Update to Chrome/72.0.3626.81 and CEF 3.3626.1881.g628f810 (#221)

src/client_handler.cpp

@@ -137,12 +137,18 @@ void ClientHandler::OnBeforeDownload(
 bool ClientHandler::OnDragEnter(CefRefPtr<CefBrowser> browser,
  CefRefPtr<CefDragData> dragData,
  DragOperationsMask mask) {
- bool external_drag = (*get_app_settings())["chrome"]["external_drag"];
- if (external_drag) {
- return false;
- } else {
- return true;
- }
+ // On Linux for drag and drop to work on web pages it is required
+ // to integrate CEF dnd using GTK APIs. See cefclient for a sample
+ // implementation.
+
+ // bool external_drag = (*get_app_settings())["chrome"]["external_drag"];
+ // if (external_drag) {
+ // return false;
+ // } else {
+ // return true;
+ // }
+
+ return false;
 }
 
 // CefLifeSpanHandler

src/include/cef_browser.h

@@ -595,6 +595,13 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
  /*--cef()--*/
  virtual void Invalidate(PaintElementType type) = 0;
 
+ ///
+ // Issue a BeginFrame request to Chromium. Only valid when
+ // CefWindowInfo::external_begin_frame_enabled is set to true.
+ ///
+ /*--cef()--*/
+ virtual void SendExternalBeginFrame() = 0;
+
  ///
  // Send a key event to the browser.
  ///

src/include/cef_render_handler.h

@@ -69,7 +69,8 @@ class CefRenderHandler : public virtual CefBaseRefCounted {
 
  ///
  // Called to retrieve the root window rectangle in screen coordinates. Return
- // true if the rectangle was provided.
+ // true if the rectangle was provided. If this method returns false the
+ // rectangle from GetViewRect will be used.
  ///
  /*--cef()--*/
  virtual bool GetRootScreenRect(CefRefPtr<CefBrowser> browser, CefRect& rect) {
@@ -78,10 +79,10 @@ class CefRenderHandler : public virtual CefBaseRefCounted {
 
  ///
  // Called to retrieve the view rectangle which is relative to screen
- // coordinates. Return true if the rectangle was provided.
+ // coordinates. This method must always provide a non-empty rectangle.
  ///
  /*--cef()--*/
- virtual bool GetViewRect(CefRefPtr<CefBrowser> browser, CefRect& rect) = 0;
+ virtual void GetViewRect(CefRefPtr<CefBrowser> browser, CefRect& rect) = 0;
 
  ///
  // Called to retrieve the translation from view coordinates to actual screen
@@ -134,7 +135,8 @@ class CefRenderHandler : public virtual CefBaseRefCounted {
  // contains the pixel data for the whole image. |dirtyRects| contains the set
  // of rectangles in pixel coordinates that need to be repainted. |buffer| will
  // be |width|*|height|*4 bytes in size and represents a BGRA image with an
- // upper-left origin.
+ // upper-left origin. This method is only called when
+ // CefWindowInfo::shared_texture_enabled is set to false.
  ///
  /*--cef()--*/
  virtual void OnPaint(CefRefPtr<CefBrowser> browser,
@@ -144,6 +146,21 @@ class CefRenderHandler : public virtual CefBaseRefCounted {
  int width,
  int height) = 0;
 
+ ///
+ // Called when an element has been rendered to the shared texture handle.
+ // |type| indicates whether the element is the view or the popup widget.
+ // |dirtyRects| contains the set of rectangles in pixel coordinates that need
+ // to be repainted. |shared_handle| is the handle for a D3D11 Texture2D that
+ // can be accessed via ID3D11Device using the OpenSharedResource method. This
+ // method is only called when CefWindowInfo::shared_texture_enabled is set to
+ // true, and is currently only supported on Windows.
+ ///
+ /*--cef()--*/
+ virtual void OnAcceleratedPaint(CefRefPtr<CefBrowser> browser,
+ PaintElementType type,
+ const RectList& dirtyRects,
+ void* shared_handle) {}
+
  ///
  // Called when the browser's cursor has changed. If |type| is CT_CUSTOM then
  // |custom_cursor_info| will be populated with the custom cursor information.

src/include/cef_resource_handler.h

@@ -71,7 +71,11 @@ class CefResourceHandler : public virtual CefBaseRefCounted {
  // false or the specified number of bytes have been read. Use the |response|
  // object to set the mime type, http status code and other optional header
  // values. To redirect the request to a new URL set |redirectUrl| to the new
- // URL. If an error occured while setting up the request you can call
+ // URL. |redirectUrl| can be either a relative or fully qualified URL.
+ // It is also possible to set |response| to a redirect http status code
+ // and pass the new URL via a Location header. Likewise with |redirectUrl| it
+ // is valid to set a relative or fully qualified URL as the Location header
+ // value. If an error occured while setting up the request you can call
  // SetError() on |response| to indicate the error condition.
  ///
  /*--cef()--*/

src/include/cef_version.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2018 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2019 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -35,16 +35,16 @@
 #ifndef CEF_INCLUDE_CEF_VERSION_H_
 #define CEF_INCLUDE_CEF_VERSION_H_
 
-#define CEF_VERSION "3.3538.1852.gcb937fc"
+#define CEF_VERSION "3.3626.1881.g628f810"
 #define CEF_VERSION_MAJOR 3
-#define CEF_COMMIT_NUMBER 1852
-#define CEF_COMMIT_HASH "cb937fc9cd02a5b5f4d5aea2d880e05fbab621bf"
-#define COPYRIGHT_YEAR 2018
+#define CEF_COMMIT_NUMBER 1881
+#define CEF_COMMIT_HASH "628f8107a76fa5c95437a7545673f3a51a266a1c"
+#define COPYRIGHT_YEAR 2019
 
-#define CHROME_VERSION_MAJOR 70
+#define CHROME_VERSION_MAJOR 72
 #define CHROME_VERSION_MINOR 0
-#define CHROME_VERSION_BUILD 3538
-#define CHROME_VERSION_PATCH 102
+#define CHROME_VERSION_BUILD 3626
+#define CHROME_VERSION_PATCH 81
 
 #define DO_MAKE_STRING(p) #p
 #define MAKE_STRING(p) DO_MAKE_STRING(p)
@@ -63,13 +63,13 @@ extern "C" {
 // universal hash value will change if any platform is affected whereas the
 // platform hash values will change only if that particular platform is
 // affected.
-#define CEF_API_HASH_UNIVERSAL "040ce5036de742f2e20741ea315f8943acb52825"
+#define CEF_API_HASH_UNIVERSAL "161352dfc6601b5f28b409b6035c95ec4d21f7a0"
 #if defined(OS_WIN)
-#define CEF_API_HASH_PLATFORM "89b811362d1e7c4c7f63080451f8d2a29f3f123f"
+#define CEF_API_HASH_PLATFORM "864498db9f12dd977766dc74abc56f198b39e2ce"
 #elif defined(OS_MACOSX)
-#define CEF_API_HASH_PLATFORM "41afc46359f3ce0704aef51755b1f10fdf7091ed"
+#define CEF_API_HASH_PLATFORM "32247df6e90b9555e16862e75885d7e157852156"
 #elif defined(OS_LINUX)
-#define CEF_API_HASH_PLATFORM "1e06dc06555ed213fb88f06f5ac77a2bdc1a7198"
+#define CEF_API_HASH_PLATFORM "a6fa42b9e296d27d524fc561060368e0209cef8b"
 #endif
 
 // Returns CEF version information for the libcef library. The |entry|

src/include/internal/cef_linux.h

@@ -82,6 +82,8 @@ struct CefWindowInfoTraits {
  target->height = src->height;
  target->parent_window = src->parent_window;
  target->windowless_rendering_enabled = src->windowless_rendering_enabled;
+ target->shared_texture_enabled = src->shared_texture_enabled;
+ target->external_begin_frame_enabled = src->external_begin_frame_enabled;
  target->window = src->window;
  }
 };

src/include/internal/cef_types.h

@@ -115,7 +115,13 @@ typedef enum {
  LOGSEVERITY_ERROR,
 
  ///
- // Completely disable logging.
+ // FATAL logging.
+ ///
+ LOGSEVERITY_FATAL,
+
+ ///
+ // Disable logging to file for all messages, and to stderr for messages with
+ // severity less than FATAL.
  ///
  LOGSEVERITY_DISABLE = 99
 } cef_log_severity_t;
@@ -290,9 +296,10 @@ typedef struct _cef_settings_t {
 
  ///
  // The log severity. Only messages of this severity level or higher will be
- // logged. Also configurable using the "log-severity" command-line switch with
- // a value of "verbose", "info", "warning", "error", "error-report" or
- // "disable".
+ // logged. When set to DISABLE no messages will be written to the log file,
+ // but FATAL messages will still be output to stderr. Also configurable using
+ // the "log-severity" command-line switch with a value of "verbose", "info",
+ // "warning", "error", "fatal" or "disable".
  ///
  cef_log_severity_t log_severity;
 

src/include/internal/cef_types_linux.h

@@ -96,6 +96,19 @@ typedef struct _cef_window_info_t {
  ///
  int windowless_rendering_enabled;
 
+ ///
+ // Set to true (1) to enable shared textures for windowless rendering. Only
+ // valid if windowless_rendering_enabled above is also set to true. Currently
+ // only supported on Windows (D3D11).
+ ///
+ int shared_texture_enabled;
+
+ ///
+ // Set to true (1) to enable the ability to issue BeginFrame requests from the
+ // client application by calling CefBrowserHost::SendExternalBeginFrame.
+ ///
+ int external_begin_frame_enabled;
+
  ///
  // Pointer for the new browser window. Only used with windowed rendering.
  ///

src/settings.json

@@ -21,7 +21,6 @@
  "log_file": "debug.log",
  "log_severity": "default",
  "cache_path": "webcache",
- "external_drag": true,
  "remote_debugging_port": 0,
  "command_line_switches": {
  "enable-media-stream": "",

src/version.h

@@ -1 +1 @@
-#define PHPDESKTOP_VERSION "70.3"
+#define PHPDESKTOP_VERSION "72.0"