Upgrade CEF to 3.3029.1611.g44e39a8 / Chromium 58.0.3029.81.

[casparcg] / dependencies64 / cef / linux / include / cef_load_handler.h

diff --git a/dependencies64/cef/include/cef_load_handler.h b/dependencies64/cef/linux/include/cef_load_handler.h
similarity index 68%
rename from dependencies64/cef/include/cef_load_handler.h
rename to dependencies64/cef/linux/include/cef_load_handler.h
index 02d9d9f1a31f5249ba209cd6ae2a6e73c080752b..66b556732d88ca25ff2ec9b872ecc0abe2cf7e2b 100644 (file)
--- a/dependencies64/cef/include/cef_load_handler.h
+++ b/dependencies64/cef/linux/include/cef_load_handler.h
@@ -48,15 +48,17 @@
 // render process main thread (TID_RENDERER).
 ///
 /*--cef(source=client)--*/
-class CefLoadHandler : public virtual CefBase {
+class CefLoadHandler : public virtual CefBaseRefCounted {
  public:
   typedef cef_errorcode_t ErrorCode;
+  typedef cef_transition_type_t TransitionType;
 
   ///
   // Called when the loading state has changed. This callback will be executed
   // twice -- once when loading is initiated either programmatically or by user
   // action, and once when loading is terminated due to completion, cancellation
-  // of failure.
+  // of failure. It will be called before any calls to OnLoadStart and after all
+  // calls to OnLoadError and/or OnLoadEnd.
   ///
   /*--cef()--*/
   virtual void OnLoadingStateChange(CefRefPtr<CefBrowser> browser,
@@ -65,25 +67,31 @@ class CefLoadHandler : public virtual CefBase {
                                     bool canGoForward) {}
 
   ///
-  // Called when the browser begins loading a frame. The |frame| value will
-  // never be empty -- call the IsMain() method to check if this frame is the
-  // main frame. Multiple frames may be loading at the same time. Sub-frames may
-  // start or continue loading after the main frame load has ended. This method
-  // may not be called for a particular frame if the load request for that frame
-  // fails. For notification of overall browser load status use
-  // OnLoadingStateChange instead.
+  // Called after a navigation has been committed and before the browser begins
+  // loading contents in the frame. The |frame| value will never be empty --
+  // call the IsMain() method to check if this frame is the main frame.
+  // |transition_type| provides information about the source of the navigation
+  // and an accurate value is only available in the browser process. Multiple
+  // frames may be loading at the same time. Sub-frames may start or continue
+  // loading after the main frame load has ended. This method will not be called
+  // for same page navigations (fragments, history state, etc.) or for
+  // navigations that fail or are canceled before commit. For notification of
+  // overall browser load status use OnLoadingStateChange instead.
   ///
   /*--cef()--*/
   virtual void OnLoadStart(CefRefPtr<CefBrowser> browser,
-                           CefRefPtr<CefFrame> frame) {}
+                           CefRefPtr<CefFrame> frame,
+                           TransitionType transition_type) {}
 
   ///
   // Called when the browser is done loading a frame. The |frame| value will
   // never be empty -- call the IsMain() method to check if this frame is the
   // main frame. Multiple frames may be loading at the same time. Sub-frames may
   // start or continue loading after the main frame load has ended. This method
-  // will always be called for all frames irrespective of whether the request
-  // completes successfully.
+  // will not be called for same page navigations (fragments, history state,
+  // etc.) or for navigations that fail or are canceled before commit. For
+  // notification of overall browser load status use OnLoadingStateChange
+  // instead.
   ///
   /*--cef()--*/
   virtual void OnLoadEnd(CefRefPtr<CefBrowser> browser,
@@ -91,10 +99,11 @@ class CefLoadHandler : public virtual CefBase {
                          int httpStatusCode) {}
 
   ///
-  // Called when the resource load for a navigation fails or is canceled.
-  // |errorCode| is the error code number, |errorText| is the error text and
-  // |failedUrl| is the URL that failed to load. See net\base\net_error_list.h
-  // for complete descriptions of the error codes.
+  // Called when a navigation fails or is canceled. This method may be called
+  // by itself if before commit or in combination with OnLoadStart/OnLoadEnd if
+  // after commit. |errorCode| is the error code number, |errorText| is the
+  // error text and |failedUrl| is the URL that failed to load.
+  // See net\base\net_error_list.h for complete descriptions of the error codes.
   ///
   /*--cef(optional_param=errorText)--*/
   virtual void OnLoadError(CefRefPtr<CefBrowser> browser,