Update to Chromium revision 248478.

- Add new CefSettings.windowless_rendering_enabled value that must be enabled when using windowless (off-screen) rendering.
- Improve naming and documentation for CefWindowInfo members.
- CefBeginTracing now completes asynchronously.
- Rename CefEndTracingAsync to CefEndTracing.
- Rename CefCompletionHandler to CefCompletionCallback.

git-svn-id: http://chromiumembedded.googlecode.com/svn/trunk/cef3@1592 5089003a-bbd8-11dd-ad1f-f1f9622dbc98

Author: [email protected]

CHROMIUM_BUILD_COMPATIBILITY.txt

@@ -17,5 +17,5 @@
 
 {
   'chromium_url': 'http://src.chromium.org/svn/trunk/src',
-  'chromium_revision': '242756',
+  'chromium_revision': '248478',
 }

cef.gyp

@@ -868,7 +868,6 @@
         '<(DEPTH)/ui/gl/gl.gyp:gl',
         '<(DEPTH)/ui/ui.gyp:ui',
         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
-        '<(DEPTH)/webkit/glue/webkit_glue.gyp:glue',
         '<(DEPTH)/webkit/storage_browser.gyp:webkit_storage_browser',
         '<(DEPTH)/webkit/storage_common.gyp:webkit_storage_common',
         # Necessary to generate the grit include files.
@@ -1037,6 +1036,8 @@
         'libcef/common/value_base.h',
         'libcef/common/values_impl.cc',
         'libcef/common/values_impl.h',
+        'libcef/common/upload_data.cc',
+        'libcef/common/upload_data.h',
         'libcef/renderer/browser_impl.cc',
         'libcef/renderer/browser_impl.h',
         'libcef/renderer/content_renderer_client.cc',
@@ -1279,6 +1280,7 @@
           'mac_bundle_resources': [
             '<(PRODUCT_DIR)/cef.pak',
             '<(PRODUCT_DIR)/devtools_resources.pak',
+            '<(PRODUCT_DIR)/icudtl.dat',
             'libcef/resources/framework-Info.plist',
           ],
           'mac_bundle_resources!': [
@@ -1635,7 +1637,7 @@
               '<@(includes_win)',
               # TODO(cef): Remove ui_unscaled_resources.rc once custom cursor
               # resources can be loaded via ResourceBundle. See crbug.com/147663.
-              '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
+              '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
               '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc',
               'libcef_dll/libcef_dll.rc',
             ],

cef_create_projects.bat

@@ -1,2 +1,2 @@
 @echo off
-..\third_party\python_26\python.exe tools\gclient_hook.py
+python.bat tools\gclient_hook.py

cef_paths.gypi

@@ -138,8 +138,8 @@
       'libcef_dll/ctocpp/client_ctocpp.h',
       'libcef_dll/cpptoc/command_line_cpptoc.cc',
       'libcef_dll/cpptoc/command_line_cpptoc.h',
-      'libcef_dll/ctocpp/completion_handler_ctocpp.cc',
-      'libcef_dll/ctocpp/completion_handler_ctocpp.h',
+      'libcef_dll/ctocpp/completion_callback_ctocpp.cc',
+      'libcef_dll/ctocpp/completion_callback_ctocpp.h',
       'libcef_dll/ctocpp/context_menu_handler_ctocpp.cc',
       'libcef_dll/ctocpp/context_menu_handler_ctocpp.h',
       'libcef_dll/cpptoc/context_menu_params_cpptoc.cc',
@@ -300,8 +300,8 @@
       'libcef_dll/cpptoc/client_cpptoc.h',
       'libcef_dll/ctocpp/command_line_ctocpp.cc',
       'libcef_dll/ctocpp/command_line_ctocpp.h',
-      'libcef_dll/cpptoc/completion_handler_cpptoc.cc',
-      'libcef_dll/cpptoc/completion_handler_cpptoc.h',
+      'libcef_dll/cpptoc/completion_callback_cpptoc.cc',
+      'libcef_dll/cpptoc/completion_callback_cpptoc.h',
       'libcef_dll/cpptoc/context_menu_handler_cpptoc.cc',
       'libcef_dll/cpptoc/context_menu_handler_cpptoc.h',
       'libcef_dll/ctocpp/context_menu_params_ctocpp.cc',

include/capi/cef_callback_capi.h

@@ -69,7 +69,7 @@ typedef struct _cef_callback_t {
 ///
 // Generic callback structure used for asynchronous completion.
 ///
-typedef struct _cef_completion_handler_t {
+typedef struct _cef_completion_callback_t {
   ///
   // Base structure.
   ///
@@ -78,8 +78,8 @@ typedef struct _cef_completion_handler_t {
   ///
   // Method that will be called once the task is complete.
   ///
-  void (CEF_CALLBACK *on_complete)(struct _cef_completion_handler_t* self);
-} cef_completion_handler_t;
+  void (CEF_CALLBACK *on_complete)(struct _cef_completion_callback_t* self);
+} cef_completion_callback_t;
 
 
 #ifdef __cplusplus

include/capi/cef_cookie_capi.h

@@ -120,11 +120,11 @@ typedef struct _cef_cookie_manager_t {
 
   ///
   // Flush the backing store (if any) to disk and execute the specified
-  // |handler| on the IO thread when done. Returns false (0) if cookies cannot
+  // |callback| on the IO thread when done. Returns false (0) if cookies cannot
   // be accessed.
   ///
   int (CEF_CALLBACK *flush_store)(struct _cef_cookie_manager_t* self,
-      struct _cef_completion_handler_t* handler);
+      struct _cef_completion_callback_t* callback);
 } cef_cookie_manager_t;
 
 

include/capi/cef_trace_capi.h

@@ -43,6 +43,7 @@ extern "C" {
 #endif
 
 #include "include/capi/cef_base_capi.h"
+#include "include/capi/cef_callback_capi.h"
 
 
 ///
@@ -68,9 +69,9 @@ typedef struct _cef_end_tracing_callback_t {
 
 
 ///
-// Start tracing events on all processes. Tracing begins immediately locally,
-// and asynchronously on child processes as soon as they receive the
-// BeginTracing request.
+// Start tracing events on all processes. Tracing is initialized asynchronously
+// and |callback| will be executed on the UI thread after initialization is
+// complete.
 //
 // If CefBeginTracing was called previously, or if a CefEndTracingAsync call is
 // pending, CefBeginTracing will fail and return false (0).
@@ -84,7 +85,8 @@ typedef struct _cef_end_tracing_callback_t {
 //
 // This function must be called on the browser process UI thread.
 ///
-CEF_EXPORT int cef_begin_tracing(const cef_string_t* categories);
+CEF_EXPORT int cef_begin_tracing(const cef_string_t* categories,
+    struct _cef_completion_callback_t* callback);
 
 ///
 // Stop tracing events on all processes.
@@ -99,7 +101,7 @@ CEF_EXPORT int cef_begin_tracing(const cef_string_t* categories);
 //
 // This function must be called on the browser process UI thread.
 ///
-CEF_EXPORT int cef_end_tracing_async(const cef_string_t* tracing_file,
+CEF_EXPORT int cef_end_tracing(const cef_string_t* tracing_file,
     cef_end_tracing_callback_t* callback);
 
 ///

include/cef_callback.h

@@ -63,7 +63,7 @@ class CefCallback : public virtual CefBase {
 // Generic callback interface used for asynchronous completion.
 ///
 /*--cef(source=client)--*/
-class CefCompletionHandler : public virtual CefBase {
+class CefCompletionCallback : public virtual CefBase {
  public:
   ///
   // Method that will be called once the task is complete.

include/cef_cookie.h

@@ -136,11 +136,11 @@ class CefCookieManager : public virtual CefBase {
 
   ///
   // Flush the backing store (if any) to disk and execute the specified
-  // |handler| on the IO thread when done. Returns false if cookies cannot be
+  // |callback| on the IO thread when done. Returns false if cookies cannot be
   // accessed.
   ///
   /*--cef(optional_param=handler)--*/
-  virtual bool FlushStore(CefRefPtr<CefCompletionHandler> handler) =0;
+  virtual bool FlushStore(CefRefPtr<CefCompletionCallback> callback) =0;
 };
 
 

include/cef_trace.h

@@ -42,6 +42,7 @@
 #pragma once
 
 #include "include/cef_base.h"
+#include "include/cef_callback.h"
 
 ///
 // Implement this interface to receive notification when tracing has completed.
@@ -61,9 +62,9 @@ class CefEndTracingCallback : public virtual CefBase {
 
 
 ///
-// Start tracing events on all processes. Tracing begins immediately locally,
-// and asynchronously on child processes as soon as they receive the
-// BeginTracing request.
+// Start tracing events on all processes. Tracing is initialized asynchronously
+// and |callback| will be executed on the UI thread after initialization is
+// complete.
 //
 // If CefBeginTracing was called previously, or if a CefEndTracingAsync call is
 // pending, CefBeginTracing will fail and return false.
@@ -79,7 +80,8 @@ class CefEndTracingCallback : public virtual CefBase {
 // This function must be called on the browser process UI thread.
 ///
 /*--cef(optional_param=categories)--*/
-bool CefBeginTracing(const CefString& categories);
+bool CefBeginTracing(const CefString& categories,
+                     CefRefPtr<CefCompletionCallback> callback);
 
 ///
 // Stop tracing events on all processes.
@@ -95,8 +97,8 @@ bool CefBeginTracing(const CefString& categories);
 // This function must be called on the browser process UI thread.
 ///
 /*--cef(optional_param=tracing_file,optional_param=callback)--*/
-bool CefEndTracingAsync(const CefString& tracing_file,
-                        CefRefPtr<CefEndTracingCallback> callback);
+bool CefEndTracing(const CefString& tracing_file,
+                   CefRefPtr<CefEndTracingCallback> callback);
 
 ///
 // Returns the current system trace time or, if none is defined, the current

include/internal/cef_linux.h

@@ -110,8 +110,8 @@ struct CefWindowInfoTraits {
   static inline void set(const struct_type* src, struct_type* target,
       bool copy) {
     target->parent_widget = src->parent_widget;
-    target->window_rendering_disabled = src->window_rendering_disabled;
-    target->transparent_painting = src->transparent_painting;
+    target->windowless_rendering_enabled = src->windowless_rendering_enabled;
+    target->transparent_painting_enabled = src->transparent_painting_enabled;
     target->widget = src->widget;
   }
 };
@@ -125,17 +125,29 @@ class CefWindowInfo : public CefStructBase<CefWindowInfoTraits> {
   explicit CefWindowInfo(const cef_window_info_t& r) : parent(r) {}
   explicit CefWindowInfo(const CefWindowInfo& r) : parent(r) {}
 
-  void SetAsChild(CefWindowHandle ParentWidget) {
-    parent_widget = ParentWidget;
+  ///
+  // Create the browser as a child widget.
+  ///
+  void SetAsChild(CefWindowHandle parent) {
+    parent_widget = parent;
   }
 
-  void SetTransparentPainting(bool transparentPainting) {
-    transparent_painting = transparentPainting;
-  }
-
-  void SetAsOffScreen(CefWindowHandle ParentWidget) {
-    window_rendering_disabled = true;
-    parent_widget = ParentWidget;
+  ///
+  // Create the browser using windowless (off-screen) rendering. No widget
+  // will be created for the browser and all rendering will occur via the
+  // CefRenderHandler interface. The |parent| value will be used to identify
+  // monitor info and to act as the parent widget for dialogs, context menus,
+  // etc. If |parent| is not provided then the main screen monitor will be used
+  // and some functionality that requires a parent widget may not function
+  // correctly. If |transparent| is true a transparent background color will be
+  // used (RGBA=0x00000000). If |transparent| is false the background will be
+  // white and opaque. In order to create windowless browsers the
+  // CefSettings.windowless_rendering_enabled value must be set to true.
+  ///
+  void SetAsWindowless(CefWindowHandle parent, bool transparent) {
+    windowless_rendering_enabled = true;
+    parent_widget = parent;
+    transparent_painting_enabled = transparent;
   }
 };
 

include/internal/cef_mac.h

@@ -112,17 +112,17 @@ struct CefWindowInfoTraits {
 
   static inline void set(const struct_type* src, struct_type* target,
       bool copy) {
-    target->view = src->view;
-    target->parent_view = src->parent_view;
     cef_string_set(src->window_name.str, src->window_name.length,
         &target->window_name, copy);
     target->x = src->x;
     target->y = src->y;
     target->width = src->width;
     target->height = src->height;
     target->hidden = src->hidden;
-    target->transparent_painting = src->transparent_painting;
-    target->window_rendering_disabled = src->window_rendering_disabled;
+    target->parent_view = src->parent_view;
+    target->windowless_rendering_enabled = src->windowless_rendering_enabled;
+    target->transparent_painting_enabled = src->transparent_painting_enabled;
+    target->view = src->view;
   }
 };
 
@@ -135,23 +135,35 @@ class CefWindowInfo : public CefStructBase<CefWindowInfoTraits> {
   explicit CefWindowInfo(const cef_window_info_t& r) : parent(r) {}
   explicit CefWindowInfo(const CefWindowInfo& r) : parent(r) {}
 
-  void SetAsChild(CefWindowHandle ParentView, int x, int y, int width,
+  ///
+  // Create the browser as a child view.
+  ///
+  void SetAsChild(CefWindowHandle parent, int x, int y, int width,
                   int height) {
-    parent_view = ParentView;
+    parent_view = parent;
     this->x = x;
     this->y = y;
     this->width = width;
     this->height = height;
     hidden = false;
   }
 
-  void SetTransparentPainting(bool transparentPainting) {
-    transparent_painting = transparentPainting;
-  }
-
-  void SetAsOffScreen(NSView* view) {
-    window_rendering_disabled = true;
-    parent_view = view;
+  ///
+  // Create the browser using windowless (off-screen) rendering. No view
+  // will be created for the browser and all rendering will occur via the
+  // CefRenderHandler interface. The |parent| value will be used to identify
+  // monitor info and to act as the parent view for dialogs, context menus,
+  // etc. If |parent| is not provided then the main screen monitor will be used
+  // and some functionality that requires a parent view may not function
+  // correctly. If |transparent| is true a transparent background color will be
+  // used (RGBA=0x00000000). If |transparent| is false the background will be
+  // white and opaque. In order to create windowless browsers the
+  // CefSettings.windowless_rendering_enabled value must be set to true.
+  ///
+  void SetAsWindowless(CefWindowHandle parent, bool transparent) {
+    windowless_rendering_enabled = true;
+    parent_view = parent;
+    transparent_painting_enabled = transparent;
   }
 };
 

include/internal/cef_types.h

@@ -223,6 +223,13 @@ typedef struct _cef_settings_t {
   ///
   int multi_threaded_message_loop;
 
+  ///
+  // Set to true to enable windowless (off-screen) rendering support. Do not
+  // enable this value if the application does not use windowless rendering as
+  // it may reduce rendering performance on some systems.
+  ///
+  bool windowless_rendering_enabled;
+
   ///
   // Set to true (1) to disable configuration of browser process features using
   // standard CEF and Chromium command-line arguments. Configuration can still
@@ -1650,14 +1657,11 @@ typedef enum {
   DOM_NODE_TYPE_ATTRIBUTE,
   DOM_NODE_TYPE_TEXT,
   DOM_NODE_TYPE_CDATA_SECTION,
-  DOM_NODE_TYPE_ENTITY,
   DOM_NODE_TYPE_PROCESSING_INSTRUCTIONS,
   DOM_NODE_TYPE_COMMENT,
   DOM_NODE_TYPE_DOCUMENT,
   DOM_NODE_TYPE_DOCUMENT_TYPE,
   DOM_NODE_TYPE_DOCUMENT_FRAGMENT,
-  DOM_NODE_TYPE_NOTATION,
-  DOM_NODE_TYPE_XPATH_NAMESPACE,
 } cef_dom_node_type_t;
 
 ///

include/internal/cef_types_linux.h

@@ -60,18 +60,34 @@ typedef struct _cef_main_args_t {
 // Class representing window information.
 ///
 typedef struct _cef_window_info_t {
-  // Pointer for the parent GtkBox widget.
+  ///
+  // Pointer for the parent widget.
+  ///
   cef_window_handle_t parent_widget;
 
-  // If window rendering is disabled no browser window will be created. Set
-  // |parent_widget| to the window that will act as the parent for popup menus,
-  // dialog boxes, etc.
-  int window_rendering_disabled;
+  ///
+  // Set to true (1) to create the browser using windowless (off-screen)
+  // rendering. No widget will be created for the browser and all rendering will
+  // occur via the CefRenderHandler interface. The |parent_widget| value will be
+  // used to identify monitor info and to act as the parent widget for dialogs,
+  // context menus, etc. If |parent_widget| is not provided then the main screen
+  // monitor will be used and some functionality that requires a parent widget
+  // may not function correctly. In order to create windowless browsers the
+  // CefSettings.windowless_rendering_enabled value must be set to true.
+  ///
+  int windowless_rendering_enabled;
 
-  // Set to true to enable transparent painting.
-  int transparent_painting;
+  ///
+  // Set to true (1) to enable transparent painting in combination with
+  // windowless rendering. When this value is true a transparent background
+  // color will be used (RGBA=0x00000000). When this value is false the
+  // background will be white and opaque.
+  ///
+  int transparent_painting_enabled;
 
-  // Pointer for the new browser widget.
+  ///
+  // Pointer for the new browser widget. Only used with windowed rendering.
+  ///
   cef_window_handle_t widget;
 } cef_window_info_t;