Update CEF to CEF3 trunk

treasurecat · Sep 18, 2012 · 286ff46 · 286ff46
1 parent b8c2786
commit 286ff46
Show file tree

Hide file tree

Showing 27 changed files with 1,596 additions and 1,111 deletions.
diff --git a/cef/cef_paths.gypi b/cef/cef_paths.gypi
@@ -216,6 +216,10 @@
       'cef/libcef_dll/cpptoc/v8exception_cpptoc.h',
       'cef/libcef_dll/ctocpp/v8handler_ctocpp.cc',
       'cef/libcef_dll/ctocpp/v8handler_ctocpp.h',
+      'cef/libcef_dll/cpptoc/v8stack_frame_cpptoc.cc',
+      'cef/libcef_dll/cpptoc/v8stack_frame_cpptoc.h',
+      'cef/libcef_dll/cpptoc/v8stack_trace_cpptoc.cc',
+      'cef/libcef_dll/cpptoc/v8stack_trace_cpptoc.h',
       'cef/libcef_dll/cpptoc/v8value_cpptoc.cc',
       'cef/libcef_dll/cpptoc/v8value_cpptoc.h',
       'cef/libcef_dll/cpptoc/web_plugin_info_cpptoc.cc',
@@ -346,6 +350,10 @@
       'cef/libcef_dll/ctocpp/v8exception_ctocpp.h',
       'cef/libcef_dll/cpptoc/v8handler_cpptoc.cc',
       'cef/libcef_dll/cpptoc/v8handler_cpptoc.h',
+      'cef/libcef_dll/ctocpp/v8stack_frame_ctocpp.cc',
+      'cef/libcef_dll/ctocpp/v8stack_frame_ctocpp.h',
+      'cef/libcef_dll/ctocpp/v8stack_trace_ctocpp.cc',
+      'cef/libcef_dll/ctocpp/v8stack_trace_ctocpp.h',
       'cef/libcef_dll/ctocpp/v8value_ctocpp.cc',
       'cef/libcef_dll/ctocpp/v8value_ctocpp.h',
       'cef/libcef_dll/ctocpp/web_plugin_info_ctocpp.cc',

diff --git a/cef/cef_paths2.gypi b/cef/cef_paths2.gypi
@@ -88,7 +88,7 @@
       'tests/cefclient/client_app.h',
       'tests/cefclient/client_app_delegates.cpp',
       'tests/cefclient/client_handler.cpp',
-      'tests/cefclient/atom_cef_client.h',
+      'tests/cefclient/client_handler.h',
       'tests/cefclient/client_renderer.cpp',
       'tests/cefclient/client_renderer.h',
       'tests/cefclient/client_switches.cpp',
@@ -130,7 +130,7 @@
       'tests/cefclient/client_app.h',
       'tests/cefclient/client_app_delegates.cpp',
       'tests/cefclient/client_handler.cpp',
-      'tests/cefclient/atom_cef_client.h',
+      'tests/cefclient/client_handler.h',
       'tests/cefclient/client_handler_mac.mm',
       'tests/cefclient/client_renderer.cpp',
       'tests/cefclient/client_renderer.h',
@@ -166,6 +166,7 @@
     ],
     'cefclient_bundle_resources_linux': [
       'tests/cefclient/res/binding.html',
+      'tests/cefclient/res/dialogs.html',
       'tests/cefclient/res/domaccess.html',
       'tests/cefclient/res/localstorage.html',
       'tests/cefclient/res/logo.png',

diff --git a/cef/frameworks/ffmpegsumo.so b/cef/frameworks/ffmpegsumo.so
diff --git a/cef/frameworks/libcef.dylib b/cef/frameworks/libcef.dylib
diff --git a/cef/include/capi/cef_browser_capi.h b/cef/include/capi/cef_browser_capi.h
@@ -114,7 +114,9 @@ typedef struct _cef_browser_t {
   ///
   int (CEF_CALLBACK *is_popup)(struct _cef_browser_t* self);
 
+  ///
   // Returns true (1) if a document has been loaded in the browser.
+  ///
   int (CEF_CALLBACK *has_document)(struct _cef_browser_t* self);
 
   ///
@@ -238,12 +240,15 @@ typedef struct _cef_browser_host_t {
       struct _cef_browser_host_t* self, int http_scheme);
 
   ///
-  // Get the zoom level. This function can only be called on the UI thread.
+  // Get the current zoom level. The default zoom level is 0.0. This function
+  // can only be called on the UI thread.
   ///
   double (CEF_CALLBACK *get_zoom_level)(struct _cef_browser_host_t* self);
 
   ///
-  // Change the zoom level to the specified value.
+  // Change the zoom level to the specified value. Specify 0.0 to reset the zoom
+  // level. If called on the UI thread the change will be applied immediately.
+  // Otherwise, the change will be applied asynchronously on the UI thread.
   ///
   void (CEF_CALLBACK *set_zoom_level)(struct _cef_browser_host_t* self,
       double zoomLevel);

diff --git a/cef/include/capi/cef_command_line_capi.h b/cef/include/capi/cef_command_line_capi.h
@@ -100,6 +100,13 @@ typedef struct _cef_command_line_t {
   ///
   void (CEF_CALLBACK *reset)(struct _cef_command_line_t* self);
 
+  ///
+  // Retrieve the original command line string as a vector of strings. The argv
+  // array: { program, [(--|-|/)switch[=value]]*, [--], [argument]* }
+  ///
+  void (CEF_CALLBACK *get_argv)(struct _cef_command_line_t* self,
+      cef_string_list_t argv);
+
   ///
   // Constructs and returns the represented command line string. Use this
   // function cautiously because quoting behavior is unclear.

diff --git a/cef/include/capi/cef_display_handler_capi.h b/cef/include/capi/cef_display_handler_capi.h
@@ -91,8 +91,7 @@ typedef struct _cef_display_handler_t {
   // status message type.
   ///
   void (CEF_CALLBACK *on_status_message)(struct _cef_display_handler_t* self,
-      struct _cef_browser_t* browser, const cef_string_t* value,
-      enum cef_handler_statustype_t type);
+      struct _cef_browser_t* browser, const cef_string_t* value);
 
   ///
   // Called to display a console message. Return true (1) to stop the message

diff --git a/cef/include/capi/cef_v8_capi.h b/cef/include/capi/cef_v8_capi.h
@@ -700,6 +700,92 @@ CEF_EXPORT cef_v8value_t* cef_v8value_create_function(const cef_string_t* name,
     cef_v8handler_t* handler);
 
 
+///
+// Structure representing a V8 stack trace. The functions of this structure may
+// only be called on the render process main thread.
+///
+typedef struct _cef_v8stack_trace_t {
+  ///
+  // Base structure.
+  ///
+  cef_base_t base;
+
+  ///
+  // Returns the number of stack frames.
+  ///
+  int (CEF_CALLBACK *get_frame_count)(struct _cef_v8stack_trace_t* self);
+
+  ///
+  // Returns the stack frame at the specified 0-based index.
+  ///
+  struct _cef_v8stack_frame_t* (CEF_CALLBACK *get_frame)(
+      struct _cef_v8stack_trace_t* self, int index);
+} cef_v8stack_trace_t;
+
+
+///
+// Returns the stack trace for the currently active context. |frame_limit| is
+// the maximum number of frames that will be captured.
+///
+CEF_EXPORT cef_v8stack_trace_t* cef_v8stack_trace_get_current(int frame_limit);
+
+
+///
+// Structure representing a V8 stack frame. The functions of this structure may
+// only be called on the render process main thread.
+///
+typedef struct _cef_v8stack_frame_t {
+  ///
+  // Base structure.
+  ///
+  cef_base_t base;
+
+  ///
+  // Returns the name of the resource script that contains the function.
+  ///
+  // The resulting string must be freed by calling cef_string_userfree_free().
+  cef_string_userfree_t (CEF_CALLBACK *get_script_name)(
+      struct _cef_v8stack_frame_t* self);
+
+  ///
+  // Returns the name of the resource script that contains the function or the
+  // sourceURL value if the script name is undefined and its source ends with a
+  // "//@ sourceURL=..." string.
+  ///
+  // The resulting string must be freed by calling cef_string_userfree_free().
+  cef_string_userfree_t (CEF_CALLBACK *get_script_name_or_source_url)(
+      struct _cef_v8stack_frame_t* self);
+
+  ///
+  // Returns the name of the function.
+  ///
+  // The resulting string must be freed by calling cef_string_userfree_free().
+  cef_string_userfree_t (CEF_CALLBACK *get_function_name)(
+      struct _cef_v8stack_frame_t* self);
+
+  ///
+  // Returns the 1-based line number for the function call or 0 if unknown.
+  ///
+  int (CEF_CALLBACK *get_line_number)(struct _cef_v8stack_frame_t* self);
+
+  ///
+  // Returns the 1-based column offset on the line for the function call or 0 if
+  // unknown.
+  ///
+  int (CEF_CALLBACK *get_column)(struct _cef_v8stack_frame_t* self);
+
+  ///
+  // Returns true (1) if the function was compiled using eval().
+  ///
+  int (CEF_CALLBACK *is_eval)(struct _cef_v8stack_frame_t* self);
+
+  ///
+  // Returns true (1) if the function was called as a constructor via "new".
+  ///
+  int (CEF_CALLBACK *is_constructor)(struct _cef_v8stack_frame_t* self);
+} cef_v8stack_frame_t;
+
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/cef/include/cef_browser.h b/cef/include/cef_browser.h
@@ -273,13 +273,17 @@ class CefBrowserHost : public virtual CefBase {
   virtual CefString GetDevToolsURL(bool http_scheme) =0;
 
   ///
-  // Get the zoom level. This method can only be called on the UI thread.
+  // Get the current zoom level. The default zoom level is 0.0. This method can
+  // only be called on the UI thread.
   ///
   /*--cef()--*/
   virtual double GetZoomLevel() =0;
 
   ///
-  // Change the zoom level to the specified value.
+  // Change the zoom level to the specified value. Specify 0.0 to reset the
+  // zoom level. If called on the UI thread the change will be applied
+  // immediately. Otherwise, the change will be applied asynchronously on the
+  // UI thread.
   ///
   /*--cef()--*/
   virtual void SetZoomLevel(double zoomLevel) =0;

diff --git a/cef/include/cef_command_line.h b/cef/include/cef_command_line.h
@@ -113,6 +113,13 @@ class CefCommandLine : public virtual CefBase {
   /*--cef()--*/
   virtual void Reset() =0;
 
+  ///
+  // Retrieve the original command line string as a vector of strings.
+  // The argv array: { program, [(--|-|/)switch[=value]]*, [--], [argument]* }
+  ///
+  /*--cef()--*/
+  virtual void GetArgv(std::vector<CefString>& argv) =0;
+
   ///
   // Constructs and returns the represented command line string. Use this method
   // cautiously because quoting behavior is unclear.

diff --git a/cef/include/cef_display_handler.h b/cef/include/cef_display_handler.h
@@ -49,8 +49,6 @@
 /*--cef(source=client)--*/
 class CefDisplayHandler : public virtual CefBase {
  public:
-  typedef cef_handler_statustype_t StatusType;
-
   ///
   // Called when the loading state has changed.
   ///
@@ -92,8 +90,7 @@ class CefDisplayHandler : public virtual CefBase {
   ///
   /*--cef(optional_param=value)--*/
   virtual void OnStatusMessage(CefRefPtr<CefBrowser> browser,
-                               const CefString& value,
-                               StatusType type) {}
+                               const CefString& value) {}
 
   ///
   // Called to display a console message. Return true to stop the message from