From 1a118ede8c7e99910ab2b071fe3ac68d1bbca696 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Sun, 18 Feb 2018 08:02:48 +0100
Subject: [PATCH 001/238] Fix building on Linux

---
 src/subprocess/cefpython_app.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/subprocess/cefpython_app.cpp b/src/subprocess/cefpython_app.cpp
index e2c2ed64..269da21b 100644
--- a/src/subprocess/cefpython_app.cpp
+++ b/src/subprocess/cefpython_app.cpp
@@ -177,11 +177,13 @@ void CefPythonApp::OnBeforeChildProcessLaunch(
 #ifdef BROWSER_PROCESS
     // This is included only in the Browser process, when building
     // the libcefpythonapp library.
+#if defined(OS_WINDOWS)
     if (IsProcessDpiAware()) {
         // It is required to set DPI awareness in subprocesses
         // as well, see Issue #358.
         command_line->AppendSwitch("enable-high-dpi-support");
     }
+#endif // OS_WINDOWS
     BrowserProcessHandler_OnBeforeChildProcessLaunch(command_line);
 #endif // BROWSER_PROCESS
 

From 53d0c63b12b838c0f56c5796d9ddaf9f5091b4b8 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Sun, 18 Feb 2018 09:08:30 +0100
Subject: [PATCH 002/238] Update unit tests. Property can be a function too.

---
 unittests/main_test.py | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/unittests/main_test.py b/unittests/main_test.py
index d7a2fbf9..ecc0f9c3 100644
--- a/unittests/main_test.py
+++ b/unittests/main_test.py
@@ -41,6 +41,10 @@
         print("Chrome: <b>"+version.chrome_version+"</b>");
         print("CEF: <b>"+version.cef_version+"</b>");
 
+        // Test binding function: test_function
+        test_function();
+        print("test_function() ok");
+
         // Test binding property: test_property1
         if (test_property1 == "Test binding property to the 'window' object") {
             print("test_property_1 ok");
@@ -56,9 +60,9 @@
             throw new Error("test_property2 contains invalid value");
         }
 
-        // Test binding function: test_function
-        test_function();
-        print("test_function() ok");
+        // Test binding function: test_property3_function
+        test_property3_function();
+        print("test_property3_function() ok");
 
         // Test binding external object and use of javascript<>python callbacks
         var start_time = new Date().getTime();
@@ -145,6 +149,11 @@ def test_main(self):
         bindings.SetFunction("test_function", external.test_function)
         bindings.SetProperty("test_property1", external.test_property1)
         bindings.SetProperty("test_property2", external.test_property2)
+        # Property with a function value can also be bound. CEF Python
+        # supports passing functions as callbacks when called from
+        # javascript, and as a side effect any value and in this case
+        # a property can also be a function.
+        bindings.SetProperty("test_property3_function", external.test_property3_function)
         bindings.SetProperty("cefpython_version", cef.GetVersion())
         bindings.SetObject("external", external)
         browser.SetJavascriptBindings(bindings)
@@ -310,6 +319,7 @@ def __init__(self, test_case):
         # Asserts for True/False will be checked just before shutdown
         self.test_for_True = True  # Test whether asserts are working correctly
         self.test_function_True = False
+        self.test_property3_function_True = False
         self.test_callbacks_True = False
         self.py_callback_True = False
 
@@ -317,6 +327,10 @@ def test_function(self):
         """Test binding function to the 'window' object."""
         self.test_function_True = True
 
+    def test_property3_function(self):
+        """Test binding function to the 'window' object."""
+        self.test_property3_function_True = True
+
     def test_callbacks(self, js_callback):
         """Test both javascript and python callbacks."""
         def py_callback(msg_from_js):

From 17caa51fcb7cd24477790cdc145a089454042674 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Sun, 18 Feb 2018 10:18:02 +0100
Subject: [PATCH 003/238] Update Tutorial - Cython compiler

---
 docs/Tutorial.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/Tutorial.md b/docs/Tutorial.md
index 40a1da38..e79815a4 100644
--- a/docs/Tutorial.md
+++ b/docs/Tutorial.md
@@ -683,6 +683,7 @@ official examples are provided for these. See the following
 issues in the tracker for all available packagers:
 
 * cx_Freeze - see [Issue #338](../../../issues/338)
+* Cython - see [Issue #407](../../../issues/407)
 * py2exe - see [Issue #35](../../../issues/35)
 * py2app - see [Issue #337](../../../issues/337)
 * Nuitka - see [Issue #396](../../../issues/396)

From 02844979f05a8f693f7f84a811402d1ca1a1a7cf Mon Sep 17 00:00:00 2001
From: Jack-2025 <jmorris7845@gmail.com>
Date: Sun, 18 Feb 2018 18:22:13 +0900
Subject: [PATCH 004/238] Avoids issue #360 on qt.py example

---
 examples/qt.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/examples/qt.py b/examples/qt.py
index 0dc126be..261f4160 100644
--- a/examples/qt.py
+++ b/examples/qt.py
@@ -108,6 +108,8 @@ class MainWindow(QMainWindow):
     def __init__(self):
         # noinspection PyArgumentList
         super(MainWindow, self).__init__(None)
+        # Avoids crash when shutting down CEF (issue #360)
+        self.setAttribute(Qt.WA_DeleteOnClose, True)
         self.cef_widget = None
         self.navigation_bar = None
         if PYQT4:

From f77161adc6cd9c7c65911e13cd150543d961763b Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Sun, 18 Feb 2018 12:26:04 +0100
Subject: [PATCH 005/238] Update examples - print Chromium and CEF version
 numbers

---
 examples/hello_world.py | 12 ++++++++----
 examples/screenshot.py  |  8 ++++++--
 examples/tutorial.py    | 12 ++++++++----
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/examples/hello_world.py b/examples/hello_world.py
index 0157267f..478c7060 100644
--- a/examples/hello_world.py
+++ b/examples/hello_world.py
@@ -1,5 +1,5 @@
 # Hello world example. Doesn't depend on any third party GUI framework.
-# Tested with CEF Python v55.3+.
+# Tested with CEF Python v57.0+.
 
 from cefpython3 import cefpython as cef
 import platform
@@ -17,10 +17,14 @@ def main():
 
 
 def check_versions():
-    print("[hello_world.py] CEF Python {ver}".format(ver=cef.__version__))
+    ver = cef.GetVersion()
+    print("[hello_world.py] CEF Python {ver}".format(ver=ver["version"]))
+    print("[hello_world.py] Chromium {ver}".format(ver=ver["chrome_version"]))
+    print("[hello_world.py] CEF {ver}".format(ver=ver["cef_version"]))
     print("[hello_world.py] Python {ver} {arch}".format(
-          ver=platform.python_version(), arch=platform.architecture()[0]))
-    assert cef.__version__ >= "55.3", "CEF Python v55.3+ required to run this"
+           ver=platform.python_version(),
+           arch=platform.architecture()[0]))
+    assert cef.__version__ >= "57.0", "CEF Python v57.0+ required to run this"
 
 
 if __name__ == '__main__':
diff --git a/examples/screenshot.py b/examples/screenshot.py
index 0f23b627..e99c2fe6 100644
--- a/examples/screenshot.py
+++ b/examples/screenshot.py
@@ -65,9 +65,13 @@ def main():
 
 
 def check_versions():
-    print("[screenshot.py] CEF Python {ver}".format(ver=cef.__version__))
+    ver = cef.GetVersion()
+    print("[screenshot.py] CEF Python {ver}".format(ver=ver["version"]))
+    print("[screenshot.py] Chromium {ver}".format(ver=ver["chrome_version"]))
+    print("[screenshot.py] CEF {ver}".format(ver=ver["cef_version"]))
     print("[screenshot.py] Python {ver} {arch}".format(
-          ver=platform.python_version(), arch=platform.architecture()[0]))
+           ver=platform.python_version(),
+           arch=platform.architecture()[0]))
     print("[screenshot.py] Pillow {ver}".format(ver=PILLOW_VERSION))
     assert cef.__version__ >= "57.0", "CEF Python v57.0+ required to run this"
 
diff --git a/examples/tutorial.py b/examples/tutorial.py
index a4dbf49e..860bbe12 100644
--- a/examples/tutorial.py
+++ b/examples/tutorial.py
@@ -1,5 +1,5 @@
 # Tutorial example. Doesn't depend on any third party GUI framework.
-# Tested with CEF Python v56.2+
+# Tested with CEF Python v57.0+
 
 from cefpython3 import cefpython as cef
 import base64
@@ -78,10 +78,14 @@ def main():
 
 
 def check_versions():
-    print("[tutorial.py] CEF Python {ver}".format(ver=cef.__version__))
+    ver = cef.GetVersion()
+    print("[tutorial.py] CEF Python {ver}".format(ver=ver["version"]))
+    print("[tutorial.py] Chromium {ver}".format(ver=ver["chrome_version"]))
+    print("[tutorial.py] CEF {ver}".format(ver=ver["cef_version"]))
     print("[tutorial.py] Python {ver} {arch}".format(
-          ver=platform.python_version(), arch=platform.architecture()[0]))
-    assert cef.__version__ >= "56.2", "CEF Python v56.2+ required to run this"
+           ver=platform.python_version(),
+           arch=platform.architecture()[0]))
+    assert cef.__version__ >= "57.0", "CEF Python v57.0+ required to run this"
 
 
 def html_to_data_uri(html, js_callback=None):

From d6b0bca10d42685ab6a1fb4022fb652a75c9533f Mon Sep 17 00:00:00 2001
From: Jack-2025 <jmorris7845@gmail.com>
Date: Sun, 18 Feb 2018 22:15:24 +0900
Subject: [PATCH 006/238] Adds Pyside guard

---
 examples/qt.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/examples/qt.py b/examples/qt.py
index 261f4160..0c40a530 100644
--- a/examples/qt.py
+++ b/examples/qt.py
@@ -109,7 +109,8 @@ def __init__(self):
         # noinspection PyArgumentList
         super(MainWindow, self).__init__(None)
         # Avoids crash when shutting down CEF (issue #360)
-        self.setAttribute(Qt.WA_DeleteOnClose, True)
+        if PYSIDE:
+            self.setAttribute(Qt.WA_DeleteOnClose, True)
         self.cef_widget = None
         self.navigation_bar = None
         if PYQT4:

From 3b5eb708c7814134ac2abc684b93fba58dca73ff Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Sun, 18 Feb 2018 15:21:34 +0100
Subject: [PATCH 007/238] Update KB - Debugging using various chrome://
 protocol uris

---
 README.md              | 10 ++---
 docs/Knowledge-Base.md | 83 +++++++++++++++++++++++++++++-------------
 2 files changed, 62 insertions(+), 31 deletions(-)

diff --git a/README.md b/README.md
index 5454d4eb..795de4bb 100644
--- a/README.md
+++ b/README.md
@@ -219,8 +219,8 @@ Additional information for v31.2 release:
 - [Tutorial](docs/Tutorial.md)
 
 
-### API categories
-
+### API categories
+
 #### Modules
 
  * [cefpython](api/cefpython.md#cefpython) module
@@ -275,9 +275,9 @@ Additional information for v31.2 release:
  * [StringVisitor](api/StringVisitor.md#stringvisitor-interface) interface
  * [WebRequestClient](api/WebRequestClient.md#webrequestclient-interface) interface
 
-
-### API index
-
+
+### API index
+
 * [Application settings](api/ApplicationSettings.md#application-settings)
   * [accept_language_list](api/ApplicationSettings.md#accept_language_list)
   * [app_user_model_id](api/ApplicationSettings.md#app_user_model_id)
diff --git a/docs/Knowledge-Base.md b/docs/Knowledge-Base.md
index 648523e6..3e7d6eaa 100644
--- a/docs/Knowledge-Base.md
+++ b/docs/Knowledge-Base.md
@@ -5,6 +5,8 @@ Table of contents:
 * [Notifications about new releases / commits](#notifications-about-new-releases--commits)
 * [Changes in API after CEF updates](#changes-in-api-after-cef-updates)
 * [Differences between Python 2 and Python 3](#differences-between-python-2-and-python-3)
+* [How to enable debug information in examples?](#how-to-enable-debug-information-in-examples)
+* [Debugging using various chrome:// protocol uris](#debugging-using-various-chrome-protocol-uris)
 * [A blank window on Mac/Linux](#a-blank-window-on-maclinux)
 * [Location of CEF framework in Mac apps](#location-of-cef-framework-in-mac-apps)
 * [Flash support](#flash-support)
@@ -12,7 +14,6 @@ Table of contents:
 * [How to capture Audio and Video in HTML5?](#how-to-capture-audio-and-video-in-html5)
 * [Touch and multi-touch support](#touch-and-multi-touch-support)
 * [Black or white browser screen](#black-or-white-browser-screen)
-* [How to enable debug information in examples?](#how-to-enable-debug-information-in-examples)
 * [Python crashes with "Segmentation fault" - how to debug?](#python-crashes-with-segmentation-fault---how-to-debug)
 * [Windows XP support](#windows-xp-support)
 * [Mac 32-bit support](#mac-32-bit-support)
@@ -89,6 +90,61 @@ they are all unicode strings. Be aware of this when porting cefpython
 based apps to Python 3, as it may cause issues.
 
 
+## How to enable debug information in examples?
+
+You can pass "--debug" command line flag to any of CEF Python
+examples and unit tests. It will also work with your app, as
+this feature is enabled in CEF Python's core. When this flag is
+passed the following settings will be set:
+```python
+settings = {
+    "debug": True,
+    "log_severity": cef.LOGSEVERITY_INFO,
+    "log_file": "debug.log",
+}
+cef.Initialize(settings=settings)
+```
+
+Now you should see debug information displayed in console like this:
+```
+[CEF Python] Initialize() called
+[CEF Python] CefExecuteProcess(): exitCode = -1
+[CEF Python] CefInitialize()
+[CEF Python] App_OnBeforeCommandLineProcessing_BrowserProcess()
+[CEF Python] Command line string for the browser process:  ...
+```
+
+
+## Debugging using various chrome:// protocol uris
+
+The `chrome://` protocol uris give you access to various debugging
+tools. For example if you encounter GPU issues then after the issue
+occured load the `chrome://gpu` to see a list of errors.
+
+Here is a list of supported `chrome://` protocol uris as of v55.2:
+- chrome://accessibility
+- chrome://appcache-internals
+- chrome://blob-internals
+- chrome://credits
+- chrome://gpu
+- chrome://histograms
+- chrome://indexeddb-internals
+- chrome://license
+- chrome://media-internals
+- chrome://net-export
+- chrome://net-internals
+- chrome://network-error
+- chrome://network-errors
+- chrome://resources
+- chrome://serviceworker-internals
+- chrome://system
+- chrome://tracing
+- chrome://version
+- chrome://view-http-cache
+- chrome://webrtc-internals
+- chrome://webui-hosts
+
+
 ## A blank window on Mac/Linux
 
 A blank window might appear when your Python does not support
@@ -214,31 +270,6 @@ appear even after disabling GPU hardware acceleration. This is normal
 because GPU was disabled so WebGL cannot work.
 
 
-## How to enable debug information in examples?
-
-You can pass "--debug" command line flag to any of CEF Python
-examples and unit tests. It will also work with your app, as
-this feature is enabled in CEF Python's core. When this flag is
-passed the following settings will be set:
-```python
-settings = {
-    "debug": True,
-    "log_severity": cef.LOGSEVERITY_INFO,
-    "log_file": "debug.log",
-}
-cef.Initialize(settings=settings)
-```
-
-Now you should see debug information displayed in console like this:
-```
-[CEF Python] Initialize() called
-[CEF Python] CefExecuteProcess(): exitCode = -1
-[CEF Python] CefInitialize()
-[CEF Python] App_OnBeforeCommandLineProcessing_BrowserProcess()
-[CEF Python] Command line string for the browser process:  ...
-```
-
-
 ## Python crashes with "Segmentation fault" - how to debug?
 
 Install gdb:

From b4e4d779ebf83019899a9bae504530a15bc11aa4 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Sun, 18 Feb 2018 15:38:11 +0100
Subject: [PATCH 008/238] Update README - support development contact details

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 795de4bb..25f04808 100644
--- a/README.md
+++ b/README.md
@@ -135,7 +135,7 @@ a comment about that when making a donation. It will give it
 a higher priority.
 
 If you are interested in sponsorship opportunities please contact Czarek
-directly (linkedin profile or email).
+directly - contact details are available in his [Resume](https://drive.google.com/file/d/17xmoT5Z_zTHkVclqPzrs2aAV64Uiu7fh/view).
 
 ### Thanks
 
@@ -219,8 +219,8 @@ Additional information for v31.2 release:
 - [Tutorial](docs/Tutorial.md)
 
 
-### API categories
-
+### API categories
+
 #### Modules
 
  * [cefpython](api/cefpython.md#cefpython) module
@@ -275,9 +275,9 @@ Additional information for v31.2 release:
  * [StringVisitor](api/StringVisitor.md#stringvisitor-interface) interface
  * [WebRequestClient](api/WebRequestClient.md#webrequestclient-interface) interface
 
-
-### API index
-
+
+### API index
+
 * [Application settings](api/ApplicationSettings.md#application-settings)
   * [accept_language_list](api/ApplicationSettings.md#accept_language_list)
   * [app_user_model_id](api/ApplicationSettings.md#app_user_model_id)

From 61ffdf48194e1b7e74956e75c3552a808a319b72 Mon Sep 17 00:00:00 2001
From: Czarek Tomczak <cztomczak@users.noreply.github.com>
Date: Mon, 19 Feb 2018 12:07:10 +0100
Subject: [PATCH 009/238] Update Knowledge-Base.md

---
 docs/Knowledge-Base.md | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/docs/Knowledge-Base.md b/docs/Knowledge-Base.md
index 3e7d6eaa..cf1deba5 100644
--- a/docs/Knowledge-Base.md
+++ b/docs/Knowledge-Base.md
@@ -68,19 +68,16 @@ To be notified on new commits subscribe to this [RSS/Atom feed](../../../commits
 ## Changes in API after CEF updates
 
 CEF Python depends on CEF and API breaks are inevitable when updating
-to latest CEF. The [Migration Guide](Migration-guide.md) document which
-is still under works, will list most notable breaking changes since
-v31 release. Until it's done go to go to the [GitHub Releases](../../../releases)
-page and check release notes for all the releases
-that appeared between your old version and the new version. Look for
-lists named "Changes in API that break backward compatibility" or
-similar.
+to latest CEF. The [Migration Guide](Migration-guide.md) document
+lists most notable breaking changes for each release. Other changes
+that do not backwards compatibility can be seen on [GitHub Releases](../../../releases)
+pages.
 
 Due to unavoidable changes in API it is recommended for your setup
 scripts that use for example PIP to install the cefpython3 package,
 to hardcode the cefpython version string. If for example using PIP's
 requirements.txt file then list the cefpython3 package in the
-following format: `cefpython3 == 31.2`.
+following format if using cefpython v57.0: `cefpython3 == 57.0`.
 
 
 ## Differences between Python 2 and Python 3

From a6f8d3ede779e2e7d67aa2d8932f0826189be39c Mon Sep 17 00:00:00 2001
From: Czarek Tomczak <cztomczak@users.noreply.github.com>
Date: Mon, 19 Feb 2018 15:48:29 +0100
Subject: [PATCH 010/238] Update ApplicationSettings.md -
 multi_threaded_message_loop

---
 api/ApplicationSettings.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/api/ApplicationSettings.md b/api/ApplicationSettings.md
index 209e6f79..8bebae68 100644
--- a/api/ApplicationSettings.md
+++ b/api/ApplicationSettings.md
@@ -319,6 +319,13 @@ thread. If false (0) than the [cefpython](cefpython.md).MessageLoopWork()
 function must be called from your application message loop. This option is
 only supported on Windows.
 
+When this option is set to true, you don't call CEF message loop explicitilly
+anymore. Also app's main thread is no more CEF's UI thread, thus many of API
+calls will require using cef.[cefpython.md#posttask](PostTask) function to run
+code on UI thread. You should also pay attention when reading API docs, as many
+handlers/callbacks execute on specific threads, so when this option is On then
+your app's code can start executing on different threads.
+
 This option is not and cannot be supported on OS-X for architectural reasons.
 
 

From c7553bc9014d79a7157e9a2a894d25458c66afd3 Mon Sep 17 00:00:00 2001
From: Czarek Tomczak <cztomczak@users.noreply.github.com>
Date: Tue, 20 Feb 2018 14:16:50 +0100
Subject: [PATCH 011/238] Update README-Examples.md - pysdl2 example issue #324

---
 examples/README-examples.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/README-examples.md b/examples/README-examples.md
index 8b50f1f8..e377b39c 100644
--- a/examples/README-examples.md
+++ b/examples/README-examples.md
@@ -45,7 +45,7 @@ workarounds.
   library (GTK 3). Currently broken on Mac ([#310](../../../issues/310)).
 - [pysdl2.py](pysdl2.py): off-screen rendering example for
   [PySDL2](https://github.com/marcusva/py-sdl2) library. Currently tested
-  only on Linux.
+  only on Linux ([#324](../../../issues/324)).
 - [pywin32.py](pywin32.py): example for [pywin32](https://github.com/mhammond/pywin32)
   library
 - [qt.py](qt.py): example for [PyQt4](https://wiki.python.org/moin/PyQt4),

From 5dbd9d6553ccb3bcd2e091c03b1c60b3d6011dca Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Tue, 20 Feb 2018 19:59:54 +0100
Subject: [PATCH 012/238] Update pysdl2.py example - support for Windows,
 performance fixes

---
 examples/README-examples.md |  3 ++-
 examples/pysdl2.py          | 25 ++++++++++++++++++++++---
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/examples/README-examples.md b/examples/README-examples.md
index e377b39c..adae5ecd 100644
--- a/examples/README-examples.md
+++ b/examples/README-examples.md
@@ -45,7 +45,8 @@ workarounds.
   library (GTK 3). Currently broken on Mac ([#310](../../../issues/310)).
 - [pysdl2.py](pysdl2.py): off-screen rendering example for
   [PySDL2](https://github.com/marcusva/py-sdl2) library. Currently tested
-  only on Linux ([#324](../../../issues/324)).
+  and works fine on Linux and Windows. For Mac support and performance
+  tweaking see Issue [#324](../../../issues/324).
 - [pywin32.py](pywin32.py): example for [pywin32](https://github.com/mhammond/pywin32)
   library
 - [qt.py](qt.py): example for [PyQt4](https://wiki.python.org/moin/PyQt4),
diff --git a/examples/pysdl2.py b/examples/pysdl2.py
index 2b7aa8cb..7753acab 100644
--- a/examples/pysdl2.py
+++ b/examples/pysdl2.py
@@ -7,17 +7,21 @@
 Requires PySDL2 and SDL2 libraries.
  
 Tested configurations:
+- Windows 7: SDL 2.0.7 and PySDL2 0.9.6
 - Fedora 25: SDL2 2.0.5 with PySDL2 0.9.3
 - Ubuntu 14.04: SDL2 with PySDL2 0.9.6
 
 Install instructions:
 1. Install SDL libraries for your OS, e.g:
+   - Windows: Download SDL2.dll from http://www.libsdl.org/download-2.0.php
+              and put SDL2.dll in C:\Python27\ (where you've installed Python)
    - Fedora: sudo dnf install SDL2 SDL2_ttf SDL2_image SDL2_gfx SDL2_mixer
    - Ubuntu: sudo apt-get install libsdl2-dev
 2. Install PySDL2 using pip package manager:
    pip install PySDL2
  
 Missing functionality:
+- Performance is still not perfect, see Issue #379 for further details
 - Keyboard modifiers that are not yet handled in this example:
   ctrl, marking text inputs with the shift key.
 - Mouse dragging
@@ -69,10 +73,23 @@ def main():
     browserHeight = height - headerHeight
     browserWidth = width
     # Mouse wheel fudge to enhance scrolling
-    scrollEnhance = 20
+    scrollEnhance = 40
     # Initialise CEF for offscreen rendering
     sys.excepthook = cef.ExceptHook
-    cef.Initialize(settings={"windowless_rendering_enabled": True})
+    switches = {
+        # Tweaking OSR performance by setting the same Chromium flags
+        # as in upstream cefclient (Issue #240).
+        "disable-surfaces": "",
+        "disable-gpu": "",
+        "disable-gpu-compositing": "",
+        "enable-begin-frame-scheduling": "",
+    }
+    browser_settings = {
+        # Tweaking OSR performance (Issue #240)
+        "windowless_frame_rate": 100
+    }
+    cef.Initialize(settings={"windowless_rendering_enabled": True},
+                   switches=switches)
     window_info = cef.WindowInfo()
     window_info.SetAsOffscreen(0)
     # Initialise SDL2 for video (add other init constants if you
@@ -96,7 +113,9 @@ def main():
     # Set-up the RenderHandler, passing in the SDL2 renderer
     renderHandler = RenderHandler(renderer, width, height - headerHeight)
     # Create the browser instance
-    browser = cef.CreateBrowserSync(window_info, url="https://www.google.com/")
+    browser = cef.CreateBrowserSync(window_info,
+                                    url="https://www.google.com/",
+                                    settings=browser_settings)
     browser.SetClientHandler(LoadHandler())
     browser.SetClientHandler(renderHandler)
     # Must call WasResized at least once to let know CEF that

From a68771c5e3cc6ff2cade8168b87dd9b22bacd4cf Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Tue, 20 Feb 2018 20:06:33 +0100
Subject: [PATCH 013/238] Fix typo

---
 examples/pysdl2.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/pysdl2.py b/examples/pysdl2.py
index 7753acab..ecb060c1 100644
--- a/examples/pysdl2.py
+++ b/examples/pysdl2.py
@@ -21,7 +21,7 @@
    pip install PySDL2
  
 Missing functionality:
-- Performance is still not perfect, see Issue #379 for further details
+- Performance is still not perfect, see Issue #324 for further details
 - Keyboard modifiers that are not yet handled in this example:
   ctrl, marking text inputs with the shift key.
 - Mouse dragging

From 3c8d36ed2e53d79c30907e345085b7c04718349d Mon Sep 17 00:00:00 2001
From: Czarek Tomczak <cztomczak@users.noreply.github.com>
Date: Tue, 20 Feb 2018 20:56:41 +0100
Subject: [PATCH 014/238] Update qt.py

---
 examples/qt.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/examples/qt.py b/examples/qt.py
index 0c40a530..731ac2e0 100644
--- a/examples/qt.py
+++ b/examples/qt.py
@@ -11,7 +11,6 @@
 # Issues with PySide 1.2:
 # - Mac: Keyboard focus issues when switching between controls (Issue #284)
 # - Mac: Mouse cursor never changes when hovering over links (Issue #311)
-# - Windows/Mac: Sometimes process hangs when quitting app (Issue #360)
 
 from cefpython3 import cefpython as cef
 import ctypes

From bbd70da9c552c44dab6a857663bec018e8d8aaeb Mon Sep 17 00:00:00 2001
From: Neil Munday <neilmunday@users.noreply.github.com>
Date: Tue, 20 Feb 2018 21:44:47 +0000
Subject: [PATCH 015/238] Added frame rate limiting code

---
 examples/pysdl2.py | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/examples/pysdl2.py b/examples/pysdl2.py
index ecb060c1..68af6827 100644
--- a/examples/pysdl2.py
+++ b/examples/pysdl2.py
@@ -5,10 +5,10 @@
 further down. Pull requests for the missing functionality are welcome.
 
 Requires PySDL2 and SDL2 libraries.
- 
+
 Tested configurations:
 - Windows 7: SDL 2.0.7 and PySDL2 0.9.6
-- Fedora 25: SDL2 2.0.5 with PySDL2 0.9.3
+- Fedora 26: SDL2 2.0.7 with PySDL2 0.9.6
 - Ubuntu 14.04: SDL2 with PySDL2 0.9.6
 
 Install instructions:
@@ -19,7 +19,7 @@
    - Ubuntu: sudo apt-get install libsdl2-dev
 2. Install PySDL2 using pip package manager:
    pip install PySDL2
- 
+
 Missing functionality:
 - Performance is still not perfect, see Issue #324 for further details
 - Keyboard modifiers that are not yet handled in this example:
@@ -74,6 +74,8 @@ def main():
     browserWidth = width
     # Mouse wheel fudge to enhance scrolling
     scrollEnhance = 40
+    # desired frame rate
+    frameRate = 60
     # Initialise CEF for offscreen rendering
     sys.excepthook = cef.ExceptHook
     switches = {
@@ -124,7 +126,12 @@ def main():
     browser.WasResized()
     # Begin the main rendering loop
     running = True
+    # FPS debug variables
+    #frames = 0
+    #lastFrameTick = sdl2.timer.SDL_GetTicks()
     while running:
+        # record when we started drawing this frame
+        startTime = sdl2.timer.SDL_GetTicks()
         # Convert SDL2 events into CEF events (where appropriate)
         events = sdl2.ext.get_events()
         for event in events:
@@ -269,6 +276,17 @@ def main():
             sdl2.SDL_Rect(0, headerHeight, browserWidth, browserHeight)
         )
         sdl2.SDL_RenderPresent(renderer)
+
+        # FPS debug code - left here for reference
+        #frames += 1
+        #currentTick = sdl2.timer.SDL_GetTicks()
+        #if currentTick - lastFrameTick > 1000:
+        #    lastFrameTick = sdl2.timer.SDL_GetTicks()
+        #    print("FPS %d" % (frames / (currentTick / 1000.0)))
+
+        # regulate frame rate
+        if sdl2.timer.SDL_GetTicks() - startTime < 1000.0 / frameRate:
+            sdl2.timer.SDL_Delay((1000 / frameRate) - (sdl2.timer.SDL_GetTicks() - startTime))
     # User exited
     exit_app()
 
@@ -298,11 +316,11 @@ def get_key_code(key):
 
 class LoadHandler(object):
     """Simple handler for loading URLs."""
-    
+
     def OnLoadingStateChange(self, is_loading, **_):
         if not is_loading:
             print("[pysdl2.py] Page loading complete")
-            
+
     def OnLoadError(self, frame, failed_url, **_):
         if not frame.IsMain():
             return
@@ -313,7 +331,7 @@ class RenderHandler(object):
     """
     Handler for rendering web pages to the
     screen via SDL2.
-    
+
     The object's texture property is exposed
     to allow the main rendering loop to access
     the SDL2 texture.
@@ -324,11 +342,11 @@ def __init__(self, renderer, width, height):
         self.__height = height
         self.__renderer = renderer
         self.texture = None
-            
+
     def GetViewRect(self, rect_out, **_):
         rect_out.extend([0, 0, self.__width, self.__height])
         return True
-    
+
     def OnPaint(self, element_type, paint_buffer, **_):
         """
         Using the pixel data from CEF's offscreen rendering
@@ -380,7 +398,7 @@ def OnPaint(self, element_type, paint_buffer, **_):
             else:
                 print("[pysdl2.py] ERROR: Unsupported mode: %s" % mode)
                 exit_app()
-            
+
             pxbuf = image.tobytes()
             # Create surface
             surface = sdl2.SDL_CreateRGBSurfaceFrom(

From ee9ee709bb1af2dc8eb63853788bde22917abbe9 Mon Sep 17 00:00:00 2001
From: Neil Munday <neilmunday@users.noreply.github.com>
Date: Tue, 20 Feb 2018 23:38:48 +0000
Subject: [PATCH 016/238] Tied up SDL and cef frame rates. Also added argparse
 and logging modules to handle console messages

---
 examples/pysdl2.py | 67 ++++++++++++++++++++++++++++------------------
 1 file changed, 41 insertions(+), 26 deletions(-)

diff --git a/examples/pysdl2.py b/examples/pysdl2.py
index 68af6827..7e3e7603 100644
--- a/examples/pysdl2.py
+++ b/examples/pysdl2.py
@@ -36,33 +36,43 @@
   https://github.com/neilmunday/pes/blob/master/lib/pes/ui.py
 """
 
+import argparse
+import logging
 import sys
+
+def die(msg):
+    """
+    Helper function to exit application on failed imports etc.
+    """
+    sys.stderr.write("%s\n" % msg)
+    sys.exit(1)
+
 try:
     # noinspection PyUnresolvedReferences
     from cefpython3 import cefpython as cef
 except ImportError:
-    print("ERROR: cefpython3 package not found")
-    print("To install type: `pip install cefpython3`")
-    sys.exit(1)
+    die("ERROR: cefpython3 package not found\nTo install type: `pip install cefpython3`")
 try:
     # noinspection PyUnresolvedReferences
     import sdl2
     # noinspection PyUnresolvedReferences
     import sdl2.ext
 except ImportError:
-    print("ERROR: SDL2 package not found")
-    print("To install type: `pip install PySDL2`")
-    sys.exit(1)
+    die("ERROR: SDL2 package not found\nTo install type: `pip install PySDL2`")
 try:
     # noinspection PyUnresolvedReferences
     from PIL import Image
 except ImportError:
-    print("ERROR: PIL package not found")
-    print("To install type: pip install Pillow")
-    sys.exit(1)
-
+    die("ERROR: PIL package not found\nTo install type: pip install Pillow")
 
 def main():
+    parser = argparse.ArgumentParser(description='PySDL2 / cefpython example', add_help=True)
+    parser.add_argument('-v', '--verbose', help='Turn on debug info', dest='verbose', action='store_true')
+    args = parser.parse_args()
+    logLevel = logging.INFO
+    if args.verbose:
+        logLevel = logging.DEBUG
+    logging.basicConfig(format='[%(filename)s %(levelname)s]: %(message)s', level=logLevel)
     # The following variables control the dimensions of the window
     # and browser display area
     width = 800
@@ -75,7 +85,7 @@ def main():
     # Mouse wheel fudge to enhance scrolling
     scrollEnhance = 40
     # desired frame rate
-    frameRate = 60
+    frameRate = 100
     # Initialise CEF for offscreen rendering
     sys.excepthook = cef.ExceptHook
     switches = {
@@ -88,16 +98,18 @@ def main():
     }
     browser_settings = {
         # Tweaking OSR performance (Issue #240)
-        "windowless_frame_rate": 100
+        "windowless_frame_rate": frameRate
     }
     cef.Initialize(settings={"windowless_rendering_enabled": True},
                    switches=switches)
+    logging.debug("cef initialised")
     window_info = cef.WindowInfo()
     window_info.SetAsOffscreen(0)
     # Initialise SDL2 for video (add other init constants if you
     # require other SDL2 functionality e.g. mixer,
     # TTF, joystick etc.
     sdl2.SDL_Init(sdl2.SDL_INIT_VIDEO)
+    logging.debug("SDL2 initialised")
     # Create the window
     window = sdl2.video.SDL_CreateWindow(
         'cefpython3 SDL2 Demo',
@@ -127,8 +139,10 @@ def main():
     # Begin the main rendering loop
     running = True
     # FPS debug variables
-    #frames = 0
-    #lastFrameTick = sdl2.timer.SDL_GetTicks()
+    if logLevel == logging.DEBUG:
+        frames = 0
+        lastFrameTick = sdl2.timer.SDL_GetTicks()
+    logging.debug("beginning rendering loop")
     while running:
         # record when we started drawing this frame
         startTime = sdl2.timer.SDL_GetTicks()
@@ -277,12 +291,13 @@ def main():
         )
         sdl2.SDL_RenderPresent(renderer)
 
-        # FPS debug code - left here for reference
-        #frames += 1
-        #currentTick = sdl2.timer.SDL_GetTicks()
-        #if currentTick - lastFrameTick > 1000:
-        #    lastFrameTick = sdl2.timer.SDL_GetTicks()
-        #    print("FPS %d" % (frames / (currentTick / 1000.0)))
+        # FPS debug code
+        if logLevel == logging.DEBUG:
+            frames += 1
+            currentTick = sdl2.timer.SDL_GetTicks()
+            if currentTick - lastFrameTick > 1000:
+                lastFrameTick = sdl2.timer.SDL_GetTicks()
+                logging.debug("FPS %d" % (frames / (currentTick / 1000.0)))
 
         # regulate frame rate
         if sdl2.timer.SDL_GetTicks() - startTime < 1000.0 / frameRate:
@@ -307,7 +322,7 @@ def get_key_code(key):
     if key in key_map:
         return key_map[key]
     # Key not mapped, raise exception
-    print("[pysdl2.py] Keyboard mapping incomplete:"
+    logging.error("Keyboard mapping incomplete:"
           " unsupported SDL key %d."
           " See https://wiki.libsdl.org/SDLKeycodeLookup for mapping."
           % key)
@@ -319,12 +334,12 @@ class LoadHandler(object):
 
     def OnLoadingStateChange(self, is_loading, **_):
         if not is_loading:
-            print("[pysdl2.py] Page loading complete")
+            logging.info("Page loading complete")
 
     def OnLoadError(self, frame, failed_url, **_):
         if not frame.IsMain():
             return
-        print("[pysdl2.py] Failed to load %s" % failed_url)
+        logging.error("Failed to load %s" % failed_url)
 
 
 class RenderHandler(object):
@@ -396,7 +411,7 @@ def OnPaint(self, element_type, paint_buffer, **_):
                 depth = 32
                 pitch = self.__width * 4
             else:
-                print("[pysdl2.py] ERROR: Unsupported mode: %s" % mode)
+                logging.error("ERROR: Unsupported mode: %s" % mode)
                 exit_app()
 
             pxbuf = image.tobytes()
@@ -421,14 +436,14 @@ def OnPaint(self, element_type, paint_buffer, **_):
             # Free the surface
             sdl2.SDL_FreeSurface(surface)
         else:
-            print("[pysdl2.py] WARNING: Unsupport element_type in OnPaint")
+            logging.warning("Unsupport element_type in OnPaint")
 
 
 def exit_app():
     """Tidy up SDL2 and CEF before exiting."""
     sdl2.SDL_Quit()
     cef.Shutdown()
-    print("[pysdl2.py] Exited gracefully")
+    logging.info("Exited gracefully")
 
 
 if __name__ == "__main__":

From 8f2298320a75feb0f630268f1e0ff3ec0af45c14 Mon Sep 17 00:00:00 2001
From: Neil Munday <neilmunday@users.noreply.github.com>
Date: Tue, 20 Feb 2018 23:38:48 +0000
Subject: [PATCH 017/238] Tidied up SDL and cef frame rates. Also added
 argparse and logging modules to handle console messages

---
 examples/pysdl2.py | 67 ++++++++++++++++++++++++++++------------------
 1 file changed, 41 insertions(+), 26 deletions(-)

diff --git a/examples/pysdl2.py b/examples/pysdl2.py
index 68af6827..7e3e7603 100644
--- a/examples/pysdl2.py
+++ b/examples/pysdl2.py
@@ -36,33 +36,43 @@
   https://github.com/neilmunday/pes/blob/master/lib/pes/ui.py
 """
 
+import argparse
+import logging
 import sys
+
+def die(msg):
+    """
+    Helper function to exit application on failed imports etc.
+    """
+    sys.stderr.write("%s\n" % msg)
+    sys.exit(1)
+
 try:
     # noinspection PyUnresolvedReferences
     from cefpython3 import cefpython as cef
 except ImportError:
-    print("ERROR: cefpython3 package not found")
-    print("To install type: `pip install cefpython3`")
-    sys.exit(1)
+    die("ERROR: cefpython3 package not found\nTo install type: `pip install cefpython3`")
 try:
     # noinspection PyUnresolvedReferences
     import sdl2
     # noinspection PyUnresolvedReferences
     import sdl2.ext
 except ImportError:
-    print("ERROR: SDL2 package not found")
-    print("To install type: `pip install PySDL2`")
-    sys.exit(1)
+    die("ERROR: SDL2 package not found\nTo install type: `pip install PySDL2`")
 try:
     # noinspection PyUnresolvedReferences
     from PIL import Image
 except ImportError:
-    print("ERROR: PIL package not found")
-    print("To install type: pip install Pillow")
-    sys.exit(1)
-
+    die("ERROR: PIL package not found\nTo install type: pip install Pillow")
 
 def main():
+    parser = argparse.ArgumentParser(description='PySDL2 / cefpython example', add_help=True)
+    parser.add_argument('-v', '--verbose', help='Turn on debug info', dest='verbose', action='store_true')
+    args = parser.parse_args()
+    logLevel = logging.INFO
+    if args.verbose:
+        logLevel = logging.DEBUG
+    logging.basicConfig(format='[%(filename)s %(levelname)s]: %(message)s', level=logLevel)
     # The following variables control the dimensions of the window
     # and browser display area
     width = 800
@@ -75,7 +85,7 @@ def main():
     # Mouse wheel fudge to enhance scrolling
     scrollEnhance = 40
     # desired frame rate
-    frameRate = 60
+    frameRate = 100
     # Initialise CEF for offscreen rendering
     sys.excepthook = cef.ExceptHook
     switches = {
@@ -88,16 +98,18 @@ def main():
     }
     browser_settings = {
         # Tweaking OSR performance (Issue #240)
-        "windowless_frame_rate": 100
+        "windowless_frame_rate": frameRate
     }
     cef.Initialize(settings={"windowless_rendering_enabled": True},
                    switches=switches)
+    logging.debug("cef initialised")
     window_info = cef.WindowInfo()
     window_info.SetAsOffscreen(0)
     # Initialise SDL2 for video (add other init constants if you
     # require other SDL2 functionality e.g. mixer,
     # TTF, joystick etc.
     sdl2.SDL_Init(sdl2.SDL_INIT_VIDEO)
+    logging.debug("SDL2 initialised")
     # Create the window
     window = sdl2.video.SDL_CreateWindow(
         'cefpython3 SDL2 Demo',
@@ -127,8 +139,10 @@ def main():
     # Begin the main rendering loop
     running = True
     # FPS debug variables
-    #frames = 0
-    #lastFrameTick = sdl2.timer.SDL_GetTicks()
+    if logLevel == logging.DEBUG:
+        frames = 0
+        lastFrameTick = sdl2.timer.SDL_GetTicks()
+    logging.debug("beginning rendering loop")
     while running:
         # record when we started drawing this frame
         startTime = sdl2.timer.SDL_GetTicks()
@@ -277,12 +291,13 @@ def main():
         )
         sdl2.SDL_RenderPresent(renderer)
 
-        # FPS debug code - left here for reference
-        #frames += 1
-        #currentTick = sdl2.timer.SDL_GetTicks()
-        #if currentTick - lastFrameTick > 1000:
-        #    lastFrameTick = sdl2.timer.SDL_GetTicks()
-        #    print("FPS %d" % (frames / (currentTick / 1000.0)))
+        # FPS debug code
+        if logLevel == logging.DEBUG:
+            frames += 1
+            currentTick = sdl2.timer.SDL_GetTicks()
+            if currentTick - lastFrameTick > 1000:
+                lastFrameTick = sdl2.timer.SDL_GetTicks()
+                logging.debug("FPS %d" % (frames / (currentTick / 1000.0)))
 
         # regulate frame rate
         if sdl2.timer.SDL_GetTicks() - startTime < 1000.0 / frameRate:
@@ -307,7 +322,7 @@ def get_key_code(key):
     if key in key_map:
         return key_map[key]
     # Key not mapped, raise exception
-    print("[pysdl2.py] Keyboard mapping incomplete:"
+    logging.error("Keyboard mapping incomplete:"
           " unsupported SDL key %d."
           " See https://wiki.libsdl.org/SDLKeycodeLookup for mapping."
           % key)
@@ -319,12 +334,12 @@ class LoadHandler(object):
 
     def OnLoadingStateChange(self, is_loading, **_):
         if not is_loading:
-            print("[pysdl2.py] Page loading complete")
+            logging.info("Page loading complete")
 
     def OnLoadError(self, frame, failed_url, **_):
         if not frame.IsMain():
             return
-        print("[pysdl2.py] Failed to load %s" % failed_url)
+        logging.error("Failed to load %s" % failed_url)
 
 
 class RenderHandler(object):
@@ -396,7 +411,7 @@ def OnPaint(self, element_type, paint_buffer, **_):
                 depth = 32
                 pitch = self.__width * 4
             else:
-                print("[pysdl2.py] ERROR: Unsupported mode: %s" % mode)
+                logging.error("ERROR: Unsupported mode: %s" % mode)
                 exit_app()
 
             pxbuf = image.tobytes()
@@ -421,14 +436,14 @@ def OnPaint(self, element_type, paint_buffer, **_):
             # Free the surface
             sdl2.SDL_FreeSurface(surface)
         else:
-            print("[pysdl2.py] WARNING: Unsupport element_type in OnPaint")
+            logging.warning("Unsupport element_type in OnPaint")
 
 
 def exit_app():
     """Tidy up SDL2 and CEF before exiting."""
     sdl2.SDL_Quit()
     cef.Shutdown()
-    print("[pysdl2.py] Exited gracefully")
+    logging.info("Exited gracefully")
 
 
 if __name__ == "__main__":

From f0d7816ca3f3f6054ca1abb3b0399f7c957cdf2a Mon Sep 17 00:00:00 2001
From: Neil Munday <neilmunday@users.noreply.github.com>
Date: Tue, 20 Feb 2018 23:42:05 +0000
Subject: [PATCH 018/238] Added usage info

---
 examples/pysdl2.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/examples/pysdl2.py b/examples/pysdl2.py
index 7e3e7603..267bdc67 100644
--- a/examples/pysdl2.py
+++ b/examples/pysdl2.py
@@ -6,6 +6,13 @@
 
 Requires PySDL2 and SDL2 libraries.
 
+Usage:
+
+    python pysdl2.py [-v] [-h]
+
+    -v  turn on debug messages
+    -h  display help info
+
 Tested configurations:
 - Windows 7: SDL 2.0.7 and PySDL2 0.9.6
 - Fedora 26: SDL2 2.0.7 with PySDL2 0.9.6

From 0df88177d813f70fbf6a8845da6df408ea27eeb2 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Wed, 21 Feb 2018 21:58:28 +0100
Subject: [PATCH 019/238] Update README-Examples.md - more examples to come

---
 examples/README-examples.md | 45 ++++++++++++++++++++++++++++++++-----
 1 file changed, 39 insertions(+), 6 deletions(-)

diff --git a/examples/README-examples.md b/examples/README-examples.md
index adae5ecd..0f49dabf 100644
--- a/examples/README-examples.md
+++ b/examples/README-examples.md
@@ -3,7 +3,8 @@
 Table of contents:
 * [Hello World!](#hello-world)
 * [Supported examples](#supported-examples)
-* [More examples](#more-examples)
+* [Other examples](#other-examples)
+* [More examples to come](#more-examples-to-come)
 
 ## Hello World!
 
@@ -71,10 +72,11 @@ There are also available unit tests and its usage of the API can
 be of some use. See [main_test.py](../unittests/main_test.py).
 
 
-## More examples
+## Other examples
 
-There are even more examples available, some of them are externally
-maintained.
+There are even more examples available, they do not reside in the examples/
+directory. Some of them were created for old verions of CEF and were not
+yet ported to latest CEF. Some of them are externally maintained.
 
 - Kivy framework:
   see [Kivy](https://github.com/cztomczak/cefpython/wiki/Kivy) wiki page.
@@ -90,5 +92,36 @@ maintained.
 - Example of using Python network library (urllib3/openssl) instead of Chromium's
   network library - see [gist by Massimiliano Dal Cero](https://gist.github.com/yattamax/0252a3c5dc54a2f81650d5c0eafabf99)
 
-There are ongoing efforts to add these examples to the official examples/
-directory, see issues in the tracker.
+## More examples to come
+
+Here is a list of issues in the tracker to implement new examples:
+
+- [Issue #323](../../../issues/323) - "Create cocos2d example"
+- [Issue #322](../../../issues/322) - "Create pyglet example"
+- [Issue #312](../../../issues/312) - "Easy to use CefBrowser widgets
+                                       for many popular GUI toolkits"
+- [Issue #301](../../../issues/301) - "Fix cefpython3.wx package to work
+                                       with latest v55+"
+- [Issue #289](../../../issues/289) - "Pygame / PyOpenGL example"
+- [Issue #288](../../../issues/288) - "Create panda3d_.py example"
+- [Issue #285](../../../issues/285) - "[kivy_.py] Refactor example, make
+                                       it work cross-platform and move it
+                                       to examples/"
+- [Issue #252](../../../issues/252) - "Use CEF views in Hello World, Tutorial
+                                       and Offscreen examples, and in Unit
+                                       tests"
+- [Issue #224](../../../issues/224) - "Port CEF 1 examples to CEF 3"
+- [Issue #109](../../../issues/109) - "The ResourceHandler example"
+
+Packaging examples:
+
+- [Issue #407](../../../issues/407) - "Example of packaging app using
+                                       Cython compiler"
+- [Issue #396](../../../issues/396) - "Example of packaging app using
+                                       Nuitka compiler"
+- [Issue #338](../../../issues/338) - "Example of packaging app using
+                                       cx_Freeze"
+- [Issue #337](../../../issues/337) - "Example of packaging app using
+                                       py2app"
+- [Issue #135](../../../issues/135) - "Example of packaging app using
+                                       pyinstaller"
\ No newline at end of file

From 5119d9d0b03774147299dc71a1dbd04aa33d5671 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Wed, 21 Feb 2018 22:01:32 +0100
Subject: [PATCH 020/238] Update README-Examples.md

---
 examples/README-examples.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/README-examples.md b/examples/README-examples.md
index 0f49dabf..65c73116 100644
--- a/examples/README-examples.md
+++ b/examples/README-examples.md
@@ -94,7 +94,7 @@ yet ported to latest CEF. Some of them are externally maintained.
 
 ## More examples to come
 
-Here is a list of issues in the tracker to implement new examples:
+Here is a list of issues in the tracker to create or upgrade examples:
 
 - [Issue #323](../../../issues/323) - "Create cocos2d example"
 - [Issue #322](../../../issues/322) - "Create pyglet example"

From c46055d120b0b1e9adbf19bda04b1692ef7f1e76 Mon Sep 17 00:00:00 2001
From: Neil Munday <neilmunday@users.noreply.github.com>
Date: Thu, 22 Feb 2018 21:39:18 +0000
Subject: [PATCH 021/238] Fixed: PEP8 conformance, FPS counter and added PySDL2
 and SDL2 version info.

---
 examples/pysdl2.py | 66 ++++++++++++++++++++++++++++++++--------------
 1 file changed, 46 insertions(+), 20 deletions(-)

diff --git a/examples/pysdl2.py b/examples/pysdl2.py
index 267bdc67..ba427399 100644
--- a/examples/pysdl2.py
+++ b/examples/pysdl2.py
@@ -47,6 +47,7 @@
 import logging
 import sys
 
+
 def die(msg):
     """
     Helper function to exit application on failed imports etc.
@@ -54,11 +55,13 @@ def die(msg):
     sys.stderr.write("%s\n" % msg)
     sys.exit(1)
 
+
 try:
     # noinspection PyUnresolvedReferences
     from cefpython3 import cefpython as cef
 except ImportError:
-    die("ERROR: cefpython3 package not found\nTo install type: `pip install cefpython3`")
+    die("""ERROR: cefpython3 package not found\n
+    To install type: `pip install cefpython3`""")
 try:
     # noinspection PyUnresolvedReferences
     import sdl2
@@ -72,14 +75,33 @@ def die(msg):
 except ImportError:
     die("ERROR: PIL package not found\nTo install type: pip install Pillow")
 
+
 def main():
-    parser = argparse.ArgumentParser(description='PySDL2 / cefpython example', add_help=True)
-    parser.add_argument('-v', '--verbose', help='Turn on debug info', dest='verbose', action='store_true')
+    parser = argparse.ArgumentParser(
+        description='PySDL2 / cefpython example',
+        add_help=True
+    )
+    parser.add_argument(
+        '-v',
+        '--verbose',
+        help='Turn on debug info',
+        dest='verbose',
+        action='store_true'
+    )
     args = parser.parse_args()
     logLevel = logging.INFO
     if args.verbose:
         logLevel = logging.DEBUG
-    logging.basicConfig(format='[%(filename)s %(levelname)s]: %(message)s', level=logLevel)
+    logging.basicConfig(
+        format='[%(filename)s %(levelname)s]: %(message)s',
+        level=logLevel
+    )
+    logging.info("Using PySDL2 %s" % sdl2.__version__)
+    version = sdl2.SDL_version()
+    sdl2.SDL_GetVersion(version)
+    logging.info(
+        "Using SDL2 %s.%s.%s" % (version.major, version.minor, version.patch)
+    )
     # The following variables control the dimensions of the window
     # and browser display area
     width = 800
@@ -146,13 +168,16 @@ def main():
     # Begin the main rendering loop
     running = True
     # FPS debug variables
-    if logLevel == logging.DEBUG:
-        frames = 0
-        lastFrameTick = sdl2.timer.SDL_GetTicks()
+    frames = 0
     logging.debug("beginning rendering loop")
+    resetFpsTime = True
+    fpsTime = 0
     while running:
         # record when we started drawing this frame
         startTime = sdl2.timer.SDL_GetTicks()
+        if resetFpsTime:
+            fpsTime = sdl2.timer.SDL_GetTicks()
+            resetFpsTime = False
         # Convert SDL2 events into CEF events (where appropriate)
         events = sdl2.ext.get_events()
         for event in events:
@@ -297,18 +322,17 @@ def main():
             sdl2.SDL_Rect(0, headerHeight, browserWidth, browserHeight)
         )
         sdl2.SDL_RenderPresent(renderer)
-
         # FPS debug code
-        if logLevel == logging.DEBUG:
-            frames += 1
-            currentTick = sdl2.timer.SDL_GetTicks()
-            if currentTick - lastFrameTick > 1000:
-                lastFrameTick = sdl2.timer.SDL_GetTicks()
-                logging.debug("FPS %d" % (frames / (currentTick / 1000.0)))
-
+        frames += 1
+        if sdl2.timer.SDL_GetTicks() - fpsTime > 1000:
+            logging.debug("FPS: %d" % frames)
+            frames = 0
+            resetFpsTime = True
         # regulate frame rate
         if sdl2.timer.SDL_GetTicks() - startTime < 1000.0 / frameRate:
-            sdl2.timer.SDL_Delay((1000 / frameRate) - (sdl2.timer.SDL_GetTicks() - startTime))
+            sdl2.timer.SDL_Delay(
+                (1000 / frameRate) - (sdl2.timer.SDL_GetTicks() - startTime)
+            )
     # User exited
     exit_app()
 
@@ -329,10 +353,12 @@ def get_key_code(key):
     if key in key_map:
         return key_map[key]
     # Key not mapped, raise exception
-    logging.error("Keyboard mapping incomplete:"
-          " unsupported SDL key %d."
-          " See https://wiki.libsdl.org/SDLKeycodeLookup for mapping."
-          % key)
+    logging.error(
+        """
+        Keyboard mapping incomplete: unsupported SDL key %d.
+        See https://wiki.libsdl.org/SDLKeycodeLookup for mapping.
+        """ % key
+    )
     return None
 
 

From 40e37b27d0ffb3436302bb12992f7ccf5525b64d Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Fri, 23 Feb 2018 09:21:03 +0100
Subject: [PATCH 022/238] Update pysdl2.py - initial support for Mac

---
 examples/README-examples.md |  6 +++---
 examples/pysdl2.py          | 25 ++++++++++++++++++++-----
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/examples/README-examples.md b/examples/README-examples.md
index 65c73116..f4000121 100644
--- a/examples/README-examples.md
+++ b/examples/README-examples.md
@@ -45,9 +45,9 @@ workarounds.
 - [gtk3.py](gtk3.py): example for [PyGObject / PyGI](https://wiki.gnome.org/Projects/PyGObject)
   library (GTK 3). Currently broken on Mac ([#310](../../../issues/310)).
 - [pysdl2.py](pysdl2.py): off-screen rendering example for
-  [PySDL2](https://github.com/marcusva/py-sdl2) library. Currently tested
-  and works fine on Linux and Windows. For Mac support and performance
-  tweaking see Issue [#324](../../../issues/324).
+  [PySDL2](https://github.com/marcusva/py-sdl2) library. There are issues
+  when running on slow machine - key events are being lost (noticed on Mac).
+  Example has some issues that are reported in Issue [#324](../../../issues/324).
 - [pywin32.py](pywin32.py): example for [pywin32](https://github.com/mhammond/pywin32)
   library
 - [qt.py](qt.py): example for [PyQt4](https://wiki.python.org/moin/PyQt4),
diff --git a/examples/pysdl2.py b/examples/pysdl2.py
index ba427399..f15a84b9 100644
--- a/examples/pysdl2.py
+++ b/examples/pysdl2.py
@@ -15,6 +15,7 @@
 
 Tested configurations:
 - Windows 7: SDL 2.0.7 and PySDL2 0.9.6
+- Mac 10.9: SDL 2.0.7 and PySDL2 0.9.6
 - Fedora 26: SDL2 2.0.7 with PySDL2 0.9.6
 - Ubuntu 14.04: SDL2 with PySDL2 0.9.6
 
@@ -22,6 +23,8 @@
 1. Install SDL libraries for your OS, e.g:
    - Windows: Download SDL2.dll from http://www.libsdl.org/download-2.0.php
               and put SDL2.dll in C:\Python27\ (where you've installed Python)
+   - Mac: Install Homebrew from https://brew.sh/
+          and then type "brew install sdl2"
    - Fedora: sudo dnf install SDL2 SDL2_ttf SDL2_image SDL2_gfx SDL2_mixer
    - Ubuntu: sudo apt-get install libsdl2-dev
 2. Install PySDL2 using pip package manager:
@@ -60,20 +63,32 @@ def die(msg):
     # noinspection PyUnresolvedReferences
     from cefpython3 import cefpython as cef
 except ImportError:
-    die("""ERROR: cefpython3 package not found\n
-    To install type: `pip install cefpython3`""")
+    die("ERROR: cefpython3 package not found\n"
+        "       To install type: pip install cefpython3")
+
 try:
     # noinspection PyUnresolvedReferences
     import sdl2
     # noinspection PyUnresolvedReferences
     import sdl2.ext
-except ImportError:
-    die("ERROR: SDL2 package not found\nTo install type: `pip install PySDL2`")
+except ImportError as exc:
+    excstr = repr(exc)
+    if "No module named sdl2" in excstr:
+        die("ERROR: PySDL2 package not found\n"
+            "       To install type: pip install PySDL2")
+    elif ("could not find any library for SDL2"
+          " (PYSDL2_DLL_PATH: unset)" in excstr):
+        die("ERROR: SDL2 package not found.\n"
+            "       See install instructions in top comment in sources.")
+    else:
+        die(excstr)
+
 try:
     # noinspection PyUnresolvedReferences
     from PIL import Image
 except ImportError:
-    die("ERROR: PIL package not found\nTo install type: pip install Pillow")
+    die("ERROR: PIL package not found\n"
+        "       To install type: pip install Pillow")
 
 
 def main():

From 64532e76fc3087e0f0a07772416b6195d839a9b5 Mon Sep 17 00:00:00 2001
From: Czarek Tomczak <cztomczak@users.noreply.github.com>
Date: Fri, 23 Feb 2018 09:44:52 +0100
Subject: [PATCH 023/238] Update pysdl2.py - known issues on Mac

---
 examples/pysdl2.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/examples/pysdl2.py b/examples/pysdl2.py
index f15a84b9..0ece5e12 100644
--- a/examples/pysdl2.py
+++ b/examples/pysdl2.py
@@ -1,10 +1,11 @@
 """
 Example of embedding CEF browser using PySDL2 library.
 
-This example is incomplete, see "Missing functionality" section
-further down. Pull requests for the missing functionality are welcome.
+Requires PySDL2 and SDL2 libraries, see install instructions further
+down.
 
-Requires PySDL2 and SDL2 libraries.
+This example is incomplete and has some issues, see the "Known issues"
+section further down. Pull requests with fixes are welcome.
 
 Usage:
 
@@ -30,11 +31,14 @@
 2. Install PySDL2 using pip package manager:
    pip install PySDL2
 
-Missing functionality:
+Known issues (pull requests are welcome):
+- There are issues when running on slow machine - key events are being
+  lost (noticed on Mac only), see Issue #324 for more details
 - Performance is still not perfect, see Issue #324 for further details
 - Keyboard modifiers that are not yet handled in this example:
   ctrl, marking text inputs with the shift key.
-- Mouse dragging
+- Backspace key doesn't work on Mac
+- Dragging with mouse not implemented
 - Window size is fixed, cannot be resized
 
 GUI controls:

From 04f5eb93f2b2e0e8c31371467a3584faed7f8d98 Mon Sep 17 00:00:00 2001
From: Czarek Tomczak <cztomczak@users.noreply.github.com>
Date: Fri, 23 Feb 2018 09:49:40 +0100
Subject: [PATCH 024/238] Update README-examples.md

---
 examples/README-examples.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/examples/README-examples.md b/examples/README-examples.md
index f4000121..8517e4ef 100644
--- a/examples/README-examples.md
+++ b/examples/README-examples.md
@@ -45,9 +45,8 @@ workarounds.
 - [gtk3.py](gtk3.py): example for [PyGObject / PyGI](https://wiki.gnome.org/Projects/PyGObject)
   library (GTK 3). Currently broken on Mac ([#310](../../../issues/310)).
 - [pysdl2.py](pysdl2.py): off-screen rendering example for
-  [PySDL2](https://github.com/marcusva/py-sdl2) library. There are issues
-  when running on slow machine - key events are being lost (noticed on Mac).
-  Example has some issues that are reported in Issue [#324](../../../issues/324).
+  [PySDL2](https://github.com/marcusva/py-sdl2) library. Example has some
+  issues that are reported in Issue [#324](../../../issues/324).
 - [pywin32.py](pywin32.py): example for [pywin32](https://github.com/mhammond/pywin32)
   library
 - [qt.py](qt.py): example for [PyQt4](https://wiki.python.org/moin/PyQt4),
@@ -124,4 +123,4 @@ Packaging examples:
 - [Issue #337](../../../issues/337) - "Example of packaging app using
                                        py2app"
 - [Issue #135](../../../issues/135) - "Example of packaging app using
-                                       pyinstaller"
\ No newline at end of file
+                                       pyinstaller"

From beebbbed9467d8470e54441844a86d0945ad0771 Mon Sep 17 00:00:00 2001
From: Neil Munday <neilmunday@users.noreply.github.com>
Date: Sun, 25 Feb 2018 11:34:04 +0000
Subject: [PATCH 025/238] Added debug statements for key presses

---
 examples/pysdl2.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/examples/pysdl2.py b/examples/pysdl2.py
index 0ece5e12..231a2866 100644
--- a/examples/pysdl2.py
+++ b/examples/pysdl2.py
@@ -257,6 +257,7 @@ def main():
                     "unmodified_character": keycode,
                     "modifiers": cef.EVENTFLAG_NONE
                 }
+                logging.debug("sending browser keyevent \"char\": %s" % event.text.text)
                 browser.SendKeyEvent(key_event)
                 key_event = {
                     "type": cef.KEYEVENT_KEYUP,
@@ -265,6 +266,7 @@ def main():
                     "unmodified_character": keycode,
                     "modifiers": cef.EVENTFLAG_NONE
                 }
+                logging.debug("sending browser key event \"up\": %s" % event.text.text)
                 browser.SendKeyEvent(key_event)
             elif event.type == sdl2.SDL_KEYDOWN:
                 # Handle key down events for non-text keys

From 9b6b157713b5f48e0f5a340b4ddd59dc55d0c252 Mon Sep 17 00:00:00 2001
From: Neil Munday <neilmunday@users.noreply.github.com>
Date: Sun, 25 Feb 2018 21:32:13 +0000
Subject: [PATCH 026/238] Added debugging to all SDL2 events

---
 examples/pysdl2.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/examples/pysdl2.py b/examples/pysdl2.py
index 231a2866..8da17bcc 100644
--- a/examples/pysdl2.py
+++ b/examples/pysdl2.py
@@ -204,10 +204,14 @@ def main():
                 or (event.type == sdl2.SDL_KEYDOWN
                     and event.key.keysym.sym == sdl2.SDLK_ESCAPE)):
                 running = False
+                logging.debug("SDL2 QUIT event")
                 break
             if event.type == sdl2.SDL_MOUSEBUTTONDOWN:
                 if event.button.button == sdl2.SDL_BUTTON_LEFT:
                     if event.button.y > headerHeight:
+                        logging.debug(
+                            "SDL2 MOUSEBUTTONDOWN event (left button)"
+                        )
                         # Mouse click triggered in browser region
                         browser.SendMouseClickEvent(
                             event.button.x,
@@ -219,6 +223,7 @@ def main():
             elif event.type == sdl2.SDL_MOUSEBUTTONUP:
                 if event.button.button == sdl2.SDL_BUTTON_LEFT:
                     if event.button.y > headerHeight:
+                        logging.debug("SDL2 MOUSEBUTTONUP event (left button)")
                         # Mouse click triggered in browser region
                         browser.SendMouseClickEvent(
                             event.button.x,
@@ -234,6 +239,7 @@ def main():
                                                event.motion.y - headerHeight,
                                                False)
             elif event.type == sdl2.SDL_MOUSEWHEEL:
+                logging.debug("SDL2 MOUSEWHEEL event")
                 # Mouse wheel event
                 x = event.wheel.x
                 if x < 0:
@@ -249,6 +255,7 @@ def main():
             elif event.type == sdl2.SDL_TEXTINPUT:
                 # Handle text events to get actual characters typed rather
                 # than the key pressed.
+                logging.debug("SDL2 TEXTINPUT event: %s" % event.text.text)
                 keycode = ord(event.text.text)
                 key_event = {
                     "type": cef.KEYEVENT_CHAR,
@@ -257,7 +264,6 @@ def main():
                     "unmodified_character": keycode,
                     "modifiers": cef.EVENTFLAG_NONE
                 }
-                logging.debug("sending browser keyevent \"char\": %s" % event.text.text)
                 browser.SendKeyEvent(key_event)
                 key_event = {
                     "type": cef.KEYEVENT_KEYUP,
@@ -266,10 +272,10 @@ def main():
                     "unmodified_character": keycode,
                     "modifiers": cef.EVENTFLAG_NONE
                 }
-                logging.debug("sending browser key event \"up\": %s" % event.text.text)
                 browser.SendKeyEvent(key_event)
             elif event.type == sdl2.SDL_KEYDOWN:
                 # Handle key down events for non-text keys
+                logging.debug("SDL2 KEYDOWN event")
                 if event.key.keysym.sym == sdl2.SDLK_RETURN:
                     keycode = event.key.keysym.sym
                     key_event = {
@@ -302,6 +308,7 @@ def main():
                         browser.SendKeyEvent(key_event)
             elif event.type == sdl2.SDL_KEYUP:
                 # Handle key up events for non-text keys
+                logging.debug("SDL2 KEYUP event")
                 if event.key.keysym.sym in [
                         sdl2.SDLK_RETURN,
                         sdl2.SDLK_BACKSPACE,

From 9b0a8b0921c3b6b2d6d8b82fcf90c0bfa2240d38 Mon Sep 17 00:00:00 2001
From: Neil Munday <neilmunday@users.noreply.github.com>
Date: Wed, 28 Feb 2018 23:50:28 +0000
Subject: [PATCH 027/238] Added ability for the user to select from hardware or
 software renderering

---
 examples/pysdl2.py | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/examples/pysdl2.py b/examples/pysdl2.py
index 8da17bcc..2863aaa8 100644
--- a/examples/pysdl2.py
+++ b/examples/pysdl2.py
@@ -9,9 +9,10 @@
 
 Usage:
 
-    python pysdl2.py [-v] [-h]
+    python pysdl2.py [-v] [-h] [-r {software|hardware}]
 
     -v  turn on debug messages
+    -r  specify hardware or software (default) rendering
     -h  display help info
 
 Tested configurations:
@@ -107,6 +108,14 @@ def main():
         dest='verbose',
         action='store_true'
     )
+    parser.add_argument(
+        '-r',
+        '--renderer',
+        help='Specify hardware or software rendering',
+        default='software',
+        dest='renderer',
+        choices=['software', 'hardware']
+    )
     args = parser.parse_args()
     logLevel = logging.INFO
     if args.verbose:
@@ -169,9 +178,23 @@ def main():
     )
     # Define default background colour (black in this case)
     backgroundColour = sdl2.SDL_Color(0, 0, 0)
-    # Create the renderer using hardware acceleration
-    renderer = sdl2.SDL_CreateRenderer(window, -1,
-                                       sdl2.render.SDL_RENDERER_ACCELERATED)
+    renderer = None
+    if args.renderer == 'hardware':
+        # Create the renderer using hardware acceleration
+        logging.info("Using hardware rendering")
+        renderer = sdl2.SDL_CreateRenderer(
+            window,
+            -1,
+            sdl2.render.SDL_RENDERER_ACCELERATED
+        )
+    else:
+        # Create the renderer using software acceleration
+        logging.info("Using software rendering")
+        renderer = sdl2.SDL_CreateRenderer(
+            window,
+            -1,
+            sdl2.render.SDL_RENDERER_SOFTWARE
+        )
     # Set-up the RenderHandler, passing in the SDL2 renderer
     renderHandler = RenderHandler(renderer, width, height - headerHeight)
     # Create the browser instance

From da50a9294abffe3e74c4c0651018ae5f597c66ce Mon Sep 17 00:00:00 2001
From: Neil Munday <neilmunday@users.noreply.github.com>
Date: Sat, 3 Mar 2018 09:16:28 +0000
Subject: [PATCH 028/238] Changed default renderer to hardware

---
 examples/pysdl2.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/pysdl2.py b/examples/pysdl2.py
index 2863aaa8..74bc5423 100644
--- a/examples/pysdl2.py
+++ b/examples/pysdl2.py
@@ -12,7 +12,7 @@
     python pysdl2.py [-v] [-h] [-r {software|hardware}]
 
     -v  turn on debug messages
-    -r  specify hardware or software (default) rendering
+    -r  specify hardware (default) or software rendering
     -h  display help info
 
 Tested configurations:
@@ -112,7 +112,7 @@ def main():
         '-r',
         '--renderer',
         help='Specify hardware or software rendering',
-        default='software',
+        default='hardware',
         dest='renderer',
         choices=['software', 'hardware']
     )

From 836f88ddeb60932990dd91418b72a9b24eb67fb0 Mon Sep 17 00:00:00 2001
From: Czarek Tomczak <cztomczak@users.noreply.github.com>
Date: Fri, 9 Mar 2018 10:10:36 +0100
Subject: [PATCH 029/238] Update README - Sponsors section

---
 README.md | 62 ++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 39 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index 25f04808..d2873954 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 Table of contents:
 * [Introduction](#introduction)
-* [Major sponsors](#major-sponsors)
+* [Sponsors](#Sponsors)
 * [Funding for v64.0 release](#funding-for-v640-release)
 * [Install](#install)
 * [Tutorial](#tutorial)
@@ -39,32 +39,48 @@ applications. You can use it for web scraping or as a web crawler,
 or other kind of internet bots.
 
 
-## Major sponsors
-
-<a href="http://www.blueplanet.com/">
-<img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/cyan.png">
-</a>
-<br>
-
-<a href="https://clearchat.com/">
-<img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/clearchat.png">
-</a>
-<br>
-
-<a href="http://www.rentouch.ch/">
-<img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/rentouch.png">
-</a>
-<br>
-
-<a href="https://www.jetbrains.com/pycharm/">
-<img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/pycharm.png">
-</a>
-<br>
-<br>
+## Sponsors
+
+<table>
+ <tr>
+  <td>
+   <a href="http://www.blueplanet.com/">
+    <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/cyan.png">
+   </a><br>
+   <a href="http://www.blueplanet.com/">www.blueplanet.com</a>
+  </td>
+  <td>
+   <a href="https://clearchat.com/">
+    <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/clearchat.png">
+   </a><br>
+   <a href="https://clearchat.com/">clearchat.com</a>
+  </td>
+  <td>
+   <a href="http://www.rentouch.ch/">
+    <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/rentouch.png">
+   </a><br>
+   <a href="http://www.rentouch.ch/">www.rentouch.ch</a>
+  </td>
+  <td>
+   <a href="https://www.jetbrains.com/pycharm/">
+    <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/pycharm.png">
+   </a><br>
+   <a href="https://www.jetbrains.com/pycharm/">www.jetbrains.com/pycharm/</a>
+  </td>
+ <tr>
+</table>
 
 See the [Support development](#support-development) section for a list of
 all the individuals and companies supporting CEF Python.
 
+If you would like to sponsor CEF Python development efforts and see your company
+logo with a link here, please contact Czarek (contact details are available in his
+[Resume](https://drive.google.com/file/d/17xmoT5Z_zTHkVclqPzrs2aAV64Uiu7fh/view)).
+This README page alone has 1,070 visitors and 2,402 views every two weeks,
+so your company logo and a website link will be visible to many Python developers.
+The statistics are from Mar 9, 2018. Complete statistics are available in this topic
+on the Forum: [[ANN] Call for sponsors](https://groups.google.com/d/topic/cefpython/CjkZF2P4rMk/discussion).
+
 
 ## Funding for v64.0 release
 

From de6e99cbfe6269fbc13b4a093899c49e12eb9a4d Mon Sep 17 00:00:00 2001
From: Czarek Tomczak <cztomczak@users.noreply.github.com>
Date: Fri, 9 Mar 2018 10:16:34 +0100
Subject: [PATCH 030/238] Update README.md - styling

---
 README.md | 40 ++++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index d2873954..eabffd05 100644
--- a/README.md
+++ b/README.md
@@ -44,28 +44,36 @@ or other kind of internet bots.
 <table>
  <tr>
   <td>
-   <a href="http://www.blueplanet.com/">
-    <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/cyan.png">
-   </a><br>
-   <a href="http://www.blueplanet.com/">www.blueplanet.com</a>
+   <div align="center">
+    <a href="http://www.blueplanet.com/">
+     <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/cyan.png">
+    </a><br>
+    <a href="http://www.blueplanet.com/">www.blueplanet.com</a>
+   </div>
   </td>
   <td>
-   <a href="https://clearchat.com/">
-    <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/clearchat.png">
-   </a><br>
-   <a href="https://clearchat.com/">clearchat.com</a>
+   <div align="center">
+    <a href="https://clearchat.com/">
+     <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/clearchat.png">
+    </a><br>
+    <a href="https://clearchat.com/">clearchat.com</a>
+   <div align="center">
   </td>
   <td>
-   <a href="http://www.rentouch.ch/">
-    <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/rentouch.png">
-   </a><br>
-   <a href="http://www.rentouch.ch/">www.rentouch.ch</a>
+   <div align="center">
+    <a href="http://www.rentouch.ch/">
+     <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/rentouch.png">
+    </a><br>
+    <a href="http://www.rentouch.ch/">www.rentouch.ch</a>
+   </div>
   </td>
   <td>
-   <a href="https://www.jetbrains.com/pycharm/">
-    <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/pycharm.png">
-   </a><br>
-   <a href="https://www.jetbrains.com/pycharm/">www.jetbrains.com/pycharm/</a>
+   <div align="center">
+    <a href="https://www.jetbrains.com/pycharm/">
+     <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/pycharm.png">
+    </a><br>
+    <a href="https://www.jetbrains.com/pycharm/">www.jetbrains.com/pycharm/</a>
+   </div>
   </td>
  <tr>
 </table>

From bbf3597ba47f72db66cf304ab8eb3ccfc3a7130c Mon Sep 17 00:00:00 2001
From: Czarek Tomczak <cztomczak@users.noreply.github.com>
Date: Fri, 9 Mar 2018 10:21:26 +0100
Subject: [PATCH 031/238] Update README - fix link

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index eabffd05..c1d162ad 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 Table of contents:
 * [Introduction](#introduction)
-* [Sponsors](#Sponsors)
+* [Sponsors](#sponsors)
 * [Funding for v64.0 release](#funding-for-v640-release)
 * [Install](#install)
 * [Tutorial](#tutorial)

From 25c0968fb5d79b64001ad1c412861d736c6677a6 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Tue, 22 May 2018 16:31:08 +0200
Subject: [PATCH 032/238] Update README. Lampix is sponsoring the v66 release
 of cefpython.

---
 README.md | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index c1d162ad..a4264edd 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 Table of contents:
 * [Introduction](#introduction)
 * [Sponsors](#sponsors)
-* [Funding for v64.0 release](#funding-for-v640-release)
+* [Funding for v66.0 release](#funding-for-v660-release)
 * [Install](#install)
 * [Tutorial](#tutorial)
 * [Examples](#examples)
@@ -43,6 +43,14 @@ or other kind of internet bots.
 
 <table>
  <tr>
+  <td>
+   <div align="center">
+    <a href="https://lampix.com/">
+     <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/lampix200.png">
+    </a><br>
+    <a href="https://lampix.com/">www.lampix.com</a>
+   </div>
+  </td>
   <td>
    <div align="center">
     <a href="http://www.blueplanet.com/">
@@ -56,9 +64,11 @@ or other kind of internet bots.
     <a href="https://clearchat.com/">
      <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/clearchat.png">
     </a><br>
-    <a href="https://clearchat.com/">clearchat.com</a>
+    <a href="https://clearchat.com/">www.clearchat.com</a>
    <div align="center">
   </td>
+ </tr>
+ <tr>
   <td>
    <div align="center">
     <a href="http://www.rentouch.ch/">
@@ -72,7 +82,7 @@ or other kind of internet bots.
     <a href="https://www.jetbrains.com/pycharm/">
      <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/pycharm.png">
     </a><br>
-    <a href="https://www.jetbrains.com/pycharm/">www.jetbrains.com/pycharm/</a>
+    <a href="https://www.jetbrains.com/pycharm/">www.jetbrains.com</a>
    </div>
   </td>
  <tr>
@@ -90,11 +100,14 @@ The statistics are from Mar 9, 2018. Complete statistics are available in this t
 on the Forum: [[ANN] Call for sponsors](https://groups.google.com/d/topic/cefpython/CjkZF2P4rMk/discussion).
 
 
-## Funding for v64.0 release
+## Funding for v66.0 release
 
-For those interested in sponsoring a v64.0 release please see
-[Issue #370](../../issues/370).
+I am happy to announce that Lampix is sponsoring the v66 release of cefpython.
+Lampix is the first hardware and software solution that turns any surface
+into a smart, augmented reality or interactive surface. Please visit its
+website here: https://lampix.com/
 
+[![lampix600](https://user-images.githubusercontent.com/1187415/40367671-40fecd4e-5dda-11e8-8ef9-1e3d91298c8a.jpg)](https://lampix.com/)
 
 ## Install
 

From 9d7ebe52f40f8f03563d622b0abd3c8702e9ac9c Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Tue, 22 May 2018 19:51:30 +0200
Subject: [PATCH 033/238] Update automate-git.py from upstream

---
 tools/automate-git.py | 1044 ++++++++++++++++++++++++++++++-----------
 1 file changed, 771 insertions(+), 273 deletions(-)

diff --git a/tools/automate-git.py b/tools/automate-git.py
index 9b3db231..4f247930 100644
--- a/tools/automate-git.py
+++ b/tools/automate-git.py
@@ -1,104 +1,19 @@
-""" See automate.py. This script is for internal usage only, don't
-call it directly. This is a modified copy of automate-git.py from
-upstream CEF.
-
-Some modifications were applied for CEF Python specific use case.
-There is a patch file with the same name as this script that contains
-differences from the original file.
-
--------------------------------------------------------------------------------
-
-Usage: automate-git.py [options]
-
- This utility implements automation for the download, update, build and
-distribution of CEF.
-
-Options:
-  -h, --help            show this help message and exit
-  --download-dir=DIR    Download directory with no spaces [required].
-  --depot-tools-dir=DIR
-                        Download directory for depot_tools.
-  --depot-tools-archive=DEPOTTOOLSARCHIVE
-                        Zip archive file that contains a single top-level
-                        depot_tools directory.
-  --branch=BRANCH       Branch of CEF to build (trunk, 1916, ...). This will
-                        be used to name the CEF download directory and to
-                        identify the correct URL if --url is not specified.
-                        The default value is trunk.
-  --url=URL             CEF download URL. If not specified the default URL
-                        will be used.
-  --chromium-url=CHROMIUMURL
-                        Chromium download URL. If not specified the default
-                        URL will be used.
-  --checkout=CHECKOUT   Version of CEF to checkout. If not specified the most
-                        recent remote version of the branch will be used.
-  --chromium-checkout=CHROMIUMCHECKOUT
-                        Version of Chromium to checkout (Git branch/hash/tag).
-                        This overrides the value specified by CEF in
-                        CHROMIUM_BUILD_COMPATIBILITY.txt.
-  --force-config        Force creation of a new gclient config file.
-  --force-clean         Force a clean checkout of Chromium and CEF. This will
-                        trigger a new update, build and distribution.
-  --force-clean-deps    Force a clean checkout of Chromium dependencies. Used
-                        in combination with --force-clean.
-  --dry-run             Output commands without executing them.
-  --dry-run-platform=DRYRUNPLATFORM
-                        Simulate a dry run on the specified platform (windows,
-                        macosx, linux). Must be used in combination with the
-                        --dry-run flag.
-  --force-update        Force a Chromium and CEF update. This will trigger a
-                        new build and distribution.
-  --no-update           Do not update Chromium or CEF. Pass --force-build or
-                        --force-distrib if you desire a new build or
-                        distribution.
-  --no-cef-update       Do not update CEF. Pass --force-build or --force-
-                        distrib if you desire a new build or distribution.
-  --no-chromium-update  Do not update Chromium.
-  --no-depot-tools-update
-                        Do not update depot_tools.
-  --force-build         Force CEF debug and release builds. This builds
-                        [build-target] on all platforms and chrome_sandbox on
-                        Linux.
-  --no-build            Do not build CEF.
-  --build-target=BUILDTARGET
-                        Target name(s) to build (defaults to "cefclient").
-  --build-tests         Also build the cef_unittests target.
-  --no-debug-build      Don't perform the CEF debug build.
-  --no-release-build    Don't perform the CEF release build.
-  --verbose-build       Show all command lines while building.
-  --build-log-file      Write build logs to file. The file will be named
-                        "build-[branch]-[debug|release].log" in the download
-                        directory.
-  --x64-build           Create a 64-bit build.
-  --arm-build           Create an ARM build.
-  --force-distrib       Force creation of a CEF binary distribution.
-  --no-distrib          Don't create a CEF binary distribution.
-  --minimal-distrib     Create a minimal CEF binary distribution.
-  --minimal-distrib-only
-                        Create a minimal CEF binary distribution only.
-  --client-distrib      Create a client CEF binary distribution.
-  --client-distrib-only
-                        Create a client CEF binary distribution only.
-  --no-distrib-docs     Don't create CEF documentation.
-  --no-distrib-archive  Don't create archives for output directories.
-  --clean-artifacts     Clean the artifacts output directory.
-  --distrib-subdir=DISTRIBSUBDIR
-                        CEF distrib dir name, child of
-                        chromium/src/cef/binary_distrib
-"""
-
 # Copyright (c) 2014 The Chromium Embedded Framework Authors. All rights
 # reserved. Use of this source code is governed by a BSD-style license that
 # can be found in the LICENSE file.
 
+from datetime import datetime
+import json
 from optparse import OptionParser
 import os
+import re
 import shlex
 import shutil
 import subprocess
 import sys
 import tempfile
 import urllib
+import urllib2
 import zipfile
 
 ##
@@ -110,6 +25,7 @@
 
 cef_git_url = 'https://bitbucket.org/chromiumembedded/cef.git'
 
+chromium_channel_json_url = 'https://omahaproxy.appspot.com/all.json'
 
 ##
 # Global system variables.
@@ -118,21 +34,22 @@
 # Script directory.
 script_dir = os.path.dirname(__file__)
 
-
 ##
 # Helper functions.
 ##
 
+
 def msg(message):
   """ Output a message. """
   sys.stdout.write('--> ' + message + "\n")
 
+
 def run(command_line, working_dir, depot_tools_dir=None, output_file=None):
   """ Runs the specified command. """
   # add depot_tools to the path
   env = os.environ
   if not depot_tools_dir is None:
-    env['PATH'] = depot_tools_dir+os.pathsep+env['PATH']
+    env['PATH'] = depot_tools_dir + os.pathsep + env['PATH']
 
   sys.stdout.write('-------- Running "'+command_line+'" in "'+\
                    working_dir+'"...'+"\n")
@@ -140,27 +57,39 @@ def run(command_line, working_dir, depot_tools_dir=None, output_file=None):
     args = shlex.split(command_line.replace('\\', '\\\\'))
 
     if not output_file:
-      return subprocess.check_call(args, cwd=working_dir, env=env,
-                                 shell=(sys.platform == 'win32'))
-    with open(output_file, "w") as f:
-      return subprocess.check_call(args, cwd=working_dir, env=env,
-                                 shell=(sys.platform == 'win32'),
-                                 stderr=subprocess.STDOUT, stdout=f)
+      return subprocess.check_call(
+          args, cwd=working_dir, env=env, shell=(sys.platform == 'win32'))
+    try:
+      msg('Writing %s' % output_file)
+      with open(output_file, "w") as f:
+        return subprocess.check_call(
+            args,
+            cwd=working_dir,
+            env=env,
+            shell=(sys.platform == 'win32'),
+            stderr=subprocess.STDOUT,
+            stdout=f)
+    except subprocess.CalledProcessError:
+      msg('ERROR Run failed. See %s for output.' % output_file)
+      raise
+
 
 def create_directory(path):
   """ Creates a directory if it doesn't already exist. """
   if not os.path.exists(path):
-    msg("Creating directory %s" % (path));
+    msg("Creating directory %s" % (path))
     if not options.dryrun:
       os.makedirs(path)
 
+
 def delete_directory(path):
   """ Removes an existing directory. """
   if os.path.exists(path):
-    msg("Removing directory %s" % (path));
+    msg("Removing directory %s" % (path))
     if not options.dryrun:
       shutil.rmtree(path, onerror=onerror)
 
+
 def copy_directory(source, target, allow_overwrite=False):
   """ Copies a directory from source to target. """
   if not options.dryrun and os.path.exists(target):
@@ -168,10 +97,11 @@ def copy_directory(source, target, allow_overwrite=False):
       raise Exception("Directory %s already exists" % (target))
     remove_directory(target)
   if os.path.exists(source):
-    msg("Copying directory %s to %s" % (source, target));
+    msg("Copying directory %s to %s" % (source, target))
     if not options.dryrun:
       shutil.copytree(source, target)
 
+
 def move_directory(source, target, allow_overwrite=False):
   """ Copies a directory from source to target. """
   if not options.dryrun and os.path.exists(target):
@@ -179,14 +109,16 @@ def move_directory(source, target, allow_overwrite=False):
       raise Exception("Directory %s already exists" % (target))
     remove_directory(target)
   if os.path.exists(source):
-    msg("Moving directory %s to %s" % (source, target));
+    msg("Moving directory %s to %s" % (source, target))
     if not options.dryrun:
       shutil.move(source, target)
 
+
 def is_git_checkout(path):
   """ Returns true if the path represents a git checkout. """
   return os.path.exists(os.path.join(path, '.git'))
 
+
 def exec_cmd(cmd, path):
   """ Execute the specified command and return the result. """
   out = ''
@@ -194,10 +126,12 @@ def exec_cmd(cmd, path):
   sys.stdout.write("-------- Running \"%s\" in \"%s\"...\n" % (cmd, path))
   parts = cmd.split()
   try:
-    process = subprocess.Popen(parts, cwd=path,
-                               stdout=subprocess.PIPE,
-                               stderr=subprocess.PIPE,
-                               shell=(sys.platform == 'win32'))
+    process = subprocess.Popen(
+        parts,
+        cwd=path,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+        shell=(sys.platform == 'win32'))
     out, err = process.communicate()
   except IOError, (errno, strerror):
     raise
@@ -205,6 +139,7 @@ def exec_cmd(cmd, path):
     raise
   return {'out': out, 'err': err}
 
+
 def get_git_hash(path, branch):
   """ Returns the git hash for the specified branch/tag/hash. """
   cmd = "%s rev-parse %s" % (git_exe, branch)
@@ -213,6 +148,17 @@ def get_git_hash(path, branch):
     return result['out'].strip()
   return 'Unknown'
 
+
+def get_git_date(path, branch):
+  """ Returns the date for the specified branch/tag/hash. """
+  cmd = "%s show -s --format=%%ct %s" % (git_exe, branch)
+  result = exec_cmd(cmd, path)
+  if result['out'] != '':
+    return datetime.utcfromtimestamp(
+        int(result['out'].strip())).strftime('%Y-%m-%d %H:%M:%S UTC')
+  return 'Unknown'
+
+
 def get_git_url(path):
   """ Returns the origin url for the specified path. """
   cmd = "%s config --get remote.origin.url" % (git_exe)
@@ -221,6 +167,7 @@ def get_git_url(path):
     return result['out'].strip()
   return 'Unknown'
 
+
 def download_and_extract(src, target):
   """ Extracts the contents of src, which may be a URL or local file, to the
       target directory. """
@@ -232,7 +179,7 @@ def download_and_extract(src, target):
     response = opener.open(src)
 
     temporary = True
-    handle, archive_path = tempfile.mkstemp(suffix = '.zip')
+    handle, archive_path = tempfile.mkstemp(suffix='.zip')
     os.write(handle, response.read())
     os.close(handle)
   elif os.path.exists(src):
@@ -258,6 +205,7 @@ def download_and_extract(src, target):
   if temporary and os.path.exists(archive_path):
     os.remove(archive_path)
 
+
 def read_file(path):
   """ Read a file. """
   if os.path.exists(path):
@@ -268,11 +216,13 @@ def read_file(path):
   else:
     raise Exception("Path does not exist: %s" % (path))
 
+
 def read_config_file(path):
   """ Read a configuration file. """
   # Parse the contents.
   return eval(read_file(path), {'__builtins__': None}, None)
 
+
 def write_config_file(path, contents):
   """ Write a configuration file. """
   msg('Writing file: %s' % path)
@@ -284,6 +234,7 @@ def write_config_file(path, contents):
     fp.write("}\n")
     fp.close()
 
+
 def read_branch_config_file(path):
   """ Read the CEF branch from the specified path. """
   config_file = os.path.join(path, 'cef.branch')
@@ -293,12 +244,14 @@ def read_branch_config_file(path):
       return contents['branch']
   return ''
 
+
 def write_branch_config_file(path, branch):
   """ Write the CEF branch to the specified path. """
   config_file = os.path.join(path, 'cef.branch')
   if not os.path.isfile(config_file):
     write_config_file(config_file, {'branch': branch})
 
+
 def remove_deps_entry(path, entry):
   """ Remove an entry from the Chromium DEPS file at the specified path. """
   msg('Updating DEPS file: %s' % path)
@@ -322,6 +275,7 @@ def remove_deps_entry(path, entry):
       fp.write(line)
     fp.close()
 
+
 def apply_deps_patch():
   """ Patch the Chromium DEPS file if necessary. """
   # Starting with 43.0.2357.126 the DEPS file is now 100% Git and the .DEPS.git
@@ -335,13 +289,13 @@ def apply_deps_patch():
 
   if os.path.isfile(deps_path):
     msg("Chromium DEPS file: %s" % (deps_path))
-    patch_file = os.path.join(cef_dir, 'patch', 'patches', deps_file + '.patch')
-    if os.path.exists(patch_file):
+    patch_file = os.path.join(cef_dir, 'patch', 'patches', deps_file)
+    if os.path.exists(patch_file + ".patch"):
       # Attempt to apply the DEPS patch file that may exist with newer branches.
       patch_tool = os.path.join(cef_dir, 'tools', 'patcher.py')
       run('%s %s --patch-file "%s" --patch-dir "%s"' %
-              (python_exe, patch_tool, patch_file, chromium_src_dir),
-          chromium_src_dir, depot_tools_dir)
+          (python_exe, patch_tool, patch_file,
+           chromium_src_dir), chromium_src_dir, depot_tools_dir)
     elif cef_branch != 'trunk' and int(cef_branch) <= 1916:
       # Release branch DEPS files older than 37.0.2007.0 may include a 'src'
       # entry. This entry needs to be removed otherwise `gclient sync` will
@@ -350,6 +304,16 @@ def apply_deps_patch():
   else:
     raise Exception("Path does not exist: %s" % (deps_path))
 
+
+def run_patch_updater(args='', output_file=None):
+  """ Run the patch updater script. """
+  tool = os.path.join(cef_src_dir, 'tools', 'patch_updater.py')
+  if len(args) > 0:
+    args = ' ' + args
+  run('%s %s%s' % (python_exe, tool, args), cef_src_dir, depot_tools_dir,
+      output_file)
+
+
 def onerror(func, path, exc_info):
   """
   Error handler for ``shutil.rmtree``.
@@ -370,6 +334,274 @@ def onerror(func, path, exc_info):
     raise
 
 
+def read_json_url(url):
+  """ Read a JSON URL. """
+  msg('Downloading %s' % url)
+  response = urllib2.urlopen(url)
+  return json.loads(response.read())
+
+
+g_channel_data = None
+
+
+def get_chromium_channel_data(os, channel, param=None):
+  """ Returns all data for the specified Chromium channel. """
+  global g_channel_data
+
+  if g_channel_data is None:
+    g_channel_data = read_json_url(chromium_channel_json_url)
+    assert len(g_channel_data) > 0, 'Failed to load Chromium channel data'
+
+  for oses in g_channel_data:
+    if oses['os'] == os:
+      for version in oses['versions']:
+        if version['channel'] == channel:
+          assert version['os'] == os
+          assert version['channel'] == channel
+          if param is None:
+            return version
+          else:
+            assert param in version, 'Missing parameter %s for Chromium channel %s %s' % (
+                param, os, channel)
+            return version[param]
+      raise Exception("Invalid Chromium channel value: %s" % channel)
+  raise Exception("Invalid Chromium os value: %s" % os)
+
+
+def get_chromium_channel_commit(os, channel):
+  """ Returns the current branch commit for the specified Chromium channel. """
+  return get_chromium_channel_data(os, channel, 'branch_commit')
+
+
+def get_chromium_channel_version(os, channel):
+  """ Returns the current version for the specified Chromium channel. """
+  return get_chromium_channel_data(os, channel, 'current_version')
+
+
+def get_chromium_master_position(commit):
+  """ Returns the closest master position for the specified Chromium commit. """
+  # Using -2 because a "Publish DEPS" commit which does not have a master
+  # position may be first.
+  cmd = "%s log -2 %s" % (git_exe, commit)
+  result = exec_cmd(cmd, chromium_src_dir)
+  if result['out'] != '':
+    match = re.search(r'refs/heads/master@{#([\d]+)}', result['out'])
+    assert match != None, 'Failed to find position'
+    return int(match.groups()[0])
+  return None
+
+
+def get_chromium_master_commit(position):
+  """ Returns the master commit for the specified Chromium commit position. """
+  cmd = '%s log -1 --grep=refs/heads/master@{#%s} origin/master' % (
+      git_exe, str(position))
+  result = exec_cmd(cmd, chromium_src_dir)
+  if result['out'] != '':
+    match = re.search(r'^commit ([a-f0-9]+)', result['out'])
+    assert match != None, 'Failed to find commit'
+    return match.groups()[0]
+  return None
+
+
+def get_chromium_versions(commit):
+  """ Returns the list of Chromium versions that contain the specified commit.
+      Versions are listed oldest to newest. """
+  cmd = '%s tag --contains %s' % (git_exe, commit)
+  result = exec_cmd(cmd, chromium_src_dir)
+  if result['out'] != '':
+    return [line.strip() for line in result['out'].strip().split('\n')]
+  return None
+
+
+def get_chromium_compat_version():
+  """ Returns the compatible Chromium version specified by the CEF checkout. """
+  compat_path = os.path.join(cef_dir, 'CHROMIUM_BUILD_COMPATIBILITY.txt')
+  msg("Reading %s" % compat_path)
+  config = read_config_file(compat_path)
+
+  if 'chromium_checkout' in config:
+    return config['chromium_checkout']
+  raise Exception("Missing chromium_checkout value in %s" % (compat_path))
+
+
+def get_chromium_target_version(os='win', channel='canary', target_distance=0):
+  """ Returns the target Chromium version based on a heuristic. """
+  # The current compatible version from CEF.
+  compat_version = chromium_compat_version
+  compat_commit = get_git_hash(chromium_src_dir, compat_version)
+  if compat_version == compat_commit:
+    versions = get_chromium_versions(compat_commit)
+    if len(versions) > 0:
+      compat_version = 'refs/tags/' + versions[0]
+      # Closest version may not align with the compat position, so adjust the
+      # commit to match.
+      compat_commit = get_git_hash(chromium_src_dir, compat_version)
+  compat_position = get_chromium_master_position(compat_commit)
+  compat_date = get_git_date(chromium_src_dir, compat_commit)
+
+  # The most recent channel version from the Chromium website.
+  channel_version = 'refs/tags/' + get_chromium_channel_version(os, channel)
+  channel_commit = get_chromium_channel_commit(os, channel)
+  channel_position = get_chromium_master_position(channel_commit)
+  channel_date = get_git_date(chromium_src_dir, channel_commit)
+
+  if compat_position >= channel_position:
+    # Already compatible with the channel version or newer.
+    target_version = compat_version
+    target_commit = compat_commit
+    target_position = compat_position
+    target_date = compat_date
+  elif target_distance <= 0 or compat_position + target_distance >= channel_position:
+    # Channel version is within the target distance.
+    target_version = channel_version
+    target_commit = channel_commit
+    target_position = channel_position
+    target_date = channel_date
+  else:
+    # Find an intermediary version that's within the target distance.
+    target_position = compat_position + target_distance
+    target_commit = get_chromium_master_commit(target_position)
+    versions = get_chromium_versions(target_commit)
+    if len(versions) > 0:
+      target_version = 'refs/tags/' + versions[0]
+      # Closest version may not align with the target position, so adjust the
+      # commit and position to match.
+      target_commit = get_git_hash(chromium_src_dir, target_version)
+      target_position = get_chromium_master_position(target_commit)
+    else:
+      target_version = target_commit
+    target_date = get_git_date(chromium_src_dir, target_commit)
+
+  msg("")
+  msg("Computed Chromium update for %s %s at distance %d" % (os, channel,
+                                                             target_distance))
+  msg("Compat:  %s %s %s (#%d)" % (compat_date, compat_version, compat_commit,
+                                   compat_position))
+  msg("Target:  %s %s %s (#%d)" % (target_date, target_version, target_commit,
+                                   target_position))
+  msg("Channel: %s %s %s (#%d)" % (channel_date, channel_version,
+                                   channel_commit, channel_position))
+  msg("")
+
+  return target_version
+
+
+def get_build_directory_name(is_debug):
+  build_dir = ('Debug' if is_debug else 'Release') + '_'
+  if use_gn:
+    # CEF uses a consistent directory naming scheme for GN via
+    # GetAllPlatformConfigs in tools/gn_args.py.
+    if options.x64build:
+      build_dir += 'GN_x64'
+    elif options.armbuild:
+      build_dir += 'GN_arm'
+    else:
+      build_dir += 'GN_x86'
+  else:
+    # GYP outputs both x86 and x64 builds to the same directory on Linux and
+    # Mac OS X. On Windows it suffixes the directory name for x64 builds.
+    if platform == 'windows' and options.x64build:
+      build_dir += 'x64'
+  return build_dir
+
+
+def read_update_file():
+  update_path = os.path.join(cef_src_dir, 'CHROMIUM_UPDATE.txt')
+  if not os.path.exists(update_path):
+    msg("Missing file: %s" % update_path)
+    return None
+
+  msg("Reading %s" % update_path)
+  return read_config_file(update_path)
+
+
+def log_chromium_changes():
+  """ Evaluate the Chromium checkout for changes. """
+  config = read_update_file()
+  if config is None:
+    msg("Skipping Chromium changes log.")
+    return
+
+  if 'files' in config:
+    out_file = os.path.join(download_dir, 'chromium_update_changes.diff')
+    if os.path.exists(out_file):
+      os.remove(out_file)
+
+    old_commit = get_chromium_master_commit(
+        get_chromium_master_position(chromium_compat_version))
+    new_commit = get_chromium_master_commit(
+        get_chromium_master_position(chromium_checkout))
+
+    cmd = '%s diff --relative --no-prefix %s..%s -- %s' % (
+        git_exe, old_commit, new_commit, ' '.join(config['files']))
+    result = exec_cmd(cmd, chromium_src_dir)
+    if result['out'] != '':
+      msg('Writing %s' % out_file)
+      with open(out_file, 'w') as fp:
+        fp.write(result['out'])
+
+
+def check_pattern_matches(output_file=None):
+  """ Evaluate the Chromium checkout for pattern matches. """
+  config = read_update_file()
+  if config is None:
+    msg("Skipping Chromium pattern matching.")
+    return
+
+  if 'patterns' in config:
+    if output_file is None:
+      fp = sys.stdout
+    else:
+      msg('Writing %s' % output_file)
+      fp = open(output_file, 'w')
+
+    has_output = False
+    for entry in config['patterns']:
+      msg("Evaluating pattern: %s" % entry['pattern'])
+
+      # Read patterns from a file to avoid formatting problems.
+      pattern_handle, pattern_file = tempfile.mkstemp()
+      os.write(pattern_handle, entry['pattern'])
+      os.close(pattern_handle)
+
+      cmd = '%s grep -n -f %s' % (git_exe, pattern_file)
+      result = exec_cmd(cmd, chromium_src_dir)
+      os.remove(pattern_file)
+
+      if result['out'] != '':
+        write_msg = True
+        re_exclude = re.compile(
+            entry['exclude_matches']) if 'exclude_matches' in entry else None
+
+        for line in result['out'].split('\n'):
+          line = line.strip()
+          if len(line) == 0:
+            continue
+          skip = not re_exclude is None and re_exclude.match(line) != None
+          if not skip:
+            if write_msg:
+              if has_output:
+                fp.write('\n')
+              fp.write('!!!! WARNING: FOUND PATTERN: %s\n' % entry['pattern'])
+              if 'message' in entry:
+                fp.write(entry['message'] + '\n')
+              fp.write('\n')
+              write_msg = False
+            fp.write(line + '\n')
+            has_output = True
+
+    if not output_file is None:
+      if has_output:
+        msg('ERROR Matches found. See %s for output.' % out_file)
+      else:
+        fp.write('Good news! No matches.\n')
+      fp.close()
+
+    if has_output:
+      # Don't continue when we know the build will be wrong.
+      sys.exit(1)
+
+
 ##
 # Program entry point.
 ##
@@ -388,10 +620,17 @@ def onerror(func, path, exc_info):
 parser = OptionParser(description=disc)
 
 # Setup options.
-parser.add_option('--download-dir', dest='downloaddir', metavar='DIR',
-                  help='Download directory with no spaces [required].')
-parser.add_option('--depot-tools-dir', dest='depottoolsdir', metavar='DIR',
-                  help='Download directory for depot_tools.', default='')
+parser.add_option(
+    '--download-dir',
+    dest='downloaddir',
+    metavar='DIR',
+    help='Download directory with no spaces [required].')
+parser.add_option(
+    '--depot-tools-dir',
+    dest='depottoolsdir',
+    metavar='DIR',
+    help='Download directory for depot_tools.',
+    default='')
 parser.add_option('--depot-tools-archive', dest='depottoolsarchive',
                   help='Zip archive file that contains a single top-level '+\
                        'depot_tools directory.', default='')
@@ -418,11 +657,24 @@ def onerror(func, path, exc_info):
                        'branch/hash/tag). This overrides the value specified '+\
                        'by CEF in CHROMIUM_BUILD_COMPATIBILITY.txt.',
                   default='')
+parser.add_option('--chromium-channel', dest='chromiumchannel',
+                  help='Chromium channel to check out (canary, dev, beta or '+\
+                       'stable). This overrides the value specified by CEF '+\
+                       'in CHROMIUM_BUILD_COMPATIBILITY.txt.',
+                  default='')
+parser.add_option('--chromium-channel-distance', dest='chromiumchanneldistance',
+                  help='The target number of commits to step in the '+\
+                       'channel, or 0 to use the newest channel version. '+\
+                       'Used in combination with --chromium-channel.',
+                  default='')
 
 # Miscellaneous options.
-parser.add_option('--force-config',
-                  action='store_true', dest='forceconfig', default=False,
-                  help='Force creation of a new gclient config file.')
+parser.add_option(
+    '--force-config',
+    action='store_true',
+    dest='forceconfig',
+    default=False,
+    help='Force creation of a new gclient config file.')
 parser.add_option('--force-clean',
                   action='store_true', dest='forceclean', default=False,
                   help='Force a clean checkout of Chromium and CEF. This will'+\
@@ -431,9 +683,12 @@ def onerror(func, path, exc_info):
                   action='store_true', dest='forcecleandeps', default=False,
                   help='Force a clean checkout of Chromium dependencies. Used'+\
                        ' in combination with --force-clean.')
-parser.add_option('--dry-run',
-                  action='store_true', dest='dryrun', default=False,
-                  help="Output commands without executing them.")
+parser.add_option(
+    '--dry-run',
+    action='store_true',
+    dest='dryrun',
+    default=False,
+    help="Output commands without executing them.")
 parser.add_option('--dry-run-platform', dest='dryrunplatform', default=None,
                   help='Simulate a dry run on the specified platform '+\
                        '(windows, macosx, linux). Must be used in combination'+\
@@ -454,12 +709,47 @@ def onerror(func, path, exc_info):
                   help='Do not update CEF. Pass --force-build or '+\
                        '--force-distrib if you desire a new build or '+\
                        'distribution.')
-parser.add_option('--no-chromium-update',
-                  action='store_true', dest='nochromiumupdate', default=False,
-                  help='Do not update Chromium.')
-parser.add_option('--no-depot-tools-update',
-                  action='store_true', dest='nodepottoolsupdate', default=False,
-                  help='Do not update depot_tools.')
+parser.add_option('--force-cef-update',
+                  action='store_true', dest='forcecefupdate', default=False,
+                  help='Force a CEF update. This will cause local changes in '+\
+                       'the CEF checkout to be discarded and patch files to '+\
+                       'be reapplied.')
+parser.add_option(
+    '--no-chromium-update',
+    action='store_true',
+    dest='nochromiumupdate',
+    default=False,
+    help='Do not update Chromium.')
+parser.add_option(
+    '--no-depot-tools-update',
+    action='store_true',
+    dest='nodepottoolsupdate',
+    default=False,
+    help='Do not update depot_tools.')
+parser.add_option('--fast-update',
+                  action='store_true', dest='fastupdate', default=False,
+                  help='Update existing Chromium/CEF checkouts for fast incremental '+\
+                       'builds by attempting to minimize the number of modified files. '+\
+                       'The update will fail if there are unstaged CEF changes or if '+\
+                       'Chromium changes are not included in a patch file.')
+parser.add_option(
+    '--force-patch-update',
+    action='store_true',
+    dest='forcepatchupdate',
+    default=False,
+    help='Force update of patch files.')
+parser.add_option(
+    '--resave',
+    action='store_true',
+    dest='resave',
+    default=False,
+    help='Resave patch files.')
+parser.add_option(
+    '--log-chromium-changes',
+    action='store_true',
+    dest='logchromiumchanges',
+    default=False,
+    help='Create a log of the Chromium changes.')
 
 # Build-related options.
 parser.add_option('--force-build',
@@ -467,63 +757,167 @@ def onerror(func, path, exc_info):
                   help='Force CEF debug and release builds. This builds '+\
                        '[build-target] on all platforms and chrome_sandbox '+\
                        'on Linux.')
-parser.add_option('--no-build',
-                  action='store_true', dest='nobuild', default=False,
-                  help='Do not build CEF.')
-parser.add_option('--build-target', dest='buildtarget', default='cefclient',
-                  help='Target name(s) to build (defaults to "cefclient").')
-parser.add_option('--build-tests',
-                  action='store_true', dest='buildtests', default=False,
-                  help='Also build the cef_unittests target.')
-parser.add_option('--no-debug-build',
-                  action='store_true', dest='nodebugbuild', default=False,
-                  help="Don't perform the CEF debug build.")
-parser.add_option('--no-release-build',
-                  action='store_true', dest='noreleasebuild', default=False,
-                  help="Don't perform the CEF release build.")
-parser.add_option('--verbose-build',
-                  action='store_true', dest='verbosebuild', default=False,
-                  help='Show all command lines while building.')
+parser.add_option(
+    '--no-build',
+    action='store_true',
+    dest='nobuild',
+    default=False,
+    help='Do not build CEF.')
+parser.add_option(
+    '--build-target',
+    dest='buildtarget',
+    default='cefclient',
+    help='Target name(s) to build (defaults to "cefclient").')
+parser.add_option(
+    '--build-tests',
+    action='store_true',
+    dest='buildtests',
+    default=False,
+    help='Also build the test target specified via --test-target.')
+parser.add_option(
+    '--no-debug-build',
+    action='store_true',
+    dest='nodebugbuild',
+    default=False,
+    help="Don't perform the CEF debug build.")
+parser.add_option(
+    '--no-release-build',
+    action='store_true',
+    dest='noreleasebuild',
+    default=False,
+    help="Don't perform the CEF release build.")
+parser.add_option(
+    '--verbose-build',
+    action='store_true',
+    dest='verbosebuild',
+    default=False,
+    help='Show all command lines while building.')
+parser.add_option(
+    '--build-failure-limit',
+    dest='buildfailurelimit',
+    default=1,
+    type="int",
+    help='Keep going until N jobs fail.')
 parser.add_option('--build-log-file',
                   action='store_true', dest='buildlogfile', default=False,
                   help='Write build logs to file. The file will be named '+\
                        '"build-[branch]-[debug|release].log" in the download '+\
                        'directory.')
-parser.add_option('--x64-build',
-                  action='store_true', dest='x64build', default=False,
-                  help='Create a 64-bit build.')
-parser.add_option('--arm-build',
-                  action='store_true', dest='armbuild', default=False,
-                  help='Create an ARM build.')
+parser.add_option(
+    '--x64-build',
+    action='store_true',
+    dest='x64build',
+    default=False,
+    help='Create a 64-bit build.')
+parser.add_option(
+    '--arm-build',
+    action='store_true',
+    dest='armbuild',
+    default=False,
+    help='Create an ARM build.')
+
+# Test-related options.
+parser.add_option(
+    '--run-tests',
+    action='store_true',
+    dest='runtests',
+    default=False,
+    help='Run the ceftests target.')
+parser.add_option(
+    '--no-debug-tests',
+    action='store_true',
+    dest='nodebugtests',
+    default=False,
+    help="Don't run debug build tests.")
+parser.add_option(
+    '--no-release-tests',
+    action='store_true',
+    dest='noreleasetests',
+    default=False,
+    help="Don't run release build tests.")
+parser.add_option(
+    '--test-target',
+    dest='testtarget',
+    default='ceftests',
+    help='Test target name to build (defaults to "ceftests").')
+parser.add_option(
+    '--test-prefix',
+    dest='testprefix',
+    default='',
+    help='Prefix for running the test executable (e.g. `xvfb-run` on Linux).')
+parser.add_option(
+    '--test-args',
+    dest='testargs',
+    default='',
+    help='Arguments that will be passed to the test executable.')
 
 # Distribution-related options.
-parser.add_option('--force-distrib',
-                  action='store_true', dest='forcedistrib', default=False,
-                  help='Force creation of a CEF binary distribution.')
-parser.add_option('--no-distrib',
-                  action='store_true', dest='nodistrib', default=False,
-                  help="Don't create a CEF binary distribution.")
-parser.add_option('--minimal-distrib',
-                  action='store_true', dest='minimaldistrib', default=False,
-                  help='Create a minimal CEF binary distribution.')
-parser.add_option('--minimal-distrib-only',
-                  action='store_true', dest='minimaldistribonly', default=False,
-                  help='Create a minimal CEF binary distribution only.')
-parser.add_option('--client-distrib',
-                  action='store_true', dest='clientdistrib', default=False,
-                  help='Create a client CEF binary distribution.')
-parser.add_option('--client-distrib-only',
-                  action='store_true', dest='clientdistribonly', default=False,
-                  help='Create a client CEF binary distribution only.')
-parser.add_option('--no-distrib-docs',
-                  action='store_true', dest='nodistribdocs', default=False,
-                  help="Don't create CEF documentation.")
-parser.add_option('--no-distrib-archive',
-                  action='store_true', dest='nodistribarchive', default=False,
-                  help="Don't create archives for output directories.")
-parser.add_option('--clean-artifacts',
-                  action='store_true', dest='cleanartifacts', default=False,
-                  help='Clean the artifacts output directory.')
+parser.add_option(
+    '--force-distrib',
+    action='store_true',
+    dest='forcedistrib',
+    default=False,
+    help='Force creation of a CEF binary distribution.')
+parser.add_option(
+    '--no-distrib',
+    action='store_true',
+    dest='nodistrib',
+    default=False,
+    help="Don't create a CEF binary distribution.")
+parser.add_option(
+    '--minimal-distrib',
+    action='store_true',
+    dest='minimaldistrib',
+    default=False,
+    help='Create a minimal CEF binary distribution.')
+parser.add_option(
+    '--minimal-distrib-only',
+    action='store_true',
+    dest='minimaldistribonly',
+    default=False,
+    help='Create a minimal CEF binary distribution only.')
+parser.add_option(
+    '--client-distrib',
+    action='store_true',
+    dest='clientdistrib',
+    default=False,
+    help='Create a client CEF binary distribution.')
+parser.add_option(
+    '--client-distrib-only',
+    action='store_true',
+    dest='clientdistribonly',
+    default=False,
+    help='Create a client CEF binary distribution only.')
+parser.add_option(
+    '--sandbox-distrib',
+    action='store_true',
+    dest='sandboxdistrib',
+    default=False,
+    help='Create a cef_sandbox static library distribution.')
+parser.add_option(
+    '--sandbox-distrib-only',
+    action='store_true',
+    dest='sandboxdistribonly',
+    default=False,
+    help='Create a cef_sandbox static library distribution only.')
+parser.add_option(
+    '--no-distrib-docs',
+    action='store_true',
+    dest='nodistribdocs',
+    default=False,
+    help="Don't create CEF documentation.")
+parser.add_option(
+    '--no-distrib-archive',
+    action='store_true',
+    dest='nodistribarchive',
+    default=False,
+    help="Don't create archives for output directories.")
+parser.add_option(
+    '--clean-artifacts',
+    action='store_true',
+    dest='cleanartifacts',
+    default=False,
+    help='Clean the artifacts output directory.')
 parser.add_option('--distrib-subdir', dest='distribsubdir',
                   help='CEF distrib dir name, child of '+\
                        'chromium/src/cef/binary_distrib',
@@ -542,23 +936,23 @@ def onerror(func, path, exc_info):
   options.nochromiumupdate = True
   options.nodepottoolsupdate = True
 
+if options.runtests:
+  options.buildtests = True
+
 if (options.nochromiumupdate and options.forceupdate) or \
    (options.nocefupdate and options.forceupdate) or \
    (options.nobuild and options.forcebuild) or \
-   (options.nodistrib and options.forcedistrib):
-  # -- CEF Python modification below
-  if (options.nocefupdate and options.forceupdate):
-    pass
-  else:
-    print "Invalid combination of options."
-    parser.print_help(sys.stderr)
-    sys.exit()
-  # --
+   (options.nodistrib and options.forcedistrib) or \
+   ((options.forceclean or options.forcecleandeps) and options.fastupdate) or \
+   (options.chromiumcheckout and options.chromiumchannel):
+  print "Invalid combination of options."
+  parser.print_help(sys.stderr)
+  sys.exit()
 
 if (options.noreleasebuild and \
      (options.minimaldistrib or options.minimaldistribonly or \
       options.clientdistrib or options.clientdistribonly)) or \
-   (options.minimaldistribonly and options.clientdistribonly):
+   (options.minimaldistribonly + options.clientdistribonly + options.sandboxdistribonly > 1):
   print 'Invalid combination of options.'
   parser.print_help(sys.stderr)
   sys.exit()
@@ -568,6 +962,11 @@ def onerror(func, path, exc_info):
   parser.print_help(sys.stderr)
   sys.exit()
 
+if (options.buildtests or options.runtests) and len(options.testtarget) == 0:
+  print "A test target must be specified via --test-target."
+  parser.print_help(sys.stderr)
+  sys.exit()
+
 # Operating system.
 if options.dryrun and options.dryrunplatform is not None:
   platform = options.dryrunplatform
@@ -601,13 +1000,20 @@ def onerror(func, path, exc_info):
     parser.print_help(sys.stderr)
     sys.exit()
 
+if platform != 'windows' and (options.sandboxdistrib or
+                              options.sandboxdistribonly):
+  print 'The sandbox distribution is only supported on Windows.'
+  sys.exit()
+
 # CEF branch.
 if options.branch != 'trunk' and not options.branch.isdigit():
   print 'Invalid branch value: %s' % (options.branch)
+  sys.exit()
+
 cef_branch = options.branch
 
 if cef_branch != 'trunk' and int(cef_branch) <= 1453:
-  print 'The requested branch is too old to build using this tool'
+  print 'The requested branch is too old to build using this tool.'
   sys.exit()
 
 # True if the requested branch is 2272 or newer.
@@ -674,22 +1080,38 @@ def onerror(func, path, exc_info):
 # Options that force the sources to change.
 force_change = options.forceclean or options.forceupdate
 
+# Options that cause local changes to be discarded.
+discard_local_changes = force_change or options.forcecefupdate
+
+if options.resave and (options.forcepatchupdate or discard_local_changes):
+  print '--resave cannot be combined with options that modify or discard patches.'
+  parser.print_help(sys.stderr)
+  sys.exit()
+
 if platform == 'windows':
   # Avoid errors when the "vs_toolchain.py update" Chromium hook runs.
   os.environ['DEPOT_TOOLS_WIN_TOOLCHAIN'] = '0'
 
+download_dir = os.path.abspath(options.downloaddir)
+chromium_dir = os.path.join(download_dir, 'chromium')
+chromium_src_dir = os.path.join(chromium_dir, 'src')
+out_src_dir = os.path.join(chromium_src_dir, 'out')
+cef_src_dir = os.path.join(chromium_src_dir, 'cef')
+
+if options.fastupdate and os.path.exists(cef_src_dir):
+  cef_dir = cef_src_dir
+else:
+  cef_dir = os.path.join(download_dir, 'cef')
 
 ##
 # Manage the download directory.
 ##
 
 # Create the download directory if necessary.
-download_dir = os.path.abspath(options.downloaddir)
 create_directory(download_dir)
 
 msg("Download Directory: %s" % (download_dir))
 
-
 ##
 # Manage the depot_tools directory.
 ##
@@ -716,16 +1138,16 @@ def onerror(func, path, exc_info):
       download_and_extract(options.depottoolsarchive, depot_tools_dir)
   else:
     # On Linux and OS X check out depot_tools using Git.
-    run('git clone '+depot_tools_url+' '+depot_tools_dir, download_dir)
+    run('git clone ' + depot_tools_url + ' ' + depot_tools_dir, download_dir)
 
 if not options.nodepottoolsupdate:
   # Update depot_tools.
   # On Windows this will download required python and git binaries.
   msg('Updating depot_tools')
   if platform == 'windows':
-    run('update_depot_tools.bat', depot_tools_dir, depot_tools_dir);
+    run('update_depot_tools.bat', depot_tools_dir, depot_tools_dir)
   else:
-    run('update_depot_tools', depot_tools_dir, depot_tools_dir);
+    run('update_depot_tools', depot_tools_dir, depot_tools_dir)
 
 # Determine the executables to use.
 if platform == 'windows':
@@ -742,13 +1164,10 @@ def onerror(func, path, exc_info):
   git_exe = 'git'
   python_exe = 'python'
 
-
 ##
 # Manage the cef directory.
 ##
 
-cef_dir = os.path.join(download_dir, 'cef')
-
 # Delete the existing CEF directory if requested.
 if options.forceclean and os.path.exists(cef_dir):
   delete_directory(cef_dir)
@@ -788,35 +1207,40 @@ def onerror(func, path, exc_info):
 # Create the CEF checkout if necessary.
 if not options.nocefupdate and not os.path.exists(cef_dir):
   cef_checkout_new = True
-  run('%s clone %s %s' % (git_exe, cef_url, cef_dir), download_dir, \
+  run('%s clone %s %s' % (git_exe, cef_url, cef_dir), download_dir,
       depot_tools_dir)
 else:
   cef_checkout_new = False
 
-# Update the CEF checkout if necessary.
+# Determine if the CEF checkout needs to change.
 if not options.nocefupdate and os.path.exists(cef_dir):
   cef_current_hash = get_git_hash(cef_dir, 'HEAD')
 
   if not cef_checkout_new:
-    # Fetch new sources.
+    # Fetch updated sources.
     run('%s fetch' % (git_exe), cef_dir, depot_tools_dir)
 
   cef_desired_hash = get_git_hash(cef_dir, cef_checkout)
   cef_checkout_changed = cef_checkout_new or force_change or \
+                         options.forcecefupdate or \
                          cef_current_hash != cef_desired_hash
 
   msg("CEF Current Checkout: %s" % (cef_current_hash))
   msg("CEF Desired Checkout: %s (%s)" % (cef_desired_hash, cef_checkout))
 
   if cef_checkout_changed:
-    # Checkout the requested branch.
+    if cef_dir == cef_src_dir:
+      # Running in fast update mode. Backup and revert the patched files before
+      # changing the CEF checkout.
+      run_patch_updater("--backup --revert")
+
+    # Update the CEF checkout.
     run('%s checkout %s%s' %
-      (git_exe, ('--force ' if options.forceclean else ''), cef_checkout), \
+      (git_exe, '--force ' if discard_local_changes else '', cef_checkout), \
       cef_dir, depot_tools_dir)
 else:
   cef_checkout_changed = False
 
-
 ##
 # Manage the out directory.
 ##
@@ -829,21 +1253,15 @@ def onerror(func, path, exc_info):
 
 msg("CEF Output Directory: %s" % (out_dir))
 
-
 ##
 # Manage the chromium directory.
 ##
 
 # Create the chromium directory if necessary.
-chromium_dir = os.path.join(download_dir, 'chromium')
 create_directory(chromium_dir)
 
-chromium_src_dir = os.path.join(chromium_dir, 'src')
-cef_src_dir = os.path.join(chromium_src_dir, 'cef')
-out_src_dir = os.path.join(chromium_src_dir, 'out')
-
 if options.chromiumurl != '':
-  chromium_url = options.chromiumurl;
+  chromium_url = options.chromiumurl
 else:
   chromium_url = 'https://chromium.googlesource.com/chromium/src.git'
 
@@ -883,8 +1301,8 @@ def onerror(func, path, exc_info):
 # Initial Chromium checkout.
 if not options.nochromiumupdate and not os.path.exists(chromium_src_dir):
   chromium_checkout_new = True
-  run("gclient sync --nohooks --with_branch_heads --jobs 16", chromium_dir, \
-      depot_tools_dir)
+  run("gclient sync --nohooks --with_branch_heads --disable-syntax-validation --jobs 16", \
+      chromium_dir, depot_tools_dir)
 else:
   chromium_checkout_new = False
 
@@ -895,18 +1313,25 @@ def onerror(func, path, exc_info):
 if os.path.exists(chromium_src_dir):
   msg("Chromium URL: %s" % (get_git_url(chromium_src_dir)))
 
-# Determine the Chromium checkout options required by CEF.
-if options.chromiumcheckout == '':
-  # Read the build compatibility file to identify the checkout name.
-  compat_path = os.path.join(cef_dir, 'CHROMIUM_BUILD_COMPATIBILITY.txt')
-  config = read_config_file(compat_path)
+# Fetch Chromium changes so that we can perform the necessary calculations using
+# local history.
+if not options.nochromiumupdate and os.path.exists(chromium_src_dir):
+  # Fetch updated sources.
+  run("%s fetch" % (git_exe), chromium_src_dir, depot_tools_dir)
+  # Also fetch tags, which are required for release branch builds.
+  run("%s fetch --tags" % (git_exe), chromium_src_dir, depot_tools_dir)
 
-  if 'chromium_checkout' in config:
-    chromium_checkout = config['chromium_checkout']
-  else:
-    raise Exception("Missing chromium_checkout value in %s" % (compat_path))
-else:
+# Determine the Chromium checkout options required by CEF.
+chromium_compat_version = get_chromium_compat_version()
+if len(options.chromiumcheckout) > 0:
   chromium_checkout = options.chromiumcheckout
+elif len(options.chromiumchannel) > 0:
+  target_distance = int(options.chromiumchanneldistance
+                       ) if len(options.chromiumchanneldistance) > 0 else 0
+  chromium_checkout = get_chromium_target_version(
+      channel=options.chromiumchannel, target_distance=target_distance)
+else:
+  chromium_checkout = chromium_compat_version
 
 # Determine if the Chromium checkout needs to change.
 if not options.nochromiumupdate and os.path.exists(chromium_src_dir):
@@ -921,10 +1346,15 @@ def onerror(func, path, exc_info):
 else:
   chromium_checkout_changed = options.dryrun
 
-# Delete the existing src/cef directory. It will be re-copied from the download
-# directory later.
-if cef_checkout_changed and os.path.exists(cef_src_dir):
-  delete_directory(cef_src_dir)  
+if cef_checkout_changed:
+  if cef_dir != cef_src_dir and os.path.exists(cef_src_dir):
+    # Delete the existing src/cef directory. It will be re-copied from the
+    # download directory later.
+    delete_directory(cef_src_dir)
+elif chromium_checkout_changed and cef_dir == cef_src_dir:
+  # Running in fast update mode. Backup and revert the patched files before
+  # changing the Chromium checkout.
+  run_patch_updater("--backup --revert")
 
 # Delete the existing src/out directory if requested.
 if options.forceclean and os.path.exists(out_src_dir):
@@ -934,14 +1364,14 @@ def onerror(func, path, exc_info):
 # directory. It will be moved back from the download directory later.
 if os.path.exists(out_src_dir):
   old_branch = read_branch_config_file(out_src_dir)
-  if old_branch != '' and (chromium_checkout_changed or \
+  if old_branch != '' and (chromium_checkout_changed or
                            old_branch != cef_branch):
     old_out_dir = os.path.join(download_dir, 'out_' + old_branch)
     move_directory(out_src_dir, old_out_dir)
 
 # Update the Chromium checkout.
 if chromium_checkout_changed:
-  if not chromium_checkout_new:
+  if not chromium_checkout_new and not options.fastupdate:
     if options.forceclean and options.forcecleandeps:
       # Remove all local changes including third-party git checkouts managed by
       # gclient.
@@ -950,14 +1380,9 @@ def onerror(func, path, exc_info):
       # Revert all changes in the Chromium checkout.
       run("gclient revert --nohooks", chromium_dir, depot_tools_dir)
 
-  # Fetch new sources.
-  run("%s fetch" % (git_exe), chromium_src_dir, depot_tools_dir)
-  # Also fetch tags, which are required for release branch builds.
-  run("%s fetch --tags" % (git_exe), chromium_src_dir, depot_tools_dir)
-
   # Checkout the requested branch.
   run("%s checkout %s%s" % \
-    (git_exe, ('--force ' if options.forceclean else ''), chromium_checkout), \
+    (git_exe, '--force ' if discard_local_changes else '', chromium_checkout), \
     chromium_src_dir, depot_tools_dir)
 
   # Patch the Chromium DEPS file if necessary.
@@ -968,9 +1393,8 @@ def onerror(func, path, exc_info):
   os.environ['GYP_CHROMIUM_NO_ACTION'] = '1'
 
   # Update third-party dependencies including branch/tag information.
-  run("gclient sync %s--with_branch_heads --jobs 16" % \
-      (('--reset ' if options.forceclean else '')), \
-      chromium_dir, depot_tools_dir)
+  run("gclient sync %s--with_branch_heads --disable-syntax-validation --jobs 16" % \
+      ('--reset ' if discard_local_changes else ''), chromium_dir, depot_tools_dir)
 
   # Clear the GYP_CHROMIUM_NO_ACTION value.
   del os.environ['GYP_CHROMIUM_NO_ACTION']
@@ -978,8 +1402,13 @@ def onerror(func, path, exc_info):
   # Delete the src/out directory created by `gclient sync`.
   delete_directory(out_src_dir)
 
-# Restore the src/cef directory.
-if os.path.exists(cef_dir) and not os.path.exists(cef_src_dir):
+if cef_dir == cef_src_dir:
+  # Running in fast update mode.
+  if cef_checkout_changed or chromium_checkout_changed:
+    # Check and restore the patched files.
+    run_patch_updater("--reapply --restore")
+elif os.path.exists(cef_dir) and not os.path.exists(cef_src_dir):
+  # Restore the src/cef directory.
   copy_directory(cef_dir, cef_src_dir)
 
 # Restore the src/out directory.
@@ -993,6 +1422,32 @@ def onerror(func, path, exc_info):
 # Write the config file for identifying the branch.
 write_branch_config_file(out_src_dir, cef_branch)
 
+if options.logchromiumchanges and chromium_checkout != chromium_compat_version:
+  log_chromium_changes()
+
+if options.forcepatchupdate or ((chromium_checkout_new or not options.fastupdate) and \
+                                chromium_checkout_changed and \
+                                chromium_checkout != chromium_compat_version):
+  # Not using the known-compatible Chromium version. Try to update patch files.
+  if options.logchromiumchanges:
+    out_file = os.path.join(download_dir, 'chromium_update_patches.txt')
+    if os.path.exists(out_file):
+      os.remove(out_file)
+  else:
+    out_file = None
+  run_patch_updater(output_file=out_file)
+elif options.resave:
+  # Resave patch files.
+  run_patch_updater("--resave")
+
+if chromium_checkout != chromium_compat_version:
+  if options.logchromiumchanges:
+    out_file = os.path.join(download_dir, 'chromium_update_patterns.txt')
+    if os.path.exists(out_file):
+      os.remove(out_file)
+  else:
+    out_file = None
+  check_pattern_matches(output_file=out_file)
 
 ##
 # Build CEF.
@@ -1032,69 +1487,106 @@ def onerror(func, path, exc_info):
       msg('%s=%s' % (key, os.environ[key]))
 
   # Run the cef_create_projects script to generate project files.
-  path = os.path.join(cef_src_dir, 'cef_create_projects'+script_ext)
+  path = os.path.join(cef_src_dir, 'cef_create_projects' + script_ext)
   run(path, cef_src_dir, depot_tools_dir)
 
   # Build using Ninja.
-  command = 'ninja -C '
+  command = 'ninja '
   if options.verbosebuild:
-    command = 'ninja -v -C'
-
-  # -- CEF Python modification below
-  assert os.environ['CEFPYTHON_NINJA_JOBS']
-  command = 'ninja -v -j' + os.environ['CEFPYTHON_NINJA_JOBS'] + ' -C'
-  # --
-
+    command += '-v '
+  if options.buildfailurelimit != 1:
+    command += '-k %d ' % options.buildfailurelimit
+  command += '-C '
   target = ' ' + options.buildtarget
   if options.buildtests:
-    target = target + ' cef_unittests'
+    target += ' ' + options.testtarget
   if platform == 'linux':
-    target = target + ' chrome_sandbox'
-
-  build_dir_suffix = ''
-  if use_gn:
-    # CEF uses a consistent directory naming scheme for GN via
-    # GetAllPlatformConfigs in tools/gn_args.py.
-    if options.x64build:
-      build_dir_suffix = '_GN_x64'
-    elif options.armbuild:
-      build_dir_suffix = '_GN_arm'
-    else:
-      build_dir_suffix = '_GN_x86'
-  else:
-    # GYP outputs both x86 and x64 builds to the same directory on Linux and
-    # Mac OS X. On Windows it suffixes the directory name for x64 builds.
-    if platform == 'windows' and options.x64build:
-      build_dir_suffix = '_x64'
+    target += ' chrome_sandbox'
 
+  # Make a CEF Debug build.
   if not options.nodebugbuild:
-    build_path = os.path.join('out', 'Debug' + build_dir_suffix)
+    build_path = os.path.join('out', get_build_directory_name(True))
     if use_gn:
       args_path = os.path.join(chromium_src_dir, build_path, 'args.gn')
-      if os.path.exists(args_path):
-        msg(args_path + ' contents:\n' + read_file(args_path))
+      msg(args_path + ' contents:\n' + read_file(args_path))
 
-    # Make a CEF Debug build.
     run(command + build_path + target, chromium_src_dir, depot_tools_dir,
         os.path.join(download_dir, 'build-%s-debug.log' % (cef_branch)) \
           if options.buildlogfile else None)
 
+    if use_gn and platform == 'windows':
+      # Make the separate cef_sandbox.lib build when GN is_official_build=true.
+      build_path += '_sandbox'
+      if os.path.exists(os.path.join(chromium_src_dir, build_path)):
+        args_path = os.path.join(chromium_src_dir, build_path, 'args.gn')
+        msg(args_path + ' contents:\n' + read_file(args_path))
+
+        run(command + build_path + ' cef_sandbox', chromium_src_dir, depot_tools_dir,
+            os.path.join(download_dir, 'build-%s-debug-sandbox.log' % (cef_branch)) \
+              if options.buildlogfile else None)
+
+  # Make a CEF Release build.
   if not options.noreleasebuild:
-    build_path = os.path.join('out', 'Release' + build_dir_suffix)
+    build_path = os.path.join('out', get_build_directory_name(False))
     if use_gn:
       args_path = os.path.join(chromium_src_dir, build_path, 'args.gn')
-      if os.path.exists(args_path):
-        msg(args_path + ' contents:\n' + read_file(args_path))
+      msg(args_path + ' contents:\n' + read_file(args_path))
 
-    # Make a CEF Release build.
     run(command + build_path + target, chromium_src_dir, depot_tools_dir,
         os.path.join(download_dir, 'build-%s-release.log' % (cef_branch)) \
           if options.buildlogfile else None)
 
+    if use_gn and platform == 'windows':
+      # Make the separate cef_sandbox.lib build when GN is_official_build=true.
+      build_path += '_sandbox'
+      if os.path.exists(os.path.join(chromium_src_dir, build_path)):
+        args_path = os.path.join(chromium_src_dir, build_path, 'args.gn')
+        msg(args_path + ' contents:\n' + read_file(args_path))
+
+        run(command + build_path + ' cef_sandbox', chromium_src_dir, depot_tools_dir,
+            os.path.join(download_dir, 'build-%s-release-sandbox.log' % (cef_branch)) \
+              if options.buildlogfile else None)
+
 elif not options.nobuild:
   msg('Not building. The source hashes have not changed and ' +
       'the output folder "%s" already exists' % (out_src_dir))
 
+##
+# Run CEF tests.
+##
+
+if options.runtests:
+  if platform == 'windows':
+    test_exe = '%s.exe' % options.testtarget
+  elif platform == 'macosx':
+    test_exe = '%s.app/Contents/MacOS/%s' % (options.testtarget,
+                                             options.testtarget)
+  elif platform == 'linux':
+    test_exe = options.testtarget
+
+  test_prefix = options.testprefix
+  if len(test_prefix) > 0:
+    test_prefix += ' '
+
+  test_args = options.testargs
+  if len(test_args) > 0:
+    test_args = ' ' + test_args
+
+  if not options.nodebugtests:
+    build_path = os.path.join(out_src_dir, get_build_directory_name(True))
+    test_path = os.path.join(build_path, test_exe)
+    if os.path.exists(test_path):
+      run(test_prefix + test_path + test_args, build_path, depot_tools_dir)
+    else:
+      msg('Not running debug tests. Missing executable: %s' % test_path)
+
+  if not options.noreleasetests:
+    build_path = os.path.join(out_src_dir, get_build_directory_name(False))
+    test_path = os.path.join(build_path, test_exe)
+    if os.path.exists(test_path):
+      run(test_prefix + test_path + test_args, build_path, depot_tools_dir)
+    else:
+      msg('Not running release tests. Missing executable: %s' % test_path)
 
 ##
 # Create the CEF binary distribution.
@@ -1113,19 +1605,23 @@ def onerror(func, path, exc_info):
     distrib_types.append('minimal')
   elif options.clientdistribonly:
     distrib_types.append('client')
+  elif options.sandboxdistribonly:
+    distrib_types.append('sandbox')
   else:
     distrib_types.append('standard')
     if options.minimaldistrib:
       distrib_types.append('minimal')
     if options.clientdistrib:
       distrib_types.append('client')
+    if options.sandboxdistrib:
+      distrib_types.append('sandbox')
 
   cef_tools_dir = os.path.join(cef_src_dir, 'tools')
 
   # Create the requested distribution types.
   first_type = True
   for type in distrib_types:
-    path = os.path.join(cef_tools_dir, 'make_distrib'+script_ext)
+    path = os.path.join(cef_tools_dir, 'make_distrib' + script_ext)
     if options.nodebugbuild or options.noreleasebuild or type != 'standard':
       path = path + ' --allow-partial'
     path = path + ' --ninja-build'
@@ -1138,6 +1634,8 @@ def onerror(func, path, exc_info):
       path = path + ' --minimal'
     elif type == 'client':
       path = path + ' --client'
+    elif type == 'sandbox':
+      path = path + ' --sandbox'
 
     if first_type:
       if options.nodistribdocs:

From b416a5e901174cd522477bf25594afdbb16612ae Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Tue, 22 May 2018 19:55:03 +0200
Subject: [PATCH 034/238] Update README

---
 README.md | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index a4264edd..67b5e4be 100644
--- a/README.md
+++ b/README.md
@@ -91,14 +91,6 @@ or other kind of internet bots.
 See the [Support development](#support-development) section for a list of
 all the individuals and companies supporting CEF Python.
 
-If you would like to sponsor CEF Python development efforts and see your company
-logo with a link here, please contact Czarek (contact details are available in his
-[Resume](https://drive.google.com/file/d/17xmoT5Z_zTHkVclqPzrs2aAV64Uiu7fh/view)).
-This README page alone has 1,070 visitors and 2,402 views every two weeks,
-so your company logo and a website link will be visible to many Python developers.
-The statistics are from Mar 9, 2018. Complete statistics are available in this topic
-on the Forum: [[ANN] Call for sponsors](https://groups.google.com/d/topic/cefpython/CjkZF2P4rMk/discussion).
-
 
 ## Funding for v66.0 release
 
@@ -174,6 +166,13 @@ a higher priority.
 If you are interested in sponsorship opportunities please contact Czarek
 directly - contact details are available in his [Resume](https://drive.google.com/file/d/17xmoT5Z_zTHkVclqPzrs2aAV64Uiu7fh/view).
 
+If you would like to sponsor CEF Python development efforts and see your company
+logo with a link in README, please contact Czarek.
+This README page alone has 1,070 visitors and 2,402 views every two weeks,
+so your company logo and a website link will be visible to many Python developers.
+The statistics are from Mar 9, 2018. Complete statistics are available in this topic
+on the Forum: [[ANN] Call for sponsors](https://groups.google.com/d/topic/cefpython/CjkZF2P4rMk/discussion).
+
 ### Thanks
 
 * [2017] Many thanks to [ClearChat Inc.](https://clearchat.com/) for sponsoring

From 108a3665e951bfab0dcd4a9587185fe9ff98354d Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Tue, 22 May 2018 20:13:58 +0200
Subject: [PATCH 035/238] Apply custom patch to automate-git.py

---
 tools/automate-git.py       | 143 +++++++++++++++++++++++++-
 tools/automate-git.py.patch | 197 +++++++++++++++++++++++++++++++++---
 2 files changed, 325 insertions(+), 15 deletions(-)

diff --git a/tools/automate-git.py b/tools/automate-git.py
index 4f247930..b819c7bd 100644
--- a/tools/automate-git.py
+++ b/tools/automate-git.py
@@ -1,3 +1,128 @@
+""" See automate.py. This script is for internal usage only, don't
+call it directly. This is a modified copy of automate-git.py from
+upstream CEF.
+
+Some modifications were applied for CEF Python specific use case.
+There is a patch file with the same name as this script that contains
+differences from the original file.
+
+-------------------------------------------------------------------------------
+
+Usage: automate-git.py [options]
+
+ This utility implements automation for the download, update, build and
+distribution of CEF.
+
+Options:
+  -h, --help            show this help message and exit
+  --download-dir=DIR    Download directory with no spaces [required].
+  --depot-tools-dir=DIR
+                        Download directory for depot_tools.
+  --depot-tools-archive=DEPOTTOOLSARCHIVE
+                        Zip archive file that contains a single top-level
+                        depot_tools directory.
+  --branch=BRANCH       Branch of CEF to build (trunk, 1916, ...). This will
+                        be used to name the CEF download directory and to
+                        identify the correct URL if --url is not specified.
+                        The default value is trunk.
+  --url=URL             CEF download URL. If not specified the default URL
+                        will be used.
+  --chromium-url=CHROMIUMURL
+                        Chromium download URL. If not specified the default
+                        URL will be used.
+  --checkout=CHECKOUT   Version of CEF to checkout. If not specified the most
+                        recent remote version of the branch will be used.
+  --chromium-checkout=CHROMIUMCHECKOUT
+                        Version of Chromium to checkout (Git branch/hash/tag).
+                        This overrides the value specified by CEF in
+                        CHROMIUM_BUILD_COMPATIBILITY.txt.
+  --chromium-channel=CHROMIUMCHANNEL
+                        Chromium channel to check out (canary, dev, beta or
+                        stable). This overrides the value specified by CEF in
+                        CHROMIUM_BUILD_COMPATIBILITY.txt.
+  --chromium-channel-distance=CHROMIUMCHANNELDISTANCE
+                        The target number of commits to step in the channel,
+                        or 0 to use the newest channel version. Used in
+                        combination with --chromium-channel.
+  --force-config        Force creation of a new gclient config file.
+  --force-clean         Force a clean checkout of Chromium and CEF. This will
+                        trigger a new update, build and distribution.
+  --force-clean-deps    Force a clean checkout of Chromium dependencies. Used
+                        in combination with --force-clean.
+  --dry-run             Output commands without executing them.
+  --dry-run-platform=DRYRUNPLATFORM
+                        Simulate a dry run on the specified platform (windows,
+                        macosx, linux). Must be used in combination with the
+                        --dry-run flag.
+  --force-update        Force a Chromium and CEF update. This will trigger a
+                        new build and distribution.
+  --no-update           Do not update Chromium or CEF. Pass --force-build or
+                        --force-distrib if you desire a new build or
+                        distribution.
+  --no-cef-update       Do not update CEF. Pass --force-build or --force-
+                        distrib if you desire a new build or distribution.
+  --force-cef-update    Force a CEF update. This will cause local changes in
+                        the CEF checkout to be discarded and patch files to be
+                        reapplied.
+  --no-chromium-update  Do not update Chromium.
+  --no-depot-tools-update
+                        Do not update depot_tools.
+  --fast-update         Update existing Chromium/CEF checkouts for fast
+                        incremental builds by attempting to minimize the
+                        number of modified files. The update will fail if
+                        there are unstaged CEF changes or if Chromium changes
+                        are not included in a patch file.
+  --force-patch-update  Force update of patch files.
+  --resave              Resave patch files.
+  --log-chromium-changes
+                        Create a log of the Chromium changes.
+  --force-build         Force CEF debug and release builds. This builds
+                        [build-target] on all platforms and chrome_sandbox on
+                        Linux.
+  --no-build            Do not build CEF.
+  --build-target=BUILDTARGET
+                        Target name(s) to build (defaults to "cefclient").
+  --build-tests         Also build the test target specified via --test-
+                        target.
+  --no-debug-build      Don't perform the CEF debug build.
+  --no-release-build    Don't perform the CEF release build.
+  --verbose-build       Show all command lines while building.
+  --build-failure-limit=BUILDFAILURELIMIT
+                        Keep going until N jobs fail.
+  --build-log-file      Write build logs to file. The file will be named
+                        "build-[branch]-[debug|release].log" in the download
+                        directory.
+  --x64-build           Create a 64-bit build.
+  --arm-build           Create an ARM build.
+  --run-tests           Run the ceftests target.
+  --no-debug-tests      Don't run debug build tests.
+  --no-release-tests    Don't run release build tests.
+  --test-target=TESTTARGET
+                        Test target name to build (defaults to "ceftests").
+  --test-prefix=TESTPREFIX
+                        Prefix for running the test executable (e.g. `xvfb-
+                        run` on Linux).
+  --test-args=TESTARGS  Arguments that will be passed to the test executable.
+  --force-distrib       Force creation of a CEF binary distribution.
+  --no-distrib          Don't create a CEF binary distribution.
+  --minimal-distrib     Create a minimal CEF binary distribution.
+  --minimal-distrib-only
+                        Create a minimal CEF binary distribution only.
+  --client-distrib      Create a client CEF binary distribution.
+  --client-distrib-only
+                        Create a client CEF binary distribution only.
+  --sandbox-distrib     Create a cef_sandbox static library distribution.
+  --sandbox-distrib-only
+                        Create a cef_sandbox static library distribution only.
+  --no-distrib-docs     Don't create CEF documentation.
+  --no-distrib-archive  Don't create archives for output directories.
+  --clean-artifacts     Clean the artifacts output directory.
+  --distrib-subdir=DISTRIBSUBDIR
+                        CEF distrib dir name, child of
+                        chromium/src/cef/binary_distrib
+
+"""
+
 # Copyright (c) 2014 The Chromium Embedded Framework Authors. All rights
 # reserved. Use of this source code is governed by a BSD-style license that
 # can be found in the LICENSE file.
@@ -945,9 +1070,14 @@ def check_pattern_matches(output_file=None):
    (options.nodistrib and options.forcedistrib) or \
    ((options.forceclean or options.forcecleandeps) and options.fastupdate) or \
    (options.chromiumcheckout and options.chromiumchannel):
-  print "Invalid combination of options."
-  parser.print_help(sys.stderr)
-  sys.exit()
+  # -- CEF Python modification below
+  if (options.nocefupdate and options.forceupdate):
+    pass
+  else:
+    print "Invalid combination of options."
+    parser.print_help(sys.stderr)
+    sys.exit()
+  # --
 
 if (options.noreleasebuild and \
      (options.minimaldistrib or options.minimaldistribonly or \
@@ -1494,9 +1624,16 @@ def check_pattern_matches(output_file=None):
   command = 'ninja '
   if options.verbosebuild:
     command += '-v '
+
+  # -- CEF Python modification below
+  assert os.environ['CEFPYTHON_NINJA_JOBS']
+  command += '-j' + os.environ['CEFPYTHON_NINJA_JOBS'] + ' '
+  # --
+
   if options.buildfailurelimit != 1:
     command += '-k %d ' % options.buildfailurelimit
   command += '-C '
+
   target = ' ' + options.buildtarget
   if options.buildtests:
     target += ' ' + options.testtarget
diff --git a/tools/automate-git.py.patch b/tools/automate-git.py.patch
index c999df72..f8f8bb56 100644
--- a/tools/automate-git.py.patch
+++ b/tools/automate-git.py.patch
@@ -1,8 +1,8 @@
 diff --git automate-git.py automate-git.py
-index d5e75ae..9b3db23 100644
+index 4f24793..b819c7b 100644
 --- automate-git.py
 +++ automate-git.py
-@@ -1,3 +1,92 @@
+@@ -1,3 +1,128 @@
 +""" See automate.py. This script is for internal usage only, don't
 +call it directly. This is a modified copy of automate-git.py from
 +upstream CEF.
@@ -41,6 +41,14 @@ index d5e75ae..9b3db23 100644
 +                        Version of Chromium to checkout (Git branch/hash/tag).
 +                        This overrides the value specified by CEF in
 +                        CHROMIUM_BUILD_COMPATIBILITY.txt.
++  --chromium-channel=CHROMIUMCHANNEL
++                        Chromium channel to check out (canary, dev, beta or
++                        stable). This overrides the value specified by CEF in
++                        CHROMIUM_BUILD_COMPATIBILITY.txt.
++  --chromium-channel-distance=CHROMIUMCHANNELDISTANCE
++                        The target number of commits to step in the channel,
++                        or 0 to use the newest channel version. Used in
++                        combination with --chromium-channel.
 +  --force-config        Force creation of a new gclient config file.
 +  --force-clean         Force a clean checkout of Chromium and CEF. This will
 +                        trigger a new update, build and distribution.
@@ -58,24 +66,48 @@ index d5e75ae..9b3db23 100644
 +                        distribution.
 +  --no-cef-update       Do not update CEF. Pass --force-build or --force-
 +                        distrib if you desire a new build or distribution.
++  --force-cef-update    Force a CEF update. This will cause local changes in
++                        the CEF checkout to be discarded and patch files to be
++                        reapplied.
 +  --no-chromium-update  Do not update Chromium.
 +  --no-depot-tools-update
 +                        Do not update depot_tools.
++  --fast-update         Update existing Chromium/CEF checkouts for fast
++                        incremental builds by attempting to minimize the
++                        number of modified files. The update will fail if
++                        there are unstaged CEF changes or if Chromium changes
++                        are not included in a patch file.
++  --force-patch-update  Force update of patch files.
++  --resave              Resave patch files.
++  --log-chromium-changes
++                        Create a log of the Chromium changes.
 +  --force-build         Force CEF debug and release builds. This builds
 +                        [build-target] on all platforms and chrome_sandbox on
 +                        Linux.
 +  --no-build            Do not build CEF.
 +  --build-target=BUILDTARGET
 +                        Target name(s) to build (defaults to "cefclient").
-+  --build-tests         Also build the cef_unittests target.
++  --build-tests         Also build the test target specified via --test-
++                        target.
 +  --no-debug-build      Don't perform the CEF debug build.
 +  --no-release-build    Don't perform the CEF release build.
 +  --verbose-build       Show all command lines while building.
++  --build-failure-limit=BUILDFAILURELIMIT
++                        Keep going until N jobs fail.
 +  --build-log-file      Write build logs to file. The file will be named
 +                        "build-[branch]-[debug|release].log" in the download
 +                        directory.
 +  --x64-build           Create a 64-bit build.
 +  --arm-build           Create an ARM build.
++  --run-tests           Run the ceftests target.
++  --no-debug-tests      Don't run debug build tests.
++  --no-release-tests    Don't run release build tests.
++  --test-target=TESTTARGET
++                        Test target name to build (defaults to "ceftests").
++  --test-prefix=TESTPREFIX
++                        Prefix for running the test executable (e.g. `xvfb-
++                        run` on Linux).
++  --test-args=TESTARGS  Arguments that will be passed to the test executable.
 +  --force-distrib       Force creation of a CEF binary distribution.
 +  --no-distrib          Don't create a CEF binary distribution.
 +  --minimal-distrib     Create a minimal CEF binary distribution.
@@ -84,21 +116,25 @@ index d5e75ae..9b3db23 100644
 +  --client-distrib      Create a client CEF binary distribution.
 +  --client-distrib-only
 +                        Create a client CEF binary distribution only.
++  --sandbox-distrib     Create a cef_sandbox static library distribution.
++  --sandbox-distrib-only
++                        Create a cef_sandbox static library distribution only.
 +  --no-distrib-docs     Don't create CEF documentation.
 +  --no-distrib-archive  Don't create archives for output directories.
 +  --clean-artifacts     Clean the artifacts output directory.
 +  --distrib-subdir=DISTRIBSUBDIR
 +                        CEF distrib dir name, child of
 +                        chromium/src/cef/binary_distrib
++
 +"""
 +
  # Copyright (c) 2014 The Chromium Embedded Framework Authors. All rights
  # reserved. Use of this source code is governed by a BSD-style license that
  # can be found in the LICENSE file.
-@@ -457,9 +546,14 @@ if (options.nochromiumupdate and options.forceupdate) or \
-    (options.nocefupdate and options.forceupdate) or \
-    (options.nobuild and options.forcebuild) or \
-    (options.nodistrib and options.forcedistrib):
+@@ -945,9 +1070,14 @@ if (options.nochromiumupdate and options.forceupdate) or \
+    (options.nodistrib and options.forcedistrib) or \
+    ((options.forceclean or options.forcecleandeps) and options.fastupdate) or \
+    (options.chromiumcheckout and options.chromiumchannel):
 -  print "Invalid combination of options."
 -  parser.print_help(sys.stderr)
 -  sys.exit()
@@ -113,16 +149,153 @@ index d5e75ae..9b3db23 100644
  
  if (options.noreleasebuild and \
       (options.minimaldistrib or options.minimaldistribonly or \
-@@ -945,6 +1039,12 @@ if not options.nobuild and (chromium_checkout_changed or \
-   command = 'ninja -C '
+@@ -1494,9 +1624,16 @@ if not options.nobuild and (chromium_checkout_changed or \
+   command = 'ninja '
    if options.verbosebuild:
-     command = 'ninja -v -C'
+     command += '-v '
 +
 +  # -- CEF Python modification below
 +  assert os.environ['CEFPYTHON_NINJA_JOBS']
-+  command = 'ninja -v -j' + os.environ['CEFPYTHON_NINJA_JOBS'] + ' -C'
++  command += '-j' + os.environ['CEFPYTHON_NINJA_JOBS'] + ' '
 +  # --
++
+   if options.buildfailurelimit != 1:
+     command += '-k %d ' % options.buildfailurelimit
+   command += '-C '
 +
    target = ' ' + options.buildtarget
    if options.buildtests:
-     target = target + ' cef_unittests'
+     target += ' ' + options.testtarget
+diff --git automate-git.py.patch automate-git.py.patch
+index c999df7..4dcd59f 100644
+--- automate-git.py.patch
++++ automate-git.py.patch
+@@ -1,128 +0,0 @@
+-diff --git automate-git.py automate-git.py
+-index d5e75ae..9b3db23 100644
+---- automate-git.py
+-+++ automate-git.py
+-@@ -1,3 +1,92 @@
+-+""" See automate.py. This script is for internal usage only, don't
+-+call it directly. This is a modified copy of automate-git.py from
+-+upstream CEF.
+-+
+-+Some modifications were applied for CEF Python specific use case.
+-+There is a patch file with the same name as this script that contains
+-+differences from the original file.
+-+
+-+-------------------------------------------------------------------------------
+-+
+-+Usage: automate-git.py [options]
+-+
+-+ This utility implements automation for the download, update, build and
+-+distribution of CEF.
+-+
+-+Options:
+-+  -h, --help            show this help message and exit
+-+  --download-dir=DIR    Download directory with no spaces [required].
+-+  --depot-tools-dir=DIR
+-+                        Download directory for depot_tools.
+-+  --depot-tools-archive=DEPOTTOOLSARCHIVE
+-+                        Zip archive file that contains a single top-level
+-+                        depot_tools directory.
+-+  --branch=BRANCH       Branch of CEF to build (trunk, 1916, ...). This will
+-+                        be used to name the CEF download directory and to
+-+                        identify the correct URL if --url is not specified.
+-+                        The default value is trunk.
+-+  --url=URL             CEF download URL. If not specified the default URL
+-+                        will be used.
+-+  --chromium-url=CHROMIUMURL
+-+                        Chromium download URL. If not specified the default
+-+                        URL will be used.
+-+  --checkout=CHECKOUT   Version of CEF to checkout. If not specified the most
+-+                        recent remote version of the branch will be used.
+-+  --chromium-checkout=CHROMIUMCHECKOUT
+-+                        Version of Chromium to checkout (Git branch/hash/tag).
+-+                        This overrides the value specified by CEF in
+-+                        CHROMIUM_BUILD_COMPATIBILITY.txt.
+-+  --force-config        Force creation of a new gclient config file.
+-+  --force-clean         Force a clean checkout of Chromium and CEF. This will
+-+                        trigger a new update, build and distribution.
+-+  --force-clean-deps    Force a clean checkout of Chromium dependencies. Used
+-+                        in combination with --force-clean.
+-+  --dry-run             Output commands without executing them.
+-+  --dry-run-platform=DRYRUNPLATFORM
+-+                        Simulate a dry run on the specified platform (windows,
+-+                        macosx, linux). Must be used in combination with the
+-+                        --dry-run flag.
+-+  --force-update        Force a Chromium and CEF update. This will trigger a
+-+                        new build and distribution.
+-+  --no-update           Do not update Chromium or CEF. Pass --force-build or
+-+                        --force-distrib if you desire a new build or
+-+                        distribution.
+-+  --no-cef-update       Do not update CEF. Pass --force-build or --force-
+-+                        distrib if you desire a new build or distribution.
+-+  --no-chromium-update  Do not update Chromium.
+-+  --no-depot-tools-update
+-+                        Do not update depot_tools.
+-+  --force-build         Force CEF debug and release builds. This builds
+-+                        [build-target] on all platforms and chrome_sandbox on
+-+                        Linux.
+-+  --no-build            Do not build CEF.
+-+  --build-target=BUILDTARGET
+-+                        Target name(s) to build (defaults to "cefclient").
+-+  --build-tests         Also build the cef_unittests target.
+-+  --no-debug-build      Don't perform the CEF debug build.
+-+  --no-release-build    Don't perform the CEF release build.
+-+  --verbose-build       Show all command lines while building.
+-+  --build-log-file      Write build logs to file. The file will be named
+-+                        "build-[branch]-[debug|release].log" in the download
+-+                        directory.
+-+  --x64-build           Create a 64-bit build.
+-+  --arm-build           Create an ARM build.
+-+  --force-distrib       Force creation of a CEF binary distribution.
+-+  --no-distrib          Don't create a CEF binary distribution.
+-+  --minimal-distrib     Create a minimal CEF binary distribution.
+-+  --minimal-distrib-only
+-+                        Create a minimal CEF binary distribution only.
+-+  --client-distrib      Create a client CEF binary distribution.
+-+  --client-distrib-only
+-+                        Create a client CEF binary distribution only.
+-+  --no-distrib-docs     Don't create CEF documentation.
+-+  --no-distrib-archive  Don't create archives for output directories.
+-+  --clean-artifacts     Clean the artifacts output directory.
+-+  --distrib-subdir=DISTRIBSUBDIR
+-+                        CEF distrib dir name, child of
+-+                        chromium/src/cef/binary_distrib
+-+"""
+-+
+- # Copyright (c) 2014 The Chromium Embedded Framework Authors. All rights
+- # reserved. Use of this source code is governed by a BSD-style license that
+- # can be found in the LICENSE file.
+-@@ -457,9 +546,14 @@ if (options.nochromiumupdate and options.forceupdate) or \
+-    (options.nocefupdate and options.forceupdate) or \
+-    (options.nobuild and options.forcebuild) or \
+-    (options.nodistrib and options.forcedistrib):
+--  print "Invalid combination of options."
+--  parser.print_help(sys.stderr)
+--  sys.exit()
+-+  # -- CEF Python modification below
+-+  if (options.nocefupdate and options.forceupdate):
+-+    pass
+-+  else:
+-+    print "Invalid combination of options."
+-+    parser.print_help(sys.stderr)
+-+    sys.exit()
+-+  # --
+- 
+- if (options.noreleasebuild and \
+-      (options.minimaldistrib or options.minimaldistribonly or \
+-@@ -945,6 +1039,12 @@ if not options.nobuild and (chromium_checkout_changed or \
+-   command = 'ninja -C '
+-   if options.verbosebuild:
+-     command = 'ninja -v -C'
+-+
+-+  # -- CEF Python modification below
+-+  assert os.environ['CEFPYTHON_NINJA_JOBS']
+-+  command = 'ninja -v -j' + os.environ['CEFPYTHON_NINJA_JOBS'] + ' -C'
+-+  # --
+-+
+-   target = ' ' + options.buildtarget
+-   if options.buildtests:
+-     target = target + ' cef_unittests'

From 2bf1758fc157018dd3d4a40402491bbedaaa7e51 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Tue, 22 May 2018 20:56:58 +0200
Subject: [PATCH 036/238] Update build instructions doc

---
 docs/Build-instructions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Build-instructions.md b/docs/Build-instructions.md
index 91014dab..60becb6b 100644
--- a/docs/Build-instructions.md
+++ b/docs/Build-instructions.md
@@ -198,7 +198,7 @@ requirements common for all platforms.
       and copy it to /usr/bin and chmod 755.
     * Install/upgrade required packages using one of the three methods below
       (these packages should be upgraded each time you update to newer CEF):
-        1. Type command: `sudo apt-get install bison build-essential cdbs curl devscripts dpkg-dev elfutils fakeroot flex g++ git-core git-svn gperf libapache2-mod-php5 libasound2-dev libav-tools libbrlapi-dev libbz2-dev libcairo2-dev libcap-dev libcups2-dev libcurl4-gnutls-dev libdrm-dev libelf-dev libexif-dev libffi-dev libgconf2-dev libgl1-mesa-dev libglib2.0-dev libglu1-mesa-dev libgnome-keyring-dev libgtk2.0-dev libkrb5-dev libnspr4-dev libnss3-dev libpam0g-dev libpci-dev libpulse-dev libsctp-dev libspeechd-dev libsqlite3-dev libssl-dev libudev-dev libwww-perl libxslt1-dev libxss-dev libxt-dev libxtst-dev mesa-common-dev openbox patch perl php5-cgi pkg-config python python-cherrypy3 python-crypto python-dev python-psutil python-numpy python-opencv python-openssl python-yaml rpm ruby subversion ttf-dejavu-core ttf-indic-fonts ttf-kochi-gothic ttf-kochi-mincho fonts-thai-tlwg wdiff wget zip`
+        1. Type command: `sudo apt-get install bison build-essential cdbs curl devscripts dpkg-dev elfutils fakeroot flex g++ git-core git-svn gperf libapache2-mod-php5 libasound2-dev libav-tools libbrlapi-dev libbz2-dev libcairo2-dev libcap-dev libcups2-dev libcurl4-gnutls-dev libdrm-dev libelf-dev libexif-dev libffi-dev libgconf2-dev libgconf-2-4 libgl1-mesa-dev libglib2.0-dev libglu1-mesa-dev libgnome-keyring-dev libgtk2.0-dev libkrb5-dev libnspr4-dev libnss3-dev libpam0g-dev libpci-dev libpulse-dev libsctp-dev libspeechd-dev libsqlite3-dev libssl-dev libudev-dev libwww-perl libxslt1-dev libxss-dev libxt-dev libxtst-dev mesa-common-dev openbox patch perl php5-cgi pkg-config python python-cherrypy3 python-crypto python-dev python-psutil python-numpy python-opencv python-openssl python-yaml rpm ruby subversion ttf-dejavu-core ttf-indic-fonts ttf-kochi-gothic ttf-kochi-mincho fonts-thai-tlwg wdiff wget zip`
         2. See the list of packages on the
            [cef/AutomatedBuildSetup.md](https://bitbucket.org/chromiumembedded/cef/wiki/AutomatedBuildSetup.md#markdown-header-linux-configuration)
             wiki page.

From cef0ca5f8258f7bbac886944332b3def3173f298 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Tue, 22 May 2018 20:57:27 +0200
Subject: [PATCH 037/238] Add --use-system-freetype flag to automate.py (#402)

---
 tools/automate.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tools/automate.py b/tools/automate.py
index 360ffed4..f9d3ddf9 100644
--- a/tools/automate.py
+++ b/tools/automate.py
@@ -33,6 +33,7 @@
                 [--build-dir BUILD_DIR] [--cef-build-dir CEF_BUILD_DIR]
                 [--ninja-jobs JOBS] [--gyp-generators GENERATORS]
                 [--gyp-msvs-version MSVS]
+                [--use-system-freetype USE_SYSTEM_FREETYPE]
     automate.py (-h | --help) [type -h to show full description for options]
 
 Options:
@@ -61,6 +62,7 @@
                              By default set to cpu_count / 2.
     --gyp-generators=<gen>   Set GYP_GENERATORS [default: ninja].
     --gyp-msvs-version=<v>   Set GYP_MSVS_VERSION.
+    --use-system-freetype    Use system Freetype library on Linux (Issue #402)
 
 """
 
@@ -103,6 +105,7 @@ class Options(object):
     ninja_jobs = None
     gyp_generators = "ninja"  # Even though CEF uses now GN, still some GYP
     gyp_msvs_version = ""     # env variables are being used.
+    use_system_freetype = False
 
     # Internal options
     depot_tools_dir = ""
@@ -878,6 +881,10 @@ def getenv():
     if Options.release_build and not Options.fast_build:
         env["GN_DEFINES"] += " is_official_build=true"
 
+    # Isssue #402 - Blurry font rendering on Linux
+    if Options.use_system_freetype:
+        env["GN_DEFINES"] += " use_system_freetype=true"
+
     # GYP configuration is DEPRECATED, however it is still set in
     # upstream Linux configuration on AutomatedBuildSetup wiki page,
     # so setting it here as well.

From c4b392379a5f914aca6a2fd52e8734a57383fad9 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Tue, 22 May 2018 21:06:47 +0200
Subject: [PATCH 038/238] Add --no-depot-tools-update to automate.py (#428)

---
 tools/automate.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tools/automate.py b/tools/automate.py
index f9d3ddf9..4ba57b17 100644
--- a/tools/automate.py
+++ b/tools/automate.py
@@ -34,6 +34,7 @@
                 [--ninja-jobs JOBS] [--gyp-generators GENERATORS]
                 [--gyp-msvs-version MSVS]
                 [--use-system-freetype USE_SYSTEM_FREETYPE]
+                [--no-depot-tools-update NO_DEPOT_TOOLS_UPDATE]
     automate.py (-h | --help) [type -h to show full description for options]
 
 Options:
@@ -63,6 +64,10 @@
     --gyp-generators=<gen>   Set GYP_GENERATORS [default: ninja].
     --gyp-msvs-version=<v>   Set GYP_MSVS_VERSION.
     --use-system-freetype    Use system Freetype library on Linux (Issue #402)
+    --no-depot-tools-update  Do not update depot_tools/ directory. When building
+                             old unsupported versions of Chromium you want to
+                             manually checkout an old version of depot tools
+                             from the time of the release.
 
 """
 
@@ -106,6 +111,7 @@ class Options(object):
     gyp_generators = "ninja"  # Even though CEF uses now GN, still some GYP
     gyp_msvs_version = ""     # env variables are being used.
     use_system_freetype = False
+    no_depot_tools_update = False
 
     # Internal options
     depot_tools_dir = ""
@@ -944,6 +950,8 @@ def run_automate_git():
         args.append("--x64-build")
     args.append("--download-dir=" + Options.cef_build_dir)
     args.append("--branch=" + Options.cef_branch)
+    if Options.no_depot_tools_update:
+        args.append("--no-depot-tools-update")
     if Options.release_build:
         args.append("--no-debug-build")
     args.append("--verbose-build")

From f87422b1060c34ca6fd4464f520aeeea10dcfbe5 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Tue, 22 May 2018 21:37:57 +0200
Subject: [PATCH 039/238] Update patches (#125, #251)

---
 patches/issue251.patch | 366 -----------------------------------------
 patches/patch.py       |  11 +-
 2 files changed, 3 insertions(+), 374 deletions(-)
 delete mode 100644 patches/issue251.patch

diff --git a/patches/issue251.patch b/patches/issue251.patch
deleted file mode 100644
index dabe3474..00000000
--- a/patches/issue251.patch
+++ /dev/null
@@ -1,366 +0,0 @@
-diff --git include/capi/cef_drag_data_capi.h include/capi/cef_drag_data_capi.h
-index e1fcfd8c..084fea20 100644
---- include/capi/cef_drag_data_capi.h
-+++ include/capi/cef_drag_data_capi.h
-@@ -39,6 +39,7 @@
- #pragma once
- 
- #include "include/capi/cef_base_capi.h"
-+#include "include/capi/cef_image_capi.h"
- #include "include/capi/cef_stream_capi.h"
- 
- #ifdef __cplusplus
-@@ -195,6 +196,21 @@ typedef struct _cef_drag_data_t {
-   ///
-   void (CEF_CALLBACK *add_file)(struct _cef_drag_data_t* self,
-       const cef_string_t* path, const cef_string_t* display_name);
-+
-+  ///
-+  // Get image representation of drag data (may be NULL).
-+  ///
-+  struct _cef_image_t* (CEF_CALLBACK *get_image)(struct _cef_drag_data_t* self);
-+
-+  ///
-+  // Get image hotspot (drag start location relative to image dimensions).
-+  ///
-+  cef_point_t (CEF_CALLBACK *get_image_hotspot)(struct _cef_drag_data_t* self);
-+
-+  ///
-+  // Whether image representation of drag data is available.
-+  ///
-+  int (CEF_CALLBACK *has_image)(struct _cef_drag_data_t* self);
- } cef_drag_data_t;
- 
- 
-diff --git include/cef_drag_data.h include/cef_drag_data.h
-index 29b85e84..de37ecc4 100644
---- include/cef_drag_data.h
-+++ include/cef_drag_data.h
-@@ -39,6 +39,7 @@
- #pragma once
- 
- #include "include/cef_base.h"
-+#include "include/cef_image.h"
- #include "include/cef_stream.h"
- #include <vector>
- 
-@@ -193,6 +194,24 @@ class CefDragData : public virtual CefBaseRefCounted {
-   ///
-   /*--cef(optional_param=display_name)--*/
-   virtual void AddFile(const CefString& path, const CefString& display_name) =0;
-+
-+  ///
-+  // Get image representation of drag data (may be NULL).
-+  ///
-+  /*--cef()--*/
-+  virtual CefRefPtr<CefImage> GetImage() =0;
-+
-+  ///
-+  // Get image hotspot (drag start location relative to image dimensions).
-+  ///
-+  /*--cef()--*/
-+  virtual CefPoint GetImageHotspot() =0;
-+
-+  ///
-+  // Whether image representation of drag data is available.
-+  ///
-+  /*--cef()--*/
-+  virtual bool HasImage() =0;
- };
- 
- #endif  // CEF_INCLUDE_CEF_DRAG_DATA_H_
-diff --git libcef/browser/osr/browser_platform_delegate_osr.cc libcef/browser/osr/browser_platform_delegate_osr.cc
-index 148ef49c..bfec55b7 100644
---- libcef/browser/osr/browser_platform_delegate_osr.cc
-+++ libcef/browser/osr/browser_platform_delegate_osr.cc
-@@ -7,6 +7,7 @@
- #include <utility>
- 
- #include "libcef/browser/browser_host_impl.h"
-+#include "libcef/browser/image_impl.h"
- #include "libcef/browser/osr/render_widget_host_view_osr.h"
- #include "libcef/browser/osr/web_contents_view_osr.h"
- #include "libcef/common/drag_data_impl.h"
-@@ -432,7 +433,11 @@ void CefBrowserPlatformDelegateOsr::StartDragging(
-   CefRefPtr<CefRenderHandler> handler =
-       browser_->GetClient()->GetRenderHandler();
-   if (handler.get()) {
--    CefRefPtr<CefDragDataImpl> drag_data(new CefDragDataImpl(drop_data));
-+    CefRefPtr<CefImage> cef_image(new CefImageImpl(image));
-+    CefPoint cef_image_pos(CefPoint(image_offset.x(), image_offset.y()));
-+    CefRefPtr<CefDragDataImpl> drag_data(new CefDragDataImpl(drop_data,
-+                                                             cef_image,
-+                                                             cef_image_pos));
-     drag_data->SetReadOnly(true);
-     base::MessageLoop::ScopedNestableTaskAllower allow(
-         base::MessageLoop::current());
-diff --git libcef/common/drag_data_impl.cc libcef/common/drag_data_impl.cc
-index a8e2c8e1..6db3da39 100644
---- libcef/common/drag_data_impl.cc
-+++ libcef/common/drag_data_impl.cc
-@@ -19,6 +19,15 @@ CefDragDataImpl::CefDragDataImpl(const content::DropData& data)
-       read_only_(false) {
- }
- 
-+CefDragDataImpl::CefDragDataImpl(const content::DropData& data,
-+                                 CefRefPtr<CefImage> image,
-+                                 const CefPoint& image_hotspot)
-+    : data_(data),
-+      image_(image),
-+      image_hotspot_(image_hotspot),
-+      read_only_(false) {
-+}
-+
- CefDragDataImpl::CefDragDataImpl()
-     : read_only_(false) {
- }
-@@ -31,7 +40,7 @@ CefRefPtr<CefDragData> CefDragDataImpl::Clone() {
-   CefDragDataImpl* drag_data = NULL;
-   {
-     base::AutoLock lock_scope(lock_);
--    drag_data = new CefDragDataImpl(data_);
-+    drag_data = new CefDragDataImpl(data_, image_, image_hotspot_);
-   }
-   return drag_data;
- }
-@@ -187,3 +196,18 @@ void CefDragDataImpl::SetReadOnly(bool read_only) {
- 
-   read_only_ = read_only;
- }
-+
-+CefRefPtr<CefImage> CefDragDataImpl::GetImage() {
-+  base::AutoLock lock_scope(lock_);
-+  return image_;
-+}
-+
-+CefPoint CefDragDataImpl::GetImageHotspot() {
-+  base::AutoLock lock_scope(lock_);
-+  return image_hotspot_;
-+}
-+
-+bool CefDragDataImpl::HasImage() {
-+  base::AutoLock lock_scope(lock_);
-+  return image_ ? true : false;
-+}
-diff --git libcef/common/drag_data_impl.h libcef/common/drag_data_impl.h
-index 64f29ed3..37c398d2 100644
---- libcef/common/drag_data_impl.h
-+++ libcef/common/drag_data_impl.h
-@@ -7,6 +7,7 @@
- #pragma once
- 
- #include "include/cef_drag_data.h"
-+#include "include/cef_image.h"
- 
- #include <vector>
- 
-@@ -18,6 +19,9 @@ class CefDragDataImpl : public CefDragData {
-  public:
-   CefDragDataImpl();
-   explicit CefDragDataImpl(const content::DropData& data);
-+  CefDragDataImpl(const content::DropData& data,
-+                  CefRefPtr<CefImage> image,
-+                  const CefPoint& image_hotspot);
- 
-   CefRefPtr<CefDragData> Clone() override;
-   bool IsReadOnly() override;
-@@ -41,6 +45,9 @@ class CefDragDataImpl : public CefDragData {
-   void SetFragmentBaseURL(const CefString& fragment) override;
-   void ResetFileContents() override;
-   void AddFile(const CefString& path, const CefString& display_name) override;
-+  CefRefPtr<CefImage> GetImage() override;
-+  CefPoint GetImageHotspot() override;
-+  bool HasImage() override;
- 
-   // This method is not safe. Use Lock/Unlock to get mutually exclusive access.
-   content::DropData* drop_data() {
-@@ -53,6 +60,8 @@ class CefDragDataImpl : public CefDragData {
- 
-  private:
-   content::DropData data_;
-+  CefRefPtr<CefImage> image_;
-+  CefPoint image_hotspot_;
- 
-   // True if this object is read-only.
-   bool read_only_;
-diff --git libcef_dll/cpptoc/drag_data_cpptoc.cc libcef_dll/cpptoc/drag_data_cpptoc.cc
-index 381b88b9..01a39793 100644
---- libcef_dll/cpptoc/drag_data_cpptoc.cc
-+++ libcef_dll/cpptoc/drag_data_cpptoc.cc
-@@ -11,6 +11,7 @@
- //
- 
- #include "libcef_dll/cpptoc/drag_data_cpptoc.h"
-+#include "libcef_dll/cpptoc/image_cpptoc.h"
- #include "libcef_dll/cpptoc/stream_writer_cpptoc.h"
- #include "libcef_dll/transfer_util.h"
- 
-@@ -367,6 +368,50 @@ void CEF_CALLBACK drag_data_add_file(struct _cef_drag_data_t* self,
-       CefString(display_name));
- }
- 
-+struct _cef_image_t* CEF_CALLBACK drag_data_get_image(
-+    struct _cef_drag_data_t* self) {
-+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-+
-+  DCHECK(self);
-+  if (!self)
-+    return NULL;
-+
-+  // Execute
-+  CefRefPtr<CefImage> _retval = CefDragDataCppToC::Get(self)->GetImage();
-+
-+  // Return type: refptr_same
-+  return CefImageCppToC::Wrap(_retval);
-+}
-+
-+cef_point_t CEF_CALLBACK drag_data_get_image_hotspot(
-+    struct _cef_drag_data_t* self) {
-+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-+
-+  DCHECK(self);
-+  if (!self)
-+    return CefPoint();
-+
-+  // Execute
-+  cef_point_t _retval = CefDragDataCppToC::Get(self)->GetImageHotspot();
-+
-+  // Return type: simple
-+  return _retval;
-+}
-+
-+int CEF_CALLBACK drag_data_has_image(struct _cef_drag_data_t* self) {
-+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-+
-+  DCHECK(self);
-+  if (!self)
-+    return 0;
-+
-+  // Execute
-+  bool _retval = CefDragDataCppToC::Get(self)->HasImage();
-+
-+  // Return type: bool
-+  return _retval;
-+}
-+
- }  // namespace
- 
- 
-@@ -395,6 +440,9 @@ CefDragDataCppToC::CefDragDataCppToC() {
-   GetStruct()->set_fragment_base_url = drag_data_set_fragment_base_url;
-   GetStruct()->reset_file_contents = drag_data_reset_file_contents;
-   GetStruct()->add_file = drag_data_add_file;
-+  GetStruct()->get_image = drag_data_get_image;
-+  GetStruct()->get_image_hotspot = drag_data_get_image_hotspot;
-+  GetStruct()->has_image = drag_data_has_image;
- }
- 
- template<> CefRefPtr<CefDragData> CefCppToCRefCounted<CefDragDataCppToC,
-diff --git libcef_dll/ctocpp/drag_data_ctocpp.cc libcef_dll/ctocpp/drag_data_ctocpp.cc
-index db1a2f71..e6714562 100644
---- libcef_dll/ctocpp/drag_data_ctocpp.cc
-+++ libcef_dll/ctocpp/drag_data_ctocpp.cc
-@@ -11,6 +11,7 @@
- //
- 
- #include "libcef_dll/ctocpp/drag_data_ctocpp.h"
-+#include "libcef_dll/ctocpp/image_ctocpp.h"
- #include "libcef_dll/ctocpp/stream_writer_ctocpp.h"
- #include "libcef_dll/transfer_util.h"
- 
-@@ -372,6 +373,48 @@ void CefDragDataCToCpp::AddFile(const CefString& path,
-       display_name.GetStruct());
- }
- 
-+CefRefPtr<CefImage> CefDragDataCToCpp::GetImage() {
-+  cef_drag_data_t* _struct = GetStruct();
-+  if (CEF_MEMBER_MISSING(_struct, get_image))
-+    return NULL;
-+
-+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-+
-+  // Execute
-+  cef_image_t* _retval = _struct->get_image(_struct);
-+
-+  // Return type: refptr_same
-+  return CefImageCToCpp::Wrap(_retval);
-+}
-+
-+CefPoint CefDragDataCToCpp::GetImageHotspot() {
-+  cef_drag_data_t* _struct = GetStruct();
-+  if (CEF_MEMBER_MISSING(_struct, get_image_hotspot))
-+    return CefPoint();
-+
-+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-+
-+  // Execute
-+  cef_point_t _retval = _struct->get_image_hotspot(_struct);
-+
-+  // Return type: simple
-+  return _retval;
-+}
-+
-+bool CefDragDataCToCpp::HasImage() {
-+  cef_drag_data_t* _struct = GetStruct();
-+  if (CEF_MEMBER_MISSING(_struct, has_image))
-+    return false;
-+
-+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-+
-+  // Execute
-+  int _retval = _struct->has_image(_struct);
-+
-+  // Return type: bool
-+  return _retval?true:false;
-+}
-+
- 
- // CONSTRUCTOR - Do not edit by hand.
- 
-diff --git libcef_dll/ctocpp/drag_data_ctocpp.h libcef_dll/ctocpp/drag_data_ctocpp.h
-index 5b202710..20262388 100644
---- libcef_dll/ctocpp/drag_data_ctocpp.h
-+++ libcef_dll/ctocpp/drag_data_ctocpp.h
-@@ -54,6 +54,9 @@ class CefDragDataCToCpp
-   void SetFragmentBaseURL(const CefString& base_url) OVERRIDE;
-   void ResetFileContents() OVERRIDE;
-   void AddFile(const CefString& path, const CefString& display_name) OVERRIDE;
-+  CefRefPtr<CefImage> GetImage() OVERRIDE;
-+  CefPoint GetImageHotspot() OVERRIDE;
-+  bool HasImage() OVERRIDE;
- };
- 
- #endif  // CEF_LIBCEF_DLL_CTOCPP_DRAG_DATA_CTOCPP_H_
-diff --git tests/ceftests/os_rendering_unittest.cc tests/ceftests/os_rendering_unittest.cc
-index 8fa110fa..c8f49d9c 100644
---- tests/ceftests/os_rendering_unittest.cc
-+++ tests/ceftests/os_rendering_unittest.cc
-@@ -1007,6 +1007,28 @@ class OSRTestHandler : public RoutingTestHandler,
-                      CefRenderHandler::DragOperationsMask allowed_ops,
-                      int x, int y) override {
-     if (test_type_ == OSR_TEST_DRAG_DROP_START_DRAGGING && started()) {
-+      // Drag image representation
-+      EXPECT_TRUE(drag_data->HasImage());
-+      CefRefPtr<CefImage> image = drag_data->GetImage();
-+      EXPECT_TRUE(image.get() != NULL);
-+      if (image.get()) {
-+        // Drag image height seem to be always + 1px greater than
-+        // the drag rect on Linux. But whether this is true on all
-+        // platforms not sure, so to be safe lets allow it to be
-+        // +/- 1px.
-+        EXPECT_GE(image->GetWidth(), GetScaledInt(kDragDivRect.width));
-+        EXPECT_LE(image->GetWidth(), GetScaledInt(kDragDivRect.width) + 1);
-+        EXPECT_GE(image->GetHeight(), GetScaledInt(kDragDivRect.height));
-+        EXPECT_LE(image->GetHeight(), GetScaledInt(kDragDivRect.height) + 1);
-+      }
-+      // During testing hotspot was (15, 23) and with scale_factor 2x
-+      // it was (15, 18). I don't know how the algorithm works, so
-+      // testing only rect boundaries.
-+      CefPoint hotspot = drag_data->GetImageHotspot();
-+      EXPECT_GT(hotspot.x, 0);
-+      EXPECT_LT(hotspot.x, GetScaledInt(kDragDivRect.width));
-+      EXPECT_GT(hotspot.y, 0);
-+      EXPECT_LT(hotspot.y, GetScaledInt(kDragDivRect.height));
-       DestroySucceededTestSoon();
-       return false;
-     } else if ((test_type_ == OSR_TEST_DRAG_DROP_UPDATE_CURSOR ||
diff --git a/patches/patch.py b/patches/patch.py
index 80a33921..5fe98998 100644
--- a/patches/patch.py
+++ b/patches/patch.py
@@ -13,9 +13,9 @@
 # noinspection PyUnresolvedReferences
 patches.extend([
     {
-        # Fixes HTTPS cache problems with private certificates
-        'name': 'issue125',
-        'path': '../net/http/'
+        # (Disabled) Fixes HTTPS cache problems with private certificates
+        # 'name': 'issue125',
+        # 'path': '../net/http/'
     },
 ])
 
@@ -28,9 +28,4 @@
             'name': 'issue231',
             'path': './'
         },
-        {
-            # Adds drag-image representation during drag & drop in OSR mode.
-            'name': 'issue251',
-            'path': './'
-        },
     ])

From 1846d64dc5ba15e5a11e25762ddde761473f8b2c Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Tue, 22 May 2018 21:55:54 +0200
Subject: [PATCH 040/238] Update docs on Issue #125 patch being disabled

---
 api/ApplicationSettings.md | 14 ++++++++------
 docs/Migration-guide.md    |  7 +++++++
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/api/ApplicationSettings.md b/api/ApplicationSettings.md
index 8bebae68..7f0be88e 100644
--- a/api/ApplicationSettings.md
+++ b/api/ApplicationSettings.md
@@ -233,12 +233,14 @@ RequestHandler.[_OnCertificateError()](#_oncertificateerror)
 callback. Note that disk caching is enabled only when the "cache_path"
 option is set.
 
-__NOTE ON CACHING__: the official CEF Python binary releases incorporate a patch
-that changes the caching behavior on sites with SSL certificate errors
-when used with this setting. Chromium by default disallows caching of
-content when there is certificate error. CEF Python applies a patch to
-Chromium sources to allow for caching even when there is certificate error,
-but only when the "ignore_certificate_errors" option is set to True.
+__NOTE ON CACHING__: Chromium by default disallows caching of
+content when there is certificate error. There is a issue125.patch
+in the patches/ directory that can be enabled when doing a custom
+CEF build. This patch changes the caching behavior on sites with SSL
+certificate errors when used with this setting. This patch can be
+applied Chromium sources to allow for caching even when there is
+certificate error, but only when the "ignore_certificate_errors"
+option is set to True.
 When it's set to False then the Chromium's caching behavior does not
 change. Enabling caching with certificate errors is useful on local
 private networks that use self-signed SSL certificates. See the
diff --git a/docs/Migration-guide.md b/docs/Migration-guide.md
index ae06f835..b2eed623 100644
--- a/docs/Migration-guide.md
+++ b/docs/Migration-guide.md
@@ -36,6 +36,7 @@ Table of contents:
 * [v55.3+ Handlers' callbacks and other interfaces](#v553-handlers-callbacks-and-other-interfaces)
 * [v56+ MacOS 10.9+ required to run](#v56-macos-109-required-to-run)
 * [v57.1+ High DPI support on Windows](#v571-high-dpi-support-on-windows)
+* [v66.0+ Linux patch that fixed HTTPS cache problems on pages with certificate errors was disabled](#v660-linux-patch-that-fixed-https-cache-problems-on-pages-with-certificate-errors-was-disabled)
 
 
 
@@ -295,3 +296,9 @@ option should have its value set to an empty string (a default now)
 for High DPI support. In previous versions the default value was
 "system_dpi" and if you have set it explicitilly in your application,
 then you should change it to an empty string now.
+
+## v66.0+ Linux patch that fixed HTTPS cache problems on pages with certificate errors was disabled
+
+See Issue [#125](../../../issues/125) for more details.
+
+

From b05234f892908e7653036d982e1168dc2b5de7f1 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Tue, 22 May 2018 22:04:46 +0200
Subject: [PATCH 041/238] Fix link

---
 api/ApplicationSettings.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/ApplicationSettings.md b/api/ApplicationSettings.md
index 7f0be88e..be86c4b7 100644
--- a/api/ApplicationSettings.md
+++ b/api/ApplicationSettings.md
@@ -244,7 +244,7 @@ option is set to True.
 When it's set to False then the Chromium's caching behavior does not
 change. Enabling caching with certificate errors is useful on local
 private networks that use self-signed SSL certificates. See the
-referenced CEF topic in [Issue #125](../issues/125) for more details.
+referenced CEF topic in [Issue #125](../../../issues/125) for more details.
 
 
 ### javascript_flags

From 691a0f6ac2fc7852706858907a2917dd8abd9cc0 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Wed, 23 May 2018 11:29:07 +0200
Subject: [PATCH 042/238] Fix patches and update build instructions

---
 docs/Build-instructions.md |  3 +--
 patches/issue231.patch     |  2 +-
 patches/patch.py           | 14 +++++++-------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/docs/Build-instructions.md b/docs/Build-instructions.md
index 60becb6b..507cbc92 100644
--- a/docs/Build-instructions.md
+++ b/docs/Build-instructions.md
@@ -194,7 +194,7 @@ requirements common for all platforms.
 * Install packages: `sudo apt-get install cmake g++ libgtk2.0-dev libgtkglext1-dev`
 * If building CEF from sources:
     * Official binaries are built on Ubuntu 14.04 (cmake 2.8.12, g++ 4.8.4)
-    * Download [ninja](http://martine.github.io/ninja/) 1.7.1 or later
+    * Download [ninja](https://github.com/ninja-build/ninja/releases) 1.7.1 or later
       and copy it to /usr/bin and chmod 755.
     * Install/upgrade required packages using one of the three methods below
       (these packages should be upgraded each time you update to newer CEF):
@@ -223,7 +223,6 @@ requirements common for all platforms.
 * Download [cmake](https://cmake.org/download/) and add it to PATH.
 
 
-
 ### All platforms
 
 * Install/update dependencies for the tools by executing:
diff --git a/patches/issue231.patch b/patches/issue231.patch
index 6e62498e..8bcb91fb 100644
--- a/patches/issue231.patch
+++ b/patches/issue231.patch
@@ -115,7 +115,7 @@ index 15026ab5..a3d21052 100644
 --- libcef_dll/wrapper/libcef_dll_wrapper.cc
 +++ libcef_dll/wrapper/libcef_dll_wrapper.cc
 @@ -880,6 +880,23 @@ CEF_GLOBAL bool CefGetPath(PathKey key, CefString& path) {
-   return _retval?true:false;
+   return _retval ? true : false;
  }
  
 +CEF_GLOBAL bool CefOverridePath(PathKey key, const CefString& path) {
diff --git a/patches/patch.py b/patches/patch.py
index 5fe98998..b6358b4d 100644
--- a/patches/patch.py
+++ b/patches/patch.py
@@ -1,6 +1,6 @@
 # CEF Python patches to Chromium and CEF.
 # See upstream cef/patch/patch.cfg for how patching works in CEF.
-# Current working directory is cef_build_dir/chromium/cef/ .
+# Current working directory is cef_build_dir/chromium/src/ .
 # See also docs/Build-instructions.md and tools/automate.py .
 
 import platform
@@ -12,11 +12,11 @@
 # ALL PLATFORMS
 # noinspection PyUnresolvedReferences
 patches.extend([
-    {
-        # (Disabled) Fixes HTTPS cache problems with private certificates
-        # 'name': 'issue125',
-        # 'path': '../net/http/'
-    },
+    #{
+    #    # (Disabled) Fixes HTTPS cache problems with private certificates
+    #    'name': 'issue125',
+    #    'path': 'net/http/'
+    #},
 ])
 
 # LINUX
@@ -26,6 +26,6 @@
         {
             # Discovery of the "icudtl.dat" file fails on Linux.
             'name': 'issue231',
-            'path': './'
+            'path': 'cef/'
         },
     ])

From 2fb9ae156802c12b9941f61661318386dbf3bfe2 Mon Sep 17 00:00:00 2001
From: Czarek Tomczak <cztomczak@users.noreply.github.com>
Date: Thu, 24 May 2018 10:27:42 +0200
Subject: [PATCH 043/238] Update README - logos and thanks

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 67b5e4be..9c4fa340 100644
--- a/README.md
+++ b/README.md
@@ -99,7 +99,7 @@ Lampix is the first hardware and software solution that turns any surface
 into a smart, augmented reality or interactive surface. Please visit its
 website here: https://lampix.com/
 
-[![lampix600](https://user-images.githubusercontent.com/1187415/40367671-40fecd4e-5dda-11e8-8ef9-1e3d91298c8a.jpg)](https://lampix.com/)
+[![lampix600](https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/lampix600.png)](https://lampix.com/)
 
 ## Install
 
@@ -175,6 +175,8 @@ on the Forum: [[ANN] Call for sponsors](https://groups.google.com/d/topic/cefpyt
 
 ### Thanks
 
+* [2018] Many thanks to [Lampix](https://lampix.com/) for sponsoring the v66
+  release for all platforms
 * [2017] Many thanks to [ClearChat Inc.](https://clearchat.com/) for sponsoring
   the v55/v56 releases for all platforms
 * [2016-2018] Thanks to JetBrains for providing an Open Source license for

From 9306e8928d828593f9aef179fabdfe8f3e312376 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Thu, 24 May 2018 13:31:38 +0200
Subject: [PATCH 044/238] Update CEF header files to CEF branch 3359 rev
 d49d25f (#403)

---
 src/include/base/cef_atomic_ref_count.h       |   65 +-
 src/include/base/cef_atomicops.h              |    3 +-
 src/include/base/cef_basictypes.h             |   30 +-
 src/include/base/cef_bind.h                   |  393 +--
 src/include/base/cef_bind_helpers.h           |   63 +-
 src/include/base/cef_build.h                  |   16 +-
 src/include/base/cef_callback.h               |  234 +-
 src/include/base/cef_callback_list.h          |   59 +-
 src/include/base/cef_cancelable_callback.h    |   53 +-
 src/include/base/cef_lock.h                   |    8 +-
 src/include/base/cef_logging.h                |  244 +-
 src/include/base/cef_macros.h                 |   30 +-
 src/include/base/cef_move.h                   |   26 +-
 src/include/base/cef_platform_thread.h        |   17 +-
 src/include/base/cef_ref_counted.h            |   74 +-
 src/include/base/cef_scoped_ptr.h             |   80 +-
 src/include/base/cef_string16.h               |   35 +-
 src/include/base/cef_template_util.h          |  110 +-
 src/include/base/cef_thread_checker.h         |   11 +-
 .../base/cef_thread_collision_warner.h        |   32 +-
 src/include/base/cef_trace_event.h            |  179 +-
 src/include/base/cef_tuple.h                  | 1159 +++++---
 src/include/base/cef_weak_ptr.h               |   49 +-
 .../base/internal/cef_atomicops_arm_gcc.h     |   53 +-
 .../cef_atomicops_atomicword_compat.h         |   38 +-
 src/include/base/internal/cef_atomicops_mac.h |    6 +-
 .../base/internal/cef_atomicops_x86_gcc.h     |   63 +-
 .../base/internal/cef_atomicops_x86_msvc.h    |   39 +-
 src/include/base/internal/cef_bind_internal.h | 2382 ++++++++++-------
 .../base/internal/cef_bind_internal_win.h     |  318 +--
 .../base/internal/cef_callback_internal.h     |    9 +-
 .../cef_raw_scoped_refptr_mismatch_checker.h  |  129 +-
 ...location.h => cef_accessibility_handler.h} |   38 +-
 src/include/cef_app.h                         |    7 +-
 src/include/cef_application_mac.h             |   16 +-
 src/include/cef_auth_callback.h               |    6 +-
 src/include/cef_base.h                        |   80 +-
 src/include/cef_browser.h                     |  248 +-
 src/include/cef_browser_process_handler.h     |    4 +-
 src/include/cef_callback.h                    |    6 +-
 src/include/cef_client.h                      |   58 +-
 src/include/cef_command_line.h                |   42 +-
 src/include/cef_context_menu_handler.h        |   52 +-
 src/include/cef_cookie.h                      |   40 +-
 src/include/cef_crash_util.h                  |   14 +-
 src/include/cef_dialog_handler.h              |    5 +-
 src/include/cef_display_handler.h             |   30 +-
 src/include/cef_dom.h                         |   86 +-
 src/include/cef_download_handler.h            |   20 +-
 src/include/cef_download_item.h               |   34 +-
 src/include/cef_drag_data.h                   |   60 +-
 src/include/cef_drag_handler.h                |    6 +-
 src/include/cef_extension.h                   |  117 +
 src/include/cef_extension_handler.h           |  199 ++
 src/include/cef_file_util.h                   |   11 +
 src/include/cef_focus_handler.h               |    8 +-
 src/include/cef_frame.h                       |   50 +-
 src/include/cef_image.h                       |   26 +-
 src/include/cef_jsdialog_handler.h            |    6 +-
 src/include/cef_keyboard_handler.h            |    8 +-
 src/include/cef_life_span_handler.h           |    6 +-
 src/include/cef_menu_model.h                  |  116 +-
 src/include/cef_menu_model_delegate.h         |    8 +-
 src/include/cef_navigation_entry.h            |   20 +-
 src/include/cef_origin_whitelist.h            |    1 -
 src/include/cef_parser.h                      |    6 +-
 src/include/cef_print_handler.h               |   31 +-
 src/include/cef_print_settings.h              |   47 +-
 src/include/cef_process_message.h             |   10 +-
 src/include/cef_render_handler.h              |   50 +-
 src/include/cef_render_process_handler.h      |   16 +-
 src/include/cef_request.h                     |   78 +-
 src/include/cef_request_context.h             |  137 +-
 src/include/cef_request_context_handler.h     |   10 +
 src/include/cef_request_handler.h             |   57 +-
 src/include/cef_resource_bundle.h             |    6 +-
 src/include/cef_resource_bundle_handler.h     |    7 +-
 src/include/cef_resource_handler.h            |    8 +-
 src/include/cef_response.h                    |   26 +-
 src/include/cef_response_filter.h             |    4 +-
 src/include/cef_sandbox_win.h                 |    8 +-
 src/include/cef_scheme.h                      |    9 +-
 src/include/cef_server.h                      |  315 +++
 src/include/cef_ssl_info.h                    |    5 +-
 src/include/cef_ssl_status.h                  |   10 +-
 src/include/cef_stream.h                      |   43 +-
 src/include/cef_string_visitor.h              |    2 +-
 src/include/cef_task.h                        |   17 +-
 src/include/cef_thread.h                      |    8 +-
 src/include/cef_trace.h                       |    3 +-
 src/include/cef_urlrequest.h                  |   29 +-
 src/include/cef_v8.h                          |  231 +-
 src/include/cef_values.h                      |  180 +-
 src/include/cef_waitable_event.h              |   10 +-
 src/include/cef_web_plugin.h                  |   17 +-
 src/include/cef_x509_certificate.h            |   42 +-
 src/include/cef_xml_reader.h                  |   60 +-
 src/include/cef_zip_reader.h                  |   25 +-
 src/include/internal/cef_export.h             |   10 +-
 src/include/internal/cef_linux.h              |   24 +-
 src/include/internal/cef_logging_internal.h   |    2 +
 src/include/internal/cef_mac.h                |   26 +-
 src/include/internal/cef_ptr.h                |   10 +-
 src/include/internal/cef_string.h             |    1 -
 src/include/internal/cef_string_list.h        |    3 +-
 src/include/internal/cef_string_map.h         |    7 +-
 src/include/internal/cef_string_multimap.h    |    9 +-
 src/include/internal/cef_string_types.h       |   72 +-
 src/include/internal/cef_string_wrappers.h    |  128 +-
 src/include/internal/cef_thread_internal.h    |    2 +-
 src/include/internal/cef_time.h               |    2 +-
 src/include/internal/cef_types.h              |  494 ++--
 src/include/internal/cef_types_linux.h        |   11 +-
 src/include/internal/cef_types_mac.h          |   11 +-
 src/include/internal/cef_types_win.h          |   15 +-
 src/include/internal/cef_types_wrappers.h     |  323 +--
 src/include/internal/cef_win.h                |   35 +-
 .../cef_test_helpers.h}                       |   72 +-
 src/include/test/cef_translator_test.h        |  265 +-
 src/include/views/cef_box_layout.h            |    4 +-
 src/include/views/cef_browser_view.h          |    4 +-
 src/include/views/cef_button.h                |   12 +-
 src/include/views/cef_button_delegate.h       |    4 +-
 src/include/views/cef_display.h               |   16 +-
 src/include/views/cef_fill_layout.h           |    3 +-
 src/include/views/cef_label_button.h          |   23 +-
 src/include/views/cef_layout.h                |    6 +-
 src/include/views/cef_menu_button.h           |    4 +-
 src/include/views/cef_menu_button_delegate.h  |   18 +-
 src/include/views/cef_panel.h                 |   28 +-
 src/include/views/cef_panel_delegate.h        |    3 +-
 src/include/views/cef_scroll_view.h           |   14 +-
 src/include/views/cef_textfield.h             |   73 +-
 src/include/views/cef_textfield_delegate.h    |    4 +-
 src/include/views/cef_view.h                  |   97 +-
 src/include/views/cef_view_delegate.h         |    8 +-
 src/include/views/cef_window.h                |   75 +-
 src/include/views/cef_window_delegate.h       |   25 +-
 src/include/wrapper/cef_closure_task.h        |    3 +-
 src/include/wrapper/cef_helpers.h             |   26 +-
 src/include/wrapper/cef_message_router.h      |   53 +-
 src/include/wrapper/cef_resource_manager.h    |   34 +-
 .../wrapper/cef_stream_resource_handler.h     |    3 +-
 src/include/wrapper/cef_xml_object.h          |    7 +-
 src/include/wrapper/cef_zip_archive.h         |    8 +-
 145 files changed, 6190 insertions(+), 4829 deletions(-)
 rename src/include/{cef_geolocation.h => cef_accessibility_handler.h} (68%)
 create mode 100644 src/include/cef_extension.h
 create mode 100644 src/include/cef_extension_handler.h
 create mode 100644 src/include/cef_server.h
 rename src/include/{cef_geolocation_handler.h => test/cef_test_helpers.h} (50%)

diff --git a/src/include/base/cef_atomic_ref_count.h b/src/include/base/cef_atomic_ref_count.h
index bdbad6c9..4d677797 100644
--- a/src/include/base/cef_atomic_ref_count.h
+++ b/src/include/base/cef_atomic_ref_count.h
@@ -39,14 +39,49 @@
 #define CEF_INCLUDE_BASE_CEF_ATOMIC_REF_COUNT_H_
 #pragma once
 
-#if defined(BASE_ATOMIC_REF_COUNT_H_)
-// Do nothing if the Chromium header has already been included.
-// This can happen in cases where Chromium code is used directly by the
-// client application. When using Chromium code directly always include
-// the Chromium header first to avoid type conflicts.
-#elif defined(USING_CHROMIUM_INCLUDES)
+#if defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
 #include "base/atomic_ref_count.h"
+
+// Used when declaring a base::AtomicRefCount value. This is an object type with
+// Chromium headers.
+#define ATOMIC_DECLARATION (0)
+
+// Maintaining compatibility with AtompicRefCount* functions that were removed
+// from Chromium in http://crrev.com/ee96d561.
+namespace base {
+
+// Increment a reference count by 1.
+inline void AtomicRefCountInc(volatile AtomicRefCount* ptr) {
+  const_cast<AtomicRefCount*>(ptr)->Increment();
+}
+
+// Decrement a reference count by 1 and return whether the result is non-zero.
+// Insert barriers to ensure that state written before the reference count
+// became zero will be visible to a thread that has just made the count zero.
+inline bool AtomicRefCountDec(volatile AtomicRefCount* ptr) {
+  return const_cast<AtomicRefCount*>(ptr)->Decrement();
+}
+
+// Return whether the reference count is one.  If the reference count is used
+// in the conventional way, a refrerence count of 1 implies that the current
+// thread owns the reference and no other thread shares it.  This call performs
+// the test for a reference count of one, and performs the memory barrier
+// needed for the owning thread to act on the object, knowing that it has
+// exclusive access to the object.
+inline bool AtomicRefCountIsOne(volatile AtomicRefCount* ptr) {
+  return const_cast<AtomicRefCount*>(ptr)->IsOne();
+}
+
+// Return whether the reference count is zero.  With conventional object
+// referencing counting, the object will be destroyed, so the reference count
+// should never be zero.  Hence this is generally used for a debug check.
+inline bool AtomicRefCountIsZero(volatile AtomicRefCount* ptr) {
+  return const_cast<AtomicRefCount*>(ptr)->IsZero();
+}
+
+}  // namespace base
+
 #else  // !USING_CHROMIUM_INCLUDES
 // The following is substantially similar to the Chromium implementation.
 // If the Chromium implementation diverges the below implementation should be
@@ -56,14 +91,18 @@
 
 // Annotations are not currently supported.
 #define ANNOTATE_HAPPENS_BEFORE(obj) /* empty */
-#define ANNOTATE_HAPPENS_AFTER(obj) /* empty */
+#define ANNOTATE_HAPPENS_AFTER(obj)  /* empty */
+
+// Used when declaring a base::AtomicRefCount value. This is an integer/ptr type
+// with CEF headers.
+#define ATOMIC_DECLARATION = 0
 
 namespace base {
 
 typedef subtle::Atomic32 AtomicRefCount;
 
 // Increment a reference count by "increment", which must exceed 0.
-inline void AtomicRefCountIncN(volatile AtomicRefCount *ptr,
+inline void AtomicRefCountIncN(volatile AtomicRefCount* ptr,
                                AtomicRefCount increment) {
   subtle::NoBarrier_AtomicIncrement(ptr, increment);
 }
@@ -72,7 +111,7 @@ inline void AtomicRefCountIncN(volatile AtomicRefCount *ptr,
 // and return whether the result is non-zero.
 // Insert barriers to ensure that state written before the reference count
 // became zero will be visible to a thread that has just made the count zero.
-inline bool AtomicRefCountDecN(volatile AtomicRefCount *ptr,
+inline bool AtomicRefCountDecN(volatile AtomicRefCount* ptr,
                                AtomicRefCount decrement) {
   ANNOTATE_HAPPENS_BEFORE(ptr);
   bool res = (subtle::Barrier_AtomicIncrement(ptr, -decrement) != 0);
@@ -83,14 +122,14 @@ inline bool AtomicRefCountDecN(volatile AtomicRefCount *ptr,
 }
 
 // Increment a reference count by 1.
-inline void AtomicRefCountInc(volatile AtomicRefCount *ptr) {
+inline void AtomicRefCountInc(volatile AtomicRefCount* ptr) {
   base::AtomicRefCountIncN(ptr, 1);
 }
 
 // Decrement a reference count by 1 and return whether the result is non-zero.
 // Insert barriers to ensure that state written before the reference count
 // became zero will be visible to a thread that has just made the count zero.
-inline bool AtomicRefCountDec(volatile AtomicRefCount *ptr) {
+inline bool AtomicRefCountDec(volatile AtomicRefCount* ptr) {
   return base::AtomicRefCountDecN(ptr, 1);
 }
 
@@ -100,7 +139,7 @@ inline bool AtomicRefCountDec(volatile AtomicRefCount *ptr) {
 // the test for a reference count of one, and performs the memory barrier
 // needed for the owning thread to act on the object, knowing that it has
 // exclusive access to the object.
-inline bool AtomicRefCountIsOne(volatile AtomicRefCount *ptr) {
+inline bool AtomicRefCountIsOne(volatile AtomicRefCount* ptr) {
   bool res = (subtle::Acquire_Load(ptr) == 1);
   if (res) {
     ANNOTATE_HAPPENS_AFTER(ptr);
@@ -111,7 +150,7 @@ inline bool AtomicRefCountIsOne(volatile AtomicRefCount *ptr) {
 // Return whether the reference count is zero.  With conventional object
 // referencing counting, the object will be destroyed, so the reference count
 // should never be zero.  Hence this is generally used for a debug check.
-inline bool AtomicRefCountIsZero(volatile AtomicRefCount *ptr) {
+inline bool AtomicRefCountIsZero(volatile AtomicRefCount* ptr) {
   bool res = (subtle::Acquire_Load(ptr) == 0);
   if (res) {
     ANNOTATE_HAPPENS_AFTER(ptr);
diff --git a/src/include/base/cef_atomicops.h b/src/include/base/cef_atomicops.h
index ae74802f..96aebabf 100644
--- a/src/include/base/cef_atomicops.h
+++ b/src/include/base/cef_atomicops.h
@@ -122,8 +122,7 @@ Atomic32 NoBarrier_AtomicExchange(volatile Atomic32* ptr, Atomic32 new_value);
 // *ptr with the increment applied.  This routine implies no memory barriers.
 Atomic32 NoBarrier_AtomicIncrement(volatile Atomic32* ptr, Atomic32 increment);
 
-Atomic32 Barrier_AtomicIncrement(volatile Atomic32* ptr,
-                                 Atomic32 increment);
+Atomic32 Barrier_AtomicIncrement(volatile Atomic32* ptr, Atomic32 increment);
 
 // These following lower-level operations are typically useful only to people
 // implementing higher-level synchronization operations like spinlocks,
diff --git a/src/include/base/cef_basictypes.h b/src/include/base/cef_basictypes.h
index 193e910f..e38f4f72 100644
--- a/src/include/base/cef_basictypes.h
+++ b/src/include/base/cef_basictypes.h
@@ -32,8 +32,8 @@
 #define CEF_INCLUDE_BASE_CEF_BASICTYPES_H_
 #pragma once
 
-#include <limits.h>         // For UINT_MAX
-#include <stddef.h>         // For size_t
+#include <limits.h>  // For UINT_MAX
+#include <stddef.h>  // For size_t
 
 #include "include/base/cef_build.h"
 
@@ -43,34 +43,44 @@
 // On Mac OS X, |long long| is used for 64-bit types for compatibility with
 // <inttypes.h> format macros even in the LP64 model.
 #if defined(__LP64__) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
-typedef long                int64;  // NOLINT(runtime/int)
-typedef unsigned long       uint64;  // NOLINT(runtime/int)
+typedef long int64;
+typedef unsigned long uint64;
 #else
-typedef long long           int64;  // NOLINT(runtime/int)
-typedef unsigned long long  uint64;  // NOLINT(runtime/int)
+typedef long long int64;
+typedef unsigned long long uint64;
 #endif
 
 // TODO: Remove these type guards.  These are to avoid conflicts with
 // obsolete/protypes.h in the Gecko SDK.
 #ifndef _INT32
 #define _INT32
-typedef int                 int32;
+typedef int int32;
 #endif
 
 // TODO: Remove these type guards.  These are to avoid conflicts with
 // obsolete/protypes.h in the Gecko SDK.
 #ifndef _UINT32
 #define _UINT32
-typedef unsigned int       uint32;
+typedef unsigned int uint32;
+#endif
+
+#ifndef _INT16
+#define _INT16
+typedef short int16;
+#endif
+
+#ifndef _UINT16
+#define _UINT16
+typedef unsigned short uint16;
 #endif
 
 // UTF-16 character type.
 // This should be kept synchronized with base/strings/string16.h
 #ifndef char16
 #if defined(WCHAR_T_IS_UTF16)
-typedef wchar_t             char16;
+typedef wchar_t char16;
 #elif defined(WCHAR_T_IS_UTF32)
-typedef unsigned short      char16;
+typedef unsigned short char16;
 #endif
 #endif
 
diff --git a/src/include/base/cef_bind.h b/src/include/base/cef_bind.h
index 8ee406d7..77c9c557 100644
--- a/src/include/base/cef_bind.h
+++ b/src/include/base/cef_bind.h
@@ -89,34 +89,32 @@
 namespace base {
 
 template <typename Functor>
-base::Callback<
-    typename cef_internal::BindState<
-        typename cef_internal::FunctorTraits<Functor>::RunnableType,
-        typename cef_internal::FunctorTraits<Functor>::RunType,
-        void()>
-            ::UnboundRunType>
+base::Callback<typename cef_internal::BindState<
+    typename cef_internal::FunctorTraits<Functor>::RunnableType,
+    typename cef_internal::FunctorTraits<Functor>::RunType,
+    void()>::UnboundRunType>
 Bind(Functor functor) {
   // Typedefs for how to store and run the functor.
-  typedef typename cef_internal::FunctorTraits<Functor>::RunnableType RunnableType;
+  typedef
+      typename cef_internal::FunctorTraits<Functor>::RunnableType RunnableType;
   typedef typename cef_internal::FunctorTraits<Functor>::RunType RunType;
 
   typedef cef_internal::BindState<RunnableType, RunType, void()> BindState;
 
-
   return Callback<typename BindState::UnboundRunType>(
       new BindState(cef_internal::MakeRunnable(functor)));
 }
 
 template <typename Functor, typename P1>
-base::Callback<
-    typename cef_internal::BindState<
-        typename cef_internal::FunctorTraits<Functor>::RunnableType,
-        typename cef_internal::FunctorTraits<Functor>::RunType,
-        void(typename cef_internal::CallbackParamTraits<P1>::StorageType)>
-            ::UnboundRunType>
+base::Callback<typename cef_internal::BindState<
+    typename cef_internal::FunctorTraits<Functor>::RunnableType,
+    typename cef_internal::FunctorTraits<Functor>::RunType,
+    void(typename cef_internal::CallbackParamTraits<P1>::StorageType)>::
+                   UnboundRunType>
 Bind(Functor functor, const P1& p1) {
   // Typedefs for how to store and run the functor.
-  typedef typename cef_internal::FunctorTraits<Functor>::RunnableType RunnableType;
+  typedef
+      typename cef_internal::FunctorTraits<Functor>::RunnableType RunnableType;
   typedef typename cef_internal::FunctorTraits<Functor>::RunType RunType;
 
   // Use RunnableType::RunType instead of RunType above because our
@@ -131,39 +129,39 @@ Bind(Functor functor, const P1& p1) {
   // invoked function will receive a reference to the stored copy of the
   // argument and not the original.
   COMPILE_ASSERT(
-      !(is_non_const_reference<typename BoundFunctorTraits::A1Type>::value ),
+      !(is_non_const_reference<typename BoundFunctorTraits::A1Type>::value),
       do_not_bind_functions_with_nonconst_ref);
 
   // For methods, we need to be careful for parameter 1.  We do not require
   // a scoped_refptr because BindState<> itself takes care of AddRef() for
   // methods. We also disallow binding of an array as the method's target
   // object.
-  COMPILE_ASSERT(
-      cef_internal::HasIsMethodTag<RunnableType>::value ||
-          !cef_internal::NeedsScopedRefptrButGetsRawPtr<P1>::value,
-      p1_is_refcounted_type_and_needs_scoped_refptr);
+  COMPILE_ASSERT(cef_internal::HasIsMethodTag<RunnableType>::value ||
+                     !cef_internal::NeedsScopedRefptrButGetsRawPtr<P1>::value,
+                 p1_is_refcounted_type_and_needs_scoped_refptr);
   COMPILE_ASSERT(!cef_internal::HasIsMethodTag<RunnableType>::value ||
                      !is_array<P1>::value,
                  first_bound_argument_to_method_cannot_be_array);
-  typedef cef_internal::BindState<RunnableType, RunType,
-      void(typename cef_internal::CallbackParamTraits<P1>::StorageType)> BindState;
-
+  typedef cef_internal::BindState<
+      RunnableType, RunType,
+      void(typename cef_internal::CallbackParamTraits<P1>::StorageType)>
+      BindState;
 
   return Callback<typename BindState::UnboundRunType>(
       new BindState(cef_internal::MakeRunnable(functor), p1));
 }
 
 template <typename Functor, typename P1, typename P2>
-base::Callback<
-    typename cef_internal::BindState<
-        typename cef_internal::FunctorTraits<Functor>::RunnableType,
-        typename cef_internal::FunctorTraits<Functor>::RunType,
-        void(typename cef_internal::CallbackParamTraits<P1>::StorageType,
-            typename cef_internal::CallbackParamTraits<P2>::StorageType)>
-            ::UnboundRunType>
+base::Callback<typename cef_internal::BindState<
+    typename cef_internal::FunctorTraits<Functor>::RunnableType,
+    typename cef_internal::FunctorTraits<Functor>::RunType,
+    void(typename cef_internal::CallbackParamTraits<P1>::StorageType,
+         typename cef_internal::CallbackParamTraits<P2>::StorageType)>::
+                   UnboundRunType>
 Bind(Functor functor, const P1& p1, const P2& p2) {
   // Typedefs for how to store and run the functor.
-  typedef typename cef_internal::FunctorTraits<Functor>::RunnableType RunnableType;
+  typedef
+      typename cef_internal::FunctorTraits<Functor>::RunnableType RunnableType;
   typedef typename cef_internal::FunctorTraits<Functor>::RunType RunType;
 
   // Use RunnableType::RunType instead of RunType above because our
@@ -179,43 +177,43 @@ Bind(Functor functor, const P1& p1, const P2& p2) {
   // argument and not the original.
   COMPILE_ASSERT(
       !(is_non_const_reference<typename BoundFunctorTraits::A1Type>::value ||
-          is_non_const_reference<typename BoundFunctorTraits::A2Type>::value ),
+        is_non_const_reference<typename BoundFunctorTraits::A2Type>::value),
       do_not_bind_functions_with_nonconst_ref);
 
   // For methods, we need to be careful for parameter 1.  We do not require
   // a scoped_refptr because BindState<> itself takes care of AddRef() for
   // methods. We also disallow binding of an array as the method's target
   // object.
-  COMPILE_ASSERT(
-      cef_internal::HasIsMethodTag<RunnableType>::value ||
-          !cef_internal::NeedsScopedRefptrButGetsRawPtr<P1>::value,
-      p1_is_refcounted_type_and_needs_scoped_refptr);
+  COMPILE_ASSERT(cef_internal::HasIsMethodTag<RunnableType>::value ||
+                     !cef_internal::NeedsScopedRefptrButGetsRawPtr<P1>::value,
+                 p1_is_refcounted_type_and_needs_scoped_refptr);
   COMPILE_ASSERT(!cef_internal::HasIsMethodTag<RunnableType>::value ||
                      !is_array<P1>::value,
                  first_bound_argument_to_method_cannot_be_array);
   COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P2>::value,
                  p2_is_refcounted_type_and_needs_scoped_refptr);
-  typedef cef_internal::BindState<RunnableType, RunType,
+  typedef cef_internal::BindState<
+      RunnableType, RunType,
       void(typename cef_internal::CallbackParamTraits<P1>::StorageType,
-      typename cef_internal::CallbackParamTraits<P2>::StorageType)> BindState;
-
+           typename cef_internal::CallbackParamTraits<P2>::StorageType)>
+      BindState;
 
   return Callback<typename BindState::UnboundRunType>(
       new BindState(cef_internal::MakeRunnable(functor), p1, p2));
 }
 
 template <typename Functor, typename P1, typename P2, typename P3>
-base::Callback<
-    typename cef_internal::BindState<
-        typename cef_internal::FunctorTraits<Functor>::RunnableType,
-        typename cef_internal::FunctorTraits<Functor>::RunType,
-        void(typename cef_internal::CallbackParamTraits<P1>::StorageType,
-            typename cef_internal::CallbackParamTraits<P2>::StorageType,
-            typename cef_internal::CallbackParamTraits<P3>::StorageType)>
-            ::UnboundRunType>
+base::Callback<typename cef_internal::BindState<
+    typename cef_internal::FunctorTraits<Functor>::RunnableType,
+    typename cef_internal::FunctorTraits<Functor>::RunType,
+    void(typename cef_internal::CallbackParamTraits<P1>::StorageType,
+         typename cef_internal::CallbackParamTraits<P2>::StorageType,
+         typename cef_internal::CallbackParamTraits<P3>::StorageType)>::
+                   UnboundRunType>
 Bind(Functor functor, const P1& p1, const P2& p2, const P3& p3) {
   // Typedefs for how to store and run the functor.
-  typedef typename cef_internal::FunctorTraits<Functor>::RunnableType RunnableType;
+  typedef
+      typename cef_internal::FunctorTraits<Functor>::RunnableType RunnableType;
   typedef typename cef_internal::FunctorTraits<Functor>::RunType RunType;
 
   // Use RunnableType::RunType instead of RunType above because our
@@ -231,18 +229,17 @@ Bind(Functor functor, const P1& p1, const P2& p2, const P3& p3) {
   // argument and not the original.
   COMPILE_ASSERT(
       !(is_non_const_reference<typename BoundFunctorTraits::A1Type>::value ||
-          is_non_const_reference<typename BoundFunctorTraits::A2Type>::value ||
-          is_non_const_reference<typename BoundFunctorTraits::A3Type>::value ),
+        is_non_const_reference<typename BoundFunctorTraits::A2Type>::value ||
+        is_non_const_reference<typename BoundFunctorTraits::A3Type>::value),
       do_not_bind_functions_with_nonconst_ref);
 
   // For methods, we need to be careful for parameter 1.  We do not require
   // a scoped_refptr because BindState<> itself takes care of AddRef() for
   // methods. We also disallow binding of an array as the method's target
   // object.
-  COMPILE_ASSERT(
-      cef_internal::HasIsMethodTag<RunnableType>::value ||
-          !cef_internal::NeedsScopedRefptrButGetsRawPtr<P1>::value,
-      p1_is_refcounted_type_and_needs_scoped_refptr);
+  COMPILE_ASSERT(cef_internal::HasIsMethodTag<RunnableType>::value ||
+                     !cef_internal::NeedsScopedRefptrButGetsRawPtr<P1>::value,
+                 p1_is_refcounted_type_and_needs_scoped_refptr);
   COMPILE_ASSERT(!cef_internal::HasIsMethodTag<RunnableType>::value ||
                      !is_array<P1>::value,
                  first_bound_argument_to_method_cannot_be_array);
@@ -250,29 +247,30 @@ Bind(Functor functor, const P1& p1, const P2& p2, const P3& p3) {
                  p2_is_refcounted_type_and_needs_scoped_refptr);
   COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P3>::value,
                  p3_is_refcounted_type_and_needs_scoped_refptr);
-  typedef cef_internal::BindState<RunnableType, RunType,
+  typedef cef_internal::BindState<
+      RunnableType, RunType,
       void(typename cef_internal::CallbackParamTraits<P1>::StorageType,
-      typename cef_internal::CallbackParamTraits<P2>::StorageType,
-      typename cef_internal::CallbackParamTraits<P3>::StorageType)> BindState;
-
+           typename cef_internal::CallbackParamTraits<P2>::StorageType,
+           typename cef_internal::CallbackParamTraits<P3>::StorageType)>
+      BindState;
 
   return Callback<typename BindState::UnboundRunType>(
       new BindState(cef_internal::MakeRunnable(functor), p1, p2, p3));
 }
 
 template <typename Functor, typename P1, typename P2, typename P3, typename P4>
-base::Callback<
-    typename cef_internal::BindState<
-        typename cef_internal::FunctorTraits<Functor>::RunnableType,
-        typename cef_internal::FunctorTraits<Functor>::RunType,
-        void(typename cef_internal::CallbackParamTraits<P1>::StorageType,
-            typename cef_internal::CallbackParamTraits<P2>::StorageType,
-            typename cef_internal::CallbackParamTraits<P3>::StorageType,
-            typename cef_internal::CallbackParamTraits<P4>::StorageType)>
-            ::UnboundRunType>
+base::Callback<typename cef_internal::BindState<
+    typename cef_internal::FunctorTraits<Functor>::RunnableType,
+    typename cef_internal::FunctorTraits<Functor>::RunType,
+    void(typename cef_internal::CallbackParamTraits<P1>::StorageType,
+         typename cef_internal::CallbackParamTraits<P2>::StorageType,
+         typename cef_internal::CallbackParamTraits<P3>::StorageType,
+         typename cef_internal::CallbackParamTraits<P4>::StorageType)>::
+                   UnboundRunType>
 Bind(Functor functor, const P1& p1, const P2& p2, const P3& p3, const P4& p4) {
   // Typedefs for how to store and run the functor.
-  typedef typename cef_internal::FunctorTraits<Functor>::RunnableType RunnableType;
+  typedef
+      typename cef_internal::FunctorTraits<Functor>::RunnableType RunnableType;
   typedef typename cef_internal::FunctorTraits<Functor>::RunType RunType;
 
   // Use RunnableType::RunType instead of RunType above because our
@@ -288,19 +286,18 @@ Bind(Functor functor, const P1& p1, const P2& p2, const P3& p3, const P4& p4) {
   // argument and not the original.
   COMPILE_ASSERT(
       !(is_non_const_reference<typename BoundFunctorTraits::A1Type>::value ||
-          is_non_const_reference<typename BoundFunctorTraits::A2Type>::value ||
-          is_non_const_reference<typename BoundFunctorTraits::A3Type>::value ||
-          is_non_const_reference<typename BoundFunctorTraits::A4Type>::value ),
+        is_non_const_reference<typename BoundFunctorTraits::A2Type>::value ||
+        is_non_const_reference<typename BoundFunctorTraits::A3Type>::value ||
+        is_non_const_reference<typename BoundFunctorTraits::A4Type>::value),
       do_not_bind_functions_with_nonconst_ref);
 
   // For methods, we need to be careful for parameter 1.  We do not require
   // a scoped_refptr because BindState<> itself takes care of AddRef() for
   // methods. We also disallow binding of an array as the method's target
   // object.
-  COMPILE_ASSERT(
-      cef_internal::HasIsMethodTag<RunnableType>::value ||
-          !cef_internal::NeedsScopedRefptrButGetsRawPtr<P1>::value,
-      p1_is_refcounted_type_and_needs_scoped_refptr);
+  COMPILE_ASSERT(cef_internal::HasIsMethodTag<RunnableType>::value ||
+                     !cef_internal::NeedsScopedRefptrButGetsRawPtr<P1>::value,
+                 p1_is_refcounted_type_and_needs_scoped_refptr);
   COMPILE_ASSERT(!cef_internal::HasIsMethodTag<RunnableType>::value ||
                      !is_array<P1>::value,
                  first_bound_argument_to_method_cannot_be_array);
@@ -310,33 +307,42 @@ Bind(Functor functor, const P1& p1, const P2& p2, const P3& p3, const P4& p4) {
                  p3_is_refcounted_type_and_needs_scoped_refptr);
   COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P4>::value,
                  p4_is_refcounted_type_and_needs_scoped_refptr);
-  typedef cef_internal::BindState<RunnableType, RunType,
+  typedef cef_internal::BindState<
+      RunnableType, RunType,
       void(typename cef_internal::CallbackParamTraits<P1>::StorageType,
-      typename cef_internal::CallbackParamTraits<P2>::StorageType,
-      typename cef_internal::CallbackParamTraits<P3>::StorageType,
-      typename cef_internal::CallbackParamTraits<P4>::StorageType)> BindState;
-
+           typename cef_internal::CallbackParamTraits<P2>::StorageType,
+           typename cef_internal::CallbackParamTraits<P3>::StorageType,
+           typename cef_internal::CallbackParamTraits<P4>::StorageType)>
+      BindState;
 
   return Callback<typename BindState::UnboundRunType>(
       new BindState(cef_internal::MakeRunnable(functor), p1, p2, p3, p4));
 }
 
-template <typename Functor, typename P1, typename P2, typename P3, typename P4,
-    typename P5>
-base::Callback<
-    typename cef_internal::BindState<
-        typename cef_internal::FunctorTraits<Functor>::RunnableType,
-        typename cef_internal::FunctorTraits<Functor>::RunType,
-        void(typename cef_internal::CallbackParamTraits<P1>::StorageType,
-            typename cef_internal::CallbackParamTraits<P2>::StorageType,
-            typename cef_internal::CallbackParamTraits<P3>::StorageType,
-            typename cef_internal::CallbackParamTraits<P4>::StorageType,
-            typename cef_internal::CallbackParamTraits<P5>::StorageType)>
-            ::UnboundRunType>
-Bind(Functor functor, const P1& p1, const P2& p2, const P3& p3, const P4& p4,
-    const P5& p5) {
+template <typename Functor,
+          typename P1,
+          typename P2,
+          typename P3,
+          typename P4,
+          typename P5>
+base::Callback<typename cef_internal::BindState<
+    typename cef_internal::FunctorTraits<Functor>::RunnableType,
+    typename cef_internal::FunctorTraits<Functor>::RunType,
+    void(typename cef_internal::CallbackParamTraits<P1>::StorageType,
+         typename cef_internal::CallbackParamTraits<P2>::StorageType,
+         typename cef_internal::CallbackParamTraits<P3>::StorageType,
+         typename cef_internal::CallbackParamTraits<P4>::StorageType,
+         typename cef_internal::CallbackParamTraits<P5>::StorageType)>::
+                   UnboundRunType>
+Bind(Functor functor,
+     const P1& p1,
+     const P2& p2,
+     const P3& p3,
+     const P4& p4,
+     const P5& p5) {
   // Typedefs for how to store and run the functor.
-  typedef typename cef_internal::FunctorTraits<Functor>::RunnableType RunnableType;
+  typedef
+      typename cef_internal::FunctorTraits<Functor>::RunnableType RunnableType;
   typedef typename cef_internal::FunctorTraits<Functor>::RunType RunType;
 
   // Use RunnableType::RunType instead of RunType above because our
@@ -352,20 +358,19 @@ Bind(Functor functor, const P1& p1, const P2& p2, const P3& p3, const P4& p4,
   // argument and not the original.
   COMPILE_ASSERT(
       !(is_non_const_reference<typename BoundFunctorTraits::A1Type>::value ||
-          is_non_const_reference<typename BoundFunctorTraits::A2Type>::value ||
-          is_non_const_reference<typename BoundFunctorTraits::A3Type>::value ||
-          is_non_const_reference<typename BoundFunctorTraits::A4Type>::value ||
-          is_non_const_reference<typename BoundFunctorTraits::A5Type>::value ),
+        is_non_const_reference<typename BoundFunctorTraits::A2Type>::value ||
+        is_non_const_reference<typename BoundFunctorTraits::A3Type>::value ||
+        is_non_const_reference<typename BoundFunctorTraits::A4Type>::value ||
+        is_non_const_reference<typename BoundFunctorTraits::A5Type>::value),
       do_not_bind_functions_with_nonconst_ref);
 
   // For methods, we need to be careful for parameter 1.  We do not require
   // a scoped_refptr because BindState<> itself takes care of AddRef() for
   // methods. We also disallow binding of an array as the method's target
   // object.
-  COMPILE_ASSERT(
-      cef_internal::HasIsMethodTag<RunnableType>::value ||
-          !cef_internal::NeedsScopedRefptrButGetsRawPtr<P1>::value,
-      p1_is_refcounted_type_and_needs_scoped_refptr);
+  COMPILE_ASSERT(cef_internal::HasIsMethodTag<RunnableType>::value ||
+                     !cef_internal::NeedsScopedRefptrButGetsRawPtr<P1>::value,
+                 p1_is_refcounted_type_and_needs_scoped_refptr);
   COMPILE_ASSERT(!cef_internal::HasIsMethodTag<RunnableType>::value ||
                      !is_array<P1>::value,
                  first_bound_argument_to_method_cannot_be_array);
@@ -377,35 +382,46 @@ Bind(Functor functor, const P1& p1, const P2& p2, const P3& p3, const P4& p4,
                  p4_is_refcounted_type_and_needs_scoped_refptr);
   COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P5>::value,
                  p5_is_refcounted_type_and_needs_scoped_refptr);
-  typedef cef_internal::BindState<RunnableType, RunType,
+  typedef cef_internal::BindState<
+      RunnableType, RunType,
       void(typename cef_internal::CallbackParamTraits<P1>::StorageType,
-      typename cef_internal::CallbackParamTraits<P2>::StorageType,
-      typename cef_internal::CallbackParamTraits<P3>::StorageType,
-      typename cef_internal::CallbackParamTraits<P4>::StorageType,
-      typename cef_internal::CallbackParamTraits<P5>::StorageType)> BindState;
-
+           typename cef_internal::CallbackParamTraits<P2>::StorageType,
+           typename cef_internal::CallbackParamTraits<P3>::StorageType,
+           typename cef_internal::CallbackParamTraits<P4>::StorageType,
+           typename cef_internal::CallbackParamTraits<P5>::StorageType)>
+      BindState;
 
   return Callback<typename BindState::UnboundRunType>(
       new BindState(cef_internal::MakeRunnable(functor), p1, p2, p3, p4, p5));
 }
 
-template <typename Functor, typename P1, typename P2, typename P3, typename P4,
-    typename P5, typename P6>
-base::Callback<
-    typename cef_internal::BindState<
-        typename cef_internal::FunctorTraits<Functor>::RunnableType,
-        typename cef_internal::FunctorTraits<Functor>::RunType,
-        void(typename cef_internal::CallbackParamTraits<P1>::StorageType,
-            typename cef_internal::CallbackParamTraits<P2>::StorageType,
-            typename cef_internal::CallbackParamTraits<P3>::StorageType,
-            typename cef_internal::CallbackParamTraits<P4>::StorageType,
-            typename cef_internal::CallbackParamTraits<P5>::StorageType,
-            typename cef_internal::CallbackParamTraits<P6>::StorageType)>
-            ::UnboundRunType>
-Bind(Functor functor, const P1& p1, const P2& p2, const P3& p3, const P4& p4,
-    const P5& p5, const P6& p6) {
+template <typename Functor,
+          typename P1,
+          typename P2,
+          typename P3,
+          typename P4,
+          typename P5,
+          typename P6>
+base::Callback<typename cef_internal::BindState<
+    typename cef_internal::FunctorTraits<Functor>::RunnableType,
+    typename cef_internal::FunctorTraits<Functor>::RunType,
+    void(typename cef_internal::CallbackParamTraits<P1>::StorageType,
+         typename cef_internal::CallbackParamTraits<P2>::StorageType,
+         typename cef_internal::CallbackParamTraits<P3>::StorageType,
+         typename cef_internal::CallbackParamTraits<P4>::StorageType,
+         typename cef_internal::CallbackParamTraits<P5>::StorageType,
+         typename cef_internal::CallbackParamTraits<P6>::StorageType)>::
+                   UnboundRunType>
+Bind(Functor functor,
+     const P1& p1,
+     const P2& p2,
+     const P3& p3,
+     const P4& p4,
+     const P5& p5,
+     const P6& p6) {
   // Typedefs for how to store and run the functor.
-  typedef typename cef_internal::FunctorTraits<Functor>::RunnableType RunnableType;
+  typedef
+      typename cef_internal::FunctorTraits<Functor>::RunnableType RunnableType;
   typedef typename cef_internal::FunctorTraits<Functor>::RunType RunType;
 
   // Use RunnableType::RunType instead of RunType above because our
@@ -421,21 +437,20 @@ Bind(Functor functor, const P1& p1, const P2& p2, const P3& p3, const P4& p4,
   // argument and not the original.
   COMPILE_ASSERT(
       !(is_non_const_reference<typename BoundFunctorTraits::A1Type>::value ||
-          is_non_const_reference<typename BoundFunctorTraits::A2Type>::value ||
-          is_non_const_reference<typename BoundFunctorTraits::A3Type>::value ||
-          is_non_const_reference<typename BoundFunctorTraits::A4Type>::value ||
-          is_non_const_reference<typename BoundFunctorTraits::A5Type>::value ||
-          is_non_const_reference<typename BoundFunctorTraits::A6Type>::value ),
+        is_non_const_reference<typename BoundFunctorTraits::A2Type>::value ||
+        is_non_const_reference<typename BoundFunctorTraits::A3Type>::value ||
+        is_non_const_reference<typename BoundFunctorTraits::A4Type>::value ||
+        is_non_const_reference<typename BoundFunctorTraits::A5Type>::value ||
+        is_non_const_reference<typename BoundFunctorTraits::A6Type>::value),
       do_not_bind_functions_with_nonconst_ref);
 
   // For methods, we need to be careful for parameter 1.  We do not require
   // a scoped_refptr because BindState<> itself takes care of AddRef() for
   // methods. We also disallow binding of an array as the method's target
   // object.
-  COMPILE_ASSERT(
-      cef_internal::HasIsMethodTag<RunnableType>::value ||
-          !cef_internal::NeedsScopedRefptrButGetsRawPtr<P1>::value,
-      p1_is_refcounted_type_and_needs_scoped_refptr);
+  COMPILE_ASSERT(cef_internal::HasIsMethodTag<RunnableType>::value ||
+                     !cef_internal::NeedsScopedRefptrButGetsRawPtr<P1>::value,
+                 p1_is_refcounted_type_and_needs_scoped_refptr);
   COMPILE_ASSERT(!cef_internal::HasIsMethodTag<RunnableType>::value ||
                      !is_array<P1>::value,
                  first_bound_argument_to_method_cannot_be_array);
@@ -449,37 +464,50 @@ Bind(Functor functor, const P1& p1, const P2& p2, const P3& p3, const P4& p4,
                  p5_is_refcounted_type_and_needs_scoped_refptr);
   COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P6>::value,
                  p6_is_refcounted_type_and_needs_scoped_refptr);
-  typedef cef_internal::BindState<RunnableType, RunType,
+  typedef cef_internal::BindState<
+      RunnableType, RunType,
       void(typename cef_internal::CallbackParamTraits<P1>::StorageType,
-      typename cef_internal::CallbackParamTraits<P2>::StorageType,
-      typename cef_internal::CallbackParamTraits<P3>::StorageType,
-      typename cef_internal::CallbackParamTraits<P4>::StorageType,
-      typename cef_internal::CallbackParamTraits<P5>::StorageType,
-      typename cef_internal::CallbackParamTraits<P6>::StorageType)> BindState;
-
-
-  return Callback<typename BindState::UnboundRunType>(
-      new BindState(cef_internal::MakeRunnable(functor), p1, p2, p3, p4, p5, p6));
+           typename cef_internal::CallbackParamTraits<P2>::StorageType,
+           typename cef_internal::CallbackParamTraits<P3>::StorageType,
+           typename cef_internal::CallbackParamTraits<P4>::StorageType,
+           typename cef_internal::CallbackParamTraits<P5>::StorageType,
+           typename cef_internal::CallbackParamTraits<P6>::StorageType)>
+      BindState;
+
+  return Callback<typename BindState::UnboundRunType>(new BindState(
+      cef_internal::MakeRunnable(functor), p1, p2, p3, p4, p5, p6));
 }
 
-template <typename Functor, typename P1, typename P2, typename P3, typename P4,
-    typename P5, typename P6, typename P7>
-base::Callback<
-    typename cef_internal::BindState<
-        typename cef_internal::FunctorTraits<Functor>::RunnableType,
-        typename cef_internal::FunctorTraits<Functor>::RunType,
-        void(typename cef_internal::CallbackParamTraits<P1>::StorageType,
-            typename cef_internal::CallbackParamTraits<P2>::StorageType,
-            typename cef_internal::CallbackParamTraits<P3>::StorageType,
-            typename cef_internal::CallbackParamTraits<P4>::StorageType,
-            typename cef_internal::CallbackParamTraits<P5>::StorageType,
-            typename cef_internal::CallbackParamTraits<P6>::StorageType,
-            typename cef_internal::CallbackParamTraits<P7>::StorageType)>
-            ::UnboundRunType>
-Bind(Functor functor, const P1& p1, const P2& p2, const P3& p3, const P4& p4,
-    const P5& p5, const P6& p6, const P7& p7) {
+template <typename Functor,
+          typename P1,
+          typename P2,
+          typename P3,
+          typename P4,
+          typename P5,
+          typename P6,
+          typename P7>
+base::Callback<typename cef_internal::BindState<
+    typename cef_internal::FunctorTraits<Functor>::RunnableType,
+    typename cef_internal::FunctorTraits<Functor>::RunType,
+    void(typename cef_internal::CallbackParamTraits<P1>::StorageType,
+         typename cef_internal::CallbackParamTraits<P2>::StorageType,
+         typename cef_internal::CallbackParamTraits<P3>::StorageType,
+         typename cef_internal::CallbackParamTraits<P4>::StorageType,
+         typename cef_internal::CallbackParamTraits<P5>::StorageType,
+         typename cef_internal::CallbackParamTraits<P6>::StorageType,
+         typename cef_internal::CallbackParamTraits<P7>::StorageType)>::
+                   UnboundRunType>
+Bind(Functor functor,
+     const P1& p1,
+     const P2& p2,
+     const P3& p3,
+     const P4& p4,
+     const P5& p5,
+     const P6& p6,
+     const P7& p7) {
   // Typedefs for how to store and run the functor.
-  typedef typename cef_internal::FunctorTraits<Functor>::RunnableType RunnableType;
+  typedef
+      typename cef_internal::FunctorTraits<Functor>::RunnableType RunnableType;
   typedef typename cef_internal::FunctorTraits<Functor>::RunType RunType;
 
   // Use RunnableType::RunType instead of RunType above because our
@@ -495,22 +523,21 @@ Bind(Functor functor, const P1& p1, const P2& p2, const P3& p3, const P4& p4,
   // argument and not the original.
   COMPILE_ASSERT(
       !(is_non_const_reference<typename BoundFunctorTraits::A1Type>::value ||
-          is_non_const_reference<typename BoundFunctorTraits::A2Type>::value ||
-          is_non_const_reference<typename BoundFunctorTraits::A3Type>::value ||
-          is_non_const_reference<typename BoundFunctorTraits::A4Type>::value ||
-          is_non_const_reference<typename BoundFunctorTraits::A5Type>::value ||
-          is_non_const_reference<typename BoundFunctorTraits::A6Type>::value ||
-          is_non_const_reference<typename BoundFunctorTraits::A7Type>::value ),
+        is_non_const_reference<typename BoundFunctorTraits::A2Type>::value ||
+        is_non_const_reference<typename BoundFunctorTraits::A3Type>::value ||
+        is_non_const_reference<typename BoundFunctorTraits::A4Type>::value ||
+        is_non_const_reference<typename BoundFunctorTraits::A5Type>::value ||
+        is_non_const_reference<typename BoundFunctorTraits::A6Type>::value ||
+        is_non_const_reference<typename BoundFunctorTraits::A7Type>::value),
       do_not_bind_functions_with_nonconst_ref);
 
   // For methods, we need to be careful for parameter 1.  We do not require
   // a scoped_refptr because BindState<> itself takes care of AddRef() for
   // methods. We also disallow binding of an array as the method's target
   // object.
-  COMPILE_ASSERT(
-      cef_internal::HasIsMethodTag<RunnableType>::value ||
-          !cef_internal::NeedsScopedRefptrButGetsRawPtr<P1>::value,
-      p1_is_refcounted_type_and_needs_scoped_refptr);
+  COMPILE_ASSERT(cef_internal::HasIsMethodTag<RunnableType>::value ||
+                     !cef_internal::NeedsScopedRefptrButGetsRawPtr<P1>::value,
+                 p1_is_refcounted_type_and_needs_scoped_refptr);
   COMPILE_ASSERT(!cef_internal::HasIsMethodTag<RunnableType>::value ||
                      !is_array<P1>::value,
                  first_bound_argument_to_method_cannot_be_array);
@@ -526,19 +553,19 @@ Bind(Functor functor, const P1& p1, const P2& p2, const P3& p3, const P4& p4,
                  p6_is_refcounted_type_and_needs_scoped_refptr);
   COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P7>::value,
                  p7_is_refcounted_type_and_needs_scoped_refptr);
-  typedef cef_internal::BindState<RunnableType, RunType,
+  typedef cef_internal::BindState<
+      RunnableType, RunType,
       void(typename cef_internal::CallbackParamTraits<P1>::StorageType,
-      typename cef_internal::CallbackParamTraits<P2>::StorageType,
-      typename cef_internal::CallbackParamTraits<P3>::StorageType,
-      typename cef_internal::CallbackParamTraits<P4>::StorageType,
-      typename cef_internal::CallbackParamTraits<P5>::StorageType,
-      typename cef_internal::CallbackParamTraits<P6>::StorageType,
-      typename cef_internal::CallbackParamTraits<P7>::StorageType)> BindState;
-
-
-  return Callback<typename BindState::UnboundRunType>(
-      new BindState(cef_internal::MakeRunnable(functor), p1, p2, p3, p4, p5, p6,
-          p7));
+           typename cef_internal::CallbackParamTraits<P2>::StorageType,
+           typename cef_internal::CallbackParamTraits<P3>::StorageType,
+           typename cef_internal::CallbackParamTraits<P4>::StorageType,
+           typename cef_internal::CallbackParamTraits<P5>::StorageType,
+           typename cef_internal::CallbackParamTraits<P6>::StorageType,
+           typename cef_internal::CallbackParamTraits<P7>::StorageType)>
+      BindState;
+
+  return Callback<typename BindState::UnboundRunType>(new BindState(
+      cef_internal::MakeRunnable(functor), p1, p2, p3, p4, p5, p6, p7));
 }
 
 }  // namespace base
diff --git a/src/include/base/cef_bind_helpers.h b/src/include/base/cef_bind_helpers.h
index dde1d0dc..2b4798b2 100644
--- a/src/include/base/cef_bind_helpers.h
+++ b/src/include/base/cef_bind_helpers.h
@@ -274,20 +274,20 @@ class SupportsAddRefAndRelease {
 // instantiate Base is made.  We disable the warning for this definition.
 #if defined(OS_WIN)
 #pragma warning(push)
-#pragma warning(disable:4624)
+#pragma warning(disable : 4624)
 #endif
-  struct Base : public T, public BaseMixin {
-  };
+  struct Base : public T, public BaseMixin {};
 #if defined(OS_WIN)
 #pragma warning(pop)
 #endif
 
-  template <void(BaseMixin::*)(void)> struct Helper {};
+  template <void (BaseMixin::*)(void)>
+  struct Helper {};
 
   template <typename C>
   static No& Check(Helper<&C::AddRef>*);
 
-  template <typename >
+  template <typename>
   static Yes& Check(...);
 
  public:
@@ -297,22 +297,18 @@ class SupportsAddRefAndRelease {
 // Helpers to assert that arguments of a recounted type are bound with a
 // scoped_refptr.
 template <bool IsClasstype, typename T>
-struct UnsafeBindtoRefCountedArgHelper : false_type {
-};
+struct UnsafeBindtoRefCountedArgHelper : false_type {};
 
 template <typename T>
 struct UnsafeBindtoRefCountedArgHelper<true, T>
-    : integral_constant<bool, SupportsAddRefAndRelease<T>::value> {
-};
+    : integral_constant<bool, SupportsAddRefAndRelease<T>::value> {};
 
 template <typename T>
-struct UnsafeBindtoRefCountedArg : false_type {
-};
+struct UnsafeBindtoRefCountedArg : false_type {};
 
 template <typename T>
 struct UnsafeBindtoRefCountedArg<T*>
-    : UnsafeBindtoRefCountedArgHelper<is_class<T>::value, T> {
-};
+    : UnsafeBindtoRefCountedArgHelper<is_class<T>::value, T> {};
 
 template <typename T>
 class HasIsMethodTag {
@@ -334,6 +330,7 @@ class UnretainedWrapper {
  public:
   explicit UnretainedWrapper(T* o) : ptr_(o) {}
   T* get() const { return ptr_; }
+
  private:
   T* ptr_;
 };
@@ -343,6 +340,7 @@ class ConstRefWrapper {
  public:
   explicit ConstRefWrapper(const T& o) : ptr_(&o) {}
   const T& get() const { return *ptr_; }
+
  private:
   const T* ptr_;
 };
@@ -355,7 +353,7 @@ struct IgnoreResultHelper {
 };
 
 template <typename T>
-struct IgnoreResultHelper<Callback<T> > {
+struct IgnoreResultHelper<Callback<T>> {
   explicit IgnoreResultHelper(const Callback<T>& functor) : functor_(functor) {}
 
   const Callback<T>& functor_;
@@ -409,8 +407,7 @@ class PassedWrapper {
  public:
   explicit PassedWrapper(T scoper) : is_valid_(true), scoper_(scoper.Pass()) {}
   PassedWrapper(const PassedWrapper& other)
-      : is_valid_(other.is_valid_), scoper_(other.scoper_.Pass()) {
-  }
+      : is_valid_(other.is_valid_), scoper_(other.scoper_.Pass()) {}
   T Pass() const {
     CHECK(is_valid_);
     is_valid_ = false;
@@ -430,7 +427,7 @@ struct UnwrapTraits {
 };
 
 template <typename T>
-struct UnwrapTraits<UnretainedWrapper<T> > {
+struct UnwrapTraits<UnretainedWrapper<T>> {
   typedef T* ForwardType;
   static ForwardType Unwrap(UnretainedWrapper<T> unretained) {
     return unretained.get();
@@ -438,7 +435,7 @@ struct UnwrapTraits<UnretainedWrapper<T> > {
 };
 
 template <typename T>
-struct UnwrapTraits<ConstRefWrapper<T> > {
+struct UnwrapTraits<ConstRefWrapper<T>> {
   typedef const T& ForwardType;
   static ForwardType Unwrap(ConstRefWrapper<T> const_ref) {
     return const_ref.get();
@@ -446,31 +443,27 @@ struct UnwrapTraits<ConstRefWrapper<T> > {
 };
 
 template <typename T>
-struct UnwrapTraits<scoped_refptr<T> > {
+struct UnwrapTraits<scoped_refptr<T>> {
   typedef T* ForwardType;
   static ForwardType Unwrap(const scoped_refptr<T>& o) { return o.get(); }
 };
 
 template <typename T>
-struct UnwrapTraits<WeakPtr<T> > {
+struct UnwrapTraits<WeakPtr<T>> {
   typedef const WeakPtr<T>& ForwardType;
   static ForwardType Unwrap(const WeakPtr<T>& o) { return o; }
 };
 
 template <typename T>
-struct UnwrapTraits<OwnedWrapper<T> > {
+struct UnwrapTraits<OwnedWrapper<T>> {
   typedef T* ForwardType;
-  static ForwardType Unwrap(const OwnedWrapper<T>& o) {
-    return o.get();
-  }
+  static ForwardType Unwrap(const OwnedWrapper<T>& o) { return o.get(); }
 };
 
 template <typename T>
-struct UnwrapTraits<PassedWrapper<T> > {
+struct UnwrapTraits<PassedWrapper<T>> {
   typedef T ForwardType;
-  static T Unwrap(PassedWrapper<T>& o) {
-    return o.Pass();
-  }
+  static T Unwrap(PassedWrapper<T>& o) { return o.Pass(); }
 };
 
 // Utility for handling different refcounting semantics in the Bind()
@@ -505,7 +498,7 @@ struct MaybeRefcount<true, T*> {
 // No need to additionally AddRef() and Release() since we are storing a
 // scoped_refptr<> inside the storage object already.
 template <typename T>
-struct MaybeRefcount<true, scoped_refptr<T> > {
+struct MaybeRefcount<true, scoped_refptr<T>> {
   static void AddRef(const scoped_refptr<T>& o) {}
   static void Release(const scoped_refptr<T>& o) {}
 };
@@ -526,10 +519,10 @@ template <bool IsMethod, typename P1>
 struct IsWeakMethod : public false_type {};
 
 template <typename T>
-struct IsWeakMethod<true, WeakPtr<T> > : public true_type {};
+struct IsWeakMethod<true, WeakPtr<T>> : public true_type {};
 
 template <typename T>
-struct IsWeakMethod<true, ConstRefWrapper<WeakPtr<T> > > : public true_type {};
+struct IsWeakMethod<true, ConstRefWrapper<WeakPtr<T>>> : public true_type {};
 
 }  // namespace cef_internal
 
@@ -567,14 +560,14 @@ static inline cef_internal::IgnoreResultHelper<T> IgnoreResult(T data) {
 }
 
 template <typename T>
-static inline cef_internal::IgnoreResultHelper<Callback<T> >
-IgnoreResult(const Callback<T>& data) {
-  return cef_internal::IgnoreResultHelper<Callback<T> >(data);
+static inline cef_internal::IgnoreResultHelper<Callback<T>> IgnoreResult(
+    const Callback<T>& data) {
+  return cef_internal::IgnoreResultHelper<Callback<T>>(data);
 }
 
 void DoNothing();
 
-template<typename T>
+template <typename T>
 void DeletePointer(T* obj) {
   delete obj;
 }
diff --git a/src/include/base/cef_build.h b/src/include/base/cef_build.h
index 81ee851f..1e2065ce 100644
--- a/src/include/base/cef_build.h
+++ b/src/include/base/cef_build.h
@@ -27,7 +27,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 #ifndef CEF_INCLUDE_BASE_CEF_BUILD_H_
 #define CEF_INCLUDE_BASE_CEF_BUILD_H_
 #pragma once
@@ -116,12 +115,10 @@
 // Type detection for wchar_t.
 #if defined(OS_WIN)
 #define WCHAR_T_IS_UTF16
-#elif defined(OS_POSIX) && defined(COMPILER_GCC) && \
-    defined(__WCHAR_MAX__) && \
+#elif defined(OS_POSIX) && defined(COMPILER_GCC) && defined(__WCHAR_MAX__) && \
     (__WCHAR_MAX__ == 0x7fffffff || __WCHAR_MAX__ == 0xffffffff)
 #define WCHAR_T_IS_UTF32
-#elif defined(OS_POSIX) && defined(COMPILER_GCC) && \
-    defined(__WCHAR_MAX__) && \
+#elif defined(OS_POSIX) && defined(COMPILER_GCC) && defined(__WCHAR_MAX__) && \
     (__WCHAR_MAX__ == 0x7fff || __WCHAR_MAX__ == 0xffff)
 // On Posix, we'll detect short wchar_t, but projects aren't guaranteed to
 // compile in this mode (in particular, Chrome doesn't). This is intended for
@@ -181,7 +178,7 @@
 // Visual Studio 2010 and later support override.
 #define OVERRIDE override
 #elif defined(COMPILER_GCC) && __cplusplus >= 201103 && \
-      (__GNUC__ * 10000 + __GNUC_MINOR__ * 100) >= 40700
+    (__GNUC__ * 10000 + __GNUC_MINOR__ * 100) >= 40700
 // GCC 4.7 supports explicit virtual overrides when C++11 support is enabled.
 #define OVERRIDE override
 #else
@@ -191,10 +188,9 @@
 
 // Check for C++11 template alias support which was added in VS2013 and GCC4.7.
 // http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2258.pdf
-#if __cplusplus > 199711L || \
-    (defined(_MSC_VER) && _MSC_VER >= 1800) || \
-    (defined(__GNUC__) && \
-      (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ >= 40700))
+#if __cplusplus > 199711L || (defined(_MSC_VER) && _MSC_VER >= 1800) || \
+    (defined(__GNUC__) &&                                               \
+     (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ >= 40700))
 #define HAS_CPP11_TEMPLATE_ALIAS_SUPPORT
 #endif
 
diff --git a/src/include/base/cef_callback.h b/src/include/base/cef_callback.h
index 611fba50..16e238a9 100644
--- a/src/include/base/cef_callback.h
+++ b/src/include/base/cef_callback.h
@@ -45,9 +45,9 @@
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.
 
-#include "include/base/internal/cef_callback_internal.h"
 #include "include/base/cef_callback_forward.h"
 #include "include/base/cef_template_util.h"
+#include "include/base/internal/cef_callback_internal.h"
 
 // NOTE: Header files that do not require the full definition of Callback or
 // Closure should #include "base/cef_callback_forward.h" instead of this file.
@@ -407,21 +407,20 @@ class Callback<R(void)> : public cef_internal::CallbackBase {
  public:
   typedef R(RunType)();
 
-  Callback() : CallbackBase(NULL) { }
+  Callback() : CallbackBase(NULL) {}
 
   // Note that this constructor CANNOT be explicit, and that Bind() CANNOT
   // return the exact Callback<> type.  See base/bind.h for details.
   template <typename Runnable, typename BindRunType, typename BoundArgsType>
-  Callback(cef_internal::BindState<Runnable, BindRunType,
-           BoundArgsType>* bind_state)
+  Callback(
+      cef_internal::BindState<Runnable, BindRunType, BoundArgsType>* bind_state)
       : CallbackBase(bind_state) {
-
     // Force the assignment to a local variable of PolymorphicInvoke
     // so the compiler will typecheck that the passed in Run() method has
     // the correct type.
     PolymorphicInvoke invoke_func =
-        &cef_internal::BindState<Runnable, BindRunType, BoundArgsType>
-            ::InvokerType::Run;
+        &cef_internal::BindState<Runnable, BindRunType,
+                                 BoundArgsType>::InvokerType::Run;
     polymorphic_invoke_ = reinterpret_cast<InvokeFuncStorage>(invoke_func);
   }
 
@@ -437,9 +436,7 @@ class Callback<R(void)> : public cef_internal::CallbackBase {
   }
 
  private:
-  typedef R(*PolymorphicInvoke)(
-      cef_internal::BindStateBase*);
-
+  typedef R (*PolymorphicInvoke)(cef_internal::BindStateBase*);
 };
 
 template <typename R, typename A1>
@@ -447,21 +444,20 @@ class Callback<R(A1)> : public cef_internal::CallbackBase {
  public:
   typedef R(RunType)(A1);
 
-  Callback() : CallbackBase(NULL) { }
+  Callback() : CallbackBase(NULL) {}
 
   // Note that this constructor CANNOT be explicit, and that Bind() CANNOT
   // return the exact Callback<> type.  See base/bind.h for details.
   template <typename Runnable, typename BindRunType, typename BoundArgsType>
-  Callback(cef_internal::BindState<Runnable, BindRunType,
-           BoundArgsType>* bind_state)
+  Callback(
+      cef_internal::BindState<Runnable, BindRunType, BoundArgsType>* bind_state)
       : CallbackBase(bind_state) {
-
     // Force the assignment to a local variable of PolymorphicInvoke
     // so the compiler will typecheck that the passed in Run() method has
     // the correct type.
     PolymorphicInvoke invoke_func =
-        &cef_internal::BindState<Runnable, BindRunType, BoundArgsType>
-            ::InvokerType::Run;
+        &cef_internal::BindState<Runnable, BindRunType,
+                                 BoundArgsType>::InvokerType::Run;
     polymorphic_invoke_ = reinterpret_cast<InvokeFuncStorage>(invoke_func);
   }
 
@@ -477,10 +473,9 @@ class Callback<R(A1)> : public cef_internal::CallbackBase {
   }
 
  private:
-  typedef R(*PolymorphicInvoke)(
+  typedef R (*PolymorphicInvoke)(
       cef_internal::BindStateBase*,
-          typename cef_internal::CallbackParamTraits<A1>::ForwardType);
-
+      typename cef_internal::CallbackParamTraits<A1>::ForwardType);
 };
 
 template <typename R, typename A1, typename A2>
@@ -488,21 +483,20 @@ class Callback<R(A1, A2)> : public cef_internal::CallbackBase {
  public:
   typedef R(RunType)(A1, A2);
 
-  Callback() : CallbackBase(NULL) { }
+  Callback() : CallbackBase(NULL) {}
 
   // Note that this constructor CANNOT be explicit, and that Bind() CANNOT
   // return the exact Callback<> type.  See base/bind.h for details.
   template <typename Runnable, typename BindRunType, typename BoundArgsType>
-  Callback(cef_internal::BindState<Runnable, BindRunType,
-           BoundArgsType>* bind_state)
+  Callback(
+      cef_internal::BindState<Runnable, BindRunType, BoundArgsType>* bind_state)
       : CallbackBase(bind_state) {
-
     // Force the assignment to a local variable of PolymorphicInvoke
     // so the compiler will typecheck that the passed in Run() method has
     // the correct type.
     PolymorphicInvoke invoke_func =
-        &cef_internal::BindState<Runnable, BindRunType, BoundArgsType>
-            ::InvokerType::Run;
+        &cef_internal::BindState<Runnable, BindRunType,
+                                 BoundArgsType>::InvokerType::Run;
     polymorphic_invoke_ = reinterpret_cast<InvokeFuncStorage>(invoke_func);
   }
 
@@ -520,11 +514,10 @@ class Callback<R(A1, A2)> : public cef_internal::CallbackBase {
   }
 
  private:
-  typedef R(*PolymorphicInvoke)(
+  typedef R (*PolymorphicInvoke)(
       cef_internal::BindStateBase*,
-          typename cef_internal::CallbackParamTraits<A1>::ForwardType,
-          typename cef_internal::CallbackParamTraits<A2>::ForwardType);
-
+      typename cef_internal::CallbackParamTraits<A1>::ForwardType,
+      typename cef_internal::CallbackParamTraits<A2>::ForwardType);
 };
 
 template <typename R, typename A1, typename A2, typename A3>
@@ -532,21 +525,20 @@ class Callback<R(A1, A2, A3)> : public cef_internal::CallbackBase {
  public:
   typedef R(RunType)(A1, A2, A3);
 
-  Callback() : CallbackBase(NULL) { }
+  Callback() : CallbackBase(NULL) {}
 
   // Note that this constructor CANNOT be explicit, and that Bind() CANNOT
   // return the exact Callback<> type.  See base/bind.h for details.
   template <typename Runnable, typename BindRunType, typename BoundArgsType>
-  Callback(cef_internal::BindState<Runnable, BindRunType,
-           BoundArgsType>* bind_state)
+  Callback(
+      cef_internal::BindState<Runnable, BindRunType, BoundArgsType>* bind_state)
       : CallbackBase(bind_state) {
-
     // Force the assignment to a local variable of PolymorphicInvoke
     // so the compiler will typecheck that the passed in Run() method has
     // the correct type.
     PolymorphicInvoke invoke_func =
-        &cef_internal::BindState<Runnable, BindRunType, BoundArgsType>
-            ::InvokerType::Run;
+        &cef_internal::BindState<Runnable, BindRunType,
+                                 BoundArgsType>::InvokerType::Run;
     polymorphic_invoke_ = reinterpret_cast<InvokeFuncStorage>(invoke_func);
   }
 
@@ -566,12 +558,11 @@ class Callback<R(A1, A2, A3)> : public cef_internal::CallbackBase {
   }
 
  private:
-  typedef R(*PolymorphicInvoke)(
+  typedef R (*PolymorphicInvoke)(
       cef_internal::BindStateBase*,
-          typename cef_internal::CallbackParamTraits<A1>::ForwardType,
-          typename cef_internal::CallbackParamTraits<A2>::ForwardType,
-          typename cef_internal::CallbackParamTraits<A3>::ForwardType);
-
+      typename cef_internal::CallbackParamTraits<A1>::ForwardType,
+      typename cef_internal::CallbackParamTraits<A2>::ForwardType,
+      typename cef_internal::CallbackParamTraits<A3>::ForwardType);
 };
 
 template <typename R, typename A1, typename A2, typename A3, typename A4>
@@ -579,21 +570,20 @@ class Callback<R(A1, A2, A3, A4)> : public cef_internal::CallbackBase {
  public:
   typedef R(RunType)(A1, A2, A3, A4);
 
-  Callback() : CallbackBase(NULL) { }
+  Callback() : CallbackBase(NULL) {}
 
   // Note that this constructor CANNOT be explicit, and that Bind() CANNOT
   // return the exact Callback<> type.  See base/bind.h for details.
   template <typename Runnable, typename BindRunType, typename BoundArgsType>
-  Callback(cef_internal::BindState<Runnable, BindRunType,
-           BoundArgsType>* bind_state)
+  Callback(
+      cef_internal::BindState<Runnable, BindRunType, BoundArgsType>* bind_state)
       : CallbackBase(bind_state) {
-
     // Force the assignment to a local variable of PolymorphicInvoke
     // so the compiler will typecheck that the passed in Run() method has
     // the correct type.
     PolymorphicInvoke invoke_func =
-        &cef_internal::BindState<Runnable, BindRunType, BoundArgsType>
-            ::InvokerType::Run;
+        &cef_internal::BindState<Runnable, BindRunType,
+                                 BoundArgsType>::InvokerType::Run;
     polymorphic_invoke_ = reinterpret_cast<InvokeFuncStorage>(invoke_func);
   }
 
@@ -615,36 +605,38 @@ class Callback<R(A1, A2, A3, A4)> : public cef_internal::CallbackBase {
   }
 
  private:
-  typedef R(*PolymorphicInvoke)(
+  typedef R (*PolymorphicInvoke)(
       cef_internal::BindStateBase*,
-          typename cef_internal::CallbackParamTraits<A1>::ForwardType,
-          typename cef_internal::CallbackParamTraits<A2>::ForwardType,
-          typename cef_internal::CallbackParamTraits<A3>::ForwardType,
-          typename cef_internal::CallbackParamTraits<A4>::ForwardType);
-
+      typename cef_internal::CallbackParamTraits<A1>::ForwardType,
+      typename cef_internal::CallbackParamTraits<A2>::ForwardType,
+      typename cef_internal::CallbackParamTraits<A3>::ForwardType,
+      typename cef_internal::CallbackParamTraits<A4>::ForwardType);
 };
 
-template <typename R, typename A1, typename A2, typename A3, typename A4,
-    typename A5>
+template <typename R,
+          typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5>
 class Callback<R(A1, A2, A3, A4, A5)> : public cef_internal::CallbackBase {
  public:
   typedef R(RunType)(A1, A2, A3, A4, A5);
 
-  Callback() : CallbackBase(NULL) { }
+  Callback() : CallbackBase(NULL) {}
 
   // Note that this constructor CANNOT be explicit, and that Bind() CANNOT
   // return the exact Callback<> type.  See base/bind.h for details.
   template <typename Runnable, typename BindRunType, typename BoundArgsType>
-  Callback(cef_internal::BindState<Runnable, BindRunType,
-           BoundArgsType>* bind_state)
+  Callback(
+      cef_internal::BindState<Runnable, BindRunType, BoundArgsType>* bind_state)
       : CallbackBase(bind_state) {
-
     // Force the assignment to a local variable of PolymorphicInvoke
     // so the compiler will typecheck that the passed in Run() method has
     // the correct type.
     PolymorphicInvoke invoke_func =
-        &cef_internal::BindState<Runnable, BindRunType, BoundArgsType>
-            ::InvokerType::Run;
+        &cef_internal::BindState<Runnable, BindRunType,
+                                 BoundArgsType>::InvokerType::Run;
     polymorphic_invoke_ = reinterpret_cast<InvokeFuncStorage>(invoke_func);
   }
 
@@ -660,45 +652,47 @@ class Callback<R(A1, A2, A3, A4, A5)> : public cef_internal::CallbackBase {
     PolymorphicInvoke f =
         reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_);
 
-    return f(bind_state_.get(), cef_internal::CallbackForward(a1),
-             cef_internal::CallbackForward(a2),
-             cef_internal::CallbackForward(a3),
-             cef_internal::CallbackForward(a4),
-             cef_internal::CallbackForward(a5));
+    return f(
+        bind_state_.get(), cef_internal::CallbackForward(a1),
+        cef_internal::CallbackForward(a2), cef_internal::CallbackForward(a3),
+        cef_internal::CallbackForward(a4), cef_internal::CallbackForward(a5));
   }
 
  private:
-  typedef R(*PolymorphicInvoke)(
+  typedef R (*PolymorphicInvoke)(
       cef_internal::BindStateBase*,
-          typename cef_internal::CallbackParamTraits<A1>::ForwardType,
-          typename cef_internal::CallbackParamTraits<A2>::ForwardType,
-          typename cef_internal::CallbackParamTraits<A3>::ForwardType,
-          typename cef_internal::CallbackParamTraits<A4>::ForwardType,
-          typename cef_internal::CallbackParamTraits<A5>::ForwardType);
-
+      typename cef_internal::CallbackParamTraits<A1>::ForwardType,
+      typename cef_internal::CallbackParamTraits<A2>::ForwardType,
+      typename cef_internal::CallbackParamTraits<A3>::ForwardType,
+      typename cef_internal::CallbackParamTraits<A4>::ForwardType,
+      typename cef_internal::CallbackParamTraits<A5>::ForwardType);
 };
 
-template <typename R, typename A1, typename A2, typename A3, typename A4,
-    typename A5, typename A6>
+template <typename R,
+          typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5,
+          typename A6>
 class Callback<R(A1, A2, A3, A4, A5, A6)> : public cef_internal::CallbackBase {
  public:
   typedef R(RunType)(A1, A2, A3, A4, A5, A6);
 
-  Callback() : CallbackBase(NULL) { }
+  Callback() : CallbackBase(NULL) {}
 
   // Note that this constructor CANNOT be explicit, and that Bind() CANNOT
   // return the exact Callback<> type.  See base/bind.h for details.
   template <typename Runnable, typename BindRunType, typename BoundArgsType>
-  Callback(cef_internal::BindState<Runnable, BindRunType,
-           BoundArgsType>* bind_state)
+  Callback(
+      cef_internal::BindState<Runnable, BindRunType, BoundArgsType>* bind_state)
       : CallbackBase(bind_state) {
-
     // Force the assignment to a local variable of PolymorphicInvoke
     // so the compiler will typecheck that the passed in Run() method has
     // the correct type.
     PolymorphicInvoke invoke_func =
-        &cef_internal::BindState<Runnable, BindRunType, BoundArgsType>
-            ::InvokerType::Run;
+        &cef_internal::BindState<Runnable, BindRunType,
+                                 BoundArgsType>::InvokerType::Run;
     polymorphic_invoke_ = reinterpret_cast<InvokeFuncStorage>(invoke_func);
   }
 
@@ -715,47 +709,51 @@ class Callback<R(A1, A2, A3, A4, A5, A6)> : public cef_internal::CallbackBase {
     PolymorphicInvoke f =
         reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_);
 
-    return f(bind_state_.get(), cef_internal::CallbackForward(a1),
-             cef_internal::CallbackForward(a2),
-             cef_internal::CallbackForward(a3),
-             cef_internal::CallbackForward(a4),
-             cef_internal::CallbackForward(a5),
-             cef_internal::CallbackForward(a6));
+    return f(
+        bind_state_.get(), cef_internal::CallbackForward(a1),
+        cef_internal::CallbackForward(a2), cef_internal::CallbackForward(a3),
+        cef_internal::CallbackForward(a4), cef_internal::CallbackForward(a5),
+        cef_internal::CallbackForward(a6));
   }
 
  private:
-  typedef R(*PolymorphicInvoke)(
+  typedef R (*PolymorphicInvoke)(
       cef_internal::BindStateBase*,
-          typename cef_internal::CallbackParamTraits<A1>::ForwardType,
-          typename cef_internal::CallbackParamTraits<A2>::ForwardType,
-          typename cef_internal::CallbackParamTraits<A3>::ForwardType,
-          typename cef_internal::CallbackParamTraits<A4>::ForwardType,
-          typename cef_internal::CallbackParamTraits<A5>::ForwardType,
-          typename cef_internal::CallbackParamTraits<A6>::ForwardType);
-
+      typename cef_internal::CallbackParamTraits<A1>::ForwardType,
+      typename cef_internal::CallbackParamTraits<A2>::ForwardType,
+      typename cef_internal::CallbackParamTraits<A3>::ForwardType,
+      typename cef_internal::CallbackParamTraits<A4>::ForwardType,
+      typename cef_internal::CallbackParamTraits<A5>::ForwardType,
+      typename cef_internal::CallbackParamTraits<A6>::ForwardType);
 };
 
-template <typename R, typename A1, typename A2, typename A3, typename A4,
-    typename A5, typename A6, typename A7>
-class Callback<R(A1, A2, A3, A4, A5, A6, A7)> : public cef_internal::CallbackBase {
+template <typename R,
+          typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5,
+          typename A6,
+          typename A7>
+class Callback<R(A1, A2, A3, A4, A5, A6, A7)>
+    : public cef_internal::CallbackBase {
  public:
   typedef R(RunType)(A1, A2, A3, A4, A5, A6, A7);
 
-  Callback() : CallbackBase(NULL) { }
+  Callback() : CallbackBase(NULL) {}
 
   // Note that this constructor CANNOT be explicit, and that Bind() CANNOT
   // return the exact Callback<> type.  See base/bind.h for details.
   template <typename Runnable, typename BindRunType, typename BoundArgsType>
-  Callback(cef_internal::BindState<Runnable, BindRunType,
-           BoundArgsType>* bind_state)
+  Callback(
+      cef_internal::BindState<Runnable, BindRunType, BoundArgsType>* bind_state)
       : CallbackBase(bind_state) {
-
     // Force the assignment to a local variable of PolymorphicInvoke
     // so the compiler will typecheck that the passed in Run() method has
     // the correct type.
     PolymorphicInvoke invoke_func =
-        &cef_internal::BindState<Runnable, BindRunType, BoundArgsType>
-            ::InvokerType::Run;
+        &cef_internal::BindState<Runnable, BindRunType,
+                                 BoundArgsType>::InvokerType::Run;
     polymorphic_invoke_ = reinterpret_cast<InvokeFuncStorage>(invoke_func);
   }
 
@@ -773,29 +771,25 @@ class Callback<R(A1, A2, A3, A4, A5, A6, A7)> : public cef_internal::CallbackBas
     PolymorphicInvoke f =
         reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_);
 
-    return f(bind_state_.get(), cef_internal::CallbackForward(a1),
-             cef_internal::CallbackForward(a2),
-             cef_internal::CallbackForward(a3),
-             cef_internal::CallbackForward(a4),
-             cef_internal::CallbackForward(a5),
-             cef_internal::CallbackForward(a6),
-             cef_internal::CallbackForward(a7));
+    return f(
+        bind_state_.get(), cef_internal::CallbackForward(a1),
+        cef_internal::CallbackForward(a2), cef_internal::CallbackForward(a3),
+        cef_internal::CallbackForward(a4), cef_internal::CallbackForward(a5),
+        cef_internal::CallbackForward(a6), cef_internal::CallbackForward(a7));
   }
 
  private:
-  typedef R(*PolymorphicInvoke)(
+  typedef R (*PolymorphicInvoke)(
       cef_internal::BindStateBase*,
-          typename cef_internal::CallbackParamTraits<A1>::ForwardType,
-          typename cef_internal::CallbackParamTraits<A2>::ForwardType,
-          typename cef_internal::CallbackParamTraits<A3>::ForwardType,
-          typename cef_internal::CallbackParamTraits<A4>::ForwardType,
-          typename cef_internal::CallbackParamTraits<A5>::ForwardType,
-          typename cef_internal::CallbackParamTraits<A6>::ForwardType,
-          typename cef_internal::CallbackParamTraits<A7>::ForwardType);
-
+      typename cef_internal::CallbackParamTraits<A1>::ForwardType,
+      typename cef_internal::CallbackParamTraits<A2>::ForwardType,
+      typename cef_internal::CallbackParamTraits<A3>::ForwardType,
+      typename cef_internal::CallbackParamTraits<A4>::ForwardType,
+      typename cef_internal::CallbackParamTraits<A5>::ForwardType,
+      typename cef_internal::CallbackParamTraits<A6>::ForwardType,
+      typename cef_internal::CallbackParamTraits<A7>::ForwardType);
 };
 
-
 // Syntactic sugar to make Callbacks<void(void)> easier to declare since it
 // will be used in a lot of APIs with delayed execution.
 typedef Callback<void(void)> Closure;
diff --git a/src/include/base/cef_callback_list.h b/src/include/base/cef_callback_list.h
index 73dd9f75..e0ef3665 100644
--- a/src/include/base/cef_callback_list.h
+++ b/src/include/base/cef_callback_list.h
@@ -48,12 +48,12 @@
 #include <list>
 
 #include "include/base/cef_basictypes.h"
-#include "include/base/cef_callback.h"
-#include "include/base/internal/cef_callback_internal.h"
 #include "include/base/cef_build.h"
+#include "include/base/cef_callback.h"
 #include "include/base/cef_logging.h"
 #include "include/base/cef_macros.h"
 #include "include/base/cef_scoped_ptr.h"
+#include "include/base/internal/cef_callback_internal.h"
 
 // OVERVIEW:
 //
@@ -120,9 +120,7 @@ class CallbackListBase {
    public:
     Subscription(CallbackListBase<CallbackType>* list,
                  typename std::list<CallbackType>::iterator iter)
-        : list_(list),
-          iter_(iter) {
-    }
+        : list_(list), iter_(iter) {}
 
     ~Subscription() {
       if (list_->active_iterator_count_) {
@@ -167,14 +165,12 @@ class CallbackListBase {
   class Iterator {
    public:
     explicit Iterator(CallbackListBase<CallbackType>* list)
-        : list_(list),
-          list_iter_(list_->callbacks_.begin()) {
+        : list_(list), list_iter_(list_->callbacks_.begin()) {
       ++list_->active_iterator_count_;
     }
 
     Iterator(const Iterator& iter)
-        : list_(iter.list_),
-          list_iter_(iter.list_iter_) {
+        : list_(iter.list_), list_iter_(iter.list_iter_) {
       ++list_->active_iterator_count_;
     }
 
@@ -210,9 +206,7 @@ class CallbackListBase {
 
   // Returns an instance of a CallbackListBase::Iterator which can be used
   // to run callbacks.
-  Iterator GetIterator() {
-    return Iterator(this);
-  }
+  Iterator GetIterator() { return Iterator(this); }
 
   // Compact the list: remove any entries which were NULLed out during
   // iteration.
@@ -242,11 +236,12 @@ class CallbackListBase {
 
 }  // namespace cef_internal
 
-template <typename Sig> class CallbackList;
+template <typename Sig>
+class CallbackList;
 
 template <>
 class CallbackList<void(void)>
-    : public cef_internal::CallbackListBase<Callback<void(void)> > {
+    : public cef_internal::CallbackListBase<Callback<void(void)>> {
  public:
   typedef Callback<void(void)> CallbackType;
 
@@ -267,7 +262,7 @@ class CallbackList<void(void)>
 
 template <typename A1>
 class CallbackList<void(A1)>
-    : public cef_internal::CallbackListBase<Callback<void(A1)> > {
+    : public cef_internal::CallbackListBase<Callback<void(A1)>> {
  public:
   typedef Callback<void(A1)> CallbackType;
 
@@ -288,7 +283,7 @@ class CallbackList<void(A1)>
 
 template <typename A1, typename A2>
 class CallbackList<void(A1, A2)>
-    : public cef_internal::CallbackListBase<Callback<void(A1, A2)> > {
+    : public cef_internal::CallbackListBase<Callback<void(A1, A2)>> {
  public:
   typedef Callback<void(A1, A2)> CallbackType;
 
@@ -310,7 +305,7 @@ class CallbackList<void(A1, A2)>
 
 template <typename A1, typename A2, typename A3>
 class CallbackList<void(A1, A2, A3)>
-    : public cef_internal::CallbackListBase<Callback<void(A1, A2, A3)> > {
+    : public cef_internal::CallbackListBase<Callback<void(A1, A2, A3)>> {
  public:
   typedef Callback<void(A1, A2, A3)> CallbackType;
 
@@ -333,7 +328,7 @@ class CallbackList<void(A1, A2, A3)>
 
 template <typename A1, typename A2, typename A3, typename A4>
 class CallbackList<void(A1, A2, A3, A4)>
-    : public cef_internal::CallbackListBase<Callback<void(A1, A2, A3, A4)> > {
+    : public cef_internal::CallbackListBase<Callback<void(A1, A2, A3, A4)>> {
  public:
   typedef Callback<void(A1, A2, A3, A4)> CallbackType;
 
@@ -357,7 +352,8 @@ class CallbackList<void(A1, A2, A3, A4)>
 
 template <typename A1, typename A2, typename A3, typename A4, typename A5>
 class CallbackList<void(A1, A2, A3, A4, A5)>
-    : public cef_internal::CallbackListBase<Callback<void(A1, A2, A3, A4, A5)> > {
+    : public cef_internal::CallbackListBase<
+          Callback<void(A1, A2, A3, A4, A5)>> {
  public:
   typedef Callback<void(A1, A2, A3, A4, A5)> CallbackType;
 
@@ -380,11 +376,15 @@ class CallbackList<void(A1, A2, A3, A4, A5)>
   DISALLOW_COPY_AND_ASSIGN(CallbackList);
 };
 
-template <typename A1, typename A2, typename A3, typename A4, typename A5,
-    typename A6>
+template <typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5,
+          typename A6>
 class CallbackList<void(A1, A2, A3, A4, A5, A6)>
-    : public cef_internal::CallbackListBase<Callback<void(A1, A2, A3, A4, A5,
-        A6)> > {
+    : public cef_internal::CallbackListBase<
+          Callback<void(A1, A2, A3, A4, A5, A6)>> {
  public:
   typedef Callback<void(A1, A2, A3, A4, A5, A6)> CallbackType;
 
@@ -408,11 +408,16 @@ class CallbackList<void(A1, A2, A3, A4, A5, A6)>
   DISALLOW_COPY_AND_ASSIGN(CallbackList);
 };
 
-template <typename A1, typename A2, typename A3, typename A4, typename A5,
-    typename A6, typename A7>
+template <typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5,
+          typename A6,
+          typename A7>
 class CallbackList<void(A1, A2, A3, A4, A5, A6, A7)>
-    : public cef_internal::CallbackListBase<Callback<void(A1, A2, A3, A4, A5, A6,
-        A7)> > {
+    : public cef_internal::CallbackListBase<
+          Callback<void(A1, A2, A3, A4, A5, A6, A7)>> {
  public:
   typedef Callback<void(A1, A2, A3, A4, A5, A6, A7)> CallbackType;
 
diff --git a/src/include/base/cef_cancelable_callback.h b/src/include/base/cef_cancelable_callback.h
index 8f5979eb..febce3a3 100644
--- a/src/include/base/cef_cancelable_callback.h
+++ b/src/include/base/cef_cancelable_callback.h
@@ -83,8 +83,8 @@
 // updated to match.
 
 #include "include/base/cef_bind.h"
-#include "include/base/cef_callback.h"
 #include "include/base/cef_build.h"
+#include "include/base/cef_callback.h"
 #include "include/base/cef_logging.h"
 #include "include/base/cef_macros.h"
 #include "include/base/cef_weak_ptr.h"
@@ -102,8 +102,7 @@ class CancelableCallback<void(void)> {
 
   // |callback| must not be null.
   explicit CancelableCallback(const base::Callback<void(void)>& callback)
-      : weak_factory_(this),
-        callback_(callback) {
+      : weak_factory_(this), callback_(callback) {
     DCHECK(!callback.is_null());
     InitializeForwarder();
   }
@@ -118,9 +117,7 @@ class CancelableCallback<void(void)> {
   }
 
   // Returns true if the wrapped callback has been cancelled.
-  bool IsCancelled() const {
-    return callback_.is_null();
-  }
+  bool IsCancelled() const { return callback_.is_null(); }
 
   // Sets |callback| as the closure that may be cancelled. |callback| may not
   // be null. Outstanding and any previously wrapped callbacks are cancelled.
@@ -137,14 +134,10 @@ class CancelableCallback<void(void)> {
   }
 
   // Returns a callback that can be disabled by calling Cancel().
-  const base::Callback<void(void)>& callback() const {
-    return forwarder_;
-  }
+  const base::Callback<void(void)>& callback() const { return forwarder_; }
 
  private:
-  void Forward() {
-    callback_.Run();
-  }
+  void Forward() { callback_.Run(); }
 
   // Helper method to bind |forwarder_| using a weak pointer from
   // |weak_factory_|.
@@ -154,7 +147,7 @@ class CancelableCallback<void(void)> {
   }
 
   // Used to ensure Forward() is not run when this object is destroyed.
-  base::WeakPtrFactory<CancelableCallback<void(void)> > weak_factory_;
+  base::WeakPtrFactory<CancelableCallback<void(void)>> weak_factory_;
 
   // The wrapper closure.
   base::Callback<void(void)> forwarder_;
@@ -172,8 +165,7 @@ class CancelableCallback<void(A1)> {
 
   // |callback| must not be null.
   explicit CancelableCallback(const base::Callback<void(A1)>& callback)
-      : weak_factory_(this),
-        callback_(callback) {
+      : weak_factory_(this), callback_(callback) {
     DCHECK(!callback.is_null());
     InitializeForwarder();
   }
@@ -188,9 +180,7 @@ class CancelableCallback<void(A1)> {
   }
 
   // Returns true if the wrapped callback has been cancelled.
-  bool IsCancelled() const {
-    return callback_.is_null();
-  }
+  bool IsCancelled() const { return callback_.is_null(); }
 
   // Sets |callback| as the closure that may be cancelled. |callback| may not
   // be null. Outstanding and any previously wrapped callbacks are cancelled.
@@ -207,14 +197,10 @@ class CancelableCallback<void(A1)> {
   }
 
   // Returns a callback that can be disabled by calling Cancel().
-  const base::Callback<void(A1)>& callback() const {
-    return forwarder_;
-  }
+  const base::Callback<void(A1)>& callback() const { return forwarder_; }
 
  private:
-  void Forward(A1 a1) const {
-    callback_.Run(a1);
-  }
+  void Forward(A1 a1) const { callback_.Run(a1); }
 
   // Helper method to bind |forwarder_| using a weak pointer from
   // |weak_factory_|.
@@ -224,7 +210,7 @@ class CancelableCallback<void(A1)> {
   }
 
   // Used to ensure Forward() is not run when this object is destroyed.
-  base::WeakPtrFactory<CancelableCallback<void(A1)> > weak_factory_;
+  base::WeakPtrFactory<CancelableCallback<void(A1)>> weak_factory_;
 
   // The wrapper closure.
   base::Callback<void(A1)> forwarder_;
@@ -242,8 +228,7 @@ class CancelableCallback<void(A1, A2)> {
 
   // |callback| must not be null.
   explicit CancelableCallback(const base::Callback<void(A1, A2)>& callback)
-      : weak_factory_(this),
-        callback_(callback) {
+      : weak_factory_(this), callback_(callback) {
     DCHECK(!callback.is_null());
     InitializeForwarder();
   }
@@ -258,9 +243,7 @@ class CancelableCallback<void(A1, A2)> {
   }
 
   // Returns true if the wrapped callback has been cancelled.
-  bool IsCancelled() const {
-    return callback_.is_null();
-  }
+  bool IsCancelled() const { return callback_.is_null(); }
 
   // Sets |callback| as the closure that may be cancelled. |callback| may not
   // be null. Outstanding and any previously wrapped callbacks are cancelled.
@@ -277,14 +260,10 @@ class CancelableCallback<void(A1, A2)> {
   }
 
   // Returns a callback that can be disabled by calling Cancel().
-  const base::Callback<void(A1, A2)>& callback() const {
-    return forwarder_;
-  }
+  const base::Callback<void(A1, A2)>& callback() const { return forwarder_; }
 
  private:
-  void Forward(A1 a1, A2 a2) const {
-    callback_.Run(a1, a2);
-  }
+  void Forward(A1 a1, A2 a2) const { callback_.Run(a1, a2); }
 
   // Helper method to bind |forwarder_| using a weak pointer from
   // |weak_factory_|.
@@ -294,7 +273,7 @@ class CancelableCallback<void(A1, A2)> {
   }
 
   // Used to ensure Forward() is not run when this object is destroyed.
-  base::WeakPtrFactory<CancelableCallback<void(A1, A2)> > weak_factory_;
+  base::WeakPtrFactory<CancelableCallback<void(A1, A2)>> weak_factory_;
 
   // The wrapper closure.
   base::Callback<void(A1, A2)> forwarder_;
diff --git a/src/include/base/cef_lock.h b/src/include/base/cef_lock.h
index 9f872bb5..6909bd6f 100644
--- a/src/include/base/cef_lock.h
+++ b/src/include/base/cef_lock.h
@@ -125,9 +125,7 @@ class AutoLock {
  public:
   struct AlreadyAcquired {};
 
-  explicit AutoLock(Lock& lock) : lock_(lock) {
-    lock_.Acquire();
-  }
+  explicit AutoLock(Lock& lock) : lock_(lock) { lock_.Acquire(); }
 
   AutoLock(Lock& lock, const AlreadyAcquired&) : lock_(lock) {
     lock_.AssertAcquired();
@@ -153,9 +151,7 @@ class AutoUnlock {
     lock_.Release();
   }
 
-  ~AutoUnlock() {
-    lock_.Acquire();
-  }
+  ~AutoUnlock() { lock_.Acquire(); }
 
  private:
   Lock& lock_;
diff --git a/src/include/base/cef_logging.h b/src/include/base/cef_logging.h
index 75e35d96..8d8bb889 100644
--- a/src/include/base/cef_logging.h
+++ b/src/include/base/cef_logging.h
@@ -158,9 +158,9 @@
 // updated to match.
 
 #include <cassert>
-#include <string>
 #include <cstring>
 #include <sstream>
+#include <string>
 
 #include "include/base/cef_build.h"
 #include "include/base/cef_macros.h"
@@ -201,32 +201,27 @@ const LogSeverity LOG_DFATAL = LOG_FATAL;
 // A few definitions of macros that don't generate much code. These are used
 // by LOG() and LOG_IF, etc. Since these are used all over our code, it's
 // better to have compact code for these operations.
-#define COMPACT_GOOGLE_LOG_EX_INFO(ClassName, ...) \
-  cef::logging::ClassName(__FILE__, __LINE__, cef::logging::LOG_INFO , \
-                         ##__VA_ARGS__)
-#define COMPACT_GOOGLE_LOG_EX_WARNING(ClassName, ...) \
-  cef::logging::ClassName(__FILE__, __LINE__, cef::logging::LOG_WARNING , \
-                         ##__VA_ARGS__)
-#define COMPACT_GOOGLE_LOG_EX_ERROR(ClassName, ...) \
-  cef::logging::ClassName(__FILE__, __LINE__, cef::logging::LOG_ERROR , \
-                         ##__VA_ARGS__)
-#define COMPACT_GOOGLE_LOG_EX_FATAL(ClassName, ...) \
-  cef::logging::ClassName(__FILE__, __LINE__, cef::logging::LOG_FATAL , \
-                         ##__VA_ARGS__)
-#define COMPACT_GOOGLE_LOG_EX_DFATAL(ClassName, ...) \
-  cef::logging::ClassName(__FILE__, __LINE__, cef::logging::LOG_DFATAL , \
-                         ##__VA_ARGS__)
-
-#define COMPACT_GOOGLE_LOG_INFO \
-  COMPACT_GOOGLE_LOG_EX_INFO(LogMessage)
-#define COMPACT_GOOGLE_LOG_WARNING \
-  COMPACT_GOOGLE_LOG_EX_WARNING(LogMessage)
-#define COMPACT_GOOGLE_LOG_ERROR \
-  COMPACT_GOOGLE_LOG_EX_ERROR(LogMessage)
-#define COMPACT_GOOGLE_LOG_FATAL \
-  COMPACT_GOOGLE_LOG_EX_FATAL(LogMessage)
-#define COMPACT_GOOGLE_LOG_DFATAL \
-  COMPACT_GOOGLE_LOG_EX_DFATAL(LogMessage)
+#define COMPACT_GOOGLE_LOG_EX_INFO(ClassName, ...)                    \
+  cef::logging::ClassName(__FILE__, __LINE__, cef::logging::LOG_INFO, \
+                          ##__VA_ARGS__)
+#define COMPACT_GOOGLE_LOG_EX_WARNING(ClassName, ...)                    \
+  cef::logging::ClassName(__FILE__, __LINE__, cef::logging::LOG_WARNING, \
+                          ##__VA_ARGS__)
+#define COMPACT_GOOGLE_LOG_EX_ERROR(ClassName, ...)                    \
+  cef::logging::ClassName(__FILE__, __LINE__, cef::logging::LOG_ERROR, \
+                          ##__VA_ARGS__)
+#define COMPACT_GOOGLE_LOG_EX_FATAL(ClassName, ...)                    \
+  cef::logging::ClassName(__FILE__, __LINE__, cef::logging::LOG_FATAL, \
+                          ##__VA_ARGS__)
+#define COMPACT_GOOGLE_LOG_EX_DFATAL(ClassName, ...)                    \
+  cef::logging::ClassName(__FILE__, __LINE__, cef::logging::LOG_DFATAL, \
+                          ##__VA_ARGS__)
+
+#define COMPACT_GOOGLE_LOG_INFO COMPACT_GOOGLE_LOG_EX_INFO(LogMessage)
+#define COMPACT_GOOGLE_LOG_WARNING COMPACT_GOOGLE_LOG_EX_WARNING(LogMessage)
+#define COMPACT_GOOGLE_LOG_ERROR COMPACT_GOOGLE_LOG_EX_ERROR(LogMessage)
+#define COMPACT_GOOGLE_LOG_FATAL COMPACT_GOOGLE_LOG_EX_FATAL(LogMessage)
+#define COMPACT_GOOGLE_LOG_DFATAL COMPACT_GOOGLE_LOG_EX_DFATAL(LogMessage)
 
 #if defined(OS_WIN)
 // wingdi.h defines ERROR to be 0. When we call LOG(ERROR), it gets
@@ -236,7 +231,7 @@ const LogSeverity LOG_DFATAL = LOG_FATAL;
 // the Windows SDK does for consistency.
 #define ERROR 0
 #define COMPACT_GOOGLE_LOG_EX_0(ClassName, ...) \
-  COMPACT_GOOGLE_LOG_EX_ERROR(ClassName , ##__VA_ARGS__)
+  COMPACT_GOOGLE_LOG_EX_ERROR(ClassName, ##__VA_ARGS__)
 #define COMPACT_GOOGLE_LOG_0 COMPACT_GOOGLE_LOG_ERROR
 // Needed for LOG_IS_ON(ERROR).
 const LogSeverity LOG_0 = LOG_ERROR;
@@ -246,7 +241,7 @@ const LogSeverity LOG_0 = LOG_ERROR;
 // LOG_IS_ON(DFATAL) always holds in debug mode. In particular, CHECK()s will
 // always fire if they fail.
 #define LOG_IS_ON(severity) \
-  ((::cef::logging::LOG_ ## severity) >= ::cef::logging::GetMinLogLevel())
+  ((::cef::logging::LOG_##severity) >= ::cef::logging::GetMinLogLevel())
 
 // We can't do any caching tricks with VLOG_IS_ON() like the
 // google-glog version since it requires GCC extensions.  This means
@@ -257,8 +252,8 @@ const LogSeverity LOG_0 = LOG_ERROR;
 
 // Helper macro which avoids evaluating the arguments to a stream if
 // the condition doesn't hold.
-#define LAZY_STREAM(stream, condition)                                  \
-  !(condition) ? (void) 0 : ::cef::logging::LogMessageVoidify() & (stream)
+#define LAZY_STREAM(stream, condition) \
+  !(condition) ? (void)0 : ::cef::logging::LogMessageVoidify() & (stream)
 
 // We use the preprocessor's merging operator, "##", so that, e.g.,
 // LOG(INFO) becomes the token COMPACT_GOOGLE_LOG_INFO.  There's some funny
@@ -268,7 +263,7 @@ const LogSeverity LOG_0 = LOG_ERROR;
 // impossible to stream something like a string directly to an unnamed
 // ostream. We employ a neat hack by calling the stream() member
 // function of LogMessage which seems to avoid the problem.
-#define LOG_STREAM(severity) COMPACT_GOOGLE_LOG_ ## severity.stream()
+#define LOG_STREAM(severity) COMPACT_GOOGLE_LOG_##severity.stream()
 
 #define LOG(severity) LAZY_STREAM(LOG_STREAM(severity), LOG_IS_ON(severity))
 #define LOG_IF(severity, condition) \
@@ -286,16 +281,18 @@ const LogSeverity LOG_0 = LOG_ERROR;
 
 #define VLOG_IF(verbose_level, condition) \
   LAZY_STREAM(VLOG_STREAM(verbose_level), \
-      VLOG_IS_ON(verbose_level) && (condition))
+              VLOG_IS_ON(verbose_level) && (condition))
 
-#if defined (OS_WIN)
-#define VPLOG_STREAM(verbose_level) \
-  cef::logging::Win32ErrorLogMessage(__FILE__, __LINE__, -verbose_level, \
-    ::cef::logging::GetLastSystemErrorCode()).stream()
+#if defined(OS_WIN)
+#define VPLOG_STREAM(verbose_level)                                            \
+  cef::logging::Win32ErrorLogMessage(__FILE__, __LINE__, -verbose_level,       \
+                                     ::cef::logging::GetLastSystemErrorCode()) \
+      .stream()
 #elif defined(OS_POSIX)
-#define VPLOG_STREAM(verbose_level) \
-  cef::logging::ErrnoLogMessage(__FILE__, __LINE__, -verbose_level, \
-    ::cef::logging::GetLastSystemErrorCode()).stream()
+#define VPLOG_STREAM(verbose_level)                                       \
+  cef::logging::ErrnoLogMessage(__FILE__, __LINE__, -verbose_level,       \
+                                ::cef::logging::GetLastSystemErrorCode()) \
+      .stream()
 #endif
 
 #define VPLOG(verbose_level) \
@@ -303,34 +300,35 @@ const LogSeverity LOG_0 = LOG_ERROR;
 
 #define VPLOG_IF(verbose_level, condition) \
   LAZY_STREAM(VPLOG_STREAM(verbose_level), \
-    VLOG_IS_ON(verbose_level) && (condition))
+              VLOG_IS_ON(verbose_level) && (condition))
 
 // TODO(akalin): Add more VLOG variants, e.g. VPLOG.
 
-#define LOG_ASSERT(condition)  \
+#define LOG_ASSERT(condition) \
   LOG_IF(FATAL, !(condition)) << "Assert failed: " #condition ". "
 #define SYSLOG_ASSERT(condition) \
   SYSLOG_IF(FATAL, !(condition)) << "Assert failed: " #condition ". "
 
 #if defined(OS_WIN)
-#define PLOG_STREAM(severity) \
-  COMPACT_GOOGLE_LOG_EX_ ## severity(Win32ErrorLogMessage, \
-      ::cef::logging::GetLastSystemErrorCode()).stream()
+#define PLOG_STREAM(severity)                                                \
+  COMPACT_GOOGLE_LOG_EX_##severity(Win32ErrorLogMessage,                     \
+                                   ::cef::logging::GetLastSystemErrorCode()) \
+      .stream()
 #elif defined(OS_POSIX)
-#define PLOG_STREAM(severity) \
-  COMPACT_GOOGLE_LOG_EX_ ## severity(ErrnoLogMessage, \
-      ::cef::logging::GetLastSystemErrorCode()).stream()
+#define PLOG_STREAM(severity)                                                \
+  COMPACT_GOOGLE_LOG_EX_##severity(ErrnoLogMessage,                          \
+                                   ::cef::logging::GetLastSystemErrorCode()) \
+      .stream()
 #endif
 
-#define PLOG(severity)                                          \
-  LAZY_STREAM(PLOG_STREAM(severity), LOG_IS_ON(severity))
+#define PLOG(severity) LAZY_STREAM(PLOG_STREAM(severity), LOG_IS_ON(severity))
 
 #define PLOG_IF(severity, condition) \
   LAZY_STREAM(PLOG_STREAM(severity), LOG_IS_ON(severity) && (condition))
 
 // The actual stream used isn't important.
-#define EAT_STREAM_PARAMETERS                                           \
-  true ? (void) 0 : ::cef::logging::LogMessageVoidify() & LOG_STREAM(FATAL)
+#define EAT_STREAM_PARAMETERS \
+  true ? (void)0 : ::cef::logging::LogMessageVoidify() & LOG_STREAM(FATAL)
 
 // CHECK dies with a fatal error if condition is not true.  It is *not*
 // controlled by NDEBUG, so the check will be executed regardless of
@@ -341,28 +339,27 @@ const LogSeverity LOG_0 = LOG_ERROR;
 
 #define CHECK(condition)                       \
   LAZY_STREAM(LOG_STREAM(FATAL), !(condition)) \
-  << "Check failed: " #condition ". "
+      << "Check failed: " #condition ". "
 
-#define PCHECK(condition) \
+#define PCHECK(condition)                       \
   LAZY_STREAM(PLOG_STREAM(FATAL), !(condition)) \
-  << "Check failed: " #condition ". "
+      << "Check failed: " #condition ". "
 
 // Helper macro for binary operators.
 // Don't use this macro directly in your code, use CHECK_EQ et al below.
 //
 // TODO(akalin): Rewrite this so that constructs like if (...)
 // CHECK_EQ(...) else { ... } work properly.
-#define CHECK_OP(name, op, val1, val2)                          \
-  if (std::string* _result =                                    \
-      cef::logging::Check##name##Impl((val1), (val2),                \
-                                 #val1 " " #op " " #val2))      \
-    cef::logging::LogMessage(__FILE__, __LINE__, _result).stream()
+#define CHECK_OP(name, op, val1, val2)                        \
+  if (std::string* _result = cef::logging::Check##name##Impl( \
+          (val1), (val2), #val1 " " #op " " #val2))           \
+  cef::logging::LogMessage(__FILE__, __LINE__, _result).stream()
 
 // Build the error message string.  This is separate from the "Impl"
 // function template because it is not performance critical and so can
 // be out of line, while the "Impl" code should be inline.  Caller
 // takes ownership of the returned string.
-template<class t1, class t2>
+template <class t1, class t2>
 std::string* MakeCheckOpString(const t1& v1, const t2& v2, const char* names) {
   std::ostringstream ss;
   ss << names << " (" << v1 << " vs. " << v2 << ")";
@@ -374,51 +371,60 @@ std::string* MakeCheckOpString(const t1& v1, const t2& v2, const char* names) {
 #if !defined(COMPILER_MSVC)
 // Commonly used instantiations of MakeCheckOpString<>. Explicitly instantiated
 // in logging.cc.
-extern template std::string* MakeCheckOpString<int, int>(
-    const int&, const int&, const char* names);
-extern template
-std::string* MakeCheckOpString<unsigned long, unsigned long>(
-    const unsigned long&, const unsigned long&, const char* names);
-extern template
-std::string* MakeCheckOpString<unsigned long, unsigned int>(
-    const unsigned long&, const unsigned int&, const char* names);
-extern template
-std::string* MakeCheckOpString<unsigned int, unsigned long>(
-    const unsigned int&, const unsigned long&, const char* names);
-extern template
-std::string* MakeCheckOpString<std::string, std::string>(
-    const std::string&, const std::string&, const char* name);
+extern template std::string* MakeCheckOpString<int, int>(const int&,
+                                                         const int&,
+                                                         const char* names);
+extern template std::string* MakeCheckOpString<unsigned long, unsigned long>(
+    const unsigned long&,
+    const unsigned long&,
+    const char* names);
+extern template std::string* MakeCheckOpString<unsigned long, unsigned int>(
+    const unsigned long&,
+    const unsigned int&,
+    const char* names);
+extern template std::string* MakeCheckOpString<unsigned int, unsigned long>(
+    const unsigned int&,
+    const unsigned long&,
+    const char* names);
+extern template std::string* MakeCheckOpString<std::string, std::string>(
+    const std::string&,
+    const std::string&,
+    const char* name);
 #endif
 
 // Helper functions for CHECK_OP macro.
 // The (int, int) specialization works around the issue that the compiler
 // will not instantiate the template version of the function on values of
 // unnamed enum type - see comment below.
-#define DEFINE_CHECK_OP_IMPL(name, op) \
-  template <class t1, class t2> \
-  inline std::string* Check##name##Impl(const t1& v1, const t2& v2, \
-                                        const char* names) { \
-    if (v1 op v2) return NULL; \
-    else return MakeCheckOpString(v1, v2, names); \
-  } \
+#define DEFINE_CHECK_OP_IMPL(name, op)                                       \
+  template <class t1, class t2>                                              \
+  inline std::string* Check##name##Impl(const t1& v1, const t2& v2,          \
+                                        const char* names) {                 \
+    if (v1 op v2)                                                            \
+      return NULL;                                                           \
+    else                                                                     \
+      return MakeCheckOpString(v1, v2, names);                               \
+  }                                                                          \
   inline std::string* Check##name##Impl(int v1, int v2, const char* names) { \
-    if (v1 op v2) return NULL; \
-    else return MakeCheckOpString(v1, v2, names); \
+    if (v1 op v2)                                                            \
+      return NULL;                                                           \
+    else                                                                     \
+      return MakeCheckOpString(v1, v2, names);                               \
   }
 DEFINE_CHECK_OP_IMPL(EQ, ==)
 DEFINE_CHECK_OP_IMPL(NE, !=)
 DEFINE_CHECK_OP_IMPL(LE, <=)
-DEFINE_CHECK_OP_IMPL(LT, < )
+DEFINE_CHECK_OP_IMPL(LT, <)
 DEFINE_CHECK_OP_IMPL(GE, >=)
-DEFINE_CHECK_OP_IMPL(GT, > )
+DEFINE_CHECK_OP_IMPL(GT, >)
 #undef DEFINE_CHECK_OP_IMPL
 
 #define CHECK_EQ(val1, val2) CHECK_OP(EQ, ==, val1, val2)
 #define CHECK_NE(val1, val2) CHECK_OP(NE, !=, val1, val2)
 #define CHECK_LE(val1, val2) CHECK_OP(LE, <=, val1, val2)
-#define CHECK_LT(val1, val2) CHECK_OP(LT, < , val1, val2)
+#define CHECK_LT(val1, val2) CHECK_OP(LT, <, val1, val2)
 #define CHECK_GE(val1, val2) CHECK_OP(GE, >=, val1, val2)
-#define CHECK_GT(val1, val2) CHECK_OP(GT, > , val1, val2)
+#define CHECK_GT(val1, val2) CHECK_OP(GT, >, val1, val2)
 
 #if defined(NDEBUG)
 #define ENABLE_DLOG 0
@@ -471,11 +477,9 @@ enum { DEBUG_MODE = ENABLE_DLOG };
 
 #undef ENABLE_DLOG
 
-#define DLOG(severity)                                          \
-  LAZY_STREAM(LOG_STREAM(severity), DLOG_IS_ON(severity))
+#define DLOG(severity) LAZY_STREAM(LOG_STREAM(severity), DLOG_IS_ON(severity))
 
-#define DPLOG(severity)                                         \
-  LAZY_STREAM(PLOG_STREAM(severity), DLOG_IS_ON(severity))
+#define DPLOG(severity) LAZY_STREAM(PLOG_STREAM(severity), DLOG_IS_ON(severity))
 
 #define DVLOG(verboselevel) DVLOG_IF(verboselevel, VLOG_IS_ON(verboselevel))
 
@@ -486,7 +490,7 @@ enum { DEBUG_MODE = ENABLE_DLOG };
 #if DCHECK_IS_ON()
 
 #define COMPACT_GOOGLE_LOG_EX_DCHECK(ClassName, ...) \
-  COMPACT_GOOGLE_LOG_EX_FATAL(ClassName , ##__VA_ARGS__)
+  COMPACT_GOOGLE_LOG_EX_FATAL(ClassName, ##__VA_ARGS__)
 #define COMPACT_GOOGLE_LOG_DCHECK COMPACT_GOOGLE_LOG_FATAL
 const LogSeverity LOG_DCHECK = LOG_FATAL;
 
@@ -494,7 +498,7 @@ const LogSeverity LOG_DCHECK = LOG_FATAL;
 
 // These are just dummy values.
 #define COMPACT_GOOGLE_LOG_EX_DCHECK(ClassName, ...) \
-  COMPACT_GOOGLE_LOG_EX_INFO(ClassName , ##__VA_ARGS__)
+  COMPACT_GOOGLE_LOG_EX_INFO(ClassName, ##__VA_ARGS__)
 #define COMPACT_GOOGLE_LOG_DCHECK COMPACT_GOOGLE_LOG_INFO
 const LogSeverity LOG_DCHECK = LOG_INFO;
 
@@ -505,22 +509,23 @@ const LogSeverity LOG_DCHECK = LOG_INFO;
 // variable warnings if the only use of a variable is in a DCHECK.
 // This behavior is different from DLOG_IF et al.
 
-#define DCHECK(condition)                                           \
-  LAZY_STREAM(LOG_STREAM(DCHECK), DCHECK_IS_ON() && !(condition))   \
+#define DCHECK(condition)                                         \
+  LAZY_STREAM(LOG_STREAM(DCHECK), DCHECK_IS_ON() && !(condition)) \
       << "Check failed: " #condition ". "
 
-#define DPCHECK(condition)                                          \
-  LAZY_STREAM(PLOG_STREAM(DCHECK), DCHECK_IS_ON() && !(condition))  \
+#define DPCHECK(condition)                                         \
+  LAZY_STREAM(PLOG_STREAM(DCHECK), DCHECK_IS_ON() && !(condition)) \
       << "Check failed: " #condition ". "
 
 // Helper macro for binary operators.
 // Don't use this macro directly in your code, use DCHECK_EQ et al below.
-#define DCHECK_OP(name, op, val1, val2)                                   \
-  if (DCHECK_IS_ON())                                                     \
-    if (std::string* _result = cef::logging::Check##name##Impl(           \
-            (val1), (val2), #val1 " " #op " " #val2))                     \
-  cef::logging::LogMessage(__FILE__, __LINE__,                            \
-      ::cef::logging::LOG_DCHECK, _result).stream()
+#define DCHECK_OP(name, op, val1, val2)                                    \
+  if (DCHECK_IS_ON())                                                      \
+    if (std::string* _result = cef::logging::Check##name##Impl(            \
+            (val1), (val2), #val1 " " #op " " #val2))                      \
+  cef::logging::LogMessage(__FILE__, __LINE__, ::cef::logging::LOG_DCHECK, \
+                           _result)                                        \
+      .stream()
 
 // Equality/Inequality checks - compare two values, and log a
 // LOG_DCHECK message including the two values when the result is not
@@ -544,13 +549,13 @@ const LogSeverity LOG_DCHECK = LOG_INFO;
 #define DCHECK_EQ(val1, val2) DCHECK_OP(EQ, ==, val1, val2)
 #define DCHECK_NE(val1, val2) DCHECK_OP(NE, !=, val1, val2)
 #define DCHECK_LE(val1, val2) DCHECK_OP(LE, <=, val1, val2)
-#define DCHECK_LT(val1, val2) DCHECK_OP(LT, < , val1, val2)
+#define DCHECK_LT(val1, val2) DCHECK_OP(LT, <, val1, val2)
 #define DCHECK_GE(val1, val2) DCHECK_OP(GE, >=, val1, val2)
-#define DCHECK_GT(val1, val2) DCHECK_OP(GT, > , val1, val2)
+#define DCHECK_GT(val1, val2) DCHECK_OP(GT, >, val1, val2)
 
 #if defined(NDEBUG) && defined(OS_CHROMEOS)
-#define NOTREACHED() LOG(ERROR) << "NOTREACHED() hit in " << \
-    __FUNCTION__ << ". "
+#define NOTREACHED() \
+  LOG(ERROR) << "NOTREACHED() hit in " << __FUNCTION__ << ". "
 #else
 #define NOTREACHED() DCHECK(false)
 #endif
@@ -577,7 +582,9 @@ class LogMessage {
   LogMessage(const char* file, int line, std::string* result);
 
   // Used for DCHECK_EQ(), etc. Takes ownership of the given string.
-  LogMessage(const char* file, int line, LogSeverity severity,
+  LogMessage(const char* file,
+             int line,
+             LogSeverity severity,
              std::string* result);
 
   ~LogMessage();
@@ -617,7 +624,7 @@ class LogMessage {
 
 // A non-macro interface to the log facility; (useful
 // when the logging level is not a compile-time constant).
-inline void LogAtLevel(int const log_level, std::string const &msg) {
+inline void LogAtLevel(int const log_level, std::string const& msg) {
   LogMessage(__FILE__, __LINE__, log_level).stream() << msg;
 }
 
@@ -626,10 +633,10 @@ inline void LogAtLevel(int const log_level, std::string const &msg) {
 // is not used" and "statement has no effect".
 class LogMessageVoidify {
  public:
-  LogMessageVoidify() { }
+  LogMessageVoidify() {}
   // This has to be an operator with a precedence lower than << but
   // higher than ?:
-  void operator&(std::ostream&) { }
+  void operator&(std::ostream&) {}
 };
 
 #if defined(OS_WIN)
@@ -739,12 +746,13 @@ inline std::ostream& operator<<(std::ostream& out, const std::wstring& wstr) {
 #elif NOTIMPLEMENTED_POLICY == 4
 #define NOTIMPLEMENTED() LOG(ERROR) << NOTIMPLEMENTED_MSG
 #elif NOTIMPLEMENTED_POLICY == 5
-#define NOTIMPLEMENTED() do {\
-  static bool logged_once = false;\
-  LOG_IF(ERROR, !logged_once) << NOTIMPLEMENTED_MSG;\
-  logged_once = true;\
-} while(0);\
-EAT_STREAM_PARAMETERS
+#define NOTIMPLEMENTED()                               \
+  do {                                                 \
+    static bool logged_once = false;                   \
+    LOG_IF(ERROR, !logged_once) << NOTIMPLEMENTED_MSG; \
+    logged_once = true;                                \
+  } while (0);                                         \
+  EAT_STREAM_PARAMETERS
 #endif
 
 #endif  // !USING_CHROMIUM_INCLUDES
diff --git a/src/include/base/cef_macros.h b/src/include/base/cef_macros.h
index df3f9b7c..e714529c 100644
--- a/src/include/base/cef_macros.h
+++ b/src/include/base/cef_macros.h
@@ -41,7 +41,7 @@
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.
 
-#include <stddef.h>  // For size_t.
+#include <stddef.h>                  // For size_t.
 #include "include/base/cef_build.h"  // For COMPILER_MSVC
 
 #if !defined(arraysize)
@@ -126,14 +126,13 @@ char (&ArraySizeHelper(const T (&array)[N]))[N];
 namespace cef {
 
 template <bool>
-struct CompileAssert {
-};
+struct CompileAssert {};
 
 }  // namespace cef
 
-#define COMPILE_ASSERT(expr, msg) \
-  typedef cef::CompileAssert<(bool(expr))> msg[bool(expr) ? 1 : -1] \
-      ALLOW_UNUSED_TYPE
+#define COMPILE_ASSERT(expr, msg)          \
+  typedef cef::CompileAssert<(bool(expr))> \
+      msg[bool(expr) ? 1 : -1] ALLOW_UNUSED_TYPE
 
 // Implementation details of COMPILE_ASSERT:
 //
@@ -182,13 +181,12 @@ struct CompileAssert {
 
 #endif  // !USING_CHROMIUM_INCLUDES
 
-#if !defined(ALLOW_THIS_IN_INITIALIZER_LIST)
-#if defined(COMPILER_MSVC)
+#if !defined(MSVC_PUSH_DISABLE_WARNING) && defined(COMPILER_MSVC)
 
 // MSVC_PUSH_DISABLE_WARNING pushes |n| onto a stack of warnings to be disabled.
 // The warning remains disabled until popped by MSVC_POP_WARNING.
-#define MSVC_PUSH_DISABLE_WARNING(n) __pragma(warning(push)) \
-                                     __pragma(warning(disable:n))
+#define MSVC_PUSH_DISABLE_WARNING(n) \
+  __pragma(warning(push)) __pragma(warning(disable : n))
 
 // MSVC_PUSH_WARNING_LEVEL pushes |n| as the global warning level.  The level
 // remains in effect until popped by MSVC_POP_WARNING().  Use 0 to disable all
@@ -198,6 +196,10 @@ struct CompileAssert {
 // Pop effects of innermost MSVC_PUSH_* macro.
 #define MSVC_POP_WARNING() __pragma(warning(pop))
 
+#endif  // !defined(MSVC_PUSH_DISABLE_WARNING) && defined(COMPILER_MSVC)
+
+#if !defined(ALLOW_THIS_IN_INITIALIZER_LIST)
+#if defined(COMPILER_MSVC)
 // Allows |this| to be passed as an argument in constructor initializer lists.
 // This uses push/pop instead of the seemingly simpler suppress feature to avoid
 // having the warning be disabled for more than just |code|.
@@ -207,13 +209,11 @@ struct CompileAssert {
 //
 // Compiler warning C4355: 'this': used in base member initializer list:
 // http://msdn.microsoft.com/en-us/library/3c594ae3(VS.80).aspx
-#define ALLOW_THIS_IN_INITIALIZER_LIST(code) MSVC_PUSH_DISABLE_WARNING(4355) \
-                                             code \
-                                             MSVC_POP_WARNING()
+#define ALLOW_THIS_IN_INITIALIZER_LIST(code) \
+  MSVC_PUSH_DISABLE_WARNING(4355)            \
+  code MSVC_POP_WARNING()
 #else  // !COMPILER_MSVC
-
 #define ALLOW_THIS_IN_INITIALIZER_LIST(code) code
-
 #endif  // !COMPILER_MSVC
 #endif  // !ALLOW_THIS_IN_INITIALIZER_LIST
 
diff --git a/src/include/base/cef_move.h b/src/include/base/cef_move.h
index 3c3c4913..da47d2d3 100644
--- a/src/include/base/cef_move.h
+++ b/src/include/base/cef_move.h
@@ -240,20 +240,22 @@
 //
 // The workaround is to explicitly declare your copy constructor.
 //
-#define MOVE_ONLY_TYPE_FOR_CPP_03(type, rvalue_type) \
- private: \
-  struct rvalue_type { \
+#define MOVE_ONLY_TYPE_FOR_CPP_03(type, rvalue_type)       \
+ private:                                                  \
+  struct rvalue_type {                                     \
     explicit rvalue_type(type* object) : object(object) {} \
-    type* object; \
-  }; \
-  type(type&); \
-  void operator=(type&); \
- public: \
-  operator rvalue_type() { return rvalue_type(this); } \
-  type Pass() { return type(rvalue_type(this)); } \
-  typedef void MoveOnlyTypeForCPP03; \
+    type* object;                                          \
+  };                                                       \
+  type(type&);                                             \
+  void operator=(type&);                                   \
+                                                           \
+ public:                                                   \
+  operator rvalue_type() { return rvalue_type(this); }     \
+  type Pass() { return type(rvalue_type(this)); }          \
+  typedef void MoveOnlyTypeForCPP03;                       \
+                                                           \
  private:
- 
+
 #endif  // !USING_CHROMIUM_INCLUDES
 
 #endif  // CEF_INCLUDE_BASE_CEF_MOVE_H_
diff --git a/src/include/base/cef_platform_thread.h b/src/include/base/cef_platform_thread.h
index 91611360..d3fdd798 100644
--- a/src/include/base/cef_platform_thread.h
+++ b/src/include/base/cef_platform_thread.h
@@ -69,21 +69,14 @@ class PlatformThreadRef {
  public:
   typedef cef_platform_thread_handle_t RefType;
 
-  PlatformThreadRef()
-      : id_(0) {
-  }
+  PlatformThreadRef() : id_(0) {}
 
-  explicit PlatformThreadRef(RefType id)
-      : id_(id) {
-  }
+  explicit PlatformThreadRef(RefType id) : id_(id) {}
 
-  bool operator==(PlatformThreadRef other) const {
-    return id_ == other.id_;
-  }
+  bool operator==(PlatformThreadRef other) const { return id_ == other.id_; }
+
+  bool is_null() const { return id_ == 0; }
 
-  bool is_null() const {
-    return id_ == 0;
-  }
  private:
   RefType id_;
 };
diff --git a/src/include/base/cef_ref_counted.h b/src/include/base/cef_ref_counted.h
index 61d4de68..480b1ce9 100644
--- a/src/include/base/cef_ref_counted.h
+++ b/src/include/base/cef_ref_counted.h
@@ -64,43 +64,43 @@ class RefCountedBase {
  protected:
   RefCountedBase()
       : ref_count_(0)
-  #if DCHECK_IS_ON()
-      , in_dtor_(false)
-  #endif
-      {
+#if DCHECK_IS_ON()
+        ,
+        in_dtor_(false)
+#endif
+  {
   }
 
   ~RefCountedBase() {
-  #if DCHECK_IS_ON()
+#if DCHECK_IS_ON()
     DCHECK(in_dtor_) << "RefCounted object deleted without calling Release()";
-  #endif
+#endif
   }
 
-
   void AddRef() const {
-    // TODO(maruel): Add back once it doesn't assert 500 times/sec.
-    // Current thread books the critical section "AddRelease"
-    // without release it.
-    // DFAKE_SCOPED_LOCK_THREAD_LOCKED(add_release_);
-  #if DCHECK_IS_ON()
+// TODO(maruel): Add back once it doesn't assert 500 times/sec.
+// Current thread books the critical section "AddRelease"
+// without release it.
+// DFAKE_SCOPED_LOCK_THREAD_LOCKED(add_release_);
+#if DCHECK_IS_ON()
     DCHECK(!in_dtor_);
-  #endif
+#endif
     ++ref_count_;
   }
 
   // Returns true if the object should self-delete.
   bool Release() const {
-    // TODO(maruel): Add back once it doesn't assert 500 times/sec.
-    // Current thread books the critical section "AddRelease"
-    // without release it.
-    // DFAKE_SCOPED_LOCK_THREAD_LOCKED(add_release_);
-  #if DCHECK_IS_ON()
+// TODO(maruel): Add back once it doesn't assert 500 times/sec.
+// Current thread books the critical section "AddRelease"
+// without release it.
+// DFAKE_SCOPED_LOCK_THREAD_LOCKED(add_release_);
+#if DCHECK_IS_ON()
     DCHECK(!in_dtor_);
-  #endif
+#endif
     if (--ref_count_ == 0) {
-  #if DCHECK_IS_ON()
+#if DCHECK_IS_ON()
       in_dtor_ = true;
-  #endif
+#endif
       return true;
     }
     return false;
@@ -160,9 +160,7 @@ class RefCounted : public cef_subtle::RefCountedBase {
  public:
   RefCounted() {}
 
-  void AddRef() const {
-    cef_subtle::RefCountedBase::AddRef();
-  }
+  void AddRef() const { cef_subtle::RefCountedBase::AddRef(); }
 
   void Release() const {
     if (cef_subtle::RefCountedBase::Release()) {
@@ -178,18 +176,19 @@ class RefCounted : public cef_subtle::RefCountedBase {
 };
 
 // Forward declaration.
-template <class T, typename Traits> class RefCountedThreadSafe;
+template <class T, typename Traits>
+class RefCountedThreadSafe;
 
 // Default traits for RefCountedThreadSafe<T>.  Deletes the object when its ref
 // count reaches 0.  Overload to delete it on a different thread etc.
-template<typename T>
+template <typename T>
 struct DefaultRefCountedThreadSafeTraits {
   static void Destruct(const T* x) {
     // Delete through RefCountedThreadSafe to make child classes only need to be
     // friend with RefCountedThreadSafe instead of this struct, which is an
     // implementation detail.
-    RefCountedThreadSafe<T,
-                         DefaultRefCountedThreadSafeTraits>::DeleteInternal(x);
+    RefCountedThreadSafe<T, DefaultRefCountedThreadSafeTraits>::DeleteInternal(
+        x);
   }
 };
 
@@ -205,14 +204,12 @@ struct DefaultRefCountedThreadSafeTraits {
 //    private:
 //     friend class base::RefCountedThreadSafe<MyFoo>;
 //     ~MyFoo();
-template <class T, typename Traits = DefaultRefCountedThreadSafeTraits<T> >
+template <class T, typename Traits = DefaultRefCountedThreadSafeTraits<T>>
 class RefCountedThreadSafe : public cef_subtle::RefCountedThreadSafeBase {
  public:
   RefCountedThreadSafe() {}
 
-  void AddRef() const {
-    cef_subtle::RefCountedThreadSafeBase::AddRef();
-  }
+  void AddRef() const { cef_subtle::RefCountedThreadSafeBase::AddRef(); }
 
   void Release() const {
     if (cef_subtle::RefCountedThreadSafeBase::Release()) {
@@ -234,9 +231,9 @@ class RefCountedThreadSafe : public cef_subtle::RefCountedThreadSafeBase {
 // A thread-safe wrapper for some piece of data so we can place other
 // things in scoped_refptrs<>.
 //
-template<typename T>
+template <typename T>
 class RefCountedData
-    : public base::RefCountedThreadSafe< base::RefCountedData<T> > {
+    : public base::RefCountedThreadSafe<base::RefCountedData<T>> {
  public:
   RefCountedData() : data() {}
   RefCountedData(const T& in_value) : data(in_value) {}
@@ -244,7 +241,7 @@ class RefCountedData
   T data;
 
  private:
-  friend class base::RefCountedThreadSafe<base::RefCountedData<T> >;
+  friend class base::RefCountedThreadSafe<base::RefCountedData<T>>;
   ~RefCountedData() {}
 };
 
@@ -303,8 +300,7 @@ class scoped_refptr {
  public:
   typedef T element_type;
 
-  scoped_refptr() : ptr_(NULL) {
-  }
+  scoped_refptr() : ptr_(NULL) {}
 
   scoped_refptr(T* p) : ptr_(p) {
     if (ptr_)
@@ -364,9 +360,7 @@ class scoped_refptr {
     *pp = p;
   }
 
-  void swap(scoped_refptr<T>& r) {
-    swap(&r.ptr_);
-  }
+  void swap(scoped_refptr<T>& r) { swap(&r.ptr_); }
 
  protected:
   T* ptr_;
diff --git a/src/include/base/cef_scoped_ptr.h b/src/include/base/cef_scoped_ptr.h
index 56355897..eb9e0e29 100644
--- a/src/include/base/cef_scoped_ptr.h
+++ b/src/include/base/cef_scoped_ptr.h
@@ -154,7 +154,8 @@ class RefCountedThreadSafeBase;
 template <class T>
 struct DefaultDeleter {
   DefaultDeleter() {}
-  template <typename U> DefaultDeleter(const DefaultDeleter<U>& other) {
+  template <typename U>
+  DefaultDeleter(const DefaultDeleter<U>& other) {
     // IMPLEMENTATION NOTE: C++11 20.7.1.1.2p2 only provides this constructor
     // if U* is implicitly convertible to T* and U is not an array type.
     //
@@ -194,7 +195,8 @@ struct DefaultDeleter<T[]> {
   // References:
   //   C++98 [expr.delete]p3
   //   http://cplusplus.github.com/LWG/lwg-defects.html#938
-  template <typename U> void operator()(U* array) const;
+  template <typename U>
+  void operator()(U* array) const;
 };
 
 template <class T, int n>
@@ -209,18 +211,18 @@ struct DefaultDeleter<T[n]> {
 // scoped_ptr<int, base::FreeDeleter> foo_ptr(
 //     static_cast<int*>(malloc(sizeof(int))));
 struct FreeDeleter {
-  inline void operator()(void* ptr) const {
-    free(ptr);
-  }
+  inline void operator()(void* ptr) const { free(ptr); }
 };
 
 namespace cef_internal {
 
-template <typename T> struct IsNotRefCounted {
+template <typename T>
+struct IsNotRefCounted {
   enum {
-    value = !base::is_convertible<T*, base::subtle::RefCountedBase*>::value &&
-        !base::is_convertible<T*, base::subtle::RefCountedThreadSafeBase*>::
-            value
+    value =
+        !base::is_convertible<T*, base::subtle::RefCountedBase*>::value &&
+        !base::is_convertible<T*,
+                              base::subtle::RefCountedThreadSafeBase*>::value
   };
 };
 
@@ -229,7 +231,7 @@ template <typename T> struct IsNotRefCounted {
 template <class T, class D>
 class scoped_ptr_impl {
  public:
-  explicit scoped_ptr_impl(T* p) : data_(p) { }
+  explicit scoped_ptr_impl(T* p) : data_(p) {}
 
   // Initializer for deleters that have data parameters.
   scoped_ptr_impl(T* p, const D& d) : data_(p, d) {}
@@ -309,7 +311,8 @@ class scoped_ptr_impl {
 
  private:
   // Needed to allow type-converting constructor.
-  template <typename U, typename V> friend class scoped_ptr_impl;
+  template <typename U, typename V>
+  friend class scoped_ptr_impl;
 
   // Use the empty base class optimization to allow us to have a D
   // member, while avoiding any space overhead for it when D is an
@@ -346,7 +349,7 @@ class scoped_ptr_impl {
 // unique_ptr<> features. Known deficiencies include not supporting move-only
 // deleteres, function pointers as deleters, and deleters with reference
 // types.
-template <class T, class D = base::DefaultDeleter<T> >
+template <class T, class D = base::DefaultDeleter<T>>
 class scoped_ptr {
   MOVE_ONLY_TYPE_FOR_CPP_03(scoped_ptr, RValue)
 
@@ -359,13 +362,13 @@ class scoped_ptr {
   typedef D deleter_type;
 
   // Constructor.  Defaults to initializing with NULL.
-  scoped_ptr() : impl_(NULL) { }
+  scoped_ptr() : impl_(NULL) {}
 
   // Constructor.  Takes ownership of p.
-  explicit scoped_ptr(element_type* p) : impl_(p) { }
+  explicit scoped_ptr(element_type* p) : impl_(p) {}
 
   // Constructor.  Allows initialization of a stateful deleter.
-  scoped_ptr(element_type* p, const D& d) : impl_(p, d) { }
+  scoped_ptr(element_type* p, const D& d) : impl_(p, d) {}
 
   // Constructor.  Allows construction from a scoped_ptr rvalue for a
   // convertible type and deleter.
@@ -383,7 +386,7 @@ class scoped_ptr {
   }
 
   // Constructor.  Move constructor for C++03 move emulation of this type.
-  scoped_ptr(RValue rvalue) : impl_(&rvalue.object->impl_) { }
+  scoped_ptr(RValue rvalue) : impl_(&rvalue.object->impl_) {}
 
   // operator=.  Allows assignment from a scoped_ptr rvalue for a convertible
   // type and deleter.
@@ -412,7 +415,7 @@ class scoped_ptr {
     assert(impl_.get() != NULL);
     return *impl_.get();
   }
-  element_type* operator->() const  {
+  element_type* operator->() const {
     assert(impl_.get() != NULL);
     return impl_.get();
   }
@@ -443,18 +446,14 @@ class scoped_ptr {
   bool operator!=(const element_type* p) const { return impl_.get() != p; }
 
   // Swap two scoped pointers.
-  void swap(scoped_ptr& p2) {
-    impl_.swap(p2.impl_);
-  }
+  void swap(scoped_ptr& p2) { impl_.swap(p2.impl_); }
 
   // Release a pointer.
   // The return value is the current pointer held by this object.
   // If this object holds a NULL pointer, the return value is NULL.
   // After this operation, this object will hold a NULL pointer,
   // and will not own the object any more.
-  element_type* release() WARN_UNUSED_RESULT {
-    return impl_.release();
-  }
+  element_type* release() WARN_UNUSED_RESULT { return impl_.release(); }
 
   // C++98 doesn't support functions templates with default parameters which
   // makes it hard to write a PassAs() that understands converting the deleter
@@ -469,7 +468,8 @@ class scoped_ptr {
 
  private:
   // Needed to reach into |impl_| in the constructor.
-  template <typename U, typename V> friend class scoped_ptr;
+  template <typename U, typename V>
+  friend class scoped_ptr;
   base::cef_internal::scoped_ptr_impl<element_type, deleter_type> impl_;
 
   // Forbidden for API compatibility with std::unique_ptr.
@@ -479,8 +479,10 @@ class scoped_ptr {
   // doesn't make sense, and if U == T, it still doesn't make sense
   // because you should never have the same object owned by two different
   // scoped_ptrs.
-  template <class U> bool operator==(scoped_ptr<U> const& p2) const;
-  template <class U> bool operator!=(scoped_ptr<U> const& p2) const;
+  template <class U>
+  bool operator==(scoped_ptr<U> const& p2) const;
+  template <class U>
+  bool operator!=(scoped_ptr<U> const& p2) const;
 };
 
 template <class T, class D>
@@ -493,7 +495,7 @@ class scoped_ptr<T[], D> {
   typedef D deleter_type;
 
   // Constructor.  Defaults to initializing with NULL.
-  scoped_ptr() : impl_(NULL) { }
+  scoped_ptr() : impl_(NULL) {}
 
   // Constructor. Stores the given array. Note that the argument's type
   // must exactly match T*. In particular:
@@ -511,10 +513,10 @@ class scoped_ptr<T[], D> {
   //   to work around this may use implicit_cast<const T*>().
   //   However, because of the first bullet in this comment, users MUST
   //   NOT use implicit_cast<Base*>() to upcast the static type of the array.
-  explicit scoped_ptr(element_type* array) : impl_(array) { }
+  explicit scoped_ptr(element_type* array) : impl_(array) {}
 
   // Constructor.  Move constructor for C++03 move emulation of this type.
-  scoped_ptr(RValue rvalue) : impl_(&rvalue.object->impl_) { }
+  scoped_ptr(RValue rvalue) : impl_(&rvalue.object->impl_) {}
 
   // operator=.  Move operator= for C++03 move emulation of this type.
   scoped_ptr& operator=(RValue rhs) {
@@ -553,18 +555,14 @@ class scoped_ptr<T[], D> {
   bool operator!=(element_type* array) const { return impl_.get() != array; }
 
   // Swap two scoped pointers.
-  void swap(scoped_ptr& p2) {
-    impl_.swap(p2.impl_);
-  }
+  void swap(scoped_ptr& p2) { impl_.swap(p2.impl_); }
 
   // Release a pointer.
   // The return value is the current pointer held by this object.
   // If this object holds a NULL pointer, the return value is NULL.
   // After this operation, this object will hold a NULL pointer,
   // and will not own the object any more.
-  element_type* release() WARN_UNUSED_RESULT {
-    return impl_.release();
-  }
+  element_type* release() WARN_UNUSED_RESULT { return impl_.release(); }
 
  private:
   // Force element_type to be a complete type.
@@ -578,20 +576,24 @@ class scoped_ptr<T[], D> {
   // private and has no definition. This is disabled because it is not safe to
   // call delete[] on an array whose static type does not match its dynamic
   // type.
-  template <typename U> explicit scoped_ptr(U* array);
+  template <typename U>
+  explicit scoped_ptr(U* array);
   explicit scoped_ptr(int disallow_construction_from_null);
 
   // Disable reset() from any type other than element_type*, for the same
   // reasons as the constructor above.
-  template <typename U> void reset(U* array);
+  template <typename U>
+  void reset(U* array);
   void reset(int disallow_reset_from_null);
 
   // Forbid comparison of scoped_ptr types.  If U != T, it totally
   // doesn't make sense, and if U == T, it still doesn't make sense
   // because you should never have the same object owned by two different
   // scoped_ptrs.
-  template <class U> bool operator==(scoped_ptr<U> const& p2) const;
-  template <class U> bool operator!=(scoped_ptr<U> const& p2) const;
+  template <class U>
+  bool operator==(scoped_ptr<U> const& p2) const;
+  template <class U>
+  bool operator!=(scoped_ptr<U> const& p2) const;
 };
 
 // Free functions
diff --git a/src/include/base/cef_string16.h b/src/include/base/cef_string16.h
index 51760f43..42756407 100644
--- a/src/include/base/cef_string16.h
+++ b/src/include/base/cef_string16.h
@@ -112,26 +112,19 @@ struct string16_char_traits {
   typedef mbstate_t state_type;
   typedef std::fpos<state_type> pos_type;
 
-  static void assign(char_type& c1, const char_type& c2) {
-    c1 = c2;
-  }
+  static void assign(char_type& c1, const char_type& c2) { c1 = c2; }
 
-  static bool eq(const char_type& c1, const char_type& c2) {
-    return c1 == c2;
-  }
-  static bool lt(const char_type& c1, const char_type& c2) {
-    return c1 < c2;
-  }
+  static bool eq(const char_type& c1, const char_type& c2) { return c1 == c2; }
+  static bool lt(const char_type& c1, const char_type& c2) { return c1 < c2; }
 
   static int compare(const char_type* s1, const char_type* s2, size_t n) {
     return c16memcmp(s1, s2, n);
   }
 
-  static size_t length(const char_type* s) {
-    return c16len(s);
-  }
+  static size_t length(const char_type* s) { return c16len(s); }
 
-  static const char_type* find(const char_type* s, size_t n,
+  static const char_type* find(const char_type* s,
+                               size_t n,
                                const char_type& a) {
     return c16memchr(s, a, n);
   }
@@ -152,21 +145,15 @@ struct string16_char_traits {
     return eq_int_type(c, eof()) ? 0 : c;
   }
 
-  static char_type to_char_type(const int_type& c) {
-    return char_type(c);
-  }
+  static char_type to_char_type(const int_type& c) { return char_type(c); }
 
-  static int_type to_int_type(const char_type& c) {
-    return int_type(c);
-  }
+  static int_type to_int_type(const char_type& c) { return int_type(c); }
 
   static bool eq_int_type(const int_type& c1, const int_type& c2) {
     return c1 == c2;
   }
 
-  static int_type eof() {
-    return static_cast<int_type>(EOF);
-  }
+  static int_type eof() { return static_cast<int_type>(EOF); }
 };
 
 typedef std::basic_string<char16, base::string16_char_traits> string16;
@@ -217,8 +204,8 @@ extern void PrintTo(const string16& str, std::ostream* out);
 //
 // TODO(mark): File this bug with Apple and update this note with a bug number.
 
-extern template
-class std::basic_string<base::char16, base::string16_char_traits>;
+extern template class std::basic_string<base::char16,
+                                        base::string16_char_traits>;
 
 #endif  // WCHAR_T_IS_UTF32
 
diff --git a/src/include/base/cef_template_util.h b/src/include/base/cef_template_util.h
index 098bf463..38fa5839 100644
--- a/src/include/base/cef_template_util.h
+++ b/src/include/base/cef_template_util.h
@@ -53,70 +53,92 @@ namespace base {
 
 // template definitions from tr1
 
-template<class T, T v>
+template <class T, T v>
 struct integral_constant {
   static const T value = v;
   typedef T value_type;
   typedef integral_constant<T, v> type;
 };
 
-template <class T, T v> const T integral_constant<T, v>::value;
+template <class T, T v>
+const T integral_constant<T, v>::value;
 
 typedef integral_constant<bool, true> true_type;
 typedef integral_constant<bool, false> false_type;
 
-template <class T> struct is_pointer : false_type {};
-template <class T> struct is_pointer<T*> : true_type {};
+template <class T>
+struct is_pointer : false_type {};
+template <class T>
+struct is_pointer<T*> : true_type {};
 
 // Member function pointer detection up to four params. Add more as needed
 // below. This is built-in to C++ 11, and we can remove this when we switch.
-template<typename T>
+template <typename T>
 struct is_member_function_pointer : false_type {};
 
 template <typename R, typename Z>
-struct is_member_function_pointer<R(Z::*)()> : true_type {};
+struct is_member_function_pointer<R (Z::*)()> : true_type {};
 template <typename R, typename Z>
-struct is_member_function_pointer<R(Z::*)() const> : true_type {};
+struct is_member_function_pointer<R (Z::*)() const> : true_type {};
 
 template <typename R, typename Z, typename A>
-struct is_member_function_pointer<R(Z::*)(A)> : true_type {};
+struct is_member_function_pointer<R (Z::*)(A)> : true_type {};
 template <typename R, typename Z, typename A>
-struct is_member_function_pointer<R(Z::*)(A) const> : true_type {};
+struct is_member_function_pointer<R (Z::*)(A) const> : true_type {};
 
 template <typename R, typename Z, typename A, typename B>
-struct is_member_function_pointer<R(Z::*)(A, B)> : true_type {};
+struct is_member_function_pointer<R (Z::*)(A, B)> : true_type {};
 template <typename R, typename Z, typename A, typename B>
-struct is_member_function_pointer<R(Z::*)(A, B) const> : true_type {};
+struct is_member_function_pointer<R (Z::*)(A, B) const> : true_type {};
 
 template <typename R, typename Z, typename A, typename B, typename C>
-struct is_member_function_pointer<R(Z::*)(A, B, C)> : true_type {};
+struct is_member_function_pointer<R (Z::*)(A, B, C)> : true_type {};
 template <typename R, typename Z, typename A, typename B, typename C>
-struct is_member_function_pointer<R(Z::*)(A, B, C) const> : true_type {};
+struct is_member_function_pointer<R (Z::*)(A, B, C) const> : true_type {};
 
-template <typename R, typename Z, typename A, typename B, typename C,
+template <typename R,
+          typename Z,
+          typename A,
+          typename B,
+          typename C,
           typename D>
-struct is_member_function_pointer<R(Z::*)(A, B, C, D)> : true_type {};
-template <typename R, typename Z, typename A, typename B, typename C,
+struct is_member_function_pointer<R (Z::*)(A, B, C, D)> : true_type {};
+template <typename R,
+          typename Z,
+          typename A,
+          typename B,
+          typename C,
           typename D>
-struct is_member_function_pointer<R(Z::*)(A, B, C, D) const> : true_type {};
-
-
-template <class T, class U> struct is_same : public false_type {};
-template <class T> struct is_same<T,T> : true_type {};
-
-template<class> struct is_array : public false_type {};
-template<class T, size_t n> struct is_array<T[n]> : public true_type {};
-template<class T> struct is_array<T[]> : public true_type {};
-
-template <class T> struct is_non_const_reference : false_type {};
-template <class T> struct is_non_const_reference<T&> : true_type {};
-template <class T> struct is_non_const_reference<const T&> : false_type {};
-
-template <class T> struct is_const : false_type {};
-template <class T> struct is_const<const T> : true_type {};
-
-template <class T> struct is_void : false_type {};
-template <> struct is_void<void> : true_type {};
+struct is_member_function_pointer<R (Z::*)(A, B, C, D) const> : true_type {};
+
+template <class T, class U>
+struct is_same : public false_type {};
+template <class T>
+struct is_same<T, T> : true_type {};
+
+template <class>
+struct is_array : public false_type {};
+template <class T, size_t n>
+struct is_array<T[n]> : public true_type {};
+template <class T>
+struct is_array<T[]> : public true_type {};
+
+template <class T>
+struct is_non_const_reference : false_type {};
+template <class T>
+struct is_non_const_reference<T&> : true_type {};
+template <class T>
+struct is_non_const_reference<const T&> : false_type {};
+
+template <class T>
+struct is_const : false_type {};
+template <class T>
+struct is_const<const T> : true_type {};
+
+template <class T>
+struct is_void : false_type {};
+template <>
+struct is_void<void> : true_type {};
 
 namespace cef_internal {
 
@@ -152,7 +174,7 @@ struct ConvertHelper {
 // is_class type_trait implementation.
 struct IsClassHelper {
   template <typename C>
-  static YesType Test(void(C::*)(void));
+  static YesType Test(void (C::*)(void));
 
   template <typename C>
   static NoType Test(...);
@@ -168,22 +190,22 @@ template <typename From, typename To>
 struct is_convertible
     : integral_constant<bool,
                         sizeof(cef_internal::ConvertHelper::Test<To>(
-                                   cef_internal::ConvertHelper::Create<From>())) ==
-                        sizeof(cef_internal::YesType)> {
-};
+                            cef_internal::ConvertHelper::Create<From>())) ==
+                            sizeof(cef_internal::YesType)> {};
 
 template <typename T>
 struct is_class
     : integral_constant<bool,
                         sizeof(cef_internal::IsClassHelper::Test<T>(0)) ==
-                            sizeof(cef_internal::YesType)> {
-};
+                            sizeof(cef_internal::YesType)> {};
 
-template<bool B, class T = void>
+template <bool B, class T = void>
 struct enable_if {};
 
-template<class T>
-struct enable_if<true, T> { typedef T type; };
+template <class T>
+struct enable_if<true, T> {
+  typedef T type;
+};
 
 }  // namespace base
 
diff --git a/src/include/base/cef_thread_checker.h b/src/include/base/cef_thread_checker.h
index 42bac7fc..e48c8d03 100644
--- a/src/include/base/cef_thread_checker.h
+++ b/src/include/base/cef_thread_checker.h
@@ -58,7 +58,6 @@
 #define ENABLE_THREAD_CHECKER 0
 #endif
 
-
 namespace base {
 
 namespace cef_internal {
@@ -69,9 +68,7 @@ namespace cef_internal {
 // right version for your build configuration.
 class ThreadCheckerDoNothing {
  public:
-  bool CalledOnValidThread() const {
-    return true;
-  }
+  bool CalledOnValidThread() const { return true; }
 
   void DetachFromThread() {}
 };
@@ -110,11 +107,9 @@ class ThreadCheckerDoNothing {
 //
 // In Release mode, CalledOnValidThread will always return true.
 #if ENABLE_THREAD_CHECKER
-class ThreadChecker : public cef_internal::ThreadCheckerImpl {
-};
+class ThreadChecker : public cef_internal::ThreadCheckerImpl {};
 #else
-class ThreadChecker : public cef_internal::ThreadCheckerDoNothing {
-};
+class ThreadChecker : public cef_internal::ThreadCheckerDoNothing {};
 #endif  // ENABLE_THREAD_CHECKER
 
 #undef ENABLE_THREAD_CHECKER
diff --git a/src/include/base/cef_thread_collision_warner.h b/src/include/base/cef_thread_collision_warner.h
index 8f60a546..53f6ef6d 100644
--- a/src/include/base/cef_thread_collision_warner.h
+++ b/src/include/base/cef_thread_collision_warner.h
@@ -139,24 +139,22 @@
 //   DFAKE_MUTEX(shareable_section_);
 // };
 
-
 #if DCHECK_IS_ON()
 
 // Defines a class member that acts like a mutex. It is used only as a
 // verification tool.
-#define DFAKE_MUTEX(obj) \
-     mutable base::ThreadCollisionWarner obj
+#define DFAKE_MUTEX(obj) mutable base::ThreadCollisionWarner obj
 // Asserts the call is never called simultaneously in two threads. Used at
 // member function scope.
 #define DFAKE_SCOPED_LOCK(obj) \
-     base::ThreadCollisionWarner::ScopedCheck s_check_##obj(&obj)
+  base::ThreadCollisionWarner::ScopedCheck s_check_##obj(&obj)
 // Asserts the call is never called simultaneously in two threads. Used at
 // member function scope. Same as DFAKE_SCOPED_LOCK but allows recursive locks.
 #define DFAKE_SCOPED_RECURSIVE_LOCK(obj) \
-     base::ThreadCollisionWarner::ScopedRecursiveCheck sr_check_##obj(&obj)
+  base::ThreadCollisionWarner::ScopedRecursiveCheck sr_check_##obj(&obj)
 // Asserts the code is always executed in the same thread.
 #define DFAKE_SCOPED_LOCK_THREAD_LOCKED(obj) \
-     base::ThreadCollisionWarner::Check check_##obj(&obj)
+  base::ThreadCollisionWarner::Check check_##obj(&obj)
 
 #else
 
@@ -187,13 +185,9 @@ class ThreadCollisionWarner {
  public:
   // The parameter asserter is there only for test purpose
   explicit ThreadCollisionWarner(AsserterBase* asserter = new DCheckAsserter())
-      : valid_thread_id_(0),
-        counter_(0),
-        asserter_(asserter) {}
+      : valid_thread_id_(0), counter_(0), asserter_(asserter) {}
 
-  ~ThreadCollisionWarner() {
-    delete asserter_;
-  }
+  ~ThreadCollisionWarner() { delete asserter_; }
 
   // This class is meant to be used through the macro
   // DFAKE_SCOPED_LOCK_THREAD_LOCKED
@@ -202,8 +196,7 @@ class ThreadCollisionWarner {
   // from one thread
   class Check {
    public:
-    explicit Check(ThreadCollisionWarner* warner)
-        : warner_(warner) {
+    explicit Check(ThreadCollisionWarner* warner) : warner_(warner) {
       warner_->EnterSelf();
     }
 
@@ -219,14 +212,11 @@ class ThreadCollisionWarner {
   // DFAKE_SCOPED_LOCK
   class ScopedCheck {
    public:
-    explicit ScopedCheck(ThreadCollisionWarner* warner)
-        : warner_(warner) {
+    explicit ScopedCheck(ThreadCollisionWarner* warner) : warner_(warner) {
       warner_->Enter();
     }
 
-    ~ScopedCheck() {
-      warner_->Leave();
-    }
+    ~ScopedCheck() { warner_->Leave(); }
 
    private:
     ThreadCollisionWarner* warner_;
@@ -243,9 +233,7 @@ class ThreadCollisionWarner {
       warner_->EnterSelf();
     }
 
-    ~ScopedRecursiveCheck() {
-      warner_->Leave();
-    }
+    ~ScopedRecursiveCheck() { warner_->Leave(); }
 
    private:
     ThreadCollisionWarner* warner_;
diff --git a/src/include/base/cef_trace_event.h b/src/include/base/cef_trace_event.h
index 20723fbb..1b2cad01 100644
--- a/src/include/base/cef_trace_event.h
+++ b/src/include/base/cef_trace_event.h
@@ -160,32 +160,29 @@
 // enabled, then this does nothing.
 // - category and name strings must have application lifetime (statics or
 //   literals). They may not include " chars.
-#define TRACE_EVENT0(category, name) \
+#define TRACE_EVENT0(category, name)                              \
   cef_trace_event_begin(category, name, NULL, 0, NULL, 0, false); \
   CEF_INTERNAL_TRACE_END_ON_SCOPE_CLOSE(category, name)
-#define TRACE_EVENT1(category, name, arg1_name, arg1_val) \
+#define TRACE_EVENT1(category, name, arg1_name, arg1_val)                     \
   cef_trace_event_begin(category, name, arg1_name, arg1_val, NULL, 0, false); \
   CEF_INTERNAL_TRACE_END_ON_SCOPE_CLOSE(category, name)
-#define TRACE_EVENT2(category, name, arg1_name, arg1_val, arg2_name, \
-      arg2_val) \
-  cef_trace_event_begin(category, name, arg1_name, arg1_val, \
-                                        arg2_name, arg2_val, false); \
+#define TRACE_EVENT2(category, name, arg1_name, arg1_val, arg2_name, arg2_val) \
+  cef_trace_event_begin(category, name, arg1_name, arg1_val, arg2_name,        \
+                        arg2_val, false);                                      \
   CEF_INTERNAL_TRACE_END_ON_SCOPE_CLOSE(category, name)
 
 // Implementation detail: trace event macros create temporary variable names.
 // These macros give each temporary variable a unique name based on the line
 // number to prevent name collisions.
-#define CEF_INTERNAL_TRACE_EVENT_UID3(a,b) \
-  cef_trace_event_unique_##a##b
-#define CEF_INTERNAL_TRACE_EVENT_UID2(a,b) \
-  CEF_INTERNAL_TRACE_EVENT_UID3(a,b)
+#define CEF_INTERNAL_TRACE_EVENT_UID3(a, b) cef_trace_event_unique_##a##b
+#define CEF_INTERNAL_TRACE_EVENT_UID2(a, b) CEF_INTERNAL_TRACE_EVENT_UID3(a, b)
 #define CEF_INTERNAL_TRACE_EVENT_UID(name_prefix) \
   CEF_INTERNAL_TRACE_EVENT_UID2(name_prefix, __LINE__)
 
 // Implementation detail: internal macro to end end event when the scope ends.
-#define CEF_INTERNAL_TRACE_END_ON_SCOPE_CLOSE(category, name) \
-   cef_trace_event::CefTraceEndOnScopeClose \
-       CEF_INTERNAL_TRACE_EVENT_UID(profileScope)(category, name)
+#define CEF_INTERNAL_TRACE_END_ON_SCOPE_CLOSE(category, name)            \
+  cef_trace_event::CefTraceEndOnScopeClose CEF_INTERNAL_TRACE_EVENT_UID( \
+      profileScope)(category, name)
 
 // Records a single event called "name" immediately, with 0, 1 or 2
 // associated arguments. If the category is not enabled, then this
@@ -196,18 +193,18 @@
   cef_trace_event_instant(category, name, NULL, 0, NULL, 0, false)
 #define TRACE_EVENT_INSTANT1(category, name, arg1_name, arg1_val) \
   cef_trace_event_instant(category, name, arg1_name, arg1_val, NULL, 0, false)
-#define TRACE_EVENT_INSTANT2(category, name, arg1_name, arg1_val, \
-      arg2_name, arg2_val) \
-  cef_trace_event_instant(category, name, arg1_name, arg1_val, arg2_name, \
-      arg2_val, false)
+#define TRACE_EVENT_INSTANT2(category, name, arg1_name, arg1_val, arg2_name, \
+                             arg2_val)                                       \
+  cef_trace_event_instant(category, name, arg1_name, arg1_val, arg2_name,    \
+                          arg2_val, false)
 #define TRACE_EVENT_COPY_INSTANT0(category, name) \
   cef_trace_event_instant(category, name, NULL, 0, NULL, 0, true)
 #define TRACE_EVENT_COPY_INSTANT1(category, name, arg1_name, arg1_val) \
   cef_trace_event_instant(category, name, arg1_name, arg1_val, NULL, 0, true)
-#define TRACE_EVENT_COPY_INSTANT2(category, name, arg1_name, arg1_val, \
-      arg2_name, arg2_val) \
+#define TRACE_EVENT_COPY_INSTANT2(category, name, arg1_name, arg1_val,    \
+                                  arg2_name, arg2_val)                    \
   cef_trace_event_instant(category, name, arg1_name, arg1_val, arg2_name, \
-      arg2_val, true)
+                          arg2_val, true)
 
 // Records a single BEGIN event called "name" immediately, with 0, 1 or 2
 // associated arguments. If the category is not enabled, then this
@@ -218,18 +215,18 @@
   cef_trace_event_begin(category, name, NULL, 0, NULL, 0, false)
 #define TRACE_EVENT_BEGIN1(category, name, arg1_name, arg1_val) \
   cef_trace_event_begin(category, name, arg1_name, arg1_val, NULL, 0, false)
-#define TRACE_EVENT_BEGIN2(category, name, arg1_name, arg1_val, \
-      arg2_name, arg2_val) \
-  cef_trace_event_begin(category, name, arg1_name, arg1_val, arg2_name, \
-      arg2_val, false)
+#define TRACE_EVENT_BEGIN2(category, name, arg1_name, arg1_val, arg2_name, \
+                           arg2_val)                                       \
+  cef_trace_event_begin(category, name, arg1_name, arg1_val, arg2_name,    \
+                        arg2_val, false)
 #define TRACE_EVENT_COPY_BEGIN0(category, name) \
   cef_trace_event_begin(category, name, NULL, 0, NULL, 0, true)
 #define TRACE_EVENT_COPY_BEGIN1(category, name, arg1_name, arg1_val) \
   cef_trace_event_begin(category, name, arg1_name, arg1_val, NULL, 0, true)
-#define TRACE_EVENT_COPY_BEGIN2(category, name, arg1_name, arg1_val, \
-      arg2_name, arg2_val) \
+#define TRACE_EVENT_COPY_BEGIN2(category, name, arg1_name, arg1_val,    \
+                                arg2_name, arg2_val)                    \
   cef_trace_event_begin(category, name, arg1_name, arg1_val, arg2_name, \
-      arg2_val, true)
+                        arg2_val, true)
 
 // Records a single END event for "name" immediately. If the category
 // is not enabled, then this does nothing.
@@ -239,18 +236,18 @@
   cef_trace_event_end(category, name, NULL, 0, NULL, 0, false)
 #define TRACE_EVENT_END1(category, name, arg1_name, arg1_val) \
   cef_trace_event_end(category, name, arg1_name, arg1_val, NULL, 0, false)
-#define TRACE_EVENT_END2(category, name, arg1_name, arg1_val, \
-      arg2_name, arg2_val) \
-  cef_trace_event_end(category, name, arg1_name, arg1_val, arg2_name, \
-      arg2_val, false)
+#define TRACE_EVENT_END2(category, name, arg1_name, arg1_val, arg2_name, \
+                         arg2_val)                                       \
+  cef_trace_event_end(category, name, arg1_name, arg1_val, arg2_name,    \
+                      arg2_val, false)
 #define TRACE_EVENT_COPY_END0(category, name) \
   cef_trace_event_end(category, name, NULL, 0, NULL, 0, true)
 #define TRACE_EVENT_COPY_END1(category, name, arg1_name, arg1_val) \
   cef_trace_event_end(category, name, arg1_name, arg1_val, NULL, 0, true)
-#define TRACE_EVENT_COPY_END2(category, name, arg1_name, arg1_val, \
-      arg2_name, arg2_val) \
-  cef_trace_event_end(category, name, arg1_name, arg1_val, arg2_name, \
-      arg2_val, true)
+#define TRACE_EVENT_COPY_END2(category, name, arg1_name, arg1_val, arg2_name, \
+                              arg2_val)                                       \
+  cef_trace_event_end(category, name, arg1_name, arg1_val, arg2_name,         \
+                      arg2_val, true)
 
 // Records the value of a counter called "name" immediately. Value
 // must be representable as a 32 bit integer.
@@ -266,14 +263,14 @@
 // values as a stacked-bar chart.
 // - category and name strings must have application lifetime (statics or
 //   literals). They may not include " chars.
-#define TRACE_COUNTER2(category, name, value1_name, value1_val, \
-      value2_name, value2_val) \
-  cef_trace_counter(category, name, value1_name, value1_val, value2_name, \
-      value2_val, false)
-#define TRACE_COPY_COUNTER2(category, name, value1_name, value1_val, \
-      value2_name, value2_val) \
+#define TRACE_COUNTER2(category, name, value1_name, value1_val, value2_name, \
+                       value2_val)                                           \
+  cef_trace_counter(category, name, value1_name, value1_val, value2_name,    \
+                    value2_val, false)
+#define TRACE_COPY_COUNTER2(category, name, value1_name, value1_val,      \
+                            value2_name, value2_val)                      \
   cef_trace_counter(category, name, value1_name, value1_val, value2_name, \
-      value2_val, true)
+                    value2_val, true)
 
 // Records the value of a counter called "name" immediately. Value
 // must be representable as a 32 bit integer.
@@ -298,14 +295,13 @@
 //   bits will be xored with a hash of the process ID so that the same pointer
 //   on two different processes will not collide.
 #define TRACE_COUNTER_ID2(category, name, id, value1_name, value1_val, \
-      value2_name, value2_val) \
-  cef_trace_counter_id(category, name, id, value1_name, value1_val, \
-      value2_name, value2_val, false)
-#define TRACE_COPY_COUNTER_ID2(category, name, id, value1_name, \
-      value1_val, value2_name, value2_val) \
-  cef_trace_counter_id(category, name, id, value1_name, value1_val, \
-      value2_name, value2_val, true)
-
+                          value2_name, value2_val)                     \
+  cef_trace_counter_id(category, name, id, value1_name, value1_val,    \
+                       value2_name, value2_val, false)
+#define TRACE_COPY_COUNTER_ID2(category, name, id, value1_name, value1_val, \
+                               value2_name, value2_val)                     \
+  cef_trace_counter_id(category, name, id, value1_name, value1_val,         \
+                       value2_name, value2_val, true)
 
 // Records a single ASYNC_BEGIN event called "name" immediately, with 0, 1 or 2
 // associated arguments. If the category is not enabled, then this
@@ -325,23 +321,22 @@
 // args.
 #define TRACE_EVENT_ASYNC_BEGIN0(category, name, id) \
   cef_trace_event_async_begin(category, name, id, NULL, 0, NULL, 0, false)
-#define TRACE_EVENT_ASYNC_BEGIN1(category, name, id, arg1_name, arg1_val) \
+#define TRACE_EVENT_ASYNC_BEGIN1(category, name, id, arg1_name, arg1_val)    \
   cef_trace_event_async_begin(category, name, id, arg1_name, arg1_val, NULL, \
-      0, false)
+                              0, false)
 #define TRACE_EVENT_ASYNC_BEGIN2(category, name, id, arg1_name, arg1_val, \
-      arg2_name, arg2_val) \
-  cef_trace_event_async_begin(category, name, id, arg1_name, arg1_val, \
-      arg2_name, arg2_val, false)
+                                 arg2_name, arg2_val)                     \
+  cef_trace_event_async_begin(category, name, id, arg1_name, arg1_val,    \
+                              arg2_name, arg2_val, false)
 #define TRACE_EVENT_COPY_ASYNC_BEGIN0(category, name, id) \
   cef_trace_event_async_begin(category, name, id, NULL, 0, NULL, 0, true)
-#define TRACE_EVENT_COPY_ASYNC_BEGIN1(category, name, id, arg1_name, \
-      arg1_val) \
-  cef_trace_event_async_begin(category, name, id, arg1_name, arg1_val, NULL, \
-      0, true)
-#define TRACE_EVENT_COPY_ASYNC_BEGIN2(category, name, id, arg1_name, \
-      arg1_val, arg2_name, arg2_val) \
-  cef_trace_event_async_begin(category, name, id, arg1_name, arg1_val, \
-      arg2_name, arg2_val, true)
+#define TRACE_EVENT_COPY_ASYNC_BEGIN1(category, name, id, arg1_name, arg1_val) \
+  cef_trace_event_async_begin(category, name, id, arg1_name, arg1_val, NULL,   \
+                              0, true)
+#define TRACE_EVENT_COPY_ASYNC_BEGIN2(category, name, id, arg1_name, arg1_val, \
+                                      arg2_name, arg2_val)                     \
+  cef_trace_event_async_begin(category, name, id, arg1_name, arg1_val,         \
+                              arg2_name, arg2_val, true)
 
 // Records a single ASYNC_STEP_INTO event for |step| immediately. If the
 // category is not enabled, then this does nothing. The |name| and |id| must
@@ -351,16 +346,16 @@
 // ASYNC_STEP_PAST events.
 #define TRACE_EVENT_ASYNC_STEP_INTO0(category, name, id, step) \
   cef_trace_event_async_step_into(category, name, id, step, NULL, 0, false)
-#define TRACE_EVENT_ASYNC_STEP_INTO1(category, name, id, step, \
-      arg1_name, arg1_val) \
-  cef_trace_event_async_step_into(category, name, id, step, arg1_name, \
-      arg1_val, false)
+#define TRACE_EVENT_ASYNC_STEP_INTO1(category, name, id, step, arg1_name, \
+                                     arg1_val)                            \
+  cef_trace_event_async_step_into(category, name, id, step, arg1_name,    \
+                                  arg1_val, false)
 #define TRACE_EVENT_COPY_ASYNC_STEP_INTO0(category, name, id, step) \
   cef_trace_event_async_step_into(category, name, id, step, NULL, 0, true)
-#define TRACE_EVENT_COPY_ASYNC_STEP_INTO1(category, name, id, step, \
-      arg1_name, arg1_val) \
-  cef_trace_event_async_step_into(category, name, id, step, arg1_name, \
-      arg1_val, true)
+#define TRACE_EVENT_COPY_ASYNC_STEP_INTO1(category, name, id, step, arg1_name, \
+                                          arg1_val)                            \
+  cef_trace_event_async_step_into(category, name, id, step, arg1_name,         \
+                                  arg1_val, true)
 
 // Records a single ASYNC_STEP_PAST event for |step| immediately. If the
 // category is not enabled, then this does nothing. The |name| and |id| must
@@ -370,38 +365,37 @@
 // ASYNC_STEP_INTO events.
 #define TRACE_EVENT_ASYNC_STEP_PAST0(category, name, id, step) \
   cef_trace_event_async_step_past(category, name, id, step, NULL, 0, false)
-#define TRACE_EVENT_ASYNC_STEP_PAST1(category, name, id, step, \
-      arg1_name, arg1_val) \
-  cef_trace_event_async_step_past(category, name, id, step, arg1_name, \
-      arg1_val, false)
+#define TRACE_EVENT_ASYNC_STEP_PAST1(category, name, id, step, arg1_name, \
+                                     arg1_val)                            \
+  cef_trace_event_async_step_past(category, name, id, step, arg1_name,    \
+                                  arg1_val, false)
 #define TRACE_EVENT_COPY_ASYNC_STEP_PAST0(category, name, id, step) \
   cef_trace_event_async_step_past(category, name, id, step, NULL, 0, true)
-#define TRACE_EVENT_COPY_ASYNC_STEP_PAST1(category, name, id, step, \
-      arg1_name, arg1_val) \
-  cef_trace_event_async_step_past(category, name, id, step, arg1_name, \
-      arg1_val, true)
+#define TRACE_EVENT_COPY_ASYNC_STEP_PAST1(category, name, id, step, arg1_name, \
+                                          arg1_val)                            \
+  cef_trace_event_async_step_past(category, name, id, step, arg1_name,         \
+                                  arg1_val, true)
 
 // Records a single ASYNC_END event for "name" immediately. If the category
 // is not enabled, then this does nothing.
 #define TRACE_EVENT_ASYNC_END0(category, name, id) \
   cef_trace_event_async_end(category, name, id, NULL, 0, NULL, 0, false)
-#define TRACE_EVENT_ASYNC_END1(category, name, id, arg1_name, arg1_val) \
+#define TRACE_EVENT_ASYNC_END1(category, name, id, arg1_name, arg1_val)       \
   cef_trace_event_async_end(category, name, id, arg1_name, arg1_val, NULL, 0, \
-      false)
+                            false)
 #define TRACE_EVENT_ASYNC_END2(category, name, id, arg1_name, arg1_val, \
-      arg2_name, arg2_val) \
-  cef_trace_event_async_end(category, name, id, arg1_name, arg1_val, \
-      arg2_name, arg2_val, false)
+                               arg2_name, arg2_val)                     \
+  cef_trace_event_async_end(category, name, id, arg1_name, arg1_val,    \
+                            arg2_name, arg2_val, false)
 #define TRACE_EVENT_COPY_ASYNC_END0(category, name, id) \
   cef_trace_event_async_end(category, name, id, NULL, 0, NULL, 0, true)
-#define TRACE_EVENT_COPY_ASYNC_END1(category, name, id, arg1_name, \
-      arg1_val) \
+#define TRACE_EVENT_COPY_ASYNC_END1(category, name, id, arg1_name, arg1_val)  \
   cef_trace_event_async_end(category, name, id, arg1_name, arg1_val, NULL, 0, \
-      true)
-#define TRACE_EVENT_COPY_ASYNC_END2(category, name, id, arg1_name, \
-      arg1_val, arg2_name, arg2_val) \
-  cef_trace_event_async_end(category, name, id, arg1_name, arg1_val, \
-      arg2_name, arg2_val, true)
+                            true)
+#define TRACE_EVENT_COPY_ASYNC_END2(category, name, id, arg1_name, arg1_val, \
+                                    arg2_name, arg2_val)                     \
+  cef_trace_event_async_end(category, name, id, arg1_name, arg1_val,         \
+                            arg2_name, arg2_val, true)
 
 namespace cef_trace_event {
 
@@ -409,8 +403,7 @@ namespace cef_trace_event {
 class CefTraceEndOnScopeClose {
  public:
   CefTraceEndOnScopeClose(const char* category, const char* name)
-      : category_(category), name_(name) {
-  }
+      : category_(category), name_(name) {}
   ~CefTraceEndOnScopeClose() {
     cef_trace_event_end(category_, name_, NULL, 0, NULL, 0, false);
   }
diff --git a/src/include/base/cef_tuple.h b/src/include/base/cef_tuple.h
index 2268792d..aeb6e9ce 100644
--- a/src/include/base/cef_tuple.h
+++ b/src/include/base/cef_tuple.h
@@ -96,7 +96,7 @@ struct TupleTraits<P&> {
 };
 
 template <class P>
-struct TupleTypes { };
+struct TupleTypes {};
 
 // Tuple -----------------------------------------------------------------------
 //
@@ -138,8 +138,7 @@ struct Tuple2 {
   Tuple2() {}
   Tuple2(typename TupleTraits<A>::ParamType a,
          typename TupleTraits<B>::ParamType b)
-      : a(a), b(b) {
-  }
+      : a(a), b(b) {}
 
   A a;
   B b;
@@ -156,8 +155,7 @@ struct Tuple3 {
   Tuple3(typename TupleTraits<A>::ParamType a,
          typename TupleTraits<B>::ParamType b,
          typename TupleTraits<C>::ParamType c)
-      : a(a), b(b), c(c){
-  }
+      : a(a), b(b), c(c) {}
 
   A a;
   B b;
@@ -177,8 +175,7 @@ struct Tuple4 {
          typename TupleTraits<B>::ParamType b,
          typename TupleTraits<C>::ParamType c,
          typename TupleTraits<D>::ParamType d)
-      : a(a), b(b), c(c), d(d) {
-  }
+      : a(a), b(b), c(c), d(d) {}
 
   A a;
   B b;
@@ -197,12 +194,11 @@ struct Tuple5 {
 
   Tuple5() {}
   Tuple5(typename TupleTraits<A>::ParamType a,
-    typename TupleTraits<B>::ParamType b,
-    typename TupleTraits<C>::ParamType c,
-    typename TupleTraits<D>::ParamType d,
-    typename TupleTraits<E>::ParamType e)
-    : a(a), b(b), c(c), d(d), e(e) {
-  }
+         typename TupleTraits<B>::ParamType b,
+         typename TupleTraits<C>::ParamType c,
+         typename TupleTraits<D>::ParamType d,
+         typename TupleTraits<E>::ParamType e)
+      : a(a), b(b), c(c), d(d), e(e) {}
 
   A a;
   B b;
@@ -223,13 +219,12 @@ struct Tuple6 {
 
   Tuple6() {}
   Tuple6(typename TupleTraits<A>::ParamType a,
-    typename TupleTraits<B>::ParamType b,
-    typename TupleTraits<C>::ParamType c,
-    typename TupleTraits<D>::ParamType d,
-    typename TupleTraits<E>::ParamType e,
-    typename TupleTraits<F>::ParamType f)
-    : a(a), b(b), c(c), d(d), e(e), f(f) {
-  }
+         typename TupleTraits<B>::ParamType b,
+         typename TupleTraits<C>::ParamType c,
+         typename TupleTraits<D>::ParamType d,
+         typename TupleTraits<E>::ParamType e,
+         typename TupleTraits<F>::ParamType f)
+      : a(a), b(b), c(c), d(d), e(e), f(f) {}
 
   A a;
   B b;
@@ -252,14 +247,13 @@ struct Tuple7 {
 
   Tuple7() {}
   Tuple7(typename TupleTraits<A>::ParamType a,
-    typename TupleTraits<B>::ParamType b,
-    typename TupleTraits<C>::ParamType c,
-    typename TupleTraits<D>::ParamType d,
-    typename TupleTraits<E>::ParamType e,
-    typename TupleTraits<F>::ParamType f,
-    typename TupleTraits<G>::ParamType g)
-    : a(a), b(b), c(c), d(d), e(e), f(f), g(g) {
-  }
+         typename TupleTraits<B>::ParamType b,
+         typename TupleTraits<C>::ParamType c,
+         typename TupleTraits<D>::ParamType d,
+         typename TupleTraits<E>::ParamType e,
+         typename TupleTraits<F>::ParamType f,
+         typename TupleTraits<G>::ParamType g)
+      : a(a), b(b), c(c), d(d), e(e), f(f), g(g) {}
 
   A a;
   B b;
@@ -270,7 +264,13 @@ struct Tuple7 {
   G g;
 };
 
-template <class A, class B, class C, class D, class E, class F, class G,
+template <class A,
+          class B,
+          class C,
+          class D,
+          class E,
+          class F,
+          class G,
           class H>
 struct Tuple8 {
  public:
@@ -285,15 +285,14 @@ struct Tuple8 {
 
   Tuple8() {}
   Tuple8(typename TupleTraits<A>::ParamType a,
-    typename TupleTraits<B>::ParamType b,
-    typename TupleTraits<C>::ParamType c,
-    typename TupleTraits<D>::ParamType d,
-    typename TupleTraits<E>::ParamType e,
-    typename TupleTraits<F>::ParamType f,
-    typename TupleTraits<G>::ParamType g,
-    typename TupleTraits<H>::ParamType h)
-    : a(a), b(b), c(c), d(d), e(e), f(f), g(g), h(h) {
-  }
+         typename TupleTraits<B>::ParamType b,
+         typename TupleTraits<C>::ParamType c,
+         typename TupleTraits<D>::ParamType d,
+         typename TupleTraits<E>::ParamType e,
+         typename TupleTraits<F>::ParamType f,
+         typename TupleTraits<G>::ParamType g,
+         typename TupleTraits<H>::ParamType h)
+      : a(a), b(b), c(c), d(d), e(e), f(f), g(g), h(h) {}
 
   A a;
   B b;
@@ -311,127 +310,151 @@ struct Tuple8 {
 // definitions of class types the tuple takes as parameters.
 
 template <>
-struct TupleTypes< Tuple0 > {
+struct TupleTypes<Tuple0> {
   typedef Tuple0 ValueTuple;
   typedef Tuple0 RefTuple;
   typedef Tuple0 ParamTuple;
 };
 
 template <class A>
-struct TupleTypes< Tuple1<A> > {
+struct TupleTypes<Tuple1<A>> {
   typedef Tuple1<typename TupleTraits<A>::ValueType> ValueTuple;
   typedef Tuple1<typename TupleTraits<A>::RefType> RefTuple;
   typedef Tuple1<typename TupleTraits<A>::ParamType> ParamTuple;
 };
 
 template <class A, class B>
-struct TupleTypes< Tuple2<A, B> > {
+struct TupleTypes<Tuple2<A, B>> {
   typedef Tuple2<typename TupleTraits<A>::ValueType,
-                 typename TupleTraits<B>::ValueType> ValueTuple;
-typedef Tuple2<typename TupleTraits<A>::RefType,
-               typename TupleTraits<B>::RefType> RefTuple;
+                 typename TupleTraits<B>::ValueType>
+      ValueTuple;
+  typedef Tuple2<typename TupleTraits<A>::RefType,
+                 typename TupleTraits<B>::RefType>
+      RefTuple;
   typedef Tuple2<typename TupleTraits<A>::ParamType,
-                 typename TupleTraits<B>::ParamType> ParamTuple;
+                 typename TupleTraits<B>::ParamType>
+      ParamTuple;
 };
 
 template <class A, class B, class C>
-struct TupleTypes< Tuple3<A, B, C> > {
+struct TupleTypes<Tuple3<A, B, C>> {
   typedef Tuple3<typename TupleTraits<A>::ValueType,
                  typename TupleTraits<B>::ValueType,
-                 typename TupleTraits<C>::ValueType> ValueTuple;
-typedef Tuple3<typename TupleTraits<A>::RefType,
-               typename TupleTraits<B>::RefType,
-               typename TupleTraits<C>::RefType> RefTuple;
+                 typename TupleTraits<C>::ValueType>
+      ValueTuple;
+  typedef Tuple3<typename TupleTraits<A>::RefType,
+                 typename TupleTraits<B>::RefType,
+                 typename TupleTraits<C>::RefType>
+      RefTuple;
   typedef Tuple3<typename TupleTraits<A>::ParamType,
                  typename TupleTraits<B>::ParamType,
-                 typename TupleTraits<C>::ParamType> ParamTuple;
+                 typename TupleTraits<C>::ParamType>
+      ParamTuple;
 };
 
 template <class A, class B, class C, class D>
-struct TupleTypes< Tuple4<A, B, C, D> > {
+struct TupleTypes<Tuple4<A, B, C, D>> {
   typedef Tuple4<typename TupleTraits<A>::ValueType,
                  typename TupleTraits<B>::ValueType,
                  typename TupleTraits<C>::ValueType,
-                 typename TupleTraits<D>::ValueType> ValueTuple;
-typedef Tuple4<typename TupleTraits<A>::RefType,
-               typename TupleTraits<B>::RefType,
-               typename TupleTraits<C>::RefType,
-               typename TupleTraits<D>::RefType> RefTuple;
+                 typename TupleTraits<D>::ValueType>
+      ValueTuple;
+  typedef Tuple4<typename TupleTraits<A>::RefType,
+                 typename TupleTraits<B>::RefType,
+                 typename TupleTraits<C>::RefType,
+                 typename TupleTraits<D>::RefType>
+      RefTuple;
   typedef Tuple4<typename TupleTraits<A>::ParamType,
                  typename TupleTraits<B>::ParamType,
                  typename TupleTraits<C>::ParamType,
-                 typename TupleTraits<D>::ParamType> ParamTuple;
+                 typename TupleTraits<D>::ParamType>
+      ParamTuple;
 };
 
 template <class A, class B, class C, class D, class E>
-struct TupleTypes< Tuple5<A, B, C, D, E> > {
+struct TupleTypes<Tuple5<A, B, C, D, E>> {
   typedef Tuple5<typename TupleTraits<A>::ValueType,
                  typename TupleTraits<B>::ValueType,
                  typename TupleTraits<C>::ValueType,
                  typename TupleTraits<D>::ValueType,
-                 typename TupleTraits<E>::ValueType> ValueTuple;
-typedef Tuple5<typename TupleTraits<A>::RefType,
-               typename TupleTraits<B>::RefType,
-               typename TupleTraits<C>::RefType,
-               typename TupleTraits<D>::RefType,
-               typename TupleTraits<E>::RefType> RefTuple;
+                 typename TupleTraits<E>::ValueType>
+      ValueTuple;
+  typedef Tuple5<typename TupleTraits<A>::RefType,
+                 typename TupleTraits<B>::RefType,
+                 typename TupleTraits<C>::RefType,
+                 typename TupleTraits<D>::RefType,
+                 typename TupleTraits<E>::RefType>
+      RefTuple;
   typedef Tuple5<typename TupleTraits<A>::ParamType,
                  typename TupleTraits<B>::ParamType,
                  typename TupleTraits<C>::ParamType,
                  typename TupleTraits<D>::ParamType,
-                 typename TupleTraits<E>::ParamType> ParamTuple;
+                 typename TupleTraits<E>::ParamType>
+      ParamTuple;
 };
 
 template <class A, class B, class C, class D, class E, class F>
-struct TupleTypes< Tuple6<A, B, C, D, E, F> > {
+struct TupleTypes<Tuple6<A, B, C, D, E, F>> {
   typedef Tuple6<typename TupleTraits<A>::ValueType,
                  typename TupleTraits<B>::ValueType,
                  typename TupleTraits<C>::ValueType,
                  typename TupleTraits<D>::ValueType,
                  typename TupleTraits<E>::ValueType,
-                 typename TupleTraits<F>::ValueType> ValueTuple;
-typedef Tuple6<typename TupleTraits<A>::RefType,
-               typename TupleTraits<B>::RefType,
-               typename TupleTraits<C>::RefType,
-               typename TupleTraits<D>::RefType,
-               typename TupleTraits<E>::RefType,
-               typename TupleTraits<F>::RefType> RefTuple;
+                 typename TupleTraits<F>::ValueType>
+      ValueTuple;
+  typedef Tuple6<typename TupleTraits<A>::RefType,
+                 typename TupleTraits<B>::RefType,
+                 typename TupleTraits<C>::RefType,
+                 typename TupleTraits<D>::RefType,
+                 typename TupleTraits<E>::RefType,
+                 typename TupleTraits<F>::RefType>
+      RefTuple;
   typedef Tuple6<typename TupleTraits<A>::ParamType,
                  typename TupleTraits<B>::ParamType,
                  typename TupleTraits<C>::ParamType,
                  typename TupleTraits<D>::ParamType,
                  typename TupleTraits<E>::ParamType,
-                 typename TupleTraits<F>::ParamType> ParamTuple;
+                 typename TupleTraits<F>::ParamType>
+      ParamTuple;
 };
 
 template <class A, class B, class C, class D, class E, class F, class G>
-struct TupleTypes< Tuple7<A, B, C, D, E, F, G> > {
+struct TupleTypes<Tuple7<A, B, C, D, E, F, G>> {
   typedef Tuple7<typename TupleTraits<A>::ValueType,
                  typename TupleTraits<B>::ValueType,
                  typename TupleTraits<C>::ValueType,
                  typename TupleTraits<D>::ValueType,
                  typename TupleTraits<E>::ValueType,
                  typename TupleTraits<F>::ValueType,
-                 typename TupleTraits<G>::ValueType> ValueTuple;
-typedef Tuple7<typename TupleTraits<A>::RefType,
-               typename TupleTraits<B>::RefType,
-               typename TupleTraits<C>::RefType,
-               typename TupleTraits<D>::RefType,
-               typename TupleTraits<E>::RefType,
-               typename TupleTraits<F>::RefType,
-               typename TupleTraits<G>::RefType> RefTuple;
+                 typename TupleTraits<G>::ValueType>
+      ValueTuple;
+  typedef Tuple7<typename TupleTraits<A>::RefType,
+                 typename TupleTraits<B>::RefType,
+                 typename TupleTraits<C>::RefType,
+                 typename TupleTraits<D>::RefType,
+                 typename TupleTraits<E>::RefType,
+                 typename TupleTraits<F>::RefType,
+                 typename TupleTraits<G>::RefType>
+      RefTuple;
   typedef Tuple7<typename TupleTraits<A>::ParamType,
                  typename TupleTraits<B>::ParamType,
                  typename TupleTraits<C>::ParamType,
                  typename TupleTraits<D>::ParamType,
                  typename TupleTraits<E>::ParamType,
                  typename TupleTraits<F>::ParamType,
-                 typename TupleTraits<G>::ParamType> ParamTuple;
+                 typename TupleTraits<G>::ParamType>
+      ParamTuple;
 };
 
-template <class A, class B, class C, class D, class E, class F, class G,
+template <class A,
+          class B,
+          class C,
+          class D,
+          class E,
+          class F,
+          class G,
           class H>
-struct TupleTypes< Tuple8<A, B, C, D, E, F, G, H> > {
+struct TupleTypes<Tuple8<A, B, C, D, E, F, G, H>> {
   typedef Tuple8<typename TupleTraits<A>::ValueType,
                  typename TupleTraits<B>::ValueType,
                  typename TupleTraits<C>::ValueType,
@@ -439,15 +462,17 @@ struct TupleTypes< Tuple8<A, B, C, D, E, F, G, H> > {
                  typename TupleTraits<E>::ValueType,
                  typename TupleTraits<F>::ValueType,
                  typename TupleTraits<G>::ValueType,
-                 typename TupleTraits<H>::ValueType> ValueTuple;
-typedef Tuple8<typename TupleTraits<A>::RefType,
-               typename TupleTraits<B>::RefType,
-               typename TupleTraits<C>::RefType,
-               typename TupleTraits<D>::RefType,
-               typename TupleTraits<E>::RefType,
-               typename TupleTraits<F>::RefType,
-               typename TupleTraits<G>::RefType,
-               typename TupleTraits<H>::RefType> RefTuple;
+                 typename TupleTraits<H>::ValueType>
+      ValueTuple;
+  typedef Tuple8<typename TupleTraits<A>::RefType,
+                 typename TupleTraits<B>::RefType,
+                 typename TupleTraits<C>::RefType,
+                 typename TupleTraits<D>::RefType,
+                 typename TupleTraits<E>::RefType,
+                 typename TupleTraits<F>::RefType,
+                 typename TupleTraits<G>::RefType,
+                 typename TupleTraits<H>::RefType>
+      RefTuple;
   typedef Tuple8<typename TupleTraits<A>::ParamType,
                  typename TupleTraits<B>::ParamType,
                  typename TupleTraits<C>::ParamType,
@@ -455,7 +480,8 @@ typedef Tuple8<typename TupleTraits<A>::RefType,
                  typename TupleTraits<E>::ParamType,
                  typename TupleTraits<F>::ParamType,
                  typename TupleTraits<G>::ParamType,
-                 typename TupleTraits<H>::ParamType> ParamTuple;
+                 typename TupleTraits<H>::ParamType>
+      ParamTuple;
 };
 
 // Tuple creators -------------------------------------------------------------
@@ -483,36 +509,59 @@ inline Tuple3<A, B, C> MakeTuple(const A& a, const B& b, const C& c) {
 }
 
 template <class A, class B, class C, class D>
-inline Tuple4<A, B, C, D> MakeTuple(const A& a, const B& b, const C& c,
+inline Tuple4<A, B, C, D> MakeTuple(const A& a,
+                                    const B& b,
+                                    const C& c,
                                     const D& d) {
   return Tuple4<A, B, C, D>(a, b, c, d);
 }
 
 template <class A, class B, class C, class D, class E>
-inline Tuple5<A, B, C, D, E> MakeTuple(const A& a, const B& b, const C& c,
-                                       const D& d, const E& e) {
+inline Tuple5<A, B, C, D, E> MakeTuple(const A& a,
+                                       const B& b,
+                                       const C& c,
+                                       const D& d,
+                                       const E& e) {
   return Tuple5<A, B, C, D, E>(a, b, c, d, e);
 }
 
 template <class A, class B, class C, class D, class E, class F>
-inline Tuple6<A, B, C, D, E, F> MakeTuple(const A& a, const B& b, const C& c,
-                                          const D& d, const E& e, const F& f) {
+inline Tuple6<A, B, C, D, E, F> MakeTuple(const A& a,
+                                          const B& b,
+                                          const C& c,
+                                          const D& d,
+                                          const E& e,
+                                          const F& f) {
   return Tuple6<A, B, C, D, E, F>(a, b, c, d, e, f);
 }
 
 template <class A, class B, class C, class D, class E, class F, class G>
-inline Tuple7<A, B, C, D, E, F, G> MakeTuple(const A& a, const B& b, const C& c,
-                                             const D& d, const E& e, const F& f,
+inline Tuple7<A, B, C, D, E, F, G> MakeTuple(const A& a,
+                                             const B& b,
+                                             const C& c,
+                                             const D& d,
+                                             const E& e,
+                                             const F& f,
                                              const G& g) {
   return Tuple7<A, B, C, D, E, F, G>(a, b, c, d, e, f, g);
 }
 
-template <class A, class B, class C, class D, class E, class F, class G,
+template <class A,
+          class B,
+          class C,
+          class D,
+          class E,
+          class F,
+          class G,
           class H>
-inline Tuple8<A, B, C, D, E, F, G, H> MakeTuple(const A& a, const B& b,
-                                                const C& c, const D& d,
-                                                const E& e, const F& f,
-                                                const G& g, const H& h) {
+inline Tuple8<A, B, C, D, E, F, G, H> MakeTuple(const A& a,
+                                                const B& b,
+                                                const C& c,
+                                                const D& d,
+                                                const E& e,
+                                                const F& f,
+                                                const G& g,
+                                                const H& h) {
   return Tuple8<A, B, C, D, E, F, G, H>(a, b, c, d, e, f, g, h);
 }
 
@@ -545,22 +594,31 @@ inline Tuple5<A&, B&, C&, D&, E&> MakeRefTuple(A& a, B& b, C& c, D& d, E& e) {
 }
 
 template <class A, class B, class C, class D, class E, class F>
-inline Tuple6<A&, B&, C&, D&, E&, F&> MakeRefTuple(A& a, B& b, C& c, D& d, E& e,
+inline Tuple6<A&, B&, C&, D&, E&, F&> MakeRefTuple(A& a,
+                                                   B& b,
+                                                   C& c,
+                                                   D& d,
+                                                   E& e,
                                                    F& f) {
   return Tuple6<A&, B&, C&, D&, E&, F&>(a, b, c, d, e, f);
 }
 
 template <class A, class B, class C, class D, class E, class F, class G>
-inline Tuple7<A&, B&, C&, D&, E&, F&, G&> MakeRefTuple(A& a, B& b, C& c, D& d,
-                                                       E& e, F& f, G& g) {
+inline Tuple7<A&, B&, C&, D&, E&, F&, G&>
+MakeRefTuple(A& a, B& b, C& c, D& d, E& e, F& f, G& g) {
   return Tuple7<A&, B&, C&, D&, E&, F&, G&>(a, b, c, d, e, f, g);
 }
 
-template <class A, class B, class C, class D, class E, class F, class G,
+template <class A,
+          class B,
+          class C,
+          class D,
+          class E,
+          class F,
+          class G,
           class H>
-inline Tuple8<A&, B&, C&, D&, E&, F&, G&, H&> MakeRefTuple(A& a, B& b, C& c,
-                                                           D& d, E& e, F& f,
-                                                           G& g, H& h) {
+inline Tuple8<A&, B&, C&, D&, E&, F&, G&, H&>
+MakeRefTuple(A& a, B& b, C& c, D& d, E& e, F& f, G& g, H& h) {
   return Tuple8<A&, B&, C&, D&, E&, F&, G&, H&>(a, b, c, d, e, f, g, h);
 }
 
@@ -590,7 +648,7 @@ inline void DispatchToMethod(ObjT* obj, Method method, const Tuple1<A>& arg) {
   (obj->*method)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a));
 }
 
-template<class ObjT, class Method, class A, class B>
+template <class ObjT, class Method, class A, class B>
 inline void DispatchToMethod(ObjT* obj,
                              Method method,
                              const Tuple2<A, B>& arg) {
@@ -598,16 +656,18 @@ inline void DispatchToMethod(ObjT* obj,
                  base::cef_internal::UnwrapTraits<B>::Unwrap(arg.b));
 }
 
-template<class ObjT, class Method, class A, class B, class C>
-inline void DispatchToMethod(ObjT* obj, Method method,
+template <class ObjT, class Method, class A, class B, class C>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const Tuple3<A, B, C>& arg) {
   (obj->*method)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a),
                  base::cef_internal::UnwrapTraits<B>::Unwrap(arg.b),
                  base::cef_internal::UnwrapTraits<C>::Unwrap(arg.c));
 }
 
-template<class ObjT, class Method, class A, class B, class C, class D>
-inline void DispatchToMethod(ObjT* obj, Method method,
+template <class ObjT, class Method, class A, class B, class C, class D>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const Tuple4<A, B, C, D>& arg) {
   (obj->*method)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a),
                  base::cef_internal::UnwrapTraits<B>::Unwrap(arg.b),
@@ -615,8 +675,9 @@ inline void DispatchToMethod(ObjT* obj, Method method,
                  base::cef_internal::UnwrapTraits<D>::Unwrap(arg.d));
 }
 
-template<class ObjT, class Method, class A, class B, class C, class D, class E>
-inline void DispatchToMethod(ObjT* obj, Method method,
+template <class ObjT, class Method, class A, class B, class C, class D, class E>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const Tuple5<A, B, C, D, E>& arg) {
   (obj->*method)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a),
                  base::cef_internal::UnwrapTraits<B>::Unwrap(arg.b),
@@ -625,9 +686,16 @@ inline void DispatchToMethod(ObjT* obj, Method method,
                  base::cef_internal::UnwrapTraits<E>::Unwrap(arg.e));
 }
 
-template<class ObjT, class Method, class A, class B, class C, class D, class E,
-         class F>
-inline void DispatchToMethod(ObjT* obj, Method method,
+template <class ObjT,
+          class Method,
+          class A,
+          class B,
+          class C,
+          class D,
+          class E,
+          class F>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const Tuple6<A, B, C, D, E, F>& arg) {
   (obj->*method)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a),
                  base::cef_internal::UnwrapTraits<B>::Unwrap(arg.b),
@@ -637,9 +705,17 @@ inline void DispatchToMethod(ObjT* obj, Method method,
                  base::cef_internal::UnwrapTraits<F>::Unwrap(arg.f));
 }
 
-template<class ObjT, class Method, class A, class B, class C, class D, class E,
-         class F, class G>
-inline void DispatchToMethod(ObjT* obj, Method method,
+template <class ObjT,
+          class Method,
+          class A,
+          class B,
+          class C,
+          class D,
+          class E,
+          class F,
+          class G>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const Tuple7<A, B, C, D, E, F, G>& arg) {
   (obj->*method)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a),
                  base::cef_internal::UnwrapTraits<B>::Unwrap(arg.b),
@@ -650,9 +726,18 @@ inline void DispatchToMethod(ObjT* obj, Method method,
                  base::cef_internal::UnwrapTraits<G>::Unwrap(arg.g));
 }
 
-template<class ObjT, class Method, class A, class B, class C, class D, class E,
-         class F, class G, class H>
-inline void DispatchToMethod(ObjT* obj, Method method,
+template <class ObjT,
+          class Method,
+          class A,
+          class B,
+          class C,
+          class D,
+          class E,
+          class F,
+          class G,
+          class H>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const Tuple8<A, B, C, D, E, F, G, H>& arg) {
   (obj->*method)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a),
                  base::cef_internal::UnwrapTraits<B>::Unwrap(arg.b),
@@ -681,20 +766,20 @@ inline void DispatchToFunction(Function function, const Tuple1<A>& arg) {
   (*function)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a));
 }
 
-template<class Function, class A, class B>
+template <class Function, class A, class B>
 inline void DispatchToFunction(Function function, const Tuple2<A, B>& arg) {
   (*function)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a),
               base::cef_internal::UnwrapTraits<B>::Unwrap(arg.b));
 }
 
-template<class Function, class A, class B, class C>
+template <class Function, class A, class B, class C>
 inline void DispatchToFunction(Function function, const Tuple3<A, B, C>& arg) {
   (*function)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a),
               base::cef_internal::UnwrapTraits<B>::Unwrap(arg.b),
               base::cef_internal::UnwrapTraits<C>::Unwrap(arg.c));
 }
 
-template<class Function, class A, class B, class C, class D>
+template <class Function, class A, class B, class C, class D>
 inline void DispatchToFunction(Function function,
                                const Tuple4<A, B, C, D>& arg) {
   (*function)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a),
@@ -703,7 +788,7 @@ inline void DispatchToFunction(Function function,
               base::cef_internal::UnwrapTraits<D>::Unwrap(arg.d));
 }
 
-template<class Function, class A, class B, class C, class D, class E>
+template <class Function, class A, class B, class C, class D, class E>
 inline void DispatchToFunction(Function function,
                                const Tuple5<A, B, C, D, E>& arg) {
   (*function)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a),
@@ -713,7 +798,7 @@ inline void DispatchToFunction(Function function,
               base::cef_internal::UnwrapTraits<E>::Unwrap(arg.e));
 }
 
-template<class Function, class A, class B, class C, class D, class E, class F>
+template <class Function, class A, class B, class C, class D, class E, class F>
 inline void DispatchToFunction(Function function,
                                const Tuple6<A, B, C, D, E, F>& arg) {
   (*function)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a),
@@ -724,8 +809,14 @@ inline void DispatchToFunction(Function function,
               base::cef_internal::UnwrapTraits<F>::Unwrap(arg.f));
 }
 
-template<class Function, class A, class B, class C, class D, class E, class F,
-         class G>
+template <class Function,
+          class A,
+          class B,
+          class C,
+          class D,
+          class E,
+          class F,
+          class G>
 inline void DispatchToFunction(Function function,
                                const Tuple7<A, B, C, D, E, F, G>& arg) {
   (*function)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a),
@@ -737,8 +828,15 @@ inline void DispatchToFunction(Function function,
               base::cef_internal::UnwrapTraits<G>::Unwrap(arg.g));
 }
 
-template<class Function, class A, class B, class C, class D, class E, class F,
-         class G, class H>
+template <class Function,
+          class A,
+          class B,
+          class C,
+          class D,
+          class E,
+          class F,
+          class G,
+          class H>
 inline void DispatchToFunction(Function function,
                                const Tuple8<A, B, C, D, E, F, G, H>& arg) {
   (*function)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a),
@@ -756,7 +854,8 @@ inline void DispatchToFunction(Function function,
 template <class ObjT, class Method>
 inline void DispatchToMethod(ObjT* obj,
                              Method method,
-                             const Tuple0& arg, Tuple0*) {
+                             const Tuple0& arg,
+                             Tuple0*) {
   (obj->*method)();
 }
 
@@ -768,38 +867,46 @@ inline void DispatchToMethod(ObjT* obj, Method method, const A& arg, Tuple0*) {
 template <class ObjT, class Method, class A>
 inline void DispatchToMethod(ObjT* obj,
                              Method method,
-                             const Tuple1<A>& arg, Tuple0*) {
+                             const Tuple1<A>& arg,
+                             Tuple0*) {
   (obj->*method)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a));
 }
 
-template<class ObjT, class Method, class A, class B>
+template <class ObjT, class Method, class A, class B>
 inline void DispatchToMethod(ObjT* obj,
                              Method method,
-                             const Tuple2<A, B>& arg, Tuple0*) {
+                             const Tuple2<A, B>& arg,
+                             Tuple0*) {
   (obj->*method)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a),
                  base::cef_internal::UnwrapTraits<B>::Unwrap(arg.b));
 }
 
-template<class ObjT, class Method, class A, class B, class C>
-inline void DispatchToMethod(ObjT* obj, Method method,
-                             const Tuple3<A, B, C>& arg, Tuple0*) {
+template <class ObjT, class Method, class A, class B, class C>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
+                             const Tuple3<A, B, C>& arg,
+                             Tuple0*) {
   (obj->*method)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a),
                  base::cef_internal::UnwrapTraits<B>::Unwrap(arg.b),
                  base::cef_internal::UnwrapTraits<C>::Unwrap(arg.c));
 }
 
-template<class ObjT, class Method, class A, class B, class C, class D>
-inline void DispatchToMethod(ObjT* obj, Method method,
-                             const Tuple4<A, B, C, D>& arg, Tuple0*) {
+template <class ObjT, class Method, class A, class B, class C, class D>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
+                             const Tuple4<A, B, C, D>& arg,
+                             Tuple0*) {
   (obj->*method)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a),
                  base::cef_internal::UnwrapTraits<B>::Unwrap(arg.b),
                  base::cef_internal::UnwrapTraits<C>::Unwrap(arg.c),
                  base::cef_internal::UnwrapTraits<D>::Unwrap(arg.d));
 }
 
-template<class ObjT, class Method, class A, class B, class C, class D, class E>
-inline void DispatchToMethod(ObjT* obj, Method method,
-                             const Tuple5<A, B, C, D, E>& arg, Tuple0*) {
+template <class ObjT, class Method, class A, class B, class C, class D, class E>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
+                             const Tuple5<A, B, C, D, E>& arg,
+                             Tuple0*) {
   (obj->*method)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a),
                  base::cef_internal::UnwrapTraits<B>::Unwrap(arg.b),
                  base::cef_internal::UnwrapTraits<C>::Unwrap(arg.c),
@@ -807,10 +914,18 @@ inline void DispatchToMethod(ObjT* obj, Method method,
                  base::cef_internal::UnwrapTraits<E>::Unwrap(arg.e));
 }
 
-template<class ObjT, class Method, class A, class B, class C, class D, class E,
-         class F>
-inline void DispatchToMethod(ObjT* obj, Method method,
-                             const Tuple6<A, B, C, D, E, F>& arg, Tuple0*) {
+template <class ObjT,
+          class Method,
+          class A,
+          class B,
+          class C,
+          class D,
+          class E,
+          class F>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
+                             const Tuple6<A, B, C, D, E, F>& arg,
+                             Tuple0*) {
   (obj->*method)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a),
                  base::cef_internal::UnwrapTraits<B>::Unwrap(arg.b),
                  base::cef_internal::UnwrapTraits<C>::Unwrap(arg.c),
@@ -821,80 +936,96 @@ inline void DispatchToMethod(ObjT* obj, Method method,
 
 // Dispatchers with 1 out param.
 
-template<class ObjT, class Method,
-         class OutA>
-inline void DispatchToMethod(ObjT* obj, Method method,
+template <class ObjT, class Method, class OutA>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const Tuple0& in,
                              Tuple1<OutA>* out) {
   (obj->*method)(&out->a);
 }
 
-template<class ObjT, class Method, class InA,
-         class OutA>
-inline void DispatchToMethod(ObjT* obj, Method method,
+template <class ObjT, class Method, class InA, class OutA>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const InA& in,
                              Tuple1<OutA>* out) {
   (obj->*method)(in, &out->a);
 }
 
-template<class ObjT, class Method, class InA,
-         class OutA>
-inline void DispatchToMethod(ObjT* obj, Method method,
+template <class ObjT, class Method, class InA, class OutA>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const Tuple1<InA>& in,
                              Tuple1<OutA>* out) {
   (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a), &out->a);
 }
 
-template<class ObjT, class Method, class InA, class InB,
-         class OutA>
-inline void DispatchToMethod(ObjT* obj, Method method,
+template <class ObjT, class Method, class InA, class InB, class OutA>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const Tuple2<InA, InB>& in,
                              Tuple1<OutA>* out) {
   (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
-                 base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b),
-                 &out->a);
+                 base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b), &out->a);
 }
 
-template<class ObjT, class Method, class InA, class InB, class InC,
-         class OutA>
-inline void DispatchToMethod(ObjT* obj, Method method,
+template <class ObjT, class Method, class InA, class InB, class InC, class OutA>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const Tuple3<InA, InB, InC>& in,
                              Tuple1<OutA>* out) {
   (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
                  base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b),
-                 base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c),
-                 &out->a);
+                 base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c), &out->a);
 }
 
-template<class ObjT, class Method, class InA, class InB, class InC, class InD,
-         class OutA>
-inline void DispatchToMethod(ObjT* obj, Method method,
+template <class ObjT,
+          class Method,
+          class InA,
+          class InB,
+          class InC,
+          class InD,
+          class OutA>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const Tuple4<InA, InB, InC, InD>& in,
                              Tuple1<OutA>* out) {
   (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
                  base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b),
                  base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c),
-                 base::cef_internal::UnwrapTraits<InD>::Unwrap(in.d),
-                 &out->a);
+                 base::cef_internal::UnwrapTraits<InD>::Unwrap(in.d), &out->a);
 }
 
-template<class ObjT, class Method, class InA, class InB, class InC, class InD,
-         class InE, class OutA>
-inline void DispatchToMethod(ObjT* obj, Method method,
+template <class ObjT,
+          class Method,
+          class InA,
+          class InB,
+          class InC,
+          class InD,
+          class InE,
+          class OutA>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const Tuple5<InA, InB, InC, InD, InE>& in,
                              Tuple1<OutA>* out) {
   (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
                  base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b),
                  base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c),
                  base::cef_internal::UnwrapTraits<InD>::Unwrap(in.d),
-                 base::cef_internal::UnwrapTraits<InE>::Unwrap(in.e),
-                 &out->a);
-}
-
-template<class ObjT, class Method,
-         class InA, class InB, class InC, class InD, class InE, class InF,
-         class OutA>
-inline void DispatchToMethod(ObjT* obj, Method method,
+                 base::cef_internal::UnwrapTraits<InE>::Unwrap(in.e), &out->a);
+}
+
+template <class ObjT,
+          class Method,
+          class InA,
+          class InB,
+          class InC,
+          class InD,
+          class InE,
+          class InF,
+          class OutA>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const Tuple6<InA, InB, InC, InD, InE, InF>& in,
                              Tuple1<OutA>* out) {
   (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
@@ -902,92 +1033,120 @@ inline void DispatchToMethod(ObjT* obj, Method method,
                  base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c),
                  base::cef_internal::UnwrapTraits<InD>::Unwrap(in.d),
                  base::cef_internal::UnwrapTraits<InE>::Unwrap(in.e),
-                 base::cef_internal::UnwrapTraits<InF>::Unwrap(in.f),
-                 &out->a);
+                 base::cef_internal::UnwrapTraits<InF>::Unwrap(in.f), &out->a);
 }
 
 // Dispatchers with 2 out params.
 
-template<class ObjT, class Method,
-         class OutA, class OutB>
-inline void DispatchToMethod(ObjT* obj, Method method,
+template <class ObjT, class Method, class OutA, class OutB>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const Tuple0& in,
                              Tuple2<OutA, OutB>* out) {
   (obj->*method)(&out->a, &out->b);
 }
 
-template<class ObjT, class Method, class InA,
-         class OutA, class OutB>
-inline void DispatchToMethod(ObjT* obj, Method method,
+template <class ObjT, class Method, class InA, class OutA, class OutB>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const InA& in,
                              Tuple2<OutA, OutB>* out) {
   (obj->*method)(in, &out->a, &out->b);
 }
 
-template<class ObjT, class Method, class InA,
-         class OutA, class OutB>
-inline void DispatchToMethod(ObjT* obj, Method method,
+template <class ObjT, class Method, class InA, class OutA, class OutB>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const Tuple1<InA>& in,
                              Tuple2<OutA, OutB>* out) {
-  (obj->*method)(
-      base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a), &out->a, &out->b);
+  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a), &out->a,
+                 &out->b);
 }
 
-template<class ObjT, class Method, class InA, class InB,
-         class OutA, class OutB>
-inline void DispatchToMethod(ObjT* obj, Method method,
+template <class ObjT,
+          class Method,
+          class InA,
+          class InB,
+          class OutA,
+          class OutB>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const Tuple2<InA, InB>& in,
                              Tuple2<OutA, OutB>* out) {
   (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
-                 base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b),
-                 &out->a,
+                 base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b), &out->a,
                  &out->b);
 }
 
-template<class ObjT, class Method, class InA, class InB, class InC,
-         class OutA, class OutB>
-inline void DispatchToMethod(ObjT* obj, Method method,
+template <class ObjT,
+          class Method,
+          class InA,
+          class InB,
+          class InC,
+          class OutA,
+          class OutB>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const Tuple3<InA, InB, InC>& in,
                              Tuple2<OutA, OutB>* out) {
   (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
                  base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b),
-                 base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c),
-                 &out->a,
+                 base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c), &out->a,
                  &out->b);
 }
 
-template<class ObjT, class Method, class InA, class InB, class InC, class InD,
-         class OutA, class OutB>
-inline void DispatchToMethod(ObjT* obj, Method method,
+template <class ObjT,
+          class Method,
+          class InA,
+          class InB,
+          class InC,
+          class InD,
+          class OutA,
+          class OutB>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const Tuple4<InA, InB, InC, InD>& in,
                              Tuple2<OutA, OutB>* out) {
   (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
                  base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b),
                  base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c),
-                 base::cef_internal::UnwrapTraits<InD>::Unwrap(in.d),
-                 &out->a,
+                 base::cef_internal::UnwrapTraits<InD>::Unwrap(in.d), &out->a,
                  &out->b);
 }
 
-template<class ObjT, class Method,
-         class InA, class InB, class InC, class InD, class InE,
-         class OutA, class OutB>
-inline void DispatchToMethod(ObjT* obj, Method method,
+template <class ObjT,
+          class Method,
+          class InA,
+          class InB,
+          class InC,
+          class InD,
+          class InE,
+          class OutA,
+          class OutB>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const Tuple5<InA, InB, InC, InD, InE>& in,
                              Tuple2<OutA, OutB>* out) {
   (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
                  base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b),
                  base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c),
                  base::cef_internal::UnwrapTraits<InD>::Unwrap(in.d),
-                 base::cef_internal::UnwrapTraits<InE>::Unwrap(in.e),
-                 &out->a,
+                 base::cef_internal::UnwrapTraits<InE>::Unwrap(in.e), &out->a,
                  &out->b);
 }
 
-template<class ObjT, class Method,
-         class InA, class InB, class InC, class InD, class InE, class InF,
-         class OutA, class OutB>
-inline void DispatchToMethod(ObjT* obj, Method method,
+template <class ObjT,
+          class Method,
+          class InA,
+          class InB,
+          class InC,
+          class InD,
+          class InE,
+          class InF,
+          class OutA,
+          class OutB>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const Tuple6<InA, InB, InC, InD, InE, InF>& in,
                              Tuple2<OutA, OutB>* out) {
   (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
@@ -995,99 +1154,136 @@ inline void DispatchToMethod(ObjT* obj, Method method,
                  base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c),
                  base::cef_internal::UnwrapTraits<InD>::Unwrap(in.d),
                  base::cef_internal::UnwrapTraits<InE>::Unwrap(in.e),
-                 base::cef_internal::UnwrapTraits<InF>::Unwrap(in.f),
-                 &out->a,
+                 base::cef_internal::UnwrapTraits<InF>::Unwrap(in.f), &out->a,
                  &out->b);
 }
 
 // Dispatchers with 3 out params.
 
-template<class ObjT, class Method,
-         class OutA, class OutB, class OutC>
-inline void DispatchToMethod(ObjT* obj, Method method,
+template <class ObjT, class Method, class OutA, class OutB, class OutC>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const Tuple0& in,
                              Tuple3<OutA, OutB, OutC>* out) {
   (obj->*method)(&out->a, &out->b, &out->c);
 }
 
-template<class ObjT, class Method, class InA,
-         class OutA, class OutB, class OutC>
-inline void DispatchToMethod(ObjT* obj, Method method,
+template <class ObjT,
+          class Method,
+          class InA,
+          class OutA,
+          class OutB,
+          class OutC>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const InA& in,
                              Tuple3<OutA, OutB, OutC>* out) {
   (obj->*method)(in, &out->a, &out->b, &out->c);
 }
 
-template<class ObjT, class Method, class InA,
-         class OutA, class OutB, class OutC>
-inline void DispatchToMethod(ObjT* obj, Method method,
+template <class ObjT,
+          class Method,
+          class InA,
+          class OutA,
+          class OutB,
+          class OutC>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const Tuple1<InA>& in,
                              Tuple3<OutA, OutB, OutC>* out) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
-                 &out->a,
-                 &out->b,
-                 &out->c);
+  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a), &out->a,
+                 &out->b, &out->c);
 }
 
-template<class ObjT, class Method, class InA, class InB,
-         class OutA, class OutB, class OutC>
-inline void DispatchToMethod(ObjT* obj, Method method,
+template <class ObjT,
+          class Method,
+          class InA,
+          class InB,
+          class OutA,
+          class OutB,
+          class OutC>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const Tuple2<InA, InB>& in,
                              Tuple3<OutA, OutB, OutC>* out) {
   (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
-                 base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b),
-                 &out->a,
-                 &out->b,
-                 &out->c);
-}
-
-template<class ObjT, class Method, class InA, class InB, class InC,
-         class OutA, class OutB, class OutC>
-inline void DispatchToMethod(ObjT* obj, Method method,
+                 base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b), &out->a,
+                 &out->b, &out->c);
+}
+
+template <class ObjT,
+          class Method,
+          class InA,
+          class InB,
+          class InC,
+          class OutA,
+          class OutB,
+          class OutC>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const Tuple3<InA, InB, InC>& in,
                              Tuple3<OutA, OutB, OutC>* out) {
   (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
                  base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b),
-                 base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c),
-                 &out->a,
-                 &out->b,
-                 &out->c);
-}
-
-template<class ObjT, class Method, class InA, class InB, class InC, class InD,
-         class OutA, class OutB, class OutC>
-inline void DispatchToMethod(ObjT* obj, Method method,
+                 base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c), &out->a,
+                 &out->b, &out->c);
+}
+
+template <class ObjT,
+          class Method,
+          class InA,
+          class InB,
+          class InC,
+          class InD,
+          class OutA,
+          class OutB,
+          class OutC>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const Tuple4<InA, InB, InC, InD>& in,
                              Tuple3<OutA, OutB, OutC>* out) {
   (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
                  base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b),
                  base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c),
-                 base::cef_internal::UnwrapTraits<InD>::Unwrap(in.d),
-                 &out->a,
-                 &out->b,
-                 &out->c);
-}
-
-template<class ObjT, class Method,
-         class InA, class InB, class InC, class InD, class InE,
-         class OutA, class OutB, class OutC>
-inline void DispatchToMethod(ObjT* obj, Method method,
+                 base::cef_internal::UnwrapTraits<InD>::Unwrap(in.d), &out->a,
+                 &out->b, &out->c);
+}
+
+template <class ObjT,
+          class Method,
+          class InA,
+          class InB,
+          class InC,
+          class InD,
+          class InE,
+          class OutA,
+          class OutB,
+          class OutC>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const Tuple5<InA, InB, InC, InD, InE>& in,
                              Tuple3<OutA, OutB, OutC>* out) {
   (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
                  base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b),
                  base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c),
                  base::cef_internal::UnwrapTraits<InD>::Unwrap(in.d),
-                 base::cef_internal::UnwrapTraits<InE>::Unwrap(in.e),
-                 &out->a,
-                 &out->b,
-                 &out->c);
-}
-
-template<class ObjT, class Method,
-         class InA, class InB, class InC, class InD, class InE, class InF,
-         class OutA, class OutB, class OutC>
-inline void DispatchToMethod(ObjT* obj, Method method,
+                 base::cef_internal::UnwrapTraits<InE>::Unwrap(in.e), &out->a,
+                 &out->b, &out->c);
+}
+
+template <class ObjT,
+          class Method,
+          class InA,
+          class InB,
+          class InC,
+          class InD,
+          class InE,
+          class InF,
+          class OutA,
+          class OutB,
+          class OutC>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const Tuple6<InA, InB, InC, InD, InE, InF>& in,
                              Tuple3<OutA, OutB, OutC>* out) {
   (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
@@ -1095,109 +1291,149 @@ inline void DispatchToMethod(ObjT* obj, Method method,
                  base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c),
                  base::cef_internal::UnwrapTraits<InD>::Unwrap(in.d),
                  base::cef_internal::UnwrapTraits<InE>::Unwrap(in.e),
-                 base::cef_internal::UnwrapTraits<InF>::Unwrap(in.f),
-                 &out->a,
-                 &out->b,
-                 &out->c);
+                 base::cef_internal::UnwrapTraits<InF>::Unwrap(in.f), &out->a,
+                 &out->b, &out->c);
 }
 
 // Dispatchers with 4 out params.
 
-template<class ObjT, class Method,
-         class OutA, class OutB, class OutC, class OutD>
-inline void DispatchToMethod(ObjT* obj, Method method,
+template <class ObjT,
+          class Method,
+          class OutA,
+          class OutB,
+          class OutC,
+          class OutD>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const Tuple0& in,
                              Tuple4<OutA, OutB, OutC, OutD>* out) {
   (obj->*method)(&out->a, &out->b, &out->c, &out->d);
 }
 
-template<class ObjT, class Method, class InA,
-         class OutA, class OutB, class OutC, class OutD>
-inline void DispatchToMethod(ObjT* obj, Method method,
+template <class ObjT,
+          class Method,
+          class InA,
+          class OutA,
+          class OutB,
+          class OutC,
+          class OutD>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const InA& in,
                              Tuple4<OutA, OutB, OutC, OutD>* out) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in),
-                 &out->a,
-                 &out->b,
-                 &out->c,
-                 &out->d);
+  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in), &out->a,
+                 &out->b, &out->c, &out->d);
 }
 
-template<class ObjT, class Method, class InA,
-         class OutA, class OutB, class OutC, class OutD>
-inline void DispatchToMethod(ObjT* obj, Method method,
+template <class ObjT,
+          class Method,
+          class InA,
+          class OutA,
+          class OutB,
+          class OutC,
+          class OutD>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const Tuple1<InA>& in,
                              Tuple4<OutA, OutB, OutC, OutD>* out) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
-                 &out->a,
-                 &out->b,
-                 &out->c,
-                 &out->d);
-}
-
-template<class ObjT, class Method, class InA, class InB,
-         class OutA, class OutB, class OutC, class OutD>
-inline void DispatchToMethod(ObjT* obj, Method method,
+  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a), &out->a,
+                 &out->b, &out->c, &out->d);
+}
+
+template <class ObjT,
+          class Method,
+          class InA,
+          class InB,
+          class OutA,
+          class OutB,
+          class OutC,
+          class OutD>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const Tuple2<InA, InB>& in,
                              Tuple4<OutA, OutB, OutC, OutD>* out) {
   (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
-                 base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b),
-                 &out->a,
-                 &out->b,
-                 &out->c,
-                 &out->d);
-}
-
-template<class ObjT, class Method, class InA, class InB, class InC,
-         class OutA, class OutB, class OutC, class OutD>
-inline void DispatchToMethod(ObjT* obj, Method method,
+                 base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b), &out->a,
+                 &out->b, &out->c, &out->d);
+}
+
+template <class ObjT,
+          class Method,
+          class InA,
+          class InB,
+          class InC,
+          class OutA,
+          class OutB,
+          class OutC,
+          class OutD>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const Tuple3<InA, InB, InC>& in,
                              Tuple4<OutA, OutB, OutC, OutD>* out) {
   (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
                  base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b),
-                 base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c),
-                 &out->a,
-                 &out->b,
-                 &out->c,
-                 &out->d);
-}
-
-template<class ObjT, class Method, class InA, class InB, class InC, class InD,
-         class OutA, class OutB, class OutC, class OutD>
-inline void DispatchToMethod(ObjT* obj, Method method,
+                 base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c), &out->a,
+                 &out->b, &out->c, &out->d);
+}
+
+template <class ObjT,
+          class Method,
+          class InA,
+          class InB,
+          class InC,
+          class InD,
+          class OutA,
+          class OutB,
+          class OutC,
+          class OutD>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const Tuple4<InA, InB, InC, InD>& in,
                              Tuple4<OutA, OutB, OutC, OutD>* out) {
   (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
                  base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b),
                  base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c),
-                 base::cef_internal::UnwrapTraits<InD>::Unwrap(in.d),
-                 &out->a,
-                 &out->b,
-                 &out->c,
-                 &out->d);
-}
-
-template<class ObjT, class Method,
-         class InA, class InB, class InC, class InD, class InE,
-         class OutA, class OutB, class OutC, class OutD>
-inline void DispatchToMethod(ObjT* obj, Method method,
+                 base::cef_internal::UnwrapTraits<InD>::Unwrap(in.d), &out->a,
+                 &out->b, &out->c, &out->d);
+}
+
+template <class ObjT,
+          class Method,
+          class InA,
+          class InB,
+          class InC,
+          class InD,
+          class InE,
+          class OutA,
+          class OutB,
+          class OutC,
+          class OutD>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const Tuple5<InA, InB, InC, InD, InE>& in,
                              Tuple4<OutA, OutB, OutC, OutD>* out) {
   (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
                  base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b),
                  base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c),
                  base::cef_internal::UnwrapTraits<InD>::Unwrap(in.d),
-                 base::cef_internal::UnwrapTraits<InE>::Unwrap(in.e),
-                 &out->a,
-                 &out->b,
-                 &out->c,
-                 &out->d);
-}
-
-template<class ObjT, class Method,
-         class InA, class InB, class InC, class InD, class InE, class InF,
-         class OutA, class OutB, class OutC, class OutD>
-inline void DispatchToMethod(ObjT* obj, Method method,
+                 base::cef_internal::UnwrapTraits<InE>::Unwrap(in.e), &out->a,
+                 &out->b, &out->c, &out->d);
+}
+
+template <class ObjT,
+          class Method,
+          class InA,
+          class InB,
+          class InC,
+          class InD,
+          class InE,
+          class InF,
+          class OutA,
+          class OutB,
+          class OutC,
+          class OutD>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const Tuple6<InA, InB, InC, InD, InE, InF>& in,
                              Tuple4<OutA, OutB, OutC, OutD>* out) {
   (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
@@ -1205,116 +1441,157 @@ inline void DispatchToMethod(ObjT* obj, Method method,
                  base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c),
                  base::cef_internal::UnwrapTraits<InD>::Unwrap(in.d),
                  base::cef_internal::UnwrapTraits<InE>::Unwrap(in.e),
-                 base::cef_internal::UnwrapTraits<InF>::Unwrap(in.f),
-                 &out->a,
-                 &out->b,
-                 &out->c,
-                 &out->d);
+                 base::cef_internal::UnwrapTraits<InF>::Unwrap(in.f), &out->a,
+                 &out->b, &out->c, &out->d);
 }
 
 // Dispatchers with 5 out params.
 
-template<class ObjT, class Method,
-         class OutA, class OutB, class OutC, class OutD, class OutE>
-inline void DispatchToMethod(ObjT* obj, Method method,
+template <class ObjT,
+          class Method,
+          class OutA,
+          class OutB,
+          class OutC,
+          class OutD,
+          class OutE>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const Tuple0& in,
                              Tuple5<OutA, OutB, OutC, OutD, OutE>* out) {
   (obj->*method)(&out->a, &out->b, &out->c, &out->d, &out->e);
 }
 
-template<class ObjT, class Method, class InA,
-         class OutA, class OutB, class OutC, class OutD, class OutE>
-inline void DispatchToMethod(ObjT* obj, Method method,
+template <class ObjT,
+          class Method,
+          class InA,
+          class OutA,
+          class OutB,
+          class OutC,
+          class OutD,
+          class OutE>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const InA& in,
                              Tuple5<OutA, OutB, OutC, OutD, OutE>* out) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in),
-                 &out->a,
-                 &out->b,
-                 &out->c,
-                 &out->d,
-                 &out->e);
-}
-
-template<class ObjT, class Method, class InA,
-         class OutA, class OutB, class OutC, class OutD, class OutE>
-inline void DispatchToMethod(ObjT* obj, Method method,
+  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in), &out->a,
+                 &out->b, &out->c, &out->d, &out->e);
+}
+
+template <class ObjT,
+          class Method,
+          class InA,
+          class OutA,
+          class OutB,
+          class OutC,
+          class OutD,
+          class OutE>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const Tuple1<InA>& in,
                              Tuple5<OutA, OutB, OutC, OutD, OutE>* out) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
-                 &out->a,
-                 &out->b,
-                 &out->c,
-                 &out->d,
-                 &out->e);
-}
-
-template<class ObjT, class Method, class InA, class InB,
-         class OutA, class OutB, class OutC, class OutD, class OutE>
-inline void DispatchToMethod(ObjT* obj, Method method,
+  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a), &out->a,
+                 &out->b, &out->c, &out->d, &out->e);
+}
+
+template <class ObjT,
+          class Method,
+          class InA,
+          class InB,
+          class OutA,
+          class OutB,
+          class OutC,
+          class OutD,
+          class OutE>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const Tuple2<InA, InB>& in,
                              Tuple5<OutA, OutB, OutC, OutD, OutE>* out) {
   (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
-                 base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b),
-                 &out->a,
-                 &out->b,
-                 &out->c,
-                 &out->d,
-                 &out->e);
-}
-
-template<class ObjT, class Method, class InA, class InB, class InC,
-         class OutA, class OutB, class OutC, class OutD, class OutE>
-inline void DispatchToMethod(ObjT* obj, Method method,
+                 base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b), &out->a,
+                 &out->b, &out->c, &out->d, &out->e);
+}
+
+template <class ObjT,
+          class Method,
+          class InA,
+          class InB,
+          class InC,
+          class OutA,
+          class OutB,
+          class OutC,
+          class OutD,
+          class OutE>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const Tuple3<InA, InB, InC>& in,
                              Tuple5<OutA, OutB, OutC, OutD, OutE>* out) {
   (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
                  base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b),
-                 base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c),
-                 &out->a,
-                 &out->b,
-                 &out->c,
-                 &out->d,
-                 &out->e);
-}
-
-template<class ObjT, class Method, class InA, class InB, class InC, class InD,
-         class OutA, class OutB, class OutC, class OutD, class OutE>
-inline void DispatchToMethod(ObjT* obj, Method method,
+                 base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c), &out->a,
+                 &out->b, &out->c, &out->d, &out->e);
+}
+
+template <class ObjT,
+          class Method,
+          class InA,
+          class InB,
+          class InC,
+          class InD,
+          class OutA,
+          class OutB,
+          class OutC,
+          class OutD,
+          class OutE>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const Tuple4<InA, InB, InC, InD>& in,
                              Tuple5<OutA, OutB, OutC, OutD, OutE>* out) {
   (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
                  base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b),
                  base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c),
-                 base::cef_internal::UnwrapTraits<InD>::Unwrap(in.d),
-                 &out->a,
-                 &out->b,
-                 &out->c,
-                 &out->d,
-                 &out->e);
-}
-
-template<class ObjT, class Method,
-         class InA, class InB, class InC, class InD, class InE,
-         class OutA, class OutB, class OutC, class OutD, class OutE>
-inline void DispatchToMethod(ObjT* obj, Method method,
+                 base::cef_internal::UnwrapTraits<InD>::Unwrap(in.d), &out->a,
+                 &out->b, &out->c, &out->d, &out->e);
+}
+
+template <class ObjT,
+          class Method,
+          class InA,
+          class InB,
+          class InC,
+          class InD,
+          class InE,
+          class OutA,
+          class OutB,
+          class OutC,
+          class OutD,
+          class OutE>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const Tuple5<InA, InB, InC, InD, InE>& in,
                              Tuple5<OutA, OutB, OutC, OutD, OutE>* out) {
   (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
                  base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b),
                  base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c),
                  base::cef_internal::UnwrapTraits<InD>::Unwrap(in.d),
-                 base::cef_internal::UnwrapTraits<InE>::Unwrap(in.e),
-                 &out->a,
-                 &out->b,
-                 &out->c,
-                 &out->d,
-                 &out->e);
-}
-
-template<class ObjT, class Method,
-         class InA, class InB, class InC, class InD, class InE, class InF,
-         class OutA, class OutB, class OutC, class OutD, class OutE>
-inline void DispatchToMethod(ObjT* obj, Method method,
+                 base::cef_internal::UnwrapTraits<InE>::Unwrap(in.e), &out->a,
+                 &out->b, &out->c, &out->d, &out->e);
+}
+
+template <class ObjT,
+          class Method,
+          class InA,
+          class InB,
+          class InC,
+          class InD,
+          class InE,
+          class InF,
+          class OutA,
+          class OutB,
+          class OutC,
+          class OutD,
+          class OutE>
+inline void DispatchToMethod(ObjT* obj,
+                             Method method,
                              const Tuple6<InA, InB, InC, InD, InE, InF>& in,
                              Tuple5<OutA, OutB, OutC, OutD, OutE>* out) {
   (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
@@ -1322,16 +1599,12 @@ inline void DispatchToMethod(ObjT* obj, Method method,
                  base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c),
                  base::cef_internal::UnwrapTraits<InD>::Unwrap(in.d),
                  base::cef_internal::UnwrapTraits<InE>::Unwrap(in.e),
-                 base::cef_internal::UnwrapTraits<InF>::Unwrap(in.f),
-                 &out->a,
-                 &out->b,
-                 &out->c,
-                 &out->d,
-                 &out->e);
+                 base::cef_internal::UnwrapTraits<InF>::Unwrap(in.f), &out->a,
+                 &out->b, &out->c, &out->d, &out->e);
 }
 
 }  // namespace base
 
-#endif // !USING_CHROMIUM_INCLUDES
+#endif  // !USING_CHROMIUM_INCLUDES
 
 #endif  // CEF_INCLUDE_BASE_CEF_TUPLE_H_
diff --git a/src/include/base/cef_weak_ptr.h b/src/include/base/cef_weak_ptr.h
index 217f12cf..1ba34b9d 100644
--- a/src/include/base/cef_weak_ptr.h
+++ b/src/include/base/cef_weak_ptr.h
@@ -117,8 +117,10 @@
 
 namespace base {
 
-template <typename T> class SupportsWeakPtr;
-template <typename T> class WeakPtr;
+template <typename T>
+class SupportsWeakPtr;
+template <typename T>
+class WeakPtr;
 
 namespace cef_internal {
 // These classes are part of the WeakPtr implementation.
@@ -164,9 +166,7 @@ class WeakReferenceOwner {
 
   WeakReference GetRef() const;
 
-  bool HasRefs() const {
-    return flag_.get() && !flag_->HasOneRef();
-  }
+  bool HasRefs() const { return flag_.get() && !flag_->HasOneRef(); }
 
   void Invalidate();
 
@@ -198,10 +198,10 @@ class SupportsWeakPtrBase {
   // conversion will only compile if there is exists a Base which inherits
   // from SupportsWeakPtr<Base>. See base::AsWeakPtr() below for a helper
   // function that makes calling this easier.
-  template<typename Derived>
+  template <typename Derived>
   static WeakPtr<Derived> StaticAsWeakPtr(Derived* t) {
-    typedef
-        is_convertible<Derived, cef_internal::SupportsWeakPtrBase&> convertible;
+    typedef is_convertible<Derived, cef_internal::SupportsWeakPtrBase&>
+        convertible;
     COMPILE_ASSERT(convertible::value,
                    AsWeakPtr_argument_inherits_from_SupportsWeakPtr);
     return AsWeakPtrImpl<Derived>(t, *t);
@@ -212,8 +212,8 @@ class SupportsWeakPtrBase {
   // which is an instance of SupportsWeakPtr<Base>. We can then safely
   // static_cast the Base* to a Derived*.
   template <typename Derived, typename Base>
-  static WeakPtr<Derived> AsWeakPtrImpl(
-      Derived* t, const SupportsWeakPtr<Base>&) {
+  static WeakPtr<Derived> AsWeakPtrImpl(Derived* t,
+                                        const SupportsWeakPtr<Base>&) {
     WeakPtr<Base> ptr = t->Base::AsWeakPtr();
     return WeakPtr<Derived>(ptr.ref_, static_cast<Derived*>(ptr.ptr_));
   }
@@ -221,7 +221,8 @@ class SupportsWeakPtrBase {
 
 }  // namespace cef_internal
 
-template <typename T> class WeakPtrFactory;
+template <typename T>
+class WeakPtrFactory;
 
 // The WeakPtr class holds a weak reference to |T*|.
 //
@@ -239,14 +240,12 @@ template <typename T> class WeakPtrFactory;
 template <typename T>
 class WeakPtr : public cef_internal::WeakPtrBase {
  public:
-  WeakPtr() : ptr_(NULL) {
-  }
+  WeakPtr() : ptr_(NULL) {}
 
   // Allow conversion from U to T provided U "is a" T. Note that this
   // is separate from the (implicit) copy constructor.
   template <typename U>
-  WeakPtr(const WeakPtr<U>& other) : WeakPtrBase(other), ptr_(other.ptr_) {
-  }
+  WeakPtr(const WeakPtr<U>& other) : WeakPtrBase(other), ptr_(other.ptr_) {}
 
   T* get() const { return ref_.is_valid() ? ptr_ : NULL; }
 
@@ -280,18 +279,19 @@ class WeakPtr : public cef_internal::WeakPtrBase {
  private:
   // Explicitly declare comparison operators as required by the bool
   // trick, but keep them private.
-  template <class U> bool operator==(WeakPtr<U> const&) const;
-  template <class U> bool operator!=(WeakPtr<U> const&) const;
+  template <class U>
+  bool operator==(WeakPtr<U> const&) const;
+  template <class U>
+  bool operator!=(WeakPtr<U> const&) const;
 
   friend class cef_internal::SupportsWeakPtrBase;
-  template <typename U> friend class WeakPtr;
+  template <typename U>
+  friend class WeakPtr;
   friend class SupportsWeakPtr<T>;
   friend class WeakPtrFactory<T>;
 
   WeakPtr(const cef_internal::WeakReference& ref, T* ptr)
-      : WeakPtrBase(ref),
-        ptr_(ptr) {
-  }
+      : WeakPtrBase(ref), ptr_(ptr) {}
 
   // This pointer is only valid when ref_.is_valid() is true.  Otherwise, its
   // value is undefined (as opposed to NULL).
@@ -306,12 +306,9 @@ class WeakPtr : public cef_internal::WeakPtrBase {
 template <class T>
 class WeakPtrFactory {
  public:
-  explicit WeakPtrFactory(T* ptr) : ptr_(ptr) {
-  }
+  explicit WeakPtrFactory(T* ptr) : ptr_(ptr) {}
 
-  ~WeakPtrFactory() {
-    ptr_ = NULL;
-  }
+  ~WeakPtrFactory() { ptr_ = NULL; }
 
   WeakPtr<T> GetWeakPtr() {
     DCHECK(ptr_);
diff --git a/src/include/base/internal/cef_atomicops_arm_gcc.h b/src/include/base/internal/cef_atomicops_arm_gcc.h
index c228b6af..2e39ce3c 100644
--- a/src/include/base/internal/cef_atomicops_arm_gcc.h
+++ b/src/include/base/internal/cef_atomicops_arm_gcc.h
@@ -85,9 +85,9 @@ inline void MemoryBarrier() {
 // variant of the target architecture is being used. This tests against
 // any known ARMv6 or ARMv7 variant, where it is possible to directly
 // use ldrex/strex instructions to implement fast atomic operations.
-#if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || \
+#if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) ||  \
     defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) || \
-    defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || \
+    defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) ||  \
     defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) || \
     defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__)
 
@@ -103,16 +103,17 @@ inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr,
     //   reloop = 0
     //   if (prev_value != old_value)
     //      reloop = STREX(ptr, new_value)
-    __asm__ __volatile__("    ldrex %0, [%3]\n"
-                         "    mov %1, #0\n"
-                         "    cmp %0, %4\n"
+    __asm__ __volatile__(
+        "    ldrex %0, [%3]\n"
+        "    mov %1, #0\n"
+        "    cmp %0, %4\n"
 #ifdef __thumb2__
-                         "    it eq\n"
+        "    it eq\n"
 #endif
-                         "    strexeq %1, %5, [%3]\n"
-                         : "=&r"(prev_value), "=&r"(reloop), "+m"(*ptr)
-                         : "r"(ptr), "r"(old_value), "r"(new_value)
-                         : "cc", "memory");
+        "    strexeq %1, %5, [%3]\n"
+        : "=&r"(prev_value), "=&r"(reloop), "+m"(*ptr)
+        : "r"(ptr), "r"(old_value), "r"(new_value)
+        : "cc", "memory");
   } while (reloop != 0);
   return prev_value;
 }
@@ -143,12 +144,13 @@ inline Atomic32 NoBarrier_AtomicIncrement(volatile Atomic32* ptr,
     //  value += increment
     //  reloop = STREX(ptr, value)
     //
-    __asm__ __volatile__("    ldrex %0, [%3]\n"
-                         "    add %0, %0, %4\n"
-                         "    strex %1, %0, [%3]\n"
-                         : "=&r"(value), "=&r"(reloop), "+m"(*ptr)
-                         : "r"(ptr), "r"(increment)
-                         : "cc", "memory");
+    __asm__ __volatile__(
+        "    ldrex %0, [%3]\n"
+        "    add %0, %0, %4\n"
+        "    strex %1, %0, [%3]\n"
+        : "=&r"(value), "=&r"(reloop), "+m"(*ptr)
+        : "r"(ptr), "r"(increment)
+        : "cc", "memory");
   } while (reloop);
   return value;
 }
@@ -171,18 +173,19 @@ inline Atomic32 NoBarrier_AtomicExchange(volatile Atomic32* ptr,
   do {
     // old_value = LDREX(ptr)
     // reloop = STREX(ptr, new_value)
-    __asm__ __volatile__("   ldrex %0, [%3]\n"
-                         "   strex %1, %4, [%3]\n"
-                         : "=&r"(old_value), "=&r"(reloop), "+m"(*ptr)
-                         : "r"(ptr), "r"(new_value)
-                         : "cc", "memory");
+    __asm__ __volatile__(
+        "   ldrex %0, [%3]\n"
+        "   strex %1, %4, [%3]\n"
+        : "=&r"(old_value), "=&r"(reloop), "+m"(*ptr)
+        : "r"(ptr), "r"(new_value)
+        : "cc", "memory");
   } while (reloop != 0);
   return old_value;
 }
 
 // This tests against any known ARMv5 variant.
 #elif defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) || \
-      defined(__ARM_ARCH_5TE__) || defined(__ARM_ARCH_5TEJ__)
+    defined(__ARM_ARCH_5TE__) || defined(__ARM_ARCH_5TEJ__)
 
 // The kernel also provides a helper function to perform an atomic
 // compare-and-swap operation at the hard-wired address 0xffff0fc0.
@@ -281,7 +284,7 @@ inline Atomic32 Release_CompareAndSwap(volatile Atomic32* ptr,
 }
 
 #else
-#  error "Your CPU's ARM architecture is not supported yet"
+#error "Your CPU's ARM architecture is not supported yet"
 #endif
 
 // NOTE: Atomicity of the following load and store operations is only
@@ -301,7 +304,9 @@ inline void Release_Store(volatile Atomic32* ptr, Atomic32 value) {
   *ptr = value;
 }
 
-inline Atomic32 NoBarrier_Load(volatile const Atomic32* ptr) { return *ptr; }
+inline Atomic32 NoBarrier_Load(volatile const Atomic32* ptr) {
+  return *ptr;
+}
 
 inline Atomic32 Acquire_Load(volatile const Atomic32* ptr) {
   Atomic32 value = *ptr;
diff --git a/src/include/base/internal/cef_atomicops_atomicword_compat.h b/src/include/base/internal/cef_atomicops_atomicword_compat.h
index 985f0f9b..f905de85 100644
--- a/src/include/base/internal/cef_atomicops_atomicword_compat.h
+++ b/src/include/base/internal/cef_atomicops_atomicword_compat.h
@@ -52,26 +52,26 @@ namespace subtle {
 inline AtomicWord NoBarrier_CompareAndSwap(volatile AtomicWord* ptr,
                                            AtomicWord old_value,
                                            AtomicWord new_value) {
-  return NoBarrier_CompareAndSwap(
-      reinterpret_cast<volatile Atomic32*>(ptr), old_value, new_value);
+  return NoBarrier_CompareAndSwap(reinterpret_cast<volatile Atomic32*>(ptr),
+                                  old_value, new_value);
 }
 
 inline AtomicWord NoBarrier_AtomicExchange(volatile AtomicWord* ptr,
                                            AtomicWord new_value) {
-  return NoBarrier_AtomicExchange(
-      reinterpret_cast<volatile Atomic32*>(ptr), new_value);
+  return NoBarrier_AtomicExchange(reinterpret_cast<volatile Atomic32*>(ptr),
+                                  new_value);
 }
 
 inline AtomicWord NoBarrier_AtomicIncrement(volatile AtomicWord* ptr,
                                             AtomicWord increment) {
-  return NoBarrier_AtomicIncrement(
-      reinterpret_cast<volatile Atomic32*>(ptr), increment);
+  return NoBarrier_AtomicIncrement(reinterpret_cast<volatile Atomic32*>(ptr),
+                                   increment);
 }
 
 inline AtomicWord Barrier_AtomicIncrement(volatile AtomicWord* ptr,
                                           AtomicWord increment) {
-  return Barrier_AtomicIncrement(
-      reinterpret_cast<volatile Atomic32*>(ptr), increment);
+  return Barrier_AtomicIncrement(reinterpret_cast<volatile Atomic32*>(ptr),
+                                 increment);
 }
 
 inline AtomicWord Acquire_CompareAndSwap(volatile AtomicWord* ptr,
@@ -88,24 +88,22 @@ inline AtomicWord Release_CompareAndSwap(volatile AtomicWord* ptr,
       reinterpret_cast<volatile Atomic32*>(ptr), old_value, new_value);
 }
 
-inline void NoBarrier_Store(volatile AtomicWord *ptr, AtomicWord value) {
-  NoBarrier_Store(
-      reinterpret_cast<volatile Atomic32*>(ptr), value);
+inline void NoBarrier_Store(volatile AtomicWord* ptr, AtomicWord value) {
+  NoBarrier_Store(reinterpret_cast<volatile Atomic32*>(ptr), value);
 }
 
 inline void Acquire_Store(volatile AtomicWord* ptr, AtomicWord value) {
-  return base::subtle::Acquire_Store(
-      reinterpret_cast<volatile Atomic32*>(ptr), value);
+  return base::subtle::Acquire_Store(reinterpret_cast<volatile Atomic32*>(ptr),
+                                     value);
 }
 
 inline void Release_Store(volatile AtomicWord* ptr, AtomicWord value) {
-  return base::subtle::Release_Store(
-      reinterpret_cast<volatile Atomic32*>(ptr), value);
+  return base::subtle::Release_Store(reinterpret_cast<volatile Atomic32*>(ptr),
+                                     value);
 }
 
-inline AtomicWord NoBarrier_Load(volatile const AtomicWord *ptr) {
-  return NoBarrier_Load(
-      reinterpret_cast<volatile const Atomic32*>(ptr));
+inline AtomicWord NoBarrier_Load(volatile const AtomicWord* ptr) {
+  return NoBarrier_Load(reinterpret_cast<volatile const Atomic32*>(ptr));
 }
 
 inline AtomicWord Acquire_Load(volatile const AtomicWord* ptr) {
@@ -118,8 +116,8 @@ inline AtomicWord Release_Load(volatile const AtomicWord* ptr) {
       reinterpret_cast<volatile const Atomic32*>(ptr));
 }
 
-}   // namespace base::subtle
-}   // namespace base
+}  // namespace base::subtle
+}  // namespace base
 
 #endif  // !defined(ARCH_CPU_64_BITS)
 
diff --git a/src/include/base/internal/cef_atomicops_mac.h b/src/include/base/internal/cef_atomicops_mac.h
index 9f268dd6..374ae35d 100644
--- a/src/include/base/internal/cef_atomicops_mac.h
+++ b/src/include/base/internal/cef_atomicops_mac.h
@@ -170,7 +170,7 @@ inline Atomic64 Acquire_CompareAndSwap(volatile Atomic64* ptr,
   Atomic64 prev_value;
   do {
     if (OSAtomicCompareAndSwap64Barrier(
-        old_value, new_value, reinterpret_cast<volatile int64_t*>(ptr))) {
+            old_value, new_value, reinterpret_cast<volatile int64_t*>(ptr))) {
       return old_value;
     }
     prev_value = *ptr;
@@ -217,7 +217,7 @@ inline Atomic64 Release_Load(volatile const Atomic64* ptr) {
 
 #endif  // defined(__LP64__)
 
-}   // namespace base::subtle
-}   // namespace base
+}  // namespace base::subtle
+}  // namespace base
 
 #endif  // CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_MAC_H_
diff --git a/src/include/base/internal/cef_atomicops_x86_gcc.h b/src/include/base/internal/cef_atomicops_x86_gcc.h
index 0e2139d9..b93df21b 100644
--- a/src/include/base/internal/cef_atomicops_x86_gcc.h
+++ b/src/include/base/internal/cef_atomicops_x86_gcc.h
@@ -38,11 +38,10 @@
 // Features of this x86.  Values may not be correct before main() is run,
 // but are set conservatively.
 struct AtomicOps_x86CPUFeatureStruct {
-  bool has_amd_lock_mb_bug; // Processor has AMD memory-barrier bug; do lfence
-                            // after acquire compare-and-swap.
+  bool has_amd_lock_mb_bug;  // Processor has AMD memory-barrier bug; do lfence
+                             // after acquire compare-and-swap.
 };
-extern struct AtomicOps_x86CPUFeatureStruct
-    AtomicOps_Internalx86CPUFeatures;
+extern struct AtomicOps_x86CPUFeatureStruct AtomicOps_Internalx86CPUFeatures;
 
 #define ATOMICOPS_COMPILER_BARRIER() __asm__ __volatile__("" : : : "memory")
 
@@ -56,8 +55,8 @@ inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr,
                                          Atomic32 new_value) {
   Atomic32 prev;
   __asm__ __volatile__("lock; cmpxchgl %1,%2"
-                       : "=a" (prev)
-                       : "q" (new_value), "m" (*ptr), "0" (old_value)
+                       : "=a"(prev)
+                       : "q"(new_value), "m"(*ptr), "0"(old_value)
                        : "memory");
   return prev;
 }
@@ -65,8 +64,8 @@ inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr,
 inline Atomic32 NoBarrier_AtomicExchange(volatile Atomic32* ptr,
                                          Atomic32 new_value) {
   __asm__ __volatile__("xchgl %1,%0"  // The lock prefix is implicit for xchg.
-                       : "=r" (new_value)
-                       : "m" (*ptr), "0" (new_value)
+                       : "=r"(new_value)
+                       : "m"(*ptr), "0"(new_value)
                        : "memory");
   return new_value;  // Now it's the previous value.
 }
@@ -75,8 +74,9 @@ inline Atomic32 NoBarrier_AtomicIncrement(volatile Atomic32* ptr,
                                           Atomic32 increment) {
   Atomic32 temp = increment;
   __asm__ __volatile__("lock; xaddl %0,%1"
-                       : "+r" (temp), "+m" (*ptr)
-                       : : "memory");
+                       : "+r"(temp), "+m"(*ptr)
+                       :
+                       : "memory");
   // temp now holds the old value of *ptr
   return temp + increment;
 }
@@ -85,8 +85,9 @@ inline Atomic32 Barrier_AtomicIncrement(volatile Atomic32* ptr,
                                         Atomic32 increment) {
   Atomic32 temp = increment;
   __asm__ __volatile__("lock; xaddl %0,%1"
-                       : "+r" (temp), "+m" (*ptr)
-                       : : "memory");
+                       : "+r"(temp), "+m"(*ptr)
+                       :
+                       : "memory");
   // temp now holds the old value of *ptr
   if (AtomicOps_Internalx86CPUFeatures.has_amd_lock_mb_bug) {
     __asm__ __volatile__("lfence" : : : "memory");
@@ -125,7 +126,7 @@ inline void Acquire_Store(volatile Atomic32* ptr, Atomic32 value) {
 
 inline void Release_Store(volatile Atomic32* ptr, Atomic32 value) {
   ATOMICOPS_COMPILER_BARRIER();
-  *ptr = value; // An x86 store acts as a release barrier.
+  *ptr = value;  // An x86 store acts as a release barrier.
   // See comments in Atomic64 version of Release_Store(), below.
 }
 
@@ -134,7 +135,7 @@ inline Atomic32 NoBarrier_Load(volatile const Atomic32* ptr) {
 }
 
 inline Atomic32 Acquire_Load(volatile const Atomic32* ptr) {
-  Atomic32 value = *ptr; // An x86 load acts as a acquire barrier.
+  Atomic32 value = *ptr;  // An x86 load acts as a acquire barrier.
   // See comments in Atomic64 version of Release_Store(), below.
   ATOMICOPS_COMPILER_BARRIER();
   return value;
@@ -154,8 +155,8 @@ inline Atomic64 NoBarrier_CompareAndSwap(volatile Atomic64* ptr,
                                          Atomic64 new_value) {
   Atomic64 prev;
   __asm__ __volatile__("lock; cmpxchgq %1,%2"
-                       : "=a" (prev)
-                       : "q" (new_value), "m" (*ptr), "0" (old_value)
+                       : "=a"(prev)
+                       : "q"(new_value), "m"(*ptr), "0"(old_value)
                        : "memory");
   return prev;
 }
@@ -163,8 +164,8 @@ inline Atomic64 NoBarrier_CompareAndSwap(volatile Atomic64* ptr,
 inline Atomic64 NoBarrier_AtomicExchange(volatile Atomic64* ptr,
                                          Atomic64 new_value) {
   __asm__ __volatile__("xchgq %1,%0"  // The lock prefix is implicit for xchg.
-                       : "=r" (new_value)
-                       : "m" (*ptr), "0" (new_value)
+                       : "=r"(new_value)
+                       : "m"(*ptr), "0"(new_value)
                        : "memory");
   return new_value;  // Now it's the previous value.
 }
@@ -173,8 +174,9 @@ inline Atomic64 NoBarrier_AtomicIncrement(volatile Atomic64* ptr,
                                           Atomic64 increment) {
   Atomic64 temp = increment;
   __asm__ __volatile__("lock; xaddq %0,%1"
-                       : "+r" (temp), "+m" (*ptr)
-                       : : "memory");
+                       : "+r"(temp), "+m"(*ptr)
+                       :
+                       : "memory");
   // temp now contains the previous value of *ptr
   return temp + increment;
 }
@@ -183,8 +185,9 @@ inline Atomic64 Barrier_AtomicIncrement(volatile Atomic64* ptr,
                                         Atomic64 increment) {
   Atomic64 temp = increment;
   __asm__ __volatile__("lock; xaddq %0,%1"
-                       : "+r" (temp), "+m" (*ptr)
-                       : : "memory");
+                       : "+r"(temp), "+m"(*ptr)
+                       :
+                       : "memory");
   // temp now contains the previous value of *ptr
   if (AtomicOps_Internalx86CPUFeatures.has_amd_lock_mb_bug) {
     __asm__ __volatile__("lfence" : : : "memory");
@@ -204,9 +207,9 @@ inline void Acquire_Store(volatile Atomic64* ptr, Atomic64 value) {
 inline void Release_Store(volatile Atomic64* ptr, Atomic64 value) {
   ATOMICOPS_COMPILER_BARRIER();
 
-  *ptr = value; // An x86 store acts as a release barrier
-                // for current AMD/Intel chips as of Jan 2008.
-                // See also Acquire_Load(), below.
+  *ptr = value;  // An x86 store acts as a release barrier
+                 // for current AMD/Intel chips as of Jan 2008.
+                 // See also Acquire_Load(), below.
 
   // When new chips come out, check:
   //  IA-32 Intel Architecture Software Developer's Manual, Volume 3:
@@ -227,9 +230,9 @@ inline Atomic64 NoBarrier_Load(volatile const Atomic64* ptr) {
 }
 
 inline Atomic64 Acquire_Load(volatile const Atomic64* ptr) {
-  Atomic64 value = *ptr; // An x86 load acts as a acquire barrier,
-                         // for current AMD/Intel chips as of Jan 2008.
-                         // See also Release_Store(), above.
+  Atomic64 value = *ptr;  // An x86 load acts as a acquire barrier,
+                          // for current AMD/Intel chips as of Jan 2008.
+                          // See also Release_Store(), above.
   ATOMICOPS_COMPILER_BARRIER();
   return value;
 }
@@ -257,8 +260,8 @@ inline Atomic64 Release_CompareAndSwap(volatile Atomic64* ptr,
 
 #endif  // defined(__x86_64__)
 
-} // namespace base::subtle
-} // namespace base
+}  // namespace base::subtle
+}  // namespace base
 
 #undef ATOMICOPS_COMPILER_BARRIER
 
diff --git a/src/include/base/internal/cef_atomicops_x86_msvc.h b/src/include/base/internal/cef_atomicops_x86_msvc.h
index 12bb0f46..a262c81f 100644
--- a/src/include/base/internal/cef_atomicops_x86_msvc.h
+++ b/src/include/base/internal/cef_atomicops_x86_msvc.h
@@ -55,25 +55,23 @@ inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr,
                                          Atomic32 old_value,
                                          Atomic32 new_value) {
   LONG result = _InterlockedCompareExchange(
-      reinterpret_cast<volatile LONG*>(ptr),
-      static_cast<LONG>(new_value),
+      reinterpret_cast<volatile LONG*>(ptr), static_cast<LONG>(new_value),
       static_cast<LONG>(old_value));
   return static_cast<Atomic32>(result);
 }
 
 inline Atomic32 NoBarrier_AtomicExchange(volatile Atomic32* ptr,
                                          Atomic32 new_value) {
-  LONG result = _InterlockedExchange(
-      reinterpret_cast<volatile LONG*>(ptr),
-      static_cast<LONG>(new_value));
+  LONG result = _InterlockedExchange(reinterpret_cast<volatile LONG*>(ptr),
+                                     static_cast<LONG>(new_value));
   return static_cast<Atomic32>(result);
 }
 
 inline Atomic32 Barrier_AtomicIncrement(volatile Atomic32* ptr,
                                         Atomic32 increment) {
-  return _InterlockedExchangeAdd(
-      reinterpret_cast<volatile LONG*>(ptr),
-      static_cast<LONG>(increment)) + increment;
+  return _InterlockedExchangeAdd(reinterpret_cast<volatile LONG*>(ptr),
+                                 static_cast<LONG>(increment)) +
+         increment;
 }
 
 inline Atomic32 NoBarrier_AtomicIncrement(volatile Atomic32* ptr,
@@ -112,11 +110,11 @@ inline void NoBarrier_Store(volatile Atomic32* ptr, Atomic32 value) {
 
 inline void Acquire_Store(volatile Atomic32* ptr, Atomic32 value) {
   NoBarrier_AtomicExchange(ptr, value);
-              // acts as a barrier in this implementation
+  // acts as a barrier in this implementation
 }
 
 inline void Release_Store(volatile Atomic32* ptr, Atomic32 value) {
-  *ptr = value; // works w/o barrier for current Intel chips as of June 2005
+  *ptr = value;  // works w/o barrier for current Intel chips as of June 2005
   // See comments in Atomic64 version of Release_Store() below.
 }
 
@@ -144,24 +142,24 @@ inline Atomic64 NoBarrier_CompareAndSwap(volatile Atomic64* ptr,
                                          Atomic64 old_value,
                                          Atomic64 new_value) {
   PVOID result = InterlockedCompareExchangePointer(
-    reinterpret_cast<volatile PVOID*>(ptr),
-    reinterpret_cast<PVOID>(new_value), reinterpret_cast<PVOID>(old_value));
+      reinterpret_cast<volatile PVOID*>(ptr),
+      reinterpret_cast<PVOID>(new_value), reinterpret_cast<PVOID>(old_value));
   return reinterpret_cast<Atomic64>(result);
 }
 
 inline Atomic64 NoBarrier_AtomicExchange(volatile Atomic64* ptr,
                                          Atomic64 new_value) {
-  PVOID result = InterlockedExchangePointer(
-    reinterpret_cast<volatile PVOID*>(ptr),
-    reinterpret_cast<PVOID>(new_value));
+  PVOID result =
+      InterlockedExchangePointer(reinterpret_cast<volatile PVOID*>(ptr),
+                                 reinterpret_cast<PVOID>(new_value));
   return reinterpret_cast<Atomic64>(result);
 }
 
 inline Atomic64 Barrier_AtomicIncrement(volatile Atomic64* ptr,
                                         Atomic64 increment) {
-  return InterlockedExchangeAdd64(
-      reinterpret_cast<volatile LONGLONG*>(ptr),
-      static_cast<LONGLONG>(increment)) + increment;
+  return InterlockedExchangeAdd64(reinterpret_cast<volatile LONGLONG*>(ptr),
+                                  static_cast<LONGLONG>(increment)) +
+         increment;
 }
 
 inline Atomic64 NoBarrier_AtomicIncrement(volatile Atomic64* ptr,
@@ -175,11 +173,11 @@ inline void NoBarrier_Store(volatile Atomic64* ptr, Atomic64 value) {
 
 inline void Acquire_Store(volatile Atomic64* ptr, Atomic64 value) {
   NoBarrier_AtomicExchange(ptr, value);
-              // acts as a barrier in this implementation
+  // acts as a barrier in this implementation
 }
 
 inline void Release_Store(volatile Atomic64* ptr, Atomic64 value) {
-  *ptr = value; // works w/o barrier for current Intel chips as of June 2005
+  *ptr = value;  // works w/o barrier for current Intel chips as of June 2005
 
   // When new chips come out, check:
   //  IA-32 Intel Architecture Software Developer's Manual, Volume 3:
@@ -215,7 +213,6 @@ inline Atomic64 Release_CompareAndSwap(volatile Atomic64* ptr,
   return NoBarrier_CompareAndSwap(ptr, old_value, new_value);
 }
 
-
 #endif  // defined(_WIN64)
 
 }  // namespace base::subtle
diff --git a/src/include/base/internal/cef_bind_internal.h b/src/include/base/internal/cef_bind_internal.h
index a097978b..64eeb3f3 100644
--- a/src/include/base/internal/cef_bind_internal.h
+++ b/src/include/base/internal/cef_bind_internal.h
@@ -125,17 +125,13 @@ class RunnableAdapter;
 
 // Function: Arity 0.
 template <typename R>
-class RunnableAdapter<R(*)()> {
+class RunnableAdapter<R (*)()> {
  public:
-  typedef R (RunType)();
+  typedef R(RunType)();
 
-  explicit RunnableAdapter(R(*function)())
-      : function_(function) {
-  }
+  explicit RunnableAdapter(R (*function)()) : function_(function) {}
 
-  R Run() {
-    return function_();
-  }
+  R Run() { return function_(); }
 
  private:
   R (*function_)();
@@ -143,18 +139,14 @@ class RunnableAdapter<R(*)()> {
 
 // Method: Arity 0.
 template <typename R, typename T>
-class RunnableAdapter<R(T::*)()> {
+class RunnableAdapter<R (T::*)()> {
  public:
-  typedef R (RunType)(T*);
+  typedef R(RunType)(T*);
   typedef true_type IsMethod;
 
-  explicit RunnableAdapter(R(T::*method)())
-      : method_(method) {
-  }
+  explicit RunnableAdapter(R (T::*method)()) : method_(method) {}
 
-  R Run(T* object) {
-    return (object->*method_)();
-  }
+  R Run(T* object) { return (object->*method_)(); }
 
  private:
   R (T::*method_)();
@@ -162,18 +154,14 @@ class RunnableAdapter<R(T::*)()> {
 
 // Const Method: Arity 0.
 template <typename R, typename T>
-class RunnableAdapter<R(T::*)() const> {
+class RunnableAdapter<R (T::*)() const> {
  public:
-  typedef R (RunType)(const T*);
+  typedef R(RunType)(const T*);
   typedef true_type IsMethod;
 
-  explicit RunnableAdapter(R(T::*method)() const)
-      : method_(method) {
-  }
+  explicit RunnableAdapter(R (T::*method)() const) : method_(method) {}
 
-  R Run(const T* object) {
-    return (object->*method_)();
-  }
+  R Run(const T* object) { return (object->*method_)(); }
 
  private:
   R (T::*method_)() const;
@@ -181,13 +169,11 @@ class RunnableAdapter<R(T::*)() const> {
 
 // Function: Arity 1.
 template <typename R, typename A1>
-class RunnableAdapter<R(*)(A1)> {
+class RunnableAdapter<R (*)(A1)> {
  public:
-  typedef R (RunType)(A1);
+  typedef R(RunType)(A1);
 
-  explicit RunnableAdapter(R(*function)(A1))
-      : function_(function) {
-  }
+  explicit RunnableAdapter(R (*function)(A1)) : function_(function) {}
 
   R Run(typename CallbackParamTraits<A1>::ForwardType a1) {
     return function_(CallbackForward(a1));
@@ -199,14 +185,12 @@ class RunnableAdapter<R(*)(A1)> {
 
 // Method: Arity 1.
 template <typename R, typename T, typename A1>
-class RunnableAdapter<R(T::*)(A1)> {
+class RunnableAdapter<R (T::*)(A1)> {
  public:
-  typedef R (RunType)(T*, A1);
+  typedef R(RunType)(T*, A1);
   typedef true_type IsMethod;
 
-  explicit RunnableAdapter(R(T::*method)(A1))
-      : method_(method) {
-  }
+  explicit RunnableAdapter(R (T::*method)(A1)) : method_(method) {}
 
   R Run(T* object, typename CallbackParamTraits<A1>::ForwardType a1) {
     return (object->*method_)(CallbackForward(a1));
@@ -218,14 +202,12 @@ class RunnableAdapter<R(T::*)(A1)> {
 
 // Const Method: Arity 1.
 template <typename R, typename T, typename A1>
-class RunnableAdapter<R(T::*)(A1) const> {
+class RunnableAdapter<R (T::*)(A1) const> {
  public:
-  typedef R (RunType)(const T*, A1);
+  typedef R(RunType)(const T*, A1);
   typedef true_type IsMethod;
 
-  explicit RunnableAdapter(R(T::*method)(A1) const)
-      : method_(method) {
-  }
+  explicit RunnableAdapter(R (T::*method)(A1) const) : method_(method) {}
 
   R Run(const T* object, typename CallbackParamTraits<A1>::ForwardType a1) {
     return (object->*method_)(CallbackForward(a1));
@@ -237,16 +219,14 @@ class RunnableAdapter<R(T::*)(A1) const> {
 
 // Function: Arity 2.
 template <typename R, typename A1, typename A2>
-class RunnableAdapter<R(*)(A1, A2)> {
+class RunnableAdapter<R (*)(A1, A2)> {
  public:
-  typedef R (RunType)(A1, A2);
+  typedef R(RunType)(A1, A2);
 
-  explicit RunnableAdapter(R(*function)(A1, A2))
-      : function_(function) {
-  }
+  explicit RunnableAdapter(R (*function)(A1, A2)) : function_(function) {}
 
   R Run(typename CallbackParamTraits<A1>::ForwardType a1,
-      typename CallbackParamTraits<A2>::ForwardType a2) {
+        typename CallbackParamTraits<A2>::ForwardType a2) {
     return function_(CallbackForward(a1), CallbackForward(a2));
   }
 
@@ -256,17 +236,16 @@ class RunnableAdapter<R(*)(A1, A2)> {
 
 // Method: Arity 2.
 template <typename R, typename T, typename A1, typename A2>
-class RunnableAdapter<R(T::*)(A1, A2)> {
+class RunnableAdapter<R (T::*)(A1, A2)> {
  public:
-  typedef R (RunType)(T*, A1, A2);
+  typedef R(RunType)(T*, A1, A2);
   typedef true_type IsMethod;
 
-  explicit RunnableAdapter(R(T::*method)(A1, A2))
-      : method_(method) {
-  }
+  explicit RunnableAdapter(R (T::*method)(A1, A2)) : method_(method) {}
 
-  R Run(T* object, typename CallbackParamTraits<A1>::ForwardType a1,
-      typename CallbackParamTraits<A2>::ForwardType a2) {
+  R Run(T* object,
+        typename CallbackParamTraits<A1>::ForwardType a1,
+        typename CallbackParamTraits<A2>::ForwardType a2) {
     return (object->*method_)(CallbackForward(a1), CallbackForward(a2));
   }
 
@@ -276,17 +255,16 @@ class RunnableAdapter<R(T::*)(A1, A2)> {
 
 // Const Method: Arity 2.
 template <typename R, typename T, typename A1, typename A2>
-class RunnableAdapter<R(T::*)(A1, A2) const> {
+class RunnableAdapter<R (T::*)(A1, A2) const> {
  public:
-  typedef R (RunType)(const T*, A1, A2);
+  typedef R(RunType)(const T*, A1, A2);
   typedef true_type IsMethod;
 
-  explicit RunnableAdapter(R(T::*method)(A1, A2) const)
-      : method_(method) {
-  }
+  explicit RunnableAdapter(R (T::*method)(A1, A2) const) : method_(method) {}
 
-  R Run(const T* object, typename CallbackParamTraits<A1>::ForwardType a1,
-      typename CallbackParamTraits<A2>::ForwardType a2) {
+  R Run(const T* object,
+        typename CallbackParamTraits<A1>::ForwardType a1,
+        typename CallbackParamTraits<A2>::ForwardType a2) {
     return (object->*method_)(CallbackForward(a1), CallbackForward(a2));
   }
 
@@ -296,19 +274,17 @@ class RunnableAdapter<R(T::*)(A1, A2) const> {
 
 // Function: Arity 3.
 template <typename R, typename A1, typename A2, typename A3>
-class RunnableAdapter<R(*)(A1, A2, A3)> {
+class RunnableAdapter<R (*)(A1, A2, A3)> {
  public:
-  typedef R (RunType)(A1, A2, A3);
+  typedef R(RunType)(A1, A2, A3);
 
-  explicit RunnableAdapter(R(*function)(A1, A2, A3))
-      : function_(function) {
-  }
+  explicit RunnableAdapter(R (*function)(A1, A2, A3)) : function_(function) {}
 
   R Run(typename CallbackParamTraits<A1>::ForwardType a1,
-      typename CallbackParamTraits<A2>::ForwardType a2,
-      typename CallbackParamTraits<A3>::ForwardType a3) {
+        typename CallbackParamTraits<A2>::ForwardType a2,
+        typename CallbackParamTraits<A3>::ForwardType a3) {
     return function_(CallbackForward(a1), CallbackForward(a2),
-        CallbackForward(a3));
+                     CallbackForward(a3));
   }
 
  private:
@@ -317,20 +293,19 @@ class RunnableAdapter<R(*)(A1, A2, A3)> {
 
 // Method: Arity 3.
 template <typename R, typename T, typename A1, typename A2, typename A3>
-class RunnableAdapter<R(T::*)(A1, A2, A3)> {
+class RunnableAdapter<R (T::*)(A1, A2, A3)> {
  public:
-  typedef R (RunType)(T*, A1, A2, A3);
+  typedef R(RunType)(T*, A1, A2, A3);
   typedef true_type IsMethod;
 
-  explicit RunnableAdapter(R(T::*method)(A1, A2, A3))
-      : method_(method) {
-  }
+  explicit RunnableAdapter(R (T::*method)(A1, A2, A3)) : method_(method) {}
 
-  R Run(T* object, typename CallbackParamTraits<A1>::ForwardType a1,
-      typename CallbackParamTraits<A2>::ForwardType a2,
-      typename CallbackParamTraits<A3>::ForwardType a3) {
+  R Run(T* object,
+        typename CallbackParamTraits<A1>::ForwardType a1,
+        typename CallbackParamTraits<A2>::ForwardType a2,
+        typename CallbackParamTraits<A3>::ForwardType a3) {
     return (object->*method_)(CallbackForward(a1), CallbackForward(a2),
-        CallbackForward(a3));
+                              CallbackForward(a3));
   }
 
  private:
@@ -339,20 +314,20 @@ class RunnableAdapter<R(T::*)(A1, A2, A3)> {
 
 // Const Method: Arity 3.
 template <typename R, typename T, typename A1, typename A2, typename A3>
-class RunnableAdapter<R(T::*)(A1, A2, A3) const> {
+class RunnableAdapter<R (T::*)(A1, A2, A3) const> {
  public:
-  typedef R (RunType)(const T*, A1, A2, A3);
+  typedef R(RunType)(const T*, A1, A2, A3);
   typedef true_type IsMethod;
 
-  explicit RunnableAdapter(R(T::*method)(A1, A2, A3) const)
-      : method_(method) {
-  }
+  explicit RunnableAdapter(R (T::*method)(A1, A2, A3) const)
+      : method_(method) {}
 
-  R Run(const T* object, typename CallbackParamTraits<A1>::ForwardType a1,
-      typename CallbackParamTraits<A2>::ForwardType a2,
-      typename CallbackParamTraits<A3>::ForwardType a3) {
+  R Run(const T* object,
+        typename CallbackParamTraits<A1>::ForwardType a1,
+        typename CallbackParamTraits<A2>::ForwardType a2,
+        typename CallbackParamTraits<A3>::ForwardType a3) {
     return (object->*method_)(CallbackForward(a1), CallbackForward(a2),
-        CallbackForward(a3));
+                              CallbackForward(a3));
   }
 
  private:
@@ -361,20 +336,19 @@ class RunnableAdapter<R(T::*)(A1, A2, A3) const> {
 
 // Function: Arity 4.
 template <typename R, typename A1, typename A2, typename A3, typename A4>
-class RunnableAdapter<R(*)(A1, A2, A3, A4)> {
+class RunnableAdapter<R (*)(A1, A2, A3, A4)> {
  public:
-  typedef R (RunType)(A1, A2, A3, A4);
+  typedef R(RunType)(A1, A2, A3, A4);
 
-  explicit RunnableAdapter(R(*function)(A1, A2, A3, A4))
-      : function_(function) {
-  }
+  explicit RunnableAdapter(R (*function)(A1, A2, A3, A4))
+      : function_(function) {}
 
   R Run(typename CallbackParamTraits<A1>::ForwardType a1,
-      typename CallbackParamTraits<A2>::ForwardType a2,
-      typename CallbackParamTraits<A3>::ForwardType a3,
-      typename CallbackParamTraits<A4>::ForwardType a4) {
+        typename CallbackParamTraits<A2>::ForwardType a2,
+        typename CallbackParamTraits<A3>::ForwardType a3,
+        typename CallbackParamTraits<A4>::ForwardType a4) {
     return function_(CallbackForward(a1), CallbackForward(a2),
-        CallbackForward(a3), CallbackForward(a4));
+                     CallbackForward(a3), CallbackForward(a4));
   }
 
  private:
@@ -382,23 +356,26 @@ class RunnableAdapter<R(*)(A1, A2, A3, A4)> {
 };
 
 // Method: Arity 4.
-template <typename R, typename T, typename A1, typename A2, typename A3,
-    typename A4>
-class RunnableAdapter<R(T::*)(A1, A2, A3, A4)> {
+template <typename R,
+          typename T,
+          typename A1,
+          typename A2,
+          typename A3,
+          typename A4>
+class RunnableAdapter<R (T::*)(A1, A2, A3, A4)> {
  public:
-  typedef R (RunType)(T*, A1, A2, A3, A4);
+  typedef R(RunType)(T*, A1, A2, A3, A4);
   typedef true_type IsMethod;
 
-  explicit RunnableAdapter(R(T::*method)(A1, A2, A3, A4))
-      : method_(method) {
-  }
+  explicit RunnableAdapter(R (T::*method)(A1, A2, A3, A4)) : method_(method) {}
 
-  R Run(T* object, typename CallbackParamTraits<A1>::ForwardType a1,
-      typename CallbackParamTraits<A2>::ForwardType a2,
-      typename CallbackParamTraits<A3>::ForwardType a3,
-      typename CallbackParamTraits<A4>::ForwardType a4) {
+  R Run(T* object,
+        typename CallbackParamTraits<A1>::ForwardType a1,
+        typename CallbackParamTraits<A2>::ForwardType a2,
+        typename CallbackParamTraits<A3>::ForwardType a3,
+        typename CallbackParamTraits<A4>::ForwardType a4) {
     return (object->*method_)(CallbackForward(a1), CallbackForward(a2),
-        CallbackForward(a3), CallbackForward(a4));
+                              CallbackForward(a3), CallbackForward(a4));
   }
 
  private:
@@ -406,23 +383,27 @@ class RunnableAdapter<R(T::*)(A1, A2, A3, A4)> {
 };
 
 // Const Method: Arity 4.
-template <typename R, typename T, typename A1, typename A2, typename A3,
-    typename A4>
-class RunnableAdapter<R(T::*)(A1, A2, A3, A4) const> {
+template <typename R,
+          typename T,
+          typename A1,
+          typename A2,
+          typename A3,
+          typename A4>
+class RunnableAdapter<R (T::*)(A1, A2, A3, A4) const> {
  public:
-  typedef R (RunType)(const T*, A1, A2, A3, A4);
+  typedef R(RunType)(const T*, A1, A2, A3, A4);
   typedef true_type IsMethod;
 
-  explicit RunnableAdapter(R(T::*method)(A1, A2, A3, A4) const)
-      : method_(method) {
-  }
+  explicit RunnableAdapter(R (T::*method)(A1, A2, A3, A4) const)
+      : method_(method) {}
 
-  R Run(const T* object, typename CallbackParamTraits<A1>::ForwardType a1,
-      typename CallbackParamTraits<A2>::ForwardType a2,
-      typename CallbackParamTraits<A3>::ForwardType a3,
-      typename CallbackParamTraits<A4>::ForwardType a4) {
+  R Run(const T* object,
+        typename CallbackParamTraits<A1>::ForwardType a1,
+        typename CallbackParamTraits<A2>::ForwardType a2,
+        typename CallbackParamTraits<A3>::ForwardType a3,
+        typename CallbackParamTraits<A4>::ForwardType a4) {
     return (object->*method_)(CallbackForward(a1), CallbackForward(a2),
-        CallbackForward(a3), CallbackForward(a4));
+                              CallbackForward(a3), CallbackForward(a4));
   }
 
  private:
@@ -430,23 +411,27 @@ class RunnableAdapter<R(T::*)(A1, A2, A3, A4) const> {
 };
 
 // Function: Arity 5.
-template <typename R, typename A1, typename A2, typename A3, typename A4,
-    typename A5>
-class RunnableAdapter<R(*)(A1, A2, A3, A4, A5)> {
+template <typename R,
+          typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5>
+class RunnableAdapter<R (*)(A1, A2, A3, A4, A5)> {
  public:
-  typedef R (RunType)(A1, A2, A3, A4, A5);
+  typedef R(RunType)(A1, A2, A3, A4, A5);
 
-  explicit RunnableAdapter(R(*function)(A1, A2, A3, A4, A5))
-      : function_(function) {
-  }
+  explicit RunnableAdapter(R (*function)(A1, A2, A3, A4, A5))
+      : function_(function) {}
 
   R Run(typename CallbackParamTraits<A1>::ForwardType a1,
-      typename CallbackParamTraits<A2>::ForwardType a2,
-      typename CallbackParamTraits<A3>::ForwardType a3,
-      typename CallbackParamTraits<A4>::ForwardType a4,
-      typename CallbackParamTraits<A5>::ForwardType a5) {
+        typename CallbackParamTraits<A2>::ForwardType a2,
+        typename CallbackParamTraits<A3>::ForwardType a3,
+        typename CallbackParamTraits<A4>::ForwardType a4,
+        typename CallbackParamTraits<A5>::ForwardType a5) {
     return function_(CallbackForward(a1), CallbackForward(a2),
-        CallbackForward(a3), CallbackForward(a4), CallbackForward(a5));
+                     CallbackForward(a3), CallbackForward(a4),
+                     CallbackForward(a5));
   }
 
  private:
@@ -454,24 +439,30 @@ class RunnableAdapter<R(*)(A1, A2, A3, A4, A5)> {
 };
 
 // Method: Arity 5.
-template <typename R, typename T, typename A1, typename A2, typename A3,
-    typename A4, typename A5>
-class RunnableAdapter<R(T::*)(A1, A2, A3, A4, A5)> {
+template <typename R,
+          typename T,
+          typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5>
+class RunnableAdapter<R (T::*)(A1, A2, A3, A4, A5)> {
  public:
-  typedef R (RunType)(T*, A1, A2, A3, A4, A5);
+  typedef R(RunType)(T*, A1, A2, A3, A4, A5);
   typedef true_type IsMethod;
 
-  explicit RunnableAdapter(R(T::*method)(A1, A2, A3, A4, A5))
-      : method_(method) {
-  }
+  explicit RunnableAdapter(R (T::*method)(A1, A2, A3, A4, A5))
+      : method_(method) {}
 
-  R Run(T* object, typename CallbackParamTraits<A1>::ForwardType a1,
-      typename CallbackParamTraits<A2>::ForwardType a2,
-      typename CallbackParamTraits<A3>::ForwardType a3,
-      typename CallbackParamTraits<A4>::ForwardType a4,
-      typename CallbackParamTraits<A5>::ForwardType a5) {
+  R Run(T* object,
+        typename CallbackParamTraits<A1>::ForwardType a1,
+        typename CallbackParamTraits<A2>::ForwardType a2,
+        typename CallbackParamTraits<A3>::ForwardType a3,
+        typename CallbackParamTraits<A4>::ForwardType a4,
+        typename CallbackParamTraits<A5>::ForwardType a5) {
     return (object->*method_)(CallbackForward(a1), CallbackForward(a2),
-        CallbackForward(a3), CallbackForward(a4), CallbackForward(a5));
+                              CallbackForward(a3), CallbackForward(a4),
+                              CallbackForward(a5));
   }
 
  private:
@@ -479,24 +470,30 @@ class RunnableAdapter<R(T::*)(A1, A2, A3, A4, A5)> {
 };
 
 // Const Method: Arity 5.
-template <typename R, typename T, typename A1, typename A2, typename A3,
-    typename A4, typename A5>
-class RunnableAdapter<R(T::*)(A1, A2, A3, A4, A5) const> {
+template <typename R,
+          typename T,
+          typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5>
+class RunnableAdapter<R (T::*)(A1, A2, A3, A4, A5) const> {
  public:
-  typedef R (RunType)(const T*, A1, A2, A3, A4, A5);
+  typedef R(RunType)(const T*, A1, A2, A3, A4, A5);
   typedef true_type IsMethod;
 
-  explicit RunnableAdapter(R(T::*method)(A1, A2, A3, A4, A5) const)
-      : method_(method) {
-  }
+  explicit RunnableAdapter(R (T::*method)(A1, A2, A3, A4, A5) const)
+      : method_(method) {}
 
-  R Run(const T* object, typename CallbackParamTraits<A1>::ForwardType a1,
-      typename CallbackParamTraits<A2>::ForwardType a2,
-      typename CallbackParamTraits<A3>::ForwardType a3,
-      typename CallbackParamTraits<A4>::ForwardType a4,
-      typename CallbackParamTraits<A5>::ForwardType a5) {
+  R Run(const T* object,
+        typename CallbackParamTraits<A1>::ForwardType a1,
+        typename CallbackParamTraits<A2>::ForwardType a2,
+        typename CallbackParamTraits<A3>::ForwardType a3,
+        typename CallbackParamTraits<A4>::ForwardType a4,
+        typename CallbackParamTraits<A5>::ForwardType a5) {
     return (object->*method_)(CallbackForward(a1), CallbackForward(a2),
-        CallbackForward(a3), CallbackForward(a4), CallbackForward(a5));
+                              CallbackForward(a3), CallbackForward(a4),
+                              CallbackForward(a5));
   }
 
  private:
@@ -504,25 +501,29 @@ class RunnableAdapter<R(T::*)(A1, A2, A3, A4, A5) const> {
 };
 
 // Function: Arity 6.
-template <typename R, typename A1, typename A2, typename A3, typename A4,
-    typename A5, typename A6>
-class RunnableAdapter<R(*)(A1, A2, A3, A4, A5, A6)> {
+template <typename R,
+          typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5,
+          typename A6>
+class RunnableAdapter<R (*)(A1, A2, A3, A4, A5, A6)> {
  public:
-  typedef R (RunType)(A1, A2, A3, A4, A5, A6);
+  typedef R(RunType)(A1, A2, A3, A4, A5, A6);
 
-  explicit RunnableAdapter(R(*function)(A1, A2, A3, A4, A5, A6))
-      : function_(function) {
-  }
+  explicit RunnableAdapter(R (*function)(A1, A2, A3, A4, A5, A6))
+      : function_(function) {}
 
   R Run(typename CallbackParamTraits<A1>::ForwardType a1,
-      typename CallbackParamTraits<A2>::ForwardType a2,
-      typename CallbackParamTraits<A3>::ForwardType a3,
-      typename CallbackParamTraits<A4>::ForwardType a4,
-      typename CallbackParamTraits<A5>::ForwardType a5,
-      typename CallbackParamTraits<A6>::ForwardType a6) {
+        typename CallbackParamTraits<A2>::ForwardType a2,
+        typename CallbackParamTraits<A3>::ForwardType a3,
+        typename CallbackParamTraits<A4>::ForwardType a4,
+        typename CallbackParamTraits<A5>::ForwardType a5,
+        typename CallbackParamTraits<A6>::ForwardType a6) {
     return function_(CallbackForward(a1), CallbackForward(a2),
-        CallbackForward(a3), CallbackForward(a4), CallbackForward(a5),
-        CallbackForward(a6));
+                     CallbackForward(a3), CallbackForward(a4),
+                     CallbackForward(a5), CallbackForward(a6));
   }
 
  private:
@@ -530,26 +531,32 @@ class RunnableAdapter<R(*)(A1, A2, A3, A4, A5, A6)> {
 };
 
 // Method: Arity 6.
-template <typename R, typename T, typename A1, typename A2, typename A3,
-    typename A4, typename A5, typename A6>
-class RunnableAdapter<R(T::*)(A1, A2, A3, A4, A5, A6)> {
+template <typename R,
+          typename T,
+          typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5,
+          typename A6>
+class RunnableAdapter<R (T::*)(A1, A2, A3, A4, A5, A6)> {
  public:
-  typedef R (RunType)(T*, A1, A2, A3, A4, A5, A6);
+  typedef R(RunType)(T*, A1, A2, A3, A4, A5, A6);
   typedef true_type IsMethod;
 
-  explicit RunnableAdapter(R(T::*method)(A1, A2, A3, A4, A5, A6))
-      : method_(method) {
-  }
+  explicit RunnableAdapter(R (T::*method)(A1, A2, A3, A4, A5, A6))
+      : method_(method) {}
 
-  R Run(T* object, typename CallbackParamTraits<A1>::ForwardType a1,
-      typename CallbackParamTraits<A2>::ForwardType a2,
-      typename CallbackParamTraits<A3>::ForwardType a3,
-      typename CallbackParamTraits<A4>::ForwardType a4,
-      typename CallbackParamTraits<A5>::ForwardType a5,
-      typename CallbackParamTraits<A6>::ForwardType a6) {
+  R Run(T* object,
+        typename CallbackParamTraits<A1>::ForwardType a1,
+        typename CallbackParamTraits<A2>::ForwardType a2,
+        typename CallbackParamTraits<A3>::ForwardType a3,
+        typename CallbackParamTraits<A4>::ForwardType a4,
+        typename CallbackParamTraits<A5>::ForwardType a5,
+        typename CallbackParamTraits<A6>::ForwardType a6) {
     return (object->*method_)(CallbackForward(a1), CallbackForward(a2),
-        CallbackForward(a3), CallbackForward(a4), CallbackForward(a5),
-        CallbackForward(a6));
+                              CallbackForward(a3), CallbackForward(a4),
+                              CallbackForward(a5), CallbackForward(a6));
   }
 
  private:
@@ -557,26 +564,32 @@ class RunnableAdapter<R(T::*)(A1, A2, A3, A4, A5, A6)> {
 };
 
 // Const Method: Arity 6.
-template <typename R, typename T, typename A1, typename A2, typename A3,
-    typename A4, typename A5, typename A6>
-class RunnableAdapter<R(T::*)(A1, A2, A3, A4, A5, A6) const> {
+template <typename R,
+          typename T,
+          typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5,
+          typename A6>
+class RunnableAdapter<R (T::*)(A1, A2, A3, A4, A5, A6) const> {
  public:
-  typedef R (RunType)(const T*, A1, A2, A3, A4, A5, A6);
+  typedef R(RunType)(const T*, A1, A2, A3, A4, A5, A6);
   typedef true_type IsMethod;
 
-  explicit RunnableAdapter(R(T::*method)(A1, A2, A3, A4, A5, A6) const)
-      : method_(method) {
-  }
+  explicit RunnableAdapter(R (T::*method)(A1, A2, A3, A4, A5, A6) const)
+      : method_(method) {}
 
-  R Run(const T* object, typename CallbackParamTraits<A1>::ForwardType a1,
-      typename CallbackParamTraits<A2>::ForwardType a2,
-      typename CallbackParamTraits<A3>::ForwardType a3,
-      typename CallbackParamTraits<A4>::ForwardType a4,
-      typename CallbackParamTraits<A5>::ForwardType a5,
-      typename CallbackParamTraits<A6>::ForwardType a6) {
+  R Run(const T* object,
+        typename CallbackParamTraits<A1>::ForwardType a1,
+        typename CallbackParamTraits<A2>::ForwardType a2,
+        typename CallbackParamTraits<A3>::ForwardType a3,
+        typename CallbackParamTraits<A4>::ForwardType a4,
+        typename CallbackParamTraits<A5>::ForwardType a5,
+        typename CallbackParamTraits<A6>::ForwardType a6) {
     return (object->*method_)(CallbackForward(a1), CallbackForward(a2),
-        CallbackForward(a3), CallbackForward(a4), CallbackForward(a5),
-        CallbackForward(a6));
+                              CallbackForward(a3), CallbackForward(a4),
+                              CallbackForward(a5), CallbackForward(a6));
   }
 
  private:
@@ -584,26 +597,32 @@ class RunnableAdapter<R(T::*)(A1, A2, A3, A4, A5, A6) const> {
 };
 
 // Function: Arity 7.
-template <typename R, typename A1, typename A2, typename A3, typename A4,
-    typename A5, typename A6, typename A7>
-class RunnableAdapter<R(*)(A1, A2, A3, A4, A5, A6, A7)> {
+template <typename R,
+          typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5,
+          typename A6,
+          typename A7>
+class RunnableAdapter<R (*)(A1, A2, A3, A4, A5, A6, A7)> {
  public:
-  typedef R (RunType)(A1, A2, A3, A4, A5, A6, A7);
+  typedef R(RunType)(A1, A2, A3, A4, A5, A6, A7);
 
-  explicit RunnableAdapter(R(*function)(A1, A2, A3, A4, A5, A6, A7))
-      : function_(function) {
-  }
+  explicit RunnableAdapter(R (*function)(A1, A2, A3, A4, A5, A6, A7))
+      : function_(function) {}
 
   R Run(typename CallbackParamTraits<A1>::ForwardType a1,
-      typename CallbackParamTraits<A2>::ForwardType a2,
-      typename CallbackParamTraits<A3>::ForwardType a3,
-      typename CallbackParamTraits<A4>::ForwardType a4,
-      typename CallbackParamTraits<A5>::ForwardType a5,
-      typename CallbackParamTraits<A6>::ForwardType a6,
-      typename CallbackParamTraits<A7>::ForwardType a7) {
+        typename CallbackParamTraits<A2>::ForwardType a2,
+        typename CallbackParamTraits<A3>::ForwardType a3,
+        typename CallbackParamTraits<A4>::ForwardType a4,
+        typename CallbackParamTraits<A5>::ForwardType a5,
+        typename CallbackParamTraits<A6>::ForwardType a6,
+        typename CallbackParamTraits<A7>::ForwardType a7) {
     return function_(CallbackForward(a1), CallbackForward(a2),
-        CallbackForward(a3), CallbackForward(a4), CallbackForward(a5),
-        CallbackForward(a6), CallbackForward(a7));
+                     CallbackForward(a3), CallbackForward(a4),
+                     CallbackForward(a5), CallbackForward(a6),
+                     CallbackForward(a7));
   }
 
  private:
@@ -611,27 +630,35 @@ class RunnableAdapter<R(*)(A1, A2, A3, A4, A5, A6, A7)> {
 };
 
 // Method: Arity 7.
-template <typename R, typename T, typename A1, typename A2, typename A3,
-    typename A4, typename A5, typename A6, typename A7>
-class RunnableAdapter<R(T::*)(A1, A2, A3, A4, A5, A6, A7)> {
+template <typename R,
+          typename T,
+          typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5,
+          typename A6,
+          typename A7>
+class RunnableAdapter<R (T::*)(A1, A2, A3, A4, A5, A6, A7)> {
  public:
-  typedef R (RunType)(T*, A1, A2, A3, A4, A5, A6, A7);
+  typedef R(RunType)(T*, A1, A2, A3, A4, A5, A6, A7);
   typedef true_type IsMethod;
 
-  explicit RunnableAdapter(R(T::*method)(A1, A2, A3, A4, A5, A6, A7))
-      : method_(method) {
-  }
-
-  R Run(T* object, typename CallbackParamTraits<A1>::ForwardType a1,
-      typename CallbackParamTraits<A2>::ForwardType a2,
-      typename CallbackParamTraits<A3>::ForwardType a3,
-      typename CallbackParamTraits<A4>::ForwardType a4,
-      typename CallbackParamTraits<A5>::ForwardType a5,
-      typename CallbackParamTraits<A6>::ForwardType a6,
-      typename CallbackParamTraits<A7>::ForwardType a7) {
+  explicit RunnableAdapter(R (T::*method)(A1, A2, A3, A4, A5, A6, A7))
+      : method_(method) {}
+
+  R Run(T* object,
+        typename CallbackParamTraits<A1>::ForwardType a1,
+        typename CallbackParamTraits<A2>::ForwardType a2,
+        typename CallbackParamTraits<A3>::ForwardType a3,
+        typename CallbackParamTraits<A4>::ForwardType a4,
+        typename CallbackParamTraits<A5>::ForwardType a5,
+        typename CallbackParamTraits<A6>::ForwardType a6,
+        typename CallbackParamTraits<A7>::ForwardType a7) {
     return (object->*method_)(CallbackForward(a1), CallbackForward(a2),
-        CallbackForward(a3), CallbackForward(a4), CallbackForward(a5),
-        CallbackForward(a6), CallbackForward(a7));
+                              CallbackForward(a3), CallbackForward(a4),
+                              CallbackForward(a5), CallbackForward(a6),
+                              CallbackForward(a7));
   }
 
  private:
@@ -639,34 +666,41 @@ class RunnableAdapter<R(T::*)(A1, A2, A3, A4, A5, A6, A7)> {
 };
 
 // Const Method: Arity 7.
-template <typename R, typename T, typename A1, typename A2, typename A3,
-    typename A4, typename A5, typename A6, typename A7>
-class RunnableAdapter<R(T::*)(A1, A2, A3, A4, A5, A6, A7) const> {
+template <typename R,
+          typename T,
+          typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5,
+          typename A6,
+          typename A7>
+class RunnableAdapter<R (T::*)(A1, A2, A3, A4, A5, A6, A7) const> {
  public:
-  typedef R (RunType)(const T*, A1, A2, A3, A4, A5, A6, A7);
+  typedef R(RunType)(const T*, A1, A2, A3, A4, A5, A6, A7);
   typedef true_type IsMethod;
 
-  explicit RunnableAdapter(R(T::*method)(A1, A2, A3, A4, A5, A6, A7) const)
-      : method_(method) {
-  }
-
-  R Run(const T* object, typename CallbackParamTraits<A1>::ForwardType a1,
-      typename CallbackParamTraits<A2>::ForwardType a2,
-      typename CallbackParamTraits<A3>::ForwardType a3,
-      typename CallbackParamTraits<A4>::ForwardType a4,
-      typename CallbackParamTraits<A5>::ForwardType a5,
-      typename CallbackParamTraits<A6>::ForwardType a6,
-      typename CallbackParamTraits<A7>::ForwardType a7) {
+  explicit RunnableAdapter(R (T::*method)(A1, A2, A3, A4, A5, A6, A7) const)
+      : method_(method) {}
+
+  R Run(const T* object,
+        typename CallbackParamTraits<A1>::ForwardType a1,
+        typename CallbackParamTraits<A2>::ForwardType a2,
+        typename CallbackParamTraits<A3>::ForwardType a3,
+        typename CallbackParamTraits<A4>::ForwardType a4,
+        typename CallbackParamTraits<A5>::ForwardType a5,
+        typename CallbackParamTraits<A6>::ForwardType a6,
+        typename CallbackParamTraits<A7>::ForwardType a7) {
     return (object->*method_)(CallbackForward(a1), CallbackForward(a2),
-        CallbackForward(a3), CallbackForward(a4), CallbackForward(a5),
-        CallbackForward(a6), CallbackForward(a7));
+                              CallbackForward(a3), CallbackForward(a4),
+                              CallbackForward(a5), CallbackForward(a6),
+                              CallbackForward(a7));
   }
 
  private:
   R (T::*method_)(A1, A2, A3, A4, A5, A6, A7) const;
 };
 
-
 // FunctionTraits<>
 //
 // Breaks a function signature apart into typedefs for easier introspection.
@@ -708,8 +742,12 @@ struct FunctionTraits<R(A1, A2, A3, A4)> {
   typedef A4 A4Type;
 };
 
-template <typename R, typename A1, typename A2, typename A3, typename A4,
-    typename A5>
+template <typename R,
+          typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5>
 struct FunctionTraits<R(A1, A2, A3, A4, A5)> {
   typedef R ReturnType;
   typedef A1 A1Type;
@@ -719,8 +757,13 @@ struct FunctionTraits<R(A1, A2, A3, A4, A5)> {
   typedef A5 A5Type;
 };
 
-template <typename R, typename A1, typename A2, typename A3, typename A4,
-    typename A5, typename A6>
+template <typename R,
+          typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5,
+          typename A6>
 struct FunctionTraits<R(A1, A2, A3, A4, A5, A6)> {
   typedef R ReturnType;
   typedef A1 A1Type;
@@ -731,8 +774,14 @@ struct FunctionTraits<R(A1, A2, A3, A4, A5, A6)> {
   typedef A6 A6Type;
 };
 
-template <typename R, typename A1, typename A2, typename A3, typename A4,
-    typename A5, typename A6, typename A7>
+template <typename R,
+          typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5,
+          typename A6,
+          typename A7>
 struct FunctionTraits<R(A1, A2, A3, A4, A5, A6, A7)> {
   typedef R ReturnType;
   typedef A1 A1Type;
@@ -744,7 +793,6 @@ struct FunctionTraits<R(A1, A2, A3, A4, A5, A6, A7)> {
   typedef A7 A7Type;
 };
 
-
 // ForceVoidReturn<>
 //
 // Set of templates that support forcing the function return type to void.
@@ -776,25 +824,39 @@ struct ForceVoidReturn<R(A1, A2, A3, A4)> {
   typedef void(RunType)(A1, A2, A3, A4);
 };
 
-template <typename R, typename A1, typename A2, typename A3, typename A4,
-    typename A5>
+template <typename R,
+          typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5>
 struct ForceVoidReturn<R(A1, A2, A3, A4, A5)> {
   typedef void(RunType)(A1, A2, A3, A4, A5);
 };
 
-template <typename R, typename A1, typename A2, typename A3, typename A4,
-    typename A5, typename A6>
+template <typename R,
+          typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5,
+          typename A6>
 struct ForceVoidReturn<R(A1, A2, A3, A4, A5, A6)> {
   typedef void(RunType)(A1, A2, A3, A4, A5, A6);
 };
 
-template <typename R, typename A1, typename A2, typename A3, typename A4,
-    typename A5, typename A6, typename A7>
+template <typename R,
+          typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5,
+          typename A6,
+          typename A7>
 struct ForceVoidReturn<R(A1, A2, A3, A4, A5, A6, A7)> {
   typedef void(RunType)(A1, A2, A3, A4, A5, A6, A7);
 };
 
-
 // FunctorTraits<>
 //
 // See description at top of file.
@@ -805,19 +867,18 @@ struct FunctorTraits {
 };
 
 template <typename T>
-struct FunctorTraits<IgnoreResultHelper<T> > {
+struct FunctorTraits<IgnoreResultHelper<T>> {
   typedef typename FunctorTraits<T>::RunnableType RunnableType;
-  typedef typename ForceVoidReturn<
-      typename RunnableType::RunType>::RunType RunType;
+  typedef
+      typename ForceVoidReturn<typename RunnableType::RunType>::RunType RunType;
 };
 
 template <typename T>
-struct FunctorTraits<Callback<T> > {
+struct FunctorTraits<Callback<T>> {
   typedef Callback<T> RunnableType;
   typedef typename Callback<T>::RunType RunType;
 };
 
-
 // MakeRunnable<>
 //
 // Converts a passed in functor to a RunnableType using type inference.
@@ -828,19 +889,18 @@ typename FunctorTraits<T>::RunnableType MakeRunnable(const T& t) {
 }
 
 template <typename T>
-typename FunctorTraits<T>::RunnableType
-MakeRunnable(const IgnoreResultHelper<T>& t) {
+typename FunctorTraits<T>::RunnableType MakeRunnable(
+    const IgnoreResultHelper<T>& t) {
   return MakeRunnable(t.functor_);
 }
 
 template <typename T>
-const typename FunctorTraits<Callback<T> >::RunnableType&
-MakeRunnable(const Callback<T>& t) {
+const typename FunctorTraits<Callback<T>>::RunnableType& MakeRunnable(
+    const Callback<T>& t) {
   DCHECK(!t.is_null());
   return t;
 }
 
-
 // InvokeHelper<>
 //
 // There are 3 logical InvokeHelper<> specializations: normal, void-return,
@@ -858,45 +918,38 @@ MakeRunnable(const Callback<T>& t) {
 //
 // WeakCalls similarly need special syntax that is applied to the first
 // argument to check if they should no-op themselves.
-template <bool IsWeakCall, typename ReturnType, typename Runnable,
+template <bool IsWeakCall,
+          typename ReturnType,
+          typename Runnable,
           typename ArgsType>
 struct InvokeHelper;
 
 template <typename ReturnType, typename Runnable>
-struct InvokeHelper<false, ReturnType, Runnable,
-    void()>  {
-  static ReturnType MakeItSo(Runnable runnable) {
-    return runnable.Run();
-  }
+struct InvokeHelper<false, ReturnType, Runnable, void()> {
+  static ReturnType MakeItSo(Runnable runnable) { return runnable.Run(); }
 };
 
 template <typename Runnable>
-struct InvokeHelper<false, void, Runnable,
-    void()>  {
-  static void MakeItSo(Runnable runnable) {
-    runnable.Run();
-  }
+struct InvokeHelper<false, void, Runnable, void()> {
+  static void MakeItSo(Runnable runnable) { runnable.Run(); }
 };
 
-template <typename ReturnType, typename Runnable,typename A1>
-struct InvokeHelper<false, ReturnType, Runnable,
-    void(A1)>  {
+template <typename ReturnType, typename Runnable, typename A1>
+struct InvokeHelper<false, ReturnType, Runnable, void(A1)> {
   static ReturnType MakeItSo(Runnable runnable, A1 a1) {
     return runnable.Run(CallbackForward(a1));
   }
 };
 
-template <typename Runnable,typename A1>
-struct InvokeHelper<false, void, Runnable,
-    void(A1)>  {
+template <typename Runnable, typename A1>
+struct InvokeHelper<false, void, Runnable, void(A1)> {
   static void MakeItSo(Runnable runnable, A1 a1) {
     runnable.Run(CallbackForward(a1));
   }
 };
 
 template <typename Runnable, typename BoundWeakPtr>
-struct InvokeHelper<true, void, Runnable,
-    void(BoundWeakPtr)>  {
+struct InvokeHelper<true, void, Runnable, void(BoundWeakPtr)> {
   static void MakeItSo(Runnable runnable, BoundWeakPtr weak_ptr) {
     if (!weak_ptr.get()) {
       return;
@@ -905,25 +958,22 @@ struct InvokeHelper<true, void, Runnable,
   }
 };
 
-template <typename ReturnType, typename Runnable,typename A1, typename A2>
-struct InvokeHelper<false, ReturnType, Runnable,
-    void(A1, A2)>  {
+template <typename ReturnType, typename Runnable, typename A1, typename A2>
+struct InvokeHelper<false, ReturnType, Runnable, void(A1, A2)> {
   static ReturnType MakeItSo(Runnable runnable, A1 a1, A2 a2) {
     return runnable.Run(CallbackForward(a1), CallbackForward(a2));
   }
 };
 
-template <typename Runnable,typename A1, typename A2>
-struct InvokeHelper<false, void, Runnable,
-    void(A1, A2)>  {
+template <typename Runnable, typename A1, typename A2>
+struct InvokeHelper<false, void, Runnable, void(A1, A2)> {
   static void MakeItSo(Runnable runnable, A1 a1, A2 a2) {
     runnable.Run(CallbackForward(a1), CallbackForward(a2));
   }
 };
 
 template <typename Runnable, typename BoundWeakPtr, typename A2>
-struct InvokeHelper<true, void, Runnable,
-    void(BoundWeakPtr, A2)>  {
+struct InvokeHelper<true, void, Runnable, void(BoundWeakPtr, A2)> {
   static void MakeItSo(Runnable runnable, BoundWeakPtr weak_ptr, A2 a2) {
     if (!weak_ptr.get()) {
       return;
@@ -932,27 +982,27 @@ struct InvokeHelper<true, void, Runnable,
   }
 };
 
-template <typename ReturnType, typename Runnable,typename A1, typename A2,
-    typename A3>
-struct InvokeHelper<false, ReturnType, Runnable,
-    void(A1, A2, A3)>  {
+template <typename ReturnType,
+          typename Runnable,
+          typename A1,
+          typename A2,
+          typename A3>
+struct InvokeHelper<false, ReturnType, Runnable, void(A1, A2, A3)> {
   static ReturnType MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3) {
     return runnable.Run(CallbackForward(a1), CallbackForward(a2),
-        CallbackForward(a3));
+                        CallbackForward(a3));
   }
 };
 
-template <typename Runnable,typename A1, typename A2, typename A3>
-struct InvokeHelper<false, void, Runnable,
-    void(A1, A2, A3)>  {
+template <typename Runnable, typename A1, typename A2, typename A3>
+struct InvokeHelper<false, void, Runnable, void(A1, A2, A3)> {
   static void MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3) {
     runnable.Run(CallbackForward(a1), CallbackForward(a2), CallbackForward(a3));
   }
 };
 
 template <typename Runnable, typename BoundWeakPtr, typename A2, typename A3>
-struct InvokeHelper<true, void, Runnable,
-    void(BoundWeakPtr, A2, A3)>  {
+struct InvokeHelper<true, void, Runnable, void(BoundWeakPtr, A2, A3)> {
   static void MakeItSo(Runnable runnable, BoundWeakPtr weak_ptr, A2 a2, A3 a3) {
     if (!weak_ptr.get()) {
       return;
@@ -961,147 +1011,223 @@ struct InvokeHelper<true, void, Runnable,
   }
 };
 
-template <typename ReturnType, typename Runnable,typename A1, typename A2,
-    typename A3, typename A4>
-struct InvokeHelper<false, ReturnType, Runnable,
-    void(A1, A2, A3, A4)>  {
+template <typename ReturnType,
+          typename Runnable,
+          typename A1,
+          typename A2,
+          typename A3,
+          typename A4>
+struct InvokeHelper<false, ReturnType, Runnable, void(A1, A2, A3, A4)> {
   static ReturnType MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4) {
     return runnable.Run(CallbackForward(a1), CallbackForward(a2),
-        CallbackForward(a3), CallbackForward(a4));
+                        CallbackForward(a3), CallbackForward(a4));
   }
 };
 
-template <typename Runnable,typename A1, typename A2, typename A3, typename A4>
-struct InvokeHelper<false, void, Runnable,
-    void(A1, A2, A3, A4)>  {
+template <typename Runnable, typename A1, typename A2, typename A3, typename A4>
+struct InvokeHelper<false, void, Runnable, void(A1, A2, A3, A4)> {
   static void MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4) {
     runnable.Run(CallbackForward(a1), CallbackForward(a2), CallbackForward(a3),
-        CallbackForward(a4));
+                 CallbackForward(a4));
   }
 };
 
-template <typename Runnable, typename BoundWeakPtr, typename A2, typename A3,
-    typename A4>
-struct InvokeHelper<true, void, Runnable,
-    void(BoundWeakPtr, A2, A3, A4)>  {
-  static void MakeItSo(Runnable runnable, BoundWeakPtr weak_ptr, A2 a2, A3 a3,
-      A4 a4) {
+template <typename Runnable,
+          typename BoundWeakPtr,
+          typename A2,
+          typename A3,
+          typename A4>
+struct InvokeHelper<true, void, Runnable, void(BoundWeakPtr, A2, A3, A4)> {
+  static void MakeItSo(Runnable runnable,
+                       BoundWeakPtr weak_ptr,
+                       A2 a2,
+                       A3 a3,
+                       A4 a4) {
     if (!weak_ptr.get()) {
       return;
     }
     runnable.Run(weak_ptr.get(), CallbackForward(a2), CallbackForward(a3),
-        CallbackForward(a4));
-  }
-};
-
-template <typename ReturnType, typename Runnable,typename A1, typename A2,
-    typename A3, typename A4, typename A5>
-struct InvokeHelper<false, ReturnType, Runnable,
-    void(A1, A2, A3, A4, A5)>  {
-  static ReturnType MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4,
-      A5 a5) {
+                 CallbackForward(a4));
+  }
+};
+
+template <typename ReturnType,
+          typename Runnable,
+          typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5>
+struct InvokeHelper<false, ReturnType, Runnable, void(A1, A2, A3, A4, A5)> {
+  static ReturnType MakeItSo(Runnable runnable,
+                             A1 a1,
+                             A2 a2,
+                             A3 a3,
+                             A4 a4,
+                             A5 a5) {
     return runnable.Run(CallbackForward(a1), CallbackForward(a2),
-        CallbackForward(a3), CallbackForward(a4), CallbackForward(a5));
+                        CallbackForward(a3), CallbackForward(a4),
+                        CallbackForward(a5));
   }
 };
 
-template <typename Runnable,typename A1, typename A2, typename A3, typename A4,
-    typename A5>
-struct InvokeHelper<false, void, Runnable,
-    void(A1, A2, A3, A4, A5)>  {
+template <typename Runnable,
+          typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5>
+struct InvokeHelper<false, void, Runnable, void(A1, A2, A3, A4, A5)> {
   static void MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5) {
     runnable.Run(CallbackForward(a1), CallbackForward(a2), CallbackForward(a3),
-        CallbackForward(a4), CallbackForward(a5));
-  }
-};
-
-template <typename Runnable, typename BoundWeakPtr, typename A2, typename A3,
-    typename A4, typename A5>
-struct InvokeHelper<true, void, Runnable,
-    void(BoundWeakPtr, A2, A3, A4, A5)>  {
-  static void MakeItSo(Runnable runnable, BoundWeakPtr weak_ptr, A2 a2, A3 a3,
-      A4 a4, A5 a5) {
+                 CallbackForward(a4), CallbackForward(a5));
+  }
+};
+
+template <typename Runnable,
+          typename BoundWeakPtr,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5>
+struct InvokeHelper<true, void, Runnable, void(BoundWeakPtr, A2, A3, A4, A5)> {
+  static void MakeItSo(Runnable runnable,
+                       BoundWeakPtr weak_ptr,
+                       A2 a2,
+                       A3 a3,
+                       A4 a4,
+                       A5 a5) {
     if (!weak_ptr.get()) {
       return;
     }
     runnable.Run(weak_ptr.get(), CallbackForward(a2), CallbackForward(a3),
-        CallbackForward(a4), CallbackForward(a5));
+                 CallbackForward(a4), CallbackForward(a5));
   }
 };
 
-template <typename ReturnType, typename Runnable,typename A1, typename A2,
-    typename A3, typename A4, typename A5, typename A6>
-struct InvokeHelper<false, ReturnType, Runnable,
-    void(A1, A2, A3, A4, A5, A6)>  {
-  static ReturnType MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4,
-      A5 a5, A6 a6) {
+template <typename ReturnType,
+          typename Runnable,
+          typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5,
+          typename A6>
+struct InvokeHelper<false, ReturnType, Runnable, void(A1, A2, A3, A4, A5, A6)> {
+  static ReturnType
+  MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6) {
     return runnable.Run(CallbackForward(a1), CallbackForward(a2),
-        CallbackForward(a3), CallbackForward(a4), CallbackForward(a5),
-        CallbackForward(a6));
+                        CallbackForward(a3), CallbackForward(a4),
+                        CallbackForward(a5), CallbackForward(a6));
   }
 };
 
-template <typename Runnable,typename A1, typename A2, typename A3, typename A4,
-    typename A5, typename A6>
-struct InvokeHelper<false, void, Runnable,
-    void(A1, A2, A3, A4, A5, A6)>  {
-  static void MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5,
-      A6 a6) {
+template <typename Runnable,
+          typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5,
+          typename A6>
+struct InvokeHelper<false, void, Runnable, void(A1, A2, A3, A4, A5, A6)> {
+  static void
+  MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6) {
     runnable.Run(CallbackForward(a1), CallbackForward(a2), CallbackForward(a3),
-        CallbackForward(a4), CallbackForward(a5), CallbackForward(a6));
-  }
-};
-
-template <typename Runnable, typename BoundWeakPtr, typename A2, typename A3,
-    typename A4, typename A5, typename A6>
-struct InvokeHelper<true, void, Runnable,
-    void(BoundWeakPtr, A2, A3, A4, A5, A6)>  {
-  static void MakeItSo(Runnable runnable, BoundWeakPtr weak_ptr, A2 a2, A3 a3,
-      A4 a4, A5 a5, A6 a6) {
+                 CallbackForward(a4), CallbackForward(a5), CallbackForward(a6));
+  }
+};
+
+template <typename Runnable,
+          typename BoundWeakPtr,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5,
+          typename A6>
+struct InvokeHelper<true,
+                    void,
+                    Runnable,
+                    void(BoundWeakPtr, A2, A3, A4, A5, A6)> {
+  static void MakeItSo(Runnable runnable,
+                       BoundWeakPtr weak_ptr,
+                       A2 a2,
+                       A3 a3,
+                       A4 a4,
+                       A5 a5,
+                       A6 a6) {
     if (!weak_ptr.get()) {
       return;
     }
     runnable.Run(weak_ptr.get(), CallbackForward(a2), CallbackForward(a3),
-        CallbackForward(a4), CallbackForward(a5), CallbackForward(a6));
-  }
-};
-
-template <typename ReturnType, typename Runnable,typename A1, typename A2,
-    typename A3, typename A4, typename A5, typename A6, typename A7>
-struct InvokeHelper<false, ReturnType, Runnable,
-    void(A1, A2, A3, A4, A5, A6, A7)>  {
-  static ReturnType MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4,
-      A5 a5, A6 a6, A7 a7) {
+                 CallbackForward(a4), CallbackForward(a5), CallbackForward(a6));
+  }
+};
+
+template <typename ReturnType,
+          typename Runnable,
+          typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5,
+          typename A6,
+          typename A7>
+struct InvokeHelper<false,
+                    ReturnType,
+                    Runnable,
+                    void(A1, A2, A3, A4, A5, A6, A7)> {
+  static ReturnType
+  MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7) {
     return runnable.Run(CallbackForward(a1), CallbackForward(a2),
-        CallbackForward(a3), CallbackForward(a4), CallbackForward(a5),
-        CallbackForward(a6), CallbackForward(a7));
-  }
-};
-
-template <typename Runnable,typename A1, typename A2, typename A3, typename A4,
-    typename A5, typename A6, typename A7>
-struct InvokeHelper<false, void, Runnable,
-    void(A1, A2, A3, A4, A5, A6, A7)>  {
-  static void MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5,
-      A6 a6, A7 a7) {
+                        CallbackForward(a3), CallbackForward(a4),
+                        CallbackForward(a5), CallbackForward(a6),
+                        CallbackForward(a7));
+  }
+};
+
+template <typename Runnable,
+          typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5,
+          typename A6,
+          typename A7>
+struct InvokeHelper<false, void, Runnable, void(A1, A2, A3, A4, A5, A6, A7)> {
+  static void
+  MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7) {
     runnable.Run(CallbackForward(a1), CallbackForward(a2), CallbackForward(a3),
-        CallbackForward(a4), CallbackForward(a5), CallbackForward(a6),
-        CallbackForward(a7));
-  }
-};
-
-template <typename Runnable, typename BoundWeakPtr, typename A2, typename A3,
-    typename A4, typename A5, typename A6, typename A7>
-struct InvokeHelper<true, void, Runnable,
-    void(BoundWeakPtr, A2, A3, A4, A5, A6, A7)>  {
-  static void MakeItSo(Runnable runnable, BoundWeakPtr weak_ptr, A2 a2, A3 a3,
-      A4 a4, A5 a5, A6 a6, A7 a7) {
+                 CallbackForward(a4), CallbackForward(a5), CallbackForward(a6),
+                 CallbackForward(a7));
+  }
+};
+
+template <typename Runnable,
+          typename BoundWeakPtr,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5,
+          typename A6,
+          typename A7>
+struct InvokeHelper<true,
+                    void,
+                    Runnable,
+                    void(BoundWeakPtr, A2, A3, A4, A5, A6, A7)> {
+  static void MakeItSo(Runnable runnable,
+                       BoundWeakPtr weak_ptr,
+                       A2 a2,
+                       A3 a3,
+                       A4 a4,
+                       A5 a5,
+                       A6 a6,
+                       A7 a7) {
     if (!weak_ptr.get()) {
       return;
     }
     runnable.Run(weak_ptr.get(), CallbackForward(a2), CallbackForward(a3),
-        CallbackForward(a4), CallbackForward(a5), CallbackForward(a6),
-        CallbackForward(a7));
+                 CallbackForward(a4), CallbackForward(a5), CallbackForward(a6),
+                 CallbackForward(a7));
   }
 };
 
@@ -1139,22 +1265,21 @@ struct Invoker<0, StorageType, R()> {
     // InvokeHelper<>::MakeItSo() call below.
 
     return InvokeHelper<StorageType::IsWeakCall::value, R,
-           typename StorageType::RunnableType,
-           void()>
-               ::MakeItSo(storage->runnable_);
+                        typename StorageType::RunnableType,
+                        void()>::MakeItSo(storage->runnable_);
   }
 };
 
 // Arity 1 -> 1.
-template <typename StorageType, typename R,typename X1>
+template <typename StorageType, typename R, typename X1>
 struct Invoker<0, StorageType, R(X1)> {
   typedef R(RunType)(BindStateBase*,
-      typename CallbackParamTraits<X1>::ForwardType);
+                     typename CallbackParamTraits<X1>::ForwardType);
 
   typedef R(UnboundRunType)(X1);
 
   static R Run(BindStateBase* base,
-      typename CallbackParamTraits<X1>::ForwardType x1) {
+               typename CallbackParamTraits<X1>::ForwardType x1) {
     StorageType* storage = static_cast<StorageType*>(base);
 
     // Local references to make debugger stepping easier. If in a debugger,
@@ -1162,14 +1287,15 @@ struct Invoker<0, StorageType, R(X1)> {
     // InvokeHelper<>::MakeItSo() call below.
 
     return InvokeHelper<StorageType::IsWeakCall::value, R,
-           typename StorageType::RunnableType,
-           void(typename CallbackParamTraits<X1>::ForwardType x1)>
-               ::MakeItSo(storage->runnable_, CallbackForward(x1));
+                        typename StorageType::RunnableType,
+                        void(typename CallbackParamTraits<X1>::ForwardType
+                                 x1)>::MakeItSo(storage->runnable_,
+                                                CallbackForward(x1));
   }
 };
 
 // Arity 1 -> 0.
-template <typename StorageType, typename R,typename X1>
+template <typename StorageType, typename R, typename X1>
 struct Invoker<1, StorageType, R(X1)> {
   typedef R(RunType)(BindStateBase*);
 
@@ -1186,24 +1312,24 @@ struct Invoker<1, StorageType, R(X1)> {
     typename Bound1UnwrapTraits::ForwardType x1 =
         Bound1UnwrapTraits::Unwrap(storage->p1_);
     return InvokeHelper<StorageType::IsWeakCall::value, R,
-           typename StorageType::RunnableType,
-           void(typename Bound1UnwrapTraits::ForwardType)>
-               ::MakeItSo(storage->runnable_, CallbackForward(x1));
+                        typename StorageType::RunnableType,
+                        void(typename Bound1UnwrapTraits::ForwardType)>::
+        MakeItSo(storage->runnable_, CallbackForward(x1));
   }
 };
 
 // Arity 2 -> 2.
-template <typename StorageType, typename R,typename X1, typename X2>
+template <typename StorageType, typename R, typename X1, typename X2>
 struct Invoker<0, StorageType, R(X1, X2)> {
   typedef R(RunType)(BindStateBase*,
-      typename CallbackParamTraits<X1>::ForwardType,
-      typename CallbackParamTraits<X2>::ForwardType);
+                     typename CallbackParamTraits<X1>::ForwardType,
+                     typename CallbackParamTraits<X2>::ForwardType);
 
   typedef R(UnboundRunType)(X1, X2);
 
   static R Run(BindStateBase* base,
-      typename CallbackParamTraits<X1>::ForwardType x1,
-      typename CallbackParamTraits<X2>::ForwardType x2) {
+               typename CallbackParamTraits<X1>::ForwardType x1,
+               typename CallbackParamTraits<X2>::ForwardType x2) {
     StorageType* storage = static_cast<StorageType*>(base);
 
     // Local references to make debugger stepping easier. If in a debugger,
@@ -1211,24 +1337,25 @@ struct Invoker<0, StorageType, R(X1, X2)> {
     // InvokeHelper<>::MakeItSo() call below.
 
     return InvokeHelper<StorageType::IsWeakCall::value, R,
-           typename StorageType::RunnableType,
-           void(typename CallbackParamTraits<X1>::ForwardType x1,
-               typename CallbackParamTraits<X2>::ForwardType x2)>
-               ::MakeItSo(storage->runnable_, CallbackForward(x1),
-                   CallbackForward(x2));
+                        typename StorageType::RunnableType,
+                        void(typename CallbackParamTraits<X1>::ForwardType x1,
+                             typename CallbackParamTraits<X2>::ForwardType
+                                 x2)>::MakeItSo(storage->runnable_,
+                                                CallbackForward(x1),
+                                                CallbackForward(x2));
   }
 };
 
 // Arity 2 -> 1.
-template <typename StorageType, typename R,typename X1, typename X2>
+template <typename StorageType, typename R, typename X1, typename X2>
 struct Invoker<1, StorageType, R(X1, X2)> {
   typedef R(RunType)(BindStateBase*,
-      typename CallbackParamTraits<X2>::ForwardType);
+                     typename CallbackParamTraits<X2>::ForwardType);
 
   typedef R(UnboundRunType)(X2);
 
   static R Run(BindStateBase* base,
-      typename CallbackParamTraits<X2>::ForwardType x2) {
+               typename CallbackParamTraits<X2>::ForwardType x2) {
     StorageType* storage = static_cast<StorageType*>(base);
 
     // Local references to make debugger stepping easier. If in a debugger,
@@ -1239,16 +1366,17 @@ struct Invoker<1, StorageType, R(X1, X2)> {
     typename Bound1UnwrapTraits::ForwardType x1 =
         Bound1UnwrapTraits::Unwrap(storage->p1_);
     return InvokeHelper<StorageType::IsWeakCall::value, R,
-           typename StorageType::RunnableType,
-           void(typename Bound1UnwrapTraits::ForwardType,
-               typename CallbackParamTraits<X2>::ForwardType x2)>
-               ::MakeItSo(storage->runnable_, CallbackForward(x1),
-                   CallbackForward(x2));
+                        typename StorageType::RunnableType,
+                        void(typename Bound1UnwrapTraits::ForwardType,
+                             typename CallbackParamTraits<X2>::ForwardType
+                                 x2)>::MakeItSo(storage->runnable_,
+                                                CallbackForward(x1),
+                                                CallbackForward(x2));
   }
 };
 
 // Arity 2 -> 0.
-template <typename StorageType, typename R,typename X1, typename X2>
+template <typename StorageType, typename R, typename X1, typename X2>
 struct Invoker<2, StorageType, R(X1, X2)> {
   typedef R(RunType)(BindStateBase*);
 
@@ -1268,29 +1396,31 @@ struct Invoker<2, StorageType, R(X1, X2)> {
     typename Bound2UnwrapTraits::ForwardType x2 =
         Bound2UnwrapTraits::Unwrap(storage->p2_);
     return InvokeHelper<StorageType::IsWeakCall::value, R,
-           typename StorageType::RunnableType,
-           void(typename Bound1UnwrapTraits::ForwardType,
-               typename Bound2UnwrapTraits::ForwardType)>
-               ::MakeItSo(storage->runnable_, CallbackForward(x1),
-                   CallbackForward(x2));
+                        typename StorageType::RunnableType,
+                        void(typename Bound1UnwrapTraits::ForwardType,
+                             typename Bound2UnwrapTraits::ForwardType)>::
+        MakeItSo(storage->runnable_, CallbackForward(x1), CallbackForward(x2));
   }
 };
 
 // Arity 3 -> 3.
-template <typename StorageType, typename R,typename X1, typename X2,
-    typename X3>
+template <typename StorageType,
+          typename R,
+          typename X1,
+          typename X2,
+          typename X3>
 struct Invoker<0, StorageType, R(X1, X2, X3)> {
   typedef R(RunType)(BindStateBase*,
-      typename CallbackParamTraits<X1>::ForwardType,
-      typename CallbackParamTraits<X2>::ForwardType,
-      typename CallbackParamTraits<X3>::ForwardType);
+                     typename CallbackParamTraits<X1>::ForwardType,
+                     typename CallbackParamTraits<X2>::ForwardType,
+                     typename CallbackParamTraits<X3>::ForwardType);
 
   typedef R(UnboundRunType)(X1, X2, X3);
 
   static R Run(BindStateBase* base,
-      typename CallbackParamTraits<X1>::ForwardType x1,
-      typename CallbackParamTraits<X2>::ForwardType x2,
-      typename CallbackParamTraits<X3>::ForwardType x3) {
+               typename CallbackParamTraits<X1>::ForwardType x1,
+               typename CallbackParamTraits<X2>::ForwardType x2,
+               typename CallbackParamTraits<X3>::ForwardType x3) {
     StorageType* storage = static_cast<StorageType*>(base);
 
     // Local references to make debugger stepping easier. If in a debugger,
@@ -1298,28 +1428,33 @@ struct Invoker<0, StorageType, R(X1, X2, X3)> {
     // InvokeHelper<>::MakeItSo() call below.
 
     return InvokeHelper<StorageType::IsWeakCall::value, R,
-           typename StorageType::RunnableType,
-           void(typename CallbackParamTraits<X1>::ForwardType x1,
-               typename CallbackParamTraits<X2>::ForwardType x2,
-               typename CallbackParamTraits<X3>::ForwardType x3)>
-               ::MakeItSo(storage->runnable_, CallbackForward(x1),
-                   CallbackForward(x2), CallbackForward(x3));
+                        typename StorageType::RunnableType,
+                        void(typename CallbackParamTraits<X1>::ForwardType x1,
+                             typename CallbackParamTraits<X2>::ForwardType x2,
+                             typename CallbackParamTraits<X3>::ForwardType
+                                 x3)>::MakeItSo(storage->runnable_,
+                                                CallbackForward(x1),
+                                                CallbackForward(x2),
+                                                CallbackForward(x3));
   }
 };
 
 // Arity 3 -> 2.
-template <typename StorageType, typename R,typename X1, typename X2,
-    typename X3>
+template <typename StorageType,
+          typename R,
+          typename X1,
+          typename X2,
+          typename X3>
 struct Invoker<1, StorageType, R(X1, X2, X3)> {
   typedef R(RunType)(BindStateBase*,
-      typename CallbackParamTraits<X2>::ForwardType,
-      typename CallbackParamTraits<X3>::ForwardType);
+                     typename CallbackParamTraits<X2>::ForwardType,
+                     typename CallbackParamTraits<X3>::ForwardType);
 
   typedef R(UnboundRunType)(X2, X3);
 
   static R Run(BindStateBase* base,
-      typename CallbackParamTraits<X2>::ForwardType x2,
-      typename CallbackParamTraits<X3>::ForwardType x3) {
+               typename CallbackParamTraits<X2>::ForwardType x2,
+               typename CallbackParamTraits<X3>::ForwardType x3) {
     StorageType* storage = static_cast<StorageType*>(base);
 
     // Local references to make debugger stepping easier. If in a debugger,
@@ -1330,26 +1465,31 @@ struct Invoker<1, StorageType, R(X1, X2, X3)> {
     typename Bound1UnwrapTraits::ForwardType x1 =
         Bound1UnwrapTraits::Unwrap(storage->p1_);
     return InvokeHelper<StorageType::IsWeakCall::value, R,
-           typename StorageType::RunnableType,
-           void(typename Bound1UnwrapTraits::ForwardType,
-               typename CallbackParamTraits<X2>::ForwardType x2,
-               typename CallbackParamTraits<X3>::ForwardType x3)>
-               ::MakeItSo(storage->runnable_, CallbackForward(x1),
-                   CallbackForward(x2), CallbackForward(x3));
+                        typename StorageType::RunnableType,
+                        void(typename Bound1UnwrapTraits::ForwardType,
+                             typename CallbackParamTraits<X2>::ForwardType x2,
+                             typename CallbackParamTraits<X3>::ForwardType
+                                 x3)>::MakeItSo(storage->runnable_,
+                                                CallbackForward(x1),
+                                                CallbackForward(x2),
+                                                CallbackForward(x3));
   }
 };
 
 // Arity 3 -> 1.
-template <typename StorageType, typename R,typename X1, typename X2,
-    typename X3>
+template <typename StorageType,
+          typename R,
+          typename X1,
+          typename X2,
+          typename X3>
 struct Invoker<2, StorageType, R(X1, X2, X3)> {
   typedef R(RunType)(BindStateBase*,
-      typename CallbackParamTraits<X3>::ForwardType);
+                     typename CallbackParamTraits<X3>::ForwardType);
 
   typedef R(UnboundRunType)(X3);
 
   static R Run(BindStateBase* base,
-      typename CallbackParamTraits<X3>::ForwardType x3) {
+               typename CallbackParamTraits<X3>::ForwardType x3) {
     StorageType* storage = static_cast<StorageType*>(base);
 
     // Local references to make debugger stepping easier. If in a debugger,
@@ -1363,18 +1503,23 @@ struct Invoker<2, StorageType, R(X1, X2, X3)> {
     typename Bound2UnwrapTraits::ForwardType x2 =
         Bound2UnwrapTraits::Unwrap(storage->p2_);
     return InvokeHelper<StorageType::IsWeakCall::value, R,
-           typename StorageType::RunnableType,
-           void(typename Bound1UnwrapTraits::ForwardType,
-               typename Bound2UnwrapTraits::ForwardType,
-               typename CallbackParamTraits<X3>::ForwardType x3)>
-               ::MakeItSo(storage->runnable_, CallbackForward(x1),
-                   CallbackForward(x2), CallbackForward(x3));
+                        typename StorageType::RunnableType,
+                        void(typename Bound1UnwrapTraits::ForwardType,
+                             typename Bound2UnwrapTraits::ForwardType,
+                             typename CallbackParamTraits<X3>::ForwardType
+                                 x3)>::MakeItSo(storage->runnable_,
+                                                CallbackForward(x1),
+                                                CallbackForward(x2),
+                                                CallbackForward(x3));
   }
 };
 
 // Arity 3 -> 0.
-template <typename StorageType, typename R,typename X1, typename X2,
-    typename X3>
+template <typename StorageType,
+          typename R,
+          typename X1,
+          typename X2,
+          typename X3>
 struct Invoker<3, StorageType, R(X1, X2, X3)> {
   typedef R(RunType)(BindStateBase*);
 
@@ -1397,32 +1542,36 @@ struct Invoker<3, StorageType, R(X1, X2, X3)> {
     typename Bound3UnwrapTraits::ForwardType x3 =
         Bound3UnwrapTraits::Unwrap(storage->p3_);
     return InvokeHelper<StorageType::IsWeakCall::value, R,
-           typename StorageType::RunnableType,
-           void(typename Bound1UnwrapTraits::ForwardType,
-               typename Bound2UnwrapTraits::ForwardType,
-               typename Bound3UnwrapTraits::ForwardType)>
-               ::MakeItSo(storage->runnable_, CallbackForward(x1),
-                   CallbackForward(x2), CallbackForward(x3));
+                        typename StorageType::RunnableType,
+                        void(typename Bound1UnwrapTraits::ForwardType,
+                             typename Bound2UnwrapTraits::ForwardType,
+                             typename Bound3UnwrapTraits::ForwardType)>::
+        MakeItSo(storage->runnable_, CallbackForward(x1), CallbackForward(x2),
+                 CallbackForward(x3));
   }
 };
 
 // Arity 4 -> 4.
-template <typename StorageType, typename R,typename X1, typename X2,
-    typename X3, typename X4>
+template <typename StorageType,
+          typename R,
+          typename X1,
+          typename X2,
+          typename X3,
+          typename X4>
 struct Invoker<0, StorageType, R(X1, X2, X3, X4)> {
   typedef R(RunType)(BindStateBase*,
-      typename CallbackParamTraits<X1>::ForwardType,
-      typename CallbackParamTraits<X2>::ForwardType,
-      typename CallbackParamTraits<X3>::ForwardType,
-      typename CallbackParamTraits<X4>::ForwardType);
+                     typename CallbackParamTraits<X1>::ForwardType,
+                     typename CallbackParamTraits<X2>::ForwardType,
+                     typename CallbackParamTraits<X3>::ForwardType,
+                     typename CallbackParamTraits<X4>::ForwardType);
 
   typedef R(UnboundRunType)(X1, X2, X3, X4);
 
   static R Run(BindStateBase* base,
-      typename CallbackParamTraits<X1>::ForwardType x1,
-      typename CallbackParamTraits<X2>::ForwardType x2,
-      typename CallbackParamTraits<X3>::ForwardType x3,
-      typename CallbackParamTraits<X4>::ForwardType x4) {
+               typename CallbackParamTraits<X1>::ForwardType x1,
+               typename CallbackParamTraits<X2>::ForwardType x2,
+               typename CallbackParamTraits<X3>::ForwardType x3,
+               typename CallbackParamTraits<X4>::ForwardType x4) {
     StorageType* storage = static_cast<StorageType*>(base);
 
     // Local references to make debugger stepping easier. If in a debugger,
@@ -1430,32 +1579,38 @@ struct Invoker<0, StorageType, R(X1, X2, X3, X4)> {
     // InvokeHelper<>::MakeItSo() call below.
 
     return InvokeHelper<StorageType::IsWeakCall::value, R,
-           typename StorageType::RunnableType,
-           void(typename CallbackParamTraits<X1>::ForwardType x1,
-               typename CallbackParamTraits<X2>::ForwardType x2,
-               typename CallbackParamTraits<X3>::ForwardType x3,
-               typename CallbackParamTraits<X4>::ForwardType x4)>
-               ::MakeItSo(storage->runnable_, CallbackForward(x1),
-                   CallbackForward(x2), CallbackForward(x3),
-                   CallbackForward(x4));
+                        typename StorageType::RunnableType,
+                        void(typename CallbackParamTraits<X1>::ForwardType x1,
+                             typename CallbackParamTraits<X2>::ForwardType x2,
+                             typename CallbackParamTraits<X3>::ForwardType x3,
+                             typename CallbackParamTraits<X4>::ForwardType
+                                 x4)>::MakeItSo(storage->runnable_,
+                                                CallbackForward(x1),
+                                                CallbackForward(x2),
+                                                CallbackForward(x3),
+                                                CallbackForward(x4));
   }
 };
 
 // Arity 4 -> 3.
-template <typename StorageType, typename R,typename X1, typename X2,
-    typename X3, typename X4>
+template <typename StorageType,
+          typename R,
+          typename X1,
+          typename X2,
+          typename X3,
+          typename X4>
 struct Invoker<1, StorageType, R(X1, X2, X3, X4)> {
   typedef R(RunType)(BindStateBase*,
-      typename CallbackParamTraits<X2>::ForwardType,
-      typename CallbackParamTraits<X3>::ForwardType,
-      typename CallbackParamTraits<X4>::ForwardType);
+                     typename CallbackParamTraits<X2>::ForwardType,
+                     typename CallbackParamTraits<X3>::ForwardType,
+                     typename CallbackParamTraits<X4>::ForwardType);
 
   typedef R(UnboundRunType)(X2, X3, X4);
 
   static R Run(BindStateBase* base,
-      typename CallbackParamTraits<X2>::ForwardType x2,
-      typename CallbackParamTraits<X3>::ForwardType x3,
-      typename CallbackParamTraits<X4>::ForwardType x4) {
+               typename CallbackParamTraits<X2>::ForwardType x2,
+               typename CallbackParamTraits<X3>::ForwardType x3,
+               typename CallbackParamTraits<X4>::ForwardType x4) {
     StorageType* storage = static_cast<StorageType*>(base);
 
     // Local references to make debugger stepping easier. If in a debugger,
@@ -1466,30 +1621,36 @@ struct Invoker<1, StorageType, R(X1, X2, X3, X4)> {
     typename Bound1UnwrapTraits::ForwardType x1 =
         Bound1UnwrapTraits::Unwrap(storage->p1_);
     return InvokeHelper<StorageType::IsWeakCall::value, R,
-           typename StorageType::RunnableType,
-           void(typename Bound1UnwrapTraits::ForwardType,
-               typename CallbackParamTraits<X2>::ForwardType x2,
-               typename CallbackParamTraits<X3>::ForwardType x3,
-               typename CallbackParamTraits<X4>::ForwardType x4)>
-               ::MakeItSo(storage->runnable_, CallbackForward(x1),
-                   CallbackForward(x2), CallbackForward(x3),
-                   CallbackForward(x4));
+                        typename StorageType::RunnableType,
+                        void(typename Bound1UnwrapTraits::ForwardType,
+                             typename CallbackParamTraits<X2>::ForwardType x2,
+                             typename CallbackParamTraits<X3>::ForwardType x3,
+                             typename CallbackParamTraits<X4>::ForwardType
+                                 x4)>::MakeItSo(storage->runnable_,
+                                                CallbackForward(x1),
+                                                CallbackForward(x2),
+                                                CallbackForward(x3),
+                                                CallbackForward(x4));
   }
 };
 
 // Arity 4 -> 2.
-template <typename StorageType, typename R,typename X1, typename X2,
-    typename X3, typename X4>
+template <typename StorageType,
+          typename R,
+          typename X1,
+          typename X2,
+          typename X3,
+          typename X4>
 struct Invoker<2, StorageType, R(X1, X2, X3, X4)> {
   typedef R(RunType)(BindStateBase*,
-      typename CallbackParamTraits<X3>::ForwardType,
-      typename CallbackParamTraits<X4>::ForwardType);
+                     typename CallbackParamTraits<X3>::ForwardType,
+                     typename CallbackParamTraits<X4>::ForwardType);
 
   typedef R(UnboundRunType)(X3, X4);
 
   static R Run(BindStateBase* base,
-      typename CallbackParamTraits<X3>::ForwardType x3,
-      typename CallbackParamTraits<X4>::ForwardType x4) {
+               typename CallbackParamTraits<X3>::ForwardType x3,
+               typename CallbackParamTraits<X4>::ForwardType x4) {
     StorageType* storage = static_cast<StorageType*>(base);
 
     // Local references to make debugger stepping easier. If in a debugger,
@@ -1503,28 +1664,34 @@ struct Invoker<2, StorageType, R(X1, X2, X3, X4)> {
     typename Bound2UnwrapTraits::ForwardType x2 =
         Bound2UnwrapTraits::Unwrap(storage->p2_);
     return InvokeHelper<StorageType::IsWeakCall::value, R,
-           typename StorageType::RunnableType,
-           void(typename Bound1UnwrapTraits::ForwardType,
-               typename Bound2UnwrapTraits::ForwardType,
-               typename CallbackParamTraits<X3>::ForwardType x3,
-               typename CallbackParamTraits<X4>::ForwardType x4)>
-               ::MakeItSo(storage->runnable_, CallbackForward(x1),
-                   CallbackForward(x2), CallbackForward(x3),
-                   CallbackForward(x4));
+                        typename StorageType::RunnableType,
+                        void(typename Bound1UnwrapTraits::ForwardType,
+                             typename Bound2UnwrapTraits::ForwardType,
+                             typename CallbackParamTraits<X3>::ForwardType x3,
+                             typename CallbackParamTraits<X4>::ForwardType
+                                 x4)>::MakeItSo(storage->runnable_,
+                                                CallbackForward(x1),
+                                                CallbackForward(x2),
+                                                CallbackForward(x3),
+                                                CallbackForward(x4));
   }
 };
 
 // Arity 4 -> 1.
-template <typename StorageType, typename R,typename X1, typename X2,
-    typename X3, typename X4>
+template <typename StorageType,
+          typename R,
+          typename X1,
+          typename X2,
+          typename X3,
+          typename X4>
 struct Invoker<3, StorageType, R(X1, X2, X3, X4)> {
   typedef R(RunType)(BindStateBase*,
-      typename CallbackParamTraits<X4>::ForwardType);
+                     typename CallbackParamTraits<X4>::ForwardType);
 
   typedef R(UnboundRunType)(X4);
 
   static R Run(BindStateBase* base,
-      typename CallbackParamTraits<X4>::ForwardType x4) {
+               typename CallbackParamTraits<X4>::ForwardType x4) {
     StorageType* storage = static_cast<StorageType*>(base);
 
     // Local references to make debugger stepping easier. If in a debugger,
@@ -1541,20 +1708,26 @@ struct Invoker<3, StorageType, R(X1, X2, X3, X4)> {
     typename Bound3UnwrapTraits::ForwardType x3 =
         Bound3UnwrapTraits::Unwrap(storage->p3_);
     return InvokeHelper<StorageType::IsWeakCall::value, R,
-           typename StorageType::RunnableType,
-           void(typename Bound1UnwrapTraits::ForwardType,
-               typename Bound2UnwrapTraits::ForwardType,
-               typename Bound3UnwrapTraits::ForwardType,
-               typename CallbackParamTraits<X4>::ForwardType x4)>
-               ::MakeItSo(storage->runnable_, CallbackForward(x1),
-                   CallbackForward(x2), CallbackForward(x3),
-                   CallbackForward(x4));
+                        typename StorageType::RunnableType,
+                        void(typename Bound1UnwrapTraits::ForwardType,
+                             typename Bound2UnwrapTraits::ForwardType,
+                             typename Bound3UnwrapTraits::ForwardType,
+                             typename CallbackParamTraits<X4>::ForwardType
+                                 x4)>::MakeItSo(storage->runnable_,
+                                                CallbackForward(x1),
+                                                CallbackForward(x2),
+                                                CallbackForward(x3),
+                                                CallbackForward(x4));
   }
 };
 
 // Arity 4 -> 0.
-template <typename StorageType, typename R,typename X1, typename X2,
-    typename X3, typename X4>
+template <typename StorageType,
+          typename R,
+          typename X1,
+          typename X2,
+          typename X3,
+          typename X4>
 struct Invoker<4, StorageType, R(X1, X2, X3, X4)> {
   typedef R(RunType)(BindStateBase*);
 
@@ -1580,72 +1753,81 @@ struct Invoker<4, StorageType, R(X1, X2, X3, X4)> {
     typename Bound4UnwrapTraits::ForwardType x4 =
         Bound4UnwrapTraits::Unwrap(storage->p4_);
     return InvokeHelper<StorageType::IsWeakCall::value, R,
-           typename StorageType::RunnableType,
-           void(typename Bound1UnwrapTraits::ForwardType,
-               typename Bound2UnwrapTraits::ForwardType,
-               typename Bound3UnwrapTraits::ForwardType,
-               typename Bound4UnwrapTraits::ForwardType)>
-               ::MakeItSo(storage->runnable_, CallbackForward(x1),
-                   CallbackForward(x2), CallbackForward(x3),
-                   CallbackForward(x4));
+                        typename StorageType::RunnableType,
+                        void(typename Bound1UnwrapTraits::ForwardType,
+                             typename Bound2UnwrapTraits::ForwardType,
+                             typename Bound3UnwrapTraits::ForwardType,
+                             typename Bound4UnwrapTraits::ForwardType)>::
+        MakeItSo(storage->runnable_, CallbackForward(x1), CallbackForward(x2),
+                 CallbackForward(x3), CallbackForward(x4));
   }
 };
 
 // Arity 5 -> 5.
-template <typename StorageType, typename R,typename X1, typename X2,
-    typename X3, typename X4, typename X5>
+template <typename StorageType,
+          typename R,
+          typename X1,
+          typename X2,
+          typename X3,
+          typename X4,
+          typename X5>
 struct Invoker<0, StorageType, R(X1, X2, X3, X4, X5)> {
   typedef R(RunType)(BindStateBase*,
-      typename CallbackParamTraits<X1>::ForwardType,
-      typename CallbackParamTraits<X2>::ForwardType,
-      typename CallbackParamTraits<X3>::ForwardType,
-      typename CallbackParamTraits<X4>::ForwardType,
-      typename CallbackParamTraits<X5>::ForwardType);
+                     typename CallbackParamTraits<X1>::ForwardType,
+                     typename CallbackParamTraits<X2>::ForwardType,
+                     typename CallbackParamTraits<X3>::ForwardType,
+                     typename CallbackParamTraits<X4>::ForwardType,
+                     typename CallbackParamTraits<X5>::ForwardType);
 
   typedef R(UnboundRunType)(X1, X2, X3, X4, X5);
 
   static R Run(BindStateBase* base,
-      typename CallbackParamTraits<X1>::ForwardType x1,
-      typename CallbackParamTraits<X2>::ForwardType x2,
-      typename CallbackParamTraits<X3>::ForwardType x3,
-      typename CallbackParamTraits<X4>::ForwardType x4,
-      typename CallbackParamTraits<X5>::ForwardType x5) {
+               typename CallbackParamTraits<X1>::ForwardType x1,
+               typename CallbackParamTraits<X2>::ForwardType x2,
+               typename CallbackParamTraits<X3>::ForwardType x3,
+               typename CallbackParamTraits<X4>::ForwardType x4,
+               typename CallbackParamTraits<X5>::ForwardType x5) {
     StorageType* storage = static_cast<StorageType*>(base);
 
     // Local references to make debugger stepping easier. If in a debugger,
     // you really want to warp ahead and step through the
     // InvokeHelper<>::MakeItSo() call below.
 
-    return InvokeHelper<StorageType::IsWeakCall::value, R,
-           typename StorageType::RunnableType,
-           void(typename CallbackParamTraits<X1>::ForwardType x1,
-               typename CallbackParamTraits<X2>::ForwardType x2,
-               typename CallbackParamTraits<X3>::ForwardType x3,
-               typename CallbackParamTraits<X4>::ForwardType x4,
-               typename CallbackParamTraits<X5>::ForwardType x5)>
-               ::MakeItSo(storage->runnable_, CallbackForward(x1),
-                   CallbackForward(x2), CallbackForward(x3),
-                   CallbackForward(x4), CallbackForward(x5));
+    return InvokeHelper<
+        StorageType::IsWeakCall::value, R, typename StorageType::RunnableType,
+        void(typename CallbackParamTraits<X1>::ForwardType x1,
+             typename CallbackParamTraits<X2>::ForwardType x2,
+             typename CallbackParamTraits<X3>::ForwardType x3,
+             typename CallbackParamTraits<X4>::ForwardType x4,
+             typename CallbackParamTraits<X5>::ForwardType
+                 x5)>::MakeItSo(storage->runnable_, CallbackForward(x1),
+                                CallbackForward(x2), CallbackForward(x3),
+                                CallbackForward(x4), CallbackForward(x5));
   }
 };
 
 // Arity 5 -> 4.
-template <typename StorageType, typename R,typename X1, typename X2,
-    typename X3, typename X4, typename X5>
+template <typename StorageType,
+          typename R,
+          typename X1,
+          typename X2,
+          typename X3,
+          typename X4,
+          typename X5>
 struct Invoker<1, StorageType, R(X1, X2, X3, X4, X5)> {
   typedef R(RunType)(BindStateBase*,
-      typename CallbackParamTraits<X2>::ForwardType,
-      typename CallbackParamTraits<X3>::ForwardType,
-      typename CallbackParamTraits<X4>::ForwardType,
-      typename CallbackParamTraits<X5>::ForwardType);
+                     typename CallbackParamTraits<X2>::ForwardType,
+                     typename CallbackParamTraits<X3>::ForwardType,
+                     typename CallbackParamTraits<X4>::ForwardType,
+                     typename CallbackParamTraits<X5>::ForwardType);
 
   typedef R(UnboundRunType)(X2, X3, X4, X5);
 
   static R Run(BindStateBase* base,
-      typename CallbackParamTraits<X2>::ForwardType x2,
-      typename CallbackParamTraits<X3>::ForwardType x3,
-      typename CallbackParamTraits<X4>::ForwardType x4,
-      typename CallbackParamTraits<X5>::ForwardType x5) {
+               typename CallbackParamTraits<X2>::ForwardType x2,
+               typename CallbackParamTraits<X3>::ForwardType x3,
+               typename CallbackParamTraits<X4>::ForwardType x4,
+               typename CallbackParamTraits<X5>::ForwardType x5) {
     StorageType* storage = static_cast<StorageType*>(base);
 
     // Local references to make debugger stepping easier. If in a debugger,
@@ -1655,34 +1837,39 @@ struct Invoker<1, StorageType, R(X1, X2, X3, X4, X5)> {
 
     typename Bound1UnwrapTraits::ForwardType x1 =
         Bound1UnwrapTraits::Unwrap(storage->p1_);
-    return InvokeHelper<StorageType::IsWeakCall::value, R,
-           typename StorageType::RunnableType,
-           void(typename Bound1UnwrapTraits::ForwardType,
-               typename CallbackParamTraits<X2>::ForwardType x2,
-               typename CallbackParamTraits<X3>::ForwardType x3,
-               typename CallbackParamTraits<X4>::ForwardType x4,
-               typename CallbackParamTraits<X5>::ForwardType x5)>
-               ::MakeItSo(storage->runnable_, CallbackForward(x1),
-                   CallbackForward(x2), CallbackForward(x3),
-                   CallbackForward(x4), CallbackForward(x5));
+    return InvokeHelper<
+        StorageType::IsWeakCall::value, R, typename StorageType::RunnableType,
+        void(typename Bound1UnwrapTraits::ForwardType,
+             typename CallbackParamTraits<X2>::ForwardType x2,
+             typename CallbackParamTraits<X3>::ForwardType x3,
+             typename CallbackParamTraits<X4>::ForwardType x4,
+             typename CallbackParamTraits<X5>::ForwardType
+                 x5)>::MakeItSo(storage->runnable_, CallbackForward(x1),
+                                CallbackForward(x2), CallbackForward(x3),
+                                CallbackForward(x4), CallbackForward(x5));
   }
 };
 
 // Arity 5 -> 3.
-template <typename StorageType, typename R,typename X1, typename X2,
-    typename X3, typename X4, typename X5>
+template <typename StorageType,
+          typename R,
+          typename X1,
+          typename X2,
+          typename X3,
+          typename X4,
+          typename X5>
 struct Invoker<2, StorageType, R(X1, X2, X3, X4, X5)> {
   typedef R(RunType)(BindStateBase*,
-      typename CallbackParamTraits<X3>::ForwardType,
-      typename CallbackParamTraits<X4>::ForwardType,
-      typename CallbackParamTraits<X5>::ForwardType);
+                     typename CallbackParamTraits<X3>::ForwardType,
+                     typename CallbackParamTraits<X4>::ForwardType,
+                     typename CallbackParamTraits<X5>::ForwardType);
 
   typedef R(UnboundRunType)(X3, X4, X5);
 
   static R Run(BindStateBase* base,
-      typename CallbackParamTraits<X3>::ForwardType x3,
-      typename CallbackParamTraits<X4>::ForwardType x4,
-      typename CallbackParamTraits<X5>::ForwardType x5) {
+               typename CallbackParamTraits<X3>::ForwardType x3,
+               typename CallbackParamTraits<X4>::ForwardType x4,
+               typename CallbackParamTraits<X5>::ForwardType x5) {
     StorageType* storage = static_cast<StorageType*>(base);
 
     // Local references to make debugger stepping easier. If in a debugger,
@@ -1695,32 +1882,37 @@ struct Invoker<2, StorageType, R(X1, X2, X3, X4, X5)> {
         Bound1UnwrapTraits::Unwrap(storage->p1_);
     typename Bound2UnwrapTraits::ForwardType x2 =
         Bound2UnwrapTraits::Unwrap(storage->p2_);
-    return InvokeHelper<StorageType::IsWeakCall::value, R,
-           typename StorageType::RunnableType,
-           void(typename Bound1UnwrapTraits::ForwardType,
-               typename Bound2UnwrapTraits::ForwardType,
-               typename CallbackParamTraits<X3>::ForwardType x3,
-               typename CallbackParamTraits<X4>::ForwardType x4,
-               typename CallbackParamTraits<X5>::ForwardType x5)>
-               ::MakeItSo(storage->runnable_, CallbackForward(x1),
-                   CallbackForward(x2), CallbackForward(x3),
-                   CallbackForward(x4), CallbackForward(x5));
+    return InvokeHelper<
+        StorageType::IsWeakCall::value, R, typename StorageType::RunnableType,
+        void(typename Bound1UnwrapTraits::ForwardType,
+             typename Bound2UnwrapTraits::ForwardType,
+             typename CallbackParamTraits<X3>::ForwardType x3,
+             typename CallbackParamTraits<X4>::ForwardType x4,
+             typename CallbackParamTraits<X5>::ForwardType
+                 x5)>::MakeItSo(storage->runnable_, CallbackForward(x1),
+                                CallbackForward(x2), CallbackForward(x3),
+                                CallbackForward(x4), CallbackForward(x5));
   }
 };
 
 // Arity 5 -> 2.
-template <typename StorageType, typename R,typename X1, typename X2,
-    typename X3, typename X4, typename X5>
+template <typename StorageType,
+          typename R,
+          typename X1,
+          typename X2,
+          typename X3,
+          typename X4,
+          typename X5>
 struct Invoker<3, StorageType, R(X1, X2, X3, X4, X5)> {
   typedef R(RunType)(BindStateBase*,
-      typename CallbackParamTraits<X4>::ForwardType,
-      typename CallbackParamTraits<X5>::ForwardType);
+                     typename CallbackParamTraits<X4>::ForwardType,
+                     typename CallbackParamTraits<X5>::ForwardType);
 
   typedef R(UnboundRunType)(X4, X5);
 
   static R Run(BindStateBase* base,
-      typename CallbackParamTraits<X4>::ForwardType x4,
-      typename CallbackParamTraits<X5>::ForwardType x5) {
+               typename CallbackParamTraits<X4>::ForwardType x4,
+               typename CallbackParamTraits<X5>::ForwardType x5) {
     StorageType* storage = static_cast<StorageType*>(base);
 
     // Local references to make debugger stepping easier. If in a debugger,
@@ -1736,30 +1928,35 @@ struct Invoker<3, StorageType, R(X1, X2, X3, X4, X5)> {
         Bound2UnwrapTraits::Unwrap(storage->p2_);
     typename Bound3UnwrapTraits::ForwardType x3 =
         Bound3UnwrapTraits::Unwrap(storage->p3_);
-    return InvokeHelper<StorageType::IsWeakCall::value, R,
-           typename StorageType::RunnableType,
-           void(typename Bound1UnwrapTraits::ForwardType,
-               typename Bound2UnwrapTraits::ForwardType,
-               typename Bound3UnwrapTraits::ForwardType,
-               typename CallbackParamTraits<X4>::ForwardType x4,
-               typename CallbackParamTraits<X5>::ForwardType x5)>
-               ::MakeItSo(storage->runnable_, CallbackForward(x1),
-                   CallbackForward(x2), CallbackForward(x3),
-                   CallbackForward(x4), CallbackForward(x5));
+    return InvokeHelper<
+        StorageType::IsWeakCall::value, R, typename StorageType::RunnableType,
+        void(typename Bound1UnwrapTraits::ForwardType,
+             typename Bound2UnwrapTraits::ForwardType,
+             typename Bound3UnwrapTraits::ForwardType,
+             typename CallbackParamTraits<X4>::ForwardType x4,
+             typename CallbackParamTraits<X5>::ForwardType
+                 x5)>::MakeItSo(storage->runnable_, CallbackForward(x1),
+                                CallbackForward(x2), CallbackForward(x3),
+                                CallbackForward(x4), CallbackForward(x5));
   }
 };
 
 // Arity 5 -> 1.
-template <typename StorageType, typename R,typename X1, typename X2,
-    typename X3, typename X4, typename X5>
+template <typename StorageType,
+          typename R,
+          typename X1,
+          typename X2,
+          typename X3,
+          typename X4,
+          typename X5>
 struct Invoker<4, StorageType, R(X1, X2, X3, X4, X5)> {
   typedef R(RunType)(BindStateBase*,
-      typename CallbackParamTraits<X5>::ForwardType);
+                     typename CallbackParamTraits<X5>::ForwardType);
 
   typedef R(UnboundRunType)(X5);
 
   static R Run(BindStateBase* base,
-      typename CallbackParamTraits<X5>::ForwardType x5) {
+               typename CallbackParamTraits<X5>::ForwardType x5) {
     StorageType* storage = static_cast<StorageType*>(base);
 
     // Local references to make debugger stepping easier. If in a debugger,
@@ -1778,22 +1975,27 @@ struct Invoker<4, StorageType, R(X1, X2, X3, X4, X5)> {
         Bound3UnwrapTraits::Unwrap(storage->p3_);
     typename Bound4UnwrapTraits::ForwardType x4 =
         Bound4UnwrapTraits::Unwrap(storage->p4_);
-    return InvokeHelper<StorageType::IsWeakCall::value, R,
-           typename StorageType::RunnableType,
-           void(typename Bound1UnwrapTraits::ForwardType,
-               typename Bound2UnwrapTraits::ForwardType,
-               typename Bound3UnwrapTraits::ForwardType,
-               typename Bound4UnwrapTraits::ForwardType,
-               typename CallbackParamTraits<X5>::ForwardType x5)>
-               ::MakeItSo(storage->runnable_, CallbackForward(x1),
-                   CallbackForward(x2), CallbackForward(x3),
-                   CallbackForward(x4), CallbackForward(x5));
+    return InvokeHelper<
+        StorageType::IsWeakCall::value, R, typename StorageType::RunnableType,
+        void(typename Bound1UnwrapTraits::ForwardType,
+             typename Bound2UnwrapTraits::ForwardType,
+             typename Bound3UnwrapTraits::ForwardType,
+             typename Bound4UnwrapTraits::ForwardType,
+             typename CallbackParamTraits<X5>::ForwardType
+                 x5)>::MakeItSo(storage->runnable_, CallbackForward(x1),
+                                CallbackForward(x2), CallbackForward(x3),
+                                CallbackForward(x4), CallbackForward(x5));
   }
 };
 
 // Arity 5 -> 0.
-template <typename StorageType, typename R,typename X1, typename X2,
-    typename X3, typename X4, typename X5>
+template <typename StorageType,
+          typename R,
+          typename X1,
+          typename X2,
+          typename X3,
+          typename X4,
+          typename X5>
 struct Invoker<5, StorageType, R(X1, X2, X3, X4, X5)> {
   typedef R(RunType)(BindStateBase*);
 
@@ -1822,79 +2024,90 @@ struct Invoker<5, StorageType, R(X1, X2, X3, X4, X5)> {
     typename Bound5UnwrapTraits::ForwardType x5 =
         Bound5UnwrapTraits::Unwrap(storage->p5_);
     return InvokeHelper<StorageType::IsWeakCall::value, R,
-           typename StorageType::RunnableType,
-           void(typename Bound1UnwrapTraits::ForwardType,
-               typename Bound2UnwrapTraits::ForwardType,
-               typename Bound3UnwrapTraits::ForwardType,
-               typename Bound4UnwrapTraits::ForwardType,
-               typename Bound5UnwrapTraits::ForwardType)>
-               ::MakeItSo(storage->runnable_, CallbackForward(x1),
-                   CallbackForward(x2), CallbackForward(x3),
-                   CallbackForward(x4), CallbackForward(x5));
+                        typename StorageType::RunnableType,
+                        void(typename Bound1UnwrapTraits::ForwardType,
+                             typename Bound2UnwrapTraits::ForwardType,
+                             typename Bound3UnwrapTraits::ForwardType,
+                             typename Bound4UnwrapTraits::ForwardType,
+                             typename Bound5UnwrapTraits::ForwardType)>::
+        MakeItSo(storage->runnable_, CallbackForward(x1), CallbackForward(x2),
+                 CallbackForward(x3), CallbackForward(x4), CallbackForward(x5));
   }
 };
 
 // Arity 6 -> 6.
-template <typename StorageType, typename R,typename X1, typename X2,
-    typename X3, typename X4, typename X5, typename X6>
+template <typename StorageType,
+          typename R,
+          typename X1,
+          typename X2,
+          typename X3,
+          typename X4,
+          typename X5,
+          typename X6>
 struct Invoker<0, StorageType, R(X1, X2, X3, X4, X5, X6)> {
   typedef R(RunType)(BindStateBase*,
-      typename CallbackParamTraits<X1>::ForwardType,
-      typename CallbackParamTraits<X2>::ForwardType,
-      typename CallbackParamTraits<X3>::ForwardType,
-      typename CallbackParamTraits<X4>::ForwardType,
-      typename CallbackParamTraits<X5>::ForwardType,
-      typename CallbackParamTraits<X6>::ForwardType);
+                     typename CallbackParamTraits<X1>::ForwardType,
+                     typename CallbackParamTraits<X2>::ForwardType,
+                     typename CallbackParamTraits<X3>::ForwardType,
+                     typename CallbackParamTraits<X4>::ForwardType,
+                     typename CallbackParamTraits<X5>::ForwardType,
+                     typename CallbackParamTraits<X6>::ForwardType);
 
   typedef R(UnboundRunType)(X1, X2, X3, X4, X5, X6);
 
   static R Run(BindStateBase* base,
-      typename CallbackParamTraits<X1>::ForwardType x1,
-      typename CallbackParamTraits<X2>::ForwardType x2,
-      typename CallbackParamTraits<X3>::ForwardType x3,
-      typename CallbackParamTraits<X4>::ForwardType x4,
-      typename CallbackParamTraits<X5>::ForwardType x5,
-      typename CallbackParamTraits<X6>::ForwardType x6) {
+               typename CallbackParamTraits<X1>::ForwardType x1,
+               typename CallbackParamTraits<X2>::ForwardType x2,
+               typename CallbackParamTraits<X3>::ForwardType x3,
+               typename CallbackParamTraits<X4>::ForwardType x4,
+               typename CallbackParamTraits<X5>::ForwardType x5,
+               typename CallbackParamTraits<X6>::ForwardType x6) {
     StorageType* storage = static_cast<StorageType*>(base);
 
     // Local references to make debugger stepping easier. If in a debugger,
     // you really want to warp ahead and step through the
     // InvokeHelper<>::MakeItSo() call below.
 
-    return InvokeHelper<StorageType::IsWeakCall::value, R,
-           typename StorageType::RunnableType,
-           void(typename CallbackParamTraits<X1>::ForwardType x1,
-               typename CallbackParamTraits<X2>::ForwardType x2,
-               typename CallbackParamTraits<X3>::ForwardType x3,
-               typename CallbackParamTraits<X4>::ForwardType x4,
-               typename CallbackParamTraits<X5>::ForwardType x5,
-               typename CallbackParamTraits<X6>::ForwardType x6)>
-               ::MakeItSo(storage->runnable_, CallbackForward(x1),
-                   CallbackForward(x2), CallbackForward(x3),
-                   CallbackForward(x4), CallbackForward(x5),
-                   CallbackForward(x6));
+    return InvokeHelper<
+        StorageType::IsWeakCall::value, R, typename StorageType::RunnableType,
+        void(typename CallbackParamTraits<X1>::ForwardType x1,
+             typename CallbackParamTraits<X2>::ForwardType x2,
+             typename CallbackParamTraits<X3>::ForwardType x3,
+             typename CallbackParamTraits<X4>::ForwardType x4,
+             typename CallbackParamTraits<X5>::ForwardType x5,
+             typename CallbackParamTraits<X6>::ForwardType
+                 x6)>::MakeItSo(storage->runnable_, CallbackForward(x1),
+                                CallbackForward(x2), CallbackForward(x3),
+                                CallbackForward(x4), CallbackForward(x5),
+                                CallbackForward(x6));
   }
 };
 
 // Arity 6 -> 5.
-template <typename StorageType, typename R,typename X1, typename X2,
-    typename X3, typename X4, typename X5, typename X6>
+template <typename StorageType,
+          typename R,
+          typename X1,
+          typename X2,
+          typename X3,
+          typename X4,
+          typename X5,
+          typename X6>
 struct Invoker<1, StorageType, R(X1, X2, X3, X4, X5, X6)> {
   typedef R(RunType)(BindStateBase*,
-      typename CallbackParamTraits<X2>::ForwardType,
-      typename CallbackParamTraits<X3>::ForwardType,
-      typename CallbackParamTraits<X4>::ForwardType,
-      typename CallbackParamTraits<X5>::ForwardType,
-      typename CallbackParamTraits<X6>::ForwardType);
+                     typename CallbackParamTraits<X2>::ForwardType,
+                     typename CallbackParamTraits<X3>::ForwardType,
+                     typename CallbackParamTraits<X4>::ForwardType,
+                     typename CallbackParamTraits<X5>::ForwardType,
+                     typename CallbackParamTraits<X6>::ForwardType);
 
   typedef R(UnboundRunType)(X2, X3, X4, X5, X6);
 
   static R Run(BindStateBase* base,
-      typename CallbackParamTraits<X2>::ForwardType x2,
-      typename CallbackParamTraits<X3>::ForwardType x3,
-      typename CallbackParamTraits<X4>::ForwardType x4,
-      typename CallbackParamTraits<X5>::ForwardType x5,
-      typename CallbackParamTraits<X6>::ForwardType x6) {
+               typename CallbackParamTraits<X2>::ForwardType x2,
+               typename CallbackParamTraits<X3>::ForwardType x3,
+               typename CallbackParamTraits<X4>::ForwardType x4,
+               typename CallbackParamTraits<X5>::ForwardType x5,
+               typename CallbackParamTraits<X6>::ForwardType x6) {
     StorageType* storage = static_cast<StorageType*>(base);
 
     // Local references to make debugger stepping easier. If in a debugger,
@@ -1904,38 +2117,44 @@ struct Invoker<1, StorageType, R(X1, X2, X3, X4, X5, X6)> {
 
     typename Bound1UnwrapTraits::ForwardType x1 =
         Bound1UnwrapTraits::Unwrap(storage->p1_);
-    return InvokeHelper<StorageType::IsWeakCall::value, R,
-           typename StorageType::RunnableType,
-           void(typename Bound1UnwrapTraits::ForwardType,
-               typename CallbackParamTraits<X2>::ForwardType x2,
-               typename CallbackParamTraits<X3>::ForwardType x3,
-               typename CallbackParamTraits<X4>::ForwardType x4,
-               typename CallbackParamTraits<X5>::ForwardType x5,
-               typename CallbackParamTraits<X6>::ForwardType x6)>
-               ::MakeItSo(storage->runnable_, CallbackForward(x1),
-                   CallbackForward(x2), CallbackForward(x3),
-                   CallbackForward(x4), CallbackForward(x5),
-                   CallbackForward(x6));
+    return InvokeHelper<
+        StorageType::IsWeakCall::value, R, typename StorageType::RunnableType,
+        void(typename Bound1UnwrapTraits::ForwardType,
+             typename CallbackParamTraits<X2>::ForwardType x2,
+             typename CallbackParamTraits<X3>::ForwardType x3,
+             typename CallbackParamTraits<X4>::ForwardType x4,
+             typename CallbackParamTraits<X5>::ForwardType x5,
+             typename CallbackParamTraits<X6>::ForwardType
+                 x6)>::MakeItSo(storage->runnable_, CallbackForward(x1),
+                                CallbackForward(x2), CallbackForward(x3),
+                                CallbackForward(x4), CallbackForward(x5),
+                                CallbackForward(x6));
   }
 };
 
 // Arity 6 -> 4.
-template <typename StorageType, typename R,typename X1, typename X2,
-    typename X3, typename X4, typename X5, typename X6>
+template <typename StorageType,
+          typename R,
+          typename X1,
+          typename X2,
+          typename X3,
+          typename X4,
+          typename X5,
+          typename X6>
 struct Invoker<2, StorageType, R(X1, X2, X3, X4, X5, X6)> {
   typedef R(RunType)(BindStateBase*,
-      typename CallbackParamTraits<X3>::ForwardType,
-      typename CallbackParamTraits<X4>::ForwardType,
-      typename CallbackParamTraits<X5>::ForwardType,
-      typename CallbackParamTraits<X6>::ForwardType);
+                     typename CallbackParamTraits<X3>::ForwardType,
+                     typename CallbackParamTraits<X4>::ForwardType,
+                     typename CallbackParamTraits<X5>::ForwardType,
+                     typename CallbackParamTraits<X6>::ForwardType);
 
   typedef R(UnboundRunType)(X3, X4, X5, X6);
 
   static R Run(BindStateBase* base,
-      typename CallbackParamTraits<X3>::ForwardType x3,
-      typename CallbackParamTraits<X4>::ForwardType x4,
-      typename CallbackParamTraits<X5>::ForwardType x5,
-      typename CallbackParamTraits<X6>::ForwardType x6) {
+               typename CallbackParamTraits<X3>::ForwardType x3,
+               typename CallbackParamTraits<X4>::ForwardType x4,
+               typename CallbackParamTraits<X5>::ForwardType x5,
+               typename CallbackParamTraits<X6>::ForwardType x6) {
     StorageType* storage = static_cast<StorageType*>(base);
 
     // Local references to make debugger stepping easier. If in a debugger,
@@ -1948,36 +2167,42 @@ struct Invoker<2, StorageType, R(X1, X2, X3, X4, X5, X6)> {
         Bound1UnwrapTraits::Unwrap(storage->p1_);
     typename Bound2UnwrapTraits::ForwardType x2 =
         Bound2UnwrapTraits::Unwrap(storage->p2_);
-    return InvokeHelper<StorageType::IsWeakCall::value, R,
-           typename StorageType::RunnableType,
-           void(typename Bound1UnwrapTraits::ForwardType,
-               typename Bound2UnwrapTraits::ForwardType,
-               typename CallbackParamTraits<X3>::ForwardType x3,
-               typename CallbackParamTraits<X4>::ForwardType x4,
-               typename CallbackParamTraits<X5>::ForwardType x5,
-               typename CallbackParamTraits<X6>::ForwardType x6)>
-               ::MakeItSo(storage->runnable_, CallbackForward(x1),
-                   CallbackForward(x2), CallbackForward(x3),
-                   CallbackForward(x4), CallbackForward(x5),
-                   CallbackForward(x6));
+    return InvokeHelper<
+        StorageType::IsWeakCall::value, R, typename StorageType::RunnableType,
+        void(typename Bound1UnwrapTraits::ForwardType,
+             typename Bound2UnwrapTraits::ForwardType,
+             typename CallbackParamTraits<X3>::ForwardType x3,
+             typename CallbackParamTraits<X4>::ForwardType x4,
+             typename CallbackParamTraits<X5>::ForwardType x5,
+             typename CallbackParamTraits<X6>::ForwardType
+                 x6)>::MakeItSo(storage->runnable_, CallbackForward(x1),
+                                CallbackForward(x2), CallbackForward(x3),
+                                CallbackForward(x4), CallbackForward(x5),
+                                CallbackForward(x6));
   }
 };
 
 // Arity 6 -> 3.
-template <typename StorageType, typename R,typename X1, typename X2,
-    typename X3, typename X4, typename X5, typename X6>
+template <typename StorageType,
+          typename R,
+          typename X1,
+          typename X2,
+          typename X3,
+          typename X4,
+          typename X5,
+          typename X6>
 struct Invoker<3, StorageType, R(X1, X2, X3, X4, X5, X6)> {
   typedef R(RunType)(BindStateBase*,
-      typename CallbackParamTraits<X4>::ForwardType,
-      typename CallbackParamTraits<X5>::ForwardType,
-      typename CallbackParamTraits<X6>::ForwardType);
+                     typename CallbackParamTraits<X4>::ForwardType,
+                     typename CallbackParamTraits<X5>::ForwardType,
+                     typename CallbackParamTraits<X6>::ForwardType);
 
   typedef R(UnboundRunType)(X4, X5, X6);
 
   static R Run(BindStateBase* base,
-      typename CallbackParamTraits<X4>::ForwardType x4,
-      typename CallbackParamTraits<X5>::ForwardType x5,
-      typename CallbackParamTraits<X6>::ForwardType x6) {
+               typename CallbackParamTraits<X4>::ForwardType x4,
+               typename CallbackParamTraits<X5>::ForwardType x5,
+               typename CallbackParamTraits<X6>::ForwardType x6) {
     StorageType* storage = static_cast<StorageType*>(base);
 
     // Local references to make debugger stepping easier. If in a debugger,
@@ -1993,34 +2218,40 @@ struct Invoker<3, StorageType, R(X1, X2, X3, X4, X5, X6)> {
         Bound2UnwrapTraits::Unwrap(storage->p2_);
     typename Bound3UnwrapTraits::ForwardType x3 =
         Bound3UnwrapTraits::Unwrap(storage->p3_);
-    return InvokeHelper<StorageType::IsWeakCall::value, R,
-           typename StorageType::RunnableType,
-           void(typename Bound1UnwrapTraits::ForwardType,
-               typename Bound2UnwrapTraits::ForwardType,
-               typename Bound3UnwrapTraits::ForwardType,
-               typename CallbackParamTraits<X4>::ForwardType x4,
-               typename CallbackParamTraits<X5>::ForwardType x5,
-               typename CallbackParamTraits<X6>::ForwardType x6)>
-               ::MakeItSo(storage->runnable_, CallbackForward(x1),
-                   CallbackForward(x2), CallbackForward(x3),
-                   CallbackForward(x4), CallbackForward(x5),
-                   CallbackForward(x6));
+    return InvokeHelper<
+        StorageType::IsWeakCall::value, R, typename StorageType::RunnableType,
+        void(typename Bound1UnwrapTraits::ForwardType,
+             typename Bound2UnwrapTraits::ForwardType,
+             typename Bound3UnwrapTraits::ForwardType,
+             typename CallbackParamTraits<X4>::ForwardType x4,
+             typename CallbackParamTraits<X5>::ForwardType x5,
+             typename CallbackParamTraits<X6>::ForwardType
+                 x6)>::MakeItSo(storage->runnable_, CallbackForward(x1),
+                                CallbackForward(x2), CallbackForward(x3),
+                                CallbackForward(x4), CallbackForward(x5),
+                                CallbackForward(x6));
   }
 };
 
 // Arity 6 -> 2.
-template <typename StorageType, typename R,typename X1, typename X2,
-    typename X3, typename X4, typename X5, typename X6>
+template <typename StorageType,
+          typename R,
+          typename X1,
+          typename X2,
+          typename X3,
+          typename X4,
+          typename X5,
+          typename X6>
 struct Invoker<4, StorageType, R(X1, X2, X3, X4, X5, X6)> {
   typedef R(RunType)(BindStateBase*,
-      typename CallbackParamTraits<X5>::ForwardType,
-      typename CallbackParamTraits<X6>::ForwardType);
+                     typename CallbackParamTraits<X5>::ForwardType,
+                     typename CallbackParamTraits<X6>::ForwardType);
 
   typedef R(UnboundRunType)(X5, X6);
 
   static R Run(BindStateBase* base,
-      typename CallbackParamTraits<X5>::ForwardType x5,
-      typename CallbackParamTraits<X6>::ForwardType x6) {
+               typename CallbackParamTraits<X5>::ForwardType x5,
+               typename CallbackParamTraits<X6>::ForwardType x6) {
     StorageType* storage = static_cast<StorageType*>(base);
 
     // Local references to make debugger stepping easier. If in a debugger,
@@ -2039,32 +2270,38 @@ struct Invoker<4, StorageType, R(X1, X2, X3, X4, X5, X6)> {
         Bound3UnwrapTraits::Unwrap(storage->p3_);
     typename Bound4UnwrapTraits::ForwardType x4 =
         Bound4UnwrapTraits::Unwrap(storage->p4_);
-    return InvokeHelper<StorageType::IsWeakCall::value, R,
-           typename StorageType::RunnableType,
-           void(typename Bound1UnwrapTraits::ForwardType,
-               typename Bound2UnwrapTraits::ForwardType,
-               typename Bound3UnwrapTraits::ForwardType,
-               typename Bound4UnwrapTraits::ForwardType,
-               typename CallbackParamTraits<X5>::ForwardType x5,
-               typename CallbackParamTraits<X6>::ForwardType x6)>
-               ::MakeItSo(storage->runnable_, CallbackForward(x1),
-                   CallbackForward(x2), CallbackForward(x3),
-                   CallbackForward(x4), CallbackForward(x5),
-                   CallbackForward(x6));
+    return InvokeHelper<
+        StorageType::IsWeakCall::value, R, typename StorageType::RunnableType,
+        void(typename Bound1UnwrapTraits::ForwardType,
+             typename Bound2UnwrapTraits::ForwardType,
+             typename Bound3UnwrapTraits::ForwardType,
+             typename Bound4UnwrapTraits::ForwardType,
+             typename CallbackParamTraits<X5>::ForwardType x5,
+             typename CallbackParamTraits<X6>::ForwardType
+                 x6)>::MakeItSo(storage->runnable_, CallbackForward(x1),
+                                CallbackForward(x2), CallbackForward(x3),
+                                CallbackForward(x4), CallbackForward(x5),
+                                CallbackForward(x6));
   }
 };
 
 // Arity 6 -> 1.
-template <typename StorageType, typename R,typename X1, typename X2,
-    typename X3, typename X4, typename X5, typename X6>
+template <typename StorageType,
+          typename R,
+          typename X1,
+          typename X2,
+          typename X3,
+          typename X4,
+          typename X5,
+          typename X6>
 struct Invoker<5, StorageType, R(X1, X2, X3, X4, X5, X6)> {
   typedef R(RunType)(BindStateBase*,
-      typename CallbackParamTraits<X6>::ForwardType);
+                     typename CallbackParamTraits<X6>::ForwardType);
 
   typedef R(UnboundRunType)(X6);
 
   static R Run(BindStateBase* base,
-      typename CallbackParamTraits<X6>::ForwardType x6) {
+               typename CallbackParamTraits<X6>::ForwardType x6) {
     StorageType* storage = static_cast<StorageType*>(base);
 
     // Local references to make debugger stepping easier. If in a debugger,
@@ -2086,24 +2323,30 @@ struct Invoker<5, StorageType, R(X1, X2, X3, X4, X5, X6)> {
         Bound4UnwrapTraits::Unwrap(storage->p4_);
     typename Bound5UnwrapTraits::ForwardType x5 =
         Bound5UnwrapTraits::Unwrap(storage->p5_);
-    return InvokeHelper<StorageType::IsWeakCall::value, R,
-           typename StorageType::RunnableType,
-           void(typename Bound1UnwrapTraits::ForwardType,
-               typename Bound2UnwrapTraits::ForwardType,
-               typename Bound3UnwrapTraits::ForwardType,
-               typename Bound4UnwrapTraits::ForwardType,
-               typename Bound5UnwrapTraits::ForwardType,
-               typename CallbackParamTraits<X6>::ForwardType x6)>
-               ::MakeItSo(storage->runnable_, CallbackForward(x1),
-                   CallbackForward(x2), CallbackForward(x3),
-                   CallbackForward(x4), CallbackForward(x5),
-                   CallbackForward(x6));
+    return InvokeHelper<
+        StorageType::IsWeakCall::value, R, typename StorageType::RunnableType,
+        void(typename Bound1UnwrapTraits::ForwardType,
+             typename Bound2UnwrapTraits::ForwardType,
+             typename Bound3UnwrapTraits::ForwardType,
+             typename Bound4UnwrapTraits::ForwardType,
+             typename Bound5UnwrapTraits::ForwardType,
+             typename CallbackParamTraits<X6>::ForwardType
+                 x6)>::MakeItSo(storage->runnable_, CallbackForward(x1),
+                                CallbackForward(x2), CallbackForward(x3),
+                                CallbackForward(x4), CallbackForward(x5),
+                                CallbackForward(x6));
   }
 };
 
 // Arity 6 -> 0.
-template <typename StorageType, typename R,typename X1, typename X2,
-    typename X3, typename X4, typename X5, typename X6>
+template <typename StorageType,
+          typename R,
+          typename X1,
+          typename X2,
+          typename X3,
+          typename X4,
+          typename X5,
+          typename X6>
 struct Invoker<6, StorageType, R(X1, X2, X3, X4, X5, X6)> {
   typedef R(RunType)(BindStateBase*);
 
@@ -2135,86 +2378,99 @@ struct Invoker<6, StorageType, R(X1, X2, X3, X4, X5, X6)> {
     typename Bound6UnwrapTraits::ForwardType x6 =
         Bound6UnwrapTraits::Unwrap(storage->p6_);
     return InvokeHelper<StorageType::IsWeakCall::value, R,
-           typename StorageType::RunnableType,
-           void(typename Bound1UnwrapTraits::ForwardType,
-               typename Bound2UnwrapTraits::ForwardType,
-               typename Bound3UnwrapTraits::ForwardType,
-               typename Bound4UnwrapTraits::ForwardType,
-               typename Bound5UnwrapTraits::ForwardType,
-               typename Bound6UnwrapTraits::ForwardType)>
-               ::MakeItSo(storage->runnable_, CallbackForward(x1),
-                   CallbackForward(x2), CallbackForward(x3),
-                   CallbackForward(x4), CallbackForward(x5),
-                   CallbackForward(x6));
+                        typename StorageType::RunnableType,
+                        void(typename Bound1UnwrapTraits::ForwardType,
+                             typename Bound2UnwrapTraits::ForwardType,
+                             typename Bound3UnwrapTraits::ForwardType,
+                             typename Bound4UnwrapTraits::ForwardType,
+                             typename Bound5UnwrapTraits::ForwardType,
+                             typename Bound6UnwrapTraits::ForwardType)>::
+        MakeItSo(storage->runnable_, CallbackForward(x1), CallbackForward(x2),
+                 CallbackForward(x3), CallbackForward(x4), CallbackForward(x5),
+                 CallbackForward(x6));
   }
 };
 
 // Arity 7 -> 7.
-template <typename StorageType, typename R,typename X1, typename X2,
-    typename X3, typename X4, typename X5, typename X6, typename X7>
+template <typename StorageType,
+          typename R,
+          typename X1,
+          typename X2,
+          typename X3,
+          typename X4,
+          typename X5,
+          typename X6,
+          typename X7>
 struct Invoker<0, StorageType, R(X1, X2, X3, X4, X5, X6, X7)> {
   typedef R(RunType)(BindStateBase*,
-      typename CallbackParamTraits<X1>::ForwardType,
-      typename CallbackParamTraits<X2>::ForwardType,
-      typename CallbackParamTraits<X3>::ForwardType,
-      typename CallbackParamTraits<X4>::ForwardType,
-      typename CallbackParamTraits<X5>::ForwardType,
-      typename CallbackParamTraits<X6>::ForwardType,
-      typename CallbackParamTraits<X7>::ForwardType);
+                     typename CallbackParamTraits<X1>::ForwardType,
+                     typename CallbackParamTraits<X2>::ForwardType,
+                     typename CallbackParamTraits<X3>::ForwardType,
+                     typename CallbackParamTraits<X4>::ForwardType,
+                     typename CallbackParamTraits<X5>::ForwardType,
+                     typename CallbackParamTraits<X6>::ForwardType,
+                     typename CallbackParamTraits<X7>::ForwardType);
 
   typedef R(UnboundRunType)(X1, X2, X3, X4, X5, X6, X7);
 
   static R Run(BindStateBase* base,
-      typename CallbackParamTraits<X1>::ForwardType x1,
-      typename CallbackParamTraits<X2>::ForwardType x2,
-      typename CallbackParamTraits<X3>::ForwardType x3,
-      typename CallbackParamTraits<X4>::ForwardType x4,
-      typename CallbackParamTraits<X5>::ForwardType x5,
-      typename CallbackParamTraits<X6>::ForwardType x6,
-      typename CallbackParamTraits<X7>::ForwardType x7) {
+               typename CallbackParamTraits<X1>::ForwardType x1,
+               typename CallbackParamTraits<X2>::ForwardType x2,
+               typename CallbackParamTraits<X3>::ForwardType x3,
+               typename CallbackParamTraits<X4>::ForwardType x4,
+               typename CallbackParamTraits<X5>::ForwardType x5,
+               typename CallbackParamTraits<X6>::ForwardType x6,
+               typename CallbackParamTraits<X7>::ForwardType x7) {
     StorageType* storage = static_cast<StorageType*>(base);
 
     // Local references to make debugger stepping easier. If in a debugger,
     // you really want to warp ahead and step through the
     // InvokeHelper<>::MakeItSo() call below.
 
-    return InvokeHelper<StorageType::IsWeakCall::value, R,
-           typename StorageType::RunnableType,
-           void(typename CallbackParamTraits<X1>::ForwardType x1,
-               typename CallbackParamTraits<X2>::ForwardType x2,
-               typename CallbackParamTraits<X3>::ForwardType x3,
-               typename CallbackParamTraits<X4>::ForwardType x4,
-               typename CallbackParamTraits<X5>::ForwardType x5,
-               typename CallbackParamTraits<X6>::ForwardType x6,
-               typename CallbackParamTraits<X7>::ForwardType x7)>
-               ::MakeItSo(storage->runnable_, CallbackForward(x1),
-                   CallbackForward(x2), CallbackForward(x3),
-                   CallbackForward(x4), CallbackForward(x5),
-                   CallbackForward(x6), CallbackForward(x7));
+    return InvokeHelper<
+        StorageType::IsWeakCall::value, R, typename StorageType::RunnableType,
+        void(typename CallbackParamTraits<X1>::ForwardType x1,
+             typename CallbackParamTraits<X2>::ForwardType x2,
+             typename CallbackParamTraits<X3>::ForwardType x3,
+             typename CallbackParamTraits<X4>::ForwardType x4,
+             typename CallbackParamTraits<X5>::ForwardType x5,
+             typename CallbackParamTraits<X6>::ForwardType x6,
+             typename CallbackParamTraits<X7>::ForwardType
+                 x7)>::MakeItSo(storage->runnable_, CallbackForward(x1),
+                                CallbackForward(x2), CallbackForward(x3),
+                                CallbackForward(x4), CallbackForward(x5),
+                                CallbackForward(x6), CallbackForward(x7));
   }
 };
 
 // Arity 7 -> 6.
-template <typename StorageType, typename R,typename X1, typename X2,
-    typename X3, typename X4, typename X5, typename X6, typename X7>
+template <typename StorageType,
+          typename R,
+          typename X1,
+          typename X2,
+          typename X3,
+          typename X4,
+          typename X5,
+          typename X6,
+          typename X7>
 struct Invoker<1, StorageType, R(X1, X2, X3, X4, X5, X6, X7)> {
   typedef R(RunType)(BindStateBase*,
-      typename CallbackParamTraits<X2>::ForwardType,
-      typename CallbackParamTraits<X3>::ForwardType,
-      typename CallbackParamTraits<X4>::ForwardType,
-      typename CallbackParamTraits<X5>::ForwardType,
-      typename CallbackParamTraits<X6>::ForwardType,
-      typename CallbackParamTraits<X7>::ForwardType);
+                     typename CallbackParamTraits<X2>::ForwardType,
+                     typename CallbackParamTraits<X3>::ForwardType,
+                     typename CallbackParamTraits<X4>::ForwardType,
+                     typename CallbackParamTraits<X5>::ForwardType,
+                     typename CallbackParamTraits<X6>::ForwardType,
+                     typename CallbackParamTraits<X7>::ForwardType);
 
   typedef R(UnboundRunType)(X2, X3, X4, X5, X6, X7);
 
   static R Run(BindStateBase* base,
-      typename CallbackParamTraits<X2>::ForwardType x2,
-      typename CallbackParamTraits<X3>::ForwardType x3,
-      typename CallbackParamTraits<X4>::ForwardType x4,
-      typename CallbackParamTraits<X5>::ForwardType x5,
-      typename CallbackParamTraits<X6>::ForwardType x6,
-      typename CallbackParamTraits<X7>::ForwardType x7) {
+               typename CallbackParamTraits<X2>::ForwardType x2,
+               typename CallbackParamTraits<X3>::ForwardType x3,
+               typename CallbackParamTraits<X4>::ForwardType x4,
+               typename CallbackParamTraits<X5>::ForwardType x5,
+               typename CallbackParamTraits<X6>::ForwardType x6,
+               typename CallbackParamTraits<X7>::ForwardType x7) {
     StorageType* storage = static_cast<StorageType*>(base);
 
     // Local references to make debugger stepping easier. If in a debugger,
@@ -2224,41 +2480,48 @@ struct Invoker<1, StorageType, R(X1, X2, X3, X4, X5, X6, X7)> {
 
     typename Bound1UnwrapTraits::ForwardType x1 =
         Bound1UnwrapTraits::Unwrap(storage->p1_);
-    return InvokeHelper<StorageType::IsWeakCall::value, R,
-           typename StorageType::RunnableType,
-           void(typename Bound1UnwrapTraits::ForwardType,
-               typename CallbackParamTraits<X2>::ForwardType x2,
-               typename CallbackParamTraits<X3>::ForwardType x3,
-               typename CallbackParamTraits<X4>::ForwardType x4,
-               typename CallbackParamTraits<X5>::ForwardType x5,
-               typename CallbackParamTraits<X6>::ForwardType x6,
-               typename CallbackParamTraits<X7>::ForwardType x7)>
-               ::MakeItSo(storage->runnable_, CallbackForward(x1),
-                   CallbackForward(x2), CallbackForward(x3),
-                   CallbackForward(x4), CallbackForward(x5),
-                   CallbackForward(x6), CallbackForward(x7));
+    return InvokeHelper<
+        StorageType::IsWeakCall::value, R, typename StorageType::RunnableType,
+        void(typename Bound1UnwrapTraits::ForwardType,
+             typename CallbackParamTraits<X2>::ForwardType x2,
+             typename CallbackParamTraits<X3>::ForwardType x3,
+             typename CallbackParamTraits<X4>::ForwardType x4,
+             typename CallbackParamTraits<X5>::ForwardType x5,
+             typename CallbackParamTraits<X6>::ForwardType x6,
+             typename CallbackParamTraits<X7>::ForwardType
+                 x7)>::MakeItSo(storage->runnable_, CallbackForward(x1),
+                                CallbackForward(x2), CallbackForward(x3),
+                                CallbackForward(x4), CallbackForward(x5),
+                                CallbackForward(x6), CallbackForward(x7));
   }
 };
 
 // Arity 7 -> 5.
-template <typename StorageType, typename R,typename X1, typename X2,
-    typename X3, typename X4, typename X5, typename X6, typename X7>
+template <typename StorageType,
+          typename R,
+          typename X1,
+          typename X2,
+          typename X3,
+          typename X4,
+          typename X5,
+          typename X6,
+          typename X7>
 struct Invoker<2, StorageType, R(X1, X2, X3, X4, X5, X6, X7)> {
   typedef R(RunType)(BindStateBase*,
-      typename CallbackParamTraits<X3>::ForwardType,
-      typename CallbackParamTraits<X4>::ForwardType,
-      typename CallbackParamTraits<X5>::ForwardType,
-      typename CallbackParamTraits<X6>::ForwardType,
-      typename CallbackParamTraits<X7>::ForwardType);
+                     typename CallbackParamTraits<X3>::ForwardType,
+                     typename CallbackParamTraits<X4>::ForwardType,
+                     typename CallbackParamTraits<X5>::ForwardType,
+                     typename CallbackParamTraits<X6>::ForwardType,
+                     typename CallbackParamTraits<X7>::ForwardType);
 
   typedef R(UnboundRunType)(X3, X4, X5, X6, X7);
 
   static R Run(BindStateBase* base,
-      typename CallbackParamTraits<X3>::ForwardType x3,
-      typename CallbackParamTraits<X4>::ForwardType x4,
-      typename CallbackParamTraits<X5>::ForwardType x5,
-      typename CallbackParamTraits<X6>::ForwardType x6,
-      typename CallbackParamTraits<X7>::ForwardType x7) {
+               typename CallbackParamTraits<X3>::ForwardType x3,
+               typename CallbackParamTraits<X4>::ForwardType x4,
+               typename CallbackParamTraits<X5>::ForwardType x5,
+               typename CallbackParamTraits<X6>::ForwardType x6,
+               typename CallbackParamTraits<X7>::ForwardType x7) {
     StorageType* storage = static_cast<StorageType*>(base);
 
     // Local references to make debugger stepping easier. If in a debugger,
@@ -2271,39 +2534,46 @@ struct Invoker<2, StorageType, R(X1, X2, X3, X4, X5, X6, X7)> {
         Bound1UnwrapTraits::Unwrap(storage->p1_);
     typename Bound2UnwrapTraits::ForwardType x2 =
         Bound2UnwrapTraits::Unwrap(storage->p2_);
-    return InvokeHelper<StorageType::IsWeakCall::value, R,
-           typename StorageType::RunnableType,
-           void(typename Bound1UnwrapTraits::ForwardType,
-               typename Bound2UnwrapTraits::ForwardType,
-               typename CallbackParamTraits<X3>::ForwardType x3,
-               typename CallbackParamTraits<X4>::ForwardType x4,
-               typename CallbackParamTraits<X5>::ForwardType x5,
-               typename CallbackParamTraits<X6>::ForwardType x6,
-               typename CallbackParamTraits<X7>::ForwardType x7)>
-               ::MakeItSo(storage->runnable_, CallbackForward(x1),
-                   CallbackForward(x2), CallbackForward(x3),
-                   CallbackForward(x4), CallbackForward(x5),
-                   CallbackForward(x6), CallbackForward(x7));
+    return InvokeHelper<
+        StorageType::IsWeakCall::value, R, typename StorageType::RunnableType,
+        void(typename Bound1UnwrapTraits::ForwardType,
+             typename Bound2UnwrapTraits::ForwardType,
+             typename CallbackParamTraits<X3>::ForwardType x3,
+             typename CallbackParamTraits<X4>::ForwardType x4,
+             typename CallbackParamTraits<X5>::ForwardType x5,
+             typename CallbackParamTraits<X6>::ForwardType x6,
+             typename CallbackParamTraits<X7>::ForwardType
+                 x7)>::MakeItSo(storage->runnable_, CallbackForward(x1),
+                                CallbackForward(x2), CallbackForward(x3),
+                                CallbackForward(x4), CallbackForward(x5),
+                                CallbackForward(x6), CallbackForward(x7));
   }
 };
 
 // Arity 7 -> 4.
-template <typename StorageType, typename R,typename X1, typename X2,
-    typename X3, typename X4, typename X5, typename X6, typename X7>
+template <typename StorageType,
+          typename R,
+          typename X1,
+          typename X2,
+          typename X3,
+          typename X4,
+          typename X5,
+          typename X6,
+          typename X7>
 struct Invoker<3, StorageType, R(X1, X2, X3, X4, X5, X6, X7)> {
   typedef R(RunType)(BindStateBase*,
-      typename CallbackParamTraits<X4>::ForwardType,
-      typename CallbackParamTraits<X5>::ForwardType,
-      typename CallbackParamTraits<X6>::ForwardType,
-      typename CallbackParamTraits<X7>::ForwardType);
+                     typename CallbackParamTraits<X4>::ForwardType,
+                     typename CallbackParamTraits<X5>::ForwardType,
+                     typename CallbackParamTraits<X6>::ForwardType,
+                     typename CallbackParamTraits<X7>::ForwardType);
 
   typedef R(UnboundRunType)(X4, X5, X6, X7);
 
   static R Run(BindStateBase* base,
-      typename CallbackParamTraits<X4>::ForwardType x4,
-      typename CallbackParamTraits<X5>::ForwardType x5,
-      typename CallbackParamTraits<X6>::ForwardType x6,
-      typename CallbackParamTraits<X7>::ForwardType x7) {
+               typename CallbackParamTraits<X4>::ForwardType x4,
+               typename CallbackParamTraits<X5>::ForwardType x5,
+               typename CallbackParamTraits<X6>::ForwardType x6,
+               typename CallbackParamTraits<X7>::ForwardType x7) {
     StorageType* storage = static_cast<StorageType*>(base);
 
     // Local references to make debugger stepping easier. If in a debugger,
@@ -2319,37 +2589,44 @@ struct Invoker<3, StorageType, R(X1, X2, X3, X4, X5, X6, X7)> {
         Bound2UnwrapTraits::Unwrap(storage->p2_);
     typename Bound3UnwrapTraits::ForwardType x3 =
         Bound3UnwrapTraits::Unwrap(storage->p3_);
-    return InvokeHelper<StorageType::IsWeakCall::value, R,
-           typename StorageType::RunnableType,
-           void(typename Bound1UnwrapTraits::ForwardType,
-               typename Bound2UnwrapTraits::ForwardType,
-               typename Bound3UnwrapTraits::ForwardType,
-               typename CallbackParamTraits<X4>::ForwardType x4,
-               typename CallbackParamTraits<X5>::ForwardType x5,
-               typename CallbackParamTraits<X6>::ForwardType x6,
-               typename CallbackParamTraits<X7>::ForwardType x7)>
-               ::MakeItSo(storage->runnable_, CallbackForward(x1),
-                   CallbackForward(x2), CallbackForward(x3),
-                   CallbackForward(x4), CallbackForward(x5),
-                   CallbackForward(x6), CallbackForward(x7));
+    return InvokeHelper<
+        StorageType::IsWeakCall::value, R, typename StorageType::RunnableType,
+        void(typename Bound1UnwrapTraits::ForwardType,
+             typename Bound2UnwrapTraits::ForwardType,
+             typename Bound3UnwrapTraits::ForwardType,
+             typename CallbackParamTraits<X4>::ForwardType x4,
+             typename CallbackParamTraits<X5>::ForwardType x5,
+             typename CallbackParamTraits<X6>::ForwardType x6,
+             typename CallbackParamTraits<X7>::ForwardType
+                 x7)>::MakeItSo(storage->runnable_, CallbackForward(x1),
+                                CallbackForward(x2), CallbackForward(x3),
+                                CallbackForward(x4), CallbackForward(x5),
+                                CallbackForward(x6), CallbackForward(x7));
   }
 };
 
 // Arity 7 -> 3.
-template <typename StorageType, typename R,typename X1, typename X2,
-    typename X3, typename X4, typename X5, typename X6, typename X7>
+template <typename StorageType,
+          typename R,
+          typename X1,
+          typename X2,
+          typename X3,
+          typename X4,
+          typename X5,
+          typename X6,
+          typename X7>
 struct Invoker<4, StorageType, R(X1, X2, X3, X4, X5, X6, X7)> {
   typedef R(RunType)(BindStateBase*,
-      typename CallbackParamTraits<X5>::ForwardType,
-      typename CallbackParamTraits<X6>::ForwardType,
-      typename CallbackParamTraits<X7>::ForwardType);
+                     typename CallbackParamTraits<X5>::ForwardType,
+                     typename CallbackParamTraits<X6>::ForwardType,
+                     typename CallbackParamTraits<X7>::ForwardType);
 
   typedef R(UnboundRunType)(X5, X6, X7);
 
   static R Run(BindStateBase* base,
-      typename CallbackParamTraits<X5>::ForwardType x5,
-      typename CallbackParamTraits<X6>::ForwardType x6,
-      typename CallbackParamTraits<X7>::ForwardType x7) {
+               typename CallbackParamTraits<X5>::ForwardType x5,
+               typename CallbackParamTraits<X6>::ForwardType x6,
+               typename CallbackParamTraits<X7>::ForwardType x7) {
     StorageType* storage = static_cast<StorageType*>(base);
 
     // Local references to make debugger stepping easier. If in a debugger,
@@ -2368,35 +2645,42 @@ struct Invoker<4, StorageType, R(X1, X2, X3, X4, X5, X6, X7)> {
         Bound3UnwrapTraits::Unwrap(storage->p3_);
     typename Bound4UnwrapTraits::ForwardType x4 =
         Bound4UnwrapTraits::Unwrap(storage->p4_);
-    return InvokeHelper<StorageType::IsWeakCall::value, R,
-           typename StorageType::RunnableType,
-           void(typename Bound1UnwrapTraits::ForwardType,
-               typename Bound2UnwrapTraits::ForwardType,
-               typename Bound3UnwrapTraits::ForwardType,
-               typename Bound4UnwrapTraits::ForwardType,
-               typename CallbackParamTraits<X5>::ForwardType x5,
-               typename CallbackParamTraits<X6>::ForwardType x6,
-               typename CallbackParamTraits<X7>::ForwardType x7)>
-               ::MakeItSo(storage->runnable_, CallbackForward(x1),
-                   CallbackForward(x2), CallbackForward(x3),
-                   CallbackForward(x4), CallbackForward(x5),
-                   CallbackForward(x6), CallbackForward(x7));
+    return InvokeHelper<
+        StorageType::IsWeakCall::value, R, typename StorageType::RunnableType,
+        void(typename Bound1UnwrapTraits::ForwardType,
+             typename Bound2UnwrapTraits::ForwardType,
+             typename Bound3UnwrapTraits::ForwardType,
+             typename Bound4UnwrapTraits::ForwardType,
+             typename CallbackParamTraits<X5>::ForwardType x5,
+             typename CallbackParamTraits<X6>::ForwardType x6,
+             typename CallbackParamTraits<X7>::ForwardType
+                 x7)>::MakeItSo(storage->runnable_, CallbackForward(x1),
+                                CallbackForward(x2), CallbackForward(x3),
+                                CallbackForward(x4), CallbackForward(x5),
+                                CallbackForward(x6), CallbackForward(x7));
   }
 };
 
 // Arity 7 -> 2.
-template <typename StorageType, typename R,typename X1, typename X2,
-    typename X3, typename X4, typename X5, typename X6, typename X7>
+template <typename StorageType,
+          typename R,
+          typename X1,
+          typename X2,
+          typename X3,
+          typename X4,
+          typename X5,
+          typename X6,
+          typename X7>
 struct Invoker<5, StorageType, R(X1, X2, X3, X4, X5, X6, X7)> {
   typedef R(RunType)(BindStateBase*,
-      typename CallbackParamTraits<X6>::ForwardType,
-      typename CallbackParamTraits<X7>::ForwardType);
+                     typename CallbackParamTraits<X6>::ForwardType,
+                     typename CallbackParamTraits<X7>::ForwardType);
 
   typedef R(UnboundRunType)(X6, X7);
 
   static R Run(BindStateBase* base,
-      typename CallbackParamTraits<X6>::ForwardType x6,
-      typename CallbackParamTraits<X7>::ForwardType x7) {
+               typename CallbackParamTraits<X6>::ForwardType x6,
+               typename CallbackParamTraits<X7>::ForwardType x7) {
     StorageType* storage = static_cast<StorageType*>(base);
 
     // Local references to make debugger stepping easier. If in a debugger,
@@ -2418,33 +2702,40 @@ struct Invoker<5, StorageType, R(X1, X2, X3, X4, X5, X6, X7)> {
         Bound4UnwrapTraits::Unwrap(storage->p4_);
     typename Bound5UnwrapTraits::ForwardType x5 =
         Bound5UnwrapTraits::Unwrap(storage->p5_);
-    return InvokeHelper<StorageType::IsWeakCall::value, R,
-           typename StorageType::RunnableType,
-           void(typename Bound1UnwrapTraits::ForwardType,
-               typename Bound2UnwrapTraits::ForwardType,
-               typename Bound3UnwrapTraits::ForwardType,
-               typename Bound4UnwrapTraits::ForwardType,
-               typename Bound5UnwrapTraits::ForwardType,
-               typename CallbackParamTraits<X6>::ForwardType x6,
-               typename CallbackParamTraits<X7>::ForwardType x7)>
-               ::MakeItSo(storage->runnable_, CallbackForward(x1),
-                   CallbackForward(x2), CallbackForward(x3),
-                   CallbackForward(x4), CallbackForward(x5),
-                   CallbackForward(x6), CallbackForward(x7));
+    return InvokeHelper<
+        StorageType::IsWeakCall::value, R, typename StorageType::RunnableType,
+        void(typename Bound1UnwrapTraits::ForwardType,
+             typename Bound2UnwrapTraits::ForwardType,
+             typename Bound3UnwrapTraits::ForwardType,
+             typename Bound4UnwrapTraits::ForwardType,
+             typename Bound5UnwrapTraits::ForwardType,
+             typename CallbackParamTraits<X6>::ForwardType x6,
+             typename CallbackParamTraits<X7>::ForwardType
+                 x7)>::MakeItSo(storage->runnable_, CallbackForward(x1),
+                                CallbackForward(x2), CallbackForward(x3),
+                                CallbackForward(x4), CallbackForward(x5),
+                                CallbackForward(x6), CallbackForward(x7));
   }
 };
 
 // Arity 7 -> 1.
-template <typename StorageType, typename R,typename X1, typename X2,
-    typename X3, typename X4, typename X5, typename X6, typename X7>
+template <typename StorageType,
+          typename R,
+          typename X1,
+          typename X2,
+          typename X3,
+          typename X4,
+          typename X5,
+          typename X6,
+          typename X7>
 struct Invoker<6, StorageType, R(X1, X2, X3, X4, X5, X6, X7)> {
   typedef R(RunType)(BindStateBase*,
-      typename CallbackParamTraits<X7>::ForwardType);
+                     typename CallbackParamTraits<X7>::ForwardType);
 
   typedef R(UnboundRunType)(X7);
 
   static R Run(BindStateBase* base,
-      typename CallbackParamTraits<X7>::ForwardType x7) {
+               typename CallbackParamTraits<X7>::ForwardType x7) {
     StorageType* storage = static_cast<StorageType*>(base);
 
     // Local references to make debugger stepping easier. If in a debugger,
@@ -2469,25 +2760,32 @@ struct Invoker<6, StorageType, R(X1, X2, X3, X4, X5, X6, X7)> {
         Bound5UnwrapTraits::Unwrap(storage->p5_);
     typename Bound6UnwrapTraits::ForwardType x6 =
         Bound6UnwrapTraits::Unwrap(storage->p6_);
-    return InvokeHelper<StorageType::IsWeakCall::value, R,
-           typename StorageType::RunnableType,
-           void(typename Bound1UnwrapTraits::ForwardType,
-               typename Bound2UnwrapTraits::ForwardType,
-               typename Bound3UnwrapTraits::ForwardType,
-               typename Bound4UnwrapTraits::ForwardType,
-               typename Bound5UnwrapTraits::ForwardType,
-               typename Bound6UnwrapTraits::ForwardType,
-               typename CallbackParamTraits<X7>::ForwardType x7)>
-               ::MakeItSo(storage->runnable_, CallbackForward(x1),
-                   CallbackForward(x2), CallbackForward(x3),
-                   CallbackForward(x4), CallbackForward(x5),
-                   CallbackForward(x6), CallbackForward(x7));
+    return InvokeHelper<
+        StorageType::IsWeakCall::value, R, typename StorageType::RunnableType,
+        void(typename Bound1UnwrapTraits::ForwardType,
+             typename Bound2UnwrapTraits::ForwardType,
+             typename Bound3UnwrapTraits::ForwardType,
+             typename Bound4UnwrapTraits::ForwardType,
+             typename Bound5UnwrapTraits::ForwardType,
+             typename Bound6UnwrapTraits::ForwardType,
+             typename CallbackParamTraits<X7>::ForwardType
+                 x7)>::MakeItSo(storage->runnable_, CallbackForward(x1),
+                                CallbackForward(x2), CallbackForward(x3),
+                                CallbackForward(x4), CallbackForward(x5),
+                                CallbackForward(x6), CallbackForward(x7));
   }
 };
 
 // Arity 7 -> 0.
-template <typename StorageType, typename R,typename X1, typename X2,
-    typename X3, typename X4, typename X5, typename X6, typename X7>
+template <typename StorageType,
+          typename R,
+          typename X1,
+          typename X2,
+          typename X3,
+          typename X4,
+          typename X5,
+          typename X6,
+          typename X7>
 struct Invoker<7, StorageType, R(X1, X2, X3, X4, X5, X6, X7)> {
   typedef R(RunType)(BindStateBase*);
 
@@ -2522,22 +2820,20 @@ struct Invoker<7, StorageType, R(X1, X2, X3, X4, X5, X6, X7)> {
     typename Bound7UnwrapTraits::ForwardType x7 =
         Bound7UnwrapTraits::Unwrap(storage->p7_);
     return InvokeHelper<StorageType::IsWeakCall::value, R,
-           typename StorageType::RunnableType,
-           void(typename Bound1UnwrapTraits::ForwardType,
-               typename Bound2UnwrapTraits::ForwardType,
-               typename Bound3UnwrapTraits::ForwardType,
-               typename Bound4UnwrapTraits::ForwardType,
-               typename Bound5UnwrapTraits::ForwardType,
-               typename Bound6UnwrapTraits::ForwardType,
-               typename Bound7UnwrapTraits::ForwardType)>
-               ::MakeItSo(storage->runnable_, CallbackForward(x1),
-                   CallbackForward(x2), CallbackForward(x3),
-                   CallbackForward(x4), CallbackForward(x5),
-                   CallbackForward(x6), CallbackForward(x7));
+                        typename StorageType::RunnableType,
+                        void(typename Bound1UnwrapTraits::ForwardType,
+                             typename Bound2UnwrapTraits::ForwardType,
+                             typename Bound3UnwrapTraits::ForwardType,
+                             typename Bound4UnwrapTraits::ForwardType,
+                             typename Bound5UnwrapTraits::ForwardType,
+                             typename Bound6UnwrapTraits::ForwardType,
+                             typename Bound7UnwrapTraits::ForwardType)>::
+        MakeItSo(storage->runnable_, CallbackForward(x1), CallbackForward(x2),
+                 CallbackForward(x3), CallbackForward(x4), CallbackForward(x5),
+                 CallbackForward(x6), CallbackForward(x7));
   }
 };
 
-
 // BindState<>
 //
 // This stores all the state passed into Bind() and is also where most
@@ -2560,11 +2856,9 @@ struct BindState<Runnable, RunType, void()> : public BindStateBase {
   typedef Invoker<0, BindState, RunType> InvokerType;
   typedef typename InvokerType::UnboundRunType UnboundRunType;
   explicit BindState(const Runnable& runnable)
-      : BindStateBase(&Destroy),
-        runnable_(runnable) {
-  }
+      : BindStateBase(&Destroy), runnable_(runnable) {}
 
-  ~BindState() {  }
+  ~BindState() {}
 
   static void Destroy(BindStateBase* self) {
     delete static_cast<BindState*>(self);
@@ -2584,14 +2878,13 @@ struct BindState<Runnable, RunType, void(P1)> : public BindStateBase {
   typedef UnwrapTraits<P1> Bound1UnwrapTraits;
 
   BindState(const Runnable& runnable, const P1& p1)
-      : BindStateBase(&Destroy),
-        runnable_(runnable),
-        p1_(p1) {
+      : BindStateBase(&Destroy), runnable_(runnable), p1_(p1) {
     MaybeRefcount<HasIsMethodTag<Runnable>::value, P1>::AddRef(p1_);
   }
 
-  ~BindState() {    MaybeRefcount<HasIsMethodTag<Runnable>::value,
-      P1>::Release(p1_);  }
+  ~BindState() {
+    MaybeRefcount<HasIsMethodTag<Runnable>::value, P1>::Release(p1_);
+  }
 
   static void Destroy(BindStateBase* self) {
     delete static_cast<BindState*>(self);
@@ -2613,15 +2906,13 @@ struct BindState<Runnable, RunType, void(P1, P2)> : public BindStateBase {
   typedef UnwrapTraits<P2> Bound2UnwrapTraits;
 
   BindState(const Runnable& runnable, const P1& p1, const P2& p2)
-      : BindStateBase(&Destroy),
-        runnable_(runnable),
-        p1_(p1),
-        p2_(p2) {
+      : BindStateBase(&Destroy), runnable_(runnable), p1_(p1), p2_(p2) {
     MaybeRefcount<HasIsMethodTag<Runnable>::value, P1>::AddRef(p1_);
   }
 
-  ~BindState() {    MaybeRefcount<HasIsMethodTag<Runnable>::value,
-      P1>::Release(p1_);  }
+  ~BindState() {
+    MaybeRefcount<HasIsMethodTag<Runnable>::value, P1>::Release(p1_);
+  }
 
   static void Destroy(BindStateBase* self) {
     delete static_cast<BindState*>(self);
@@ -2632,10 +2923,12 @@ struct BindState<Runnable, RunType, void(P1, P2)> : public BindStateBase {
   P2 p2_;
 };
 
-template <typename Runnable, typename RunType, typename P1, typename P2,
-    typename P3>
-struct BindState<Runnable, RunType, void(P1, P2, P3)>
-    : public BindStateBase {
+template <typename Runnable,
+          typename RunType,
+          typename P1,
+          typename P2,
+          typename P3>
+struct BindState<Runnable, RunType, void(P1, P2, P3)> : public BindStateBase {
   typedef Runnable RunnableType;
   typedef IsWeakMethod<HasIsMethodTag<Runnable>::value, P1> IsWeakCall;
   typedef Invoker<3, BindState, RunType> InvokerType;
@@ -2655,8 +2948,9 @@ struct BindState<Runnable, RunType, void(P1, P2, P3)>
     MaybeRefcount<HasIsMethodTag<Runnable>::value, P1>::AddRef(p1_);
   }
 
-  ~BindState() {    MaybeRefcount<HasIsMethodTag<Runnable>::value,
-      P1>::Release(p1_);  }
+  ~BindState() {
+    MaybeRefcount<HasIsMethodTag<Runnable>::value, P1>::Release(p1_);
+  }
 
   static void Destroy(BindStateBase* self) {
     delete static_cast<BindState*>(self);
@@ -2668,8 +2962,12 @@ struct BindState<Runnable, RunType, void(P1, P2, P3)>
   P3 p3_;
 };
 
-template <typename Runnable, typename RunType, typename P1, typename P2,
-    typename P3, typename P4>
+template <typename Runnable,
+          typename RunType,
+          typename P1,
+          typename P2,
+          typename P3,
+          typename P4>
 struct BindState<Runnable, RunType, void(P1, P2, P3, P4)>
     : public BindStateBase {
   typedef Runnable RunnableType;
@@ -2683,8 +2981,11 @@ struct BindState<Runnable, RunType, void(P1, P2, P3, P4)>
   typedef UnwrapTraits<P3> Bound3UnwrapTraits;
   typedef UnwrapTraits<P4> Bound4UnwrapTraits;
 
-  BindState(const Runnable& runnable, const P1& p1, const P2& p2, const P3& p3,
-      const P4& p4)
+  BindState(const Runnable& runnable,
+            const P1& p1,
+            const P2& p2,
+            const P3& p3,
+            const P4& p4)
       : BindStateBase(&Destroy),
         runnable_(runnable),
         p1_(p1),
@@ -2694,8 +2995,9 @@ struct BindState<Runnable, RunType, void(P1, P2, P3, P4)>
     MaybeRefcount<HasIsMethodTag<Runnable>::value, P1>::AddRef(p1_);
   }
 
-  ~BindState() {    MaybeRefcount<HasIsMethodTag<Runnable>::value,
-      P1>::Release(p1_);  }
+  ~BindState() {
+    MaybeRefcount<HasIsMethodTag<Runnable>::value, P1>::Release(p1_);
+  }
 
   static void Destroy(BindStateBase* self) {
     delete static_cast<BindState*>(self);
@@ -2708,8 +3010,13 @@ struct BindState<Runnable, RunType, void(P1, P2, P3, P4)>
   P4 p4_;
 };
 
-template <typename Runnable, typename RunType, typename P1, typename P2,
-    typename P3, typename P4, typename P5>
+template <typename Runnable,
+          typename RunType,
+          typename P1,
+          typename P2,
+          typename P3,
+          typename P4,
+          typename P5>
 struct BindState<Runnable, RunType, void(P1, P2, P3, P4, P5)>
     : public BindStateBase {
   typedef Runnable RunnableType;
@@ -2724,8 +3031,12 @@ struct BindState<Runnable, RunType, void(P1, P2, P3, P4, P5)>
   typedef UnwrapTraits<P4> Bound4UnwrapTraits;
   typedef UnwrapTraits<P5> Bound5UnwrapTraits;
 
-  BindState(const Runnable& runnable, const P1& p1, const P2& p2, const P3& p3,
-      const P4& p4, const P5& p5)
+  BindState(const Runnable& runnable,
+            const P1& p1,
+            const P2& p2,
+            const P3& p3,
+            const P4& p4,
+            const P5& p5)
       : BindStateBase(&Destroy),
         runnable_(runnable),
         p1_(p1),
@@ -2736,8 +3047,9 @@ struct BindState<Runnable, RunType, void(P1, P2, P3, P4, P5)>
     MaybeRefcount<HasIsMethodTag<Runnable>::value, P1>::AddRef(p1_);
   }
 
-  ~BindState() {    MaybeRefcount<HasIsMethodTag<Runnable>::value,
-      P1>::Release(p1_);  }
+  ~BindState() {
+    MaybeRefcount<HasIsMethodTag<Runnable>::value, P1>::Release(p1_);
+  }
 
   static void Destroy(BindStateBase* self) {
     delete static_cast<BindState*>(self);
@@ -2751,8 +3063,14 @@ struct BindState<Runnable, RunType, void(P1, P2, P3, P4, P5)>
   P5 p5_;
 };
 
-template <typename Runnable, typename RunType, typename P1, typename P2,
-    typename P3, typename P4, typename P5, typename P6>
+template <typename Runnable,
+          typename RunType,
+          typename P1,
+          typename P2,
+          typename P3,
+          typename P4,
+          typename P5,
+          typename P6>
 struct BindState<Runnable, RunType, void(P1, P2, P3, P4, P5, P6)>
     : public BindStateBase {
   typedef Runnable RunnableType;
@@ -2768,8 +3086,13 @@ struct BindState<Runnable, RunType, void(P1, P2, P3, P4, P5, P6)>
   typedef UnwrapTraits<P5> Bound5UnwrapTraits;
   typedef UnwrapTraits<P6> Bound6UnwrapTraits;
 
-  BindState(const Runnable& runnable, const P1& p1, const P2& p2, const P3& p3,
-      const P4& p4, const P5& p5, const P6& p6)
+  BindState(const Runnable& runnable,
+            const P1& p1,
+            const P2& p2,
+            const P3& p3,
+            const P4& p4,
+            const P5& p5,
+            const P6& p6)
       : BindStateBase(&Destroy),
         runnable_(runnable),
         p1_(p1),
@@ -2781,8 +3104,9 @@ struct BindState<Runnable, RunType, void(P1, P2, P3, P4, P5, P6)>
     MaybeRefcount<HasIsMethodTag<Runnable>::value, P1>::AddRef(p1_);
   }
 
-  ~BindState() {    MaybeRefcount<HasIsMethodTag<Runnable>::value,
-      P1>::Release(p1_);  }
+  ~BindState() {
+    MaybeRefcount<HasIsMethodTag<Runnable>::value, P1>::Release(p1_);
+  }
 
   static void Destroy(BindStateBase* self) {
     delete static_cast<BindState*>(self);
@@ -2797,8 +3121,15 @@ struct BindState<Runnable, RunType, void(P1, P2, P3, P4, P5, P6)>
   P6 p6_;
 };
 
-template <typename Runnable, typename RunType, typename P1, typename P2,
-    typename P3, typename P4, typename P5, typename P6, typename P7>
+template <typename Runnable,
+          typename RunType,
+          typename P1,
+          typename P2,
+          typename P3,
+          typename P4,
+          typename P5,
+          typename P6,
+          typename P7>
 struct BindState<Runnable, RunType, void(P1, P2, P3, P4, P5, P6, P7)>
     : public BindStateBase {
   typedef Runnable RunnableType;
@@ -2815,8 +3146,14 @@ struct BindState<Runnable, RunType, void(P1, P2, P3, P4, P5, P6, P7)>
   typedef UnwrapTraits<P6> Bound6UnwrapTraits;
   typedef UnwrapTraits<P7> Bound7UnwrapTraits;
 
-  BindState(const Runnable& runnable, const P1& p1, const P2& p2, const P3& p3,
-      const P4& p4, const P5& p5, const P6& p6, const P7& p7)
+  BindState(const Runnable& runnable,
+            const P1& p1,
+            const P2& p2,
+            const P3& p3,
+            const P4& p4,
+            const P5& p5,
+            const P6& p6,
+            const P7& p7)
       : BindStateBase(&Destroy),
         runnable_(runnable),
         p1_(p1),
@@ -2829,8 +3166,9 @@ struct BindState<Runnable, RunType, void(P1, P2, P3, P4, P5, P6, P7)>
     MaybeRefcount<HasIsMethodTag<Runnable>::value, P1>::AddRef(p1_);
   }
 
-  ~BindState() {    MaybeRefcount<HasIsMethodTag<Runnable>::value,
-      P1>::Release(p1_);  }
+  ~BindState() {
+    MaybeRefcount<HasIsMethodTag<Runnable>::value, P1>::Release(p1_);
+  }
 
   static void Destroy(BindStateBase* self) {
     delete static_cast<BindState*>(self);
diff --git a/src/include/base/internal/cef_bind_internal_win.h b/src/include/base/internal/cef_bind_internal_win.h
index 1b061ccd..4a363def 100644
--- a/src/include/base/internal/cef_bind_internal_win.h
+++ b/src/include/base/internal/cef_bind_internal_win.h
@@ -48,338 +48,344 @@ class RunnableAdapter;
 
 // __stdcall Function: Arity 0.
 template <typename R>
-class RunnableAdapter<R(__stdcall *)()> {
+class RunnableAdapter<R(__stdcall*)()> {
  public:
-  typedef R (RunType)();
+  typedef R(RunType)();
 
-  explicit RunnableAdapter(R(__stdcall *function)())
-      : function_(function) {
-  }
+  explicit RunnableAdapter(R(__stdcall* function)()) : function_(function) {}
 
-  R Run() {
-    return function_();
-  }
+  R Run() { return function_(); }
 
  private:
-  R (__stdcall *function_)();
+  R(__stdcall* function_)();
 };
 
 // __fastcall Function: Arity 0.
 template <typename R>
-class RunnableAdapter<R(__fastcall *)()> {
+class RunnableAdapter<R(__fastcall*)()> {
  public:
-  typedef R (RunType)();
+  typedef R(RunType)();
 
-  explicit RunnableAdapter(R(__fastcall *function)())
-      : function_(function) {
-  }
+  explicit RunnableAdapter(R(__fastcall* function)()) : function_(function) {}
 
-  R Run() {
-    return function_();
-  }
+  R Run() { return function_(); }
 
  private:
-  R (__fastcall *function_)();
+  R(__fastcall* function_)();
 };
 
 // __stdcall Function: Arity 1.
 template <typename R, typename A1>
-class RunnableAdapter<R(__stdcall *)(A1)> {
+class RunnableAdapter<R(__stdcall*)(A1)> {
  public:
-  typedef R (RunType)(A1);
+  typedef R(RunType)(A1);
 
-  explicit RunnableAdapter(R(__stdcall *function)(A1))
-      : function_(function) {
-  }
+  explicit RunnableAdapter(R(__stdcall* function)(A1)) : function_(function) {}
 
   R Run(typename CallbackParamTraits<A1>::ForwardType a1) {
     return function_(a1);
   }
 
  private:
-  R (__stdcall *function_)(A1);
+  R(__stdcall* function_)(A1);
 };
 
 // __fastcall Function: Arity 1.
 template <typename R, typename A1>
-class RunnableAdapter<R(__fastcall *)(A1)> {
+class RunnableAdapter<R(__fastcall*)(A1)> {
  public:
-  typedef R (RunType)(A1);
+  typedef R(RunType)(A1);
 
-  explicit RunnableAdapter(R(__fastcall *function)(A1))
-      : function_(function) {
-  }
+  explicit RunnableAdapter(R(__fastcall* function)(A1)) : function_(function) {}
 
   R Run(typename CallbackParamTraits<A1>::ForwardType a1) {
     return function_(a1);
   }
 
  private:
-  R (__fastcall *function_)(A1);
+  R(__fastcall* function_)(A1);
 };
 
 // __stdcall Function: Arity 2.
 template <typename R, typename A1, typename A2>
-class RunnableAdapter<R(__stdcall *)(A1, A2)> {
+class RunnableAdapter<R(__stdcall*)(A1, A2)> {
  public:
-  typedef R (RunType)(A1, A2);
+  typedef R(RunType)(A1, A2);
 
-  explicit RunnableAdapter(R(__stdcall *function)(A1, A2))
-      : function_(function) {
-  }
+  explicit RunnableAdapter(R(__stdcall* function)(A1, A2))
+      : function_(function) {}
 
   R Run(typename CallbackParamTraits<A1>::ForwardType a1,
-      typename CallbackParamTraits<A2>::ForwardType a2) {
+        typename CallbackParamTraits<A2>::ForwardType a2) {
     return function_(a1, a2);
   }
 
  private:
-  R (__stdcall *function_)(A1, A2);
+  R(__stdcall* function_)(A1, A2);
 };
 
 // __fastcall Function: Arity 2.
 template <typename R, typename A1, typename A2>
-class RunnableAdapter<R(__fastcall *)(A1, A2)> {
+class RunnableAdapter<R(__fastcall*)(A1, A2)> {
  public:
-  typedef R (RunType)(A1, A2);
+  typedef R(RunType)(A1, A2);
 
-  explicit RunnableAdapter(R(__fastcall *function)(A1, A2))
-      : function_(function) {
-  }
+  explicit RunnableAdapter(R(__fastcall* function)(A1, A2))
+      : function_(function) {}
 
   R Run(typename CallbackParamTraits<A1>::ForwardType a1,
-      typename CallbackParamTraits<A2>::ForwardType a2) {
+        typename CallbackParamTraits<A2>::ForwardType a2) {
     return function_(a1, a2);
   }
 
  private:
-  R (__fastcall *function_)(A1, A2);
+  R(__fastcall* function_)(A1, A2);
 };
 
 // __stdcall Function: Arity 3.
 template <typename R, typename A1, typename A2, typename A3>
-class RunnableAdapter<R(__stdcall *)(A1, A2, A3)> {
+class RunnableAdapter<R(__stdcall*)(A1, A2, A3)> {
  public:
-  typedef R (RunType)(A1, A2, A3);
+  typedef R(RunType)(A1, A2, A3);
 
-  explicit RunnableAdapter(R(__stdcall *function)(A1, A2, A3))
-      : function_(function) {
-  }
+  explicit RunnableAdapter(R(__stdcall* function)(A1, A2, A3))
+      : function_(function) {}
 
   R Run(typename CallbackParamTraits<A1>::ForwardType a1,
-      typename CallbackParamTraits<A2>::ForwardType a2,
-      typename CallbackParamTraits<A3>::ForwardType a3) {
+        typename CallbackParamTraits<A2>::ForwardType a2,
+        typename CallbackParamTraits<A3>::ForwardType a3) {
     return function_(a1, a2, a3);
   }
 
  private:
-  R (__stdcall *function_)(A1, A2, A3);
+  R(__stdcall* function_)(A1, A2, A3);
 };
 
 // __fastcall Function: Arity 3.
 template <typename R, typename A1, typename A2, typename A3>
-class RunnableAdapter<R(__fastcall *)(A1, A2, A3)> {
+class RunnableAdapter<R(__fastcall*)(A1, A2, A3)> {
  public:
-  typedef R (RunType)(A1, A2, A3);
+  typedef R(RunType)(A1, A2, A3);
 
-  explicit RunnableAdapter(R(__fastcall *function)(A1, A2, A3))
-      : function_(function) {
-  }
+  explicit RunnableAdapter(R(__fastcall* function)(A1, A2, A3))
+      : function_(function) {}
 
   R Run(typename CallbackParamTraits<A1>::ForwardType a1,
-      typename CallbackParamTraits<A2>::ForwardType a2,
-      typename CallbackParamTraits<A3>::ForwardType a3) {
+        typename CallbackParamTraits<A2>::ForwardType a2,
+        typename CallbackParamTraits<A3>::ForwardType a3) {
     return function_(a1, a2, a3);
   }
 
  private:
-  R (__fastcall *function_)(A1, A2, A3);
+  R(__fastcall* function_)(A1, A2, A3);
 };
 
 // __stdcall Function: Arity 4.
 template <typename R, typename A1, typename A2, typename A3, typename A4>
-class RunnableAdapter<R(__stdcall *)(A1, A2, A3, A4)> {
+class RunnableAdapter<R(__stdcall*)(A1, A2, A3, A4)> {
  public:
-  typedef R (RunType)(A1, A2, A3, A4);
+  typedef R(RunType)(A1, A2, A3, A4);
 
-  explicit RunnableAdapter(R(__stdcall *function)(A1, A2, A3, A4))
-      : function_(function) {
-  }
+  explicit RunnableAdapter(R(__stdcall* function)(A1, A2, A3, A4))
+      : function_(function) {}
 
   R Run(typename CallbackParamTraits<A1>::ForwardType a1,
-      typename CallbackParamTraits<A2>::ForwardType a2,
-      typename CallbackParamTraits<A3>::ForwardType a3,
-      typename CallbackParamTraits<A4>::ForwardType a4) {
+        typename CallbackParamTraits<A2>::ForwardType a2,
+        typename CallbackParamTraits<A3>::ForwardType a3,
+        typename CallbackParamTraits<A4>::ForwardType a4) {
     return function_(a1, a2, a3, a4);
   }
 
  private:
-  R (__stdcall *function_)(A1, A2, A3, A4);
+  R(__stdcall* function_)(A1, A2, A3, A4);
 };
 
 // __fastcall Function: Arity 4.
 template <typename R, typename A1, typename A2, typename A3, typename A4>
-class RunnableAdapter<R(__fastcall *)(A1, A2, A3, A4)> {
+class RunnableAdapter<R(__fastcall*)(A1, A2, A3, A4)> {
  public:
-  typedef R (RunType)(A1, A2, A3, A4);
+  typedef R(RunType)(A1, A2, A3, A4);
 
-  explicit RunnableAdapter(R(__fastcall *function)(A1, A2, A3, A4))
-      : function_(function) {
-  }
+  explicit RunnableAdapter(R(__fastcall* function)(A1, A2, A3, A4))
+      : function_(function) {}
 
   R Run(typename CallbackParamTraits<A1>::ForwardType a1,
-      typename CallbackParamTraits<A2>::ForwardType a2,
-      typename CallbackParamTraits<A3>::ForwardType a3,
-      typename CallbackParamTraits<A4>::ForwardType a4) {
+        typename CallbackParamTraits<A2>::ForwardType a2,
+        typename CallbackParamTraits<A3>::ForwardType a3,
+        typename CallbackParamTraits<A4>::ForwardType a4) {
     return function_(a1, a2, a3, a4);
   }
 
  private:
-  R (__fastcall *function_)(A1, A2, A3, A4);
+  R(__fastcall* function_)(A1, A2, A3, A4);
 };
 
 // __stdcall Function: Arity 5.
-template <typename R, typename A1, typename A2, typename A3, typename A4,
-    typename A5>
-class RunnableAdapter<R(__stdcall *)(A1, A2, A3, A4, A5)> {
+template <typename R,
+          typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5>
+class RunnableAdapter<R(__stdcall*)(A1, A2, A3, A4, A5)> {
  public:
-  typedef R (RunType)(A1, A2, A3, A4, A5);
+  typedef R(RunType)(A1, A2, A3, A4, A5);
 
-  explicit RunnableAdapter(R(__stdcall *function)(A1, A2, A3, A4, A5))
-      : function_(function) {
-  }
+  explicit RunnableAdapter(R(__stdcall* function)(A1, A2, A3, A4, A5))
+      : function_(function) {}
 
   R Run(typename CallbackParamTraits<A1>::ForwardType a1,
-      typename CallbackParamTraits<A2>::ForwardType a2,
-      typename CallbackParamTraits<A3>::ForwardType a3,
-      typename CallbackParamTraits<A4>::ForwardType a4,
-      typename CallbackParamTraits<A5>::ForwardType a5) {
+        typename CallbackParamTraits<A2>::ForwardType a2,
+        typename CallbackParamTraits<A3>::ForwardType a3,
+        typename CallbackParamTraits<A4>::ForwardType a4,
+        typename CallbackParamTraits<A5>::ForwardType a5) {
     return function_(a1, a2, a3, a4, a5);
   }
 
  private:
-  R (__stdcall *function_)(A1, A2, A3, A4, A5);
+  R(__stdcall* function_)(A1, A2, A3, A4, A5);
 };
 
 // __fastcall Function: Arity 5.
-template <typename R, typename A1, typename A2, typename A3, typename A4,
-    typename A5>
-class RunnableAdapter<R(__fastcall *)(A1, A2, A3, A4, A5)> {
+template <typename R,
+          typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5>
+class RunnableAdapter<R(__fastcall*)(A1, A2, A3, A4, A5)> {
  public:
-  typedef R (RunType)(A1, A2, A3, A4, A5);
+  typedef R(RunType)(A1, A2, A3, A4, A5);
 
-  explicit RunnableAdapter(R(__fastcall *function)(A1, A2, A3, A4, A5))
-      : function_(function) {
-  }
+  explicit RunnableAdapter(R(__fastcall* function)(A1, A2, A3, A4, A5))
+      : function_(function) {}
 
   R Run(typename CallbackParamTraits<A1>::ForwardType a1,
-      typename CallbackParamTraits<A2>::ForwardType a2,
-      typename CallbackParamTraits<A3>::ForwardType a3,
-      typename CallbackParamTraits<A4>::ForwardType a4,
-      typename CallbackParamTraits<A5>::ForwardType a5) {
+        typename CallbackParamTraits<A2>::ForwardType a2,
+        typename CallbackParamTraits<A3>::ForwardType a3,
+        typename CallbackParamTraits<A4>::ForwardType a4,
+        typename CallbackParamTraits<A5>::ForwardType a5) {
     return function_(a1, a2, a3, a4, a5);
   }
 
  private:
-  R (__fastcall *function_)(A1, A2, A3, A4, A5);
+  R(__fastcall* function_)(A1, A2, A3, A4, A5);
 };
 
 // __stdcall Function: Arity 6.
-template <typename R, typename A1, typename A2, typename A3, typename A4,
-    typename A5, typename A6>
-class RunnableAdapter<R(__stdcall *)(A1, A2, A3, A4, A5, A6)> {
+template <typename R,
+          typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5,
+          typename A6>
+class RunnableAdapter<R(__stdcall*)(A1, A2, A3, A4, A5, A6)> {
  public:
-  typedef R (RunType)(A1, A2, A3, A4, A5, A6);
+  typedef R(RunType)(A1, A2, A3, A4, A5, A6);
 
-  explicit RunnableAdapter(R(__stdcall *function)(A1, A2, A3, A4, A5, A6))
-      : function_(function) {
-  }
+  explicit RunnableAdapter(R(__stdcall* function)(A1, A2, A3, A4, A5, A6))
+      : function_(function) {}
 
   R Run(typename CallbackParamTraits<A1>::ForwardType a1,
-      typename CallbackParamTraits<A2>::ForwardType a2,
-      typename CallbackParamTraits<A3>::ForwardType a3,
-      typename CallbackParamTraits<A4>::ForwardType a4,
-      typename CallbackParamTraits<A5>::ForwardType a5,
-      typename CallbackParamTraits<A6>::ForwardType a6) {
+        typename CallbackParamTraits<A2>::ForwardType a2,
+        typename CallbackParamTraits<A3>::ForwardType a3,
+        typename CallbackParamTraits<A4>::ForwardType a4,
+        typename CallbackParamTraits<A5>::ForwardType a5,
+        typename CallbackParamTraits<A6>::ForwardType a6) {
     return function_(a1, a2, a3, a4, a5, a6);
   }
 
  private:
-  R (__stdcall *function_)(A1, A2, A3, A4, A5, A6);
+  R(__stdcall* function_)(A1, A2, A3, A4, A5, A6);
 };
 
 // __fastcall Function: Arity 6.
-template <typename R, typename A1, typename A2, typename A3, typename A4,
-    typename A5, typename A6>
-class RunnableAdapter<R(__fastcall *)(A1, A2, A3, A4, A5, A6)> {
+template <typename R,
+          typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5,
+          typename A6>
+class RunnableAdapter<R(__fastcall*)(A1, A2, A3, A4, A5, A6)> {
  public:
-  typedef R (RunType)(A1, A2, A3, A4, A5, A6);
+  typedef R(RunType)(A1, A2, A3, A4, A5, A6);
 
-  explicit RunnableAdapter(R(__fastcall *function)(A1, A2, A3, A4, A5, A6))
-      : function_(function) {
-  }
+  explicit RunnableAdapter(R(__fastcall* function)(A1, A2, A3, A4, A5, A6))
+      : function_(function) {}
 
   R Run(typename CallbackParamTraits<A1>::ForwardType a1,
-      typename CallbackParamTraits<A2>::ForwardType a2,
-      typename CallbackParamTraits<A3>::ForwardType a3,
-      typename CallbackParamTraits<A4>::ForwardType a4,
-      typename CallbackParamTraits<A5>::ForwardType a5,
-      typename CallbackParamTraits<A6>::ForwardType a6) {
+        typename CallbackParamTraits<A2>::ForwardType a2,
+        typename CallbackParamTraits<A3>::ForwardType a3,
+        typename CallbackParamTraits<A4>::ForwardType a4,
+        typename CallbackParamTraits<A5>::ForwardType a5,
+        typename CallbackParamTraits<A6>::ForwardType a6) {
     return function_(a1, a2, a3, a4, a5, a6);
   }
 
  private:
-  R (__fastcall *function_)(A1, A2, A3, A4, A5, A6);
+  R(__fastcall* function_)(A1, A2, A3, A4, A5, A6);
 };
 
 // __stdcall Function: Arity 7.
-template <typename R, typename A1, typename A2, typename A3, typename A4,
-    typename A5, typename A6, typename A7>
-class RunnableAdapter<R(__stdcall *)(A1, A2, A3, A4, A5, A6, A7)> {
+template <typename R,
+          typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5,
+          typename A6,
+          typename A7>
+class RunnableAdapter<R(__stdcall*)(A1, A2, A3, A4, A5, A6, A7)> {
  public:
-  typedef R (RunType)(A1, A2, A3, A4, A5, A6, A7);
+  typedef R(RunType)(A1, A2, A3, A4, A5, A6, A7);
 
-  explicit RunnableAdapter(R(__stdcall *function)(A1, A2, A3, A4, A5, A6, A7))
-      : function_(function) {
-  }
+  explicit RunnableAdapter(R(__stdcall* function)(A1, A2, A3, A4, A5, A6, A7))
+      : function_(function) {}
 
   R Run(typename CallbackParamTraits<A1>::ForwardType a1,
-      typename CallbackParamTraits<A2>::ForwardType a2,
-      typename CallbackParamTraits<A3>::ForwardType a3,
-      typename CallbackParamTraits<A4>::ForwardType a4,
-      typename CallbackParamTraits<A5>::ForwardType a5,
-      typename CallbackParamTraits<A6>::ForwardType a6,
-      typename CallbackParamTraits<A7>::ForwardType a7) {
+        typename CallbackParamTraits<A2>::ForwardType a2,
+        typename CallbackParamTraits<A3>::ForwardType a3,
+        typename CallbackParamTraits<A4>::ForwardType a4,
+        typename CallbackParamTraits<A5>::ForwardType a5,
+        typename CallbackParamTraits<A6>::ForwardType a6,
+        typename CallbackParamTraits<A7>::ForwardType a7) {
     return function_(a1, a2, a3, a4, a5, a6, a7);
   }
 
  private:
-  R (__stdcall *function_)(A1, A2, A3, A4, A5, A6, A7);
+  R(__stdcall* function_)(A1, A2, A3, A4, A5, A6, A7);
 };
 
 // __fastcall Function: Arity 7.
-template <typename R, typename A1, typename A2, typename A3, typename A4,
-    typename A5, typename A6, typename A7>
-class RunnableAdapter<R(__fastcall *)(A1, A2, A3, A4, A5, A6, A7)> {
+template <typename R,
+          typename A1,
+          typename A2,
+          typename A3,
+          typename A4,
+          typename A5,
+          typename A6,
+          typename A7>
+class RunnableAdapter<R(__fastcall*)(A1, A2, A3, A4, A5, A6, A7)> {
  public:
-  typedef R (RunType)(A1, A2, A3, A4, A5, A6, A7);
+  typedef R(RunType)(A1, A2, A3, A4, A5, A6, A7);
 
-  explicit RunnableAdapter(R(__fastcall *function)(A1, A2, A3, A4, A5, A6, A7))
-      : function_(function) {
-  }
+  explicit RunnableAdapter(R(__fastcall* function)(A1, A2, A3, A4, A5, A6, A7))
+      : function_(function) {}
 
   R Run(typename CallbackParamTraits<A1>::ForwardType a1,
-      typename CallbackParamTraits<A2>::ForwardType a2,
-      typename CallbackParamTraits<A3>::ForwardType a3,
-      typename CallbackParamTraits<A4>::ForwardType a4,
-      typename CallbackParamTraits<A5>::ForwardType a5,
-      typename CallbackParamTraits<A6>::ForwardType a6,
-      typename CallbackParamTraits<A7>::ForwardType a7) {
+        typename CallbackParamTraits<A2>::ForwardType a2,
+        typename CallbackParamTraits<A3>::ForwardType a3,
+        typename CallbackParamTraits<A4>::ForwardType a4,
+        typename CallbackParamTraits<A5>::ForwardType a5,
+        typename CallbackParamTraits<A6>::ForwardType a6,
+        typename CallbackParamTraits<A7>::ForwardType a7) {
     return function_(a1, a2, a3, a4, a5, a6, a7);
   }
 
  private:
-  R (__fastcall *function_)(A1, A2, A3, A4, A5, A6, A7);
+  R(__fastcall* function_)(A1, A2, A3, A4, A5, A6, A7);
 };
 
 }  // namespace cef_internal
diff --git a/src/include/base/internal/cef_callback_internal.h b/src/include/base/internal/cef_callback_internal.h
index 542e8438..1f2e16c9 100644
--- a/src/include/base/internal/cef_callback_internal.h
+++ b/src/include/base/internal/cef_callback_internal.h
@@ -92,7 +92,7 @@ class CallbackBase {
   // another type. It is not okay to use void*. We create a InvokeFuncStorage
   // that that can store our function pointer, and then cast it back to
   // the original type on usage.
-  typedef void(*InvokeFuncStorage)(void);
+  typedef void (*InvokeFuncStorage)(void);
 
   // Returns true if this callback equals |other|. |other| may be null.
   bool Equals(const CallbackBase& other) const;
@@ -115,15 +115,16 @@ class CallbackBase {
 // A helper template to determine if given type is non-const move-only-type,
 // i.e. if a value of the given type should be passed via .Pass() in a
 // destructive way.
-template <typename T> struct IsMoveOnlyType {
+template <typename T>
+struct IsMoveOnlyType {
   template <typename U>
   static YesType Test(const typename U::MoveOnlyTypeForCPP03*);
 
   template <typename U>
   static NoType Test(...);
 
-  static const bool value = sizeof(Test<T>(0)) == sizeof(YesType) &&
-                            !is_const<T>::value;
+  static const bool value =
+      sizeof(Test<T>(0)) == sizeof(YesType) && !is_const<T>::value;
 };
 
 // This is a typetraits object that's used to take an argument type, and
diff --git a/src/include/base/internal/cef_raw_scoped_refptr_mismatch_checker.h b/src/include/base/internal/cef_raw_scoped_refptr_mismatch_checker.h
index 8584fcd7..9f2f932f 100644
--- a/src/include/base/internal/cef_raw_scoped_refptr_mismatch_checker.h
+++ b/src/include/base/internal/cef_raw_scoped_refptr_mismatch_checker.h
@@ -51,9 +51,7 @@ namespace cef_internal {
 template <typename T>
 struct NeedsScopedRefptrButGetsRawPtr {
 #if defined(OS_WIN)
-  enum {
-    value = base::false_type::value
-  };
+  enum { value = base::false_type::value };
 #else
   enum {
     // Human readable translation: you needed to be a scoped_refptr if you are a
@@ -77,74 +75,103 @@ struct ParamsUseScopedRefptrCorrectly<Tuple0> {
 };
 
 template <typename A>
-struct ParamsUseScopedRefptrCorrectly<Tuple1<A> > {
+struct ParamsUseScopedRefptrCorrectly<Tuple1<A>> {
   enum { value = !NeedsScopedRefptrButGetsRawPtr<A>::value };
 };
 
 template <typename A, typename B>
-struct ParamsUseScopedRefptrCorrectly<Tuple2<A, B> > {
-  enum { value = !(NeedsScopedRefptrButGetsRawPtr<A>::value ||
-                   NeedsScopedRefptrButGetsRawPtr<B>::value) };
+struct ParamsUseScopedRefptrCorrectly<Tuple2<A, B>> {
+  enum {
+    value = !(NeedsScopedRefptrButGetsRawPtr<A>::value ||
+              NeedsScopedRefptrButGetsRawPtr<B>::value)
+  };
 };
 
 template <typename A, typename B, typename C>
-struct ParamsUseScopedRefptrCorrectly<Tuple3<A, B, C> > {
-  enum { value = !(NeedsScopedRefptrButGetsRawPtr<A>::value ||
-                   NeedsScopedRefptrButGetsRawPtr<B>::value ||
-                   NeedsScopedRefptrButGetsRawPtr<C>::value) };
+struct ParamsUseScopedRefptrCorrectly<Tuple3<A, B, C>> {
+  enum {
+    value = !(NeedsScopedRefptrButGetsRawPtr<A>::value ||
+              NeedsScopedRefptrButGetsRawPtr<B>::value ||
+              NeedsScopedRefptrButGetsRawPtr<C>::value)
+  };
 };
 
 template <typename A, typename B, typename C, typename D>
-struct ParamsUseScopedRefptrCorrectly<Tuple4<A, B, C, D> > {
-  enum { value = !(NeedsScopedRefptrButGetsRawPtr<A>::value ||
-                   NeedsScopedRefptrButGetsRawPtr<B>::value ||
-                   NeedsScopedRefptrButGetsRawPtr<C>::value ||
-                   NeedsScopedRefptrButGetsRawPtr<D>::value) };
+struct ParamsUseScopedRefptrCorrectly<Tuple4<A, B, C, D>> {
+  enum {
+    value = !(NeedsScopedRefptrButGetsRawPtr<A>::value ||
+              NeedsScopedRefptrButGetsRawPtr<B>::value ||
+              NeedsScopedRefptrButGetsRawPtr<C>::value ||
+              NeedsScopedRefptrButGetsRawPtr<D>::value)
+  };
 };
 
 template <typename A, typename B, typename C, typename D, typename E>
-struct ParamsUseScopedRefptrCorrectly<Tuple5<A, B, C, D, E> > {
-  enum { value = !(NeedsScopedRefptrButGetsRawPtr<A>::value ||
-                   NeedsScopedRefptrButGetsRawPtr<B>::value ||
-                   NeedsScopedRefptrButGetsRawPtr<C>::value ||
-                   NeedsScopedRefptrButGetsRawPtr<D>::value ||
-                   NeedsScopedRefptrButGetsRawPtr<E>::value) };
+struct ParamsUseScopedRefptrCorrectly<Tuple5<A, B, C, D, E>> {
+  enum {
+    value = !(NeedsScopedRefptrButGetsRawPtr<A>::value ||
+              NeedsScopedRefptrButGetsRawPtr<B>::value ||
+              NeedsScopedRefptrButGetsRawPtr<C>::value ||
+              NeedsScopedRefptrButGetsRawPtr<D>::value ||
+              NeedsScopedRefptrButGetsRawPtr<E>::value)
+  };
 };
 
-template <typename A, typename B, typename C, typename D, typename E,
+template <typename A,
+          typename B,
+          typename C,
+          typename D,
+          typename E,
           typename F>
-struct ParamsUseScopedRefptrCorrectly<Tuple6<A, B, C, D, E, F> > {
-  enum { value = !(NeedsScopedRefptrButGetsRawPtr<A>::value ||
-                   NeedsScopedRefptrButGetsRawPtr<B>::value ||
-                   NeedsScopedRefptrButGetsRawPtr<C>::value ||
-                   NeedsScopedRefptrButGetsRawPtr<D>::value ||
-                   NeedsScopedRefptrButGetsRawPtr<E>::value ||
-                   NeedsScopedRefptrButGetsRawPtr<F>::value) };
+struct ParamsUseScopedRefptrCorrectly<Tuple6<A, B, C, D, E, F>> {
+  enum {
+    value = !(NeedsScopedRefptrButGetsRawPtr<A>::value ||
+              NeedsScopedRefptrButGetsRawPtr<B>::value ||
+              NeedsScopedRefptrButGetsRawPtr<C>::value ||
+              NeedsScopedRefptrButGetsRawPtr<D>::value ||
+              NeedsScopedRefptrButGetsRawPtr<E>::value ||
+              NeedsScopedRefptrButGetsRawPtr<F>::value)
+  };
 };
 
-template <typename A, typename B, typename C, typename D, typename E,
-          typename F, typename G>
-struct ParamsUseScopedRefptrCorrectly<Tuple7<A, B, C, D, E, F, G> > {
-  enum { value = !(NeedsScopedRefptrButGetsRawPtr<A>::value ||
-                   NeedsScopedRefptrButGetsRawPtr<B>::value ||
-                   NeedsScopedRefptrButGetsRawPtr<C>::value ||
-                   NeedsScopedRefptrButGetsRawPtr<D>::value ||
-                   NeedsScopedRefptrButGetsRawPtr<E>::value ||
-                   NeedsScopedRefptrButGetsRawPtr<F>::value ||
-                   NeedsScopedRefptrButGetsRawPtr<G>::value) };
+template <typename A,
+          typename B,
+          typename C,
+          typename D,
+          typename E,
+          typename F,
+          typename G>
+struct ParamsUseScopedRefptrCorrectly<Tuple7<A, B, C, D, E, F, G>> {
+  enum {
+    value = !(NeedsScopedRefptrButGetsRawPtr<A>::value ||
+              NeedsScopedRefptrButGetsRawPtr<B>::value ||
+              NeedsScopedRefptrButGetsRawPtr<C>::value ||
+              NeedsScopedRefptrButGetsRawPtr<D>::value ||
+              NeedsScopedRefptrButGetsRawPtr<E>::value ||
+              NeedsScopedRefptrButGetsRawPtr<F>::value ||
+              NeedsScopedRefptrButGetsRawPtr<G>::value)
+  };
 };
 
-template <typename A, typename B, typename C, typename D, typename E,
-          typename F, typename G, typename H>
-struct ParamsUseScopedRefptrCorrectly<Tuple8<A, B, C, D, E, F, G, H> > {
-  enum { value = !(NeedsScopedRefptrButGetsRawPtr<A>::value ||
-                   NeedsScopedRefptrButGetsRawPtr<B>::value ||
-                   NeedsScopedRefptrButGetsRawPtr<C>::value ||
-                   NeedsScopedRefptrButGetsRawPtr<D>::value ||
-                   NeedsScopedRefptrButGetsRawPtr<E>::value ||
-                   NeedsScopedRefptrButGetsRawPtr<F>::value ||
-                   NeedsScopedRefptrButGetsRawPtr<G>::value ||
-                   NeedsScopedRefptrButGetsRawPtr<H>::value) };
+template <typename A,
+          typename B,
+          typename C,
+          typename D,
+          typename E,
+          typename F,
+          typename G,
+          typename H>
+struct ParamsUseScopedRefptrCorrectly<Tuple8<A, B, C, D, E, F, G, H>> {
+  enum {
+    value = !(NeedsScopedRefptrButGetsRawPtr<A>::value ||
+              NeedsScopedRefptrButGetsRawPtr<B>::value ||
+              NeedsScopedRefptrButGetsRawPtr<C>::value ||
+              NeedsScopedRefptrButGetsRawPtr<D>::value ||
+              NeedsScopedRefptrButGetsRawPtr<E>::value ||
+              NeedsScopedRefptrButGetsRawPtr<F>::value ||
+              NeedsScopedRefptrButGetsRawPtr<G>::value ||
+              NeedsScopedRefptrButGetsRawPtr<H>::value)
+  };
 };
 
 }  // namespace cef_internal
diff --git a/src/include/cef_geolocation.h b/src/include/cef_accessibility_handler.h
similarity index 68%
rename from src/include/cef_geolocation.h
rename to src/include/cef_accessibility_handler.h
index 32005a43..c34e0c57 100644
--- a/src/include/cef_geolocation.h
+++ b/src/include/cef_accessibility_handler.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2017 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
@@ -34,33 +34,33 @@
 // tools directory for more information.
 //
 
-#ifndef CEF_INCLUDE_CEF_GEOLOCATION_H_
-#define CEF_INCLUDE_CEF_GEOLOCATION_H_
+#ifndef CEF_INCLUDE_CEF_ACCESSIBILITY_HANDLER_H_
+#define CEF_INCLUDE_CEF_ACCESSIBILITY_HANDLER_H_
 #pragma once
 
-#include "include/cef_base.h"
+#include "include/cef_values.h"
 
 ///
-// Implement this interface to receive geolocation updates. The methods of this
-// class will be called on the browser process UI thread.
+// Implement this interface to receive accessibility notification when
+// accessibility events have been registered. The methods of this class will
+// be called on the UI thread.
 ///
 /*--cef(source=client)--*/
-class CefGetGeolocationCallback : public virtual CefBaseRefCounted {
+class CefAccessibilityHandler : public virtual CefBaseRefCounted {
  public:
   ///
-  // Called with the 'best available' location information or, if the location
-  // update failed, with error information.
+  // Called after renderer process sends accessibility tree changes to the
+  // browser process.
   ///
   /*--cef()--*/
-  virtual void OnLocationUpdate(const CefGeoposition& position) =0;
-};
+  virtual void OnAccessibilityTreeChange(CefRefPtr<CefValue> value) = 0;
 
-///
-// Request a one-time geolocation update. This function bypasses any user
-// permission checks so should only be used by code that is allowed to access
-// location information.
-///
-/*--cef()--*/
-bool CefGetGeolocation(CefRefPtr<CefGetGeolocationCallback> callback);
+  ///
+  // Called after renderer process sends accessibility location changes to the
+  // browser process.
+  ///
+  /*--cef()--*/
+  virtual void OnAccessibilityLocationChange(CefRefPtr<CefValue> value) = 0;
+};
 
-#endif  // CEF_INCLUDE_CEF_GEOLOCATION_H_
+#endif  // CEF_INCLUDE_CEF_ACCESSIBILITY_HANDLER_H_
diff --git a/src/include/cef_app.h b/src/include/cef_app.h
index 5aca29b3..3962a09c 100644
--- a/src/include/cef_app.h
+++ b/src/include/cef_app.h
@@ -34,7 +34,6 @@
 // tools directory for more information.
 //
 
-
 #ifndef CEF_INCLUDE_CEF_APP_H_
 #define CEF_INCLUDE_CEF_APP_H_
 #pragma once
@@ -159,8 +158,7 @@ class CefApp : public virtual CefBaseRefCounted {
   /*--cef(optional_param=process_type)--*/
   virtual void OnBeforeCommandLineProcessing(
       const CefString& process_type,
-      CefRefPtr<CefCommandLine> command_line) {
-  }
+      CefRefPtr<CefCommandLine> command_line) {}
 
   ///
   // Provides an opportunity to register custom schemes. Do not keep a reference
@@ -170,8 +168,7 @@ class CefApp : public virtual CefBaseRefCounted {
   ///
   /*--cef()--*/
   virtual void OnRegisterCustomSchemes(
-      CefRawPtr<CefSchemeRegistrar> registrar) {
-  }
+      CefRawPtr<CefSchemeRegistrar> registrar) {}
 
   ///
   // Return the handler for resource bundle events. If
diff --git a/src/include/cef_application_mac.h b/src/include/cef_application_mac.h
index 473e9972..e2858c48 100644
--- a/src/include/cef_application_mac.h
+++ b/src/include/cef_application_mac.h
@@ -31,7 +31,9 @@
 #define CEF_INCLUDE_CEF_APPLICATION_MAC_H_
 #pragma once
 
+#ifdef __cplusplus
 #include "include/cef_base.h"
+#endif  // __cplusplus
 
 #if defined(OS_MACOSX) && defined(__OBJC__)
 
@@ -82,25 +84,27 @@
 @protocol CefAppProtocol<CrAppControlProtocol>
 @end
 
+#ifdef __cplusplus
+
 // Controls the state of |isHandlingSendEvent| in the event loop so that it is
 // reset properly.
 class CefScopedSendingEvent {
  public:
   CefScopedSendingEvent()
-    : app_(static_cast<NSApplication<CefAppProtocol>*>(
-              [NSApplication sharedApplication])),
-      handling_([app_ isHandlingSendEvent]) {
+      : app_(static_cast<NSApplication<CefAppProtocol>*>(
+            [NSApplication sharedApplication])),
+        handling_([app_ isHandlingSendEvent]) {
     [app_ setHandlingSendEvent:YES];
   }
-  ~CefScopedSendingEvent() {
-    [app_ setHandlingSendEvent:handling_];
-  }
+  ~CefScopedSendingEvent() { [app_ setHandlingSendEvent:handling_]; }
 
  private:
   NSApplication<CefAppProtocol>* app_;
   BOOL handling_;
 };
 
+#endif  // __cplusplus
+
 #endif  // defined(OS_MACOSX) && defined(__OBJC__)
 
 #endif  // CEF_INCLUDE_CEF_APPLICATION_MAC_H_
diff --git a/src/include/cef_auth_callback.h b/src/include/cef_auth_callback.h
index ca511fdc..fc8a10a9 100644
--- a/src/include/cef_auth_callback.h
+++ b/src/include/cef_auth_callback.h
@@ -50,15 +50,15 @@ class CefAuthCallback : public virtual CefBaseRefCounted {
   ///
   // Continue the authentication request.
   ///
-  /*--cef(capi_name=cont)--*/
+  /*--cef(capi_name=cont,optional_param=username,optional_param=password)--*/
   virtual void Continue(const CefString& username,
-                        const CefString& password) =0;
+                        const CefString& password) = 0;
 
   ///
   // Cancel the authentication request.
   ///
   /*--cef()--*/
-  virtual void Cancel() =0;
+  virtual void Cancel() = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_AUTH_CALLBACK_H_
diff --git a/src/include/cef_base.h b/src/include/cef_base.h
index c152cf06..816108e2 100644
--- a/src/include/cef_base.h
+++ b/src/include/cef_base.h
@@ -27,7 +27,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 #ifndef CEF_INCLUDE_CEF_BASE_H_
 #define CEF_INCLUDE_CEF_BASE_H_
 #pragma once
@@ -56,18 +55,18 @@ class CefBaseRefCounted {
   // Called to increment the reference count for the object. Should be called
   // for every new copy of a pointer to a given object.
   ///
-  virtual void AddRef() const =0;
+  virtual void AddRef() const = 0;
 
   ///
   // Called to decrement the reference count for the object. Returns true if
   // the reference count is 0, in which case the object should self-delete.
   ///
-  virtual bool Release() const =0;
+  virtual bool Release() const = 0;
 
   ///
   // Returns true if the reference count is 1.
   ///
-  virtual bool HasOneRef() const =0;
+  virtual bool HasOneRef() const = 0;
 
  protected:
   virtual ~CefBaseRefCounted() {}
@@ -91,23 +90,17 @@ class CefRefCount {
   ///
   // Increment the reference count.
   ///
-  void AddRef() const {
-    base::AtomicRefCountInc(&ref_count_); 
-  }
+  void AddRef() const { base::AtomicRefCountInc(&ref_count_); }
 
   ///
   // Decrement the reference count. Returns true if the reference count is 0.
   ///
-  bool Release() const {
-    return !base::AtomicRefCountDec(&ref_count_);
-  }
+  bool Release() const { return !base::AtomicRefCountDec(&ref_count_); }
 
   ///
   // Returns true if the reference count is 1.
   ///
-  bool HasOneRef() const {
-    return base::AtomicRefCountIsOne(&ref_count_);
-  }
+  bool HasOneRef() const { return base::AtomicRefCountIsOne(&ref_count_); }
 
  private:
   mutable base::AtomicRefCount ref_count_;
@@ -118,23 +111,20 @@ class CefRefCount {
 // Macro that provides a reference counting implementation for classes extending
 // CefBase.
 ///
-#define IMPLEMENT_REFCOUNTING(ClassName)            \
-  public:                                           \
-    void AddRef() const OVERRIDE {                  \
-      ref_count_.AddRef();                          \
-    }                                               \
-    bool Release() const OVERRIDE {                 \
-      if (ref_count_.Release()) {                   \
-        delete static_cast<const ClassName*>(this); \
-        return true;                                \
-      }                                             \
-      return false;                                 \
-    }                                               \
-    bool HasOneRef() const OVERRIDE {               \
-      return ref_count_.HasOneRef();                \
-    }                                               \
-  private:                                          \
-    CefRefCount ref_count_;
+#define IMPLEMENT_REFCOUNTING(ClassName)                             \
+ public:                                                             \
+  void AddRef() const OVERRIDE { ref_count_.AddRef(); }              \
+  bool Release() const OVERRIDE {                                    \
+    if (ref_count_.Release()) {                                      \
+      delete static_cast<const ClassName*>(this);                    \
+      return true;                                                   \
+    }                                                                \
+    return false;                                                    \
+  }                                                                  \
+  bool HasOneRef() const OVERRIDE { return ref_count_.HasOneRef(); } \
+                                                                     \
+ private:                                                            \
+  CefRefCount ref_count_;
 
 ///
 // Macro that provides a locking implementation. Use the Lock() and Unlock()
@@ -169,19 +159,21 @@ class CefRefCount {
 //   value_++;
 // }
 ///
-#define IMPLEMENT_LOCKING(ClassName)                                       \
-  public:                                                                  \
-    class AutoLock {                                                       \
-     public:                                                               \
-      explicit AutoLock(ClassName* base) : base_(base) { base_->Lock(); }  \
-      ~AutoLock() { base_->Unlock(); }                                     \
-     private:                                                              \
-      ClassName* base_;                                                    \
-      DISALLOW_COPY_AND_ASSIGN(AutoLock);                                  \
-    };                                                                     \
-    void Lock() { lock_.Acquire(); }                                       \
-    void Unlock() { lock_.Release(); }                                     \
-  private:                                                                 \
-    base::Lock lock_;
+#define IMPLEMENT_LOCKING(ClassName)                                    \
+ public:                                                                \
+  class AutoLock {                                                      \
+   public:                                                              \
+    explicit AutoLock(ClassName* base) : base_(base) { base_->Lock(); } \
+    ~AutoLock() { base_->Unlock(); }                                    \
+                                                                        \
+   private:                                                             \
+    ClassName* base_;                                                   \
+    DISALLOW_COPY_AND_ASSIGN(AutoLock);                                 \
+  };                                                                    \
+  void Lock() { lock_.Acquire(); }                                      \
+  void Unlock() { lock_.Release(); }                                    \
+                                                                        \
+ private:                                                               \
+  base::Lock lock_;
 
 #endif  // CEF_INCLUDE_CEF_BASE_H_
diff --git a/src/include/cef_browser.h b/src/include/cef_browser.h
index 3b4ed161..72d9b3ba 100644
--- a/src/include/cef_browser.h
+++ b/src/include/cef_browser.h
@@ -38,6 +38,7 @@
 #define CEF_INCLUDE_CEF_BROWSER_H_
 #pragma once
 
+#include <vector>
 #include "include/cef_base.h"
 #include "include/cef_drag_data.h"
 #include "include/cef_frame.h"
@@ -45,12 +46,10 @@
 #include "include/cef_navigation_entry.h"
 #include "include/cef_process_message.h"
 #include "include/cef_request_context.h"
-#include <vector>
 
 class CefBrowserHost;
 class CefClient;
 
-
 ///
 // Class used to represent a browser window. When used in the browser process
 // the methods of this class may be called on any thread unless otherwise
@@ -65,122 +64,123 @@ class CefBrowser : public virtual CefBaseRefCounted {
   // browser process.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefBrowserHost> GetHost() =0;
+  virtual CefRefPtr<CefBrowserHost> GetHost() = 0;
 
   ///
   // Returns true if the browser can navigate backwards.
   ///
   /*--cef()--*/
-  virtual bool CanGoBack() =0;
+  virtual bool CanGoBack() = 0;
 
   ///
   // Navigate backwards.
   ///
   /*--cef()--*/
-  virtual void GoBack() =0;
+  virtual void GoBack() = 0;
 
   ///
   // Returns true if the browser can navigate forwards.
   ///
   /*--cef()--*/
-  virtual bool CanGoForward() =0;
+  virtual bool CanGoForward() = 0;
 
   ///
   // Navigate forwards.
   ///
   /*--cef()--*/
-  virtual void GoForward() =0;
+  virtual void GoForward() = 0;
 
   ///
   // Returns true if the browser is currently loading.
   ///
   /*--cef()--*/
-  virtual bool IsLoading() =0;
+  virtual bool IsLoading() = 0;
 
   ///
   // Reload the current page.
   ///
   /*--cef()--*/
-  virtual void Reload() =0;
+  virtual void Reload() = 0;
 
   ///
   // Reload the current page ignoring any cached data.
   ///
   /*--cef()--*/
-  virtual void ReloadIgnoreCache() =0;
+  virtual void ReloadIgnoreCache() = 0;
 
   ///
   // Stop loading the page.
   ///
   /*--cef()--*/
-  virtual void StopLoad() =0;
+  virtual void StopLoad() = 0;
 
   ///
-  // Returns the globally unique identifier for this browser.
+  // Returns the globally unique identifier for this browser. This value is also
+  // used as the tabId for extension APIs.
   ///
   /*--cef()--*/
-  virtual int GetIdentifier() =0;
+  virtual int GetIdentifier() = 0;
 
   ///
   // Returns true if this object is pointing to the same handle as |that|
   // object.
   ///
   /*--cef()--*/
-  virtual bool IsSame(CefRefPtr<CefBrowser> that) =0;
+  virtual bool IsSame(CefRefPtr<CefBrowser> that) = 0;
 
   ///
   // Returns true if the window is a popup window.
   ///
   /*--cef()--*/
-  virtual bool IsPopup() =0;
+  virtual bool IsPopup() = 0;
 
   ///
   // Returns true if a document has been loaded in the browser.
   ///
   /*--cef()--*/
-  virtual bool HasDocument() =0;
+  virtual bool HasDocument() = 0;
 
   ///
   // Returns the main (top-level) frame for the browser window.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefFrame> GetMainFrame() =0;
+  virtual CefRefPtr<CefFrame> GetMainFrame() = 0;
 
   ///
   // Returns the focused frame for the browser window.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefFrame> GetFocusedFrame() =0;
+  virtual CefRefPtr<CefFrame> GetFocusedFrame() = 0;
 
   ///
   // Returns the frame with the specified identifier, or NULL if not found.
   ///
   /*--cef(capi_name=get_frame_byident)--*/
-  virtual CefRefPtr<CefFrame> GetFrame(int64 identifier) =0;
+  virtual CefRefPtr<CefFrame> GetFrame(int64 identifier) = 0;
 
   ///
   // Returns the frame with the specified name, or NULL if not found.
   ///
   /*--cef(optional_param=name)--*/
-  virtual CefRefPtr<CefFrame> GetFrame(const CefString& name) =0;
+  virtual CefRefPtr<CefFrame> GetFrame(const CefString& name) = 0;
 
   ///
   // Returns the number of frames that currently exist.
   ///
   /*--cef()--*/
-  virtual size_t GetFrameCount() =0;
+  virtual size_t GetFrameCount() = 0;
 
   ///
   // Returns the identifiers of all existing frames.
   ///
   /*--cef(count_func=identifiers:GetFrameCount)--*/
-  virtual void GetFrameIdentifiers(std::vector<int64>& identifiers) =0;
+  virtual void GetFrameIdentifiers(std::vector<int64>& identifiers) = 0;
 
   ///
   // Returns the names of all existing frames.
   ///
   /*--cef()--*/
-  virtual void GetFrameNames(std::vector<CefString>& names) =0;
+  virtual void GetFrameNames(std::vector<CefString>& names) = 0;
 
   ///
   // Send a message to the specified |target_process|. Returns true if the
@@ -188,10 +188,9 @@ class CefBrowser : public virtual CefBaseRefCounted {
   ///
   /*--cef()--*/
   virtual bool SendProcessMessage(CefProcessId target_process,
-                                  CefRefPtr<CefProcessMessage> message) =0;
+                                  CefRefPtr<CefProcessMessage> message) = 0;
 };
 
-
 ///
 // Callback interface for CefBrowserHost::RunFileDialog. The methods of this
 // class will be called on the browser process UI thread.
@@ -209,10 +208,9 @@ class CefRunFileDialogCallback : public virtual CefBaseRefCounted {
   /*--cef(index_param=selected_accept_filter,optional_param=file_paths)--*/
   virtual void OnFileDialogDismissed(
       int selected_accept_filter,
-      const std::vector<CefString>& file_paths) =0;
+      const std::vector<CefString>& file_paths) = 0;
 };
 
-
 ///
 // Callback interface for CefBrowserHost::GetNavigationEntries. The methods of
 // this class will be called on the browser process UI thread.
@@ -231,10 +229,9 @@ class CefNavigationEntryVisitor : public virtual CefBaseRefCounted {
   virtual bool Visit(CefRefPtr<CefNavigationEntry> entry,
                      bool current,
                      int index,
-                     int total) =0;
+                     int total) = 0;
 };
 
-
 ///
 // Callback interface for CefBrowserHost::PrintToPDF. The methods of this class
 // will be called on the browser process UI thread.
@@ -248,10 +245,9 @@ class CefPdfPrintCallback : public virtual CefBaseRefCounted {
   // successfully or false otherwise.
   ///
   /*--cef()--*/
-  virtual void OnPdfPrintFinished(const CefString& path, bool ok) =0;
+  virtual void OnPdfPrintFinished(const CefString& path, bool ok) = 0;
 };
 
-
 ///
 // Callback interface for CefBrowserHost::DownloadImage. The methods of this
 // class will be called on the browser process UI thread.
@@ -266,13 +262,11 @@ class CefDownloadImageCallback : public virtual CefBaseRefCounted {
   // multiple scale factors, or empty if the download failed.
   ///
   /*--cef(optional_param=image)--*/
-  virtual void OnDownloadImageFinished(
-     const CefString& image_url,
-     int http_status_code,
-     CefRefPtr<CefImage> image) =0;
+  virtual void OnDownloadImageFinished(const CefString& image_url,
+                                       int http_status_code,
+                                       CefRefPtr<CefImage> image) = 0;
 };
 
-
 ///
 // Class used to represent the browser process aspects of a browser window. The
 // methods of this class can only be called in the browser process. They may be
@@ -321,7 +315,7 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
   // Returns the hosted browser object.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefBrowser> GetBrowser() =0;
+  virtual CefRefPtr<CefBrowser> GetBrowser() = 0;
 
   ///
   // Request that the browser close. The JavaScript 'onbeforeunload' event will
@@ -334,7 +328,7 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
   // information.
   ///
   /*--cef()--*/
-  virtual void CloseBrowser(bool force_close) =0;
+  virtual void CloseBrowser(bool force_close) = 0;
 
   ///
   // Helper for closing a browser. Call this method from the top-level window
@@ -345,13 +339,13 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
   // information. This method must be called on the browser process UI thread.
   ///
   /*--cef()--*/
-  virtual bool TryCloseBrowser() =0;
+  virtual bool TryCloseBrowser() = 0;
 
   ///
   // Set whether the browser is focused.
   ///
   /*--cef()--*/
-  virtual void SetFocus(bool focus) =0;
+  virtual void SetFocus(bool focus) = 0;
 
   ///
   // Retrieve the window handle for this browser. If this browser is wrapped in
@@ -359,41 +353,41 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
   // thread and it will return the handle for the top-level native window.
   ///
   /*--cef()--*/
-  virtual CefWindowHandle GetWindowHandle() =0;
+  virtual CefWindowHandle GetWindowHandle() = 0;
 
   ///
   // Retrieve the window handle of the browser that opened this browser. Will
   // return NULL for non-popup windows or if this browser is wrapped in a
   // CefBrowserView. This method can be used in combination with custom handling
-  // of modal windows. 
+  // of modal windows.
   ///
   /*--cef()--*/
-  virtual CefWindowHandle GetOpenerWindowHandle() =0;
+  virtual CefWindowHandle GetOpenerWindowHandle() = 0;
 
   ///
   // Returns true if this browser is wrapped in a CefBrowserView.
   ///
   /*--cef()--*/
-  virtual bool HasView() =0;
+  virtual bool HasView() = 0;
 
   ///
   // Returns the client for this browser.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefClient> GetClient() =0;
+  virtual CefRefPtr<CefClient> GetClient() = 0;
 
   ///
   // Returns the request context for this browser.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefRequestContext> GetRequestContext() =0;
+  virtual CefRefPtr<CefRequestContext> GetRequestContext() = 0;
 
   ///
   // 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;
+  virtual double GetZoomLevel() = 0;
 
   ///
   // Change the zoom level to the specified value. Specify 0.0 to reset the
@@ -402,7 +396,7 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
   // UI thread.
   ///
   /*--cef()--*/
-  virtual void SetZoomLevel(double zoomLevel) =0;
+  virtual void SetZoomLevel(double zoomLevel) = 0;
 
   ///
   // Call to run a file chooser dialog. Only a single file chooser dialog may be
@@ -427,13 +421,13 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
                              const CefString& default_file_path,
                              const std::vector<CefString>& accept_filters,
                              int selected_accept_filter,
-                             CefRefPtr<CefRunFileDialogCallback> callback) =0;
+                             CefRefPtr<CefRunFileDialogCallback> callback) = 0;
 
   ///
   // Download the file at |url| using CefDownloadHandler.
   ///
   /*--cef()--*/
-  virtual void StartDownload(const CefString& url) =0;
+  virtual void StartDownload(const CefString& url) = 0;
 
   ///
   // Download |image_url| and execute |callback| on completion with the images
@@ -452,13 +446,13 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
                              bool is_favicon,
                              uint32 max_image_size,
                              bool bypass_cache,
-                             CefRefPtr<CefDownloadImageCallback> callback) =0;
+                             CefRefPtr<CefDownloadImageCallback> callback) = 0;
 
   ///
   // Print the current browser contents.
   ///
   /*--cef()--*/
-  virtual void Print() =0;
+  virtual void Print() = 0;
 
   ///
   // Print the current browser contents to the PDF file specified by |path| and
@@ -469,25 +463,31 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
   /*--cef(optional_param=callback)--*/
   virtual void PrintToPDF(const CefString& path,
                           const CefPdfPrintSettings& settings,
-                          CefRefPtr<CefPdfPrintCallback> callback) =0;
+                          CefRefPtr<CefPdfPrintCallback> callback) = 0;
 
   ///
-  // Search for |searchText|. |identifier| can be used to have multiple searches
-  // running simultaniously. |forward| indicates whether to search forward or
-  // backward within the page. |matchCase| indicates whether the search should
-  // be case-sensitive. |findNext| indicates whether this is the first request
-  // or a follow-up. The CefFindHandler instance, if any, returned via
-  // CefClient::GetFindHandler will be called to report find results.
+  // Search for |searchText|. |identifier| must be a unique ID and these IDs
+  // must strictly increase so that newer requests always have greater IDs than
+  // older requests. If |identifier| is zero or less than the previous ID value
+  // then it will be automatically assigned a new valid ID. |forward| indicates
+  // whether to search forward or backward within the page. |matchCase|
+  // indicates whether the search should be case-sensitive. |findNext| indicates
+  // whether this is the first request or a follow-up. The CefFindHandler
+  // instance, if any, returned via CefClient::GetFindHandler will be called to
+  // report find results.
   ///
   /*--cef()--*/
-  virtual void Find(int identifier, const CefString& searchText,
-                    bool forward, bool matchCase, bool findNext) =0;
+  virtual void Find(int identifier,
+                    const CefString& searchText,
+                    bool forward,
+                    bool matchCase,
+                    bool findNext) = 0;
 
   ///
   // Cancel all searches that are currently going on.
   ///
   /*--cef()--*/
-  virtual void StopFinding(bool clearSelection) =0;
+  virtual void StopFinding(bool clearSelection) = 0;
 
   ///
   // Open developer tools (DevTools) in its own browser. The DevTools browser
@@ -503,20 +503,20 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
   virtual void ShowDevTools(const CefWindowInfo& windowInfo,
                             CefRefPtr<CefClient> client,
                             const CefBrowserSettings& settings,
-                            const CefPoint& inspect_element_at) =0;
+                            const CefPoint& inspect_element_at) = 0;
 
   ///
   // Explicitly close the associated DevTools browser, if any.
   ///
   /*--cef()--*/
-  virtual void CloseDevTools() =0;
+  virtual void CloseDevTools() = 0;
 
   ///
   // Returns true if this browser currently has an associated DevTools browser.
   // Must be called on the browser process UI thread.
   ///
   /*--cef()--*/
-  virtual bool HasDevTools() =0;
+  virtual bool HasDevTools() = 0;
 
   ///
   // Retrieve a snapshot of current navigation entries as values sent to the
@@ -526,38 +526,38 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
   /*--cef()--*/
   virtual void GetNavigationEntries(
       CefRefPtr<CefNavigationEntryVisitor> visitor,
-      bool current_only) =0;
+      bool current_only) = 0;
 
   ///
   // Set whether mouse cursor change is disabled.
   ///
   /*--cef()--*/
-  virtual void SetMouseCursorChangeDisabled(bool disabled) =0;
+  virtual void SetMouseCursorChangeDisabled(bool disabled) = 0;
 
   ///
   // Returns true if mouse cursor change is disabled.
   ///
   /*--cef()--*/
-  virtual bool IsMouseCursorChangeDisabled() =0;
+  virtual bool IsMouseCursorChangeDisabled() = 0;
 
   ///
   // If a misspelled word is currently selected in an editable node calling
   // this method will replace it with the specified |word|.
   ///
   /*--cef()--*/
-  virtual void ReplaceMisspelling(const CefString& word) =0;
+  virtual void ReplaceMisspelling(const CefString& word) = 0;
 
   ///
   // Add the specified |word| to the spelling dictionary.
   ///
   /*--cef()--*/
-  virtual void AddWordToDictionary(const CefString& word) =0;
+  virtual void AddWordToDictionary(const CefString& word) = 0;
 
   ///
   // Returns true if window rendering is disabled.
   ///
   /*--cef()--*/
-  virtual bool IsWindowRenderingDisabled() =0;
+  virtual bool IsWindowRenderingDisabled() = 0;
 
   ///
   // Notify the browser that the widget has been resized. The browser will first
@@ -566,7 +566,7 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
   // method is only used when window rendering is disabled.
   ///
   /*--cef()--*/
-  virtual void WasResized() =0;
+  virtual void WasResized() = 0;
 
   ///
   // Notify the browser that it has been hidden or shown. Layouting and
@@ -574,7 +574,7 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
   // hidden. This method is only used when window rendering is disabled.
   ///
   /*--cef()--*/
-  virtual void WasHidden(bool hidden) =0;
+  virtual void WasHidden(bool hidden) = 0;
 
   ///
   // Send a notification to the browser that the screen info has changed. The
@@ -585,7 +585,7 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
   // disabled.
   ///
   /*--cef()--*/
-  virtual void NotifyScreenInfoChanged() =0;
+  virtual void NotifyScreenInfoChanged() = 0;
 
   ///
   // Invalidate the view. The browser will call CefRenderHandler::OnPaint
@@ -593,13 +593,13 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
   // disabled.
   ///
   /*--cef()--*/
-  virtual void Invalidate(PaintElementType type) =0;
+  virtual void Invalidate(PaintElementType type) = 0;
 
   ///
   // Send a key event to the browser.
   ///
   /*--cef()--*/
-  virtual void SendKeyEvent(const CefKeyEvent& event) =0;
+  virtual void SendKeyEvent(const CefKeyEvent& event) = 0;
 
   ///
   // Send a mouse click event to the browser. The |x| and |y| coordinates are
@@ -608,7 +608,8 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
   /*--cef()--*/
   virtual void SendMouseClickEvent(const CefMouseEvent& event,
                                    MouseButtonType type,
-                                   bool mouseUp, int clickCount) =0;
+                                   bool mouseUp,
+                                   int clickCount) = 0;
 
   ///
   // Send a mouse move event to the browser. The |x| and |y| coordinates are
@@ -616,7 +617,7 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
   ///
   /*--cef()--*/
   virtual void SendMouseMoveEvent(const CefMouseEvent& event,
-                                  bool mouseLeave) =0;
+                                  bool mouseLeave) = 0;
 
   ///
   // Send a mouse wheel event to the browser. The |x| and |y| coordinates are
@@ -627,26 +628,27 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
   ///
   /*--cef()--*/
   virtual void SendMouseWheelEvent(const CefMouseEvent& event,
-                                   int deltaX, int deltaY) =0;
+                                   int deltaX,
+                                   int deltaY) = 0;
 
   ///
   // Send a focus event to the browser.
   ///
   /*--cef()--*/
-  virtual void SendFocusEvent(bool setFocus) =0;
+  virtual void SendFocusEvent(bool setFocus) = 0;
 
   ///
   // Send a capture lost event to the browser.
   ///
   /*--cef()--*/
-  virtual void SendCaptureLostEvent() =0;
+  virtual void SendCaptureLostEvent() = 0;
 
   ///
   // Notify the browser that the window hosting it is about to be moved or
   // resized. This method is only used on Windows and Linux.
   ///
   /*--cef()--*/
-  virtual void NotifyMoveOrResizeStarted() =0;
+  virtual void NotifyMoveOrResizeStarted() = 0;
 
   ///
   // Returns the maximum rate in frames per second (fps) that CefRenderHandler::
@@ -656,7 +658,7 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
   // can only be called on the UI thread.
   ///
   /*--cef()--*/
-  virtual int GetWindowlessFrameRate() =0;
+  virtual int GetWindowlessFrameRate() = 0;
 
   ///
   // Set the maximum rate in frames per second (fps) that CefRenderHandler::
@@ -666,7 +668,7 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
   // set at browser creation via CefBrowserSettings.windowless_frame_rate.
   ///
   /*--cef()--*/
-  virtual void SetWindowlessFrameRate(int frame_rate) =0;
+  virtual void SetWindowlessFrameRate(int frame_rate) = 0;
 
   ///
   // Begins a new composition or updates the existing composition. Blink has a
@@ -696,7 +698,7 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
       const CefString& text,
       const std::vector<CefCompositionUnderline>& underlines,
       const CefRange& replacement_range,
-      const CefRange& selection_range) =0;
+      const CefRange& selection_range) = 0;
 
   ///
   // Completes the existing composition by optionally inserting the specified
@@ -710,7 +712,7 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
   /*--cef(optional_param=text)--*/
   virtual void ImeCommitText(const CefString& text,
                              const CefRange& replacement_range,
-                             int relative_cursor_pos) =0;
+                             int relative_cursor_pos) = 0;
 
   ///
   // Completes the existing composition by applying the current composition node
@@ -719,7 +721,7 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
   // This method is only used when window rendering is disabled.
   ///
   /*--cef()--*/
-  virtual void ImeFinishComposingText(bool keep_selection) =0;
+  virtual void ImeFinishComposingText(bool keep_selection) = 0;
 
   ///
   // Cancels the existing composition and discards the composition node
@@ -728,7 +730,7 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
   // This method is only used when window rendering is disabled.
   ///
   /*--cef()--*/
-  virtual void ImeCancelComposition() =0;
+  virtual void ImeCancelComposition() = 0;
 
   ///
   // Call this method when the user drags the mouse into the web view (before
@@ -741,8 +743,8 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
   ///
   /*--cef()--*/
   virtual void DragTargetDragEnter(CefRefPtr<CefDragData> drag_data,
-                                  const CefMouseEvent& event,
-                                  DragOperationsMask allowed_ops) =0;
+                                   const CefMouseEvent& event,
+                                   DragOperationsMask allowed_ops) = 0;
 
   ///
   // Call this method each time the mouse is moved across the web view during
@@ -752,7 +754,7 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
   ///
   /*--cef()--*/
   virtual void DragTargetDragOver(const CefMouseEvent& event,
-                                  DragOperationsMask allowed_ops) =0;
+                                  DragOperationsMask allowed_ops) = 0;
 
   ///
   // Call this method when the user drags the mouse out of the web view (after
@@ -760,7 +762,7 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
   // This method is only used when window rendering is disabled.
   ///
   /*--cef()--*/
-  virtual void DragTargetDragLeave() =0;
+  virtual void DragTargetDragLeave() = 0;
 
   ///
   // Call this method when the user completes the drag operation by dropping
@@ -770,7 +772,7 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
   // This method is only used when window rendering is disabled.
   ///
   /*--cef()--*/
-  virtual void DragTargetDrop(const CefMouseEvent& event) =0;
+  virtual void DragTargetDrop(const CefMouseEvent& event) = 0;
 
   ///
   // Call this method when the drag operation started by a
@@ -782,7 +784,7 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
   // This method is only used when window rendering is disabled.
   ///
   /*--cef()--*/
-  virtual void DragSourceEndedAt(int x, int y, DragOperationsMask op) =0;
+  virtual void DragSourceEndedAt(int x, int y, DragOperationsMask op) = 0;
 
   ///
   // Call this method when the drag operation started by a
@@ -794,14 +796,68 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
   // This method is only used when window rendering is disabled.
   ///
   /*--cef()--*/
-  virtual void DragSourceSystemDragEnded() =0;
+  virtual void DragSourceSystemDragEnded() = 0;
 
   ///
   // Returns the current visible navigation entry for this browser. This method
   // can only be called on the UI thread.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefNavigationEntry> GetVisibleNavigationEntry() =0;
+  virtual CefRefPtr<CefNavigationEntry> GetVisibleNavigationEntry() = 0;
+
+  ///
+  // Set accessibility state for all frames. |accessibility_state| may be
+  // default, enabled or disabled. If |accessibility_state| is STATE_DEFAULT
+  // then accessibility will be disabled by default and the state may be further
+  // controlled with the "force-renderer-accessibility" and
+  // "disable-renderer-accessibility" command-line switches. If
+  // |accessibility_state| is STATE_ENABLED then accessibility will be enabled.
+  // If |accessibility_state| is STATE_DISABLED then accessibility will be
+  // completely disabled.
+  //
+  // For windowed browsers accessibility will be enabled in Complete mode (which
+  // corresponds to kAccessibilityModeComplete in Chromium). In this mode all
+  // platform accessibility objects will be created and managed by Chromium's
+  // internal implementation. The client needs only to detect the screen reader
+  // and call this method appropriately. For example, on macOS the client can
+  // handle the @"AXEnhancedUserInterface" accessibility attribute to detect
+  // VoiceOver state changes and on Windows the client can handle WM_GETOBJECT
+  // with OBJID_CLIENT to detect accessibility readers.
+  //
+  // For windowless browsers accessibility will be enabled in TreeOnly mode
+  // (which corresponds to kAccessibilityModeWebContentsOnly in Chromium). In
+  // this mode renderer accessibility is enabled, the full tree is computed, and
+  // events are passed to CefAccessibiltyHandler, but platform accessibility
+  // objects are not created. The client may implement platform accessibility
+  // objects using CefAccessibiltyHandler callbacks if desired.
+  ///
+  /*--cef()--*/
+  virtual void SetAccessibilityState(cef_state_t accessibility_state) = 0;
+
+  ///
+  // Enable notifications of auto resize via CefDisplayHandler::OnAutoResize.
+  // Notifications are disabled by default. |min_size| and |max_size| define the
+  // range of allowed sizes.
+  ///
+  /*--cef()--*/
+  virtual void SetAutoResizeEnabled(bool enabled,
+                                    const CefSize& min_size,
+                                    const CefSize& max_size) = 0;
+
+  ///
+  // Returns the extension hosted in this browser or NULL if no extension is
+  // hosted. See CefRequestContext::LoadExtension for details.
+  ///
+  /*--cef()--*/
+  virtual CefRefPtr<CefExtension> GetExtension() = 0;
+
+  ///
+  // Returns true if this browser is hosting an extension background script.
+  // Background hosts do not have a window and are not displayable. See
+  // CefRequestContext::LoadExtension for details.
+  ///
+  /*--cef()--*/
+  virtual bool IsBackgroundHost() = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_BROWSER_H_
diff --git a/src/include/cef_browser_process_handler.h b/src/include/cef_browser_process_handler.h
index e65503fb..fb770997 100644
--- a/src/include/cef_browser_process_handler.h
+++ b/src/include/cef_browser_process_handler.h
@@ -84,9 +84,7 @@ class CefBrowserProcessHandler : public virtual CefBaseRefCounted {
   // provided then printing will not be supported on the Linux platform.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefPrintHandler> GetPrintHandler() {
-    return NULL;
-  }
+  virtual CefRefPtr<CefPrintHandler> GetPrintHandler() { return NULL; }
 
   ///
   // Called from any thread when work has been scheduled for the browser process
diff --git a/src/include/cef_callback.h b/src/include/cef_callback.h
index 5be51e94..e206cb97 100644
--- a/src/include/cef_callback.h
+++ b/src/include/cef_callback.h
@@ -50,13 +50,13 @@ class CefCallback : public virtual CefBaseRefCounted {
   // Continue processing.
   ///
   /*--cef(capi_name=cont)--*/
-  virtual void Continue() =0;
+  virtual void Continue() = 0;
 
   ///
   // Cancel processing.
   ///
   /*--cef()--*/
-  virtual void Cancel() =0;
+  virtual void Cancel() = 0;
 };
 
 ///
@@ -69,7 +69,7 @@ class CefCompletionCallback : public virtual CefBaseRefCounted {
   // Method that will be called once the task is complete.
   ///
   /*--cef()--*/
-  virtual void OnComplete() =0;
+  virtual void OnComplete() = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_CALLBACK_H_
diff --git a/src/include/cef_client.h b/src/include/cef_client.h
index 9421c7c0..59173c77 100644
--- a/src/include/cef_client.h
+++ b/src/include/cef_client.h
@@ -46,7 +46,6 @@
 #include "include/cef_drag_handler.h"
 #include "include/cef_find_handler.h"
 #include "include/cef_focus_handler.h"
-#include "include/cef_geolocation_handler.h"
 #include "include/cef_jsdialog_handler.h"
 #include "include/cef_keyboard_handler.h"
 #include "include/cef_life_span_handler.h"
@@ -75,108 +74,75 @@ class CefClient : public virtual CefBaseRefCounted {
   // implementation will be used.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefDialogHandler> GetDialogHandler() {
-    return NULL;
-  }
+  virtual CefRefPtr<CefDialogHandler> GetDialogHandler() { return NULL; }
 
   ///
   // Return the handler for browser display state events.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefDisplayHandler> GetDisplayHandler() {
-    return NULL;
-  }
+  virtual CefRefPtr<CefDisplayHandler> GetDisplayHandler() { return NULL; }
 
   ///
   // Return the handler for download events. If no handler is returned downloads
   // will not be allowed.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefDownloadHandler> GetDownloadHandler() {
-    return NULL;
-  }
+  virtual CefRefPtr<CefDownloadHandler> GetDownloadHandler() { return NULL; }
 
   ///
   // Return the handler for drag events.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefDragHandler> GetDragHandler() {
-    return NULL;
-  }
+  virtual CefRefPtr<CefDragHandler> GetDragHandler() { return NULL; }
 
   ///
   // Return the handler for find result events.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefFindHandler> GetFindHandler() {
-    return NULL;
-  }
+  virtual CefRefPtr<CefFindHandler> GetFindHandler() { return NULL; }
 
   ///
   // Return the handler for focus events.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefFocusHandler> GetFocusHandler() {
-    return NULL;
-  }
-
-  ///
-  // Return the handler for geolocation permissions requests. If no handler is
-  // provided geolocation access will be denied by default.
-  ///
-  /*--cef()--*/
-  virtual CefRefPtr<CefGeolocationHandler> GetGeolocationHandler() {
-    return NULL;
-  }
+  virtual CefRefPtr<CefFocusHandler> GetFocusHandler() { return NULL; }
 
   ///
   // Return the handler for JavaScript dialogs. If no handler is provided the
   // default implementation will be used.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefJSDialogHandler> GetJSDialogHandler() {
-    return NULL;
-  }
+  virtual CefRefPtr<CefJSDialogHandler> GetJSDialogHandler() { return NULL; }
 
   ///
   // Return the handler for keyboard events.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefKeyboardHandler> GetKeyboardHandler() {
-    return NULL;
-  }
+  virtual CefRefPtr<CefKeyboardHandler> GetKeyboardHandler() { return NULL; }
 
   ///
   // Return the handler for browser life span events.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefLifeSpanHandler> GetLifeSpanHandler() {
-    return NULL;
-  }
+  virtual CefRefPtr<CefLifeSpanHandler> GetLifeSpanHandler() { return NULL; }
 
   ///
   // Return the handler for browser load status events.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefLoadHandler> GetLoadHandler() {
-    return NULL;
-  }
+  virtual CefRefPtr<CefLoadHandler> GetLoadHandler() { return NULL; }
 
   ///
   // Return the handler for off-screen rendering events.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefRenderHandler> GetRenderHandler() {
-    return NULL;
-  }
+  virtual CefRefPtr<CefRenderHandler> GetRenderHandler() { return NULL; }
 
   ///
   // Return the handler for browser request events.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefRequestHandler> GetRequestHandler() {
-    return NULL;
-  }
+  virtual CefRefPtr<CefRequestHandler> GetRequestHandler() { return NULL; }
 
   ///
   // Called when a new message is received from a different process. Return true
diff --git a/src/include/cef_command_line.h b/src/include/cef_command_line.h
index 5e581b6e..dd5491cd 100644
--- a/src/include/cef_command_line.h
+++ b/src/include/cef_command_line.h
@@ -38,9 +38,9 @@
 #define CEF_INCLUDE_CEF_COMMAND_LINE_H_
 #pragma once
 
-#include "include/cef_base.h"
 #include <map>
 #include <vector>
+#include "include/cef_base.h"
 
 ///
 // Class used to create and/or parse command line arguments. Arguments with
@@ -76,20 +76,20 @@ class CefCommandLine : public virtual CefBaseRefCounted {
   // function returns false.
   ///
   /*--cef()--*/
-  virtual bool IsValid() =0;
+  virtual bool IsValid() = 0;
 
   ///
   // Returns true if the values of this object are read-only. Some APIs may
   // expose read-only objects.
   ///
   /*--cef()--*/
-  virtual bool IsReadOnly() =0;
+  virtual bool IsReadOnly() = 0;
 
   ///
   // Returns a writable copy of this object.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefCommandLine> Copy() =0;
+  virtual CefRefPtr<CefCommandLine> Copy() = 0;
 
   ///
   // Initialize the command line with the specified |argc| and |argv| values.
@@ -97,112 +97,112 @@ class CefCommandLine : public virtual CefBaseRefCounted {
   // supported on non-Windows platforms.
   ///
   /*--cef()--*/
-  virtual void InitFromArgv(int argc, const char* const* argv) =0;
+  virtual void InitFromArgv(int argc, const char* const* argv) = 0;
 
   ///
   // Initialize the command line with the string returned by calling
   // GetCommandLineW(). This method is only supported on Windows.
   ///
   /*--cef()--*/
-  virtual void InitFromString(const CefString& command_line) =0;
+  virtual void InitFromString(const CefString& command_line) = 0;
 
   ///
   // Reset the command-line switches and arguments but leave the program
   // component unchanged.
   ///
   /*--cef()--*/
-  virtual void Reset() =0;
+  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;
+  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.
   ///
   /*--cef()--*/
-  virtual CefString GetCommandLineString() =0;
+  virtual CefString GetCommandLineString() = 0;
 
   ///
   // Get the program part of the command line string (the first item).
   ///
   /*--cef()--*/
-  virtual CefString GetProgram() =0;
+  virtual CefString GetProgram() = 0;
 
   ///
   // Set the program part of the command line string (the first item).
   ///
   /*--cef()--*/
-  virtual void SetProgram(const CefString& program) =0;
+  virtual void SetProgram(const CefString& program) = 0;
 
   ///
   // Returns true if the command line has switches.
   ///
   /*--cef()--*/
-  virtual bool HasSwitches() =0;
+  virtual bool HasSwitches() = 0;
 
   ///
   // Returns true if the command line contains the given switch.
   ///
   /*--cef()--*/
-  virtual bool HasSwitch(const CefString& name) =0;
+  virtual bool HasSwitch(const CefString& name) = 0;
 
   ///
   // Returns the value associated with the given switch. If the switch has no
   // value or isn't present this method returns the empty string.
   ///
   /*--cef()--*/
-  virtual CefString GetSwitchValue(const CefString& name) =0;
+  virtual CefString GetSwitchValue(const CefString& name) = 0;
 
   ///
   // Returns the map of switch names and values. If a switch has no value an
   // empty string is returned.
   ///
   /*--cef()--*/
-  virtual void GetSwitches(SwitchMap& switches) =0;
+  virtual void GetSwitches(SwitchMap& switches) = 0;
 
   ///
   // Add a switch to the end of the command line. If the switch has no value
   // pass an empty value string.
   ///
   /*--cef()--*/
-  virtual void AppendSwitch(const CefString& name) =0;
+  virtual void AppendSwitch(const CefString& name) = 0;
 
   ///
   // Add a switch with the specified value to the end of the command line.
   ///
   /*--cef()--*/
   virtual void AppendSwitchWithValue(const CefString& name,
-                                     const CefString& value) =0;
+                                     const CefString& value) = 0;
 
   ///
   // True if there are remaining command line arguments.
   ///
   /*--cef()--*/
-  virtual bool HasArguments() =0;
+  virtual bool HasArguments() = 0;
 
   ///
   // Get the remaining command line arguments.
   ///
   /*--cef()--*/
-  virtual void GetArguments(ArgumentList& arguments) =0;
+  virtual void GetArguments(ArgumentList& arguments) = 0;
 
   ///
   // Add an argument to the end of the command line.
   ///
   /*--cef()--*/
-  virtual void AppendArgument(const CefString& argument) =0;
+  virtual void AppendArgument(const CefString& argument) = 0;
 
   ///
   // Insert a command before the current command.
   // Common for debuggers, like "valgrind" or "gdb --args".
   ///
   /*--cef()--*/
-  virtual void PrependWrapper(const CefString& wrapper) =0;
+  virtual void PrependWrapper(const CefString& wrapper) = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_COMMAND_LINE_H_
diff --git a/src/include/cef_context_menu_handler.h b/src/include/cef_context_menu_handler.h
index 7619b8ed..2a2a73e6 100644
--- a/src/include/cef_context_menu_handler.h
+++ b/src/include/cef_context_menu_handler.h
@@ -45,7 +45,6 @@
 
 class CefContextMenuParams;
 
-
 ///
 // Callback interface used for continuation of custom context menu display.
 ///
@@ -59,16 +58,15 @@ class CefRunContextMenuCallback : public virtual CefBaseRefCounted {
   // |event_flags|.
   ///
   /*--cef(capi_name=cont)--*/
-  virtual void Continue(int command_id, EventFlags event_flags) =0;
+  virtual void Continue(int command_id, EventFlags event_flags) = 0;
 
   ///
   // Cancel context menu display.
   ///
   /*--cef()--*/
-  virtual void Cancel() =0;
+  virtual void Cancel() = 0;
 };
 
-
 ///
 // Implement this interface to handle context menu events. The methods of this
 // class will be called on the UI thread.
@@ -122,7 +120,9 @@ class CefContextMenuHandler : public virtual CefBaseRefCounted {
                                     CefRefPtr<CefFrame> frame,
                                     CefRefPtr<CefContextMenuParams> params,
                                     int command_id,
-                                    EventFlags event_flags) { return false; }
+                                    EventFlags event_flags) {
+    return false;
+  }
 
   ///
   // Called when the context menu is dismissed irregardless of whether the menu
@@ -133,7 +133,6 @@ class CefContextMenuHandler : public virtual CefBaseRefCounted {
                                       CefRefPtr<CefFrame> frame) {}
 };
 
-
 ///
 // Provides information about the context menu state. The ethods of this class
 // can only be accessed on browser process the UI thread.
@@ -151,49 +150,49 @@ class CefContextMenuParams : public virtual CefBaseRefCounted {
   // Coords are relative to the associated RenderView's origin.
   ///
   /*--cef()--*/
-  virtual int GetXCoord() =0;
+  virtual int GetXCoord() = 0;
 
   ///
   // Returns the Y coordinate of the mouse where the context menu was invoked.
   // Coords are relative to the associated RenderView's origin.
   ///
   /*--cef()--*/
-  virtual int GetYCoord() =0;
+  virtual int GetYCoord() = 0;
 
   ///
   // Returns flags representing the type of node that the context menu was
   // invoked on.
   ///
   /*--cef(default_retval=CM_TYPEFLAG_NONE)--*/
-  virtual TypeFlags GetTypeFlags() =0;
+  virtual TypeFlags GetTypeFlags() = 0;
 
   ///
   // Returns the URL of the link, if any, that encloses the node that the
   // context menu was invoked on.
   ///
   /*--cef()--*/
-  virtual CefString GetLinkUrl() =0;
+  virtual CefString GetLinkUrl() = 0;
 
   ///
   // Returns the link URL, if any, to be used ONLY for "copy link address". We
   // don't validate this field in the frontend process.
   ///
   /*--cef()--*/
-  virtual CefString GetUnfilteredLinkUrl() =0;
+  virtual CefString GetUnfilteredLinkUrl() = 0;
 
   ///
   // Returns the source URL, if any, for the element that the context menu was
   // invoked on. Example of elements with source URLs are img, audio, and video.
   ///
   /*--cef()--*/
-  virtual CefString GetSourceUrl() =0;
+  virtual CefString GetSourceUrl() = 0;
 
   ///
   // Returns true if the context menu was invoked on an image which has
   // non-empty contents.
   ///
   /*--cef()--*/
-  virtual bool HasImageContents() =0;
+  virtual bool HasImageContents() = 0;
 
   ///
   // Returns the title text or the alt text if the context menu was invoked on
@@ -206,87 +205,88 @@ class CefContextMenuParams : public virtual CefBaseRefCounted {
   // Returns the URL of the top level page that the context menu was invoked on.
   ///
   /*--cef()--*/
-  virtual CefString GetPageUrl() =0;
+  virtual CefString GetPageUrl() = 0;
 
   ///
   // Returns the URL of the subframe that the context menu was invoked on.
   ///
   /*--cef()--*/
-  virtual CefString GetFrameUrl() =0;
+  virtual CefString GetFrameUrl() = 0;
 
   ///
   // Returns the character encoding of the subframe that the context menu was
   // invoked on.
   ///
   /*--cef()--*/
-  virtual CefString GetFrameCharset() =0;
+  virtual CefString GetFrameCharset() = 0;
 
   ///
   // Returns the type of context node that the context menu was invoked on.
   ///
   /*--cef(default_retval=CM_MEDIATYPE_NONE)--*/
-  virtual MediaType GetMediaType() =0;
+  virtual MediaType GetMediaType() = 0;
 
   ///
   // Returns flags representing the actions supported by the media element, if
   // any, that the context menu was invoked on.
   ///
   /*--cef(default_retval=CM_MEDIAFLAG_NONE)--*/
-  virtual MediaStateFlags GetMediaStateFlags() =0;
+  virtual MediaStateFlags GetMediaStateFlags() = 0;
 
   ///
   // Returns the text of the selection, if any, that the context menu was
   // invoked on.
   ///
   /*--cef()--*/
-  virtual CefString GetSelectionText() =0;
+  virtual CefString GetSelectionText() = 0;
 
   ///
   // Returns the text of the misspelled word, if any, that the context menu was
   // invoked on.
   ///
   /*--cef()--*/
-  virtual CefString GetMisspelledWord() =0;
+  virtual CefString GetMisspelledWord() = 0;
 
   ///
   // Returns true if suggestions exist, false otherwise. Fills in |suggestions|
   // from the spell check service for the misspelled word if there is one.
   ///
   /*--cef()--*/
-  virtual bool GetDictionarySuggestions(std::vector<CefString>& suggestions) =0;
+  virtual bool GetDictionarySuggestions(
+      std::vector<CefString>& suggestions) = 0;
 
   ///
   // Returns true if the context menu was invoked on an editable node.
   ///
   /*--cef()--*/
-  virtual bool IsEditable() =0;
+  virtual bool IsEditable() = 0;
 
   ///
   // Returns true if the context menu was invoked on an editable node where
   // spell-check is enabled.
   ///
   /*--cef()--*/
-  virtual bool IsSpellCheckEnabled() =0;
+  virtual bool IsSpellCheckEnabled() = 0;
 
   ///
   // Returns flags representing the actions supported by the editable node, if
   // any, that the context menu was invoked on.
   ///
   /*--cef(default_retval=CM_EDITFLAG_NONE)--*/
-  virtual EditStateFlags GetEditStateFlags() =0;
+  virtual EditStateFlags GetEditStateFlags() = 0;
 
   ///
   // Returns true if the context menu contains items specified by the renderer
   // process (for example, plugin placeholder or pepper plugin menu items).
   ///
   /*--cef()--*/
-  virtual bool IsCustomMenu() =0;
+  virtual bool IsCustomMenu() = 0;
 
   ///
   // Returns true if the context menu was invoked from a pepper plugin.
   ///
   /*--cef()--*/
-  virtual bool IsPepperMenu() =0;
+  virtual bool IsPepperMenu() = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_CONTEXT_MENU_HANDLER_H_
diff --git a/src/include/cef_cookie.h b/src/include/cef_cookie.h
index 28f056d8..eb57630a 100644
--- a/src/include/cef_cookie.h
+++ b/src/include/cef_cookie.h
@@ -38,9 +38,9 @@
 #define CEF_INCLUDE_CEF_COOKIE_H_
 #pragma once
 
+#include <vector>
 #include "include/cef_base.h"
 #include "include/cef_callback.h"
-#include <vector>
 
 class CefCookieVisitor;
 class CefSetCookieCallback;
@@ -64,6 +64,17 @@ class CefCookieManager : public virtual CefBaseRefCounted {
   static CefRefPtr<CefCookieManager> GetGlobalManager(
       CefRefPtr<CefCompletionCallback> callback);
 
+  ///
+  // Returns a cookie manager that neither stores nor retrieves cookies. All
+  // usage of cookies will be blocked including cookies accessed via the network
+  // (request/response headers), via JavaScript (document.cookie), and via
+  // CefCookieManager methods. No cookies will be displayed in DevTools. If you
+  // wish to only block cookies sent via the network use the CefRequestHandler
+  // CanGetCookies and CanSetCookie methods instead.
+  ///
+  /*--cef()--*/
+  static CefRefPtr<CefCookieManager> GetBlockingManager();
+
   ///
   // Creates a new cookie manager. If |path| is empty data will be stored in
   // memory only. Otherwise, data will be stored at the specified |path|. To
@@ -88,7 +99,7 @@ class CefCookieManager : public virtual CefBaseRefCounted {
   /*--cef(optional_param=callback)--*/
   virtual void SetSupportedSchemes(
       const std::vector<CefString>& schemes,
-      CefRefPtr<CefCompletionCallback> callback) =0;
+      CefRefPtr<CefCompletionCallback> callback) = 0;
 
   ///
   // Visit all cookies on the IO thread. The returned cookies are ordered by
@@ -96,7 +107,7 @@ class CefCookieManager : public virtual CefBaseRefCounted {
   // cannot be accessed.
   ///
   /*--cef()--*/
-  virtual bool VisitAllCookies(CefRefPtr<CefCookieVisitor> visitor) =0;
+  virtual bool VisitAllCookies(CefRefPtr<CefCookieVisitor> visitor) = 0;
 
   ///
   // Visit a subset of cookies on the IO thread. The results are filtered by the
@@ -108,7 +119,7 @@ class CefCookieManager : public virtual CefBaseRefCounted {
   /*--cef()--*/
   virtual bool VisitUrlCookies(const CefString& url,
                                bool includeHttpOnly,
-                               CefRefPtr<CefCookieVisitor> visitor) =0;
+                               CefRefPtr<CefCookieVisitor> visitor) = 0;
 
   ///
   // Sets a cookie given a valid URL and explicit user-provided cookie
@@ -122,7 +133,7 @@ class CefCookieManager : public virtual CefBaseRefCounted {
   /*--cef(optional_param=callback)--*/
   virtual bool SetCookie(const CefString& url,
                          const CefCookie& cookie,
-                         CefRefPtr<CefSetCookieCallback> callback) =0;
+                         CefRefPtr<CefSetCookieCallback> callback) = 0;
 
   ///
   // Delete all cookies that match the specified parameters. If both |url| and
@@ -139,7 +150,7 @@ class CefCookieManager : public virtual CefBaseRefCounted {
           optional_param=callback)--*/
   virtual bool DeleteCookies(const CefString& url,
                              const CefString& cookie_name,
-                             CefRefPtr<CefDeleteCookiesCallback> callback) =0;
+                             CefRefPtr<CefDeleteCookiesCallback> callback) = 0;
 
   ///
   // Sets the directory path that will be used for storing cookie data. If
@@ -154,7 +165,7 @@ class CefCookieManager : public virtual CefBaseRefCounted {
   /*--cef(optional_param=path,optional_param=callback)--*/
   virtual bool SetStoragePath(const CefString& path,
                               bool persist_session_cookies,
-                              CefRefPtr<CefCompletionCallback> callback) =0;
+                              CefRefPtr<CefCompletionCallback> callback) = 0;
 
   ///
   // Flush the backing store (if any) to disk. If |callback| is non-NULL it will
@@ -162,10 +173,9 @@ class CefCookieManager : public virtual CefBaseRefCounted {
   // Returns false if cookies cannot be accessed.
   ///
   /*--cef(optional_param=callback)--*/
-  virtual bool FlushStore(CefRefPtr<CefCompletionCallback> callback) =0;
+  virtual bool FlushStore(CefRefPtr<CefCompletionCallback> callback) = 0;
 };
 
-
 ///
 // Interface to implement for visiting cookie values. The methods of this class
 // will always be called on the IO thread.
@@ -181,11 +191,12 @@ class CefCookieVisitor : public virtual CefBaseRefCounted {
   // no cookies are found.
   ///
   /*--cef()--*/
-  virtual bool Visit(const CefCookie& cookie, int count, int total,
-                     bool& deleteCookie) =0;
+  virtual bool Visit(const CefCookie& cookie,
+                     int count,
+                     int total,
+                     bool& deleteCookie) = 0;
 };
 
-
 ///
 // Interface to implement to be notified of asynchronous completion via
 // CefCookieManager::SetCookie().
@@ -198,10 +209,9 @@ class CefSetCookieCallback : public virtual CefBaseRefCounted {
   // cookie was set successfully.
   ///
   /*--cef()--*/
-  virtual void OnComplete(bool success) =0;
+  virtual void OnComplete(bool success) = 0;
 };
 
-
 ///
 // Interface to implement to be notified of asynchronous completion via
 // CefCookieManager::DeleteCookies().
@@ -214,7 +224,7 @@ class CefDeleteCookiesCallback : public virtual CefBaseRefCounted {
   // number of cookies that were deleted or -1 if unknown.
   ///
   /*--cef()--*/
-  virtual void OnComplete(int num_deleted) =0;
+  virtual void OnComplete(int num_deleted) = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_COOKIE_H_
diff --git a/src/include/cef_crash_util.h b/src/include/cef_crash_util.h
index d9ecfe35..e569df74 100644
--- a/src/include/cef_crash_util.h
+++ b/src/include/cef_crash_util.h
@@ -121,14 +121,12 @@
 //
 // CrashKeys section:
 //
-// Any number of crash keys can be specified for use by the application. Crash
-// key values will be truncated based on the specified size (small = 63 bytes,
-// medium = 252 bytes, large = 1008 bytes). The value of crash keys can be set
-// from any thread or process using the CefSetCrashKeyValue function. These
-// key/value pairs will be sent to the crash server along with the crash dump
-// file. Medium and large values will be chunked for submission. For example,
-// if your key is named "mykey" then the value will be broken into ordered
-// chunks and submitted using keys named "mykey-1", "mykey-2", etc.
+// A maximum of 26 crash keys of each size can be specified for use by the
+// application. Crash key values will be truncated based on the specified size
+// (small = 64 bytes, medium = 256 bytes, large = 1024 bytes). The value of
+// crash keys can be set from any thread or process using the
+// CefSetCrashKeyValue function. These key/value pairs will be sent to the crash
+// server along with the crash dump file.
 ///
 /*--cef()--*/
 bool CefCrashReportingEnabled();
diff --git a/src/include/cef_dialog_handler.h b/src/include/cef_dialog_handler.h
index 3ca98fb5..3ce02e6c 100644
--- a/src/include/cef_dialog_handler.h
+++ b/src/include/cef_dialog_handler.h
@@ -57,16 +57,15 @@ class CefFileDialogCallback : public virtual CefBaseRefCounted {
   /*--cef(capi_name=cont,index_param=selected_accept_filter,
           optional_param=file_paths)--*/
   virtual void Continue(int selected_accept_filter,
-                        const std::vector<CefString>& file_paths) =0;
+                        const std::vector<CefString>& file_paths) = 0;
 
   ///
   // Cancel the file selection.
   ///
   /*--cef()--*/
-  virtual void Cancel() =0;
+  virtual void Cancel() = 0;
 };
 
-
 ///
 // Implement this interface to handle dialog events. The methods of this class
 // will be called on the browser process UI thread.
diff --git a/src/include/cef_display_handler.h b/src/include/cef_display_handler.h
index 6147cc79..4fdc3c31 100644
--- a/src/include/cef_display_handler.h
+++ b/src/include/cef_display_handler.h
@@ -91,8 +91,9 @@ class CefDisplayHandler : public virtual CefBaseRefCounted {
   // drawing tooltips and the return value is ignored.
   ///
   /*--cef(optional_param=text)--*/
-  virtual bool OnTooltip(CefRefPtr<CefBrowser> browser,
-                         CefString& text) { return false; }
+  virtual bool OnTooltip(CefRefPtr<CefBrowser> browser, CefString& text) {
+    return false;
+  }
 
   ///
   // Called when the browser receives a status message. |value| contains the
@@ -108,9 +109,32 @@ class CefDisplayHandler : public virtual CefBaseRefCounted {
   ///
   /*--cef(optional_param=message,optional_param=source)--*/
   virtual bool OnConsoleMessage(CefRefPtr<CefBrowser> browser,
+                                cef_log_severity_t level,
                                 const CefString& message,
                                 const CefString& source,
-                                int line) { return false; }
+                                int line) {
+    return false;
+  }
+
+  ///
+  // Called when auto-resize is enabled via CefBrowserHost::SetAutoResizeEnabled
+  // and the contents have auto-resized. |new_size| will be the desired size in
+  // view coordinates. Return true if the resize was handled or false for
+  // default handling.
+  ///
+  /*--cef()--*/
+  virtual bool OnAutoResize(CefRefPtr<CefBrowser> browser,
+                            const CefSize& new_size) {
+    return false;
+  }
+
+  ///
+  // Called when the overall page loading progress has changed. |progress|
+  // ranges from 0.0 to 1.0.
+  ///
+  /*--cef()--*/
+  virtual void OnLoadingProgressChange(CefRefPtr<CefBrowser> browser,
+                                       double progress) {}
 };
 
 #endif  // CEF_INCLUDE_CEF_DISPLAY_HANDLER_H_
diff --git a/src/include/cef_dom.h b/src/include/cef_dom.h
index f653a074..382b1930 100644
--- a/src/include/cef_dom.h
+++ b/src/include/cef_dom.h
@@ -38,8 +38,8 @@
 #define CEF_INCLUDE_CEF_DOM_H_
 #pragma once
 
-#include "include/cef_base.h"
 #include <map>
+#include "include/cef_base.h"
 
 class CefDOMDocument;
 class CefDOMNode;
@@ -59,10 +59,9 @@ class CefDOMVisitor : public virtual CefBaseRefCounted {
   // of this method.
   ///
   /*--cef()--*/
-  virtual void Visit(CefRefPtr<CefDOMDocument> document) =0;
+  virtual void Visit(CefRefPtr<CefDOMDocument> document) = 0;
 };
 
-
 ///
 // Class used to represent a DOM document. The methods of this class should only
 // be called on the render process main thread thread.
@@ -76,89 +75,88 @@ class CefDOMDocument : public virtual CefBaseRefCounted {
   // Returns the document type.
   ///
   /*--cef(default_retval=DOM_DOCUMENT_TYPE_UNKNOWN)--*/
-  virtual Type GetType() =0;
+  virtual Type GetType() = 0;
 
   ///
   // Returns the root document node.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefDOMNode> GetDocument() =0;
+  virtual CefRefPtr<CefDOMNode> GetDocument() = 0;
 
   ///
   // Returns the BODY node of an HTML document.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefDOMNode> GetBody() =0;
+  virtual CefRefPtr<CefDOMNode> GetBody() = 0;
 
   ///
   // Returns the HEAD node of an HTML document.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefDOMNode> GetHead() =0;
+  virtual CefRefPtr<CefDOMNode> GetHead() = 0;
 
   ///
   // Returns the title of an HTML document.
   ///
   /*--cef()--*/
-  virtual CefString GetTitle() =0;
+  virtual CefString GetTitle() = 0;
 
   ///
   // Returns the document element with the specified ID value.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefDOMNode> GetElementById(const CefString& id) =0;
+  virtual CefRefPtr<CefDOMNode> GetElementById(const CefString& id) = 0;
 
   ///
   // Returns the node that currently has keyboard focus.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefDOMNode> GetFocusedNode() =0;
+  virtual CefRefPtr<CefDOMNode> GetFocusedNode() = 0;
 
   ///
   // Returns true if a portion of the document is selected.
   ///
   /*--cef()--*/
-  virtual bool HasSelection() =0;
+  virtual bool HasSelection() = 0;
 
   ///
   // Returns the selection offset within the start node.
   ///
   /*--cef()--*/
-  virtual int GetSelectionStartOffset() =0;
+  virtual int GetSelectionStartOffset() = 0;
 
   ///
   // Returns the selection offset within the end node.
   ///
   /*--cef()--*/
-  virtual int GetSelectionEndOffset() =0;
+  virtual int GetSelectionEndOffset() = 0;
 
   ///
   // Returns the contents of this selection as markup.
   ///
   /*--cef()--*/
-  virtual CefString GetSelectionAsMarkup() =0;
+  virtual CefString GetSelectionAsMarkup() = 0;
 
   ///
   // Returns the contents of this selection as text.
   ///
   /*--cef()--*/
-  virtual CefString GetSelectionAsText() =0;
+  virtual CefString GetSelectionAsText() = 0;
 
   ///
   // Returns the base URL for the document.
   ///
   /*--cef()--*/
-  virtual CefString GetBaseURL() =0;
+  virtual CefString GetBaseURL() = 0;
 
   ///
   // Returns a complete URL based on the document base URL and the specified
   // partial URL.
   ///
   /*--cef()--*/
-  virtual CefString GetCompleteURL(const CefString& partialURL) =0;
+  virtual CefString GetCompleteURL(const CefString& partialURL) = 0;
 };
 
-
 ///
 // Class used to represent a DOM node. The methods of this class should only be
 // called on the render process main thread.
@@ -173,110 +171,110 @@ class CefDOMNode : public virtual CefBaseRefCounted {
   // Returns the type for this node.
   ///
   /*--cef(default_retval=DOM_NODE_TYPE_UNSUPPORTED)--*/
-  virtual Type GetType() =0;
+  virtual Type GetType() = 0;
 
   ///
   // Returns true if this is a text node.
   ///
   /*--cef()--*/
-  virtual bool IsText() =0;
+  virtual bool IsText() = 0;
 
   ///
   // Returns true if this is an element node.
   ///
   /*--cef()--*/
-  virtual bool IsElement() =0;
+  virtual bool IsElement() = 0;
 
   ///
   // Returns true if this is an editable node.
   ///
   /*--cef()--*/
-  virtual bool IsEditable() =0;
+  virtual bool IsEditable() = 0;
 
   ///
   // Returns true if this is a form control element node.
   ///
   /*--cef()--*/
-  virtual bool IsFormControlElement() =0;
+  virtual bool IsFormControlElement() = 0;
 
   ///
   // Returns the type of this form control element node.
   ///
   /*--cef()--*/
-  virtual CefString GetFormControlElementType() =0;
+  virtual CefString GetFormControlElementType() = 0;
 
   ///
   // Returns true if this object is pointing to the same handle as |that|
   // object.
   ///
   /*--cef()--*/
-  virtual bool IsSame(CefRefPtr<CefDOMNode> that) =0;
+  virtual bool IsSame(CefRefPtr<CefDOMNode> that) = 0;
 
   ///
   // Returns the name of this node.
   ///
   /*--cef()--*/
-  virtual CefString GetName() =0;
+  virtual CefString GetName() = 0;
 
   ///
   // Returns the value of this node.
   ///
   /*--cef()--*/
-  virtual CefString GetValue() =0;
+  virtual CefString GetValue() = 0;
 
   ///
   // Set the value of this node. Returns true on success.
   ///
   /*--cef()--*/
-  virtual bool SetValue(const CefString& value) =0;
+  virtual bool SetValue(const CefString& value) = 0;
 
   ///
   // Returns the contents of this node as markup.
   ///
   /*--cef()--*/
-  virtual CefString GetAsMarkup() =0;
+  virtual CefString GetAsMarkup() = 0;
 
   ///
   // Returns the document associated with this node.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefDOMDocument> GetDocument() =0;
+  virtual CefRefPtr<CefDOMDocument> GetDocument() = 0;
 
   ///
   // Returns the parent node.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefDOMNode> GetParent() =0;
+  virtual CefRefPtr<CefDOMNode> GetParent() = 0;
 
   ///
   // Returns the previous sibling node.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefDOMNode> GetPreviousSibling() =0;
+  virtual CefRefPtr<CefDOMNode> GetPreviousSibling() = 0;
 
   ///
   // Returns the next sibling node.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefDOMNode> GetNextSibling() =0;
+  virtual CefRefPtr<CefDOMNode> GetNextSibling() = 0;
 
   ///
   // Returns true if this node has child nodes.
   ///
   /*--cef()--*/
-  virtual bool HasChildren() =0;
+  virtual bool HasChildren() = 0;
 
   ///
   // Return the first child node.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefDOMNode> GetFirstChild() =0;
+  virtual CefRefPtr<CefDOMNode> GetFirstChild() = 0;
 
   ///
   // Returns the last child node.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefDOMNode> GetLastChild() =0;
+  virtual CefRefPtr<CefDOMNode> GetLastChild() = 0;
 
   // The following methods are valid only for element nodes.
 
@@ -284,31 +282,31 @@ class CefDOMNode : public virtual CefBaseRefCounted {
   // Returns the tag name of this element.
   ///
   /*--cef()--*/
-  virtual CefString GetElementTagName() =0;
+  virtual CefString GetElementTagName() = 0;
 
   ///
   // Returns true if this element has attributes.
   ///
   /*--cef()--*/
-  virtual bool HasElementAttributes() =0;
+  virtual bool HasElementAttributes() = 0;
 
   ///
   // Returns true if this element has an attribute named |attrName|.
   ///
   /*--cef()--*/
-  virtual bool HasElementAttribute(const CefString& attrName) =0;
+  virtual bool HasElementAttribute(const CefString& attrName) = 0;
 
   ///
   // Returns the element attribute named |attrName|.
   ///
   /*--cef()--*/
-  virtual CefString GetElementAttribute(const CefString& attrName) =0;
+  virtual CefString GetElementAttribute(const CefString& attrName) = 0;
 
   ///
   // Returns a map of all element attributes.
   ///
   /*--cef()--*/
-  virtual void GetElementAttributes(AttributeMap& attrMap) =0;
+  virtual void GetElementAttributes(AttributeMap& attrMap) = 0;
 
   ///
   // Set the value for the element attribute named |attrName|. Returns true on
@@ -316,19 +314,19 @@ class CefDOMNode : public virtual CefBaseRefCounted {
   ///
   /*--cef()--*/
   virtual bool SetElementAttribute(const CefString& attrName,
-                                   const CefString& value) =0;
+                                   const CefString& value) = 0;
 
   ///
   // Returns the inner text of the element.
   ///
   /*--cef()--*/
-  virtual CefString GetElementInnerText() =0;
+  virtual CefString GetElementInnerText() = 0;
 
   ///
   // Returns the bounds of the element.
   ///
   /*--cef()--*/
-  virtual CefRect GetElementBounds() =0;
+  virtual CefRect GetElementBounds() = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_DOM_H_
diff --git a/src/include/cef_download_handler.h b/src/include/cef_download_handler.h
index b32c248e..dfaeba50 100644
--- a/src/include/cef_download_handler.h
+++ b/src/include/cef_download_handler.h
@@ -42,7 +42,6 @@
 #include "include/cef_browser.h"
 #include "include/cef_download_item.h"
 
-
 ///
 // Callback interface used to asynchronously continue a download.
 ///
@@ -56,10 +55,9 @@ class CefBeforeDownloadCallback : public virtual CefBaseRefCounted {
   // if you do wish to show the default "Save As" dialog.
   ///
   /*--cef(capi_name=cont,optional_param=download_path)--*/
-  virtual void Continue(const CefString& download_path, bool show_dialog) =0;
+  virtual void Continue(const CefString& download_path, bool show_dialog) = 0;
 };
 
-
 ///
 // Callback interface used to asynchronously cancel a download.
 ///
@@ -70,22 +68,21 @@ class CefDownloadItemCallback : public virtual CefBaseRefCounted {
   // Call to cancel the download.
   ///
   /*--cef()--*/
-  virtual void Cancel() =0;
+  virtual void Cancel() = 0;
 
   ///
   // Call to pause the download.
   ///
   /*--cef()--*/
-  virtual void Pause() =0;
+  virtual void Pause() = 0;
 
   ///
   // Call to resume the download.
   ///
   /*--cef()--*/
-  virtual void Resume() =0;
+  virtual void Resume() = 0;
 };
 
-
 ///
 // Class used to handle file downloads. The methods of this class will called
 // on the browser process UI thread.
@@ -105,7 +102,7 @@ class CefDownloadHandler : public virtual CefBaseRefCounted {
       CefRefPtr<CefBrowser> browser,
       CefRefPtr<CefDownloadItem> download_item,
       const CefString& suggested_name,
-      CefRefPtr<CefBeforeDownloadCallback> callback) =0;
+      CefRefPtr<CefBeforeDownloadCallback> callback) = 0;
 
   ///
   // Called when a download's status or progress information has been updated.
@@ -115,10 +112,9 @@ class CefDownloadHandler : public virtual CefBaseRefCounted {
   // this method.
   ///
   /*--cef()--*/
-  virtual void OnDownloadUpdated(
-      CefRefPtr<CefBrowser> browser,
-      CefRefPtr<CefDownloadItem> download_item,
-      CefRefPtr<CefDownloadItemCallback> callback) {}
+  virtual void OnDownloadUpdated(CefRefPtr<CefBrowser> browser,
+                                 CefRefPtr<CefDownloadItem> download_item,
+                                 CefRefPtr<CefDownloadItemCallback> callback) {}
 };
 
 #endif  // CEF_INCLUDE_CEF_DOWNLOAD_HANDLER_H_
diff --git a/src/include/cef_download_item.h b/src/include/cef_download_item.h
index b0ea797f..930f53bb 100644
--- a/src/include/cef_download_item.h
+++ b/src/include/cef_download_item.h
@@ -51,104 +51,104 @@ class CefDownloadItem : public virtual CefBaseRefCounted {
   // function returns false.
   ///
   /*--cef()--*/
-  virtual bool IsValid() =0;
+  virtual bool IsValid() = 0;
 
   ///
   // Returns true if the download is in progress.
   ///
   /*--cef()--*/
-  virtual bool IsInProgress() =0;
+  virtual bool IsInProgress() = 0;
 
   ///
   // Returns true if the download is complete.
   ///
   /*--cef()--*/
-  virtual bool IsComplete() =0;
+  virtual bool IsComplete() = 0;
 
   ///
   // Returns true if the download has been canceled or interrupted.
   ///
   /*--cef()--*/
-  virtual bool IsCanceled() =0;
+  virtual bool IsCanceled() = 0;
 
   ///
   // Returns a simple speed estimate in bytes/s.
   ///
   /*--cef()--*/
-  virtual int64 GetCurrentSpeed() =0;
+  virtual int64 GetCurrentSpeed() = 0;
 
   ///
   // Returns the rough percent complete or -1 if the receive total size is
   // unknown.
   ///
   /*--cef()--*/
-  virtual int GetPercentComplete() =0;
+  virtual int GetPercentComplete() = 0;
 
   ///
   // Returns the total number of bytes.
   ///
   /*--cef()--*/
-  virtual int64 GetTotalBytes() =0;
+  virtual int64 GetTotalBytes() = 0;
 
   ///
   // Returns the number of received bytes.
   ///
   /*--cef()--*/
-  virtual int64 GetReceivedBytes() =0;
+  virtual int64 GetReceivedBytes() = 0;
 
   ///
   // Returns the time that the download started.
   ///
   /*--cef()--*/
-  virtual CefTime GetStartTime() =0;
+  virtual CefTime GetStartTime() = 0;
 
   ///
   // Returns the time that the download ended.
   ///
   /*--cef()--*/
-  virtual CefTime GetEndTime() =0;
+  virtual CefTime GetEndTime() = 0;
 
   ///
   // Returns the full path to the downloaded or downloading file.
   ///
   /*--cef()--*/
-  virtual CefString GetFullPath() =0;
+  virtual CefString GetFullPath() = 0;
 
   ///
   // Returns the unique identifier for this download.
   ///
   /*--cef()--*/
-  virtual uint32 GetId() =0;
+  virtual uint32 GetId() = 0;
 
   ///
   // Returns the URL.
   ///
   /*--cef()--*/
-  virtual CefString GetURL() =0;
+  virtual CefString GetURL() = 0;
 
   ///
   // Returns the original URL before any redirections.
   ///
   /*--cef()--*/
-  virtual CefString GetOriginalUrl() =0;
+  virtual CefString GetOriginalUrl() = 0;
 
   ///
   // Returns the suggested file name.
   ///
   /*--cef()--*/
-  virtual CefString GetSuggestedFileName() =0;
+  virtual CefString GetSuggestedFileName() = 0;
 
   ///
   // Returns the content disposition.
   ///
   /*--cef()--*/
-  virtual CefString GetContentDisposition() =0;
+  virtual CefString GetContentDisposition() = 0;
 
   ///
   // Returns the mime type.
   ///
   /*--cef()--*/
-  virtual CefString GetMimeType() =0;
+  virtual CefString GetMimeType() = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_DOWNLOAD_ITEM_H_
diff --git a/src/include/cef_drag_data.h b/src/include/cef_drag_data.h
index de37ecc4..35661f87 100644
--- a/src/include/cef_drag_data.h
+++ b/src/include/cef_drag_data.h
@@ -38,10 +38,10 @@
 #define CEF_INCLUDE_CEF_DRAG_DATA_H_
 #pragma once
 
+#include <vector>
 #include "include/cef_base.h"
 #include "include/cef_image.h"
 #include "include/cef_stream.h"
-#include <vector>
 
 ///
 // Class used to represent drag data. The methods of this class may be called
@@ -60,74 +60,74 @@ class CefDragData : public virtual CefBaseRefCounted {
   // Returns a copy of the current object.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefDragData> Clone() =0;
+  virtual CefRefPtr<CefDragData> Clone() = 0;
 
   ///
   // Returns true if this object is read-only.
   ///
   /*--cef()--*/
-  virtual bool IsReadOnly() =0;
+  virtual bool IsReadOnly() = 0;
 
   ///
   // Returns true if the drag data is a link.
   ///
   /*--cef()--*/
-  virtual bool IsLink() =0;
+  virtual bool IsLink() = 0;
 
   ///
   // Returns true if the drag data is a text or html fragment.
   ///
   /*--cef()--*/
-  virtual bool IsFragment() =0;
+  virtual bool IsFragment() = 0;
 
   ///
   // Returns true if the drag data is a file.
   ///
   /*--cef()--*/
-  virtual bool IsFile() =0;
+  virtual bool IsFile() = 0;
 
   ///
   // Return the link URL that is being dragged.
   ///
   /*--cef()--*/
-  virtual CefString GetLinkURL() =0;
+  virtual CefString GetLinkURL() = 0;
 
   ///
   // Return the title associated with the link being dragged.
   ///
   /*--cef()--*/
-  virtual CefString GetLinkTitle() =0;
+  virtual CefString GetLinkTitle() = 0;
 
   ///
   // Return the metadata, if any, associated with the link being dragged.
   ///
   /*--cef()--*/
-  virtual CefString GetLinkMetadata() =0;
+  virtual CefString GetLinkMetadata() = 0;
 
   ///
   // Return the plain text fragment that is being dragged.
   ///
   /*--cef()--*/
-  virtual CefString GetFragmentText() =0;
+  virtual CefString GetFragmentText() = 0;
 
   ///
   // Return the text/html fragment that is being dragged.
   ///
   /*--cef()--*/
-  virtual CefString GetFragmentHtml() =0;
+  virtual CefString GetFragmentHtml() = 0;
 
   ///
   // Return the base URL that the fragment came from. This value is used for
   // resolving relative URLs and may be empty.
   ///
   /*--cef()--*/
-  virtual CefString GetFragmentBaseURL() =0;
+  virtual CefString GetFragmentBaseURL() = 0;
 
   ///
   // Return the name of the file being dragged out of the browser window.
   ///
   /*--cef()--*/
-  virtual CefString GetFileName() =0;
+  virtual CefString GetFileName() = 0;
 
   ///
   // Write the contents of the file being dragged out of the web view into
@@ -136,50 +136,50 @@ class CefDragData : public virtual CefBaseRefCounted {
   // Call GetFileName() to get a suggested name for the file.
   ///
   /*--cef(optional_param=writer)--*/
-  virtual size_t GetFileContents(CefRefPtr<CefStreamWriter> writer) =0;
+  virtual size_t GetFileContents(CefRefPtr<CefStreamWriter> writer) = 0;
 
   ///
   // Retrieve the list of file names that are being dragged into the browser
   // window.
   ///
   /*--cef()--*/
-  virtual bool GetFileNames(std::vector<CefString>& names) =0;
+  virtual bool GetFileNames(std::vector<CefString>& names) = 0;
 
   ///
   // Set the link URL that is being dragged.
   ///
   /*--cef(optional_param=url)--*/
-  virtual void SetLinkURL(const CefString& url) =0;
+  virtual void SetLinkURL(const CefString& url) = 0;
 
   ///
   // Set the title associated with the link being dragged.
   ///
   /*--cef(optional_param=title)--*/
-  virtual void SetLinkTitle(const CefString& title) =0;
+  virtual void SetLinkTitle(const CefString& title) = 0;
 
   ///
   // Set the metadata associated with the link being dragged.
   ///
   /*--cef(optional_param=data)--*/
-  virtual void SetLinkMetadata(const CefString& data) =0;
+  virtual void SetLinkMetadata(const CefString& data) = 0;
 
   ///
   // Set the plain text fragment that is being dragged.
   ///
   /*--cef(optional_param=text)--*/
-  virtual void SetFragmentText(const CefString& text) =0;
+  virtual void SetFragmentText(const CefString& text) = 0;
 
   ///
   // Set the text/html fragment that is being dragged.
   ///
   /*--cef(optional_param=html)--*/
-  virtual void SetFragmentHtml(const CefString& html) =0;
+  virtual void SetFragmentHtml(const CefString& html) = 0;
 
   ///
   // Set the base URL that the fragment came from.
   ///
   /*--cef(optional_param=base_url)--*/
-  virtual void SetFragmentBaseURL(const CefString& base_url) =0;
+  virtual void SetFragmentBaseURL(const CefString& base_url) = 0;
 
   ///
   // Reset the file contents. You should do this before calling
@@ -187,31 +187,33 @@ class CefDragData : public virtual CefBaseRefCounted {
   // drag in this kind of data.
   ///
   /*--cef()--*/
-  virtual void ResetFileContents() =0;
+  virtual void ResetFileContents() = 0;
 
   ///
   // Add a file that is being dragged into the webview.
   ///
   /*--cef(optional_param=display_name)--*/
-  virtual void AddFile(const CefString& path, const CefString& display_name) =0;
+  virtual void AddFile(const CefString& path,
+                       const CefString& display_name) = 0;
 
   ///
-  // Get image representation of drag data (may be NULL).
+  // Get the image representation of drag data. May return NULL if no image
+  // representation is available.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefImage> GetImage() =0;
+  virtual CefRefPtr<CefImage> GetImage() = 0;
 
   ///
-  // Get image hotspot (drag start location relative to image dimensions).
+  // Get the image hotspot (drag start location relative to image dimensions).
   ///
   /*--cef()--*/
-  virtual CefPoint GetImageHotspot() =0;
+  virtual CefPoint GetImageHotspot() = 0;
 
   ///
-  // Whether image representation of drag data is available.
+  // Returns true if an image representation of drag data is available.
   ///
   /*--cef()--*/
-  virtual bool HasImage() =0;
+  virtual bool HasImage() = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_DRAG_DATA_H_
diff --git a/src/include/cef_drag_handler.h b/src/include/cef_drag_handler.h
index aee01366..0410c0d8 100644
--- a/src/include/cef_drag_handler.h
+++ b/src/include/cef_drag_handler.h
@@ -39,8 +39,8 @@
 #pragma once
 
 #include "include/cef_base.h"
-#include "include/cef_drag_data.h"
 #include "include/cef_browser.h"
+#include "include/cef_drag_data.h"
 
 ///
 // Implement this interface to handle events related to dragging. The methods of
@@ -60,7 +60,9 @@ class CefDragHandler : public virtual CefBaseRefCounted {
   /*--cef()--*/
   virtual bool OnDragEnter(CefRefPtr<CefBrowser> browser,
                            CefRefPtr<CefDragData> dragData,
-                           DragOperationsMask mask) { return false; }
+                           DragOperationsMask mask) {
+    return false;
+  }
 
   ///
   // Called whenever draggable regions for the browser window change. These can
diff --git a/src/include/cef_extension.h b/src/include/cef_extension.h
new file mode 100644
index 00000000..c34d0132
--- /dev/null
+++ b/src/include/cef_extension.h
@@ -0,0 +1,117 @@
+// Copyright (c) 2017 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
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// ---------------------------------------------------------------------------
+//
+// The contents of this file must follow a specific format in order to
+// support the CEF translator tool. See the translator.README.txt file in the
+// tools directory for more information.
+//
+
+#ifndef CEF_INCLUDE_CEF_EXTENSION_H_
+#define CEF_INCLUDE_CEF_EXTENSION_H_
+#pragma once
+
+#include "include/cef_base.h"
+#include "include/cef_values.h"
+
+class CefExtensionHandler;
+class CefRequestContext;
+
+///
+// Object representing an extension. Methods may be called on any thread unless
+// otherwise indicated.
+///
+/*--cef(source=library)--*/
+class CefExtension : public CefBaseRefCounted {
+ public:
+  ///
+  // Returns the unique extension identifier. This is calculated based on the
+  // extension public key, if available, or on the extension path. See
+  // https://developer.chrome.com/extensions/manifest/key for details.
+  ///
+  /*--cef()--*/
+  virtual CefString GetIdentifier() = 0;
+
+  ///
+  // Returns the absolute path to the extension directory on disk. This value
+  // will be prefixed with PK_DIR_RESOURCES if a relative path was passed to
+  // CefRequestContext::LoadExtension.
+  ///
+  /*--cef()--*/
+  virtual CefString GetPath() = 0;
+
+  ///
+  // Returns the extension manifest contents as a CefDictionaryValue object. See
+  // https://developer.chrome.com/extensions/manifest for details.
+  ///
+  /*--cef()--*/
+  virtual CefRefPtr<CefDictionaryValue> GetManifest() = 0;
+
+  ///
+  // Returns true if this object is the same extension as |that| object.
+  // Extensions are considered the same if identifier, path and loader context
+  // match.
+  ///
+  /*--cef()--*/
+  virtual bool IsSame(CefRefPtr<CefExtension> that) = 0;
+
+  ///
+  // Returns the handler for this extension. Will return NULL for internal
+  // extensions or if no handler was passed to CefRequestContext::LoadExtension.
+  ///
+  /*--cef()--*/
+  virtual CefRefPtr<CefExtensionHandler> GetHandler() = 0;
+
+  ///
+  // Returns the request context that loaded this extension. Will return NULL
+  // for internal extensions or if the extension has been unloaded. See the
+  // CefRequestContext::LoadExtension documentation for more information about
+  // loader contexts. Must be called on the browser process UI thread.
+  ///
+  /*--cef()--*/
+  virtual CefRefPtr<CefRequestContext> GetLoaderContext() = 0;
+
+  ///
+  // Returns true if this extension is currently loaded. Must be called on the
+  // browser process UI thread.
+  ///
+  /*--cef()--*/
+  virtual bool IsLoaded() = 0;
+
+  ///
+  // Unload this extension if it is not an internal extension and is currently
+  // loaded. Will result in a call to CefExtensionHandler::OnExtensionUnloaded
+  // on success.
+  ///
+  /*--cef()--*/
+  virtual void Unload() = 0;
+};
+
+#endif  // CEF_INCLUDE_CEF_EXTENSION_H_
diff --git a/src/include/cef_extension_handler.h b/src/include/cef_extension_handler.h
new file mode 100644
index 00000000..7b0b86a3
--- /dev/null
+++ b/src/include/cef_extension_handler.h
@@ -0,0 +1,199 @@
+// Copyright (c) 2017 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
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// ---------------------------------------------------------------------------
+//
+// The contents of this file must follow a specific format in order to
+// support the CEF translator tool. See the translator.README.txt file in the
+// tools directory for more information.
+//
+
+#ifndef CEF_INCLUDE_CEF_EXTENSION_HANDLER_H_
+#define CEF_INCLUDE_CEF_EXTENSION_HANDLER_H_
+#pragma once
+
+#include "include/cef_base.h"
+#include "include/cef_browser.h"
+#include "include/cef_extension.h"
+#include "include/cef_stream.h"
+
+class CefClient;
+
+///
+// Callback interface used for asynchronous continuation of
+// CefExtensionHandler::GetExtensionResource.
+///
+/*--cef(source=library)--*/
+class CefGetExtensionResourceCallback : public CefBaseRefCounted {
+ public:
+  ///
+  // Continue the request. Read the resource contents from |stream|.
+  ///
+  /*--cef(capi_name=cont,optional_param=stream)--*/
+  virtual void Continue(CefRefPtr<CefStreamReader> stream) = 0;
+
+  ///
+  // Cancel the request.
+  ///
+  /*--cef()--*/
+  virtual void Cancel() = 0;
+};
+
+///
+// Implement this interface to handle events related to browser extensions.
+// The methods of this class will be called on the UI thread. See
+// CefRequestContext::LoadExtension for information about extension loading.
+///
+/*--cef(source=client)--*/
+class CefExtensionHandler : public virtual CefBaseRefCounted {
+ public:
+  ///
+  // Called if the CefRequestContext::LoadExtension request fails. |result| will
+  // be the error code.
+  ///
+  /*--cef()--*/
+  virtual void OnExtensionLoadFailed(cef_errorcode_t result) {}
+
+  ///
+  // Called if the CefRequestContext::LoadExtension request succeeds.
+  // |extension| is the loaded extension.
+  ///
+  /*--cef()--*/
+  virtual void OnExtensionLoaded(CefRefPtr<CefExtension> extension) {}
+
+  ///
+  // Called after the CefExtension::Unload request has completed.
+  ///
+  /*--cef()--*/
+  virtual void OnExtensionUnloaded(CefRefPtr<CefExtension> extension) {}
+
+  ///
+  // Called when an extension needs a browser to host a background script
+  // specified via the "background" manifest key. The browser will have no
+  // visible window and cannot be displayed. |extension| is the extension that
+  // is loading the background script. |url| is an internally generated
+  // reference to an HTML page that will be used to load the background script
+  // via a <script> src attribute. To allow creation of the browser optionally
+  // modify |client| and |settings| and return false. To cancel creation of the
+  // browser (and consequently cancel load of the background script) return
+  // true. Successful creation will be indicated by a call to
+  // CefLifeSpanHandler::OnAfterCreated, and CefBrowserHost::IsBackgroundHost
+  // will return true for the resulting browser. See
+  // https://developer.chrome.com/extensions/event_pages for more information
+  // about extension background script usage.
+  ///
+  /*--cef()--*/
+  virtual bool OnBeforeBackgroundBrowser(CefRefPtr<CefExtension> extension,
+                                         const CefString& url,
+                                         CefRefPtr<CefClient>& client,
+                                         CefBrowserSettings& settings) {
+    return false;
+  }
+
+  ///
+  // Called when an extension API (e.g. chrome.tabs.create) requests creation of
+  // a new browser. |extension| and |browser| are the source of the API call.
+  // |active_browser| may optionally be specified via the windowId property or
+  // returned via the GetActiveBrowser() callback and provides the default
+  // |client| and |settings| values for the new browser. |index| is the position
+  // value optionally specified via the index property. |url| is the URL that
+  // will be loaded in the browser. |active| is true if the new browser should
+  // be active when opened.  To allow creation of the browser optionally modify
+  // |windowInfo|, |client| and |settings| and return false. To cancel creation
+  // of the browser return true. Successful creation will be indicated by a call
+  // to CefLifeSpanHandler::OnAfterCreated. Any modifications to |windowInfo|
+  // will be ignored if |active_browser| is wrapped in a CefBrowserView.
+  ///
+  /*--cef()--*/
+  virtual bool OnBeforeBrowser(CefRefPtr<CefExtension> extension,
+                               CefRefPtr<CefBrowser> browser,
+                               CefRefPtr<CefBrowser> active_browser,
+                               int index,
+                               const CefString& url,
+                               bool active,
+                               CefWindowInfo& windowInfo,
+                               CefRefPtr<CefClient>& client,
+                               CefBrowserSettings& settings) {
+    return false;
+  }
+
+  ///
+  // Called when no tabId is specified to an extension API call that accepts a
+  // tabId parameter (e.g. chrome.tabs.*). |extension| and |browser| are the
+  // source of the API call. Return the browser that will be acted on by the API
+  // call or return NULL to act on |browser|. The returned browser must share
+  // the same CefRequestContext as |browser|. Incognito browsers should not be
+  // considered unless the source extension has incognito access enabled, in
+  // which case |include_incognito| will be true.
+  ///
+  /*--cef()--*/
+  virtual CefRefPtr<CefBrowser> GetActiveBrowser(
+      CefRefPtr<CefExtension> extension,
+      CefRefPtr<CefBrowser> browser,
+      bool include_incognito) {
+    return NULL;
+  }
+
+  ///
+  // Called when the tabId associated with |target_browser| is specified to an
+  // extension API call that accepts a tabId parameter (e.g. chrome.tabs.*).
+  // |extension| and |browser| are the source of the API call. Return true
+  // to allow access of false to deny access. Access to incognito browsers
+  // should not be allowed unless the source extension has incognito access
+  // enabled, in which case |include_incognito| will be true.
+  ///
+  /*--cef()--*/
+  virtual bool CanAccessBrowser(CefRefPtr<CefExtension> extension,
+                                CefRefPtr<CefBrowser> browser,
+                                bool include_incognito,
+                                CefRefPtr<CefBrowser> target_browser) {
+    return true;
+  }
+
+  ///
+  // Called to retrieve an extension resource that would normally be loaded from
+  // disk (e.g. if a file parameter is specified to chrome.tabs.executeScript).
+  // |extension| and |browser| are the source of the resource request. |file| is
+  // the requested relative file path. To handle the resource request return
+  // true and execute |callback| either synchronously or asynchronously. For the
+  // default behavior which reads the resource from the extension directory on
+  // disk return false. Localization substitutions will not be applied to
+  // resources handled via this method.
+  ///
+  /*--cef()--*/
+  virtual bool GetExtensionResource(
+      CefRefPtr<CefExtension> extension,
+      CefRefPtr<CefBrowser> browser,
+      const CefString& file,
+      CefRefPtr<CefGetExtensionResourceCallback> callback) {
+    return false;
+  }
+};
+
+#endif  // CEF_INCLUDE_CEF_EXTENSION_HANDLER_H_
diff --git a/src/include/cef_file_util.h b/src/include/cef_file_util.h
index d18f886c..8dd1ff64 100644
--- a/src/include/cef_file_util.h
+++ b/src/include/cef_file_util.h
@@ -115,4 +115,15 @@ bool CefZipDirectory(const CefString& src_dir,
                      const CefString& dest_file,
                      bool include_hidden_files);
 
+///
+// Loads the existing "Certificate Revocation Lists" file that is managed by
+// Google Chrome. This file can generally be found in Chrome's User Data
+// directory (e.g. "C:\Users\[User]\AppData\Local\Google\Chrome\User Data\" on
+// Windows) and is updated periodically by Chrome's component updater service.
+// Must be called in the browser process after the context has been initialized.
+// See https://dev.chromium.org/Home/chromium-security/crlsets for background.
+///
+/*--cef()--*/
+void CefLoadCRLSetsFile(const CefString& path);
+
 #endif  // CEF_INCLUDE_CEF_FILE_UTIL_H_
diff --git a/src/include/cef_focus_handler.h b/src/include/cef_focus_handler.h
index 27352fa2..6fd44f5d 100644
--- a/src/include/cef_focus_handler.h
+++ b/src/include/cef_focus_handler.h
@@ -59,8 +59,7 @@ class CefFocusHandler : public virtual CefBaseRefCounted {
   // if the browser is giving focus to the previous component.
   ///
   /*--cef()--*/
-  virtual void OnTakeFocus(CefRefPtr<CefBrowser> browser,
-                           bool next) {}
+  virtual void OnTakeFocus(CefRefPtr<CefBrowser> browser, bool next) {}
 
   ///
   // Called when the browser component is requesting focus. |source| indicates
@@ -68,8 +67,9 @@ class CefFocusHandler : public virtual CefBaseRefCounted {
   // focus to be set or true to cancel setting the focus.
   ///
   /*--cef()--*/
-  virtual bool OnSetFocus(CefRefPtr<CefBrowser> browser,
-                          FocusSource source) { return false; }
+  virtual bool OnSetFocus(CefRefPtr<CefBrowser> browser, FocusSource source) {
+    return false;
+  }
 
   ///
   // Called when the browser component has received focus.
diff --git a/src/include/cef_frame.h b/src/include/cef_frame.h
index bcf680d6..47f5888b 100644
--- a/src/include/cef_frame.h
+++ b/src/include/cef_frame.h
@@ -60,49 +60,49 @@ class CefFrame : public virtual CefBaseRefCounted {
   // True if this object is currently attached to a valid frame.
   ///
   /*--cef()--*/
-  virtual bool IsValid() =0;
+  virtual bool IsValid() = 0;
 
   ///
   // Execute undo in this frame.
   ///
   /*--cef()--*/
-  virtual void Undo() =0;
+  virtual void Undo() = 0;
 
   ///
   // Execute redo in this frame.
   ///
   /*--cef()--*/
-  virtual void Redo() =0;
+  virtual void Redo() = 0;
 
   ///
   // Execute cut in this frame.
   ///
   /*--cef()--*/
-  virtual void Cut() =0;
+  virtual void Cut() = 0;
 
   ///
   // Execute copy in this frame.
   ///
   /*--cef()--*/
-  virtual void Copy() =0;
+  virtual void Copy() = 0;
 
   ///
   // Execute paste in this frame.
   ///
   /*--cef()--*/
-  virtual void Paste() =0;
+  virtual void Paste() = 0;
 
   ///
   // Execute delete in this frame.
   ///
   /*--cef(capi_name=del)--*/
-  virtual void Delete() =0;
+  virtual void Delete() = 0;
 
   ///
   // Execute select all in this frame.
   ///
   /*--cef()--*/
-  virtual void SelectAll() =0;
+  virtual void SelectAll() = 0;
 
   ///
   // Save this frame's HTML source to a temporary file and open it in the
@@ -110,33 +110,33 @@ class CefFrame : public virtual CefBaseRefCounted {
   // browser process.
   ///
   /*--cef()--*/
-  virtual void ViewSource() =0;
+  virtual void ViewSource() = 0;
 
   ///
   // Retrieve this frame's HTML source as a string sent to the specified
   // visitor.
   ///
   /*--cef()--*/
-  virtual void GetSource(CefRefPtr<CefStringVisitor> visitor) =0;
+  virtual void GetSource(CefRefPtr<CefStringVisitor> visitor) = 0;
 
   ///
   // Retrieve this frame's display text as a string sent to the specified
   // visitor.
   ///
   /*--cef()--*/
-  virtual void GetText(CefRefPtr<CefStringVisitor> visitor) =0;
+  virtual void GetText(CefRefPtr<CefStringVisitor> visitor) = 0;
 
   ///
   // Load the request represented by the |request| object.
   ///
   /*--cef()--*/
-  virtual void LoadRequest(CefRefPtr<CefRequest> request) =0;
+  virtual void LoadRequest(CefRefPtr<CefRequest> request) = 0;
 
   ///
   // Load the specified |url|.
   ///
   /*--cef()--*/
-  virtual void LoadURL(const CefString& url) =0;
+  virtual void LoadURL(const CefString& url) = 0;
 
   ///
   // Load the contents of |string_val| with the specified dummy |url|. |url|
@@ -145,7 +145,7 @@ class CefFrame : public virtual CefBaseRefCounted {
   ///
   /*--cef()--*/
   virtual void LoadString(const CefString& string_val,
-                          const CefString& url) =0;
+                          const CefString& url) = 0;
 
   ///
   // Execute a string of JavaScript code in this frame. The |script_url|
@@ -157,19 +157,19 @@ class CefFrame : public virtual CefBaseRefCounted {
   /*--cef(optional_param=script_url)--*/
   virtual void ExecuteJavaScript(const CefString& code,
                                  const CefString& script_url,
-                                 int start_line) =0;
+                                 int start_line) = 0;
 
   ///
   // Returns true if this is the main (top-level) frame.
   ///
   /*--cef()--*/
-  virtual bool IsMain() =0;
+  virtual bool IsMain() = 0;
 
   ///
   // Returns true if this is the focused frame.
   ///
   /*--cef()--*/
-  virtual bool IsFocused() =0;
+  virtual bool IsFocused() = 0;
 
   ///
   // Returns the name for this frame. If the frame has an assigned name (for
@@ -179,47 +179,47 @@ class CefFrame : public virtual CefBaseRefCounted {
   // value.
   ///
   /*--cef()--*/
-  virtual CefString GetName() =0;
+  virtual CefString GetName() = 0;
 
   ///
   // Returns the globally unique identifier for this frame or < 0 if the
   // underlying frame does not yet exist.
   ///
   /*--cef()--*/
-  virtual int64 GetIdentifier() =0;
+  virtual int64 GetIdentifier() = 0;
 
   ///
   // Returns the parent of this frame or NULL if this is the main (top-level)
   // frame.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefFrame> GetParent() =0;
+  virtual CefRefPtr<CefFrame> GetParent() = 0;
 
   ///
   // Returns the URL currently loaded in this frame.
   ///
   /*--cef()--*/
-  virtual CefString GetURL() =0;
+  virtual CefString GetURL() = 0;
 
   ///
   // Returns the browser that this frame belongs to.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefBrowser> GetBrowser() =0;
+  virtual CefRefPtr<CefBrowser> GetBrowser() = 0;
 
   ///
   // Get the V8 context associated with the frame. This method can only be
   // called from the render process.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefV8Context> GetV8Context() =0;
-  
+  virtual CefRefPtr<CefV8Context> GetV8Context() = 0;
+
   ///
   // Visit the DOM document. This method can only be called from the render
   // process.
   ///
   /*--cef()--*/
-  virtual void VisitDOM(CefRefPtr<CefDOMVisitor> visitor) =0;
+  virtual void VisitDOM(CefRefPtr<CefDOMVisitor> visitor) = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_FRAME_H_
diff --git a/src/include/cef_image.h b/src/include/cef_image.h
index 71f69ab6..3507393a 100644
--- a/src/include/cef_image.h
+++ b/src/include/cef_image.h
@@ -63,14 +63,14 @@ class CefImage : public virtual CefBaseRefCounted {
   // Returns true if this Image is empty.
   ///
   /*--cef()--*/
-  virtual bool IsEmpty() =0;
+  virtual bool IsEmpty() = 0;
 
   ///
   // Returns true if this Image and |that| Image share the same underlying
   // storage. Will also return true if both images are empty.
   ///
   /*--cef()--*/
-  virtual bool IsSame(CefRefPtr<CefImage> that) =0;
+  virtual bool IsSame(CefRefPtr<CefImage> that) = 0;
 
   ///
   // Add a bitmap image representation for |scale_factor|. Only 32-bit RGBA/BGRA
@@ -86,7 +86,7 @@ class CefImage : public virtual CefBaseRefCounted {
                          cef_color_type_t color_type,
                          cef_alpha_type_t alpha_type,
                          const void* pixel_data,
-                         size_t pixel_data_size) =0;
+                         size_t pixel_data_size) = 0;
 
   ///
   // Add a PNG image representation for |scale_factor|. |png_data| is the image
@@ -96,7 +96,7 @@ class CefImage : public virtual CefBaseRefCounted {
   /*--cef()--*/
   virtual bool AddPNG(float scale_factor,
                       const void* png_data,
-                      size_t png_data_size) =0;
+                      size_t png_data_size) = 0;
 
   ///
   // Create a JPEG image representation for |scale_factor|. |jpeg_data| is the
@@ -106,31 +106,31 @@ class CefImage : public virtual CefBaseRefCounted {
   /*--cef()--*/
   virtual bool AddJPEG(float scale_factor,
                        const void* jpeg_data,
-                       size_t jpeg_data_size) =0;
+                       size_t jpeg_data_size) = 0;
 
   ///
   // Returns the image width in density independent pixel (DIP) units.
   ///
   /*--cef()--*/
-  virtual size_t GetWidth() =0;
+  virtual size_t GetWidth() = 0;
 
   ///
   // Returns the image height in density independent pixel (DIP) units.
   ///
   /*--cef()--*/
-  virtual size_t GetHeight() =0;
+  virtual size_t GetHeight() = 0;
 
   ///
   // Returns true if this image contains a representation for |scale_factor|.
   ///
   /*--cef()--*/
-  virtual bool HasRepresentation(float scale_factor) =0;
+  virtual bool HasRepresentation(float scale_factor) = 0;
 
   ///
   // Removes the representation for |scale_factor|. Returns true on success.
   ///
   /*--cef()--*/
-  virtual bool RemoveRepresentation(float scale_factor) =0;
+  virtual bool RemoveRepresentation(float scale_factor) = 0;
 
   ///
   // Returns information for the representation that most closely matches
@@ -142,7 +142,7 @@ class CefImage : public virtual CefBaseRefCounted {
   virtual bool GetRepresentationInfo(float scale_factor,
                                      float& actual_scale_factor,
                                      int& pixel_width,
-                                     int& pixel_height) =0;
+                                     int& pixel_height) = 0;
 
   ///
   // Returns the bitmap representation that most closely matches |scale_factor|.
@@ -157,7 +157,7 @@ class CefImage : public virtual CefBaseRefCounted {
                                                 cef_color_type_t color_type,
                                                 cef_alpha_type_t alpha_type,
                                                 int& pixel_width,
-                                                int& pixel_height) =0;
+                                                int& pixel_height) = 0;
 
   ///
   // Returns the PNG representation that most closely matches |scale_factor|. If
@@ -170,7 +170,7 @@ class CefImage : public virtual CefBaseRefCounted {
   virtual CefRefPtr<CefBinaryValue> GetAsPNG(float scale_factor,
                                              bool with_transparency,
                                              int& pixel_width,
-                                             int& pixel_height) =0;
+                                             int& pixel_height) = 0;
 
   ///
   // Returns the JPEG representation that most closely matches |scale_factor|.
@@ -185,7 +185,7 @@ class CefImage : public virtual CefBaseRefCounted {
   virtual CefRefPtr<CefBinaryValue> GetAsJPEG(float scale_factor,
                                               int quality,
                                               int& pixel_width,
-                                              int& pixel_height) =0;
+                                              int& pixel_height) = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_IMAGE_H_
diff --git a/src/include/cef_jsdialog_handler.h b/src/include/cef_jsdialog_handler.h
index 4596430c..b7e09450 100644
--- a/src/include/cef_jsdialog_handler.h
+++ b/src/include/cef_jsdialog_handler.h
@@ -53,11 +53,9 @@ class CefJSDialogCallback : public virtual CefBaseRefCounted {
   // pressed. The |user_input| value should be specified for prompt dialogs.
   ///
   /*--cef(capi_name=cont,optional_param=user_input)--*/
-  virtual void Continue(bool success,
-                        const CefString& user_input) =0;
+  virtual void Continue(bool success, const CefString& user_input) = 0;
 };
 
-
 ///
 // Implement this interface to handle events related to JavaScript dialogs. The
 // methods of this class will be called on the UI thread.
@@ -118,7 +116,7 @@ class CefJSDialogHandler : public virtual CefBaseRefCounted {
   ///
   /*--cef()--*/
   virtual void OnResetDialogState(CefRefPtr<CefBrowser> browser) {}
-  
+
   ///
   // Called when the default implementation dialog is closed.
   ///
diff --git a/src/include/cef_keyboard_handler.h b/src/include/cef_keyboard_handler.h
index cd4c4d0e..386491ed 100644
--- a/src/include/cef_keyboard_handler.h
+++ b/src/include/cef_keyboard_handler.h
@@ -59,7 +59,9 @@ class CefKeyboardHandler : public virtual CefBaseRefCounted {
   virtual bool OnPreKeyEvent(CefRefPtr<CefBrowser> browser,
                              const CefKeyEvent& event,
                              CefEventHandle os_event,
-                             bool* is_keyboard_shortcut) { return false; }
+                             bool* is_keyboard_shortcut) {
+    return false;
+  }
 
   ///
   // Called after the renderer and JavaScript in the page has had a chance to
@@ -70,7 +72,9 @@ class CefKeyboardHandler : public virtual CefBaseRefCounted {
   /*--cef()--*/
   virtual bool OnKeyEvent(CefRefPtr<CefBrowser> browser,
                           const CefKeyEvent& event,
-                          CefEventHandle os_event) { return false; }
+                          CefEventHandle os_event) {
+    return false;
+  }
 };
 
 #endif  // CEF_INCLUDE_CEF_KEYBOARD_HANDLER_H_
diff --git a/src/include/cef_life_span_handler.h b/src/include/cef_life_span_handler.h
index b1acc4d7..64553018 100644
--- a/src/include/cef_life_span_handler.h
+++ b/src/include/cef_life_span_handler.h
@@ -54,7 +54,7 @@ class CefLifeSpanHandler : public virtual CefBaseRefCounted {
   typedef cef_window_open_disposition_t WindowOpenDisposition;
 
   ///
-  // Called on the IO thread before a new popup browser is created. The
+  // Called on the UI thread before a new popup browser is created. The
   // |browser| and |frame| values represent the source of the popup request. The
   // |target_url| and |target_frame_name| values indicate where the popup
   // browser should navigate and may be empty if not specified with the request.
@@ -71,7 +71,9 @@ class CefLifeSpanHandler : public virtual CefBaseRefCounted {
   // false the new browser will not be scriptable and may not be hosted in the
   // same renderer process as the source browser. Any modifications to
   // |windowInfo| will be ignored if the parent browser is wrapped in a
-  // CefBrowserView.
+  // CefBrowserView. Popup browser creation will be canceled if the parent
+  // browser is destroyed before the popup browser creation completes (indicated
+  // by a call to OnAfterCreated for the popup browser).
   ///
   /*--cef(optional_param=target_url,optional_param=target_frame_name)--*/
   virtual bool OnBeforePopup(CefRefPtr<CefBrowser> browser,
diff --git a/src/include/cef_menu_model.h b/src/include/cef_menu_model.h
index b039119a..1c9a7c09 100644
--- a/src/include/cef_menu_model.h
+++ b/src/include/cef_menu_model.h
@@ -63,39 +63,37 @@ class CefMenuModel : public virtual CefBaseRefCounted {
   // Returns true if this menu is a submenu.
   ///
   /*--cef()--*/
-  virtual bool IsSubMenu() =0;
+  virtual bool IsSubMenu() = 0;
 
   ///
   // Clears the menu. Returns true on success.
   ///
   /*--cef()--*/
-  virtual bool Clear() =0;
+  virtual bool Clear() = 0;
 
   ///
   // Returns the number of items in this menu.
   ///
   /*--cef()--*/
-  virtual int GetCount() =0;
+  virtual int GetCount() = 0;
 
   ///
   // Add a separator to the menu. Returns true on success.
   ///
   /*--cef()--*/
-  virtual bool AddSeparator() =0;
+  virtual bool AddSeparator() = 0;
 
   ///
   // Add an item to the menu. Returns true on success.
   ///
   /*--cef()--*/
-  virtual bool AddItem(int command_id,
-                       const CefString& label) =0;
+  virtual bool AddItem(int command_id, const CefString& label) = 0;
 
   ///
   // Add a check item to the menu. Returns true on success.
   ///
   /*--cef()--*/
-  virtual bool AddCheckItem(int command_id,
-                            const CefString& label) =0;
+  virtual bool AddCheckItem(int command_id, const CefString& label) = 0;
   ///
   // Add a radio item to the menu. Only a single item with the specified
   // |group_id| can be checked at a time. Returns true on success.
@@ -103,21 +101,21 @@ class CefMenuModel : public virtual CefBaseRefCounted {
   /*--cef()--*/
   virtual bool AddRadioItem(int command_id,
                             const CefString& label,
-                            int group_id) =0;
+                            int group_id) = 0;
 
   ///
   // Add a sub-menu to the menu. The new sub-menu is returned.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefMenuModel> AddSubMenu(int command_id,
-                                             const CefString& label) =0;
+                                             const CefString& label) = 0;
 
   ///
   // Insert a separator in the menu at the specified |index|. Returns true on
   // success.
   ///
   /*--cef()--*/
-  virtual bool InsertSeparatorAt(int index) =0;
+  virtual bool InsertSeparatorAt(int index) = 0;
 
   ///
   // Insert an item in the menu at the specified |index|. Returns true on
@@ -126,7 +124,7 @@ class CefMenuModel : public virtual CefBaseRefCounted {
   /*--cef()--*/
   virtual bool InsertItemAt(int index,
                             int command_id,
-                            const CefString& label) =0;
+                            const CefString& label) = 0;
 
   ///
   // Insert a check item in the menu at the specified |index|. Returns true on
@@ -135,7 +133,7 @@ class CefMenuModel : public virtual CefBaseRefCounted {
   /*--cef()--*/
   virtual bool InsertCheckItemAt(int index,
                                  int command_id,
-                                 const CefString& label) =0;
+                                 const CefString& label) = 0;
 
   ///
   // Insert a radio item in the menu at the specified |index|. Only a single
@@ -146,7 +144,7 @@ class CefMenuModel : public virtual CefBaseRefCounted {
   virtual bool InsertRadioItemAt(int index,
                                  int command_id,
                                  const CefString& label,
-                                 int group_id) =0;
+                                 int group_id) = 0;
 
   ///
   // Insert a sub-menu in the menu at the specified |index|. The new sub-menu
@@ -155,204 +153,204 @@ class CefMenuModel : public virtual CefBaseRefCounted {
   /*--cef()--*/
   virtual CefRefPtr<CefMenuModel> InsertSubMenuAt(int index,
                                                   int command_id,
-                                                  const CefString& label) =0;
+                                                  const CefString& label) = 0;
 
   ///
   // Removes the item with the specified |command_id|. Returns true on success.
   ///
   /*--cef()--*/
-  virtual bool Remove(int command_id) =0;
+  virtual bool Remove(int command_id) = 0;
 
   ///
   // Removes the item at the specified |index|. Returns true on success.
   ///
   /*--cef()--*/
-  virtual bool RemoveAt(int index) =0;
+  virtual bool RemoveAt(int index) = 0;
 
   ///
   // Returns the index associated with the specified |command_id| or -1 if not
   // found due to the command id not existing in the menu.
   ///
   /*--cef()--*/
-  virtual int GetIndexOf(int command_id) =0;
+  virtual int GetIndexOf(int command_id) = 0;
 
   ///
   // Returns the command id at the specified |index| or -1 if not found due to
   // invalid range or the index being a separator.
   ///
   /*--cef()--*/
-  virtual int GetCommandIdAt(int index) =0;
+  virtual int GetCommandIdAt(int index) = 0;
 
   ///
   // Sets the command id at the specified |index|. Returns true on success.
   ///
   /*--cef()--*/
-  virtual bool SetCommandIdAt(int index, int command_id) =0;
+  virtual bool SetCommandIdAt(int index, int command_id) = 0;
 
   ///
   // Returns the label for the specified |command_id| or empty if not found.
   ///
   /*--cef()--*/
-  virtual CefString GetLabel(int command_id) =0;
+  virtual CefString GetLabel(int command_id) = 0;
 
   ///
   // Returns the label at the specified |index| or empty if not found due to
   // invalid range or the index being a separator.
   ///
   /*--cef()--*/
-  virtual CefString GetLabelAt(int index) =0;
+  virtual CefString GetLabelAt(int index) = 0;
 
   ///
   // Sets the label for the specified |command_id|. Returns true on success.
   ///
   /*--cef()--*/
-  virtual bool SetLabel(int command_id, const CefString& label) =0;
+  virtual bool SetLabel(int command_id, const CefString& label) = 0;
 
   ///
   // Set the label at the specified |index|. Returns true on success.
   ///
   /*--cef()--*/
-  virtual bool SetLabelAt(int index, const CefString& label) =0;
+  virtual bool SetLabelAt(int index, const CefString& label) = 0;
 
   ///
   // Returns the item type for the specified |command_id|.
   ///
   /*--cef(default_retval=MENUITEMTYPE_NONE)--*/
-  virtual MenuItemType GetType(int command_id) =0;
+  virtual MenuItemType GetType(int command_id) = 0;
 
   ///
   // Returns the item type at the specified |index|.
   ///
   /*--cef(default_retval=MENUITEMTYPE_NONE)--*/
-  virtual MenuItemType GetTypeAt(int index) =0;
+  virtual MenuItemType GetTypeAt(int index) = 0;
 
   ///
   // Returns the group id for the specified |command_id| or -1 if invalid.
   ///
   /*--cef()--*/
-  virtual int GetGroupId(int command_id) =0;
+  virtual int GetGroupId(int command_id) = 0;
 
   ///
   // Returns the group id at the specified |index| or -1 if invalid.
   ///
   /*--cef()--*/
-  virtual int GetGroupIdAt(int index) =0;
+  virtual int GetGroupIdAt(int index) = 0;
 
   ///
   // Sets the group id for the specified |command_id|. Returns true on success.
   ///
   /*--cef()--*/
-  virtual bool SetGroupId(int command_id, int group_id) =0;
+  virtual bool SetGroupId(int command_id, int group_id) = 0;
 
   ///
   // Sets the group id at the specified |index|. Returns true on success.
   ///
   /*--cef()--*/
-  virtual bool SetGroupIdAt(int index, int group_id) =0;
+  virtual bool SetGroupIdAt(int index, int group_id) = 0;
 
   ///
   // Returns the submenu for the specified |command_id| or empty if invalid.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefMenuModel> GetSubMenu(int command_id) =0;
+  virtual CefRefPtr<CefMenuModel> GetSubMenu(int command_id) = 0;
 
   ///
   // Returns the submenu at the specified |index| or empty if invalid.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefMenuModel> GetSubMenuAt(int index) =0;
+  virtual CefRefPtr<CefMenuModel> GetSubMenuAt(int index) = 0;
 
   ///
   // Returns true if the specified |command_id| is visible.
   ///
   /*--cef()--*/
-  virtual bool IsVisible(int command_id) =0;
+  virtual bool IsVisible(int command_id) = 0;
 
   ///
   // Returns true if the specified |index| is visible.
   ///
   /*--cef()--*/
-  virtual bool IsVisibleAt(int index) =0;
+  virtual bool IsVisibleAt(int index) = 0;
 
   ///
   // Change the visibility of the specified |command_id|. Returns true on
   // success.
   ///
   /*--cef()--*/
-  virtual bool SetVisible(int command_id, bool visible) =0;
+  virtual bool SetVisible(int command_id, bool visible) = 0;
 
   ///
   // Change the visibility at the specified |index|. Returns true on success.
   ///
   /*--cef()--*/
-  virtual bool SetVisibleAt(int index, bool visible) =0;
+  virtual bool SetVisibleAt(int index, bool visible) = 0;
 
   ///
   // Returns true if the specified |command_id| is enabled.
   ///
   /*--cef()--*/
-  virtual bool IsEnabled(int command_id) =0;
+  virtual bool IsEnabled(int command_id) = 0;
 
   ///
   // Returns true if the specified |index| is enabled.
   ///
   /*--cef()--*/
-  virtual bool IsEnabledAt(int index) =0;
+  virtual bool IsEnabledAt(int index) = 0;
 
   ///
   // Change the enabled status of the specified |command_id|. Returns true on
   // success.
   ///
   /*--cef()--*/
-  virtual bool SetEnabled(int command_id, bool enabled) =0;
+  virtual bool SetEnabled(int command_id, bool enabled) = 0;
 
   ///
   // Change the enabled status at the specified |index|. Returns true on
   // success.
   ///
   /*--cef()--*/
-  virtual bool SetEnabledAt(int index, bool enabled) =0;
+  virtual bool SetEnabledAt(int index, bool enabled) = 0;
 
   ///
   // Returns true if the specified |command_id| is checked. Only applies to
   // check and radio items.
   ///
   /*--cef()--*/
-  virtual bool IsChecked(int command_id) =0;
+  virtual bool IsChecked(int command_id) = 0;
 
   ///
   // Returns true if the specified |index| is checked. Only applies to check
   // and radio items.
   ///
   /*--cef()--*/
-  virtual bool IsCheckedAt(int index) =0;
+  virtual bool IsCheckedAt(int index) = 0;
 
   ///
   // Check the specified |command_id|. Only applies to check and radio items.
   // Returns true on success.
   ///
   /*--cef()--*/
-  virtual bool SetChecked(int command_id, bool checked) =0;
+  virtual bool SetChecked(int command_id, bool checked) = 0;
 
   ///
   // Check the specified |index|. Only applies to check and radio items. Returns
   // true on success.
   ///
   /*--cef()--*/
-  virtual bool SetCheckedAt(int index, bool checked) =0;
+  virtual bool SetCheckedAt(int index, bool checked) = 0;
 
   ///
   // Returns true if the specified |command_id| has a keyboard accelerator
   // assigned.
   ///
   /*--cef()--*/
-  virtual bool HasAccelerator(int command_id) =0;
+  virtual bool HasAccelerator(int command_id) = 0;
 
   ///
   // Returns true if the specified |index| has a keyboard accelerator assigned.
   ///
   /*--cef()--*/
-  virtual bool HasAcceleratorAt(int index) =0;
+  virtual bool HasAcceleratorAt(int index) = 0;
 
   ///
   // Set the keyboard accelerator for the specified |command_id|. |key_code| can
@@ -363,7 +361,7 @@ class CefMenuModel : public virtual CefBaseRefCounted {
                               int key_code,
                               bool shift_pressed,
                               bool ctrl_pressed,
-                              bool alt_pressed) =0;
+                              bool alt_pressed) = 0;
 
   ///
   // Set the keyboard accelerator at the specified |index|. |key_code| can be
@@ -374,21 +372,21 @@ class CefMenuModel : public virtual CefBaseRefCounted {
                                 int key_code,
                                 bool shift_pressed,
                                 bool ctrl_pressed,
-                                bool alt_pressed) =0;
+                                bool alt_pressed) = 0;
 
   ///
   // Remove the keyboard accelerator for the specified |command_id|. Returns
   // true on success.
   ///
   /*--cef()--*/
-  virtual bool RemoveAccelerator(int command_id) =0;
+  virtual bool RemoveAccelerator(int command_id) = 0;
 
   ///
   // Remove the keyboard accelerator at the specified |index|. Returns true on
   // success.
   ///
   /*--cef()--*/
-  virtual bool RemoveAcceleratorAt(int index) =0;
+  virtual bool RemoveAcceleratorAt(int index) = 0;
 
   ///
   // Retrieves the keyboard accelerator for the specified |command_id|. Returns
@@ -399,7 +397,7 @@ class CefMenuModel : public virtual CefBaseRefCounted {
                               int& key_code,
                               bool& shift_pressed,
                               bool& ctrl_pressed,
-                              bool& alt_pressed) =0;
+                              bool& alt_pressed) = 0;
 
   ///
   // Retrieves the keyboard accelerator for the specified |index|. Returns true
@@ -410,7 +408,7 @@ class CefMenuModel : public virtual CefBaseRefCounted {
                                 int& key_code,
                                 bool& shift_pressed,
                                 bool& ctrl_pressed,
-                                bool& alt_pressed) =0;
+                                bool& alt_pressed) = 0;
 
   ///
   // Set the explicit color for |command_id| and |color_type| to |color|.
@@ -421,7 +419,7 @@ class CefMenuModel : public virtual CefBaseRefCounted {
   /*--cef()--*/
   virtual bool SetColor(int command_id,
                         cef_menu_color_type_t color_type,
-                        cef_color_t color) =0;
+                        cef_color_t color) = 0;
 
   ///
   // Set the explicit color for |command_id| and |index| to |color|. Specify a
@@ -433,7 +431,7 @@ class CefMenuModel : public virtual CefBaseRefCounted {
   /*--cef()--*/
   virtual bool SetColorAt(int index,
                           cef_menu_color_type_t color_type,
-                          cef_color_t color) =0;
+                          cef_color_t color) = 0;
 
   ///
   // Returns in |color| the color that was explicitly set for |command_id| and
@@ -443,7 +441,7 @@ class CefMenuModel : public virtual CefBaseRefCounted {
   /*--cef()--*/
   virtual bool GetColor(int command_id,
                         cef_menu_color_type_t color_type,
-                        cef_color_t& color) =0;
+                        cef_color_t& color) = 0;
 
   ///
   // Returns in |color| the color that was explicitly set for |command_id| and
@@ -454,7 +452,7 @@ class CefMenuModel : public virtual CefBaseRefCounted {
   /*--cef()--*/
   virtual bool GetColorAt(int index,
                           cef_menu_color_type_t color_type,
-                          cef_color_t& color) =0;
+                          cef_color_t& color) = 0;
 
   ///
   // Sets the font list for the specified |command_id|. If |font_list| is empty
@@ -470,8 +468,7 @@ class CefMenuModel : public virtual CefBaseRefCounted {
   // - "Arial, 14px"
   ///
   /*--cef(optional_param=font_list)--*/
-  virtual bool SetFontList(int command_id,
-                           const CefString& font_list) =0;
+  virtual bool SetFontList(int command_id, const CefString& font_list) = 0;
 
   ///
   // Sets the font list for the specified |index|. Specify an |index| value of
@@ -488,8 +485,7 @@ class CefMenuModel : public virtual CefBaseRefCounted {
   // - "Arial, 14px"
   ///
   /*--cef(optional_param=font_list)--*/
-  virtual bool SetFontListAt(int index,
-                             const CefString& font_list) =0;
+  virtual bool SetFontListAt(int index, const CefString& font_list) = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_MENU_MODEL_H_
diff --git a/src/include/cef_menu_model_delegate.h b/src/include/cef_menu_model_delegate.h
index d05b580a..e3ddfbda 100644
--- a/src/include/cef_menu_model_delegate.h
+++ b/src/include/cef_menu_model_delegate.h
@@ -57,7 +57,7 @@ class CefMenuModelDelegate : public virtual CefBaseRefCounted {
   /*--cef()--*/
   virtual void ExecuteCommand(CefRefPtr<CefMenuModel> menu_model,
                               int command_id,
-                              cef_event_flags_t event_flags) =0;
+                              cef_event_flags_t event_flags) = 0;
 
   ///
   // Called when the user moves the mouse outside the menu and over the owning
@@ -66,7 +66,7 @@ class CefMenuModelDelegate : public virtual CefBaseRefCounted {
   /*--cef()--*/
   virtual void MouseOutsideMenu(CefRefPtr<CefMenuModel> menu_model,
                                 const CefPoint& screen_point) {}
-                                
+
   ///
   // Called on unhandled open submenu keyboard commands. |is_rtl| will be true
   // if the menu is displaying a right-to-left language.
@@ -100,7 +100,9 @@ class CefMenuModelDelegate : public virtual CefBaseRefCounted {
   ///
   /*--cef()--*/
   virtual bool FormatLabel(CefRefPtr<CefMenuModel> menu_model,
-                           CefString& label) { return false; }
+                           CefString& label) {
+    return false;
+  }
 };
 
 #endif  // CEF_INCLUDE_VIEWS_CEF_MENU_MODEL_DELEGATE_H_
diff --git a/src/include/cef_navigation_entry.h b/src/include/cef_navigation_entry.h
index 9c86a338..292f5b6c 100644
--- a/src/include/cef_navigation_entry.h
+++ b/src/include/cef_navigation_entry.h
@@ -54,45 +54,45 @@ class CefNavigationEntry : public virtual CefBaseRefCounted {
   // function returns false.
   ///
   /*--cef()--*/
-  virtual bool IsValid() =0;
+  virtual bool IsValid() = 0;
 
   ///
   // Returns the actual URL of the page. For some pages this may be data: URL or
   // similar. Use GetDisplayURL() to return a display-friendly version.
   ///
   /*--cef()--*/
-  virtual CefString GetURL() =0;
+  virtual CefString GetURL() = 0;
 
   ///
   // Returns a display-friendly version of the URL.
   ///
   /*--cef()--*/
-  virtual CefString GetDisplayURL() =0;
+  virtual CefString GetDisplayURL() = 0;
 
   ///
   // Returns the original URL that was entered by the user before any redirects.
   ///
   /*--cef()--*/
-  virtual CefString GetOriginalURL() =0;
+  virtual CefString GetOriginalURL() = 0;
 
   ///
   // Returns the title set by the page. This value may be empty.
   ///
   /*--cef()--*/
-  virtual CefString GetTitle() =0;
+  virtual CefString GetTitle() = 0;
 
   ///
   // Returns the transition type which indicates what the user did to move to
   // this page from the previous page.
   ///
   /*--cef(default_retval=TT_EXPLICIT)--*/
-  virtual TransitionType GetTransitionType() =0;
+  virtual TransitionType GetTransitionType() = 0;
 
   ///
   // Returns true if this navigation includes post data.
   ///
   /*--cef()--*/
-  virtual bool HasPostData() =0;
+  virtual bool HasPostData() = 0;
 
   ///
   // Returns the time for the last known successful navigation completion. A
@@ -100,7 +100,7 @@ class CefNavigationEntry : public virtual CefBaseRefCounted {
   // 0 if the navigation has not yet completed.
   ///
   /*--cef()--*/
-  virtual CefTime GetCompletionTime() =0;
+  virtual CefTime GetCompletionTime() = 0;
 
   ///
   // Returns the HTTP status code for the last known successful navigation
@@ -108,13 +108,13 @@ class CefNavigationEntry : public virtual CefBaseRefCounted {
   // navigation has not yet completed.
   ///
   /*--cef()--*/
-  virtual int GetHttpStatusCode() =0;
+  virtual int GetHttpStatusCode() = 0;
 
   ///
   // Returns the SSL information for this navigation entry.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefSSLStatus> GetSSLStatus() =0;
+  virtual CefRefPtr<CefSSLStatus> GetSSLStatus() = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_NAVIGATION_ENTRY_H_
diff --git a/src/include/cef_origin_whitelist.h b/src/include/cef_origin_whitelist.h
index 7fed3453..ad173181 100644
--- a/src/include/cef_origin_whitelist.h
+++ b/src/include/cef_origin_whitelist.h
@@ -40,7 +40,6 @@
 
 #include "include/cef_base.h"
 
-
 ///
 // Add an entry to the cross-origin access whitelist.
 //
diff --git a/src/include/cef_parser.h b/src/include/cef_parser.h
index 44c36299..ebe75103 100644
--- a/src/include/cef_parser.h
+++ b/src/include/cef_parser.h
@@ -48,8 +48,7 @@
 // Returns false if the URL is empty or invalid.
 ///
 /*--cef()--*/
-bool CefParseURL(const CefString& url,
-                 CefURLParts& parts);
+bool CefParseURL(const CefString& url, CefURLParts& parts);
 
 ///
 // Creates a URL from the specified |parts|, which must contain a non-empty
@@ -57,8 +56,7 @@ bool CefParseURL(const CefString& url,
 // Returns false if |parts| isn't initialized as described.
 ///
 /*--cef()--*/
-bool CefCreateURL(const CefURLParts& parts,
-                  CefString& url);
+bool CefCreateURL(const CefURLParts& parts, CefString& url);
 
 ///
 // This is a convenience function for formatting a URL in a concise and human-
diff --git a/src/include/cef_print_handler.h b/src/include/cef_print_handler.h
index 50519c4f..c668bd4c 100644
--- a/src/include/cef_print_handler.h
+++ b/src/include/cef_print_handler.h
@@ -52,13 +52,13 @@ class CefPrintDialogCallback : public virtual CefBaseRefCounted {
   // Continue printing with the specified |settings|.
   ///
   /*--cef(capi_name=cont)--*/
-  virtual void Continue(CefRefPtr<CefPrintSettings> settings) =0;
+  virtual void Continue(CefRefPtr<CefPrintSettings> settings) = 0;
 
   ///
   // Cancel the printing.
   ///
   /*--cef()--*/
-  virtual void Cancel() =0;
+  virtual void Cancel() = 0;
 };
 
 ///
@@ -71,13 +71,13 @@ class CefPrintJobCallback : public virtual CefBaseRefCounted {
   // Indicate completion of the print job.
   ///
   /*--cef(capi_name=cont)--*/
-  virtual void Continue() =0;
+  virtual void Continue() = 0;
 };
 
-
 ///
-// Implement this interface to handle printing on Linux. The methods of this
-// class will be called on the browser process UI thread.
+// Implement this interface to handle printing on Linux. Each browser will have
+// only one print job in progress at a time. The methods of this class will be
+// called on the browser process UI thread.
 ///
 /*--cef(source=client)--*/
 class CefPrintHandler : public virtual CefBaseRefCounted {
@@ -89,7 +89,7 @@ class CefPrintHandler : public virtual CefBaseRefCounted {
   // window.print() or PDF extension print button).
   ///
   /*--cef()--*/
-  virtual void OnPrintStart(CefRefPtr<CefBrowser> browser) =0;
+  virtual void OnPrintStart(CefRefPtr<CefBrowser> browser) = 0;
 
   ///
   // Synchronize |settings| with client state. If |get_defaults| is true then
@@ -97,8 +97,9 @@ class CefPrintHandler : public virtual CefBaseRefCounted {
   // reference to |settings| outside of this callback.
   ///
   /*--cef()--*/
-  virtual void OnPrintSettings(CefRefPtr<CefPrintSettings> settings,
-                               bool get_defaults) =0;
+  virtual void OnPrintSettings(CefRefPtr<CefBrowser> browser,
+                               CefRefPtr<CefPrintSettings> settings,
+                               bool get_defaults) = 0;
 
   ///
   // Show the print dialog. Execute |callback| once the dialog is dismissed.
@@ -106,8 +107,9 @@ class CefPrintHandler : public virtual CefBaseRefCounted {
   // printing immediately.
   ///
   /*--cef()--*/
-  virtual bool OnPrintDialog(bool has_selection,
-                             CefRefPtr<CefPrintDialogCallback> callback) =0;
+  virtual bool OnPrintDialog(CefRefPtr<CefBrowser> browser,
+                             bool has_selection,
+                             CefRefPtr<CefPrintDialogCallback> callback) = 0;
 
   ///
   // Send the print job to the printer. Execute |callback| once the job is
@@ -115,15 +117,16 @@ class CefPrintHandler : public virtual CefBaseRefCounted {
   // immediately.
   ///
   /*--cef()--*/
-  virtual bool OnPrintJob(const CefString& document_name,
+  virtual bool OnPrintJob(CefRefPtr<CefBrowser> browser,
+                          const CefString& document_name,
                           const CefString& pdf_file_path,
-                          CefRefPtr<CefPrintJobCallback> callback) =0;
+                          CefRefPtr<CefPrintJobCallback> callback) = 0;
 
   ///
   // Reset client state related to printing.
   ///
   /*--cef()--*/
-  virtual void OnPrintReset() =0;
+  virtual void OnPrintReset(CefRefPtr<CefBrowser> browser) = 0;
 
   ///
   // Return the PDF paper size in device units. Used in combination with
diff --git a/src/include/cef_print_settings.h b/src/include/cef_print_settings.h
index 0fe2a0ba..576ac4e5 100644
--- a/src/include/cef_print_settings.h
+++ b/src/include/cef_print_settings.h
@@ -63,32 +63,32 @@ class CefPrintSettings : public virtual CefBaseRefCounted {
   // function returns false.
   ///
   /*--cef()--*/
-  virtual bool IsValid() =0;
+  virtual bool IsValid() = 0;
 
   ///
   // Returns true if the values of this object are read-only. Some APIs may
   // expose read-only objects.
   ///
   /*--cef()--*/
-  virtual bool IsReadOnly() =0;
+  virtual bool IsReadOnly() = 0;
 
   ///
   // Returns a writable copy of this object.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefPrintSettings> Copy() =0;
+  virtual CefRefPtr<CefPrintSettings> Copy() = 0;
 
   ///
   // Set the page orientation.
   ///
   /*--cef()--*/
-  virtual void SetOrientation(bool landscape) =0;
+  virtual void SetOrientation(bool landscape) = 0;
 
   ///
   // Returns true if the orientation is landscape.
   ///
   /*--cef()--*/
-  virtual bool IsLandscape() =0;
+  virtual bool IsLandscape() = 0;
 
   ///
   // Set the printer printable area in device units.
@@ -99,110 +99,109 @@ class CefPrintSettings : public virtual CefBaseRefCounted {
   virtual void SetPrinterPrintableArea(
       const CefSize& physical_size_device_units,
       const CefRect& printable_area_device_units,
-      bool landscape_needs_flip) =0;
+      bool landscape_needs_flip) = 0;
 
   ///
   // Set the device name.
   ///
   /*--cef(optional_param=name)--*/
-  virtual void SetDeviceName(const CefString& name) =0;
+  virtual void SetDeviceName(const CefString& name) = 0;
 
   ///
   // Get the device name.
   ///
   /*--cef()--*/
-  virtual CefString GetDeviceName() =0;
+  virtual CefString GetDeviceName() = 0;
 
   ///
   // Set the DPI (dots per inch).
   ///
   /*--cef()--*/
-  virtual void SetDPI(int dpi) =0;
+  virtual void SetDPI(int dpi) = 0;
 
   ///
   // Get the DPI (dots per inch).
   ///
   /*--cef()--*/
-  virtual int GetDPI() =0;
+  virtual int GetDPI() = 0;
 
   ///
   // Set the page ranges.
   ///
   /*--cef()--*/
-  virtual void SetPageRanges(const PageRangeList& ranges) =0;
+  virtual void SetPageRanges(const PageRangeList& ranges) = 0;
 
   ///
   // Returns the number of page ranges that currently exist.
   ///
   /*--cef()--*/
-  virtual size_t GetPageRangesCount() =0;
+  virtual size_t GetPageRangesCount() = 0;
 
   ///
   // Retrieve the page ranges.
   ///
   /*--cef(count_func=ranges:GetPageRangesCount)--*/
-  virtual void GetPageRanges(PageRangeList& ranges) =0;
+  virtual void GetPageRanges(PageRangeList& ranges) = 0;
 
   ///
   // Set whether only the selection will be printed.
   ///
   /*--cef()--*/
-  virtual void SetSelectionOnly(bool selection_only) =0;
+  virtual void SetSelectionOnly(bool selection_only) = 0;
 
   ///
   // Returns true if only the selection will be printed.
   ///
   /*--cef()--*/
-  virtual bool IsSelectionOnly() =0;
+  virtual bool IsSelectionOnly() = 0;
 
   ///
   // Set whether pages will be collated.
   ///
   /*--cef()--*/
-  virtual void SetCollate(bool collate) =0;
+  virtual void SetCollate(bool collate) = 0;
 
   ///
   // Returns true if pages will be collated.
   ///
   /*--cef()--*/
-  virtual bool WillCollate() =0;
+  virtual bool WillCollate() = 0;
 
   ///
   // Set the color model.
   ///
   /*--cef()--*/
-  virtual void SetColorModel(ColorModel model) =0;
+  virtual void SetColorModel(ColorModel model) = 0;
 
   ///
   // Get the color model.
   ///
   /*--cef(default_retval=COLOR_MODEL_UNKNOWN)--*/
-  virtual ColorModel GetColorModel() =0;
+  virtual ColorModel GetColorModel() = 0;
 
   ///
   // Set the number of copies.
   ///
   /*--cef()--*/
-  virtual void SetCopies(int copies) =0;
+  virtual void SetCopies(int copies) = 0;
 
   ///
   // Get the number of copies.
   ///
   /*--cef()--*/
-  virtual int GetCopies() =0;
+  virtual int GetCopies() = 0;
 
   ///
   // Set the duplex mode.
   ///
   /*--cef()--*/
-  virtual void SetDuplexMode(DuplexMode mode) =0;
+  virtual void SetDuplexMode(DuplexMode mode) = 0;
 
   ///
   // Get the duplex mode.
   ///
   /*--cef(default_retval=DUPLEX_MODE_UNKNOWN)--*/
-  virtual DuplexMode GetDuplexMode() =0;
+  virtual DuplexMode GetDuplexMode() = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_PRINT_SETTINGS_H_
-
diff --git a/src/include/cef_process_message.h b/src/include/cef_process_message.h
index a6b6a18a..c4daeb82 100644
--- a/src/include/cef_process_message.h
+++ b/src/include/cef_process_message.h
@@ -60,32 +60,32 @@ class CefProcessMessage : public virtual CefBaseRefCounted {
   // function returns false.
   ///
   /*--cef()--*/
-  virtual bool IsValid() =0;
+  virtual bool IsValid() = 0;
 
   ///
   // Returns true if the values of this object are read-only. Some APIs may
   // expose read-only objects.
   ///
   /*--cef()--*/
-  virtual bool IsReadOnly() =0;
+  virtual bool IsReadOnly() = 0;
 
   ///
   // Returns a writable copy of this object.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefProcessMessage> Copy() =0;
+  virtual CefRefPtr<CefProcessMessage> Copy() = 0;
 
   ///
   // Returns the message name.
   ///
   /*--cef()--*/
-  virtual CefString GetName() =0;
+  virtual CefString GetName() = 0;
 
   ///
   // Returns the list of arguments.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefListValue> GetArgumentList() =0;
+  virtual CefRefPtr<CefListValue> GetArgumentList() = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_MESSAGE_H_
diff --git a/src/include/cef_render_handler.h b/src/include/cef_render_handler.h
index 9c253535..38cb74a1 100644
--- a/src/include/cef_render_handler.h
+++ b/src/include/cef_render_handler.h
@@ -40,6 +40,7 @@
 
 #include <vector>
 
+#include "include/cef_accessibility_handler.h"
 #include "include/cef_base.h"
 #include "include/cef_browser.h"
 #include "include/cef_drag_data.h"
@@ -57,20 +58,30 @@ class CefRenderHandler : public virtual CefBaseRefCounted {
   typedef cef_paint_element_type_t PaintElementType;
   typedef std::vector<CefRect> RectList;
 
+  ///
+  // Return the handler for accessibility notifications. If no handler is
+  // provided the default implementation will be used.
+  ///
+  /*--cef()--*/
+  virtual CefRefPtr<CefAccessibilityHandler> GetAccessibilityHandler() {
+    return NULL;
+  }
+
   ///
   // Called to retrieve the root window rectangle in screen coordinates. Return
   // true if the rectangle was provided.
   ///
   /*--cef()--*/
-  virtual bool GetRootScreenRect(CefRefPtr<CefBrowser> browser,
-                                 CefRect& rect) { return false; }
+  virtual bool GetRootScreenRect(CefRefPtr<CefBrowser> browser, CefRect& rect) {
+    return false;
+  }
 
   ///
   // Called to retrieve the view rectangle which is relative to screen
   // coordinates. Return true if the rectangle was provided.
   ///
   /*--cef()--*/
-  virtual bool GetViewRect(CefRefPtr<CefBrowser> browser, CefRect& rect) =0;
+  virtual bool GetViewRect(CefRefPtr<CefBrowser> browser, CefRect& rect) = 0;
 
   ///
   // Called to retrieve the translation from view coordinates to actual screen
@@ -81,7 +92,9 @@ class CefRenderHandler : public virtual CefBaseRefCounted {
                               int viewX,
                               int viewY,
                               int& screenX,
-                              int& screenY) { return false; }
+                              int& screenY) {
+    return false;
+  }
 
   ///
   // Called to allow the client to fill in the CefScreenInfo object with
@@ -94,23 +107,24 @@ class CefRenderHandler : public virtual CefBaseRefCounted {
   ///
   /*--cef()--*/
   virtual bool GetScreenInfo(CefRefPtr<CefBrowser> browser,
-                             CefScreenInfo& screen_info) { return false; }
+                             CefScreenInfo& screen_info) {
+    return false;
+  }
 
   ///
   // Called when the browser wants to show or hide the popup widget. The popup
   // should be shown if |show| is true and hidden if |show| is false.
   ///
   /*--cef()--*/
-  virtual void OnPopupShow(CefRefPtr<CefBrowser> browser,
-                           bool show) {}
+  virtual void OnPopupShow(CefRefPtr<CefBrowser> browser, bool show) {}
 
   ///
   // Called when the browser wants to move or resize the popup widget. |rect|
   // contains the new location and size in view coordinates.
   ///
   /*--cef()--*/
-  virtual void OnPopupSize(CefRefPtr<CefBrowser> browser,
-                           const CefRect& rect) {}
+  virtual void OnPopupSize(CefRefPtr<CefBrowser> browser, const CefRect& rect) {
+  }
 
   ///
   // Called when an element should be painted. Pixel values passed to this
@@ -127,7 +141,8 @@ class CefRenderHandler : public virtual CefBaseRefCounted {
                        PaintElementType type,
                        const RectList& dirtyRects,
                        const void* buffer,
-                       int width, int height) =0;
+                       int width,
+                       int height) = 0;
 
   ///
   // Called when the browser's cursor has changed. If |type| is CT_CUSTOM then
@@ -158,7 +173,10 @@ class CefRenderHandler : public virtual CefBaseRefCounted {
   virtual bool StartDragging(CefRefPtr<CefBrowser> browser,
                              CefRefPtr<CefDragData> drag_data,
                              DragOperationsMask allowed_ops,
-                             int x, int y) { return false; }
+                             int x,
+                             int y) {
+    return false;
+  }
 
   ///
   // Called when the web view wants to update the mouse cursor during a
@@ -186,6 +204,16 @@ class CefRenderHandler : public virtual CefBaseRefCounted {
   virtual void OnImeCompositionRangeChanged(CefRefPtr<CefBrowser> browser,
                                             const CefRange& selected_range,
                                             const RectList& character_bounds) {}
+
+  ///
+  // Called when text selection has changed for the specified |browser|.
+  // |selected_text| is the currently selected text and |selected_range| is
+  // the character range.
+  ///
+  /*--cef(optional_param=selected_text,optional_param=selected_range)--*/
+  virtual void OnTextSelectionChanged(CefRefPtr<CefBrowser> browser,
+                                      const CefString& selected_text,
+                                      const CefRange& selected_range) {}
 };
 
 #endif  // CEF_INCLUDE_CEF_RENDER_HANDLER_H_
diff --git a/src/include/cef_render_process_handler.h b/src/include/cef_render_process_handler.h
index ecf6fc59..52709b59 100644
--- a/src/include/cef_render_process_handler.h
+++ b/src/include/cef_render_process_handler.h
@@ -90,21 +90,7 @@ class CefRenderProcessHandler : public virtual CefBaseRefCounted {
   // Return the handler for browser load status events.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefLoadHandler> GetLoadHandler() {
-    return NULL;
-  }
-
-  ///
-  // Called before browser navigation. Return true to cancel the navigation or
-  // false to allow the navigation to proceed. The |request| object cannot be
-  // modified in this callback.
-  ///
-  /*--cef()--*/
-  virtual bool OnBeforeNavigation(CefRefPtr<CefBrowser> browser,
-                                  CefRefPtr<CefFrame> frame,
-                                  CefRefPtr<CefRequest> request,
-                                  NavigationType navigation_type,
-                                  bool is_redirect) { return false; }
+  virtual CefRefPtr<CefLoadHandler> GetLoadHandler() { return NULL; }
 
   ///
   // Called immediately after the V8 context for a frame has been created. To
diff --git a/src/include/cef_request.h b/src/include/cef_request.h
index 8d48f41d..ec88ea47 100644
--- a/src/include/cef_request.h
+++ b/src/include/cef_request.h
@@ -38,9 +38,9 @@
 #define CEF_INCLUDE_CEF_REQUEST_H_
 #pragma once
 
-#include "include/cef_base.h"
 #include <map>
 #include <vector>
+#include "include/cef_base.h"
 
 class CefPostData;
 class CefPostDataElement;
@@ -67,32 +67,32 @@ class CefRequest : public virtual CefBaseRefCounted {
   // Returns true if this object is read-only.
   ///
   /*--cef()--*/
-  virtual bool IsReadOnly() =0;
+  virtual bool IsReadOnly() = 0;
 
   ///
   // Get the fully qualified URL.
   ///
   /*--cef()--*/
-  virtual CefString GetURL() =0;
+  virtual CefString GetURL() = 0;
 
   ///
   // Set the fully qualified URL.
   ///
   /*--cef()--*/
-  virtual void SetURL(const CefString& url) =0;
+  virtual void SetURL(const CefString& url) = 0;
 
   ///
   // Get the request method type. The value will default to POST if post data
   // is provided and GET otherwise.
   ///
   /*--cef()--*/
-  virtual CefString GetMethod() =0;
+  virtual CefString GetMethod() = 0;
 
   ///
   // Set the request method type.
   ///
   /*--cef()--*/
-  virtual void SetMethod(const CefString& method) =0;
+  virtual void SetMethod(const CefString& method) = 0;
 
   ///
   // Set the referrer URL and policy. If non-empty the referrer URL must be
@@ -101,44 +101,44 @@ class CefRequest : public virtual CefBaseRefCounted {
   ///
   /*--cef()--*/
   virtual void SetReferrer(const CefString& referrer_url,
-                           ReferrerPolicy policy) =0;
+                           ReferrerPolicy policy) = 0;
 
   ///
   // Get the referrer URL.
   ///
   /*--cef()--*/
-  virtual CefString GetReferrerURL() =0;
+  virtual CefString GetReferrerURL() = 0;
 
   ///
   // Get the referrer policy.
   ///
   /*--cef(default_retval=REFERRER_POLICY_DEFAULT)--*/
-  virtual ReferrerPolicy GetReferrerPolicy() =0;
+  virtual ReferrerPolicy GetReferrerPolicy() = 0;
 
   ///
   // Get the post data.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefPostData> GetPostData() =0;
+  virtual CefRefPtr<CefPostData> GetPostData() = 0;
 
   ///
   // Set the post data.
   ///
   /*--cef()--*/
-  virtual void SetPostData(CefRefPtr<CefPostData> postData) =0;
+  virtual void SetPostData(CefRefPtr<CefPostData> postData) = 0;
 
   ///
   // Get the header values. Will not include the Referer value if any.
   ///
   /*--cef()--*/
-  virtual void GetHeaderMap(HeaderMap& headerMap) =0;
+  virtual void GetHeaderMap(HeaderMap& headerMap) = 0;
 
   ///
   // Set the header values. If a Referer value exists in the header map it will
   // be removed and ignored.
   ///
   /*--cef()--*/
-  virtual void SetHeaderMap(const HeaderMap& headerMap) =0;
+  virtual void SetHeaderMap(const HeaderMap& headerMap) = 0;
 
   ///
   // Set all values at one time.
@@ -147,42 +147,42 @@ class CefRequest : public virtual CefBaseRefCounted {
   virtual void Set(const CefString& url,
                    const CefString& method,
                    CefRefPtr<CefPostData> postData,
-                   const HeaderMap& headerMap) =0;
+                   const HeaderMap& headerMap) = 0;
 
   ///
   // Get the flags used in combination with CefURLRequest. See
   // cef_urlrequest_flags_t for supported values.
   ///
   /*--cef(default_retval=UR_FLAG_NONE)--*/
-  virtual int GetFlags() =0;
+  virtual int GetFlags() = 0;
 
   ///
   // Set the flags used in combination with CefURLRequest.  See
   // cef_urlrequest_flags_t for supported values.
   ///
   /*--cef()--*/
-  virtual void SetFlags(int flags) =0;
+  virtual void SetFlags(int flags) = 0;
 
   ///
-  // Set the URL to the first party for cookies used in combination with
+  // Get the URL to the first party for cookies used in combination with
   // CefURLRequest.
   ///
   /*--cef()--*/
-  virtual CefString GetFirstPartyForCookies() =0;
+  virtual CefString GetFirstPartyForCookies() = 0;
 
   ///
-  // Get the URL to the first party for cookies used in combination with
+  // Set the URL to the first party for cookies used in combination with
   // CefURLRequest.
   ///
   /*--cef()--*/
-  virtual void SetFirstPartyForCookies(const CefString& url) =0;
+  virtual void SetFirstPartyForCookies(const CefString& url) = 0;
 
   ///
   // Get the resource type for this request. Only available in the browser
   // process.
   ///
   /*--cef(default_retval=RT_SUB_RESOURCE)--*/
-  virtual ResourceType GetResourceType() =0;
+  virtual ResourceType GetResourceType() = 0;
 
   ///
   // Get the transition type for this request. Only available in the browser
@@ -190,7 +190,7 @@ class CefRequest : public virtual CefBaseRefCounted {
   // sub-frame navigation.
   ///
   /*--cef(default_retval=TT_EXPLICIT)--*/
-  virtual TransitionType GetTransitionType() =0;
+  virtual TransitionType GetTransitionType() = 0;
 
   ///
   // Returns the globally unique identifier for this request or 0 if not
@@ -198,10 +198,9 @@ class CefRequest : public virtual CefBaseRefCounted {
   // process to track a single request across multiple callbacks.
   ///
   /*--cef()--*/
-  virtual uint64 GetIdentifier() =0;
+  virtual uint64 GetIdentifier() = 0;
 };
 
-
 ///
 // Class used to represent post data for a web request. The methods of this
 // class may be called on any thread.
@@ -209,7 +208,7 @@ class CefRequest : public virtual CefBaseRefCounted {
 /*--cef(source=library,no_debugct_check)--*/
 class CefPostData : public virtual CefBaseRefCounted {
  public:
-  typedef std::vector<CefRefPtr<CefPostDataElement> > ElementVector;
+  typedef std::vector<CefRefPtr<CefPostDataElement>> ElementVector;
 
   ///
   // Create a new CefPostData object.
@@ -221,7 +220,7 @@ class CefPostData : public virtual CefBaseRefCounted {
   // Returns true if this object is read-only.
   ///
   /*--cef()--*/
-  virtual bool IsReadOnly() =0;
+  virtual bool IsReadOnly() = 0;
 
   ///
   // Returns true if the underlying POST data includes elements that are not
@@ -236,35 +235,34 @@ class CefPostData : public virtual CefBaseRefCounted {
   // Returns the number of existing post data elements.
   ///
   /*--cef()--*/
-  virtual size_t GetElementCount() =0;
+  virtual size_t GetElementCount() = 0;
 
   ///
   // Retrieve the post data elements.
   ///
   /*--cef(count_func=elements:GetElementCount)--*/
-  virtual void GetElements(ElementVector& elements) =0;
+  virtual void GetElements(ElementVector& elements) = 0;
 
   ///
   // Remove the specified post data element.  Returns true if the removal
   // succeeds.
   ///
   /*--cef()--*/
-  virtual bool RemoveElement(CefRefPtr<CefPostDataElement> element) =0;
+  virtual bool RemoveElement(CefRefPtr<CefPostDataElement> element) = 0;
 
   ///
   // Add the specified post data element.  Returns true if the add succeeds.
   ///
   /*--cef()--*/
-  virtual bool AddElement(CefRefPtr<CefPostDataElement> element) =0;
+  virtual bool AddElement(CefRefPtr<CefPostDataElement> element) = 0;
 
   ///
   // Remove all existing post data elements.
   ///
   /*--cef()--*/
-  virtual void RemoveElements() =0;
+  virtual void RemoveElements() = 0;
 };
 
-
 ///
 // Class used to represent a single element in the request post data. The
 // methods of this class may be called on any thread.
@@ -287,51 +285,51 @@ class CefPostDataElement : public virtual CefBaseRefCounted {
   // Returns true if this object is read-only.
   ///
   /*--cef()--*/
-  virtual bool IsReadOnly() =0;
+  virtual bool IsReadOnly() = 0;
 
   ///
   // Remove all contents from the post data element.
   ///
   /*--cef()--*/
-  virtual void SetToEmpty() =0;
+  virtual void SetToEmpty() = 0;
 
   ///
   // The post data element will represent a file.
   ///
   /*--cef()--*/
-  virtual void SetToFile(const CefString& fileName) =0;
+  virtual void SetToFile(const CefString& fileName) = 0;
 
   ///
   // The post data element will represent bytes.  The bytes passed
   // in will be copied.
   ///
   /*--cef()--*/
-  virtual void SetToBytes(size_t size, const void* bytes) =0;
+  virtual void SetToBytes(size_t size, const void* bytes) = 0;
 
   ///
   // Return the type of this post data element.
   ///
   /*--cef(default_retval=PDE_TYPE_EMPTY)--*/
-  virtual Type GetType() =0;
+  virtual Type GetType() = 0;
 
   ///
   // Return the file name.
   ///
   /*--cef()--*/
-  virtual CefString GetFile() =0;
+  virtual CefString GetFile() = 0;
 
   ///
   // Return the number of bytes.
   ///
   /*--cef()--*/
-  virtual size_t GetBytesCount() =0;
+  virtual size_t GetBytesCount() = 0;
 
   ///
   // Read up to |size| bytes into |bytes| and return the number of bytes
   // actually read.
   ///
   /*--cef()--*/
-  virtual size_t GetBytes(size_t size, void* bytes) =0;
+  virtual size_t GetBytes(size_t size, void* bytes) = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_REQUEST_H_
diff --git a/src/include/cef_request_context.h b/src/include/cef_request_context.h
index 3f6d8fd4..fdf4737d 100644
--- a/src/include/cef_request_context.h
+++ b/src/include/cef_request_context.h
@@ -42,12 +42,13 @@
 
 #include "include/cef_callback.h"
 #include "include/cef_cookie.h"
+#include "include/cef_extension.h"
+#include "include/cef_extension_handler.h"
 #include "include/cef_request_context_handler.h"
 #include "include/cef_values.h"
 
 class CefSchemeHandlerFactory;
 
-
 ///
 // Callback interface for CefRequestContext::ResolveHost.
 ///
@@ -55,17 +56,16 @@ class CefSchemeHandlerFactory;
 class CefResolveCallback : public virtual CefBaseRefCounted {
  public:
   ///
-  // Called after the ResolveHost request has completed. |result| will be the
-  // result code. |resolved_ips| will be the list of resolved IP addresses or
-  // empty if the resolution failed.
+  // Called on the UI thread after the ResolveHost request has completed.
+  // |result| will be the result code. |resolved_ips| will be the list of
+  // resolved IP addresses or empty if the resolution failed.
   ///
   /*--cef(optional_param=resolved_ips)--*/
   virtual void OnResolveCompleted(
       cef_errorcode_t result,
-      const std::vector<CefString>& resolved_ips) =0;
+      const std::vector<CefString>& resolved_ips) = 0;
 };
 
-
 ///
 // A request context provides request handling for a set of related browser
 // or URL request objects. A request context can be specified when creating a
@@ -114,13 +114,13 @@ class CefRequestContext : public virtual CefBaseRefCounted {
   // object.
   ///
   /*--cef()--*/
-  virtual bool IsSame(CefRefPtr<CefRequestContext> other) =0;
+  virtual bool IsSame(CefRefPtr<CefRequestContext> other) = 0;
 
   ///
   // Returns true if this object is sharing the same storage as |that| object.
   ///
   /*--cef()--*/
-  virtual bool IsSharingWith(CefRefPtr<CefRequestContext> other) =0;
+  virtual bool IsSharingWith(CefRefPtr<CefRequestContext> other) = 0;
 
   ///
   // Returns true if this object is the global context. The global context is
@@ -128,20 +128,20 @@ class CefRequestContext : public virtual CefBaseRefCounted {
   // argument.
   ///
   /*--cef()--*/
-  virtual bool IsGlobal() =0;
+  virtual bool IsGlobal() = 0;
 
   ///
   // Returns the handler for this context if any.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefRequestContextHandler> GetHandler() =0;
+  virtual CefRefPtr<CefRequestContextHandler> GetHandler() = 0;
 
   ///
   // Returns the cache path for this object. If empty an "incognito mode"
   // in-memory cache is being used.
   ///
   /*--cef()--*/
-  virtual CefString GetCachePath() =0;
+  virtual CefString GetCachePath() = 0;
 
   ///
   // Returns the default cookie manager for this object. This will be the global
@@ -153,7 +153,7 @@ class CefRequestContext : public virtual CefBaseRefCounted {
   ///
   /*--cef(optional_param=callback)--*/
   virtual CefRefPtr<CefCookieManager> GetDefaultCookieManager(
-      CefRefPtr<CefCompletionCallback> callback) =0;
+      CefRefPtr<CefCompletionCallback> callback) = 0;
 
   ///
   // Register a scheme handler factory for the specified |scheme_name| and
@@ -172,14 +172,14 @@ class CefRequestContext : public virtual CefBaseRefCounted {
   virtual bool RegisterSchemeHandlerFactory(
       const CefString& scheme_name,
       const CefString& domain_name,
-      CefRefPtr<CefSchemeHandlerFactory> factory) =0;
+      CefRefPtr<CefSchemeHandlerFactory> factory) = 0;
 
   ///
   // Clear all registered scheme handler factories. Returns false on error. This
   // function may be called on any thread in the browser process.
   ///
   /*--cef()--*/
-  virtual bool ClearSchemeHandlerFactories() =0;
+  virtual bool ClearSchemeHandlerFactories() = 0;
 
   ///
   // Tells all renderer processes associated with this context to throw away
@@ -188,14 +188,14 @@ class CefRequestContext : public virtual CefBaseRefCounted {
   // be called to rebuild the plugin list cache.
   ///
   /*--cef()--*/
-  virtual void PurgePluginListCache(bool reload_pages) =0;
+  virtual void PurgePluginListCache(bool reload_pages) = 0;
 
   ///
   // Returns true if a preference with the specified |name| exists. This method
   // must be called on the browser process UI thread.
   ///
   /*--cef()--*/
-  virtual bool HasPreference(const CefString& name) =0;
+  virtual bool HasPreference(const CefString& name) = 0;
 
   ///
   // Returns the value for the preference with the specified |name|. Returns
@@ -205,7 +205,7 @@ class CefRequestContext : public virtual CefBaseRefCounted {
   // on the browser process UI thread.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefValue> GetPreference(const CefString& name) =0;
+  virtual CefRefPtr<CefValue> GetPreference(const CefString& name) = 0;
 
   ///
   // Returns all preferences as a dictionary. If |include_defaults| is true then
@@ -217,7 +217,7 @@ class CefRequestContext : public virtual CefBaseRefCounted {
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefDictionaryValue> GetAllPreferences(
-      bool include_defaults) =0;
+      bool include_defaults) = 0;
 
   ///
   // Returns true if the preference with the specified |name| can be modified
@@ -226,7 +226,7 @@ class CefRequestContext : public virtual CefBaseRefCounted {
   // process UI thread.
   ///
   /*--cef()--*/
-  virtual bool CanSetPreference(const CefString& name) =0;
+  virtual bool CanSetPreference(const CefString& name) = 0;
 
   ///
   // Set the |value| associated with preference |name|. Returns true if the
@@ -238,7 +238,7 @@ class CefRequestContext : public virtual CefBaseRefCounted {
   /*--cef(optional_param=value)--*/
   virtual bool SetPreference(const CefString& name,
                              CefRefPtr<CefValue> value,
-                             CefString& error) =0;
+                             CefString& error) = 0;
 
   ///
   // Clears all certificate exceptions that were added as part of handling
@@ -250,7 +250,7 @@ class CefRequestContext : public virtual CefBaseRefCounted {
   ///
   /*--cef(optional_param=callback)--*/
   virtual void ClearCertificateExceptions(
-      CefRefPtr<CefCompletionCallback> callback) =0;
+      CefRefPtr<CefCompletionCallback> callback) = 0;
 
   ///
   // Clears all active and idle connections that Chromium currently has.
@@ -260,16 +260,15 @@ class CefRequestContext : public virtual CefBaseRefCounted {
   ///
   /*--cef(optional_param=callback)--*/
   virtual void CloseAllConnections(
-      CefRefPtr<CefCompletionCallback> callback) =0;
+      CefRefPtr<CefCompletionCallback> callback) = 0;
 
   ///
   // Attempts to resolve |origin| to a list of associated IP addresses.
   // |callback| will be executed on the UI thread after completion.
   ///
   /*--cef()--*/
-  virtual void ResolveHost(
-      const CefString& origin,
-      CefRefPtr<CefResolveCallback> callback) =0;
+  virtual void ResolveHost(const CefString& origin,
+                           CefRefPtr<CefResolveCallback> callback) = 0;
 
   ///
   // Attempts to resolve |origin| to a list of associated IP addresses using
@@ -280,7 +279,93 @@ class CefRequestContext : public virtual CefBaseRefCounted {
   /*--cef(default_retval=ERR_FAILED)--*/
   virtual cef_errorcode_t ResolveHostCached(
       const CefString& origin,
-      std::vector<CefString>& resolved_ips) =0;
+      std::vector<CefString>& resolved_ips) = 0;
+
+  ///
+  // Load an extension.
+  //
+  // If extension resources will be read from disk using the default load
+  // implementation then |root_directory| should be the absolute path to the
+  // extension resources directory and |manifest| should be NULL. If extension
+  // resources will be provided by the client (e.g. via CefRequestHandler and/or
+  // CefExtensionHandler) then |root_directory| should be a path component
+  // unique to the extension (if not absolute this will be internally prefixed
+  // with the PK_DIR_RESOURCES path) and |manifest| should contain the contents
+  // that would otherwise be read from the "manifest.json" file on disk.
+  //
+  // The loaded extension will be accessible in all contexts sharing the same
+  // storage (HasExtension returns true). However, only the context on which
+  // this method was called is considered the loader (DidLoadExtension returns
+  // true) and only the loader will receive CefRequestContextHandler callbacks
+  // for the extension.
+  //
+  // CefExtensionHandler::OnExtensionLoaded will be called on load success or
+  // CefExtensionHandler::OnExtensionLoadFailed will be called on load failure.
+  //
+  // If the extension specifies a background script via the "background"
+  // manifest key then CefExtensionHandler::OnBeforeBackgroundBrowser will be
+  // called to create the background browser. See that method for additional
+  // information about background scripts.
+  //
+  // For visible extension views the client application should evaluate the
+  // manifest to determine the correct extension URL to load and then pass that
+  // URL to the CefBrowserHost::CreateBrowser* function after the extension has
+  // loaded. For example, the client can look for the "browser_action" manifest
+  // key as documented at https://developer.chrome.com/extensions/browserAction.
+  // Extension URLs take the form "chrome-extension://<extension_id>/<path>".
+  //
+  // Browsers that host extensions differ from normal browsers as follows:
+  //  - Can access chrome.* JavaScript APIs if allowed by the manifest. Visit
+  //    chrome://extensions-support for the list of extension APIs currently
+  //    supported by CEF.
+  //  - Main frame navigation to non-extension content is blocked.
+  //  - Pinch-zooming is disabled.
+  //  - CefBrowserHost::GetExtension returns the hosted extension.
+  //  - CefBrowserHost::IsBackgroundHost returns true for background hosts.
+  //
+  // See https://developer.chrome.com/extensions for extension implementation
+  // and usage documentation.
+  ///
+  /*--cef(optional_param=manifest,optional_param=handler)--*/
+  virtual void LoadExtension(const CefString& root_directory,
+                             CefRefPtr<CefDictionaryValue> manifest,
+                             CefRefPtr<CefExtensionHandler> handler) = 0;
+
+  ///
+  // Returns true if this context was used to load the extension identified by
+  // |extension_id|. Other contexts sharing the same storage will also have
+  // access to the extension (see HasExtension). This method must be called on
+  // the browser process UI thread.
+  ///
+  /*--cef()--*/
+  virtual bool DidLoadExtension(const CefString& extension_id) = 0;
+
+  ///
+  // Returns true if this context has access to the extension identified by
+  // |extension_id|. This may not be the context that was used to load the
+  // extension (see DidLoadExtension). This method must be called on the browser
+  // process UI thread.
+  ///
+  /*--cef()--*/
+  virtual bool HasExtension(const CefString& extension_id) = 0;
+
+  ///
+  // Retrieve the list of all extensions that this context has access to (see
+  // HasExtension). |extension_ids| will be populated with the list of extension
+  // ID values. Returns true on success. This method must be called on the
+  // browser process UI thread.
+  ///
+  /*--cef()--*/
+  virtual bool GetExtensions(std::vector<CefString>& extension_ids) = 0;
+
+  ///
+  // Returns the extension matching |extension_id| or NULL if no matching
+  // extension is accessible in this context (see HasExtension). This method
+  // must be called on the browser process UI thread.
+  ///
+  /*--cef()--*/
+  virtual CefRefPtr<CefExtension> GetExtension(
+      const CefString& extension_id) = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_REQUEST_CONTEXT_H_
diff --git a/src/include/cef_request_context_handler.h b/src/include/cef_request_context_handler.h
index 26864e88..20d91334 100644
--- a/src/include/cef_request_context_handler.h
+++ b/src/include/cef_request_context_handler.h
@@ -42,6 +42,8 @@
 #include "include/cef_cookie.h"
 #include "include/cef_web_plugin.h"
 
+class CefRequestContext;
+
 ///
 // Implement this interface to provide handler implementations. The handler
 // instance will not be released until all objects related to the context have
@@ -52,6 +54,14 @@ class CefRequestContextHandler : public virtual CefBaseRefCounted {
  public:
   typedef cef_plugin_policy_t PluginPolicy;
 
+  ///
+  // Called on the browser process UI thread immediately after the request
+  // context has been initialized.
+  ///
+  /*--cef()--*/
+  virtual void OnRequestContextInitialized(
+      CefRefPtr<CefRequestContext> request_context) {}
+
   ///
   // Called on the browser process IO thread to retrieve the cookie manager. If
   // this method returns NULL the default cookie manager retrievable via
diff --git a/src/include/cef_request_handler.h b/src/include/cef_request_handler.h
index c44a3dfa..7c535a55 100644
--- a/src/include/cef_request_handler.h
+++ b/src/include/cef_request_handler.h
@@ -44,10 +44,10 @@
 #include "include/cef_base.h"
 #include "include/cef_browser.h"
 #include "include/cef_frame.h"
+#include "include/cef_request.h"
 #include "include/cef_resource_handler.h"
 #include "include/cef_response.h"
 #include "include/cef_response_filter.h"
-#include "include/cef_request.h"
 #include "include/cef_ssl_info.h"
 #include "include/cef_x509_certificate.h"
 
@@ -62,16 +62,15 @@ class CefRequestCallback : public virtual CefBaseRefCounted {
   // Otherwise, the request will be canceled.
   ///
   /*--cef(capi_name=cont)--*/
-  virtual void Continue(bool allow) =0;
+  virtual void Continue(bool allow) = 0;
 
   ///
   // Cancel the url request.
   ///
   /*--cef()--*/
-  virtual void Cancel() =0;
+  virtual void Cancel() = 0;
 };
 
-
 ///
 // Callback interface used to select a client certificate for authentication.
 ///
@@ -83,10 +82,9 @@ class CefSelectClientCertificateCallback : public virtual CefBaseRefCounted {
   // NULL value means that no client certificate should be used.
   ///
   /*--cef(optional_param=cert)--*/
-  virtual void Select(CefRefPtr<CefX509Certificate> cert) =0;
+  virtual void Select(CefRefPtr<CefX509Certificate> cert) = 0;
 };
 
-
 ///
 // Implement this interface to handle events related to browser requests. The
 // methods of this class will be called on the thread indicated.
@@ -98,7 +96,7 @@ class CefRequestHandler : public virtual CefBaseRefCounted {
   typedef cef_termination_status_t TerminationStatus;
   typedef cef_urlrequest_status_t URLRequestStatus;
   typedef cef_window_open_disposition_t WindowOpenDisposition;
-  typedef std::vector<CefRefPtr<CefX509Certificate> > X509CertificateList;
+  typedef std::vector<CefRefPtr<CefX509Certificate>> X509CertificateList;
 
   ///
   // Called on the UI thread before browser navigation. Return true to cancel
@@ -108,12 +106,15 @@ class CefRequestHandler : public virtual CefBaseRefCounted {
   // If the navigation is allowed CefLoadHandler::OnLoadStart and
   // CefLoadHandler::OnLoadEnd will be called. If the navigation is canceled
   // CefLoadHandler::OnLoadError will be called with an |errorCode| value of
-  // ERR_ABORTED.
+  // ERR_ABORTED. The |user_gesture| value will be true if the browser
+  // navigated via explicit user gesture (e.g. clicking a link) or false if it
+  // navigated automatically (e.g. via the DomContentLoaded event).
   ///
   /*--cef()--*/
   virtual bool OnBeforeBrowse(CefRefPtr<CefBrowser> browser,
                               CefRefPtr<CefFrame> frame,
                               CefRefPtr<CefRequest> request,
+                              bool user_gesture,
                               bool is_redirect) {
     return false;
   }
@@ -149,7 +150,7 @@ class CefRequestHandler : public virtual CefBaseRefCounted {
   // immediately. Return RV_CONTINUE_ASYNC and call CefRequestCallback::
   // Continue() at a later time to continue or cancel the request
   // asynchronously. Return RV_CANCEL to cancel the request immediately.
-  // 
+  //
   ///
   /*--cef(default_retval=RV_CONTINUE)--*/
   virtual ReturnValue OnBeforeResourceLoad(
@@ -254,6 +255,33 @@ class CefRequestHandler : public virtual CefBaseRefCounted {
     return false;
   }
 
+  ///
+  // Called on the IO thread before sending a network request with a "Cookie"
+  // request header. Return true to allow cookies to be included in the network
+  // request or false to block cookies. The |request| object should not be
+  // modified in this callback.
+  ///
+  /*--cef()--*/
+  virtual bool CanGetCookies(CefRefPtr<CefBrowser> browser,
+                             CefRefPtr<CefFrame> frame,
+                             CefRefPtr<CefRequest> request) {
+    return true;
+  }
+
+  ///
+  // Called on the IO thread when receiving a network request with a
+  // "Set-Cookie" response header value represented by |cookie|. Return true to
+  // allow the cookie to be stored or false to block the cookie. The |request|
+  // object should not be modified in this callback.
+  ///
+  /*--cef()--*/
+  virtual bool CanSetCookie(CefRefPtr<CefBrowser> browser,
+                            CefRefPtr<CefFrame> frame,
+                            CefRefPtr<CefRequest> request,
+                            const CefCookie& cookie) {
+    return true;
+  }
+
   ///
   // Called on the IO thread when JavaScript requests a specific storage quota
   // size via the webkitStorageInfo.requestQuota function. |origin_url| is the
@@ -291,12 +319,11 @@ class CefRequestHandler : public virtual CefBaseRefCounted {
   // be accepted without calling this method.
   ///
   /*--cef()--*/
-  virtual bool OnCertificateError(
-      CefRefPtr<CefBrowser> browser,
-      cef_errorcode_t cert_error,
-      const CefString& request_url,
-      CefRefPtr<CefSSLInfo> ssl_info,
-      CefRefPtr<CefRequestCallback> callback) {
+  virtual bool OnCertificateError(CefRefPtr<CefBrowser> browser,
+                                  cef_errorcode_t cert_error,
+                                  const CefString& request_url,
+                                  CefRefPtr<CefSSLInfo> ssl_info,
+                                  CefRefPtr<CefRequestCallback> callback) {
     return false;
   }
 
diff --git a/src/include/cef_resource_bundle.h b/src/include/cef_resource_bundle.h
index 3fda8998..c08f5b08 100644
--- a/src/include/cef_resource_bundle.h
+++ b/src/include/cef_resource_bundle.h
@@ -64,7 +64,7 @@ class CefResourceBundle : public virtual CefBaseRefCounted {
   // of valid string ID values.
   ///
   /*--cef()--*/
-  virtual CefString GetLocalizedString(int string_id) =0;
+  virtual CefString GetLocalizedString(int string_id) = 0;
 
   ///
   // Retrieves the contents of the specified scale independent |resource_id|.
@@ -77,7 +77,7 @@ class CefResourceBundle : public virtual CefBaseRefCounted {
   /*--cef()--*/
   virtual bool GetDataResource(int resource_id,
                                void*& data,
-                               size_t& data_size) =0;
+                               size_t& data_size) = 0;
 
   ///
   // Retrieves the contents of the specified |resource_id| nearest the scale
@@ -93,7 +93,7 @@ class CefResourceBundle : public virtual CefBaseRefCounted {
   virtual bool GetDataResourceForScale(int resource_id,
                                        ScaleFactor scale_factor,
                                        void*& data,
-                                       size_t& data_size) =0;
+                                       size_t& data_size) = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_RESOURCE_BUNDLE_H_
diff --git a/src/include/cef_resource_bundle_handler.h b/src/include/cef_resource_bundle_handler.h
index 932ef9f5..6cd6c9af 100644
--- a/src/include/cef_resource_bundle_handler.h
+++ b/src/include/cef_resource_bundle_handler.h
@@ -57,8 +57,7 @@ class CefResourceBundleHandler : public virtual CefBaseRefCounted {
   // cef_pack_strings.h for a listing of valid string ID values.
   ///
   /*--cef()--*/
-  virtual bool GetLocalizedString(int string_id,
-                                  CefString& string) =0;
+  virtual bool GetLocalizedString(int string_id, CefString& string) = 0;
 
   ///
   // Called to retrieve data for the specified scale independent |resource_id|.
@@ -71,7 +70,7 @@ class CefResourceBundleHandler : public virtual CefBaseRefCounted {
   /*--cef()--*/
   virtual bool GetDataResource(int resource_id,
                                void*& data,
-                               size_t& data_size) =0;
+                               size_t& data_size) = 0;
 
   ///
   // Called to retrieve data for the specified |resource_id| nearest the scale
@@ -85,7 +84,7 @@ class CefResourceBundleHandler : public virtual CefBaseRefCounted {
   virtual bool GetDataResourceForScale(int resource_id,
                                        ScaleFactor scale_factor,
                                        void*& data,
-                                       size_t& data_size) =0;
+                                       size_t& data_size) = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_RESOURCE_BUNDLE_HANDLER_H_
diff --git a/src/include/cef_resource_handler.h b/src/include/cef_resource_handler.h
index abe7196d..02ccea91 100644
--- a/src/include/cef_resource_handler.h
+++ b/src/include/cef_resource_handler.h
@@ -61,7 +61,7 @@ class CefResourceHandler : public virtual CefBaseRefCounted {
   ///
   /*--cef()--*/
   virtual bool ProcessRequest(CefRefPtr<CefRequest> request,
-                              CefRefPtr<CefCallback> callback) =0;
+                              CefRefPtr<CefCallback> callback) = 0;
 
   ///
   // Retrieve response header information. If the response length is not known
@@ -77,7 +77,7 @@ class CefResourceHandler : public virtual CefBaseRefCounted {
   /*--cef()--*/
   virtual void GetResponseHeaders(CefRefPtr<CefResponse> response,
                                   int64& response_length,
-                                  CefString& redirectUrl) =0;
+                                  CefString& redirectUrl) = 0;
 
   ///
   // Read response data. If data is available immediately copy up to
@@ -90,7 +90,7 @@ class CefResourceHandler : public virtual CefBaseRefCounted {
   virtual bool ReadResponse(void* data_out,
                             int bytes_to_read,
                             int& bytes_read,
-                            CefRefPtr<CefCallback> callback) =0;
+                            CefRefPtr<CefCallback> callback) = 0;
 
   ///
   // Return true if the specified cookie can be sent with the request or false
@@ -111,7 +111,7 @@ class CefResourceHandler : public virtual CefBaseRefCounted {
   // Request processing has been canceled.
   ///
   /*--cef()--*/
-  virtual void Cancel() =0;
+  virtual void Cancel() = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_RESOURCE_HANDLER_H_
diff --git a/src/include/cef_response.h b/src/include/cef_response.h
index cd7356ef..1862034a 100644
--- a/src/include/cef_response.h
+++ b/src/include/cef_response.h
@@ -38,8 +38,8 @@
 #define CEF_INCLUDE_CEF_RESPONSE_H_
 #pragma once
 
-#include "include/cef_base.h"
 #include <map>
+#include "include/cef_base.h"
 
 ///
 // Class used to represent a web response. The methods of this class may be
@@ -60,7 +60,7 @@ class CefResponse : public virtual CefBaseRefCounted {
   // Returns true if this object is read-only.
   ///
   /*--cef()--*/
-  virtual bool IsReadOnly() =0;
+  virtual bool IsReadOnly() = 0;
 
   ///
   // Get the response error code. Returns ERR_NONE if there was no error.
@@ -79,7 +79,7 @@ class CefResponse : public virtual CefBaseRefCounted {
   // Get the response status code.
   ///
   /*--cef()--*/
-  virtual int GetStatus() =0;
+  virtual int GetStatus() = 0;
 
   ///
   // Set the response status code.
@@ -91,7 +91,7 @@ class CefResponse : public virtual CefBaseRefCounted {
   // Get the response status text.
   ///
   /*--cef()--*/
-  virtual CefString GetStatusText() =0;
+  virtual CefString GetStatusText() = 0;
 
   ///
   // Set the response status text.
@@ -115,19 +115,31 @@ class CefResponse : public virtual CefBaseRefCounted {
   // Get the value for the specified response header field.
   ///
   /*--cef()--*/
-  virtual CefString GetHeader(const CefString& name) =0;
+  virtual CefString GetHeader(const CefString& name) = 0;
 
   ///
   // Get all response header fields.
   ///
   /*--cef()--*/
-  virtual void GetHeaderMap(HeaderMap& headerMap) =0;
+  virtual void GetHeaderMap(HeaderMap& headerMap) = 0;
 
   ///
   // Set all response header fields.
   ///
   /*--cef()--*/
-  virtual void SetHeaderMap(const HeaderMap& headerMap) =0;
+  virtual void SetHeaderMap(const HeaderMap& headerMap) = 0;
+
+  ///
+  // Get the resolved URL after redirects or changed as a result of HSTS.
+  ///
+  /*--cef()--*/
+  virtual CefString GetURL() = 0;
+
+  ///
+  // Set the resolved URL after redirects or changed as a result of HSTS.
+  ///
+  /*--cef()--*/
+  virtual void SetURL(const CefString& url) = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_RESPONSE_H_
diff --git a/src/include/cef_response_filter.h b/src/include/cef_response_filter.h
index 58c978ea..2eb446fa 100644
--- a/src/include/cef_response_filter.h
+++ b/src/include/cef_response_filter.h
@@ -54,7 +54,7 @@ class CefResponseFilter : public virtual CefBaseRefCounted {
   // filter will not be installed if this method returns false.
   ///
   /*--cef()--*/
-  virtual bool InitFilter() =0;
+  virtual bool InitFilter() = 0;
 
   ///
   // Called to filter a chunk of data. Expected usage is as follows:
@@ -92,7 +92,7 @@ class CefResponseFilter : public virtual CefBaseRefCounted {
                               size_t& data_in_read,
                               void* data_out,
                               size_t data_out_size,
-                              size_t& data_out_written) =0;
+                              size_t& data_out_written) = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_RESPONSE_FILTER_H_
diff --git a/src/include/cef_sandbox_win.h b/src/include/cef_sandbox_win.h
index 04444b49..3b7c4e0b 100644
--- a/src/include/cef_sandbox_win.h
+++ b/src/include/cef_sandbox_win.h
@@ -73,12 +73,8 @@ void cef_sandbox_info_destroy(void* sandbox_info);
 ///
 class CefScopedSandboxInfo {
  public:
-  CefScopedSandboxInfo() {
-    sandbox_info_ = cef_sandbox_info_create();
-  }
-  ~CefScopedSandboxInfo() {
-    cef_sandbox_info_destroy(sandbox_info_);
-  }
+  CefScopedSandboxInfo() { sandbox_info_ = cef_sandbox_info_create(); }
+  ~CefScopedSandboxInfo() { cef_sandbox_info_destroy(sandbox_info_); }
 
   void* sandbox_info() const { return sandbox_info_; }
 
diff --git a/src/include/cef_scheme.h b/src/include/cef_scheme.h
index 24b0c55b..d1b96082 100644
--- a/src/include/cef_scheme.h
+++ b/src/include/cef_scheme.h
@@ -42,12 +42,11 @@
 #include "include/cef_browser.h"
 #include "include/cef_frame.h"
 #include "include/cef_request.h"
-#include "include/cef_response.h"
 #include "include/cef_resource_handler.h"
+#include "include/cef_response.h"
 
 class CefSchemeHandlerFactory;
 
-
 ///
 // Register a scheme handler factory with the global request context. An empty
 // |domain_name| value for a standard scheme will cause the factory to match all
@@ -77,7 +76,6 @@ bool CefRegisterSchemeHandlerFactory(
 /*--cef()--*/
 bool CefClearSchemeHandlerFactories();
 
-
 ///
 // Class that manages custom scheme registrations.
 ///
@@ -150,10 +148,9 @@ class CefSchemeRegistrar : public CefBaseScoped {
                                bool is_display_isolated,
                                bool is_secure,
                                bool is_cors_enabled,
-                               bool is_csp_bypassing) =0;
+                               bool is_csp_bypassing) = 0;
 };
 
-
 ///
 // Class that creates CefResourceHandler instances for handling scheme requests.
 // The methods of this class will always be called on the IO thread.
@@ -174,7 +171,7 @@ class CefSchemeHandlerFactory : public virtual CefBaseRefCounted {
       CefRefPtr<CefBrowser> browser,
       CefRefPtr<CefFrame> frame,
       const CefString& scheme_name,
-      CefRefPtr<CefRequest> request) =0;
+      CefRefPtr<CefRequest> request) = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_SCHEME_H_
diff --git a/src/include/cef_server.h b/src/include/cef_server.h
new file mode 100644
index 00000000..e22b8a6b
--- /dev/null
+++ b/src/include/cef_server.h
@@ -0,0 +1,315 @@
+// Copyright (c) 2017 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
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// ---------------------------------------------------------------------------
+//
+// The contents of this file must follow a specific format in order to
+// support the CEF translator tool. See the translator.README.txt file in the
+// tools directory for more information.
+//
+
+#ifndef CEF_INCLUDE_CEF_SERVER_H_
+#define CEF_INCLUDE_CEF_SERVER_H_
+#pragma once
+
+#include <map>
+#include "include/cef_base.h"
+#include "include/cef_callback.h"
+#include "include/cef_request.h"
+#include "include/cef_task.h"
+
+class CefServerHandler;
+
+///
+// Class representing a server that supports HTTP and WebSocket requests. Server
+// capacity is limited and is intended to handle only a small number of
+// simultaneous connections (e.g. for communicating between applications on
+// localhost). The methods of this class are safe to call from any thread in the
+// brower process unless otherwise indicated.
+///
+/*--cef(source=library)--*/
+class CefServer : public CefBaseRefCounted {
+ public:
+  typedef std::multimap<CefString, CefString> HeaderMap;
+
+  ///
+  // Create a new server that binds to |address| and |port|. |address| must be a
+  // valid IPv4 or IPv6 address (e.g. 127.0.0.1 or ::1) and |port| must be a
+  // port number outside of the reserved range (e.g. between 1025 and 65535 on
+  // most platforms). |backlog| is the maximum number of pending connections.
+  // A new thread will be created for each CreateServer call (the "dedicated
+  // server thread"). It is therefore recommended to use a different
+  // CefServerHandler instance for each CreateServer call to avoid thread safety
+  // issues in the CefServerHandler implementation. The
+  // CefServerHandler::OnServerCreated method will be called on the dedicated
+  // server thread to report success or failure. See
+  // CefServerHandler::OnServerCreated documentation for a description of server
+  // lifespan.
+  ///
+  /*--cef()--*/
+  static void CreateServer(const CefString& address,
+                           uint16 port,
+                           int backlog,
+                           CefRefPtr<CefServerHandler> handler);
+
+  ///
+  // Returns the task runner for the dedicated server thread.
+  ///
+  /*--cef()--*/
+  virtual CefRefPtr<CefTaskRunner> GetTaskRunner() = 0;
+
+  ///
+  // Stop the server and shut down the dedicated server thread. See
+  // CefServerHandler::OnServerCreated documentation for a description of
+  // server lifespan.
+  ///
+  /*--cef()--*/
+  virtual void Shutdown() = 0;
+
+  ///
+  // Returns true if the server is currently running and accepting incoming
+  // connections. See CefServerHandler::OnServerCreated documentation for a
+  // description of server lifespan. This method must be called on the dedicated
+  // server thread.
+  ///
+  /*--cef()--*/
+  virtual bool IsRunning() = 0;
+
+  ///
+  // Returns the server address including the port number.
+  ///
+  /*--cef()--*/
+  virtual CefString GetAddress() = 0;
+
+  ///
+  // Returns true if the server currently has a connection. This method must be
+  // called on the dedicated server thread.
+  ///
+  /*--cef()--*/
+  virtual bool HasConnection() = 0;
+
+  ///
+  // Returns true if |connection_id| represents a valid connection. This method
+  // must be called on the dedicated server thread.
+  ///
+  /*--cef()--*/
+  virtual bool IsValidConnection(int connection_id) = 0;
+
+  ///
+  // Send an HTTP 200 "OK" response to the connection identified by
+  // |connection_id|. |content_type| is the response content type (e.g.
+  // "text/html"), |data| is the response content, and |data_size| is the size
+  // of |data| in bytes. The contents of |data| will be copied. The connection
+  // will be closed automatically after the response is sent.
+  ///
+  /*--cef()--*/
+  virtual void SendHttp200Response(int connection_id,
+                                   const CefString& content_type,
+                                   const void* data,
+                                   size_t data_size) = 0;
+
+  ///
+  // Send an HTTP 404 "Not Found" response to the connection identified by
+  // |connection_id|. The connection will be closed automatically after the
+  // response is sent.
+  ///
+  /*--cef()--*/
+  virtual void SendHttp404Response(int connection_id) = 0;
+
+  ///
+  // Send an HTTP 500 "Internal Server Error" response to the connection
+  // identified by |connection_id|. |error_message| is the associated error
+  // message. The connection will be closed automatically after the response is
+  // sent.
+  ///
+  /*--cef()--*/
+  virtual void SendHttp500Response(int connection_id,
+                                   const CefString& error_message) = 0;
+
+  ///
+  // Send a custom HTTP response to the connection identified by
+  // |connection_id|. |response_code| is the HTTP response code sent in the
+  // status line (e.g. 200), |content_type| is the response content type sent
+  // as the "Content-Type" header (e.g. "text/html"), |content_length| is the
+  // expected content length, and |extra_headers| is the map of extra response
+  // headers. If |content_length| is >= 0 then the "Content-Length" header will
+  // be sent. If |content_length| is 0 then no content is expected and the
+  // connection will be closed automatically after the response is sent. If
+  // |content_length| is < 0 then no "Content-Length" header will be sent and
+  // the client will continue reading until the connection is closed. Use the
+  // SendRawData method to send the content, if applicable, and call
+  // CloseConnection after all content has been sent.
+  ///
+  /*--cef(optional_param=extra_headers)--*/
+  virtual void SendHttpResponse(int connection_id,
+                                int response_code,
+                                const CefString& content_type,
+                                int64 content_length,
+                                const HeaderMap& extra_headers) = 0;
+
+  ///
+  // Send raw data directly to the connection identified by |connection_id|.
+  // |data| is the raw data and |data_size| is the size of |data| in bytes.
+  // The contents of |data| will be copied. No validation of |data| is
+  // performed internally so the client should be careful to send the amount
+  // indicated by the "Content-Length" header, if specified. See
+  // SendHttpResponse documentation for intended usage.
+  ///
+  /*--cef()--*/
+  virtual void SendRawData(int connection_id,
+                           const void* data,
+                           size_t data_size) = 0;
+
+  ///
+  // Close the connection identified by |connection_id|. See SendHttpResponse
+  // documentation for intended usage.
+  ///
+  /*--cef()--*/
+  virtual void CloseConnection(int connection_id) = 0;
+
+  ///
+  // Send a WebSocket message to the connection identified by |connection_id|.
+  // |data| is the response content and |data_size| is the size of |data| in
+  // bytes. The contents of |data| will be copied. See
+  // CefServerHandler::OnWebSocketRequest documentation for intended usage.
+  ///
+  /*--cef()--*/
+  virtual void SendWebSocketMessage(int connection_id,
+                                    const void* data,
+                                    size_t data_size) = 0;
+};
+
+///
+// Implement this interface to handle HTTP server requests. A new thread will be
+// created for each CefServer::CreateServer call (the "dedicated server
+// thread"), and the methods of this class will be called on that thread. It is
+// therefore recommended to use a different CefServerHandler instance for each
+// CefServer::CreateServer call to avoid thread safety issues in the
+// CefServerHandler implementation.
+///
+/*--cef(source=client)--*/
+class CefServerHandler : public virtual CefBaseRefCounted {
+ public:
+  ///
+  // Called when |server| is created. If the server was started successfully
+  // then CefServer::IsRunning will return true. The server will continue
+  // running until CefServer::Shutdown is called, after which time
+  // OnServerDestroyed will be called. If the server failed to start then
+  // OnServerDestroyed will be called immediately after this method returns.
+  ///
+  /*--cef()--*/
+  virtual void OnServerCreated(CefRefPtr<CefServer> server) = 0;
+
+  ///
+  // Called when |server| is destroyed. The server thread will be stopped after
+  // this method returns. The client should release any references to |server|
+  // when this method is called. See OnServerCreated documentation for a
+  // description of server lifespan.
+  ///
+  /*--cef()--*/
+  virtual void OnServerDestroyed(CefRefPtr<CefServer> server) = 0;
+
+  ///
+  // Called when a client connects to |server|. |connection_id| uniquely
+  // identifies the connection. Each call to this method will have a matching
+  // call to OnClientDisconnected.
+  ///
+  /*--cef()--*/
+  virtual void OnClientConnected(CefRefPtr<CefServer> server,
+                                 int connection_id) = 0;
+
+  ///
+  // Called when a client disconnects from |server|. |connection_id| uniquely
+  // identifies the connection. The client should release any data associated
+  // with |connection_id| when this method is called and |connection_id| should
+  // no longer be passed to CefServer methods. Disconnects can originate from
+  // either the client or the server. For example, the server will disconnect
+  // automatically after a CefServer::SendHttpXXXResponse method is called.
+  ///
+  /*--cef()--*/
+  virtual void OnClientDisconnected(CefRefPtr<CefServer> server,
+                                    int connection_id) = 0;
+
+  ///
+  // Called when |server| receives an HTTP request. |connection_id| uniquely
+  // identifies the connection, |client_address| is the requesting IPv4 or IPv6
+  // client address including port number, and |request| contains the request
+  // contents (URL, method, headers and optional POST data). Call CefServer
+  // methods either synchronously or asynchronusly to send a response.
+  ///
+  /*--cef()--*/
+  virtual void OnHttpRequest(CefRefPtr<CefServer> server,
+                             int connection_id,
+                             const CefString& client_address,
+                             CefRefPtr<CefRequest> request) = 0;
+
+  ///
+  // Called when |server| receives a WebSocket request. |connection_id| uniquely
+  // identifies the connection, |client_address| is the requesting IPv4 or
+  // IPv6 client address including port number, and |request| contains the
+  // request contents (URL, method, headers and optional POST data). Execute
+  // |callback| either synchronously or asynchronously to accept or decline the
+  // WebSocket connection. If the request is accepted then OnWebSocketConnected
+  // will be called after the WebSocket has connected and incoming messages will
+  // be delivered to the OnWebSocketMessage callback. If the request is declined
+  // then the client will be disconnected and OnClientDisconnected will be
+  // called. Call the CefServer::SendWebSocketMessage method after receiving the
+  // OnWebSocketConnected callback to respond with WebSocket messages.
+  ///
+  /*--cef()--*/
+  virtual void OnWebSocketRequest(CefRefPtr<CefServer> server,
+                                  int connection_id,
+                                  const CefString& client_address,
+                                  CefRefPtr<CefRequest> request,
+                                  CefRefPtr<CefCallback> callback) = 0;
+
+  ///
+  // Called after the client has accepted the WebSocket connection for |server|
+  // and |connection_id| via the OnWebSocketRequest callback. See
+  // OnWebSocketRequest documentation for intended usage.
+  ///
+  /*--cef()--*/
+  virtual void OnWebSocketConnected(CefRefPtr<CefServer> server,
+                                    int connection_id) = 0;
+
+  ///
+  // Called when |server| receives an WebSocket message. |connection_id|
+  // uniquely identifies the connection, |data| is the message content and
+  // |data_size| is the size of |data| in bytes. Do not keep a reference to
+  // |data| outside of this method. See OnWebSocketRequest documentation for
+  // intended usage.
+  ///
+  /*--cef()--*/
+  virtual void OnWebSocketMessage(CefRefPtr<CefServer> server,
+                                  int connection_id,
+                                  const void* data,
+                                  size_t data_size) = 0;
+};
+
+#endif  // CEF_INCLUDE_CEF_SERVER_H_
diff --git a/src/include/cef_ssl_info.h b/src/include/cef_ssl_info.h
index db075cab..1ede5908 100644
--- a/src/include/cef_ssl_info.h
+++ b/src/include/cef_ssl_info.h
@@ -54,16 +54,15 @@ class CefSSLInfo : public virtual CefBaseRefCounted {
   // certificate.
   ///
   /*--cef(default_retval=CERT_STATUS_NONE)--*/
-  virtual cef_cert_status_t GetCertStatus() =0;
+  virtual cef_cert_status_t GetCertStatus() = 0;
 
   ///
   // Returns the X.509 certificate.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefX509Certificate> GetX509Certificate() =0;
+  virtual CefRefPtr<CefX509Certificate> GetX509Certificate() = 0;
 };
 
-
 ///
 // Returns true if the certificate status has any error, major or minor.
 ///
diff --git a/src/include/cef_ssl_status.h b/src/include/cef_ssl_status.h
index 3a5f3950..002ac491 100644
--- a/src/include/cef_ssl_status.h
+++ b/src/include/cef_ssl_status.h
@@ -52,32 +52,32 @@ class CefSSLStatus : public virtual CefBaseRefCounted {
   // Returns true if the status is related to a secure SSL/TLS connection.
   ///
   /*--cef()--*/
-  virtual bool IsSecureConnection() =0;
+  virtual bool IsSecureConnection() = 0;
 
   ///
   // Returns a bitmask containing any and all problems verifying the server
   // certificate.
   ///
   /*--cef(default_retval=CERT_STATUS_NONE)--*/
-  virtual cef_cert_status_t GetCertStatus() =0;
+  virtual cef_cert_status_t GetCertStatus() = 0;
 
   ///
   // Returns the SSL version used for the SSL connection.
   ///
   /*--cef(default_retval=SSL_CONNECTION_VERSION_UNKNOWN)--*/
-  virtual cef_ssl_version_t GetSSLVersion() =0;
+  virtual cef_ssl_version_t GetSSLVersion() = 0;
 
   ///
   // Returns a bitmask containing the page security content status.
   ///
   /*--cef(default_retval=SSL_CONTENT_NORMAL_CONTENT)--*/
-  virtual cef_ssl_content_status_t GetContentStatus() =0;
+  virtual cef_ssl_content_status_t GetContentStatus() = 0;
 
   ///
   // Returns the X.509 certificate.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefX509Certificate> GetX509Certificate() =0;
+  virtual CefRefPtr<CefX509Certificate> GetX509Certificate() = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_SSL_STATUS_H_
diff --git a/src/include/cef_stream.h b/src/include/cef_stream.h
index 81b0b916..c40392e0 100644
--- a/src/include/cef_stream.h
+++ b/src/include/cef_stream.h
@@ -50,7 +50,7 @@ class CefReadHandler : public virtual CefBaseRefCounted {
   // Read raw binary data.
   ///
   /*--cef()--*/
-  virtual size_t Read(void* ptr, size_t size, size_t n) =0;
+  virtual size_t Read(void* ptr, size_t size, size_t n) = 0;
 
   ///
   // Seek to the specified offset position. |whence| may be any one of
@@ -58,19 +58,19 @@ class CefReadHandler : public virtual CefBaseRefCounted {
   // failure.
   ///
   /*--cef()--*/
-  virtual int Seek(int64 offset, int whence) =0;
+  virtual int Seek(int64 offset, int whence) = 0;
 
   ///
   // Return the current offset position.
   ///
   /*--cef()--*/
-  virtual int64 Tell() =0;
+  virtual int64 Tell() = 0;
 
   ///
   // Return non-zero if at end of file.
   ///
   /*--cef()--*/
-  virtual int Eof() =0;
+  virtual int Eof() = 0;
 
   ///
   // Return true if this handler performs work like accessing the file system
@@ -78,10 +78,9 @@ class CefReadHandler : public virtual CefBaseRefCounted {
   // handler from.
   ///
   /*--cef()--*/
-  virtual bool MayBlock() =0;
+  virtual bool MayBlock() = 0;
 };
 
-
 ///
 // Class used to read data from a stream. The methods of this class may be
 // called on any thread.
@@ -110,7 +109,7 @@ class CefStreamReader : public virtual CefBaseRefCounted {
   // Read raw binary data.
   ///
   /*--cef()--*/
-  virtual size_t Read(void* ptr, size_t size, size_t n) =0;
+  virtual size_t Read(void* ptr, size_t size, size_t n) = 0;
 
   ///
   // Seek to the specified offset position. |whence| may be any one of
@@ -118,19 +117,19 @@ class CefStreamReader : public virtual CefBaseRefCounted {
   // failure.
   ///
   /*--cef()--*/
-  virtual int Seek(int64 offset, int whence) =0;
+  virtual int Seek(int64 offset, int whence) = 0;
 
   ///
   // Return the current offset position.
   ///
   /*--cef()--*/
-  virtual int64 Tell() =0;
+  virtual int64 Tell() = 0;
 
   ///
   // Return non-zero if at end of file.
   ///
   /*--cef()--*/
-  virtual int Eof() =0;
+  virtual int Eof() = 0;
 
   ///
   // Returns true if this reader performs work like accessing the file system
@@ -138,10 +137,9 @@ class CefStreamReader : public virtual CefBaseRefCounted {
   // reader from.
   ///
   /*--cef()--*/
-  virtual bool MayBlock() =0;
+  virtual bool MayBlock() = 0;
 };
 
-
 ///
 // Interface the client can implement to provide a custom stream writer. The
 // methods of this class may be called on any thread.
@@ -153,7 +151,7 @@ class CefWriteHandler : public virtual CefBaseRefCounted {
   // Write raw binary data.
   ///
   /*--cef()--*/
-  virtual size_t Write(const void* ptr, size_t size, size_t n) =0;
+  virtual size_t Write(const void* ptr, size_t size, size_t n) = 0;
 
   ///
   // Seek to the specified offset position. |whence| may be any one of
@@ -161,19 +159,19 @@ class CefWriteHandler : public virtual CefBaseRefCounted {
   // failure.
   ///
   /*--cef()--*/
-  virtual int Seek(int64 offset, int whence) =0;
+  virtual int Seek(int64 offset, int whence) = 0;
 
   ///
   // Return the current offset position.
   ///
   /*--cef()--*/
-  virtual int64 Tell() =0;
+  virtual int64 Tell() = 0;
 
   ///
   // Flush the stream.
   ///
   /*--cef()--*/
-  virtual int Flush() =0;
+  virtual int Flush() = 0;
 
   ///
   // Return true if this handler performs work like accessing the file system
@@ -181,10 +179,9 @@ class CefWriteHandler : public virtual CefBaseRefCounted {
   // handler from.
   ///
   /*--cef()--*/
-  virtual bool MayBlock() =0;
+  virtual bool MayBlock() = 0;
 };
 
-
 ///
 // Class used to write data to a stream. The methods of this class may be called
 // on any thread.
@@ -208,7 +205,7 @@ class CefStreamWriter : public virtual CefBaseRefCounted {
   // Write raw binary data.
   ///
   /*--cef()--*/
-  virtual size_t Write(const void* ptr, size_t size, size_t n) =0;
+  virtual size_t Write(const void* ptr, size_t size, size_t n) = 0;
 
   ///
   // Seek to the specified offset position. |whence| may be any one of
@@ -216,19 +213,19 @@ class CefStreamWriter : public virtual CefBaseRefCounted {
   // failure.
   ///
   /*--cef()--*/
-  virtual int Seek(int64 offset, int whence) =0;
+  virtual int Seek(int64 offset, int whence) = 0;
 
   ///
   // Return the current offset position.
   ///
   /*--cef()--*/
-  virtual int64 Tell() =0;
+  virtual int64 Tell() = 0;
 
   ///
   // Flush the stream.
   ///
   /*--cef()--*/
-  virtual int Flush() =0;
+  virtual int Flush() = 0;
 
   ///
   // Returns true if this writer performs work like accessing the file system
@@ -236,7 +233,7 @@ class CefStreamWriter : public virtual CefBaseRefCounted {
   // writer from.
   ///
   /*--cef()--*/
-  virtual bool MayBlock() =0;
+  virtual bool MayBlock() = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_STREAM_H_
diff --git a/src/include/cef_string_visitor.h b/src/include/cef_string_visitor.h
index 36a97ba3..f23dfb6a 100644
--- a/src/include/cef_string_visitor.h
+++ b/src/include/cef_string_visitor.h
@@ -49,7 +49,7 @@ class CefStringVisitor : public virtual CefBaseRefCounted {
   // Method that will be executed.
   ///
   /*--cef(optional_param=string)--*/
-  virtual void Visit(const CefString& string) =0;
+  virtual void Visit(const CefString& string) = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_STRING_VISITOR_H_
diff --git a/src/include/cef_task.h b/src/include/cef_task.h
index ea3b2d96..a892d395 100644
--- a/src/include/cef_task.h
+++ b/src/include/cef_task.h
@@ -56,7 +56,7 @@ class CefTask : public virtual CefBaseRefCounted {
   // Method that will be executed on the target thread.
   ///
   /*--cef()--*/
-  virtual void Execute() =0;
+  virtual void Execute() = 0;
 };
 
 ///
@@ -90,26 +90,26 @@ class CefTaskRunner : public virtual CefBaseRefCounted {
   // object.
   ///
   /*--cef()--*/
-  virtual bool IsSame(CefRefPtr<CefTaskRunner> that) =0;
+  virtual bool IsSame(CefRefPtr<CefTaskRunner> that) = 0;
 
   ///
   // Returns true if this task runner belongs to the current thread.
   ///
   /*--cef()--*/
-  virtual bool BelongsToCurrentThread() =0;
+  virtual bool BelongsToCurrentThread() = 0;
 
   ///
   // Returns true if this task runner is for the specified CEF thread.
   ///
   /*--cef()--*/
-  virtual bool BelongsToThread(CefThreadId threadId) =0;
+  virtual bool BelongsToThread(CefThreadId threadId) = 0;
 
   ///
   // Post a task for execution on the thread associated with this task runner.
   // Execution will occur asynchronously.
   ///
   /*--cef()--*/
-  virtual bool PostTask(CefRefPtr<CefTask> task) =0;
+  virtual bool PostTask(CefRefPtr<CefTask> task) = 0;
 
   ///
   // Post a task for delayed execution on the thread associated with this task
@@ -118,10 +118,9 @@ class CefTaskRunner : public virtual CefBaseRefCounted {
   // specified delay.
   ///
   /*--cef()--*/
-  virtual bool PostDelayedTask(CefRefPtr<CefTask> task, int64 delay_ms) =0;
+  virtual bool PostDelayedTask(CefRefPtr<CefTask> task, int64 delay_ms) = 0;
 };
 
-
 ///
 // Returns true if called on the specified thread. Equivalent to using
 // CefTaskRunner::GetForThread(threadId)->BelongsToCurrentThread().
@@ -141,8 +140,8 @@ bool CefPostTask(CefThreadId threadId, CefRefPtr<CefTask> task);
 // using CefTaskRunner::GetForThread(threadId)->PostDelayedTask(task, delay_ms).
 ///
 /*--cef()--*/
-bool CefPostDelayedTask(CefThreadId threadId, CefRefPtr<CefTask> task,
+bool CefPostDelayedTask(CefThreadId threadId,
+                        CefRefPtr<CefTask> task,
                         int64 delay_ms);
 
-
 #endif  // CEF_INCLUDE_CEF_TASK_H_
diff --git a/src/include/cef_thread.h b/src/include/cef_thread.h
index dfe652d2..1d0bd4cc 100644
--- a/src/include/cef_thread.h
+++ b/src/include/cef_thread.h
@@ -89,14 +89,14 @@ class CefThread : public CefBaseRefCounted {
   // loop. This method is safe to call from any thread.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefTaskRunner> GetTaskRunner() =0;
+  virtual CefRefPtr<CefTaskRunner> GetTaskRunner() = 0;
 
   ///
   // Returns the platform thread ID. It will return the same value after Stop()
   // is called. This method is safe to call from any thread.
   ///
   /*--cef(default_retval=kInvalidPlatformThreadId)--*/
-  virtual cef_platform_thread_id_t GetPlatformThreadId() =0;
+  virtual cef_platform_thread_id_t GetPlatformThreadId() = 0;
 
   ///
   // Stop and join the thread. This method must be called from the same thread
@@ -104,14 +104,14 @@ class CefThread : public CefBaseRefCounted {
   // called with a |stoppable| value of false.
   ///
   /*--cef()--*/
-  virtual void Stop() =0;
+  virtual void Stop() = 0;
 
   ///
   // Returns true if the thread is currently running. This method must be called
   // from the same thread that called CreateThread().
   ///
   /*--cef()--*/
-  virtual bool IsRunning() =0;
+  virtual bool IsRunning() = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_THREAD_H_
diff --git a/src/include/cef_trace.h b/src/include/cef_trace.h
index fa7f6278..bc92d389 100644
--- a/src/include/cef_trace.h
+++ b/src/include/cef_trace.h
@@ -57,10 +57,9 @@ class CefEndTracingCallback : public virtual CefBaseRefCounted {
   // deleting |tracing_file|.
   ///
   /*--cef()--*/
-  virtual void OnEndTracingComplete(const CefString& tracing_file) =0;
+  virtual void OnEndTracingComplete(const CefString& tracing_file) = 0;
 };
 
-
 ///
 // Start tracing events on all processes. Tracing is initialized asynchronously
 // and |callback| will be executed on the UI thread after initialization is
diff --git a/src/include/cef_urlrequest.h b/src/include/cef_urlrequest.h
index 23bc821e..889386ad 100644
--- a/src/include/cef_urlrequest.h
+++ b/src/include/cef_urlrequest.h
@@ -85,26 +85,26 @@ class CefURLRequest : public virtual CefBaseRefCounted {
   // object is read-only and should not be modified.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefRequest> GetRequest() =0;
+  virtual CefRefPtr<CefRequest> GetRequest() = 0;
 
   ///
   // Returns the client.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefURLRequestClient> GetClient() =0;
+  virtual CefRefPtr<CefURLRequestClient> GetClient() = 0;
 
   ///
   // Returns the request status.
   ///
   /*--cef(default_retval=UR_UNKNOWN)--*/
-  virtual Status GetRequestStatus() =0;
+  virtual Status GetRequestStatus() = 0;
 
   ///
   // Returns the request error if status is UR_CANCELED or UR_FAILED, or 0
   // otherwise.
   ///
   /*--cef(default_retval=ERR_NONE)--*/
-  virtual ErrorCode GetRequestError() =0;
+  virtual ErrorCode GetRequestError() = 0;
 
   ///
   // Returns the response, or NULL if no response information is available.
@@ -112,13 +112,20 @@ class CefURLRequest : public virtual CefBaseRefCounted {
   // The returned object is read-only and should not be modified.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefResponse> GetResponse() =0;
+  virtual CefRefPtr<CefResponse> GetResponse() = 0;
+
+  ///
+  // Returns true if the response body was served from the cache. This includes
+  // responses for which revalidation was required.
+  ///
+  /*--cef()--*/
+  virtual bool ResponseWasCached() = 0;
 
   ///
   // Cancel the request.
   ///
   /*--cef()--*/
-  virtual void Cancel() =0;
+  virtual void Cancel() = 0;
 };
 
 ///
@@ -135,7 +142,7 @@ class CefURLRequestClient : public virtual CefBaseRefCounted {
   // successful or not.
   ///
   /*--cef()--*/
-  virtual void OnRequestComplete(CefRefPtr<CefURLRequest> request) =0;
+  virtual void OnRequestComplete(CefRefPtr<CefURLRequest> request) = 0;
 
   ///
   // Notifies the client of upload progress. |current| denotes the number of
@@ -146,7 +153,7 @@ class CefURLRequestClient : public virtual CefBaseRefCounted {
   /*--cef()--*/
   virtual void OnUploadProgress(CefRefPtr<CefURLRequest> request,
                                 int64 current,
-                                int64 total) =0;
+                                int64 total) = 0;
 
   ///
   // Notifies the client of download progress. |current| denotes the number of
@@ -156,7 +163,7 @@ class CefURLRequestClient : public virtual CefBaseRefCounted {
   /*--cef()--*/
   virtual void OnDownloadProgress(CefRefPtr<CefURLRequest> request,
                                   int64 current,
-                                  int64 total) =0;
+                                  int64 total) = 0;
 
   ///
   // Called when some part of the response is read. |data| contains the current
@@ -166,7 +173,7 @@ class CefURLRequestClient : public virtual CefBaseRefCounted {
   /*--cef()--*/
   virtual void OnDownloadData(CefRefPtr<CefURLRequest> request,
                               const void* data,
-                              size_t data_length) =0;
+                              size_t data_length) = 0;
 
   ///
   // Called on the IO thread when the browser needs credentials from the user.
@@ -182,7 +189,7 @@ class CefURLRequestClient : public virtual CefBaseRefCounted {
                                   int port,
                                   const CefString& realm,
                                   const CefString& scheme,
-                                  CefRefPtr<CefAuthCallback> callback) =0;
+                                  CefRefPtr<CefAuthCallback> callback) = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_URLREQUEST_H_
diff --git a/src/include/cef_v8.h b/src/include/cef_v8.h
index 2ec4feb8..2886d35f 100644
--- a/src/include/cef_v8.h
+++ b/src/include/cef_v8.h
@@ -34,23 +34,21 @@
 // tools directory for more information.
 //
 
-
 #ifndef CEF_INCLUDE_CEF_V8_H_
 #define CEF_INCLUDE_CEF_V8_H_
 #pragma once
 
+#include <vector>
 #include "include/cef_base.h"
 #include "include/cef_browser.h"
 #include "include/cef_frame.h"
 #include "include/cef_task.h"
-#include <vector>
 
 class CefV8Exception;
 class CefV8Handler;
 class CefV8StackFrame;
 class CefV8Value;
 
-
 ///
 // Register a new V8 extension with the specified JavaScript extension code and
 // handler. Functions implemented by the handler are prototyped using the
@@ -115,7 +113,6 @@ bool CefRegisterExtension(const CefString& extension_name,
                           const CefString& javascript_code,
                           CefRefPtr<CefV8Handler> handler);
 
-
 ///
 // Class representing a V8 context handle. V8 handles can only be accessed from
 // the thread on which they are created. Valid threads for creating a V8 handle
@@ -150,7 +147,7 @@ class CefV8Context : public virtual CefBaseRefCounted {
   // called on any render process thread.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefTaskRunner> GetTaskRunner() =0;
+  virtual CefRefPtr<CefTaskRunner> GetTaskRunner() = 0;
 
   ///
   // Returns true if the underlying handle is valid and it can be accessed on
@@ -158,28 +155,28 @@ class CefV8Context : public virtual CefBaseRefCounted {
   // false.
   ///
   /*--cef()--*/
-  virtual bool IsValid() =0;
+  virtual bool IsValid() = 0;
 
   ///
   // Returns the browser for this context. This method will return an empty
   // reference for WebWorker contexts.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefBrowser> GetBrowser() =0;
+  virtual CefRefPtr<CefBrowser> GetBrowser() = 0;
 
   ///
   // Returns the frame for this context. This method will return an empty
   // reference for WebWorker contexts.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefFrame> GetFrame() =0;
+  virtual CefRefPtr<CefFrame> GetFrame() = 0;
 
   ///
   // Returns the global object for this context. The context must be entered
   // before calling this method.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefV8Value> GetGlobal() =0;
+  virtual CefRefPtr<CefV8Value> GetGlobal() = 0;
 
   ///
   // Enter this context. A context must be explicitly entered before creating a
@@ -189,21 +186,21 @@ class CefV8Context : public virtual CefBaseRefCounted {
   // the scope was entered successfully.
   ///
   /*--cef()--*/
-  virtual bool Enter() =0;
+  virtual bool Enter() = 0;
 
   ///
   // Exit this context. Call this method only after calling Enter(). Returns
   // true if the scope was exited successfully.
   ///
   /*--cef()--*/
-  virtual bool Exit() =0;
+  virtual bool Exit() = 0;
 
   ///
   // Returns true if this object is pointing to the same handle as |that|
   // object.
   ///
   /*--cef()--*/
-  virtual bool IsSame(CefRefPtr<CefV8Context> that) =0;
+  virtual bool IsSame(CefRefPtr<CefV8Context> that) = 0;
 
   ///
   // Execute a string of JavaScript code in this V8 context. The |script_url|
@@ -218,11 +215,10 @@ class CefV8Context : public virtual CefBaseRefCounted {
                     const CefString& script_url,
                     int start_line,
                     CefRefPtr<CefV8Value>& retval,
-                    CefRefPtr<CefV8Exception>& exception) =0;
+                    CefRefPtr<CefV8Exception>& exception) = 0;
 };
 
-
-typedef std::vector<CefRefPtr<CefV8Value> > CefV8ValueList;
+typedef std::vector<CefRefPtr<CefV8Value>> CefV8ValueList;
 
 ///
 // Interface that should be implemented to handle V8 function calls. The methods
@@ -243,7 +239,7 @@ class CefV8Handler : public virtual CefBaseRefCounted {
                        CefRefPtr<CefV8Value> object,
                        const CefV8ValueList& arguments,
                        CefRefPtr<CefV8Value>& retval,
-                       CefString& exception) =0;
+                       CefString& exception) = 0;
 };
 
 ///
@@ -265,7 +261,7 @@ class CefV8Accessor : public virtual CefBaseRefCounted {
   virtual bool Get(const CefString& name,
                    const CefRefPtr<CefV8Value> object,
                    CefRefPtr<CefV8Value>& retval,
-                   CefString& exception) =0;
+                   CefString& exception) = 0;
 
   ///
   // Handle assignment of the accessor value identified by |name|. |object| is
@@ -278,7 +274,7 @@ class CefV8Accessor : public virtual CefBaseRefCounted {
   virtual bool Set(const CefString& name,
                    const CefRefPtr<CefV8Value> object,
                    const CefRefPtr<CefV8Value> value,
-                   CefString& exception) =0;
+                   CefString& exception) = 0;
 };
 
 ///
@@ -291,7 +287,7 @@ class CefV8Accessor : public virtual CefBaseRefCounted {
 ///
 /*--cef(source=client)--*/
 class CefV8Interceptor : public virtual CefBaseRefCounted {
-public:
+ public:
   ///
   // Handle retrieval of the interceptor value identified by |name|. |object| is
   // the receiver ('this' object) of the interceptor. If retrieval succeeds, set
@@ -305,7 +301,7 @@ class CefV8Interceptor : public virtual CefBaseRefCounted {
   virtual bool Get(const CefString& name,
                    const CefRefPtr<CefV8Value> object,
                    CefRefPtr<CefV8Value>& retval,
-                   CefString& exception) =0;
+                   CefString& exception) = 0;
 
   ///
   // Handle retrieval of the interceptor value identified by |index|. |object|
@@ -319,7 +315,7 @@ class CefV8Interceptor : public virtual CefBaseRefCounted {
   virtual bool Get(int index,
                    const CefRefPtr<CefV8Value> object,
                    CefRefPtr<CefV8Value>& retval,
-                   CefString& exception) =0;
+                   CefString& exception) = 0;
 
   ///
   // Handle assignment of the interceptor value identified by |name|. |object|
@@ -333,7 +329,7 @@ class CefV8Interceptor : public virtual CefBaseRefCounted {
   virtual bool Set(const CefString& name,
                    const CefRefPtr<CefV8Value> object,
                    const CefRefPtr<CefV8Value> value,
-                   CefString& exception) =0;
+                   CefString& exception) = 0;
 
   ///
   // Handle assignment of the interceptor value identified by |index|. |object|
@@ -346,7 +342,7 @@ class CefV8Interceptor : public virtual CefBaseRefCounted {
   virtual bool Set(int index,
                    const CefRefPtr<CefV8Value> object,
                    const CefRefPtr<CefV8Value> value,
-                   CefString& exception) =0;
+                   CefString& exception) = 0;
 };
 
 ///
@@ -360,55 +356,70 @@ class CefV8Exception : public virtual CefBaseRefCounted {
   // Returns the exception message.
   ///
   /*--cef()--*/
-  virtual CefString GetMessage() =0;
+  virtual CefString GetMessage() = 0;
 
   ///
   // Returns the line of source code that the exception occurred within.
   ///
   /*--cef()--*/
-  virtual CefString GetSourceLine() =0;
+  virtual CefString GetSourceLine() = 0;
 
   ///
   // Returns the resource name for the script from where the function causing
   // the error originates.
   ///
   /*--cef()--*/
-  virtual CefString GetScriptResourceName() =0;
+  virtual CefString GetScriptResourceName() = 0;
 
   ///
   // Returns the 1-based number of the line where the error occurred or 0 if the
   // line number is unknown.
   ///
   /*--cef()--*/
-  virtual int GetLineNumber() =0;
+  virtual int GetLineNumber() = 0;
 
   ///
   // Returns the index within the script of the first character where the error
   // occurred.
   ///
   /*--cef()--*/
-  virtual int GetStartPosition() =0;
+  virtual int GetStartPosition() = 0;
 
   ///
   // Returns the index within the script of the last character where the error
   // occurred.
   ///
   /*--cef()--*/
-  virtual int GetEndPosition() =0;
+  virtual int GetEndPosition() = 0;
 
   ///
   // Returns the index within the line of the first character where the error
   // occurred.
   ///
   /*--cef()--*/
-  virtual int GetStartColumn() =0;
+  virtual int GetStartColumn() = 0;
 
   ///
   // Returns the index within the line of the last character where the error
   // occurred.
   ///
   /*--cef()--*/
-  virtual int GetEndColumn() =0;
+  virtual int GetEndColumn() = 0;
+};
+
+///
+// Callback interface that is passed to CefV8Value::CreateArrayBuffer.
+///
+/*--cef(source=client)--*/
+class CefV8ArrayBufferReleaseCallback : public virtual CefBaseRefCounted {
+ public:
+  ///
+  // Called to release |buffer| when the ArrayBuffer JS object is garbage
+  // collected. |buffer| is the value that was passed to CreateArrayBuffer along
+  // with this object.
+  ///
+  /*--cef()--*/
+  virtual void ReleaseBuffer(void* buffer) = 0;
 };
 
 ///
@@ -497,6 +508,22 @@ class CefV8Value : public virtual CefBaseRefCounted {
   /*--cef()--*/
   static CefRefPtr<CefV8Value> CreateArray(int length);
 
+  ///
+  // Create a new CefV8Value object of type ArrayBuffer which wraps the provided
+  // |buffer| of size |length| bytes. The ArrayBuffer is externalized, meaning
+  // that it does not own |buffer|. The caller is responsible for freeing
+  // |buffer| when requested via a call to CefV8ArrayBufferReleaseCallback::
+  // ReleaseBuffer. This method should only be called from within the scope of a
+  // CefRenderProcessHandler, CefV8Handler or CefV8Accessor callback, or in
+  // combination with calling Enter() and Exit() on a stored CefV8Context
+  // reference.
+  ///
+  /*--cef()--*/
+  static CefRefPtr<CefV8Value> CreateArrayBuffer(
+      void* buffer,
+      size_t length,
+      CefRefPtr<CefV8ArrayBufferReleaseCallback> release_callback);
+
   ///
   // Create a new CefV8Value object of type function. This method should only be
   // called from within the scope of a CefRenderProcessHandler, CefV8Handler or
@@ -513,117 +540,122 @@ class CefV8Value : public virtual CefBaseRefCounted {
   // false.
   ///
   /*--cef()--*/
-  virtual bool IsValid() =0;
+  virtual bool IsValid() = 0;
 
   ///
   // True if the value type is undefined.
   ///
   /*--cef()--*/
-  virtual bool IsUndefined() =0;
+  virtual bool IsUndefined() = 0;
 
   ///
   // True if the value type is null.
   ///
   /*--cef()--*/
-  virtual bool IsNull() =0;
+  virtual bool IsNull() = 0;
 
   ///
   // True if the value type is bool.
   ///
   /*--cef()--*/
-  virtual bool IsBool() =0;
+  virtual bool IsBool() = 0;
 
   ///
   // True if the value type is int.
   ///
   /*--cef()--*/
-  virtual bool IsInt() =0;
+  virtual bool IsInt() = 0;
 
   ///
   // True if the value type is unsigned int.
   ///
   /*--cef()--*/
-  virtual bool IsUInt() =0;
+  virtual bool IsUInt() = 0;
 
   ///
   // True if the value type is double.
   ///
   /*--cef()--*/
-  virtual bool IsDouble() =0;
+  virtual bool IsDouble() = 0;
 
   ///
   // True if the value type is Date.
   ///
   /*--cef()--*/
-  virtual bool IsDate() =0;
+  virtual bool IsDate() = 0;
 
   ///
   // True if the value type is string.
   ///
   /*--cef()--*/
-  virtual bool IsString() =0;
+  virtual bool IsString() = 0;
 
   ///
   // True if the value type is object.
   ///
   /*--cef()--*/
-  virtual bool IsObject() =0;
+  virtual bool IsObject() = 0;
 
   ///
   // True if the value type is array.
   ///
   /*--cef()--*/
-  virtual bool IsArray() =0;
+  virtual bool IsArray() = 0;
+
+  ///
+  // True if the value type is an ArrayBuffer.
+  ///
+  /*--cef()--*/
+  virtual bool IsArrayBuffer() = 0;
 
   ///
   // True if the value type is function.
   ///
   /*--cef()--*/
-  virtual bool IsFunction() =0;
+  virtual bool IsFunction() = 0;
 
   ///
   // Returns true if this object is pointing to the same handle as |that|
   // object.
   ///
   /*--cef()--*/
-  virtual bool IsSame(CefRefPtr<CefV8Value> that) =0;
+  virtual bool IsSame(CefRefPtr<CefV8Value> that) = 0;
 
   ///
   // Return a bool value.
   ///
   /*--cef()--*/
-  virtual bool GetBoolValue() =0;
+  virtual bool GetBoolValue() = 0;
 
   ///
   // Return an int value.
   ///
   /*--cef()--*/
-  virtual int32 GetIntValue() =0;
+  virtual int32 GetIntValue() = 0;
 
   ///
   // Return an unsigned int value.
   ///
   /*--cef()--*/
-  virtual uint32 GetUIntValue() =0;
+  virtual uint32 GetUIntValue() = 0;
 
   ///
   // Return a double value.
   ///
   /*--cef()--*/
-  virtual double GetDoubleValue() =0;
+  virtual double GetDoubleValue() = 0;
 
   ///
   // Return a Date value.
   ///
   /*--cef()--*/
-  virtual CefTime GetDateValue() =0;
+  virtual CefTime GetDateValue() = 0;
 
   ///
   // Return a string value.
   ///
   /*--cef()--*/
-  virtual CefString GetStringValue() =0;
-
+  virtual CefString GetStringValue() = 0;
 
   // OBJECT METHODS - These methods are only available on objects. Arrays and
   // functions are also objects. String- and integer-based keys can be used
@@ -633,34 +665,34 @@ class CefV8Value : public virtual CefBaseRefCounted {
   // Returns true if this is a user created object.
   ///
   /*--cef()--*/
-  virtual bool IsUserCreated() =0;
+  virtual bool IsUserCreated() = 0;
 
   ///
   // Returns true if the last method call resulted in an exception. This
   // attribute exists only in the scope of the current CEF value object.
   ///
   /*--cef()--*/
-  virtual bool HasException() =0;
+  virtual bool HasException() = 0;
 
   ///
   // Returns the exception resulting from the last method call. This attribute
   // exists only in the scope of the current CEF value object.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefV8Exception> GetException() =0;
+  virtual CefRefPtr<CefV8Exception> GetException() = 0;
 
   ///
   // Clears the last exception and returns true on success.
   ///
   /*--cef()--*/
-  virtual bool ClearException() =0;
+  virtual bool ClearException() = 0;
 
   ///
   // Returns true if this object will re-throw future exceptions. This attribute
   // exists only in the scope of the current CEF value object.
   ///
   /*--cef()--*/
-  virtual bool WillRethrowExceptions() =0;
+  virtual bool WillRethrowExceptions() = 0;
 
   ///
   // Set whether this object will re-throw future exceptions. By default
@@ -670,19 +702,19 @@ class CefV8Value : public virtual CefBaseRefCounted {
   // only in the scope of the current CEF value object.
   ///
   /*--cef()--*/
-  virtual bool SetRethrowExceptions(bool rethrow) =0;
+  virtual bool SetRethrowExceptions(bool rethrow) = 0;
 
   ///
   // Returns true if the object has a value with the specified identifier.
   ///
   /*--cef(capi_name=has_value_bykey,optional_param=key)--*/
-  virtual bool HasValue(const CefString& key) =0;
+  virtual bool HasValue(const CefString& key) = 0;
 
   ///
   // Returns true if the object has a value with the specified identifier.
   ///
   /*--cef(capi_name=has_value_byindex,index_param=index)--*/
-  virtual bool HasValue(int index) =0;
+  virtual bool HasValue(int index) = 0;
 
   ///
   // Deletes the value with the specified identifier and returns true on
@@ -691,7 +723,7 @@ class CefV8Value : public virtual CefBaseRefCounted {
   // true even though deletion failed.
   ///
   /*--cef(capi_name=delete_value_bykey,optional_param=key)--*/
-  virtual bool DeleteValue(const CefString& key) =0;
+  virtual bool DeleteValue(const CefString& key) = 0;
 
   ///
   // Deletes the value with the specified identifier and returns true on
@@ -700,21 +732,21 @@ class CefV8Value : public virtual CefBaseRefCounted {
   // method will return true even though deletion failed.
   ///
   /*--cef(capi_name=delete_value_byindex,index_param=index)--*/
-  virtual bool DeleteValue(int index) =0;
+  virtual bool DeleteValue(int index) = 0;
 
   ///
   // Returns the value with the specified identifier on success. Returns NULL
   // if this method is called incorrectly or an exception is thrown.
   ///
   /*--cef(capi_name=get_value_bykey,optional_param=key)--*/
-  virtual CefRefPtr<CefV8Value> GetValue(const CefString& key) =0;
+  virtual CefRefPtr<CefV8Value> GetValue(const CefString& key) = 0;
 
   ///
   // Returns the value with the specified identifier on success. Returns NULL
   // if this method is called incorrectly or an exception is thrown.
   ///
   /*--cef(capi_name=get_value_byindex,index_param=index)--*/
-  virtual CefRefPtr<CefV8Value> GetValue(int index) =0;
+  virtual CefRefPtr<CefV8Value> GetValue(int index) = 0;
 
   ///
   // Associates a value with the specified identifier and returns true on
@@ -723,8 +755,9 @@ class CefV8Value : public virtual CefBaseRefCounted {
   // assignment failed.
   ///
   /*--cef(capi_name=set_value_bykey,optional_param=key)--*/
-  virtual bool SetValue(const CefString& key, CefRefPtr<CefV8Value> value,
-                        PropertyAttribute attribute) =0;
+  virtual bool SetValue(const CefString& key,
+                        CefRefPtr<CefV8Value> value,
+                        PropertyAttribute attribute) = 0;
 
   ///
   // Associates a value with the specified identifier and returns true on
@@ -733,7 +766,7 @@ class CefV8Value : public virtual CefBaseRefCounted {
   // assignment failed.
   ///
   /*--cef(capi_name=set_value_byindex,index_param=index)--*/
-  virtual bool SetValue(int index, CefRefPtr<CefV8Value> value) =0;
+  virtual bool SetValue(int index, CefRefPtr<CefV8Value> value) = 0;
 
   ///
   // Registers an identifier and returns true on success. Access to the
@@ -743,15 +776,16 @@ class CefV8Value : public virtual CefBaseRefCounted {
   // will return true even though assignment failed.
   ///
   /*--cef(capi_name=set_value_byaccessor,optional_param=key)--*/
-  virtual bool SetValue(const CefString& key, AccessControl settings,
-                        PropertyAttribute attribute) =0;
+  virtual bool SetValue(const CefString& key,
+                        AccessControl settings,
+                        PropertyAttribute attribute) = 0;
 
   ///
   // Read the keys for the object's values into the specified vector. Integer-
   // based keys will also be returned as strings.
   ///
   /*--cef()--*/
-  virtual bool GetKeys(std::vector<CefString>& keys) =0;
+  virtual bool GetKeys(std::vector<CefString>& keys) = 0;
 
   ///
   // Sets the user data for this object and returns true on success. Returns
@@ -759,20 +793,20 @@ class CefV8Value : public virtual CefBaseRefCounted {
   // on user created objects.
   ///
   /*--cef(optional_param=user_data)--*/
-  virtual bool SetUserData(CefRefPtr<CefBaseRefCounted> user_data) =0;
+  virtual bool SetUserData(CefRefPtr<CefBaseRefCounted> user_data) = 0;
 
   ///
   // Returns the user data, if any, assigned to this object.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefBaseRefCounted> GetUserData() =0;
+  virtual CefRefPtr<CefBaseRefCounted> GetUserData() = 0;
 
   ///
   // Returns the amount of externally allocated memory registered for the
   // object.
   ///
   /*--cef()--*/
-  virtual int GetExternallyAllocatedMemory() =0;
+  virtual int GetExternallyAllocatedMemory() = 0;
 
   ///
   // Adjusts the amount of registered external memory for the object. Used to
@@ -786,8 +820,7 @@ class CefV8Value : public virtual CefBaseRefCounted {
   // only be called on user created objects.
   ///
   /*--cef()--*/
-  virtual int AdjustExternallyAllocatedMemory(int change_in_bytes) =0;
-
+  virtual int AdjustExternallyAllocatedMemory(int change_in_bytes) = 0;
 
   // ARRAY METHODS - These methods are only available on arrays.
 
@@ -795,8 +828,26 @@ class CefV8Value : public virtual CefBaseRefCounted {
   // Returns the number of elements in the array.
   ///
   /*--cef()--*/
-  virtual int GetArrayLength() =0;
+  virtual int GetArrayLength() = 0;
+
+  // ARRAY BUFFER METHODS - These methods are only available on ArrayBuffers.
 
+  ///
+  // Returns the ReleaseCallback object associated with the ArrayBuffer or NULL
+  // if the ArrayBuffer was not created with CreateArrayBuffer.
+  ///
+  /*--cef()--*/
+  virtual CefRefPtr<CefV8ArrayBufferReleaseCallback>
+  GetArrayBufferReleaseCallback() = 0;
+
+  ///
+  // Prevent the ArrayBuffer from using it's memory block by setting the length
+  // to zero. This operation cannot be undone. If the ArrayBuffer was created
+  // with CreateArrayBuffer then CefV8ArrayBufferReleaseCallback::ReleaseBuffer
+  // will be called to release the underlying buffer.
+  ///
+  /*--cef()--*/
+  virtual bool NeuterArrayBuffer() = 0;
 
   // FUNCTION METHODS - These methods are only available on functions.
 
@@ -804,13 +855,13 @@ class CefV8Value : public virtual CefBaseRefCounted {
   // Returns the function name.
   ///
   /*--cef()--*/
-  virtual CefString GetFunctionName() =0;
+  virtual CefString GetFunctionName() = 0;
 
   ///
   // Returns the function handler or NULL if not a CEF-created function.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefV8Handler> GetFunctionHandler() =0;
+  virtual CefRefPtr<CefV8Handler> GetFunctionHandler() = 0;
 
   ///
   // Execute the function using the current V8 context. This method should only
@@ -825,7 +876,7 @@ class CefV8Value : public virtual CefBaseRefCounted {
   /*--cef(optional_param=object)--*/
   virtual CefRefPtr<CefV8Value> ExecuteFunction(
       CefRefPtr<CefV8Value> object,
-      const CefV8ValueList& arguments) =0;
+      const CefV8ValueList& arguments) = 0;
 
   ///
   // Execute the function using the specified V8 context. |object| is the
@@ -839,7 +890,7 @@ class CefV8Value : public virtual CefBaseRefCounted {
   virtual CefRefPtr<CefV8Value> ExecuteFunctionWithContext(
       CefRefPtr<CefV8Context> context,
       CefRefPtr<CefV8Value> object,
-      const CefV8ValueList& arguments) =0;
+      const CefV8ValueList& arguments) = 0;
 };
 
 ///
@@ -865,19 +916,19 @@ class CefV8StackTrace : public virtual CefBaseRefCounted {
   // false.
   ///
   /*--cef()--*/
-  virtual bool IsValid() =0;
+  virtual bool IsValid() = 0;
 
   ///
   // Returns the number of stack frames.
   ///
   /*--cef()--*/
-  virtual int GetFrameCount() =0;
+  virtual int GetFrameCount() = 0;
 
   ///
   // Returns the stack frame at the specified 0-based index.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefV8StackFrame> GetFrame(int index) =0;
+  virtual CefRefPtr<CefV8StackFrame> GetFrame(int index) = 0;
 };
 
 ///
@@ -896,13 +947,13 @@ class CefV8StackFrame : public virtual CefBaseRefCounted {
   // false.
   ///
   /*--cef()--*/
-  virtual bool IsValid() =0;
+  virtual bool IsValid() = 0;
 
   ///
   // Returns the name of the resource script that contains the function.
   ///
   /*--cef()--*/
-  virtual CefString GetScriptName() =0;
+  virtual CefString GetScriptName() = 0;
 
   ///
   // Returns the name of the resource script that contains the function or the
@@ -910,38 +961,38 @@ class CefV8StackFrame : public virtual CefBaseRefCounted {
   // a "//@ sourceURL=..." string.
   ///
   /*--cef()--*/
-  virtual CefString GetScriptNameOrSourceURL() =0;
+  virtual CefString GetScriptNameOrSourceURL() = 0;
 
   ///
   // Returns the name of the function.
   ///
   /*--cef()--*/
-  virtual CefString GetFunctionName() =0;
+  virtual CefString GetFunctionName() = 0;
 
   ///
   // Returns the 1-based line number for the function call or 0 if unknown.
   ///
   /*--cef()--*/
-  virtual int GetLineNumber() =0;
+  virtual int GetLineNumber() = 0;
 
   ///
   // Returns the 1-based column offset on the line for the function call or 0 if
   // unknown.
   ///
   /*--cef()--*/
-  virtual int GetColumn() =0;
+  virtual int GetColumn() = 0;
 
   ///
   // Returns true if the function was compiled using eval().
   ///
   /*--cef()--*/
-  virtual bool IsEval() =0;
+  virtual bool IsEval() = 0;
 
   ///
   // Returns true if the function was called as a constructor via "new".
   ///
   /*--cef()--*/
-  virtual bool IsConstructor() =0;
+  virtual bool IsConstructor() = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_V8_H_
diff --git a/src/include/cef_values.h b/src/include/cef_values.h
index 6bbd1e27..be88794e 100644
--- a/src/include/cef_values.h
+++ b/src/include/cef_values.h
@@ -70,20 +70,20 @@ class CefValue : public virtual CefBaseRefCounted {
   // invalid.
   ///
   /*--cef()--*/
-  virtual bool IsValid() =0;
+  virtual bool IsValid() = 0;
 
   ///
   // Returns true if the underlying data is owned by another object.
   ///
   /*--cef()--*/
-  virtual bool IsOwned() =0;
+  virtual bool IsOwned() = 0;
 
   ///
   // Returns true if the underlying data is read-only. Some APIs may expose
   // read-only objects.
   ///
   /*--cef()--*/
-  virtual bool IsReadOnly() =0;
+  virtual bool IsReadOnly() = 0;
 
   ///
   // Returns true if this object and |that| object have the same underlying
@@ -91,50 +91,50 @@ class CefValue : public virtual CefBaseRefCounted {
   // and vice-versa.
   ///
   /*--cef()--*/
-  virtual bool IsSame(CefRefPtr<CefValue> that) =0;
+  virtual bool IsSame(CefRefPtr<CefValue> that) = 0;
 
   ///
   // Returns true if this object and |that| object have an equivalent underlying
   // value but are not necessarily the same object.
   ///
   /*--cef()--*/
-  virtual bool IsEqual(CefRefPtr<CefValue> that) =0;
+  virtual bool IsEqual(CefRefPtr<CefValue> that) = 0;
 
   ///
   // Returns a copy of this object. The underlying data will also be copied.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefValue> Copy() =0;
+  virtual CefRefPtr<CefValue> Copy() = 0;
 
   ///
   // Returns the underlying value type.
   ///
   /*--cef(default_retval=VTYPE_INVALID)--*/
-  virtual CefValueType GetType() =0;
+  virtual CefValueType GetType() = 0;
 
   ///
   // Returns the underlying value as type bool.
   ///
   /*--cef()--*/
-  virtual bool GetBool() =0;
+  virtual bool GetBool() = 0;
 
   ///
   // Returns the underlying value as type int.
   ///
   /*--cef()--*/
-  virtual int GetInt() =0;
+  virtual int GetInt() = 0;
 
   ///
   // Returns the underlying value as type double.
   ///
   /*--cef()--*/
-  virtual double GetDouble() =0;
+  virtual double GetDouble() = 0;
 
   ///
   // Returns the underlying value as type string.
   ///
   /*--cef()--*/
-  virtual CefString GetString() =0;
+  virtual CefString GetString() = 0;
 
   ///
   // Returns the underlying value as type binary. The returned reference may
@@ -145,7 +145,7 @@ class CefValue : public virtual CefBaseRefCounted {
   // to SetBinary().
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefBinaryValue> GetBinary() =0;
+  virtual CefRefPtr<CefBinaryValue> GetBinary() = 0;
 
   ///
   // Returns the underlying value as type dictionary. The returned reference may
@@ -156,7 +156,7 @@ class CefValue : public virtual CefBaseRefCounted {
   // to SetDictionary().
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefDictionaryValue> GetDictionary() =0;
+  virtual CefRefPtr<CefDictionaryValue> GetDictionary() = 0;
 
   ///
   // Returns the underlying value as type list. The returned reference may
@@ -167,42 +167,42 @@ class CefValue : public virtual CefBaseRefCounted {
   // to SetList().
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefListValue> GetList() =0;
+  virtual CefRefPtr<CefListValue> GetList() = 0;
 
   ///
   // Sets the underlying value as type null. Returns true if the value was set
   // successfully.
   ///
   /*--cef()--*/
-  virtual bool SetNull() =0;
+  virtual bool SetNull() = 0;
 
   ///
   // Sets the underlying value as type bool. Returns true if the value was set
   // successfully.
   ///
   /*--cef()--*/
-  virtual bool SetBool(bool value) =0;
+  virtual bool SetBool(bool value) = 0;
 
   ///
   // Sets the underlying value as type int. Returns true if the value was set
   // successfully.
   ///
   /*--cef()--*/
-  virtual bool SetInt(int value) =0;
+  virtual bool SetInt(int value) = 0;
 
   ///
   // Sets the underlying value as type double. Returns true if the value was set
   // successfully.
   ///
   /*--cef()--*/
-  virtual bool SetDouble(double value) =0;
+  virtual bool SetDouble(double value) = 0;
 
   ///
   // Sets the underlying value as type string. Returns true if the value was set
   // successfully.
   ///
   /*--cef(optional_param=value)--*/
-  virtual bool SetString(const CefString& value) =0;
+  virtual bool SetString(const CefString& value) = 0;
 
   ///
   // Sets the underlying value as type binary. Returns true if the value was set
@@ -210,7 +210,7 @@ class CefValue : public virtual CefBaseRefCounted {
   // underlying data remains unchanged.
   ///
   /*--cef()--*/
-  virtual bool SetBinary(CefRefPtr<CefBinaryValue> value) =0;
+  virtual bool SetBinary(CefRefPtr<CefBinaryValue> value) = 0;
 
   ///
   // Sets the underlying value as type dict. Returns true if the value was set
@@ -218,7 +218,7 @@ class CefValue : public virtual CefBaseRefCounted {
   // underlying data remains unchanged.
   ///
   /*--cef()--*/
-  virtual bool SetDictionary(CefRefPtr<CefDictionaryValue> value) =0;
+  virtual bool SetDictionary(CefRefPtr<CefDictionaryValue> value) = 0;
 
   ///
   // Sets the underlying value as type list. Returns true if the value was set
@@ -226,10 +226,9 @@ class CefValue : public virtual CefBaseRefCounted {
   // underlying data remains unchanged.
   ///
   /*--cef()--*/
-  virtual bool SetList(CefRefPtr<CefListValue> value) =0;
+  virtual bool SetList(CefRefPtr<CefListValue> value) = 0;
 };
 
-
 ///
 // Class representing a binary value. Can be used on any process and thread.
 ///
@@ -241,8 +240,7 @@ class CefBinaryValue : public virtual CefBaseRefCounted {
   // |data| will be copied.
   ///
   /*--cef()--*/
-  static CefRefPtr<CefBinaryValue> Create(const void* data,
-                                          size_t data_size);
+  static CefRefPtr<CefBinaryValue> Create(const void* data, size_t data_size);
 
   ///
   // Returns true if this object is valid. This object may become invalid if
@@ -251,39 +249,39 @@ class CefBinaryValue : public virtual CefBaseRefCounted {
   // methods if this method returns false.
   ///
   /*--cef()--*/
-  virtual bool IsValid() =0;
+  virtual bool IsValid() = 0;
 
   ///
   // Returns true if this object is currently owned by another object.
   ///
   /*--cef()--*/
-  virtual bool IsOwned() =0;
+  virtual bool IsOwned() = 0;
 
   ///
   // Returns true if this object and |that| object have the same underlying
   // data.
   ///
   /*--cef()--*/
-  virtual bool IsSame(CefRefPtr<CefBinaryValue> that) =0;
+  virtual bool IsSame(CefRefPtr<CefBinaryValue> that) = 0;
 
   ///
   // Returns true if this object and |that| object have an equivalent underlying
   // value but are not necessarily the same object.
   ///
   /*--cef()--*/
-  virtual bool IsEqual(CefRefPtr<CefBinaryValue> that) =0;
+  virtual bool IsEqual(CefRefPtr<CefBinaryValue> that) = 0;
 
   ///
   // Returns a copy of this object. The data in this object will also be copied.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefBinaryValue> Copy() =0;
+  virtual CefRefPtr<CefBinaryValue> Copy() = 0;
 
   ///
   // Returns the data size.
   ///
   /*--cef()--*/
-  virtual size_t GetSize() =0;
+  virtual size_t GetSize() = 0;
 
   ///
   // Read up to |buffer_size| number of bytes into |buffer|. Reading begins at
@@ -292,10 +290,9 @@ class CefBinaryValue : public virtual CefBaseRefCounted {
   /*--cef()--*/
   virtual size_t GetData(void* buffer,
                          size_t buffer_size,
-                         size_t data_offset) =0;
+                         size_t data_offset) = 0;
 };
 
-
 ///
 // Class representing a dictionary value. Can be used on any process and thread.
 ///
@@ -317,20 +314,20 @@ class CefDictionaryValue : public virtual CefBaseRefCounted {
   // methods if this method returns false.
   ///
   /*--cef()--*/
-  virtual bool IsValid() =0;
+  virtual bool IsValid() = 0;
 
   ///
   // Returns true if this object is currently owned by another object.
   ///
   /*--cef()--*/
-  virtual bool IsOwned() =0;
+  virtual bool IsOwned() = 0;
 
   ///
   // Returns true if the values of this object are read-only. Some APIs may
   // expose read-only objects.
   ///
   /*--cef()--*/
-  virtual bool IsReadOnly() =0;
+  virtual bool IsReadOnly() = 0;
 
   ///
   // Returns true if this object and |that| object have the same underlying
@@ -338,58 +335,58 @@ class CefDictionaryValue : public virtual CefBaseRefCounted {
   // and vice-versa.
   ///
   /*--cef()--*/
-  virtual bool IsSame(CefRefPtr<CefDictionaryValue> that) =0;
+  virtual bool IsSame(CefRefPtr<CefDictionaryValue> that) = 0;
 
   ///
   // Returns true if this object and |that| object have an equivalent underlying
   // value but are not necessarily the same object.
   ///
   /*--cef()--*/
-  virtual bool IsEqual(CefRefPtr<CefDictionaryValue> that) =0;
+  virtual bool IsEqual(CefRefPtr<CefDictionaryValue> that) = 0;
 
   ///
   // Returns a writable copy of this object. If |exclude_empty_children| is true
   // any empty dictionaries or lists will be excluded from the copy.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefDictionaryValue> Copy(bool exclude_empty_children) =0;
+  virtual CefRefPtr<CefDictionaryValue> Copy(bool exclude_empty_children) = 0;
 
   ///
   // Returns the number of values.
   ///
   /*--cef()--*/
-  virtual size_t GetSize() =0;
+  virtual size_t GetSize() = 0;
 
   ///
   // Removes all values. Returns true on success.
   ///
   /*--cef()--*/
-  virtual bool Clear() =0;
+  virtual bool Clear() = 0;
 
   ///
   // Returns true if the current dictionary has a value for the given key.
   ///
   /*--cef()--*/
-  virtual bool HasKey(const CefString& key) =0;
+  virtual bool HasKey(const CefString& key) = 0;
 
   ///
   // Reads all keys for this dictionary into the specified vector.
   ///
   /*--cef()--*/
-  virtual bool GetKeys(KeyList& keys) =0;
+  virtual bool GetKeys(KeyList& keys) = 0;
 
   ///
   // Removes the value at the specified key. Returns true is the value was
   // removed successfully.
   ///
   /*--cef()--*/
-  virtual bool Remove(const CefString& key) =0;
+  virtual bool Remove(const CefString& key) = 0;
 
   ///
   // Returns the value type for the specified key.
   ///
   /*--cef(default_retval=VTYPE_INVALID)--*/
-  virtual CefValueType GetType(const CefString& key) =0;
+  virtual CefValueType GetType(const CefString& key) = 0;
 
   ///
   // Returns the value at the specified key. For simple types the returned
@@ -399,38 +396,38 @@ class CefDictionaryValue : public virtual CefBaseRefCounted {
   // will modify this object.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefValue> GetValue(const CefString& key) =0;
+  virtual CefRefPtr<CefValue> GetValue(const CefString& key) = 0;
 
   ///
   // Returns the value at the specified key as type bool.
   ///
   /*--cef()--*/
-  virtual bool GetBool(const CefString& key) =0;
+  virtual bool GetBool(const CefString& key) = 0;
 
   ///
   // Returns the value at the specified key as type int.
   ///
   /*--cef()--*/
-  virtual int GetInt(const CefString& key) =0;
+  virtual int GetInt(const CefString& key) = 0;
 
   ///
   // Returns the value at the specified key as type double.
   ///
   /*--cef()--*/
-  virtual double GetDouble(const CefString& key) =0;
+  virtual double GetDouble(const CefString& key) = 0;
 
   ///
   // Returns the value at the specified key as type string.
   ///
   /*--cef()--*/
-  virtual CefString GetString(const CefString& key) =0;
+  virtual CefString GetString(const CefString& key) = 0;
 
   ///
   // Returns the value at the specified key as type binary. The returned
   // value will reference existing data.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefBinaryValue> GetBinary(const CefString& key) =0;
+  virtual CefRefPtr<CefBinaryValue> GetBinary(const CefString& key) = 0;
 
   ///
   // Returns the value at the specified key as type dictionary. The returned
@@ -438,7 +435,7 @@ class CefDictionaryValue : public virtual CefBaseRefCounted {
   // modify this object.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefDictionaryValue> GetDictionary(const CefString& key) =0;
+  virtual CefRefPtr<CefDictionaryValue> GetDictionary(const CefString& key) = 0;
 
   ///
   // Returns the value at the specified key as type list. The returned value
@@ -446,7 +443,7 @@ class CefDictionaryValue : public virtual CefBaseRefCounted {
   // this object.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefListValue> GetList(const CefString& key) =0;
+  virtual CefRefPtr<CefListValue> GetList(const CefString& key) = 0;
 
   ///
   // Sets the value at the specified key. Returns true if the value was set
@@ -457,42 +454,42 @@ class CefDictionaryValue : public virtual CefBaseRefCounted {
   // this object.
   ///
   /*--cef()--*/
-  virtual bool SetValue(const CefString& key, CefRefPtr<CefValue> value) =0;
+  virtual bool SetValue(const CefString& key, CefRefPtr<CefValue> value) = 0;
 
   ///
   // Sets the value at the specified key as type null. Returns true if the
   // value was set successfully.
   ///
   /*--cef()--*/
-  virtual bool SetNull(const CefString& key) =0;
+  virtual bool SetNull(const CefString& key) = 0;
 
   ///
   // Sets the value at the specified key as type bool. Returns true if the
   // value was set successfully.
   ///
   /*--cef()--*/
-  virtual bool SetBool(const CefString& key, bool value) =0;
+  virtual bool SetBool(const CefString& key, bool value) = 0;
 
   ///
   // Sets the value at the specified key as type int. Returns true if the
   // value was set successfully.
   ///
   /*--cef()--*/
-  virtual bool SetInt(const CefString& key, int value) =0;
+  virtual bool SetInt(const CefString& key, int value) = 0;
 
   ///
   // Sets the value at the specified key as type double. Returns true if the
   // value was set successfully.
   ///
   /*--cef()--*/
-  virtual bool SetDouble(const CefString& key, double value) =0;
+  virtual bool SetDouble(const CefString& key, double value) = 0;
 
   ///
   // Sets the value at the specified key as type string. Returns true if the
   // value was set successfully.
   ///
   /*--cef(optional_param=value)--*/
-  virtual bool SetString(const CefString& key, const CefString& value) =0;
+  virtual bool SetString(const CefString& key, const CefString& value) = 0;
 
   ///
   // Sets the value at the specified key as type binary. Returns true if the
@@ -503,7 +500,7 @@ class CefDictionaryValue : public virtual CefBaseRefCounted {
   ///
   /*--cef()--*/
   virtual bool SetBinary(const CefString& key,
-                         CefRefPtr<CefBinaryValue> value) =0;
+                         CefRefPtr<CefBinaryValue> value) = 0;
 
   ///
   // Sets the value at the specified key as type dict. Returns true if the
@@ -514,7 +511,7 @@ class CefDictionaryValue : public virtual CefBaseRefCounted {
   ///
   /*--cef()--*/
   virtual bool SetDictionary(const CefString& key,
-                             CefRefPtr<CefDictionaryValue> value) =0;
+                             CefRefPtr<CefDictionaryValue> value) = 0;
 
   ///
   // Sets the value at the specified key as type list. Returns true if the
@@ -524,11 +521,9 @@ class CefDictionaryValue : public virtual CefBaseRefCounted {
   // reference will be invalidated.
   ///
   /*--cef()--*/
-  virtual bool SetList(const CefString& key,
-                       CefRefPtr<CefListValue> value) =0;
+  virtual bool SetList(const CefString& key, CefRefPtr<CefListValue> value) = 0;
 };
 
-
 ///
 // Class representing a list value. Can be used on any process and thread.
 ///
@@ -548,20 +543,20 @@ class CefListValue : public virtual CefBaseRefCounted {
   // methods if this method returns false.
   ///
   /*--cef()--*/
-  virtual bool IsValid() =0;
+  virtual bool IsValid() = 0;
 
   ///
   // Returns true if this object is currently owned by another object.
   ///
   /*--cef()--*/
-  virtual bool IsOwned() =0;
+  virtual bool IsOwned() = 0;
 
   ///
   // Returns true if the values of this object are read-only. Some APIs may
   // expose read-only objects.
   ///
   /*--cef()--*/
-  virtual bool IsReadOnly() =0;
+  virtual bool IsReadOnly() = 0;
 
   ///
   // Returns true if this object and |that| object have the same underlying
@@ -569,51 +564,51 @@ class CefListValue : public virtual CefBaseRefCounted {
   // and vice-versa.
   ///
   /*--cef()--*/
-  virtual bool IsSame(CefRefPtr<CefListValue> that) =0;
+  virtual bool IsSame(CefRefPtr<CefListValue> that) = 0;
 
   ///
   // Returns true if this object and |that| object have an equivalent underlying
   // value but are not necessarily the same object.
   ///
   /*--cef()--*/
-  virtual bool IsEqual(CefRefPtr<CefListValue> that) =0;
+  virtual bool IsEqual(CefRefPtr<CefListValue> that) = 0;
 
   ///
   // Returns a writable copy of this object.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefListValue> Copy() =0;
+  virtual CefRefPtr<CefListValue> Copy() = 0;
 
   ///
   // Sets the number of values. If the number of values is expanded all
   // new value slots will default to type null. Returns true on success.
   ///
   /*--cef()--*/
-  virtual bool SetSize(size_t size) =0;
+  virtual bool SetSize(size_t size) = 0;
 
   ///
   // Returns the number of values.
   ///
   /*--cef()--*/
-  virtual size_t GetSize() =0;
+  virtual size_t GetSize() = 0;
 
   ///
   // Removes all values. Returns true on success.
   ///
   /*--cef()--*/
-  virtual bool Clear() =0;
+  virtual bool Clear() = 0;
 
   ///
   // Removes the value at the specified index.
   ///
   /*--cef()--*/
-  virtual bool Remove(size_t index) =0;
+  virtual bool Remove(size_t index) = 0;
 
   ///
   // Returns the value type at the specified index.
   ///
   /*--cef(default_retval=VTYPE_INVALID)--*/
-  virtual CefValueType GetType(size_t index) =0;
+  virtual CefValueType GetType(size_t index) = 0;
 
   ///
   // Returns the value at the specified index. For simple types the returned
@@ -623,38 +618,38 @@ class CefListValue : public virtual CefBaseRefCounted {
   // will modify this object.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefValue> GetValue(size_t index) =0;
+  virtual CefRefPtr<CefValue> GetValue(size_t index) = 0;
 
   ///
   // Returns the value at the specified index as type bool.
   ///
   /*--cef()--*/
-  virtual bool GetBool(size_t index) =0;
+  virtual bool GetBool(size_t index) = 0;
 
   ///
   // Returns the value at the specified index as type int.
   ///
   /*--cef()--*/
-  virtual int GetInt(size_t index) =0;
+  virtual int GetInt(size_t index) = 0;
 
   ///
   // Returns the value at the specified index as type double.
   ///
   /*--cef()--*/
-  virtual double GetDouble(size_t index) =0;
+  virtual double GetDouble(size_t index) = 0;
 
   ///
   // Returns the value at the specified index as type string.
   ///
   /*--cef()--*/
-  virtual CefString GetString(size_t index) =0;
+  virtual CefString GetString(size_t index) = 0;
 
   ///
   // Returns the value at the specified index as type binary. The returned
   // value will reference existing data.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefBinaryValue> GetBinary(size_t index) =0;
+  virtual CefRefPtr<CefBinaryValue> GetBinary(size_t index) = 0;
 
   ///
   // Returns the value at the specified index as type dictionary. The returned
@@ -662,7 +657,7 @@ class CefListValue : public virtual CefBaseRefCounted {
   // modify this object.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefDictionaryValue> GetDictionary(size_t index) =0;
+  virtual CefRefPtr<CefDictionaryValue> GetDictionary(size_t index) = 0;
 
   ///
   // Returns the value at the specified index as type list. The returned
@@ -670,7 +665,7 @@ class CefListValue : public virtual CefBaseRefCounted {
   // modify this object.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefListValue> GetList(size_t index) =0;
+  virtual CefRefPtr<CefListValue> GetList(size_t index) = 0;
 
   ///
   // Sets the value at the specified index. Returns true if the value was set
@@ -681,42 +676,42 @@ class CefListValue : public virtual CefBaseRefCounted {
   // this object.
   ///
   /*--cef()--*/
-  virtual bool SetValue(size_t index, CefRefPtr<CefValue> value) =0;
+  virtual bool SetValue(size_t index, CefRefPtr<CefValue> value) = 0;
 
   ///
   // Sets the value at the specified index as type null. Returns true if the
   // value was set successfully.
   ///
   /*--cef()--*/
-  virtual bool SetNull(size_t index) =0;
+  virtual bool SetNull(size_t index) = 0;
 
   ///
   // Sets the value at the specified index as type bool. Returns true if the
   // value was set successfully.
   ///
   /*--cef()--*/
-  virtual bool SetBool(size_t index, bool value) =0;
+  virtual bool SetBool(size_t index, bool value) = 0;
 
   ///
   // Sets the value at the specified index as type int. Returns true if the
   // value was set successfully.
   ///
   /*--cef()--*/
-  virtual bool SetInt(size_t index, int value) =0;
+  virtual bool SetInt(size_t index, int value) = 0;
 
   ///
   // Sets the value at the specified index as type double. Returns true if the
   // value was set successfully.
   ///
   /*--cef()--*/
-  virtual bool SetDouble(size_t index, double value) =0;
+  virtual bool SetDouble(size_t index, double value) = 0;
 
   ///
   // Sets the value at the specified index as type string. Returns true if the
   // value was set successfully.
   ///
   /*--cef(optional_param=value)--*/
-  virtual bool SetString(size_t index, const CefString& value) =0;
+  virtual bool SetString(size_t index, const CefString& value) = 0;
 
   ///
   // Sets the value at the specified index as type binary. Returns true if the
@@ -726,7 +721,7 @@ class CefListValue : public virtual CefBaseRefCounted {
   // reference will be invalidated.
   ///
   /*--cef()--*/
-  virtual bool SetBinary(size_t index, CefRefPtr<CefBinaryValue> value) =0;
+  virtual bool SetBinary(size_t index, CefRefPtr<CefBinaryValue> value) = 0;
 
   ///
   // Sets the value at the specified index as type dict. Returns true if the
@@ -736,7 +731,8 @@ class CefListValue : public virtual CefBaseRefCounted {
   // reference will be invalidated.
   ///
   /*--cef()--*/
-  virtual bool SetDictionary(size_t index, CefRefPtr<CefDictionaryValue> value) =0;
+  virtual bool SetDictionary(size_t index,
+                             CefRefPtr<CefDictionaryValue> value) = 0;
 
   ///
   // Sets the value at the specified index as type list. Returns true if the
@@ -746,7 +742,7 @@ class CefListValue : public virtual CefBaseRefCounted {
   // reference will be invalidated.
   ///
   /*--cef()--*/
-  virtual bool SetList(size_t index, CefRefPtr<CefListValue> value) =0;
+  virtual bool SetList(size_t index, CefRefPtr<CefListValue> value) = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_VALUES_H_
diff --git a/src/include/cef_waitable_event.h b/src/include/cef_waitable_event.h
index 070ca681..d89371eb 100644
--- a/src/include/cef_waitable_event.h
+++ b/src/include/cef_waitable_event.h
@@ -70,14 +70,14 @@ class CefWaitableEvent : public CefBaseRefCounted {
   // Put the event in the un-signaled state.
   ///
   /*--cef()--*/
-  virtual void Reset() =0;
+  virtual void Reset() = 0;
 
   ///
   // Put the event in the signaled state. This causes any thread blocked on Wait
   // to be woken up.
   ///
   /*--cef()--*/
-  virtual void Signal() =0;
+  virtual void Signal() = 0;
 
   ///
   // Returns true if the event is in the signaled state, else false. If the
@@ -85,7 +85,7 @@ class CefWaitableEvent : public CefBaseRefCounted {
   // method will also cause a reset.
   ///
   /*--cef()--*/
-  virtual bool IsSignaled() =0;
+  virtual bool IsSignaled() = 0;
 
   ///
   // Wait indefinitely for the event to be signaled. This method will not return
@@ -93,7 +93,7 @@ class CefWaitableEvent : public CefBaseRefCounted {
   // called on the browser process UI or IO threads.
   ///
   /*--cef()--*/
-  virtual void Wait() =0;
+  virtual void Wait() = 0;
 
   ///
   // Wait up to |max_ms| milliseconds for the event to be signaled. Returns true
@@ -103,7 +103,7 @@ class CefWaitableEvent : public CefBaseRefCounted {
   // browser process UI or IO threads.
   ///
   /*--cef()--*/
-  virtual bool TimedWait(int64 max_ms) =0;
+  virtual bool TimedWait(int64 max_ms) = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_WAITABLE_EVENT_H_
diff --git a/src/include/cef_web_plugin.h b/src/include/cef_web_plugin.h
index 3eea5413..d5de16ab 100644
--- a/src/include/cef_web_plugin.h
+++ b/src/include/cef_web_plugin.h
@@ -51,25 +51,25 @@ class CefWebPluginInfo : public virtual CefBaseRefCounted {
   // Returns the plugin name (i.e. Flash).
   ///
   /*--cef()--*/
-  virtual CefString GetName() =0;
+  virtual CefString GetName() = 0;
 
   ///
   // Returns the plugin file path (DLL/bundle/library).
   ///
   /*--cef()--*/
-  virtual CefString GetPath() =0;
+  virtual CefString GetPath() = 0;
 
   ///
   // Returns the version of the plugin (may be OS-specific).
   ///
   /*--cef()--*/
-  virtual CefString GetVersion() =0;
+  virtual CefString GetVersion() = 0;
 
   ///
   // Returns a description of the plugin from the version information.
   ///
   /*--cef()--*/
-  virtual CefString GetDescription() =0;
+  virtual CefString GetDescription() = 0;
 };
 
 ///
@@ -86,7 +86,9 @@ class CefWebPluginInfoVisitor : public virtual CefBaseRefCounted {
   // no plugins are found.
   ///
   /*--cef()--*/
-  virtual bool Visit(CefRefPtr<CefWebPluginInfo> info, int count, int total) =0;
+  virtual bool Visit(CefRefPtr<CefWebPluginInfo> info,
+                     int count,
+                     int total) = 0;
 };
 
 ///
@@ -132,8 +134,7 @@ class CefWebPluginUnstableCallback : public virtual CefBaseRefCounted {
   // seconds.
   ///
   /*--cef()--*/
-  virtual void IsUnstable(const CefString& path,
-                          bool unstable) =0;
+  virtual void IsUnstable(const CefString& path, bool unstable) = 0;
 };
 
 ///
@@ -160,7 +161,7 @@ class CefRegisterCdmCallback : public virtual CefBaseRefCounted {
   ///
   /*--cef(optional_param=error_message)--*/
   virtual void OnCdmRegistrationComplete(cef_cdm_registration_error_t result,
-                                         const CefString& error_message) =0;
+                                         const CefString& error_message) = 0;
 };
 
 ///
diff --git a/src/include/cef_x509_certificate.h b/src/include/cef_x509_certificate.h
index c784ce1b..b466a6ad 100644
--- a/src/include/cef_x509_certificate.h
+++ b/src/include/cef_x509_certificate.h
@@ -55,55 +55,55 @@ class CefX509CertPrincipal : public virtual CefBaseRefCounted {
   // Name (OU) and returns the first non-empty one found.
   ///
   /*--cef()--*/
-  virtual CefString GetDisplayName() =0;
+  virtual CefString GetDisplayName() = 0;
 
   ///
   // Returns the common name.
   ///
   /*--cef()--*/
-  virtual CefString GetCommonName() =0;
+  virtual CefString GetCommonName() = 0;
 
   ///
   // Returns the locality name.
   ///
   /*--cef()--*/
-  virtual CefString GetLocalityName() =0;
+  virtual CefString GetLocalityName() = 0;
 
   ///
   // Returns the state or province name.
   ///
   /*--cef()--*/
-  virtual CefString GetStateOrProvinceName() =0;
+  virtual CefString GetStateOrProvinceName() = 0;
 
   ///
   // Returns the country name.
   ///
   /*--cef()--*/
-  virtual CefString GetCountryName() =0;
+  virtual CefString GetCountryName() = 0;
 
   ///
   // Retrieve the list of street addresses.
   ///
   /*--cef()--*/
-  virtual void GetStreetAddresses(std::vector<CefString>& addresses) =0;
+  virtual void GetStreetAddresses(std::vector<CefString>& addresses) = 0;
 
   ///
   // Retrieve the list of organization names.
   ///
   /*--cef()--*/
-  virtual void GetOrganizationNames(std::vector<CefString>& names) =0;
+  virtual void GetOrganizationNames(std::vector<CefString>& names) = 0;
 
   ///
   // Retrieve the list of organization unit names.
   ///
   /*--cef()--*/
-  virtual void GetOrganizationUnitNames(std::vector<CefString>& names) =0;
+  virtual void GetOrganizationUnitNames(std::vector<CefString>& names) = 0;
 
   ///
   // Retrieve the list of domain components.
   ///
   /*--cef()--*/
-  virtual void GetDomainComponents(std::vector<CefString>& components) =0;
+  virtual void GetDomainComponents(std::vector<CefString>& components) = 0;
 };
 
 ///
@@ -112,7 +112,7 @@ class CefX509CertPrincipal : public virtual CefBaseRefCounted {
 /*--cef(source=library)--*/
 class CefX509Certificate : public virtual CefBaseRefCounted {
  public:
-  typedef std::vector<CefRefPtr<CefBinaryValue> > IssuerChainBinaryList;
+  typedef std::vector<CefRefPtr<CefBinaryValue>> IssuerChainBinaryList;
 
   ///
   // Returns the subject of the X.509 certificate. For HTTPS server
@@ -120,53 +120,53 @@ class CefX509Certificate : public virtual CefBaseRefCounted {
   // subject should match the host name of the web server.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefX509CertPrincipal> GetSubject() =0;
+  virtual CefRefPtr<CefX509CertPrincipal> GetSubject() = 0;
 
   ///
   // Returns the issuer of the X.509 certificate.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefX509CertPrincipal> GetIssuer() =0;
+  virtual CefRefPtr<CefX509CertPrincipal> GetIssuer() = 0;
 
   ///
   // Returns the DER encoded serial number for the X.509 certificate. The value
   // possibly includes a leading 00 byte.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefBinaryValue> GetSerialNumber() =0;
-  
+  virtual CefRefPtr<CefBinaryValue> GetSerialNumber() = 0;
+
   ///
   // Returns the date before which the X.509 certificate is invalid.
   // CefTime.GetTimeT() will return 0 if no date was specified.
   ///
   /*--cef()--*/
-  virtual CefTime GetValidStart() =0;
+  virtual CefTime GetValidStart() = 0;
 
   ///
   // Returns the date after which the X.509 certificate is invalid.
   // CefTime.GetTimeT() will return 0 if no date was specified.
   ///
   /*--cef()--*/
-  virtual CefTime GetValidExpiry() =0;
+  virtual CefTime GetValidExpiry() = 0;
 
   ///
   // Returns the DER encoded data for the X.509 certificate.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefBinaryValue> GetDEREncoded() =0;
+  virtual CefRefPtr<CefBinaryValue> GetDEREncoded() = 0;
 
   ///
   // Returns the PEM encoded data for the X.509 certificate.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefBinaryValue> GetPEMEncoded() =0;
+  virtual CefRefPtr<CefBinaryValue> GetPEMEncoded() = 0;
 
   ///
   // Returns the number of certificates in the issuer chain.
   // If 0, the certificate is self-signed.
   ///
   /*--cef()--*/
-  virtual size_t GetIssuerChainSize() =0;
+  virtual size_t GetIssuerChainSize() = 0;
 
   ///
   // Returns the DER encoded data for the certificate issuer chain.
@@ -174,7 +174,7 @@ class CefX509Certificate : public virtual CefBaseRefCounted {
   // present in the array but is an empty string.
   ///
   /*--cef(count_func=chain:GetIssuerChainSize)--*/
-  virtual void GetDEREncodedIssuerChain(IssuerChainBinaryList& chain) =0;
+  virtual void GetDEREncodedIssuerChain(IssuerChainBinaryList& chain) = 0;
 
   ///
   // Returns the PEM encoded data for the certificate issuer chain.
@@ -182,7 +182,7 @@ class CefX509Certificate : public virtual CefBaseRefCounted {
   // present in the array but is an empty string.
   ///
   /*--cef(count_func=chain:GetIssuerChainSize)--*/
-  virtual void GetPEMEncodedIssuerChain(IssuerChainBinaryList& chain) =0;
+  virtual void GetPEMEncodedIssuerChain(IssuerChainBinaryList& chain) = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_X509_CERTIFICATE_H_
diff --git a/src/include/cef_xml_reader.h b/src/include/cef_xml_reader.h
index ab5244e3..5269ef5e 100644
--- a/src/include/cef_xml_reader.h
+++ b/src/include/cef_xml_reader.h
@@ -67,27 +67,26 @@ class CefXmlReader : public virtual CefBaseRefCounted {
   // the cursor position was set successfully.
   ///
   /*--cef()--*/
-  virtual bool MoveToNextNode() =0;
+  virtual bool MoveToNextNode() = 0;
 
   ///
   // Close the document. This should be called directly to ensure that cleanup
   // occurs on the correct thread.
   ///
   /*--cef()--*/
-  virtual bool Close() =0;
+  virtual bool Close() = 0;
 
   ///
   // Returns true if an error has been reported by the XML parser.
   ///
   /*--cef()--*/
-  virtual bool HasError() =0;
+  virtual bool HasError() = 0;
 
   ///
   // Returns the error string.
   ///
   /*--cef()--*/
-  virtual CefString GetError() =0;
-
+  virtual CefString GetError() = 0;
 
   // The below methods retrieve data for the node at the current cursor
   // position.
@@ -96,98 +95,98 @@ class CefXmlReader : public virtual CefBaseRefCounted {
   // Returns the node type.
   ///
   /*--cef(default_retval=XML_NODE_UNSUPPORTED)--*/
-  virtual NodeType GetType() =0;
+  virtual NodeType GetType() = 0;
 
   ///
   // Returns the node depth. Depth starts at 0 for the root node.
   ///
   /*--cef()--*/
-  virtual int GetDepth() =0;
+  virtual int GetDepth() = 0;
 
   ///
   // Returns the local name. See
   // http://www.w3.org/TR/REC-xml-names/#NT-LocalPart for additional details.
   ///
   /*--cef()--*/
-  virtual CefString GetLocalName() =0;
+  virtual CefString GetLocalName() = 0;
 
   ///
   // Returns the namespace prefix. See http://www.w3.org/TR/REC-xml-names/ for
   // additional details.
   ///
   /*--cef()--*/
-  virtual CefString GetPrefix() =0;
+  virtual CefString GetPrefix() = 0;
 
   ///
   // Returns the qualified name, equal to (Prefix:)LocalName. See
   // http://www.w3.org/TR/REC-xml-names/#ns-qualnames for additional details.
   ///
   /*--cef()--*/
-  virtual CefString GetQualifiedName() =0;
+  virtual CefString GetQualifiedName() = 0;
 
   ///
   // Returns the URI defining the namespace associated with the node. See
   // http://www.w3.org/TR/REC-xml-names/ for additional details.
   ///
   /*--cef()--*/
-  virtual CefString GetNamespaceURI() =0;
+  virtual CefString GetNamespaceURI() = 0;
 
   ///
   // Returns the base URI of the node. See http://www.w3.org/TR/xmlbase/ for
   // additional details.
   ///
   /*--cef()--*/
-  virtual CefString GetBaseURI() =0;
+  virtual CefString GetBaseURI() = 0;
 
   ///
   // Returns the xml:lang scope within which the node resides. See
   // http://www.w3.org/TR/REC-xml/#sec-lang-tag for additional details.
   ///
   /*--cef()--*/
-  virtual CefString GetXmlLang() =0;
+  virtual CefString GetXmlLang() = 0;
 
   ///
   // Returns true if the node represents an empty element. <a/> is considered
   // empty but <a></a> is not.
   ///
   /*--cef()--*/
-  virtual bool IsEmptyElement() =0;
+  virtual bool IsEmptyElement() = 0;
 
   ///
   // Returns true if the node has a text value.
   ///
   /*--cef()--*/
-  virtual bool HasValue() =0;
+  virtual bool HasValue() = 0;
 
   ///
   // Returns the text value.
   ///
   /*--cef()--*/
-  virtual CefString GetValue() =0;
+  virtual CefString GetValue() = 0;
 
   ///
   // Returns true if the node has attributes.
   ///
   /*--cef()--*/
-  virtual bool HasAttributes() =0;
+  virtual bool HasAttributes() = 0;
 
   ///
   // Returns the number of attributes.
   ///
   /*--cef()--*/
-  virtual size_t GetAttributeCount() =0;
+  virtual size_t GetAttributeCount() = 0;
 
   ///
   // Returns the value of the attribute at the specified 0-based index.
   ///
   /*--cef(capi_name=get_attribute_byindex,index_param=index)--*/
-  virtual CefString GetAttribute(int index) =0;
+  virtual CefString GetAttribute(int index) = 0;
 
   ///
   // Returns the value of the attribute with the specified qualified name.
   ///
   /*--cef(capi_name=get_attribute_byqname)--*/
-  virtual CefString GetAttribute(const CefString& qualifiedName) =0;
+  virtual CefString GetAttribute(const CefString& qualifiedName) = 0;
 
   ///
   // Returns the value of the attribute with the specified local name and
@@ -195,26 +194,25 @@ class CefXmlReader : public virtual CefBaseRefCounted {
   ///
   /*--cef(capi_name=get_attribute_bylname)--*/
   virtual CefString GetAttribute(const CefString& localName,
-                                 const CefString& namespaceURI) =0;
+                                 const CefString& namespaceURI) = 0;
 
   ///
   // Returns an XML representation of the current node's children.
   ///
   /*--cef()--*/
-  virtual CefString GetInnerXml() =0;
+  virtual CefString GetInnerXml() = 0;
 
   ///
   // Returns an XML representation of the current node including its children.
   ///
   /*--cef()--*/
-  virtual CefString GetOuterXml() =0;
+  virtual CefString GetOuterXml() = 0;
 
   ///
   // Returns the line number for the current node.
   ///
   /*--cef()--*/
-  virtual int GetLineNumber() =0;
-
+  virtual int GetLineNumber() = 0;
 
   // Attribute nodes are not traversed by default. The below methods can be
   // used to move the cursor to an attribute node. MoveToCarryingElement() can
@@ -226,14 +224,14 @@ class CefXmlReader : public virtual CefBaseRefCounted {
   // true if the cursor position was set successfully.
   ///
   /*--cef(capi_name=move_to_attribute_byindex,index_param=index)--*/
-  virtual bool MoveToAttribute(int index) =0;
+  virtual bool MoveToAttribute(int index) = 0;
 
   ///
   // Moves the cursor to the attribute with the specified qualified name.
   // Returns true if the cursor position was set successfully.
   ///
   /*--cef(capi_name=move_to_attribute_byqname)--*/
-  virtual bool MoveToAttribute(const CefString& qualifiedName) =0;
+  virtual bool MoveToAttribute(const CefString& qualifiedName) = 0;
 
   ///
   // Moves the cursor to the attribute with the specified local name and
@@ -241,28 +239,28 @@ class CefXmlReader : public virtual CefBaseRefCounted {
   ///
   /*--cef(capi_name=move_to_attribute_bylname)--*/
   virtual bool MoveToAttribute(const CefString& localName,
-                               const CefString& namespaceURI) =0;
+                               const CefString& namespaceURI) = 0;
 
   ///
   // Moves the cursor to the first attribute in the current element. Returns
   // true if the cursor position was set successfully.
   ///
   /*--cef()--*/
-  virtual bool MoveToFirstAttribute() =0;
+  virtual bool MoveToFirstAttribute() = 0;
 
   ///
   // Moves the cursor to the next attribute in the current element. Returns
   // true if the cursor position was set successfully.
   ///
   /*--cef()--*/
-  virtual bool MoveToNextAttribute() =0;
+  virtual bool MoveToNextAttribute() = 0;
 
   ///
   // Moves the cursor back to the carrying element. Returns true if the cursor
   // position was set successfully.
   ///
   /*--cef()--*/
-  virtual bool MoveToCarryingElement() =0;
+  virtual bool MoveToCarryingElement() = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_XML_READER_H_
diff --git a/src/include/cef_zip_reader.h b/src/include/cef_zip_reader.h
index 80640087..5dc2efd6 100644
--- a/src/include/cef_zip_reader.h
+++ b/src/include/cef_zip_reader.h
@@ -60,14 +60,14 @@ class CefZipReader : public virtual CefBaseRefCounted {
   // cursor position was set successfully.
   ///
   /*--cef()--*/
-  virtual bool MoveToFirstFile() =0;
+  virtual bool MoveToFirstFile() = 0;
 
   ///
   // Moves the cursor to the next file in the archive. Returns true if the
   // cursor position was set successfully.
   ///
   /*--cef()--*/
-  virtual bool MoveToNextFile() =0;
+  virtual bool MoveToNextFile() = 0;
 
   ///
   // Moves the cursor to the specified file in the archive. If |caseSensitive|
@@ -75,15 +75,14 @@ class CefZipReader : public virtual CefBaseRefCounted {
   // position was set successfully.
   ///
   /*--cef()--*/
-  virtual bool MoveToFile(const CefString& fileName, bool caseSensitive) =0;
+  virtual bool MoveToFile(const CefString& fileName, bool caseSensitive) = 0;
 
   ///
   // Closes the archive. This should be called directly to ensure that cleanup
   // occurs on the correct thread.
   ///
   /*--cef()--*/
-  virtual bool Close() =0;
-
+  virtual bool Close() = 0;
 
   // The below methods act on the file at the current cursor position.
 
@@ -91,51 +90,51 @@ class CefZipReader : public virtual CefBaseRefCounted {
   // Returns the name of the file.
   ///
   /*--cef()--*/
-  virtual CefString GetFileName() =0;
+  virtual CefString GetFileName() = 0;
 
   ///
   // Returns the uncompressed size of the file.
   ///
   /*--cef()--*/
-  virtual int64 GetFileSize() =0;
+  virtual int64 GetFileSize() = 0;
 
   ///
   // Returns the last modified timestamp for the file.
   ///
   /*--cef()--*/
-  virtual CefTime GetFileLastModified() =0;
+  virtual CefTime GetFileLastModified() = 0;
 
   ///
   // Opens the file for reading of uncompressed data. A read password may
   // optionally be specified.
   ///
   /*--cef(optional_param=password)--*/
-  virtual bool OpenFile(const CefString& password) =0;
+  virtual bool OpenFile(const CefString& password) = 0;
 
   ///
   // Closes the file.
   ///
   /*--cef()--*/
-  virtual bool CloseFile() =0;
+  virtual bool CloseFile() = 0;
 
   ///
   // Read uncompressed file contents into the specified buffer. Returns < 0 if
   // an error occurred, 0 if at the end of file, or the number of bytes read.
   ///
   /*--cef()--*/
-  virtual int ReadFile(void* buffer, size_t bufferSize) =0;
+  virtual int ReadFile(void* buffer, size_t bufferSize) = 0;
 
   ///
   // Returns the current offset in the uncompressed file contents.
   ///
   /*--cef()--*/
-  virtual int64 Tell() =0;
+  virtual int64 Tell() = 0;
 
   ///
   // Returns true if at end of the file contents.
   ///
   /*--cef()--*/
-  virtual bool Eof() =0;
+  virtual bool Eof() = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_ZIP_READER_H_
diff --git a/src/include/internal/cef_export.h b/src/include/internal/cef_export.h
index 2813253b..1915f5e5 100644
--- a/src/include/internal/cef_export.h
+++ b/src/include/internal/cef_export.h
@@ -43,13 +43,17 @@
 #else
 #define CEF_EXPORT
 #endif
-#define CEF_CALLBACK __stdcall
 
 #elif defined(COMPILER_GCC)
 
-#define CEF_EXPORT __attribute__ ((visibility("default")))
-#define CEF_CALLBACK
+#define CEF_EXPORT __attribute__((visibility("default")))
 
 #endif  // COMPILER_GCC
 
+#if defined(OS_WIN)
+#define CEF_CALLBACK __stdcall
+#else
+#define CEF_CALLBACK
+#endif
+
 #endif  // CEF_INCLUDE_INTERNAL_CEF_EXPORT_H_
diff --git a/src/include/internal/cef_linux.h b/src/include/internal/cef_linux.h
index d9813a5b..ecf74e0f 100644
--- a/src/include/internal/cef_linux.h
+++ b/src/include/internal/cef_linux.h
@@ -27,7 +27,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 #ifndef CEF_INCLUDE_INTERNAL_CEF_LINUX_H_
 #define CEF_INCLUDE_INTERNAL_CEF_LINUX_H_
 #pragma once
@@ -46,8 +45,9 @@ struct CefMainArgsTraits {
   static inline void init(struct_type* s) {}
   static inline void clear(struct_type* s) {}
 
-  static inline void set(const struct_type* src, struct_type* target,
-      bool copy) {
+  static inline void set(const struct_type* src,
+                         struct_type* target,
+                         bool copy) {
     target->argc = src->argc;
     target->argv = src->argv;
   }
@@ -73,15 +73,15 @@ struct CefWindowInfoTraits {
   static inline void init(struct_type* s) {}
   static inline void clear(struct_type* s) {}
 
-  static inline void set(const struct_type* src, struct_type* target,
-      bool copy) {
+  static inline void set(const struct_type* src,
+                         struct_type* target,
+                         bool copy) {
     target->x = src->x;
     target->y = src->y;
     target->width = src->width;
     target->height = src->height;
     target->parent_window = src->parent_window;
     target->windowless_rendering_enabled = src->windowless_rendering_enabled;
-    target->transparent_painting_enabled = src->transparent_painting_enabled;
     target->window = src->window;
   }
 };
@@ -98,8 +98,7 @@ class CefWindowInfo : public CefStructBase<CefWindowInfoTraits> {
   ///
   // Create the browser as a child window.
   ///
-  void SetAsChild(CefWindowHandle parent,
-                  const CefRect& windowRect) {
+  void SetAsChild(CefWindowHandle parent, const CefRect& windowRect) {
     parent_window = parent;
     x = windowRect.x;
     y = windowRect.y;
@@ -114,15 +113,14 @@ class CefWindowInfo : public CefStructBase<CefWindowInfoTraits> {
   // monitor info and to act as the parent window 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 window 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
+  // correctly. In order to create windowless browsers the
   // CefSettings.windowless_rendering_enabled value must be set to true.
+  // Transparent painting is enabled by default but can be disabled by setting
+  // CefBrowserSettings.background_color to an opaque value.
   ///
-  void SetAsWindowless(CefWindowHandle parent, bool transparent) {
+  void SetAsWindowless(CefWindowHandle parent) {
     windowless_rendering_enabled = true;
     parent_window = parent;
-    transparent_painting_enabled = transparent;
   }
 };
 
diff --git a/src/include/internal/cef_logging_internal.h b/src/include/internal/cef_logging_internal.h
index c376d052..598263d1 100644
--- a/src/include/internal/cef_logging_internal.h
+++ b/src/include/internal/cef_logging_internal.h
@@ -31,6 +31,8 @@
 #define CEF_INCLUDE_INTERNAL_CEF_LOGGING_INTERNAL_H_
 #pragma once
 
+#include <stddef.h>
+
 #include "include/internal/cef_export.h"
 
 #ifdef __cplusplus
diff --git a/src/include/internal/cef_mac.h b/src/include/internal/cef_mac.h
index 420f16ad..689d88cd 100644
--- a/src/include/internal/cef_mac.h
+++ b/src/include/internal/cef_mac.h
@@ -27,7 +27,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 #ifndef CEF_INCLUDE_INTERNAL_CEF_MAC_H_
 #define CEF_INCLUDE_INTERNAL_CEF_MAC_H_
 #pragma once
@@ -46,8 +45,9 @@ struct CefMainArgsTraits {
   static inline void init(struct_type* s) {}
   static inline void clear(struct_type* s) {}
 
-  static inline void set(const struct_type* src, struct_type* target,
-      bool copy) {
+  static inline void set(const struct_type* src,
+                         struct_type* target,
+                         bool copy) {
     target->argc = src->argc;
     target->argv = src->argv;
   }
@@ -76,10 +76,11 @@ struct CefWindowInfoTraits {
     cef_string_clear(&s->window_name);
   }
 
-  static inline void set(const struct_type* src, struct_type* target,
-      bool copy) {
+  static inline void set(const struct_type* src,
+                         struct_type* target,
+                         bool copy) {
     cef_string_set(src->window_name.str, src->window_name.length,
-        &target->window_name, copy);
+                   &target->window_name, copy);
     target->x = src->x;
     target->y = src->y;
     target->width = src->width;
@@ -87,7 +88,6 @@ struct CefWindowInfoTraits {
     target->hidden = src->hidden;
     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;
   }
 };
@@ -104,8 +104,7 @@ class CefWindowInfo : public CefStructBase<CefWindowInfoTraits> {
   ///
   // Create the browser as a child view.
   ///
-  void SetAsChild(CefWindowHandle parent, int x, int y, int width,
-                  int height) {
+  void SetAsChild(CefWindowHandle parent, int x, int y, int width, int height) {
     parent_view = parent;
     this->x = x;
     this->y = y;
@@ -121,15 +120,14 @@ class CefWindowInfo : public CefStructBase<CefWindowInfoTraits> {
   // 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
+  // correctly. In order to create windowless browsers the
   // CefSettings.windowless_rendering_enabled value must be set to true.
+  // Transparent painting is enabled by default but can be disabled by setting
+  // CefBrowserSettings.background_color to an opaque value.
   ///
-  void SetAsWindowless(CefWindowHandle parent, bool transparent) {
+  void SetAsWindowless(CefWindowHandle parent) {
     windowless_rendering_enabled = true;
     parent_view = parent;
-    transparent_painting_enabled = transparent;
   }
 };
 
diff --git a/src/include/internal/cef_ptr.h b/src/include/internal/cef_ptr.h
index 25ce7455..044c7331 100644
--- a/src/include/internal/cef_ptr.h
+++ b/src/include/internal/cef_ptr.h
@@ -27,7 +27,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 #ifndef CEF_INCLUDE_INTERNAL_CEF_PTR_H_
 #define CEF_INCLUDE_INTERNAL_CEF_PTR_H_
 #pragma once
@@ -159,7 +158,6 @@ using CefRefPtr = scoped_refptr<T>;
 #define CefRefPtr scoped_refptr
 #endif
 
-
 ///
 // A CefOwnPtr<T> is like a T*, except that the destructor of CefOwnPtr<T>
 // automatically deletes the pointer it holds (if any). That is, CefOwnPtr<T>
@@ -181,15 +179,17 @@ using CefOwnPtr = scoped_ptr<T, D>;
 #define CefOwnPtr scoped_ptr
 #endif
 
-
 ///
 // A CefRawPtr<T> is the same as T*
 ///
 #if defined(HAS_CPP11_TEMPLATE_ALIAS_SUPPORT)
+#define CEF_RAW_PTR_GET(r) r
 template <class T>
 using CefRawPtr = T*;
 #else
 // Simple wrapper implementation that behaves as much like T* as possible.
+// CEF_RAW_PTR_GET is required for VS2008 compatibility (Issue #2155).
+#define CEF_RAW_PTR_GET(r) r.get()
 template <class T>
 class CefRawPtr {
  public:
@@ -215,9 +215,7 @@ class CefRawPtr {
     return *this;
   }
 
-  CefRawPtr<T>& operator=(const CefRawPtr<T>& r) {
-    return *this = r.ptr_;
-  }
+  CefRawPtr<T>& operator=(const CefRawPtr<T>& r) { return *this = r.ptr_; }
 
   template <typename U>
   CefRawPtr<T>& operator=(const CefRawPtr<U>& r) {
diff --git a/src/include/internal/cef_string.h b/src/include/internal/cef_string.h
index a7876fe5..77c8ca3d 100644
--- a/src/include/internal/cef_string.h
+++ b/src/include/internal/cef_string.h
@@ -44,7 +44,6 @@
 // Build with the wide string type as default.
 // #define CEF_STRING_TYPE_WIDE 1
 
-
 #include "include/internal/cef_string_types.h"
 
 #ifdef __cplusplus
diff --git a/src/include/internal/cef_string_list.h b/src/include/internal/cef_string_list.h
index 79c0509f..b44bac71 100644
--- a/src/include/internal/cef_string_list.h
+++ b/src/include/internal/cef_string_list.h
@@ -58,7 +58,8 @@ CEF_EXPORT size_t cef_string_list_size(cef_string_list_t list);
 // true (1) if the value was successfully retrieved.
 ///
 CEF_EXPORT int cef_string_list_value(cef_string_list_t list,
-                                     size_t index, cef_string_t* value);
+                                     size_t index,
+                                     cef_string_t* value);
 
 ///
 // Append a new value at the end of the string list.
diff --git a/src/include/internal/cef_string_map.h b/src/include/internal/cef_string_map.h
index a22f33a7..0f334257 100644
--- a/src/include/internal/cef_string_map.h
+++ b/src/include/internal/cef_string_map.h
@@ -63,13 +63,15 @@ CEF_EXPORT int cef_string_map_find(cef_string_map_t map,
 ///
 // Return the key at the specified zero-based string map index.
 ///
-CEF_EXPORT int cef_string_map_key(cef_string_map_t map, size_t index,
+CEF_EXPORT int cef_string_map_key(cef_string_map_t map,
+                                  size_t index,
                                   cef_string_t* key);
 
 ///
 // Return the value at the specified zero-based string map index.
 ///
-CEF_EXPORT int cef_string_map_value(cef_string_map_t map, size_t index,
+CEF_EXPORT int cef_string_map_value(cef_string_map_t map,
+                                    size_t index,
                                     cef_string_t* value);
 
 ///
@@ -89,7 +91,6 @@ CEF_EXPORT void cef_string_map_clear(cef_string_map_t map);
 ///
 CEF_EXPORT void cef_string_map_free(cef_string_map_t map);
 
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/include/internal/cef_string_multimap.h b/src/include/internal/cef_string_multimap.h
index ee9325b3..cd077460 100644
--- a/src/include/internal/cef_string_multimap.h
+++ b/src/include/internal/cef_string_multimap.h
@@ -58,7 +58,7 @@ CEF_EXPORT size_t cef_string_multimap_size(cef_string_multimap_t map);
 // Return the number of values with the specified key.
 ///
 CEF_EXPORT size_t cef_string_multimap_find_count(cef_string_multimap_t map,
-                                              const cef_string_t* key);
+                                                 const cef_string_t* key);
 
 ///
 // Return the value_index-th value with the specified key.
@@ -71,13 +71,15 @@ CEF_EXPORT int cef_string_multimap_enumerate(cef_string_multimap_t map,
 ///
 // Return the key at the specified zero-based string multimap index.
 ///
-CEF_EXPORT int cef_string_multimap_key(cef_string_multimap_t map, size_t index,
+CEF_EXPORT int cef_string_multimap_key(cef_string_multimap_t map,
+                                       size_t index,
                                        cef_string_t* key);
 
 ///
 // Return the value at the specified zero-based string multimap index.
 ///
-CEF_EXPORT int cef_string_multimap_value(cef_string_multimap_t map, size_t index,
+CEF_EXPORT int cef_string_multimap_value(cef_string_multimap_t map,
+                                         size_t index,
                                          cef_string_t* value);
 
 ///
@@ -97,7 +99,6 @@ CEF_EXPORT void cef_string_multimap_clear(cef_string_multimap_t map);
 ///
 CEF_EXPORT void cef_string_multimap_free(cef_string_multimap_t map);
 
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/include/internal/cef_string_types.h b/src/include/internal/cef_string_types.h
index 06206570..ea919608 100644
--- a/src/include/internal/cef_string_types.h
+++ b/src/include/internal/cef_string_types.h
@@ -70,32 +70,35 @@ typedef struct _cef_string_utf16_t {
   void (*dtor)(char16* str);
 } cef_string_utf16_t;
 
-
 ///
 // These functions set string values. If |copy| is true (1) the value will be
 // copied instead of referenced. It is up to the user to properly manage
 // the lifespan of references.
 ///
 
-CEF_EXPORT int cef_string_wide_set(const wchar_t* src, size_t src_len,
-                                   cef_string_wide_t* output, int copy);
-CEF_EXPORT int cef_string_utf8_set(const char* src, size_t src_len,
-                                   cef_string_utf8_t* output, int copy);
-CEF_EXPORT int cef_string_utf16_set(const char16* src, size_t src_len,
-                                    cef_string_utf16_t* output, int copy);
-
+CEF_EXPORT int cef_string_wide_set(const wchar_t* src,
+                                   size_t src_len,
+                                   cef_string_wide_t* output,
+                                   int copy);
+CEF_EXPORT int cef_string_utf8_set(const char* src,
+                                   size_t src_len,
+                                   cef_string_utf8_t* output,
+                                   int copy);
+CEF_EXPORT int cef_string_utf16_set(const char16* src,
+                                    size_t src_len,
+                                    cef_string_utf16_t* output,
+                                    int copy);
 
 ///
 // Convenience macros for copying values.
 ///
 
-#define cef_string_wide_copy(src, src_len, output)  \
-    cef_string_wide_set(src, src_len, output, true)
-#define cef_string_utf8_copy(src, src_len, output)  \
-    cef_string_utf8_set(src, src_len, output, true)
-#define cef_string_utf16_copy(src, src_len, output)  \
-    cef_string_utf16_set(src, src_len, output, true)
-
+#define cef_string_wide_copy(src, src_len, output) \
+  cef_string_wide_set(src, src_len, output, true)
+#define cef_string_utf8_copy(src, src_len, output) \
+  cef_string_utf8_set(src, src_len, output, true)
+#define cef_string_utf16_copy(src, src_len, output) \
+  cef_string_utf16_set(src, src_len, output, true)
 
 ///
 // These functions clear string values. The structure itself is not freed.
@@ -105,7 +108,6 @@ CEF_EXPORT void cef_string_wide_clear(cef_string_wide_t* str);
 CEF_EXPORT void cef_string_utf8_clear(cef_string_utf8_t* str);
 CEF_EXPORT void cef_string_utf16_clear(cef_string_utf16_t* str);
 
-
 ///
 // These functions compare two string values with the same results as strcmp().
 ///
@@ -117,7 +119,6 @@ CEF_EXPORT int cef_string_utf8_cmp(const cef_string_utf8_t* str1,
 CEF_EXPORT int cef_string_utf16_cmp(const cef_string_utf16_t* str1,
                                     const cef_string_utf16_t* str2);
 
-
 ///
 // These functions convert between UTF-8, -16, and -32 strings. They are
 // potentially slow so unnecessary conversions should be avoided. The best
@@ -125,35 +126,40 @@ CEF_EXPORT int cef_string_utf16_cmp(const cef_string_utf16_t* str1,
 // value indicating whether the conversion is 100% valid.
 ///
 
-CEF_EXPORT int cef_string_wide_to_utf8(const wchar_t* src, size_t src_len,
+CEF_EXPORT int cef_string_wide_to_utf8(const wchar_t* src,
+                                       size_t src_len,
                                        cef_string_utf8_t* output);
-CEF_EXPORT int cef_string_utf8_to_wide(const char* src, size_t src_len,
+CEF_EXPORT int cef_string_utf8_to_wide(const char* src,
+                                       size_t src_len,
                                        cef_string_wide_t* output);
 
-CEF_EXPORT int cef_string_wide_to_utf16(const wchar_t* src, size_t src_len,
+CEF_EXPORT int cef_string_wide_to_utf16(const wchar_t* src,
+                                        size_t src_len,
                                         cef_string_utf16_t* output);
-CEF_EXPORT int cef_string_utf16_to_wide(const char16* src, size_t src_len,
+CEF_EXPORT int cef_string_utf16_to_wide(const char16* src,
+                                        size_t src_len,
                                         cef_string_wide_t* output);
 
-CEF_EXPORT int cef_string_utf8_to_utf16(const char* src, size_t src_len,
+CEF_EXPORT int cef_string_utf8_to_utf16(const char* src,
+                                        size_t src_len,
                                         cef_string_utf16_t* output);
-CEF_EXPORT int cef_string_utf16_to_utf8(const char16* src, size_t src_len,
+CEF_EXPORT int cef_string_utf16_to_utf8(const char16* src,
+                                        size_t src_len,
                                         cef_string_utf8_t* output);
 
-
 ///
 // These functions convert an ASCII string, typically a hardcoded constant, to a
 // Wide/UTF16 string. Use instead of the UTF8 conversion routines if you know
 // the string is ASCII.
 ///
 
-CEF_EXPORT int cef_string_ascii_to_wide(const char* src, size_t src_len,
+CEF_EXPORT int cef_string_ascii_to_wide(const char* src,
+                                        size_t src_len,
                                         cef_string_wide_t* output);
-CEF_EXPORT int cef_string_ascii_to_utf16(const char* src, size_t src_len,
+CEF_EXPORT int cef_string_ascii_to_utf16(const char* src,
+                                         size_t src_len,
                                          cef_string_utf16_t* output);
 
-
-
 ///
 // It is sometimes necessary for the system to allocate string structures with
 // the expectation that the user will free them. The userfree types act as a
@@ -164,7 +170,6 @@ typedef cef_string_wide_t* cef_string_userfree_wide_t;
 typedef cef_string_utf8_t* cef_string_userfree_utf8_t;
 typedef cef_string_utf16_t* cef_string_userfree_utf16_t;
 
-
 ///
 // These functions allocate a new string structure. They must be freed by
 // calling the associated free function.
@@ -174,7 +179,6 @@ CEF_EXPORT cef_string_userfree_wide_t cef_string_userfree_wide_alloc();
 CEF_EXPORT cef_string_userfree_utf8_t cef_string_userfree_utf8_alloc();
 CEF_EXPORT cef_string_userfree_utf16_t cef_string_userfree_utf16_alloc();
 
-
 ///
 // These functions free the string structure allocated by the associated
 // alloc function. Any string contents will first be cleared.
@@ -184,18 +188,18 @@ CEF_EXPORT void cef_string_userfree_wide_free(cef_string_userfree_wide_t str);
 CEF_EXPORT void cef_string_userfree_utf8_free(cef_string_userfree_utf8_t str);
 CEF_EXPORT void cef_string_userfree_utf16_free(cef_string_userfree_utf16_t str);
 
-
 ///
 // These functions convert utf16 string case using the current ICU locale. This
 // may change the length of the string in some cases.
 ///
 
-CEF_EXPORT int cef_string_utf16_to_lower(const char16* src, size_t src_len,
+CEF_EXPORT int cef_string_utf16_to_lower(const char16* src,
+                                         size_t src_len,
                                          cef_string_utf16_t* output);
-CEF_EXPORT int cef_string_utf16_to_upper(const char16* src, size_t src_len,
+CEF_EXPORT int cef_string_utf16_to_upper(const char16* src,
+                                         size_t src_len,
                                          cef_string_utf16_t* output);
 
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/include/internal/cef_string_wrappers.h b/src/include/internal/cef_string_wrappers.h
index f5d6ab9e..f965e9c0 100644
--- a/src/include/internal/cef_string_wrappers.h
+++ b/src/include/internal/cef_string_wrappers.h
@@ -49,9 +49,11 @@ struct CefStringTraitsWide {
   typedef cef_string_wide_t struct_type;
   typedef cef_string_userfree_wide_t userfree_struct_type;
 
-  static inline void clear(struct_type *s) { cef_string_wide_clear(s); }
-  static inline int set(const char_type* src, size_t src_size,
-                        struct_type* output, int copy) {
+  static inline void clear(struct_type* s) { cef_string_wide_clear(s); }
+  static inline int set(const char_type* src,
+                        size_t src_size,
+                        struct_type* output,
+                        int copy) {
     return cef_string_wide_set(src, src_size, output, copy);
   }
   static inline int compare(const struct_type* s1, const struct_type* s2) {
@@ -65,10 +67,10 @@ struct CefStringTraitsWide {
   }
 
   // Conversion methods.
-  static inline bool from_ascii(const char* str, size_t len, struct_type *s) {
+  static inline bool from_ascii(const char* str, size_t len, struct_type* s) {
     return cef_string_ascii_to_wide(str, len, s) ? true : false;
   }
-  static inline std::string to_string(const struct_type *s) {
+  static inline std::string to_string(const struct_type* s) {
     cef_string_utf8_t cstr;
     memset(&cstr, 0, sizeof(cstr));
     cef_string_wide_to_utf8(s->str, s->length, &cstr);
@@ -78,18 +80,18 @@ struct CefStringTraitsWide {
     cef_string_utf8_clear(&cstr);
     return str;
   }
-  static inline bool from_string(const std::string& str, struct_type *s) {
+  static inline bool from_string(const std::string& str, struct_type* s) {
     return cef_string_utf8_to_wide(str.c_str(), str.length(), s) ? true : false;
   }
-  static inline std::wstring to_wstring(const struct_type *s) {
+  static inline std::wstring to_wstring(const struct_type* s) {
     return std::wstring(s->str, s->length);
   }
-  static inline bool from_wstring(const std::wstring& str, struct_type *s) {
-    return cef_string_wide_set(str.c_str(), str.length(), s, true) ?
-        true : false;
+  static inline bool from_wstring(const std::wstring& str, struct_type* s) {
+    return cef_string_wide_set(str.c_str(), str.length(), s, true) ? true
+                                                                   : false;
   }
 #if defined(WCHAR_T_IS_UTF32)
-  static inline base::string16 to_string16(const struct_type *s) {
+  static inline base::string16 to_string16(const struct_type* s) {
     cef_string_utf16_t cstr;
     memset(&cstr, 0, sizeof(cstr));
     cef_string_wide_to_utf16(s->str, s->length, &cstr);
@@ -99,18 +101,17 @@ struct CefStringTraitsWide {
     cef_string_utf16_clear(&cstr);
     return str;
   }
-  static inline bool from_string16(const base::string16& str,
-                                         struct_type *s) {
-    return cef_string_utf16_to_wide(str.c_str(), str.length(), s) ?
-        true : false;
+  static inline bool from_string16(const base::string16& str, struct_type* s) {
+    return cef_string_utf16_to_wide(str.c_str(), str.length(), s) ? true
+                                                                  : false;
   }
-#else  // WCHAR_T_IS_UTF32
-  static inline base::string16 to_string16(const struct_type *s) {
+#else   // WCHAR_T_IS_UTF32
+  static inline base::string16 to_string16(const struct_type* s) {
     return base::string16(s->str, s->length);
   }
-  static inline bool from_string16(const base::string16& str, struct_type *s) {
-    return cef_string_wide_set(str.c_str(), str.length(), s, true) ?
-        true : false;
+  static inline bool from_string16(const base::string16& str, struct_type* s) {
+    return cef_string_wide_set(str.c_str(), str.length(), s, true) ? true
+                                                                   : false;
   }
 #endif  // WCHAR_T_IS_UTF32
 };
@@ -123,9 +124,11 @@ struct CefStringTraitsUTF8 {
   typedef cef_string_utf8_t struct_type;
   typedef cef_string_userfree_utf8_t userfree_struct_type;
 
-  static inline void clear(struct_type *s) { cef_string_utf8_clear(s); }
-  static inline int set(const char_type* src, size_t src_size,
-                        struct_type* output, int copy) {
+  static inline void clear(struct_type* s) { cef_string_utf8_clear(s); }
+  static inline int set(const char_type* src,
+                        size_t src_size,
+                        struct_type* output,
+                        int copy) {
     return cef_string_utf8_set(src, src_size, output, copy);
   }
   static inline int compare(const struct_type* s1, const struct_type* s2) {
@@ -172,8 +175,8 @@ struct CefStringTraitsUTF8 {
     return str;
   }
   static inline bool from_string16(const base::string16& str, struct_type* s) {
-    return cef_string_utf16_to_utf8(str.c_str(), str.length(), s) ?
-        true : false;
+    return cef_string_utf16_to_utf8(str.c_str(), str.length(), s) ? true
+                                                                  : false;
   }
 };
 
@@ -185,9 +188,11 @@ struct CefStringTraitsUTF16 {
   typedef cef_string_utf16_t struct_type;
   typedef cef_string_userfree_utf16_t userfree_struct_type;
 
-  static inline void clear(struct_type *s) { cef_string_utf16_clear(s); }
-  static inline int set(const char_type* src, size_t src_size,
-                        struct_type* output, int copy) {
+  static inline void clear(struct_type* s) { cef_string_utf16_clear(s); }
+  static inline int set(const char_type* src,
+                        size_t src_size,
+                        struct_type* output,
+                        int copy) {
     return cef_string_utf16_set(src, src_size, output, copy);
   }
   static inline int compare(const struct_type* s1, const struct_type* s2) {
@@ -215,8 +220,8 @@ struct CefStringTraitsUTF16 {
     return str;
   }
   static inline bool from_string(const std::string& str, struct_type* s) {
-    return cef_string_utf8_to_utf16(str.c_str(), str.length(), s) ?
-        true : false;
+    return cef_string_utf8_to_utf16(str.c_str(), str.length(), s) ? true
+                                                                  : false;
   }
 #if defined(WCHAR_T_IS_UTF32)
   static inline std::wstring to_wstring(const struct_type* s) {
@@ -230,24 +235,24 @@ struct CefStringTraitsUTF16 {
     return str;
   }
   static inline bool from_wstring(const std::wstring& str, struct_type* s) {
-    return cef_string_wide_to_utf16(str.c_str(), str.length(), s) ?
-        true : false;
+    return cef_string_wide_to_utf16(str.c_str(), str.length(), s) ? true
+                                                                  : false;
   }
-#else  // WCHAR_T_IS_UTF32
+#else   // WCHAR_T_IS_UTF32
   static inline std::wstring to_wstring(const struct_type* s) {
     return std::wstring(s->str, s->length);
   }
   static inline bool from_wstring(const std::wstring& str, struct_type* s) {
-    return cef_string_utf16_set(str.c_str(), str.length(), s, true) ?
-        true : false;
+    return cef_string_utf16_set(str.c_str(), str.length(), s, true) ? true
+                                                                    : false;
   }
 #endif  // WCHAR_T_IS_UTF32
   static inline base::string16 to_string16(const struct_type* s) {
     return base::string16(s->str, s->length);
   }
   static inline bool from_string16(const base::string16& str, struct_type* s) {
-    return cef_string_utf16_set(str.c_str(), str.length(), s, true) ?
-        true : false;
+    return cef_string_utf16_set(str.c_str(), str.length(), s, true) ? true
+                                                                    : false;
   }
 };
 
@@ -294,8 +299,7 @@ class CefStringBase {
   ///
   // Create a new string from an existing string. Data will always be copied.
   ///
-  CefStringBase(const CefStringBase& str)
-    : string_(NULL), owner_(false) {
+  CefStringBase(const CefStringBase& str) : string_(NULL), owner_(false) {
     FromString(str.c_str(), str.length(), true);
   }
 
@@ -304,12 +308,10 @@ class CefStringBase {
   // copied. Translation will occur if necessary based on the underlying string
   // type.
   ///
-  CefStringBase(const std::string& src)  // NOLINT(runtime/explicit)
-    : string_(NULL), owner_(false) {
+  CefStringBase(const std::string& src) : string_(NULL), owner_(false) {
     FromString(src);
   }
-  CefStringBase(const char* src)  // NOLINT(runtime/explicit)
-    : string_(NULL), owner_(false) {
+  CefStringBase(const char* src) : string_(NULL), owner_(false) {
     if (src)
       FromString(std::string(src));
   }
@@ -319,12 +321,10 @@ class CefStringBase {
   // copied. Translation will occur if necessary based on the underlying string
   // type.
   ///
-  CefStringBase(const std::wstring& src)  // NOLINT(runtime/explicit)
-    : string_(NULL), owner_(false) {
+  CefStringBase(const std::wstring& src) : string_(NULL), owner_(false) {
     FromWString(src);
   }
-  CefStringBase(const wchar_t* src)  // NOLINT(runtime/explicit)
-    : string_(NULL), owner_(false) {
+  CefStringBase(const wchar_t* src) : string_(NULL), owner_(false) {
     if (src)
       FromWString(std::wstring(src));
   }
@@ -335,12 +335,10 @@ class CefStringBase {
   // copied. Translation will occur if necessary based on the underlying string
   // type.
   ///
-  CefStringBase(const base::string16& src)  // NOLINT(runtime/explicit)
-    : string_(NULL), owner_(false) {
+  CefStringBase(const base::string16& src) : string_(NULL), owner_(false) {
     FromString16(src);
   }
-  CefStringBase(const char16* src)  // NOLINT(runtime/explicit)
-    : string_(NULL), owner_(false) {
+  CefStringBase(const char16* src) : string_(NULL), owner_(false) {
     if (src)
       FromString16(base::string16(src));
   }
@@ -353,7 +351,7 @@ class CefStringBase {
   // and will not be freed by this class.
   ///
   CefStringBase(const char_type* src, size_t src_len, bool copy)
-    : string_(NULL), owner_(false) {
+      : string_(NULL), owner_(false) {
     if (src && src_len > 0)
       FromString(src, src_len, copy);
   }
@@ -363,8 +361,7 @@ class CefStringBase {
   // ownership. Referenced structures must exist for the lifetime of this class
   // and will not be freed by this class.
   ///
-  CefStringBase(const struct_type* src)  // NOLINT(runtime/explicit)
-    : string_(NULL), owner_(false) {
+  CefStringBase(const struct_type* src) : string_(NULL), owner_(false) {
     if (!src)
       return;
     // Reference the existing structure without taking ownership.
@@ -373,7 +370,6 @@ class CefStringBase {
 
   virtual ~CefStringBase() { ClearAndFree(); }
 
-
   // The following methods are named for compatibility with the standard library
   // string template types.
 
@@ -430,7 +426,6 @@ class CefStringBase {
     str.owner_ = tmp_owner;
   }
 
-
   // The following methods are unique to CEF string template types.
 
   ///
@@ -635,15 +630,11 @@ class CefStringBase {
   ///
   // Comparison operator overloads.
   ///
-  bool operator<(const CefStringBase& str) const {
-    return (compare(str) < 0);
-  }
+  bool operator<(const CefStringBase& str) const { return (compare(str) < 0); }
   bool operator<=(const CefStringBase& str) const {
     return (compare(str) <= 0);
   }
-  bool operator>(const CefStringBase& str) const {
-    return (compare(str) > 0);
-  }
+  bool operator>(const CefStringBase& str) const { return (compare(str) > 0); }
   bool operator>=(const CefStringBase& str) const {
     return (compare(str) >= 0);
   }
@@ -661,9 +652,7 @@ class CefStringBase {
     FromString(str.c_str(), str.length(), true);
     return *this;
   }
-  operator std::string() const {
-    return ToString();
-  }
+  operator std::string() const { return ToString(); }
   CefStringBase& operator=(const std::string& str) {
     FromString(str);
     return *this;
@@ -672,9 +661,7 @@ class CefStringBase {
     FromString(std::string(str));
     return *this;
   }
-  operator std::wstring() const {
-    return ToWString();
-  }
+  operator std::wstring() const { return ToWString(); }
   CefStringBase& operator=(const std::wstring& str) {
     FromWString(str);
     return *this;
@@ -684,9 +671,7 @@ class CefStringBase {
     return *this;
   }
 #if defined(WCHAR_T_IS_UTF32)
-  operator base::string16() const {
-    return ToString16();
-  }
+  operator base::string16() const { return ToString16(); }
   CefStringBase& operator=(const base::string16& str) {
     FromString16(str);
     return *this;
@@ -722,7 +707,6 @@ class CefStringBase {
   bool owner_;
 };
 
-
 typedef CefStringBase<CefStringTraitsWide> CefStringWide;
 typedef CefStringBase<CefStringTraitsUTF8> CefStringUTF8;
 typedef CefStringBase<CefStringTraitsUTF16> CefStringUTF16;
diff --git a/src/include/internal/cef_thread_internal.h b/src/include/internal/cef_thread_internal.h
index 006ff15d..f326bcd1 100644
--- a/src/include/internal/cef_thread_internal.h
+++ b/src/include/internal/cef_thread_internal.h
@@ -69,7 +69,7 @@ typedef pthread_t cef_platform_thread_handle_t;
 // Returns the current platform thread handle.
 ///
 CEF_EXPORT cef_platform_thread_handle_t
-    cef_get_current_platform_thread_handle();
+cef_get_current_platform_thread_handle();
 
 #ifdef __cplusplus
 }
diff --git a/src/include/internal/cef_time.h b/src/include/internal/cef_time.h
index f7e397f0..5435e599 100644
--- a/src/include/internal/cef_time.h
+++ b/src/include/internal/cef_time.h
@@ -35,8 +35,8 @@
 extern "C" {
 #endif
 
-#include "include/internal/cef_export.h"
 #include <time.h>
+#include "include/internal/cef_export.h"
 
 ///
 // Time information. Values should always be in UTC.
diff --git a/src/include/internal/cef_types.h b/src/include/internal/cef_types.h
index 63b89b9c..8efe7640 100644
--- a/src/include/internal/cef_types.h
+++ b/src/include/internal/cef_types.h
@@ -27,7 +27,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 #ifndef CEF_INCLUDE_INTERNAL_CEF_TYPES_H_
 #define CEF_INCLUDE_INTERNAL_CEF_TYPES_H_
 #pragma once
@@ -48,36 +47,34 @@
 
 // 32-bit ARGB color value, not premultiplied. The color components are always
 // in a known order. Equivalent to the SkColor type.
-typedef uint32              cef_color_t;
+typedef uint32 cef_color_t;
 
 // Return the alpha byte from a cef_color_t value.
-#define CefColorGetA(color)      (((color) >> 24) & 0xFF)
+#define CefColorGetA(color) (((color) >> 24) & 0xFF)
 // Return the red byte from a cef_color_t value.
-#define CefColorGetR(color)      (((color) >> 16) & 0xFF)
+#define CefColorGetR(color) (((color) >> 16) & 0xFF)
 // Return the green byte from a cef_color_t value.
-#define CefColorGetG(color)      (((color) >>  8) & 0xFF)
+#define CefColorGetG(color) (((color) >> 8) & 0xFF)
 // Return the blue byte from a cef_color_t value.
-#define CefColorGetB(color)      (((color) >>  0) & 0xFF)
+#define CefColorGetB(color) (((color) >> 0) & 0xFF)
 
 // Return an cef_color_t value with the specified byte component values.
-#define CefColorSetARGB(a, r, g, b) \
-    static_cast<cef_color_t>( \
-        (static_cast<unsigned>(a) << 24) | \
-        (static_cast<unsigned>(r) << 16) | \
-        (static_cast<unsigned>(g) << 8) | \
-        (static_cast<unsigned>(b) << 0))
+#define CefColorSetARGB(a, r, g, b)                                         \
+  static_cast<cef_color_t>(                                                 \
+      (static_cast<unsigned>(a) << 24) | (static_cast<unsigned>(r) << 16) | \
+      (static_cast<unsigned>(g) << 8) | (static_cast<unsigned>(b) << 0))
 
 // Return an int64 value with the specified low and high int32 component values.
-#define CefInt64Set(int32_low, int32_high) \
-    static_cast<int64>((static_cast<uint32>(int32_low)) | \
-        (static_cast<int64>(static_cast<int32>(int32_high))) << 32)
+#define CefInt64Set(int32_low, int32_high)                                \
+  static_cast<int64>((static_cast<uint32>(int32_low)) |                   \
+                     (static_cast<int64>(static_cast<int32>(int32_high))) \
+                         << 32)
 
 // Return the low int32 value from an int64 value.
 #define CefInt64GetLow(int64_val) static_cast<int32>(int64_val)
 // Return the high int32 value from an int64 value.
 #define CefInt64GetHigh(int64_val) \
-    static_cast<int32>((static_cast<int64>(int64_val) >> 32) & 0xFFFFFFFFL)
-
+  static_cast<int32>((static_cast<int64>(int64_val) >> 32) & 0xFFFFFFFFL)
 
 #ifdef __cplusplus
 extern "C" {
@@ -97,6 +94,11 @@ typedef enum {
   ///
   LOGSEVERITY_VERBOSE,
 
+  ///
+  // DEBUG logging.
+  ///
+  LOGSEVERITY_DEBUG = LOGSEVERITY_VERBOSE,
+
   ///
   // INFO logging.
   ///
@@ -354,28 +356,6 @@ typedef struct _cef_settings_t {
   ///
   int uncaught_exception_stack_size;
 
-  ///
-  // By default CEF V8 references will be invalidated (the IsValid() method will
-  // return false) after the owning context has been released. This reduces the
-  // need for external record keeping and avoids crashes due to the use of V8
-  // references after the associated context has been released.
-  //
-  // CEF currently offers two context safety implementations with different
-  // performance characteristics. The default implementation (value of 0) uses a
-  // map of hash values and should provide better performance in situations with
-  // a small number contexts. The alternate implementation (value of 1) uses a
-  // hidden value attached to each context and should provide better performance
-  // in situations with a large number of contexts.
-  //
-  // If you need better performance in the creation of V8 references and you
-  // plan to manually track context lifespan you can disable context safety by
-  // specifying a value of -1.
-  //
-  // Also configurable using the "context-safety-implementation" command-line
-  // switch.
-  ///
-  int context_safety_implementation;
-
   ///
   // Set to true (1) to ignore errors related to invalid SSL certificates.
   // Enabling this setting can lead to potential security vulnerabilities like
@@ -401,10 +381,14 @@ typedef struct _cef_settings_t {
   int enable_net_security_expiration;
 
   ///
-  // Opaque background color used for accelerated content. By default the
-  // background color will be white. Only the RGB compontents of the specified
-  // value will be used. The alpha component must greater than 0 to enable use
-  // of the background color but will be otherwise ignored.
+  // Background color used for the browser before a document is loaded and when
+  // no document color is specified. The alpha component must be either fully
+  // opaque (0xFF) or fully transparent (0x00). If the alpha component is fully
+  // opaque then the RGB components will be used as the background color. If the
+  // alpha component is fully transparent for a windowed browser then the
+  // default value of opaque white be used. If the alpha component is fully
+  // transparent for a windowless (off-screen) browser then transparent painting
+  // will be enabled.
   ///
   cef_color_t background_color;
 
@@ -544,13 +528,6 @@ typedef struct _cef_browser_settings_t {
   ///
   cef_state_t javascript;
 
-  ///
-  // Controls whether JavaScript can be used for opening windows. Also
-  // configurable using the "disable-javascript-open-windows" command-line
-  // switch.
-  ///
-  cef_state_t javascript_open_windows;
-
   ///
   // Controls whether JavaScript can be used to close windows that were not
   // opened via JavaScript. JavaScript can still be used to close windows that
@@ -652,11 +629,14 @@ typedef struct _cef_browser_settings_t {
   cef_state_t webgl;
 
   ///
-  // Opaque background color used for the browser before a document is loaded
-  // and when no document color is specified. By default the background color
-  // will be the same as CefSettings.background_color. Only the RGB compontents
-  // of the specified value will be used. The alpha component must greater than
-  // 0 to enable use of the background color but will be otherwise ignored.
+  // Background color used for the browser before a document is loaded and when
+  // no document color is specified. The alpha component must be either fully
+  // opaque (0xFF) or fully transparent (0x00). If the alpha component is fully
+  // opaque then the RGB components will be used as the background color. If the
+  // alpha component is fully transparent for a windowed browser then the
+  // CefSettings.background_color value will be used. If the alpha component is
+  // fully transparent for a windowless (off-screen) browser then transparent
+  // painting will be enabled.
   ///
   cef_color_t background_color;
 
@@ -865,6 +845,12 @@ typedef enum {
   // and "~/Library/Application Support" directory on Mac OS X.
   ///
   PK_USER_DATA,
+
+  ///
+  // Directory containing application resources. Can be configured via
+  // CefSettings.resources_dir_path.
+  ///
+  PK_DIR_RESOURCES,
 } cef_path_key_t;
 
 ///
@@ -994,23 +980,23 @@ typedef enum {
 // DragActions.h and should not be renumbered.
 ///
 typedef enum {
-    DRAG_OPERATION_NONE    = 0,
-    DRAG_OPERATION_COPY    = 1,
-    DRAG_OPERATION_LINK    = 2,
-    DRAG_OPERATION_GENERIC = 4,
-    DRAG_OPERATION_PRIVATE = 8,
-    DRAG_OPERATION_MOVE    = 16,
-    DRAG_OPERATION_DELETE  = 32,
-    DRAG_OPERATION_EVERY   = UINT_MAX
+  DRAG_OPERATION_NONE = 0,
+  DRAG_OPERATION_COPY = 1,
+  DRAG_OPERATION_LINK = 2,
+  DRAG_OPERATION_GENERIC = 4,
+  DRAG_OPERATION_PRIVATE = 8,
+  DRAG_OPERATION_MOVE = 16,
+  DRAG_OPERATION_DELETE = 32,
+  DRAG_OPERATION_EVERY = UINT_MAX
 } cef_drag_operations_mask_t;
 
 ///
 // V8 access control values.
 ///
 typedef enum {
-  V8_ACCESS_CONTROL_DEFAULT               = 0,
-  V8_ACCESS_CONTROL_ALL_CAN_READ          = 1,
-  V8_ACCESS_CONTROL_ALL_CAN_WRITE         = 1 << 1,
+  V8_ACCESS_CONTROL_DEFAULT = 0,
+  V8_ACCESS_CONTROL_ALL_CAN_READ = 1,
+  V8_ACCESS_CONTROL_ALL_CAN_WRITE = 1 << 1,
   V8_ACCESS_CONTROL_PROHIBITS_OVERWRITING = 1 << 2
 } cef_v8_accesscontrol_t;
 
@@ -1018,18 +1004,18 @@ typedef enum {
 // V8 property attribute values.
 ///
 typedef enum {
-  V8_PROPERTY_ATTRIBUTE_NONE       = 0,       // Writeable, Enumerable,
-                                              //   Configurable
-  V8_PROPERTY_ATTRIBUTE_READONLY   = 1 << 0,  // Not writeable
-  V8_PROPERTY_ATTRIBUTE_DONTENUM   = 1 << 1,  // Not enumerable
-  V8_PROPERTY_ATTRIBUTE_DONTDELETE = 1 << 2   // Not configurable
+  V8_PROPERTY_ATTRIBUTE_NONE = 0,            // Writeable, Enumerable,
+                                             //   Configurable
+  V8_PROPERTY_ATTRIBUTE_READONLY = 1 << 0,   // Not writeable
+  V8_PROPERTY_ATTRIBUTE_DONTENUM = 1 << 1,   // Not enumerable
+  V8_PROPERTY_ATTRIBUTE_DONTDELETE = 1 << 2  // Not configurable
 } cef_v8_propertyattribute_t;
 
 ///
 // Post data elements may represent either bytes or files.
 ///
 typedef enum {
-  PDE_TYPE_EMPTY  = 0,
+  PDE_TYPE_EMPTY = 0,
   PDE_TYPE_BYTES,
   PDE_TYPE_FILE,
 } cef_postdataelement_type_t;
@@ -1238,35 +1224,52 @@ typedef enum {
   ///
   // Default behavior.
   ///
-  UR_FLAG_NONE                      = 0,
+  UR_FLAG_NONE = 0,
 
   ///
-  // If set the cache will be skipped when handling the request.
+  // If set the cache will be skipped when handling the request. Setting this
+  // value is equivalent to specifying the "Cache-Control: no-cache" request
+  // header. Setting this value in combination with UR_FLAG_ONLY_FROM_CACHE will
+  // cause the request to fail.
   ///
-  UR_FLAG_SKIP_CACHE                = 1 << 0,
+  UR_FLAG_SKIP_CACHE = 1 << 0,
+
+  ///
+  // If set the request will fail if it cannot be served from the cache (or some
+  // equivalent local store). Setting this value is equivalent to specifying the
+  // "Cache-Control: only-if-cached" request header. Setting this value in
+  // combination with UR_FLAG_SKIP_CACHE will cause the request to fail.
+  ///
+  UR_FLAG_ONLY_FROM_CACHE = 1 << 1,
 
   ///
   // If set user name, password, and cookies may be sent with the request, and
   // cookies may be saved from the response.
   ///
-  UR_FLAG_ALLOW_CACHED_CREDENTIALS  = 1 << 1,
+  UR_FLAG_ALLOW_STORED_CREDENTIALS = 1 << 2,
 
   ///
   // If set upload progress events will be generated when a request has a body.
   ///
-  UR_FLAG_REPORT_UPLOAD_PROGRESS    = 1 << 3,
+  UR_FLAG_REPORT_UPLOAD_PROGRESS = 1 << 3,
 
   ///
   // If set the CefURLRequestClient::OnDownloadData method will not be called.
   ///
-  UR_FLAG_NO_DOWNLOAD_DATA          = 1 << 6,
+  UR_FLAG_NO_DOWNLOAD_DATA = 1 << 4,
 
   ///
   // If set 5XX redirect errors will be propagated to the observer instead of
   // automatically re-tried. This currently only applies for requests
   // originated in the browser process.
   ///
-  UR_FLAG_NO_RETRY_ON_5XX           = 1 << 7,
+  UR_FLAG_NO_RETRY_ON_5XX = 1 << 5,
+
+  ///
+  // If set 3XX responses will cause the fetch to halt immediately rather than
+  // continue through the redirect.
+  ///
+  UR_FLAG_STOP_ON_REDIRECT = 1 << 6,
 } cef_urlrequest_flags_t;
 
 ///
@@ -1377,50 +1380,65 @@ typedef enum {
 // Existing thread IDs.
 ///
 typedef enum {
-// BROWSER PROCESS THREADS -- Only available in the browser process.
+  // BROWSER PROCESS THREADS -- Only available in the browser process.
 
   ///
   // The main thread in the browser. This will be the same as the main
   // application thread if CefInitialize() is called with a
-  // CefSettings.multi_threaded_message_loop value of false.
+  // CefSettings.multi_threaded_message_loop value of false. Do not perform
+  // blocking tasks on this thread. All tasks posted after
+  // CefBrowserProcessHandler::OnContextInitialized() and before CefShutdown()
+  // are guaranteed to run. This thread will outlive all other CEF threads.
   ///
   TID_UI,
 
   ///
-  // Used to interact with the database.
+  // Used for blocking tasks (e.g. file system access) where the user won't
+  // notice if the task takes an arbitrarily long time to complete. All tasks
+  // posted after CefBrowserProcessHandler::OnContextInitialized() and before
+  // CefShutdown() are guaranteed to run.
   ///
-  TID_DB,
+  TID_FILE_BACKGROUND,
+  TID_FILE = TID_FILE_BACKGROUND,
 
   ///
-  // Used to interact with the file system.
+  // Used for blocking tasks (e.g. file system access) that affect UI or
+  // responsiveness of future user interactions. Do not use if an immediate
+  // response to a user interaction is expected. All tasks posted after
+  // CefBrowserProcessHandler::OnContextInitialized() and before CefShutdown()
+  // are guaranteed to run.
+  // Examples:
+  // - Updating the UI to reflect progress on a long task.
+  // - Loading data that might be shown in the UI after a future user
+  //   interaction.
   ///
-  TID_FILE,
+  TID_FILE_USER_VISIBLE,
 
   ///
-  // Used for file system operations that block user interactions.
-  // Responsiveness of this thread affects users.
+  // Used for blocking tasks (e.g. file system access) that affect UI
+  // immediately after a user interaction. All tasks posted after
+  // CefBrowserProcessHandler::OnContextInitialized() and before CefShutdown()
+  // are guaranteed to run.
+  // Example: Generating data shown in the UI immediately after a click.
   ///
   TID_FILE_USER_BLOCKING,
 
   ///
-  // Used to launch and terminate browser processes.
-  ///
-  TID_PROCESS_LAUNCHER,
-
-  ///
-  // Used to handle slow HTTP cache operations.
-  ///
-  TID_CACHE,
-
-  ///
-  // Used to process IPC and network messages.
+  // Used to process IPC and network messages. Do not perform blocking tasks on
+  // this thread. All tasks posted after
+  // CefBrowserProcessHandler::OnContextInitialized() and before CefShutdown()
+  // are guaranteed to run.
   ///
   TID_IO,
 
-// RENDER PROCESS THREADS -- Only available in the render process.
+  // RENDER PROCESS THREADS -- Only available in the render process.
 
   ///
   // The main thread in the renderer. Used for all WebKit and V8 interaction.
+  // Tasks may be posted to this thread after
+  // CefRenderProcessHandler::OnRenderThreadCreated but are not guaranteed to
+  // run before sub-process termination (sub-processes may be killed at any time
+  // without warning).
   ///
   TID_RENDERER,
 } cef_thread_id_t;
@@ -1578,53 +1596,53 @@ typedef struct _cef_screen_info_t {
 ///
 typedef enum {
   // Navigation.
-  MENU_ID_BACK                = 100,
-  MENU_ID_FORWARD             = 101,
-  MENU_ID_RELOAD              = 102,
-  MENU_ID_RELOAD_NOCACHE      = 103,
-  MENU_ID_STOPLOAD            = 104,
+  MENU_ID_BACK = 100,
+  MENU_ID_FORWARD = 101,
+  MENU_ID_RELOAD = 102,
+  MENU_ID_RELOAD_NOCACHE = 103,
+  MENU_ID_STOPLOAD = 104,
 
   // Editing.
-  MENU_ID_UNDO                = 110,
-  MENU_ID_REDO                = 111,
-  MENU_ID_CUT                 = 112,
-  MENU_ID_COPY                = 113,
-  MENU_ID_PASTE               = 114,
-  MENU_ID_DELETE              = 115,
-  MENU_ID_SELECT_ALL          = 116,
+  MENU_ID_UNDO = 110,
+  MENU_ID_REDO = 111,
+  MENU_ID_CUT = 112,
+  MENU_ID_COPY = 113,
+  MENU_ID_PASTE = 114,
+  MENU_ID_DELETE = 115,
+  MENU_ID_SELECT_ALL = 116,
 
   // Miscellaneous.
-  MENU_ID_FIND                = 130,
-  MENU_ID_PRINT               = 131,
-  MENU_ID_VIEW_SOURCE         = 132,
+  MENU_ID_FIND = 130,
+  MENU_ID_PRINT = 131,
+  MENU_ID_VIEW_SOURCE = 132,
 
   // Spell checking word correction suggestions.
-  MENU_ID_SPELLCHECK_SUGGESTION_0        = 200,
-  MENU_ID_SPELLCHECK_SUGGESTION_1        = 201,
-  MENU_ID_SPELLCHECK_SUGGESTION_2        = 202,
-  MENU_ID_SPELLCHECK_SUGGESTION_3        = 203,
-  MENU_ID_SPELLCHECK_SUGGESTION_4        = 204,
-  MENU_ID_SPELLCHECK_SUGGESTION_LAST     = 204,
-  MENU_ID_NO_SPELLING_SUGGESTIONS        = 205,
-  MENU_ID_ADD_TO_DICTIONARY              = 206,
+  MENU_ID_SPELLCHECK_SUGGESTION_0 = 200,
+  MENU_ID_SPELLCHECK_SUGGESTION_1 = 201,
+  MENU_ID_SPELLCHECK_SUGGESTION_2 = 202,
+  MENU_ID_SPELLCHECK_SUGGESTION_3 = 203,
+  MENU_ID_SPELLCHECK_SUGGESTION_4 = 204,
+  MENU_ID_SPELLCHECK_SUGGESTION_LAST = 204,
+  MENU_ID_NO_SPELLING_SUGGESTIONS = 205,
+  MENU_ID_ADD_TO_DICTIONARY = 206,
 
   // Custom menu items originating from the renderer process. For example,
   // plugin placeholder menu items or Flash menu items.
-  MENU_ID_CUSTOM_FIRST        = 220,
-  MENU_ID_CUSTOM_LAST         = 250,
+  MENU_ID_CUSTOM_FIRST = 220,
+  MENU_ID_CUSTOM_LAST = 250,
 
   // All user-defined menu IDs should come between MENU_ID_USER_FIRST and
   // MENU_ID_USER_LAST to avoid overlapping the Chromium and CEF ID ranges
   // defined in the tools/gritsettings/resource_ids file.
-  MENU_ID_USER_FIRST          = 26500,
-  MENU_ID_USER_LAST           = 28500,
+  MENU_ID_USER_FIRST = 26500,
+  MENU_ID_USER_LAST = 28500,
 } cef_menu_id_t;
 
 ///
 // Mouse button types.
 ///
 typedef enum {
-  MBT_LEFT   = 0,
+  MBT_LEFT = 0,
   MBT_MIDDLE,
   MBT_RIGHT,
 } cef_mouse_button_type_t;
@@ -1654,7 +1672,7 @@ typedef struct _cef_mouse_event_t {
 // Paint element types.
 ///
 typedef enum {
-  PET_VIEW  = 0,
+  PET_VIEW = 0,
   PET_POPUP,
 } cef_paint_element_type_t;
 
@@ -1662,20 +1680,20 @@ typedef enum {
 // Supported event bit flags.
 ///
 typedef enum {
-  EVENTFLAG_NONE                = 0,
-  EVENTFLAG_CAPS_LOCK_ON        = 1 << 0,
-  EVENTFLAG_SHIFT_DOWN          = 1 << 1,
-  EVENTFLAG_CONTROL_DOWN        = 1 << 2,
-  EVENTFLAG_ALT_DOWN            = 1 << 3,
-  EVENTFLAG_LEFT_MOUSE_BUTTON   = 1 << 4,
+  EVENTFLAG_NONE = 0,
+  EVENTFLAG_CAPS_LOCK_ON = 1 << 0,
+  EVENTFLAG_SHIFT_DOWN = 1 << 1,
+  EVENTFLAG_CONTROL_DOWN = 1 << 2,
+  EVENTFLAG_ALT_DOWN = 1 << 3,
+  EVENTFLAG_LEFT_MOUSE_BUTTON = 1 << 4,
   EVENTFLAG_MIDDLE_MOUSE_BUTTON = 1 << 5,
-  EVENTFLAG_RIGHT_MOUSE_BUTTON  = 1 << 6,
+  EVENTFLAG_RIGHT_MOUSE_BUTTON = 1 << 6,
   // Mac OS-X command key.
-  EVENTFLAG_COMMAND_DOWN        = 1 << 7,
-  EVENTFLAG_NUM_LOCK_ON         = 1 << 8,
-  EVENTFLAG_IS_KEY_PAD          = 1 << 9,
-  EVENTFLAG_IS_LEFT             = 1 << 10,
-  EVENTFLAG_IS_RIGHT            = 1 << 11,
+  EVENTFLAG_COMMAND_DOWN = 1 << 7,
+  EVENTFLAG_NUM_LOCK_ON = 1 << 8,
+  EVENTFLAG_IS_KEY_PAD = 1 << 9,
+  EVENTFLAG_IS_LEFT = 1 << 10,
+  EVENTFLAG_IS_RIGHT = 1 << 11,
 } cef_event_flags_t;
 
 ///
@@ -1697,31 +1715,31 @@ typedef enum {
   ///
   // No node is selected.
   ///
-  CM_TYPEFLAG_NONE        = 0,
+  CM_TYPEFLAG_NONE = 0,
   ///
   // The top page is selected.
   ///
-  CM_TYPEFLAG_PAGE        = 1 << 0,
+  CM_TYPEFLAG_PAGE = 1 << 0,
   ///
   // A subframe page is selected.
   ///
-  CM_TYPEFLAG_FRAME       = 1 << 1,
+  CM_TYPEFLAG_FRAME = 1 << 1,
   ///
   // A link is selected.
   ///
-  CM_TYPEFLAG_LINK        = 1 << 2,
+  CM_TYPEFLAG_LINK = 1 << 2,
   ///
   // A media node is selected.
   ///
-  CM_TYPEFLAG_MEDIA       = 1 << 3,
+  CM_TYPEFLAG_MEDIA = 1 << 3,
   ///
   // There is a textual or mixed selection that is selected.
   ///
-  CM_TYPEFLAG_SELECTION   = 1 << 4,
+  CM_TYPEFLAG_SELECTION = 1 << 4,
   ///
   // An editable element is selected.
   ///
-  CM_TYPEFLAG_EDITABLE    = 1 << 5,
+  CM_TYPEFLAG_EDITABLE = 1 << 5,
 } cef_context_menu_type_flags_t;
 
 ///
@@ -1758,32 +1776,32 @@ typedef enum {
 // Supported context menu media state bit flags.
 ///
 typedef enum {
-  CM_MEDIAFLAG_NONE                  = 0,
-  CM_MEDIAFLAG_ERROR                 = 1 << 0,
-  CM_MEDIAFLAG_PAUSED                = 1 << 1,
-  CM_MEDIAFLAG_MUTED                 = 1 << 2,
-  CM_MEDIAFLAG_LOOP                  = 1 << 3,
-  CM_MEDIAFLAG_CAN_SAVE              = 1 << 4,
-  CM_MEDIAFLAG_HAS_AUDIO             = 1 << 5,
-  CM_MEDIAFLAG_HAS_VIDEO             = 1 << 6,
-  CM_MEDIAFLAG_CONTROL_ROOT_ELEMENT  = 1 << 7,
-  CM_MEDIAFLAG_CAN_PRINT             = 1 << 8,
-  CM_MEDIAFLAG_CAN_ROTATE            = 1 << 9,
+  CM_MEDIAFLAG_NONE = 0,
+  CM_MEDIAFLAG_ERROR = 1 << 0,
+  CM_MEDIAFLAG_PAUSED = 1 << 1,
+  CM_MEDIAFLAG_MUTED = 1 << 2,
+  CM_MEDIAFLAG_LOOP = 1 << 3,
+  CM_MEDIAFLAG_CAN_SAVE = 1 << 4,
+  CM_MEDIAFLAG_HAS_AUDIO = 1 << 5,
+  CM_MEDIAFLAG_HAS_VIDEO = 1 << 6,
+  CM_MEDIAFLAG_CONTROL_ROOT_ELEMENT = 1 << 7,
+  CM_MEDIAFLAG_CAN_PRINT = 1 << 8,
+  CM_MEDIAFLAG_CAN_ROTATE = 1 << 9,
 } cef_context_menu_media_state_flags_t;
 
 ///
 // Supported context menu edit state bit flags.
 ///
 typedef enum {
-  CM_EDITFLAG_NONE            = 0,
-  CM_EDITFLAG_CAN_UNDO        = 1 << 0,
-  CM_EDITFLAG_CAN_REDO        = 1 << 1,
-  CM_EDITFLAG_CAN_CUT         = 1 << 2,
-  CM_EDITFLAG_CAN_COPY        = 1 << 3,
-  CM_EDITFLAG_CAN_PASTE       = 1 << 4,
-  CM_EDITFLAG_CAN_DELETE      = 1 << 5,
-  CM_EDITFLAG_CAN_SELECT_ALL  = 1 << 6,
-  CM_EDITFLAG_CAN_TRANSLATE   = 1 << 7,
+  CM_EDITFLAG_NONE = 0,
+  CM_EDITFLAG_CAN_UNDO = 1 << 0,
+  CM_EDITFLAG_CAN_REDO = 1 << 1,
+  CM_EDITFLAG_CAN_CUT = 1 << 2,
+  CM_EDITFLAG_CAN_COPY = 1 << 3,
+  CM_EDITFLAG_CAN_PASTE = 1 << 4,
+  CM_EDITFLAG_CAN_DELETE = 1 << 5,
+  CM_EDITFLAG_CAN_SELECT_ALL = 1 << 6,
+  CM_EDITFLAG_CAN_TRANSLATE = 1 << 7,
 } cef_context_menu_edit_state_flags_t;
 
 ///
@@ -1941,12 +1959,7 @@ typedef struct _cef_popup_features_t {
   int menuBarVisible;
   int statusBarVisible;
   int toolBarVisible;
-  int locationBarVisible;
   int scrollbarsVisible;
-  int resizable;
-
-  int fullscreen;
-  int dialog;
 } cef_popup_features_t;
 
 ///
@@ -2054,74 +2067,6 @@ typedef enum {
   FILE_DIALOG_HIDEREADONLY_FLAG = 0x02000000,
 } cef_file_dialog_mode_t;
 
-///
-// Geoposition error codes.
-///
-typedef enum {
-  GEOPOSITON_ERROR_NONE = 0,
-  GEOPOSITON_ERROR_PERMISSION_DENIED,
-  GEOPOSITON_ERROR_POSITION_UNAVAILABLE,
-  GEOPOSITON_ERROR_TIMEOUT,
-} cef_geoposition_error_code_t;
-
-///
-// Structure representing geoposition information. The properties of this
-// structure correspond to those of the JavaScript Position object although
-// their types may differ.
-///
-typedef struct _cef_geoposition_t {
-  ///
-  // Latitude in decimal degrees north (WGS84 coordinate frame).
-  ///
-  double latitude;
-
-  ///
-  // Longitude in decimal degrees west (WGS84 coordinate frame).
-  ///
-  double longitude;
-
-  ///
-  // Altitude in meters (above WGS84 datum).
-  ///
-  double altitude;
-
-  ///
-  // Accuracy of horizontal position in meters.
-  ///
-  double accuracy;
-
-  ///
-  // Accuracy of altitude in meters.
-  ///
-  double altitude_accuracy;
-
-  ///
-  // Heading in decimal degrees clockwise from true north.
-  ///
-  double heading;
-
-  ///
-  // Horizontal component of device velocity in meters per second.
-  ///
-  double speed;
-
-  ///
-  // Time of position measurement in milliseconds since Epoch in UTC time. This
-  // is taken from the host computer's system clock.
-  ///
-  cef_time_t timestamp;
-
-  ///
-  // Error code, see enum above.
-  ///
-  cef_geoposition_error_code_t error_code;
-
-  ///
-  // Human-readable error message.
-  ///
-  cef_string_t error_message;
-} cef_geoposition_t;
-
 ///
 // Print job color mode values.
 ///
@@ -2138,15 +2083,15 @@ typedef enum {
   COLOR_MODEL_RGB,
   COLOR_MODEL_RGB16,
   COLOR_MODEL_RGBA,
-  COLOR_MODEL_COLORMODE_COLOR,  // Used in samsung printer ppds.
-  COLOR_MODEL_COLORMODE_MONOCHROME,  // Used in samsung printer ppds.
-  COLOR_MODEL_HP_COLOR_COLOR,  // Used in HP color printer ppds.
-  COLOR_MODEL_HP_COLOR_BLACK,  // Used in HP color printer ppds.
-  COLOR_MODEL_PRINTOUTMODE_NORMAL,  // Used in foomatic ppds.
-  COLOR_MODEL_PRINTOUTMODE_NORMAL_GRAY,  // Used in foomatic ppds.
-  COLOR_MODEL_PROCESSCOLORMODEL_CMYK,  // Used in canon printer ppds.
+  COLOR_MODEL_COLORMODE_COLOR,              // Used in samsung printer ppds.
+  COLOR_MODEL_COLORMODE_MONOCHROME,         // Used in samsung printer ppds.
+  COLOR_MODEL_HP_COLOR_COLOR,               // Used in HP color printer ppds.
+  COLOR_MODEL_HP_COLOR_BLACK,               // Used in HP color printer ppds.
+  COLOR_MODEL_PRINTOUTMODE_NORMAL,          // Used in foomatic ppds.
+  COLOR_MODEL_PRINTOUTMODE_NORMAL_GRAY,     // Used in foomatic ppds.
+  COLOR_MODEL_PROCESSCOLORMODEL_CMYK,       // Used in canon printer ppds.
   COLOR_MODEL_PROCESSCOLORMODEL_GREYSCALE,  // Used in canon printer ppds.
-  COLOR_MODEL_PROCESSCOLORMODEL_RGB,  // Used in canon printer ppds
+  COLOR_MODEL_PROCESSCOLORMODEL_RGB,        // Used in canon printer ppds
 } cef_color_model_t;
 
 ///
@@ -2488,42 +2433,61 @@ typedef enum {
 // Policy for how the Referrer HTTP header value will be sent during navigation.
 // If the `--no-referrers` command-line flag is specified then the policy value
 // will be ignored and the Referrer value will never be sent.
+// Must be kept synchronized with net::URLRequest::ReferrerPolicy from Chromium.
 ///
 typedef enum {
   ///
-  // Always send the complete Referrer value.
+  // Clear the referrer header if the header value is HTTPS but the request
+  // destination is HTTP. This is the default behavior.
   ///
-  REFERRER_POLICY_ALWAYS,
+  REFERRER_POLICY_CLEAR_REFERRER_ON_TRANSITION_FROM_SECURE_TO_INSECURE,
+  REFERRER_POLICY_DEFAULT =
+      REFERRER_POLICY_CLEAR_REFERRER_ON_TRANSITION_FROM_SECURE_TO_INSECURE,
 
   ///
-  // Use the default policy. This is REFERRER_POLICY_ORIGIN_WHEN_CROSS_ORIGIN
-  // when the `--reduced-referrer-granularity` command-line flag is specified
-  // and REFERRER_POLICY_NO_REFERRER_WHEN_DOWNGRADE otherwise.
-  //
+  // A slight variant on CLEAR_REFERRER_ON_TRANSITION_FROM_SECURE_TO_INSECURE:
+  // If the request destination is HTTP, an HTTPS referrer will be cleared. If
+  // the request's destination is cross-origin with the referrer (but does not
+  // downgrade), the referrer's granularity will be stripped down to an origin
+  // rather than a full URL. Same-origin requests will send the full referrer.
   ///
-  REFERRER_POLICY_DEFAULT,
+  REFERRER_POLICY_REDUCE_REFERRER_GRANULARITY_ON_TRANSITION_CROSS_ORIGIN,
 
   ///
-  // When navigating from HTTPS to HTTP do not send the Referrer value.
-  // Otherwise, send the complete Referrer value.
+  // Strip the referrer down to an origin when the origin of the referrer is
+  // different from the destination's origin.
   ///
-  REFERRER_POLICY_NO_REFERRER_WHEN_DOWNGRADE,
+  REFERRER_POLICY_ORIGIN_ONLY_ON_TRANSITION_CROSS_ORIGIN,
 
   ///
-  // Never send the Referrer value.
+  // Never change the referrer.
   ///
-  REFERRER_POLICY_NEVER,
+  REFERRER_POLICY_NEVER_CLEAR_REFERRER,
 
   ///
-  // Only send the origin component of the Referrer value.
+  // Strip the referrer down to the origin regardless of the redirect location.
   ///
   REFERRER_POLICY_ORIGIN,
 
   ///
-  // When navigating cross-origin only send the origin component of the Referrer
-  // value. Otherwise, send the complete Referrer value.
+  // Clear the referrer when the request's referrer is cross-origin with the
+  // request's destination.
+  ///
+  REFERRER_POLICY_CLEAR_REFERRER_ON_TRANSITION_CROSS_ORIGIN,
+
   ///
-  REFERRER_POLICY_ORIGIN_WHEN_CROSS_ORIGIN,
+  // Strip the referrer down to the origin, but clear it entirely if the
+  // referrer value is HTTPS and the destination is HTTP.
+  ///
+  REFERRER_POLICY_ORIGIN_CLEAR_ON_TRANSITION_FROM_SECURE_TO_INSECURE,
+
+  ///
+  // Always clear the referrer regardless of the request destination.
+  ///
+  REFERRER_POLICY_NO_REFERRER,
+
+  // Always the last value in this enumeration.
+  REFERRER_POLICY_LAST_VALUE,
 } cef_referrer_policy_t;
 
 ///
@@ -2576,7 +2540,7 @@ typedef enum {
   // Transparency with pre-multiplied alpha component.
   ///
   CEF_ALPHA_TYPE_PREMULTIPLIED,
-  
+
   ///
   // Transparency with post-multiplied alpha component.
   ///
diff --git a/src/include/internal/cef_types_linux.h b/src/include/internal/cef_types_linux.h
index 865a9613..f5e1747e 100644
--- a/src/include/internal/cef_types_linux.h
+++ b/src/include/internal/cef_types_linux.h
@@ -27,7 +27,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 #ifndef CEF_INCLUDE_INTERNAL_CEF_TYPES_LINUX_H_
 #define CEF_INCLUDE_INTERNAL_CEF_TYPES_LINUX_H_
 #pragma once
@@ -92,17 +91,11 @@ typedef struct _cef_window_info_t {
   // monitor will be used and some functionality that requires a parent window
   // may not function correctly. In order to create windowless browsers the
   // CefSettings.windowless_rendering_enabled value must be set to true.
+  // Transparent painting is enabled by default but can be disabled by setting
+  // CefBrowserSettings.background_color to an opaque value.
   ///
   int windowless_rendering_enabled;
 
-  ///
-  // 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 window. Only used with windowed rendering.
   ///
diff --git a/src/include/internal/cef_types_mac.h b/src/include/internal/cef_types_mac.h
index 8947e258..3bd62d0e 100644
--- a/src/include/internal/cef_types_mac.h
+++ b/src/include/internal/cef_types_mac.h
@@ -27,7 +27,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 #ifndef CEF_INCLUDE_INTERNAL_CEF_TYPES_MAC_H_
 #define CEF_INCLUDE_INTERNAL_CEF_TYPES_MAC_H_
 #pragma once
@@ -102,17 +101,11 @@ typedef struct _cef_window_info_t {
   // monitor will be used and some functionality that requires a parent view
   // may not function correctly. In order to create windowless browsers the
   // CefSettings.windowless_rendering_enabled value must be set to true.
+  // Transparent painting is enabled by default but can be disabled by setting
+  // CefBrowserSettings.background_color to an opaque value.
   ///
   int windowless_rendering_enabled;
 
-  ///
-  // 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;
-
   ///
   // NSView pointer for the new browser view. Only used with windowed rendering.
   ///
diff --git a/src/include/internal/cef_types_win.h b/src/include/internal/cef_types_win.h
index 0c23a7e7..50a2ebfa 100644
--- a/src/include/internal/cef_types_win.h
+++ b/src/include/internal/cef_types_win.h
@@ -27,7 +27,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 #ifndef CEF_INCLUDE_INTERNAL_CEF_TYPES_WIN_H_
 #define CEF_INCLUDE_INTERNAL_CEF_TYPES_WIN_H_
 #pragma once
@@ -54,9 +53,7 @@ extern "C" {
 ///
 // Structure representing CefExecuteProcess arguments.
 ///
-typedef struct _cef_main_args_t {
-  HINSTANCE instance;
-} cef_main_args_t;
+typedef struct _cef_main_args_t { HINSTANCE instance; } cef_main_args_t;
 
 ///
 // Structure representing window information.
@@ -82,17 +79,11 @@ typedef struct _cef_window_info_t {
   // monitor will be used and some functionality that requires a parent window
   // may not function correctly. In order to create windowless browsers the
   // CefSettings.windowless_rendering_enabled value must be set to true.
+  // Transparent painting is enabled by default but can be disabled by setting
+  // CefBrowserSettings.background_color to an opaque value.
   ///
   int windowless_rendering_enabled;
 
-  ///
-  // 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;
-
   ///
   // Handle for the new browser window. Only used with windowed rendering.
   ///
diff --git a/src/include/internal/cef_types_wrappers.h b/src/include/internal/cef_types_wrappers.h
index 4108a933..147926e9 100644
--- a/src/include/internal/cef_types_wrappers.h
+++ b/src/include/internal/cef_types_wrappers.h
@@ -43,9 +43,7 @@ class CefStructBase : public traits::struct_type {
  public:
   typedef typename traits::struct_type struct_type;
 
-  CefStructBase() : attached_to_(NULL) {
-    Init();
-  }
+  CefStructBase() : attached_to_(NULL) { Init(); }
   virtual ~CefStructBase() {
     // Only clear this object's data if it isn't currently attached to a
     // structure.
@@ -57,7 +55,7 @@ class CefStructBase : public traits::struct_type {
     Init();
     *this = r;
   }
-  CefStructBase(const struct_type& r) {  // NOLINT(runtime/explicit)
+  CefStructBase(const struct_type& r) {
     Init();
     *this = r;
   }
@@ -133,15 +131,15 @@ class CefStructBase : public traits::struct_type {
   struct_type* attached_to_;
 };
 
-
 struct CefPointTraits {
   typedef cef_point_t struct_type;
 
   static inline void init(struct_type* s) {}
   static inline void clear(struct_type* s) {}
 
-  static inline void set(const struct_type* src, struct_type* target,
-      bool copy) {
+  static inline void set(const struct_type* src,
+                         struct_type* target,
+                         bool copy) {
     *target = *src;
   }
 };
@@ -154,16 +152,12 @@ class CefPoint : public CefStructBase<CefPointTraits> {
   typedef CefStructBase<CefPointTraits> parent;
 
   CefPoint() : parent() {}
-  CefPoint(const cef_point_t& r) : parent(r) {}  // NOLINT(runtime/explicit)
-  CefPoint(const CefPoint& r) : parent(r) {}  // NOLINT(runtime/explicit)
-  CefPoint(int x, int y) : parent() {
-    Set(x, y);
-  }
+  CefPoint(const cef_point_t& r) : parent(r) {}
+  CefPoint(const CefPoint& r) : parent(r) {}
+  CefPoint(int x, int y) : parent() { Set(x, y); }
 
   bool IsEmpty() const { return x <= 0 && y <= 0; }
-  void Set(int x_val, int y_val) {
-    x = x_val, y = y_val;
-  }
+  void Set(int x_val, int y_val) { x = x_val, y = y_val; }
 };
 
 inline bool operator==(const CefPoint& a, const CefPoint& b) {
@@ -174,15 +168,15 @@ inline bool operator!=(const CefPoint& a, const CefPoint& b) {
   return !(a == b);
 }
 
-
 struct CefRectTraits {
   typedef cef_rect_t struct_type;
 
   static inline void init(struct_type* s) {}
   static inline void clear(struct_type* s) {}
 
-  static inline void set(const struct_type* src, struct_type* target,
-      bool copy) {
+  static inline void set(const struct_type* src,
+                         struct_type* target,
+                         bool copy) {
     *target = *src;
   }
 };
@@ -195,8 +189,8 @@ class CefRect : public CefStructBase<CefRectTraits> {
   typedef CefStructBase<CefRectTraits> parent;
 
   CefRect() : parent() {}
-  CefRect(const cef_rect_t& r) : parent(r) {}  // NOLINT(runtime/explicit)
-  CefRect(const CefRect& r) : parent(r) {}  // NOLINT(runtime/explicit)
+  CefRect(const cef_rect_t& r) : parent(r) {}
+  CefRect(const CefRect& r) : parent(r) {}
   CefRect(int x, int y, int width, int height) : parent() {
     Set(x, y, width, height);
   }
@@ -226,15 +220,15 @@ inline bool operator!=(const CefRect& a, const CefRect& b) {
   return !(a == b);
 }
 
-
 struct CefSizeTraits {
   typedef cef_size_t struct_type;
 
   static inline void init(struct_type* s) {}
   static inline void clear(struct_type* s) {}
 
-  static inline void set(const struct_type* src, struct_type* target,
-      bool copy) {
+  static inline void set(const struct_type* src,
+                         struct_type* target,
+                         bool copy) {
     *target = *src;
   }
 };
@@ -247,11 +241,9 @@ class CefSize : public CefStructBase<CefSizeTraits> {
   typedef CefStructBase<CefSizeTraits> parent;
 
   CefSize() : parent() {}
-  CefSize(const cef_size_t& r) : parent(r) {}  // NOLINT(runtime/explicit)
-  CefSize(const CefSize& r) : parent(r) {}  // NOLINT(runtime/explicit)
-  CefSize(int width, int height) : parent() {
-    Set(width, height);
-  }
+  CefSize(const cef_size_t& r) : parent(r) {}
+  CefSize(const CefSize& r) : parent(r) {}
+  CefSize(int width, int height) : parent() { Set(width, height); }
 
   bool IsEmpty() const { return width <= 0 || height <= 0; }
   void Set(int width_val, int height_val) {
@@ -267,15 +259,15 @@ inline bool operator!=(const CefSize& a, const CefSize& b) {
   return !(a == b);
 }
 
-
 struct CefRangeTraits {
   typedef cef_range_t struct_type;
 
   static inline void init(struct_type* s) {}
   static inline void clear(struct_type* s) {}
 
-  static inline void set(const struct_type* src, struct_type* target,
-      bool copy) {
+  static inline void set(const struct_type* src,
+                         struct_type* target,
+                         bool copy) {
     *target = *src;
   }
 };
@@ -288,17 +280,11 @@ class CefRange : public CefStructBase<CefRangeTraits> {
   typedef CefStructBase<CefRangeTraits> parent;
 
   CefRange() : parent() {}
-  CefRange(const cef_range_t& r)  // NOLINT(runtime/explicit)
-      : parent(r) {}
-  CefRange(const CefRange& r)  // NOLINT(runtime/explicit)
-      : parent(r) {}
-  CefRange(int from, int to) : parent() {
-    Set(from, to);
-  }
+  CefRange(const cef_range_t& r) : parent(r) {}
+  CefRange(const CefRange& r) : parent(r) {}
+  CefRange(int from, int to) : parent() { Set(from, to); }
 
-  void Set(int from_val, int to_val) {
-    from = from_val, to = to_val;
-  }
+  void Set(int from_val, int to_val) { from = from_val, to = to_val; }
 };
 
 inline bool operator==(const CefRange& a, const CefRange& b) {
@@ -309,15 +295,15 @@ inline bool operator!=(const CefRange& a, const CefRange& b) {
   return !(a == b);
 }
 
-
 struct CefInsetsTraits {
   typedef cef_insets_t struct_type;
 
   static inline void init(struct_type* s) {}
   static inline void clear(struct_type* s) {}
 
-  static inline void set(const struct_type* src, struct_type* target,
-      bool copy) {
+  static inline void set(const struct_type* src,
+                         struct_type* target,
+                         bool copy) {
     *target = *src;
   }
 };
@@ -330,8 +316,8 @@ class CefInsets : public CefStructBase<CefInsetsTraits> {
   typedef CefStructBase<CefInsetsTraits> parent;
 
   CefInsets() : parent() {}
-  CefInsets(const cef_insets_t& r) : parent(r) {}  // NOLINT(runtime/explicit)
-  CefInsets(const CefInsets& r) : parent(r) {}  // NOLINT(runtime/explicit)
+  CefInsets(const cef_insets_t& r) : parent(r) {}
+  CefInsets(const CefInsets& r) : parent(r) {}
   CefInsets(int top, int left, int bottom, int right) : parent() {
     Set(top, left, bottom, right);
   }
@@ -350,15 +336,15 @@ inline bool operator!=(const CefInsets& a, const CefInsets& b) {
   return !(a == b);
 }
 
-
 struct CefDraggableRegionTraits {
   typedef cef_draggable_region_t struct_type;
 
   static inline void init(struct_type* s) {}
   static inline void clear(struct_type* s) {}
 
-  static inline void set(const struct_type* src, struct_type* target,
-      bool copy) {
+  static inline void set(const struct_type* src,
+                         struct_type* target,
+                         bool copy) {
     *target = *src;
   }
 };
@@ -371,10 +357,8 @@ class CefDraggableRegion : public CefStructBase<CefDraggableRegionTraits> {
   typedef CefStructBase<CefDraggableRegionTraits> parent;
 
   CefDraggableRegion() : parent() {}
-  CefDraggableRegion(const cef_draggable_region_t& r)  // NOLINT(runtime/explicit)
-    : parent(r) {}
-  CefDraggableRegion(const CefDraggableRegion& r)  // NOLINT(runtime/explicit)
-    : parent(r) {}
+  CefDraggableRegion(const cef_draggable_region_t& r) : parent(r) {}
+  CefDraggableRegion(const CefDraggableRegion& r) : parent(r) {}
   CefDraggableRegion(const CefRect& bounds, bool draggable) : parent() {
     Set(bounds, draggable);
   }
@@ -385,16 +369,15 @@ class CefDraggableRegion : public CefStructBase<CefDraggableRegionTraits> {
 };
 
 inline bool operator==(const CefDraggableRegion& a,
-    const CefDraggableRegion& b) {
+                       const CefDraggableRegion& b) {
   return a.bounds == b.bounds && a.draggable == b.draggable;
 }
 
 inline bool operator!=(const CefDraggableRegion& a,
-    const CefDraggableRegion& b) {
+                       const CefDraggableRegion& b) {
   return !(a == b);
 }
 
-
 struct CefScreenInfoTraits {
   typedef cef_screen_info_t struct_type;
 
@@ -402,8 +385,9 @@ struct CefScreenInfoTraits {
 
   static inline void clear(struct_type* s) {}
 
-  static inline void set(const struct_type* src, struct_type* target,
-      bool copy) {
+  static inline void set(const struct_type* src,
+                         struct_type* target,
+                         bool copy) {
     target->device_scale_factor = src->device_scale_factor;
     target->depth = src->depth;
     target->depth_per_component = src->depth_per_component;
@@ -422,16 +406,17 @@ class CefScreenInfo : public CefStructBase<CefScreenInfoTraits> {
   typedef CefStructBase<CefScreenInfoTraits> parent;
 
   CefScreenInfo() : parent() {}
-  CefScreenInfo(const cef_screen_info_t& r) : parent(r) {}  // NOLINT(runtime/explicit)
-  CefScreenInfo(const CefScreenInfo& r) : parent(r) {}  // NOLINT(runtime/explicit)
+  CefScreenInfo(const cef_screen_info_t& r) : parent(r) {}
+  CefScreenInfo(const CefScreenInfo& r) : parent(r) {}
   CefScreenInfo(float device_scale_factor,
                 int depth,
                 int depth_per_component,
                 bool is_monochrome,
                 const CefRect& rect,
-                const CefRect& available_rect) : parent() {
-    Set(device_scale_factor, depth, depth_per_component,
-        is_monochrome, rect, available_rect);
+                const CefRect& available_rect)
+      : parent() {
+    Set(device_scale_factor, depth, depth_per_component, is_monochrome, rect,
+        available_rect);
   }
 
   void Set(float device_scale_factor_val,
@@ -449,7 +434,6 @@ class CefScreenInfo : public CefStructBase<CefScreenInfoTraits> {
   }
 };
 
-
 struct CefKeyEventTraits {
   typedef cef_key_event_t struct_type;
 
@@ -457,8 +441,9 @@ struct CefKeyEventTraits {
 
   static inline void clear(struct_type* s) {}
 
-  static inline void set(const struct_type* src, struct_type* target,
-      bool copy) {
+  static inline void set(const struct_type* src,
+                         struct_type* target,
+                         bool copy) {
     target->type = src->type;
     target->modifiers = src->modifiers;
     target->windows_key_code = src->windows_key_code;
@@ -475,7 +460,6 @@ struct CefKeyEventTraits {
 ///
 typedef CefStructBase<CefKeyEventTraits> CefKeyEvent;
 
-
 struct CefMouseEventTraits {
   typedef cef_mouse_event_t struct_type;
 
@@ -483,8 +467,9 @@ struct CefMouseEventTraits {
 
   static inline void clear(struct_type* s) {}
 
-  static inline void set(const struct_type* src, struct_type* target,
-      bool copy) {
+  static inline void set(const struct_type* src,
+                         struct_type* target,
+                         bool copy) {
     target->x = src->x;
     target->y = src->y;
     target->modifiers = src->modifiers;
@@ -496,7 +481,6 @@ struct CefMouseEventTraits {
 ///
 typedef CefStructBase<CefMouseEventTraits> CefMouseEvent;
 
-
 struct CefPopupFeaturesTraits {
   typedef cef_popup_features_t struct_type;
 
@@ -504,15 +488,14 @@ struct CefPopupFeaturesTraits {
     s->menuBarVisible = true;
     s->statusBarVisible = true;
     s->toolBarVisible = true;
-    s->locationBarVisible = true;
     s->scrollbarsVisible = true;
-    s->resizable = true;
   }
 
   static inline void clear(struct_type* s) {}
 
-  static inline void set(const struct_type* src, struct_type* target,
-      bool copy) {
+  static inline void set(const struct_type* src,
+                         struct_type* target,
+                         bool copy) {
     target->x = src->x;
     target->xSet = src->xSet;
     target->y = src->y;
@@ -524,11 +507,7 @@ struct CefPopupFeaturesTraits {
     target->menuBarVisible = src->menuBarVisible;
     target->statusBarVisible = src->statusBarVisible;
     target->toolBarVisible = src->toolBarVisible;
-    target->locationBarVisible = src->locationBarVisible;
     target->scrollbarsVisible = src->scrollbarsVisible;
-    target->resizable = src->resizable;
-    target->fullscreen = src->fullscreen;
-    target->dialog = src->dialog;
   }
 };
 
@@ -537,13 +516,10 @@ struct CefPopupFeaturesTraits {
 ///
 typedef CefStructBase<CefPopupFeaturesTraits> CefPopupFeatures;
 
-
 struct CefSettingsTraits {
   typedef cef_settings_t struct_type;
 
-  static inline void init(struct_type* s) {
-    s->size = sizeof(struct_type);
-  }
+  static inline void init(struct_type* s) { s->size = sizeof(struct_type); }
 
   static inline void clear(struct_type* s) {
     cef_string_clear(&s->browser_subprocess_path);
@@ -560,55 +536,55 @@ struct CefSettingsTraits {
     cef_string_clear(&s->accept_language_list);
   }
 
-  static inline void set(const struct_type* src, struct_type* target,
-      bool copy) {
+  static inline void set(const struct_type* src,
+                         struct_type* target,
+                         bool copy) {
     target->single_process = src->single_process;
     target->no_sandbox = src->no_sandbox;
     cef_string_set(src->browser_subprocess_path.str,
-        src->browser_subprocess_path.length,
-        &target->browser_subprocess_path, copy);
-    cef_string_set(src->framework_dir_path.str,
-        src->framework_dir_path.length,
-        &target->framework_dir_path, copy);
+                   src->browser_subprocess_path.length,
+                   &target->browser_subprocess_path, copy);
+    cef_string_set(src->framework_dir_path.str, src->framework_dir_path.length,
+                   &target->framework_dir_path, copy);
     target->multi_threaded_message_loop = src->multi_threaded_message_loop;
     target->external_message_pump = src->external_message_pump;
     target->windowless_rendering_enabled = src->windowless_rendering_enabled;
     target->command_line_args_disabled = src->command_line_args_disabled;
 
     cef_string_set(src->cache_path.str, src->cache_path.length,
-        &target->cache_path, copy);
+                   &target->cache_path, copy);
     cef_string_set(src->user_data_path.str, src->user_data_path.length,
-        &target->user_data_path, copy);
+                   &target->user_data_path, copy);
     target->persist_session_cookies = src->persist_session_cookies;
     target->persist_user_preferences = src->persist_user_preferences;
 
     cef_string_set(src->user_agent.str, src->user_agent.length,
-        &target->user_agent, copy);
+                   &target->user_agent, copy);
     cef_string_set(src->product_version.str, src->product_version.length,
-        &target->product_version, copy);
+                   &target->product_version, copy);
     cef_string_set(src->locale.str, src->locale.length, &target->locale, copy);
 
     cef_string_set(src->log_file.str, src->log_file.length, &target->log_file,
-        copy);
+                   copy);
     target->log_severity = src->log_severity;
     cef_string_set(src->javascript_flags.str, src->javascript_flags.length,
-        &target->javascript_flags, copy);
+                   &target->javascript_flags, copy);
 
     cef_string_set(src->resources_dir_path.str, src->resources_dir_path.length,
-        &target->resources_dir_path, copy);
+                   &target->resources_dir_path, copy);
     cef_string_set(src->locales_dir_path.str, src->locales_dir_path.length,
-        &target->locales_dir_path, copy);
+                   &target->locales_dir_path, copy);
     target->pack_loading_disabled = src->pack_loading_disabled;
     target->remote_debugging_port = src->remote_debugging_port;
     target->uncaught_exception_stack_size = src->uncaught_exception_stack_size;
-    target->context_safety_implementation = src->context_safety_implementation;
     target->ignore_certificate_errors = src->ignore_certificate_errors;
     target->enable_net_security_expiration =
         src->enable_net_security_expiration;
     target->background_color = src->background_color;
 
     cef_string_set(src->accept_language_list.str,
-        src->accept_language_list.length, &target->accept_language_list, copy);
+                   src->accept_language_list.length,
+                   &target->accept_language_list, copy);
   }
 };
 
@@ -617,30 +593,29 @@ struct CefSettingsTraits {
 ///
 typedef CefStructBase<CefSettingsTraits> CefSettings;
 
-
 struct CefRequestContextSettingsTraits {
   typedef cef_request_context_settings_t struct_type;
 
-  static inline void init(struct_type* s) {
-    s->size = sizeof(struct_type);
-  }
+  static inline void init(struct_type* s) { s->size = sizeof(struct_type); }
 
   static inline void clear(struct_type* s) {
     cef_string_clear(&s->cache_path);
     cef_string_clear(&s->accept_language_list);
   }
 
-  static inline void set(const struct_type* src, struct_type* target,
-      bool copy) {
+  static inline void set(const struct_type* src,
+                         struct_type* target,
+                         bool copy) {
     cef_string_set(src->cache_path.str, src->cache_path.length,
-        &target->cache_path, copy);
+                   &target->cache_path, copy);
     target->persist_session_cookies = src->persist_session_cookies;
     target->persist_user_preferences = src->persist_user_preferences;
     target->ignore_certificate_errors = src->ignore_certificate_errors;
     target->enable_net_security_expiration =
         src->enable_net_security_expiration;
     cef_string_set(src->accept_language_list.str,
-        src->accept_language_list.length, &target->accept_language_list, copy);
+                   src->accept_language_list.length,
+                   &target->accept_language_list, copy);
   }
 };
 
@@ -650,13 +625,10 @@ struct CefRequestContextSettingsTraits {
 typedef CefStructBase<CefRequestContextSettingsTraits>
     CefRequestContextSettings;
 
-
 struct CefBrowserSettingsTraits {
   typedef cef_browser_settings_t struct_type;
 
-  static inline void init(struct_type* s) {
-    s->size = sizeof(struct_type);
-  }
+  static inline void init(struct_type* s) { s->size = sizeof(struct_type); }
 
   static inline void clear(struct_type* s) {
     cef_string_clear(&s->standard_font_family);
@@ -669,23 +641,27 @@ struct CefBrowserSettingsTraits {
     cef_string_clear(&s->accept_language_list);
   }
 
-  static inline void set(const struct_type* src, struct_type* target,
-      bool copy) {
+  static inline void set(const struct_type* src,
+                         struct_type* target,
+                         bool copy) {
     target->windowless_frame_rate = src->windowless_frame_rate;
 
     cef_string_set(src->standard_font_family.str,
-        src->standard_font_family.length, &target->standard_font_family, copy);
+                   src->standard_font_family.length,
+                   &target->standard_font_family, copy);
     cef_string_set(src->fixed_font_family.str, src->fixed_font_family.length,
-        &target->fixed_font_family, copy);
+                   &target->fixed_font_family, copy);
     cef_string_set(src->serif_font_family.str, src->serif_font_family.length,
-        &target->serif_font_family, copy);
+                   &target->serif_font_family, copy);
     cef_string_set(src->sans_serif_font_family.str,
-        src->sans_serif_font_family.length, &target->sans_serif_font_family,
-        copy);
+                   src->sans_serif_font_family.length,
+                   &target->sans_serif_font_family, copy);
     cef_string_set(src->cursive_font_family.str,
-        src->cursive_font_family.length, &target->cursive_font_family, copy);
+                   src->cursive_font_family.length,
+                   &target->cursive_font_family, copy);
     cef_string_set(src->fantasy_font_family.str,
-        src->fantasy_font_family.length, &target->fantasy_font_family, copy);
+                   src->fantasy_font_family.length,
+                   &target->fantasy_font_family, copy);
 
     target->default_font_size = src->default_font_size;
     target->default_fixed_font_size = src->default_fixed_font_size;
@@ -693,11 +669,10 @@ struct CefBrowserSettingsTraits {
     target->minimum_logical_font_size = src->minimum_logical_font_size;
 
     cef_string_set(src->default_encoding.str, src->default_encoding.length,
-        &target->default_encoding, copy);
+                   &target->default_encoding, copy);
 
     target->remote_fonts = src->remote_fonts;
     target->javascript = src->javascript;
-    target->javascript_open_windows = src->javascript_open_windows;
     target->javascript_close_windows = src->javascript_close_windows;
     target->javascript_access_clipboard = src->javascript_access_clipboard;
     target->javascript_dom_paste = src->javascript_dom_paste;
@@ -712,14 +687,15 @@ struct CefBrowserSettingsTraits {
     target->text_area_resize = src->text_area_resize;
     target->tab_to_links = src->tab_to_links;
     target->local_storage = src->local_storage;
-    target->databases= src->databases;
+    target->databases = src->databases;
     target->application_cache = src->application_cache;
     target->webgl = src->webgl;
 
     target->background_color = src->background_color;
 
     cef_string_set(src->accept_language_list.str,
-        src->accept_language_list.length, &target->accept_language_list, copy);
+                   src->accept_language_list.length,
+                   &target->accept_language_list, copy);
   }
 };
 
@@ -728,7 +704,6 @@ struct CefBrowserSettingsTraits {
 ///
 typedef CefStructBase<CefBrowserSettingsTraits> CefBrowserSettings;
 
-
 struct CefURLPartsTraits {
   typedef cef_urlparts_t struct_type;
 
@@ -746,14 +721,15 @@ struct CefURLPartsTraits {
     cef_string_clear(&s->query);
   }
 
-  static inline void set(const struct_type* src, struct_type* target,
-      bool copy) {
+  static inline void set(const struct_type* src,
+                         struct_type* target,
+                         bool copy) {
     cef_string_set(src->spec.str, src->spec.length, &target->spec, copy);
     cef_string_set(src->scheme.str, src->scheme.length, &target->scheme, copy);
     cef_string_set(src->username.str, src->username.length, &target->username,
-        copy);
+                   copy);
     cef_string_set(src->password.str, src->password.length, &target->password,
-        copy);
+                   copy);
     cef_string_set(src->host.str, src->host.length, &target->host, copy);
     cef_string_set(src->port.str, src->port.length, &target->port, copy);
     cef_string_set(src->origin.str, src->origin.length, &target->origin, copy);
@@ -767,7 +743,6 @@ struct CefURLPartsTraits {
 ///
 typedef CefStructBase<CefURLPartsTraits> CefURLParts;
 
-
 struct CefTimeTraits {
   typedef cef_time_t struct_type;
 
@@ -775,8 +750,9 @@ struct CefTimeTraits {
 
   static inline void clear(struct_type* s) {}
 
-  static inline void set(const struct_type* src, struct_type* target,
-      bool copy) {
+  static inline void set(const struct_type* src,
+                         struct_type* target,
+                         bool copy) {
     *target = *src;
   }
 };
@@ -789,15 +765,13 @@ class CefTime : public CefStructBase<CefTimeTraits> {
   typedef CefStructBase<CefTimeTraits> parent;
 
   CefTime() : parent() {}
-  CefTime(const cef_time_t& r) : parent(r) {}  // NOLINT(runtime/explicit)
-  CefTime(const CefTime& r) : parent(r) {}  // NOLINT(runtime/explicit)
+  CefTime(const cef_time_t& r) : parent(r) {}
+  CefTime(const CefTime& r) : parent(r) {}
   explicit CefTime(time_t r) : parent() { SetTimeT(r); }
   explicit CefTime(double r) : parent() { SetDoubleT(r); }
 
   // Converts to/from time_t.
-  void SetTimeT(time_t r) {
-    cef_time_from_timet(r, this);
-  }
+  void SetTimeT(time_t r) { cef_time_from_timet(r, this); }
   time_t GetTimeT() const {
     time_t time = 0;
     cef_time_to_timet(this, &time);
@@ -807,9 +781,7 @@ class CefTime : public CefStructBase<CefTimeTraits> {
   // Converts to/from a double which is the number of seconds since epoch
   // (Jan 1, 1970). Webkit uses this format to represent time. A value of 0
   // means "not initialized".
-  void SetDoubleT(double r) {
-    cef_time_from_doublet(r, this);
-  }
+  void SetDoubleT(double r) { cef_time_from_doublet(r, this); }
   double GetDoubleT() const {
     double time = 0;
     cef_time_to_doublet(this, &time);
@@ -817,9 +789,7 @@ class CefTime : public CefStructBase<CefTimeTraits> {
   }
 
   // Set this object to now.
-  void Now() {
-    cef_time_now(this);
-  }
+  void Now() { cef_time_now(this); }
 
   // Return the delta between this object and |other| in milliseconds.
   long long Delta(const CefTime& other) {
@@ -829,7 +799,6 @@ class CefTime : public CefStructBase<CefTimeTraits> {
   }
 };
 
-
 struct CefCookieTraits {
   typedef cef_cookie_t struct_type;
 
@@ -842,8 +811,9 @@ struct CefCookieTraits {
     cef_string_clear(&s->path);
   }
 
-  static inline void set(const struct_type* src, struct_type* target,
-      bool copy) {
+  static inline void set(const struct_type* src,
+                         struct_type* target,
+                         bool copy) {
     cef_string_set(src->name.str, src->name.length, &target->name, copy);
     cef_string_set(src->value.str, src->value.length, &target->value, copy);
     cef_string_set(src->domain.str, src->domain.length, &target->domain, copy);
@@ -862,38 +832,6 @@ struct CefCookieTraits {
 ///
 typedef CefStructBase<CefCookieTraits> CefCookie;
 
-
-struct CefGeopositionTraits {
-  typedef cef_geoposition_t struct_type;
-
-  static inline void init(struct_type* s) {}
-
-  static inline void clear(struct_type* s) {
-    cef_string_clear(&s->error_message);
-  }
-
-  static inline void set(const struct_type* src, struct_type* target,
-      bool copy) {
-    target->latitude = src->latitude;
-    target->longitude = src->longitude;
-    target->altitude = src->altitude;
-    target->accuracy = src->accuracy;
-    target->altitude_accuracy = src->altitude_accuracy;
-    target->heading = src->heading;
-    target->speed = src->speed;
-    target->timestamp = src->timestamp;
-    target->error_code = src->error_code;
-    cef_string_set(src->error_message.str, src->error_message.length,
-        &target->error_message, copy);
-  }
-};
-
-///
-// Class representing a geoposition.
-///
-typedef CefStructBase<CefGeopositionTraits> CefGeoposition;
-
-
 struct CefCursorInfoTraits {
   typedef cef_cursor_info_t struct_type;
 
@@ -901,8 +839,9 @@ struct CefCursorInfoTraits {
 
   static inline void clear(struct_type* s) {}
 
-  static inline void set(const struct_type* src, struct_type* target,
-      bool copy) {
+  static inline void set(const struct_type* src,
+                         struct_type* target,
+                         bool copy) {
     target->hotspot = src->hotspot;
     target->image_scale_factor = src->image_scale_factor;
     target->buffer = src->buffer;
@@ -915,7 +854,6 @@ struct CefCursorInfoTraits {
 ///
 typedef CefStructBase<CefCursorInfoTraits> CefCursorInfo;
 
-
 struct CefPdfPrintSettingsTraits {
   typedef cef_pdf_print_settings_t struct_type;
 
@@ -926,13 +864,14 @@ struct CefPdfPrintSettingsTraits {
     cef_string_clear(&s->header_footer_url);
   }
 
-  static inline void set(const struct_type* src, struct_type* target,
-      bool copy) {
-
+  static inline void set(const struct_type* src,
+                         struct_type* target,
+                         bool copy) {
     cef_string_set(src->header_footer_title.str,
-        src->header_footer_title.length, &target->header_footer_title, copy);
+                   src->header_footer_title.length,
+                   &target->header_footer_title, copy);
     cef_string_set(src->header_footer_url.str, src->header_footer_url.length,
-        &target->header_footer_url, copy);
+                   &target->header_footer_url, copy);
 
     target->page_width = src->page_width;
     target->page_height = src->page_height;
@@ -957,7 +896,6 @@ struct CefPdfPrintSettingsTraits {
 ///
 typedef CefStructBase<CefPdfPrintSettingsTraits> CefPdfPrintSettings;
 
-
 struct CefBoxLayoutSettingsTraits {
   typedef cef_box_layout_settings_t struct_type;
 
@@ -965,8 +903,9 @@ struct CefBoxLayoutSettingsTraits {
 
   static inline void clear(struct_type* s) {}
 
-  static inline void set(const struct_type* src, struct_type* target,
-      bool copy) {
+  static inline void set(const struct_type* src,
+                         struct_type* target,
+                         bool copy) {
     *target = *src;
   }
 };
@@ -987,10 +926,10 @@ struct CefCompositionUnderlineTraits {
     s->thick = 0;
   }
 
-  static inline void clear(struct_type* s) {
-  }
+  static inline void clear(struct_type* s) {}
 
-  static inline void set(const struct_type* src, struct_type* target,
+  static inline void set(const struct_type* src,
+                         struct_type* target,
                          bool copy) {
     target->range = src->range;
     target->color = src->color;
diff --git a/src/include/internal/cef_win.h b/src/include/internal/cef_win.h
index 9c20c481..8b30a4fe 100644
--- a/src/include/internal/cef_win.h
+++ b/src/include/internal/cef_win.h
@@ -27,7 +27,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 #ifndef CEF_INCLUDE_INTERNAL_CEF_WIN_H_
 #define CEF_INCLUDE_INTERNAL_CEF_WIN_H_
 #pragma once
@@ -48,8 +47,9 @@ struct CefMainArgsTraits {
   static inline void init(struct_type* s) {}
   static inline void clear(struct_type* s) {}
 
-  static inline void set(const struct_type* src, struct_type* target,
-      bool copy) {
+  static inline void set(const struct_type* src,
+                         struct_type* target,
+                         bool copy) {
     target->instance = src->instance;
   }
 };
@@ -62,9 +62,7 @@ class CefMainArgs : public CefStructBase<CefMainArgsTraits> {
   CefMainArgs() : parent() {}
   explicit CefMainArgs(const cef_main_args_t& r) : parent(r) {}
   explicit CefMainArgs(const CefMainArgs& r) : parent(r) {}
-  explicit CefMainArgs(HINSTANCE hInstance) : parent() {
-    instance = hInstance;
-  }
+  explicit CefMainArgs(HINSTANCE hInstance) : parent() { instance = hInstance; }
 };
 
 struct CefWindowInfoTraits {
@@ -76,11 +74,12 @@ struct CefWindowInfoTraits {
     cef_string_clear(&s->window_name);
   }
 
-  static inline void set(const struct_type* src, struct_type* target,
-      bool copy) {
+  static inline void set(const struct_type* src,
+                         struct_type* target,
+                         bool copy) {
     target->ex_style = src->ex_style;
     cef_string_set(src->window_name.str, src->window_name.length,
-        &target->window_name, copy);
+                   &target->window_name, copy);
     target->style = src->style;
     target->x = src->x;
     target->y = src->y;
@@ -88,7 +87,6 @@ struct CefWindowInfoTraits {
     target->height = src->height;
     target->parent_window = src->parent_window;
     target->menu = src->menu;
-    target->transparent_painting_enabled = src->transparent_painting_enabled;
     target->windowless_rendering_enabled = src->windowless_rendering_enabled;
     target->window = src->window;
   }
@@ -109,8 +107,8 @@ class CefWindowInfo : public CefStructBase<CefWindowInfoTraits> {
   // Create the browser as a child window.
   ///
   void SetAsChild(CefWindowHandle parent, RECT windowRect) {
-    style = WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_TABSTOP |
-            WS_VISIBLE;
+    style =
+        WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_TABSTOP | WS_VISIBLE;
     parent_window = parent;
     x = windowRect.left;
     y = windowRect.top;
@@ -122,8 +120,8 @@ class CefWindowInfo : public CefStructBase<CefWindowInfoTraits> {
   // Create the browser as a popup window.
   ///
   void SetAsPopup(CefWindowHandle parent, const CefString& windowName) {
-    style = WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN | WS_CLIPSIBLINGS |
-            WS_VISIBLE;
+    style =
+        WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_VISIBLE;
     parent_window = parent;
     x = CW_USEDEFAULT;
     y = CW_USEDEFAULT;
@@ -140,15 +138,14 @@ class CefWindowInfo : public CefStructBase<CefWindowInfoTraits> {
   // monitor info and to act as the parent window 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 window 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
+  // correctly. In order to create windowless browsers the
   // CefSettings.windowless_rendering_enabled value must be set to true.
+  // Transparent painting is enabled by default but can be disabled by setting
+  // CefBrowserSettings.background_color to an opaque value.
   ///
-  void SetAsWindowless(CefWindowHandle parent, bool transparent) {
+  void SetAsWindowless(CefWindowHandle parent) {
     windowless_rendering_enabled = TRUE;
     parent_window = parent;
-    transparent_painting_enabled = transparent;
   }
 };
 
diff --git a/src/include/cef_geolocation_handler.h b/src/include/test/cef_test_helpers.h
similarity index 50%
rename from src/include/cef_geolocation_handler.h
rename to src/include/test/cef_test_helpers.h
index b2a722ce..a4e45b8e 100644
--- a/src/include/cef_geolocation_handler.h
+++ b/src/include/test/cef_test_helpers.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2017 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
@@ -33,63 +33,29 @@
 // support the CEF translator tool. See the translator.README.txt file in the
 // tools directory for more information.
 //
+// THIS FILE IS FOR TESTING PURPOSES ONLY.
+//
+// The APIs defined in this file are for testing purposes only. They should only
+// be included from unit test targets.
+//
 
-#ifndef CEF_INCLUDE_CEF_GEOLOCATION_HANDLER_H_
-#define CEF_INCLUDE_CEF_GEOLOCATION_HANDLER_H_
+#ifndef CEF_INCLUDE_TEST_CEF_TEST_HELPERS_H_
+#define CEF_INCLUDE_TEST_CEF_TEST_HELPERS_H_
 #pragma once
 
-#include "include/cef_base.h"
-#include "include/cef_browser.h"
-
-///
-// Callback interface used for asynchronous continuation of geolocation
-// permission requests.
-///
-/*--cef(source=library)--*/
-class CefGeolocationCallback : public virtual CefBaseRefCounted {
- public:
-  ///
-  // Call to allow or deny geolocation access.
-  ///
-  /*--cef(capi_name=cont)--*/
-  virtual void Continue(bool allow) =0;
-};
+#if !defined(BUILDING_CEF_SHARED) && !defined(WRAPPING_CEF_SHARED) && \
+    !defined(UNIT_TEST)
+#error This file can be included for unit tests only
+#endif
 
+#include "include/cef_frame.h"
 
 ///
-// Implement this interface to handle events related to geolocation permission
-// requests. The methods of this class will be called on the browser process UI
-// thread.
+// Execute JavaScript with a user gesture to trigger functionality like
+// onbeforeunload handlers that will otherwise be blocked.
 ///
-/*--cef(source=client)--*/
-class CefGeolocationHandler : public virtual CefBaseRefCounted {
- public:
-  ///
-  // Called when a page requests permission to access geolocation information.
-  // |requesting_url| is the URL requesting permission and |request_id| is the
-  // unique ID for the permission request. Return true and call
-  // CefGeolocationCallback::Continue() either in this method or at a later
-  // time to continue or cancel the request. Return false to cancel the request
-  // immediately.
-  ///
-  /*--cef()--*/
-  virtual bool OnRequestGeolocationPermission(
-      CefRefPtr<CefBrowser> browser,
-      const CefString& requesting_url,
-      int request_id,
-      CefRefPtr<CefGeolocationCallback> callback) {
-    return false;
-  }
-
-  ///
-  // Called when a geolocation access request is canceled. |request_id| is the
-  // unique ID for the permission request.
-  ///
-  /*--cef()--*/
-  virtual void OnCancelGeolocationPermission(
-      CefRefPtr<CefBrowser> browser,
-      int request_id) {
-  }
-};
+/*--cef(optional_param=javascript)--*/
+void CefExecuteJavaScriptWithUserGestureForTests(CefRefPtr<CefFrame> frame,
+                                                 const CefString& javascript);
 
-#endif  // CEF_INCLUDE_CEF_GEOLOCATION_HANDLER_H_
+#endif  // CEF_INCLUDE_TEST_CEF_TEST_HELPERS_H_
diff --git a/src/include/test/cef_translator_test.h b/src/include/test/cef_translator_test.h
index 29d1da26..590b5a27 100644
--- a/src/include/test/cef_translator_test.h
+++ b/src/include/test/cef_translator_test.h
@@ -63,22 +63,22 @@ class CefTranslatorTestScopedLibrary;
 class CefTranslatorTestScopedLibraryChild;
 
 // Test values.
-#define TEST_INT_VAL      5
-#define TEST_INT_VAL2     60
-#define TEST_BOOL_VAL     true
-#define TEST_DOUBLE_VAL   4.543
-#define TEST_LONG_VAL     -65
-#define TEST_SIZET_VAL    3U
-#define TEST_STRING_VAL   "My test string"
-#define TEST_STRING_VAL2  "My 2nd test string"
-#define TEST_STRING_VAL3  "My 3rd test string"
-#define TEST_STRING_KEY   "key0"
-#define TEST_STRING_KEY2  "key1"
-#define TEST_STRING_KEY3  "key2"
-#define TEST_X_VAL        44
-#define TEST_Y_VAL        754
-#define TEST_X_VAL2       900
-#define TEST_Y_VAL2       300
+#define TEST_INT_VAL 5
+#define TEST_INT_VAL2 60
+#define TEST_BOOL_VAL true
+#define TEST_DOUBLE_VAL 4.543
+#define TEST_LONG_VAL -65
+#define TEST_SIZET_VAL 3U
+#define TEST_STRING_VAL "My test string"
+#define TEST_STRING_VAL2 "My 2nd test string"
+#define TEST_STRING_VAL3 "My 3rd test string"
+#define TEST_STRING_KEY "key0"
+#define TEST_STRING_KEY2 "key1"
+#define TEST_STRING_KEY3 "key2"
+#define TEST_X_VAL 44
+#define TEST_Y_VAL 754
+#define TEST_X_VAL2 900
+#define TEST_Y_VAL2 300
 
 ///
 // Class for testing all of the possible data transfer types.
@@ -92,81 +92,79 @@ class CefTranslatorTest : public CefBaseRefCounted {
   /*--cef()--*/
   static CefRefPtr<CefTranslatorTest> Create();
 
-
   // PRIMITIVE VALUES
 
   ///
   // Return a void value.
   ///
   /*--cef()--*/
-  virtual void GetVoid() =0;
+  virtual void GetVoid() = 0;
 
   ///
   // Return a bool value.
   ///
   /*--cef()--*/
-  virtual bool GetBool() =0;
+  virtual bool GetBool() = 0;
 
   ///
   // Return an int value.
   ///
   /*--cef()--*/
-  virtual int GetInt() =0;
+  virtual int GetInt() = 0;
 
   ///
   // Return a double value.
   ///
   /*--cef()--*/
-  virtual double GetDouble() =0;
+  virtual double GetDouble() = 0;
 
   ///
   // Return a long value.
   ///
   /*--cef()--*/
-  virtual long GetLong() =0;
+  virtual long GetLong() = 0;
 
   ///
   // Return a size_t value.
   ///
   /*--cef()--*/
-  virtual size_t GetSizet() =0;
+  virtual size_t GetSizet() = 0;
 
   ///
   // Set a void value.
   ///
   /*--cef()--*/
-  virtual bool SetVoid() =0;
+  virtual bool SetVoid() = 0;
 
   ///
   // Set a bool value.
   ///
   /*--cef()--*/
-  virtual bool SetBool(bool val) =0;
+  virtual bool SetBool(bool val) = 0;
 
   ///
   // Set an int value.
   ///
   /*--cef()--*/
-  virtual bool SetInt(int val) =0;
+  virtual bool SetInt(int val) = 0;
 
   ///
   // Set a double value.
   ///
   /*--cef()--*/
-  virtual bool SetDouble(double val) =0;
+  virtual bool SetDouble(double val) = 0;
 
   ///
   // Set a long value.
   ///
   /*--cef()--*/
-  virtual bool SetLong(long val) =0;
+  virtual bool SetLong(long val) = 0;
 
   ///
   // Set a size_t value.
   ///
   /*--cef()--*/
-  virtual bool SetSizet(size_t val) =0;
-
+  virtual bool SetSizet(size_t val) = 0;
 
   // PRIMITIVE LIST VALUES
 
@@ -177,13 +175,13 @@ class CefTranslatorTest : public CefBaseRefCounted {
   // Set a int list value.
   ///
   /*--cef()--*/
-  virtual bool SetIntList(const std::vector<int>& val) =0;
+  virtual bool SetIntList(const std::vector<int>& val) = 0;
 
   ///
   // Return an int list value by out-param.
   ///
   /*--cef(count_func=val:GetIntListSize)--*/
-  virtual bool GetIntListByRef(IntList& val) =0;
+  virtual bool GetIntListByRef(IntList& val) = 0;
 
   ///
   // Return the number of points that will be output above.
@@ -191,27 +189,25 @@ class CefTranslatorTest : public CefBaseRefCounted {
   /*--cef()--*/
   virtual size_t GetIntListSize() = 0;
 
-
   // STRING VALUES
 
   ///
   // Return a string value.
   ///
   /*--cef()--*/
-  virtual CefString GetString() =0;
+  virtual CefString GetString() = 0;
 
   ///
   // Set a string value.
   ///
   /*--cef()--*/
-  virtual bool SetString(const CefString& val) =0;
+  virtual bool SetString(const CefString& val) = 0;
 
   ///
   // Return a string value by out-param.
   ///
   /*--cef()--*/
-  virtual void GetStringByRef(CefString& val) =0;
-
+  virtual void GetStringByRef(CefString& val) = 0;
 
   // STRING LIST VALUES
 
@@ -222,14 +218,13 @@ class CefTranslatorTest : public CefBaseRefCounted {
   // Set a string list value.
   ///
   /*--cef()--*/
-  virtual bool SetStringList(const std::vector<CefString>& val) =0;
+  virtual bool SetStringList(const std::vector<CefString>& val) = 0;
 
   ///
   // Return a string list value by out-param.
   ///
   /*--cef()--*/
-  virtual bool GetStringListByRef(StringList& val) =0;
-
+  virtual bool GetStringListByRef(StringList& val) = 0;
 
   // STRING MAP VALUES
 
@@ -240,14 +235,13 @@ class CefTranslatorTest : public CefBaseRefCounted {
   // Set a string map value.
   ///
   /*--cef()--*/
-  virtual bool SetStringMap(const StringMap& val) =0;
+  virtual bool SetStringMap(const StringMap& val) = 0;
 
   ///
   // Return a string map value by out-param.
   ///
   /*--cef()--*/
-  virtual bool GetStringMapByRef(std::map<CefString, CefString>& val) =0;
-
+  virtual bool GetStringMapByRef(std::map<CefString, CefString>& val) = 0;
 
   // STRING MULTIMAP VALUES
 
@@ -259,14 +253,13 @@ class CefTranslatorTest : public CefBaseRefCounted {
   ///
   /*--cef()--*/
   virtual bool SetStringMultimap(
-      const std::multimap<CefString, CefString>& val) =0;
+      const std::multimap<CefString, CefString>& val) = 0;
 
   ///
   // Return a string multimap value by out-param.
   ///
   /*--cef()--*/
-  virtual bool GetStringMultimapByRef(StringMultimap& val) =0;
-
+  virtual bool GetStringMultimapByRef(StringMultimap& val) = 0;
 
   // STRUCT VALUES
 
@@ -274,20 +267,19 @@ class CefTranslatorTest : public CefBaseRefCounted {
   // Return a point value.
   ///
   /*--cef()--*/
-  virtual CefPoint GetPoint() =0;
+  virtual CefPoint GetPoint() = 0;
 
   ///
   // Set a point value.
   ///
   /*--cef()--*/
-  virtual bool SetPoint(const CefPoint& val) =0;
+  virtual bool SetPoint(const CefPoint& val) = 0;
 
   ///
   // Return a point value by out-param.
   ///
   /*--cef()--*/
-  virtual void GetPointByRef(CefPoint& val) =0;
-
+  virtual void GetPointByRef(CefPoint& val) = 0;
 
   // STRUCT LIST VALUES
 
@@ -298,13 +290,13 @@ class CefTranslatorTest : public CefBaseRefCounted {
   // Set a point list vlaue.
   ///
   /*--cef()--*/
-  virtual bool SetPointList(const std::vector<CefPoint>& val) =0;
+  virtual bool SetPointList(const std::vector<CefPoint>& val) = 0;
 
   ///
   // Return a point list value by out-param.
   ///
   /*--cef(count_func=val:GetPointListSize)--*/
-  virtual bool GetPointListByRef(PointList& val) =0;
+  virtual bool GetPointListByRef(PointList& val) = 0;
 
   ///
   // Return the number of points that will be output above.
@@ -312,7 +304,6 @@ class CefTranslatorTest : public CefBaseRefCounted {
   /*--cef()--*/
   virtual size_t GetPointListSize() = 0;
 
-
   // LIBRARY-SIDE REFPTR VALUES
 
   ///
@@ -320,7 +311,7 @@ class CefTranslatorTest : public CefBaseRefCounted {
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefTranslatorTestRefPtrLibrary> GetRefPtrLibrary(
-      int val) =0;
+      int val) = 0;
 
   ///
   // Set an object. Returns the value from
@@ -329,7 +320,7 @@ class CefTranslatorTest : public CefBaseRefCounted {
   ///
   /*--cef()--*/
   virtual int SetRefPtrLibrary(
-      CefRefPtr<CefTranslatorTestRefPtrLibrary> val) =0;
+      CefRefPtr<CefTranslatorTestRefPtrLibrary> val) = 0;
 
   ///
   // Set an object. Returns the object passed in. This tests input and output
@@ -337,7 +328,7 @@ class CefTranslatorTest : public CefBaseRefCounted {
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefTranslatorTestRefPtrLibrary> SetRefPtrLibraryAndReturn(
-      CefRefPtr<CefTranslatorTestRefPtrLibrary> val) =0;
+      CefRefPtr<CefTranslatorTestRefPtrLibrary> val) = 0;
 
   ///
   // Set a child object. Returns the value from
@@ -346,7 +337,7 @@ class CefTranslatorTest : public CefBaseRefCounted {
   ///
   /*--cef()--*/
   virtual int SetChildRefPtrLibrary(
-      CefRefPtr<CefTranslatorTestRefPtrLibraryChild> val) =0;
+      CefRefPtr<CefTranslatorTestRefPtrLibraryChild> val) = 0;
 
   ///
   // Set a child object. Returns the object as the parent type. This tests input
@@ -355,13 +346,12 @@ class CefTranslatorTest : public CefBaseRefCounted {
   /*--cef()--*/
   virtual CefRefPtr<CefTranslatorTestRefPtrLibrary>
   SetChildRefPtrLibraryAndReturnParent(
-      CefRefPtr<CefTranslatorTestRefPtrLibraryChild> val) =0;
-
+      CefRefPtr<CefTranslatorTestRefPtrLibraryChild> val) = 0;
 
   // LIBRARY-SIDE REFPTR LIST VALUES
 
   // Test both with and without a typedef.
-  typedef std::vector<CefRefPtr<CefTranslatorTestRefPtrLibrary> >
+  typedef std::vector<CefRefPtr<CefTranslatorTestRefPtrLibrary>>
       RefPtrLibraryList;
 
   ///
@@ -369,15 +359,17 @@ class CefTranslatorTest : public CefBaseRefCounted {
   ///
   /*--cef()--*/
   virtual bool SetRefPtrLibraryList(
-      const std::vector<CefRefPtr<CefTranslatorTestRefPtrLibrary> >& val,
-      int val1, int val2) =0;
+      const std::vector<CefRefPtr<CefTranslatorTestRefPtrLibrary>>& val,
+      int val1,
+      int val2) = 0;
 
   ///
   // Return an object list value by out-param.
   ///
   /*--cef(count_func=val:GetRefPtrLibraryListSize)--*/
-  virtual bool GetRefPtrLibraryListByRef(RefPtrLibraryList& val, int val1,
-                                         int val2) =0;
+  virtual bool GetRefPtrLibraryListByRef(RefPtrLibraryList& val,
+                                         int val1,
+                                         int val2) = 0;
 
   ///
   // Return the number of object that will be output above.
@@ -385,7 +377,6 @@ class CefTranslatorTest : public CefBaseRefCounted {
   /*--cef()--*/
   virtual size_t GetRefPtrLibraryListSize() = 0;
 
-
   // CLIENT-SIDE REFPTR VALUES
 
   ///
@@ -394,7 +385,7 @@ class CefTranslatorTest : public CefBaseRefCounted {
   // This tests input and execution of a client-side object type.
   ///
   /*--cef()--*/
-  virtual int SetRefPtrClient(CefRefPtr<CefTranslatorTestRefPtrClient> val) =0;
+  virtual int SetRefPtrClient(CefRefPtr<CefTranslatorTestRefPtrClient> val) = 0;
 
   ///
   // Set an object. Returns the handler passed in. This tests input and output
@@ -402,7 +393,7 @@ class CefTranslatorTest : public CefBaseRefCounted {
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefTranslatorTestRefPtrClient> SetRefPtrClientAndReturn(
-      CefRefPtr<CefTranslatorTestRefPtrClient> val) =0;
+      CefRefPtr<CefTranslatorTestRefPtrClient> val) = 0;
 
   ///
   // Set a child object. Returns the value from
@@ -411,7 +402,7 @@ class CefTranslatorTest : public CefBaseRefCounted {
   ///
   /*--cef()--*/
   virtual int SetChildRefPtrClient(
-      CefRefPtr<CefTranslatorTestRefPtrClientChild> val) =0;
+      CefRefPtr<CefTranslatorTestRefPtrClientChild> val) = 0;
 
   ///
   // Set a child object. Returns the object as the parent type. This tests
@@ -420,13 +411,12 @@ class CefTranslatorTest : public CefBaseRefCounted {
   /*--cef()--*/
   virtual CefRefPtr<CefTranslatorTestRefPtrClient>
   SetChildRefPtrClientAndReturnParent(
-      CefRefPtr<CefTranslatorTestRefPtrClientChild> val) =0;
-
+      CefRefPtr<CefTranslatorTestRefPtrClientChild> val) = 0;
 
   // CLIENT-SIDE REFPTR LIST VALUES
 
   // Test both with and without a typedef.
-  typedef std::vector<CefRefPtr<CefTranslatorTestRefPtrClient> >
+  typedef std::vector<CefRefPtr<CefTranslatorTestRefPtrClient>>
       RefPtrClientList;
 
   ///
@@ -434,8 +424,9 @@ class CefTranslatorTest : public CefBaseRefCounted {
   ///
   /*--cef()--*/
   virtual bool SetRefPtrClientList(
-      const std::vector<CefRefPtr<CefTranslatorTestRefPtrClient> >& val,
-      int val1, int val2) =0;
+      const std::vector<CefRefPtr<CefTranslatorTestRefPtrClient>>& val,
+      int val1,
+      int val2) = 0;
 
   ///
   // Return an object list value by out-param.
@@ -444,7 +435,7 @@ class CefTranslatorTest : public CefBaseRefCounted {
   virtual bool GetRefPtrClientListByRef(
       RefPtrClientList& val,
       CefRefPtr<CefTranslatorTestRefPtrClient> val1,
-      CefRefPtr<CefTranslatorTestRefPtrClient> val2) =0;
+      CefRefPtr<CefTranslatorTestRefPtrClient> val2) = 0;
 
   ///
   // Return the number of object that will be output above.
@@ -452,7 +443,6 @@ class CefTranslatorTest : public CefBaseRefCounted {
   /*--cef()--*/
   virtual size_t GetRefPtrClientListSize() = 0;
 
-
   // LIBRARY-SIDE OWNPTR VALUES
 
   ///
@@ -460,7 +450,7 @@ class CefTranslatorTest : public CefBaseRefCounted {
   ///
   /*--cef()--*/
   virtual CefOwnPtr<CefTranslatorTestScopedLibrary> GetOwnPtrLibrary(
-      int val) =0;
+      int val) = 0;
 
   ///
   // Set an object. Returns the value from
@@ -469,7 +459,7 @@ class CefTranslatorTest : public CefBaseRefCounted {
   ///
   /*--cef()--*/
   virtual int SetOwnPtrLibrary(
-      CefOwnPtr<CefTranslatorTestScopedLibrary> val) =0;
+      CefOwnPtr<CefTranslatorTestScopedLibrary> val) = 0;
 
   ///
   // Set an object. Returns the object passed in. This tests input and output
@@ -477,7 +467,7 @@ class CefTranslatorTest : public CefBaseRefCounted {
   ///
   /*--cef()--*/
   virtual CefOwnPtr<CefTranslatorTestScopedLibrary> SetOwnPtrLibraryAndReturn(
-      CefOwnPtr<CefTranslatorTestScopedLibrary> val) =0;
+      CefOwnPtr<CefTranslatorTestScopedLibrary> val) = 0;
 
   ///
   // Set a child object. Returns the value from
@@ -486,7 +476,7 @@ class CefTranslatorTest : public CefBaseRefCounted {
   ///
   /*--cef()--*/
   virtual int SetChildOwnPtrLibrary(
-      CefOwnPtr<CefTranslatorTestScopedLibraryChild> val) =0;
+      CefOwnPtr<CefTranslatorTestScopedLibraryChild> val) = 0;
 
   ///
   // Set a child object. Returns the object as the parent type. This tests input
@@ -495,8 +485,7 @@ class CefTranslatorTest : public CefBaseRefCounted {
   /*--cef()--*/
   virtual CefOwnPtr<CefTranslatorTestScopedLibrary>
   SetChildOwnPtrLibraryAndReturnParent(
-      CefOwnPtr<CefTranslatorTestScopedLibraryChild> val) =0;
-
+      CefOwnPtr<CefTranslatorTestScopedLibraryChild> val) = 0;
 
   // CLIENT-SIDE OWNPTR VALUES
 
@@ -506,7 +495,7 @@ class CefTranslatorTest : public CefBaseRefCounted {
   // This tests input and execution of a client-side object type.
   ///
   /*--cef()--*/
-  virtual int SetOwnPtrClient(CefOwnPtr<CefTranslatorTestScopedClient> val) =0;
+  virtual int SetOwnPtrClient(CefOwnPtr<CefTranslatorTestScopedClient> val) = 0;
 
   ///
   // Set an object. Returns the handler passed in. This tests input and output
@@ -514,7 +503,7 @@ class CefTranslatorTest : public CefBaseRefCounted {
   ///
   /*--cef()--*/
   virtual CefOwnPtr<CefTranslatorTestScopedClient> SetOwnPtrClientAndReturn(
-      CefOwnPtr<CefTranslatorTestScopedClient> val) =0;
+      CefOwnPtr<CefTranslatorTestScopedClient> val) = 0;
 
   ///
   // Set a child object. Returns the value from
@@ -523,7 +512,7 @@ class CefTranslatorTest : public CefBaseRefCounted {
   ///
   /*--cef()--*/
   virtual int SetChildOwnPtrClient(
-      CefOwnPtr<CefTranslatorTestScopedClientChild> val) =0;
+      CefOwnPtr<CefTranslatorTestScopedClientChild> val) = 0;
 
   ///
   // Set a child object. Returns the object as the parent type. This tests
@@ -532,8 +521,7 @@ class CefTranslatorTest : public CefBaseRefCounted {
   /*--cef()--*/
   virtual CefOwnPtr<CefTranslatorTestScopedClient>
   SetChildOwnPtrClientAndReturnParent(
-      CefOwnPtr<CefTranslatorTestScopedClientChild> val) =0;
-
+      CefOwnPtr<CefTranslatorTestScopedClientChild> val) = 0;
 
   // LIBRARY-SIDE RAWPTR VALUES
 
@@ -544,7 +532,7 @@ class CefTranslatorTest : public CefBaseRefCounted {
   ///
   /*--cef()--*/
   virtual int SetRawPtrLibrary(
-      CefRawPtr<CefTranslatorTestScopedLibrary> val) =0;
+      CefRawPtr<CefTranslatorTestScopedLibrary> val) = 0;
 
   ///
   // Set a child object. Returns the value from
@@ -553,13 +541,12 @@ class CefTranslatorTest : public CefBaseRefCounted {
   ///
   /*--cef()--*/
   virtual int SetChildRawPtrLibrary(
-      CefRawPtr<CefTranslatorTestScopedLibraryChild> val) =0;
-
+      CefRawPtr<CefTranslatorTestScopedLibraryChild> val) = 0;
 
   // LIBRARY-SIDE RAWPTR LIST VALUES
 
   // Test both with and without a typedef.
-  typedef std::vector<CefRawPtr<CefTranslatorTestScopedLibrary> >
+  typedef std::vector<CefRawPtr<CefTranslatorTestScopedLibrary>>
       RawPtrLibraryList;
 
   ///
@@ -567,9 +554,9 @@ class CefTranslatorTest : public CefBaseRefCounted {
   ///
   /*--cef()--*/
   virtual bool SetRawPtrLibraryList(
-      const std::vector<CefRawPtr<CefTranslatorTestScopedLibrary> >& val,
-      int val1, int val2) =0;
-
+      const std::vector<CefRawPtr<CefTranslatorTestScopedLibrary>>& val,
+      int val1,
+      int val2) = 0;
 
   // CLIENT-SIDE RAWPTR VALUES
 
@@ -579,7 +566,7 @@ class CefTranslatorTest : public CefBaseRefCounted {
   // This tests input and execution of a client-side object type.
   ///
   /*--cef()--*/
-  virtual int SetRawPtrClient(CefRawPtr<CefTranslatorTestScopedClient> val) =0;
+  virtual int SetRawPtrClient(CefRawPtr<CefTranslatorTestScopedClient> val) = 0;
 
   ///
   // Set a child object. Returns the value from
@@ -588,13 +575,12 @@ class CefTranslatorTest : public CefBaseRefCounted {
   ///
   /*--cef()--*/
   virtual int SetChildRawPtrClient(
-      CefRawPtr<CefTranslatorTestScopedClientChild> val) =0;
-
+      CefRawPtr<CefTranslatorTestScopedClientChild> val) = 0;
 
   // CLIENT-SIDE RAWPTR LIST VALUES
 
   // Test both with and without a typedef.
-  typedef std::vector<CefRawPtr<CefTranslatorTestScopedClient> >
+  typedef std::vector<CefRawPtr<CefTranslatorTestScopedClient>>
       RawPtrClientList;
 
   ///
@@ -602,11 +588,11 @@ class CefTranslatorTest : public CefBaseRefCounted {
   ///
   /*--cef()--*/
   virtual bool SetRawPtrClientList(
-      const std::vector<CefRawPtr<CefTranslatorTestScopedClient> >& val,
-      int val1, int val2) =0;
+      const std::vector<CefRawPtr<CefTranslatorTestScopedClient>>& val,
+      int val1,
+      int val2) = 0;
 };
 
-
 ///
 // Library-side test object for RefPtr.
 ///
@@ -623,70 +609,67 @@ class CefTranslatorTestRefPtrLibrary : public CefBaseRefCounted {
   // Return a value.
   ///
   /*--cef()--*/
-  virtual int GetValue() =0;
+  virtual int GetValue() = 0;
 
   ///
   // Set a value.
   ///
   /*--cef()--*/
-  virtual void SetValue(int value) =0;
+  virtual void SetValue(int value) = 0;
 };
 
 ///
 // Library-side child test object for RefPtr.
 ///
 /*--cef(source=library)--*/
-class CefTranslatorTestRefPtrLibraryChild :
-    public CefTranslatorTestRefPtrLibrary {
+class CefTranslatorTestRefPtrLibraryChild
+    : public CefTranslatorTestRefPtrLibrary {
  public:
   ///
   // Create the test object.
   ///
   /*--cef()--*/
-  static CefRefPtr<CefTranslatorTestRefPtrLibraryChild> Create(
-      int value,
-      int other_value);
+  static CefRefPtr<CefTranslatorTestRefPtrLibraryChild> Create(int value,
+                                                               int other_value);
 
   ///
   // Return a value.
   ///
   /*--cef()--*/
-  virtual int GetOtherValue() =0;
+  virtual int GetOtherValue() = 0;
 
   ///
   // Set a value.
   ///
   /*--cef()--*/
-  virtual void SetOtherValue(int value) =0;
+  virtual void SetOtherValue(int value) = 0;
 };
 
 ///
 // Another library-side child test object for RefPtr.
 ///
 /*--cef(source=library)--*/
-class CefTranslatorTestRefPtrLibraryChildChild :
-    public CefTranslatorTestRefPtrLibraryChild {
+class CefTranslatorTestRefPtrLibraryChildChild
+    : public CefTranslatorTestRefPtrLibraryChild {
  public:
   ///
   // Create the test object.
   ///
   /*--cef()--*/
-  static CefRefPtr<CefTranslatorTestRefPtrLibraryChildChild> Create(
-      int value,
-      int other_value,
-      int other_other_value);
+  static CefRefPtr<CefTranslatorTestRefPtrLibraryChildChild>
+  Create(int value, int other_value, int other_other_value);
 
   ///
   // Return a value.
   ///
   /*--cef()--*/
-  virtual int GetOtherOtherValue() =0;
+  virtual int GetOtherOtherValue() = 0;
 
   ///
   // Set a value.
   ///
   /*--cef()--*/
-  virtual void SetOtherOtherValue(int value) =0;
+  virtual void SetOtherOtherValue(int value) = 0;
 };
 
 ///
@@ -699,24 +682,23 @@ class CefTranslatorTestRefPtrClient : public virtual CefBaseRefCounted {
   // Return a value.
   ///
   /*--cef()--*/
-  virtual int GetValue() =0;
+  virtual int GetValue() = 0;
 };
 
 ///
 // Client-side child test object for RefPtr.
 ///
 /*--cef(source=client)--*/
-class CefTranslatorTestRefPtrClientChild :
-    public CefTranslatorTestRefPtrClient {
+class CefTranslatorTestRefPtrClientChild
+    : public CefTranslatorTestRefPtrClient {
  public:
   ///
   // Return a value.
   ///
   /*--cef()--*/
-  virtual int GetOtherValue() =0;
+  virtual int GetOtherValue() = 0;
 };
 
-
 ///
 // Library-side test object for OwnPtr/RawPtr.
 ///
@@ -733,70 +715,67 @@ class CefTranslatorTestScopedLibrary : public CefBaseScoped {
   // Return a value.
   ///
   /*--cef()--*/
-  virtual int GetValue() =0;
+  virtual int GetValue() = 0;
 
   ///
   // Set a value.
   ///
   /*--cef()--*/
-  virtual void SetValue(int value) =0;
+  virtual void SetValue(int value) = 0;
 };
 
 ///
 // Library-side child test object for OwnPtr/RawPtr.
 ///
 /*--cef(source=library)--*/
-class CefTranslatorTestScopedLibraryChild :
-    public CefTranslatorTestScopedLibrary {
+class CefTranslatorTestScopedLibraryChild
+    : public CefTranslatorTestScopedLibrary {
  public:
   ///
   // Create the test object.
   ///
   /*--cef()--*/
-  static CefOwnPtr<CefTranslatorTestScopedLibraryChild> Create(
-      int value,
-      int other_value);
+  static CefOwnPtr<CefTranslatorTestScopedLibraryChild> Create(int value,
+                                                               int other_value);
 
   ///
   // Return a value.
   ///
   /*--cef()--*/
-  virtual int GetOtherValue() =0;
+  virtual int GetOtherValue() = 0;
 
   ///
   // Set a value.
   ///
   /*--cef()--*/
-  virtual void SetOtherValue(int value) =0;
+  virtual void SetOtherValue(int value) = 0;
 };
 
 ///
 // Another library-side child test object for OwnPtr/RawPtr.
 ///
 /*--cef(source=library)--*/
-class CefTranslatorTestScopedLibraryChildChild :
-    public CefTranslatorTestScopedLibraryChild {
+class CefTranslatorTestScopedLibraryChildChild
+    : public CefTranslatorTestScopedLibraryChild {
  public:
   ///
   // Create the test object.
   ///
   /*--cef()--*/
-  static CefOwnPtr<CefTranslatorTestScopedLibraryChildChild> Create(
-      int value,
-      int other_value,
-      int other_other_value);
+  static CefOwnPtr<CefTranslatorTestScopedLibraryChildChild>
+  Create(int value, int other_value, int other_other_value);
 
   ///
   // Return a value.
   ///
   /*--cef()--*/
-  virtual int GetOtherOtherValue() =0;
+  virtual int GetOtherOtherValue() = 0;
 
   ///
   // Set a value.
   ///
   /*--cef()--*/
-  virtual void SetOtherOtherValue(int value) =0;
+  virtual void SetOtherOtherValue(int value) = 0;
 };
 
 ///
@@ -809,21 +788,21 @@ class CefTranslatorTestScopedClient : public virtual CefBaseScoped {
   // Return a value.
   ///
   /*--cef()--*/
-  virtual int GetValue() =0;
+  virtual int GetValue() = 0;
 };
 
 ///
 // Client-side child test object for OwnPtr/RawPtr.
 ///
 /*--cef(source=client)--*/
-class CefTranslatorTestScopedClientChild :
-    public CefTranslatorTestScopedClient {
+class CefTranslatorTestScopedClientChild
+    : public CefTranslatorTestScopedClient {
  public:
   ///
   // Return a value.
   ///
   /*--cef()--*/
-  virtual int GetOtherValue() =0;
+  virtual int GetOtherValue() = 0;
 };
 
 #endif  // CEF_INCLUDE_TEST_CEF_TEST_H_
diff --git a/src/include/views/cef_box_layout.h b/src/include/views/cef_box_layout.h
index 3cf7a554..74989190 100644
--- a/src/include/views/cef_box_layout.h
+++ b/src/include/views/cef_box_layout.h
@@ -61,14 +61,14 @@ class CefBoxLayout : public CefLayout {
   // not resized. Flex values must not be negative.
   ///
   /*--cef()--*/
-  virtual void SetFlexForView(CefRefPtr<CefView> view, int flex) =0;
+  virtual void SetFlexForView(CefRefPtr<CefView> view, int flex) = 0;
 
   ///
   // Clears the flex for the given |view|, causing it to use the default flex
   // specified via CefBoxLayoutSettings.default_flex.
   ///
   /*--cef()--*/
-  virtual void ClearFlexForView(CefRefPtr<CefView> view) =0;
+  virtual void ClearFlexForView(CefRefPtr<CefView> view) = 0;
 };
 
 #endif  // CEF_INCLUDE_VIEWS_CEF_BOX_LAYOUT_H_
diff --git a/src/include/views/cef_browser_view.h b/src/include/views/cef_browser_view.h
index db622d4d..5d6cb568 100644
--- a/src/include/views/cef_browser_view.h
+++ b/src/include/views/cef_browser_view.h
@@ -73,7 +73,7 @@ class CefBrowserView : public CefView {
   // browser has not yet been created or has already been destroyed.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefBrowser> GetBrowser() =0;
+  virtual CefRefPtr<CefBrowser> GetBrowser() = 0;
 
   ///
   // Sets whether accelerators registered with CefWindow::SetAccelerator are
@@ -85,7 +85,7 @@ class CefBrowserView : public CefView {
   // CefKeyboardHandler. The default value is false.
   ///
   /*--cef()--*/
-  virtual void SetPreferAccelerators(bool prefer_accelerators) =0;
+  virtual void SetPreferAccelerators(bool prefer_accelerators) = 0;
 };
 
 #endif  // CEF_INCLUDE_VIEWS_CEF_BROWSER_VIEW_H_
diff --git a/src/include/views/cef_button.h b/src/include/views/cef_button.h
index db3db7d6..039446ba 100644
--- a/src/include/views/cef_button.h
+++ b/src/include/views/cef_button.h
@@ -54,38 +54,38 @@ class CefButton : public CefView {
   // Returns this Button as a LabelButton or NULL if this is not a LabelButton.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefLabelButton> AsLabelButton() =0;
+  virtual CefRefPtr<CefLabelButton> AsLabelButton() = 0;
 
   ///
   // Sets the current display state of the Button.
   ///
   /*--cef()--*/
-  virtual void SetState(cef_button_state_t state) =0;
+  virtual void SetState(cef_button_state_t state) = 0;
 
   ///
   // Returns the current display state of the Button.
   ///
   /*--cef(default_retval=CEF_BUTTON_STATE_NORMAL)--*/
-  virtual cef_button_state_t GetState() =0;
+  virtual cef_button_state_t GetState() = 0;
 
   ///
   // Sets the Button will use an ink drop effect for displaying state changes.
   ///
   /*--cef()--*/
-  virtual void SetInkDropEnabled(bool enabled) =0;
+  virtual void SetInkDropEnabled(bool enabled) = 0;
 
   ///
   // Sets the tooltip text that will be displayed when the user hovers the mouse
   // cursor over the Button.
   ///
   /*--cef()--*/
-  virtual void SetTooltipText(const CefString& tooltip_text) =0;
+  virtual void SetTooltipText(const CefString& tooltip_text) = 0;
 
   ///
   // Sets the accessible name that will be exposed to assistive technology (AT).
   ///
   /*--cef()--*/
-  virtual void SetAccessibleName(const CefString& name) =0;
+  virtual void SetAccessibleName(const CefString& name) = 0;
 };
 
 #endif  // CEF_INCLUDE_VIEWS_CEF_BUTTON_H_
diff --git a/src/include/views/cef_button_delegate.h b/src/include/views/cef_button_delegate.h
index ec33d9be..77e77393 100644
--- a/src/include/views/cef_button_delegate.h
+++ b/src/include/views/cef_button_delegate.h
@@ -53,13 +53,13 @@ class CefButtonDelegate : public CefViewDelegate {
   // Called when |button| is pressed.
   ///
   /*--cef()--*/
-  virtual void OnButtonPressed(CefRefPtr<CefButton> button) =0;
+  virtual void OnButtonPressed(CefRefPtr<CefButton> button) = 0;
 
   ///
   // Called when the state of |button| changes.
   ///
   /*--cef()--*/
-  virtual void OnButtonStateChanged(CefRefPtr<CefButton> button) {};
+  virtual void OnButtonStateChanged(CefRefPtr<CefButton> button){};
 };
 
 #endif  // CEF_INCLUDE_VIEWS_CEF_BUTTON_DELEGATE_H_
diff --git a/src/include/views/cef_display.h b/src/include/views/cef_display.h
index e3a84561..de3e7ab8 100644
--- a/src/include/views/cef_display.h
+++ b/src/include/views/cef_display.h
@@ -90,13 +90,13 @@ class CefDisplay : public CefBaseRefCounted {
   // intended to return distinct, usable displays.
   ///
   /*--cef(count_func=displays:GetDisplayCount)--*/
-  static void GetAllDisplays(std::vector<CefRefPtr<CefDisplay> >& displays);
+  static void GetAllDisplays(std::vector<CefRefPtr<CefDisplay>>& displays);
 
   ///
   // Returns the unique identifier for this Display.
   ///
   /*--cef()--*/
-  virtual int64 GetID() =0;
+  virtual int64 GetID() = 0;
 
   ///
   // Returns this Display's device pixel scale factor. This specifies how much
@@ -105,40 +105,40 @@ class CefDisplay : public CefBaseRefCounted {
   // differ by platform.
   ///
   /*--cef()--*/
-  virtual float GetDeviceScaleFactor() =0;
+  virtual float GetDeviceScaleFactor() = 0;
 
   ///
   // Convert |point| from density independent pixels (DIP) to pixel coordinates
   // using this Display's device scale factor.
   ///
   /*--cef()--*/
-  virtual void ConvertPointToPixels(CefPoint& point) =0;
+  virtual void ConvertPointToPixels(CefPoint& point) = 0;
 
   ///
   // Convert |point| from pixel coordinates to density independent pixels (DIP)
   // using this Display's device scale factor.
   ///
   /*--cef()--*/
-  virtual void ConvertPointFromPixels(CefPoint& point) =0;
+  virtual void ConvertPointFromPixels(CefPoint& point) = 0;
 
   ///
   // Returns this Display's bounds. This is the full size of the display.
   ///
   /*--cef()--*/
-  virtual CefRect GetBounds() =0;
+  virtual CefRect GetBounds() = 0;
 
   ///
   // Returns this Display's work area. This excludes areas of the display that
   // are occupied for window manager toolbars, etc.
   ///
   /*--cef()--*/
-  virtual CefRect GetWorkArea() =0;
+  virtual CefRect GetWorkArea() = 0;
 
   ///
   // Returns this Display's rotation in degrees.
   ///
   /*--cef()--*/
-  virtual int GetRotation() =0;
+  virtual int GetRotation() = 0;
 };
 
 #endif  // CEF_INCLUDE_VIEWS_CEF_DISPLAY_H_
diff --git a/src/include/views/cef_fill_layout.h b/src/include/views/cef_fill_layout.h
index 470fefc6..a412f631 100644
--- a/src/include/views/cef_fill_layout.h
+++ b/src/include/views/cef_fill_layout.h
@@ -46,7 +46,6 @@
 // UI thread unless otherwise indicated.
 ///
 /*--cef(source=library)--*/
-class CefFillLayout : public CefLayout {
-};
+class CefFillLayout : public CefLayout {};
 
 #endif  // CEF_INCLUDE_VIEWS_CEF_FILL_LAYOUT_H_
diff --git a/src/include/views/cef_label_button.h b/src/include/views/cef_label_button.h
index 1447b98a..da840025 100644
--- a/src/include/views/cef_label_button.h
+++ b/src/include/views/cef_label_button.h
@@ -71,20 +71,20 @@ class CefLabelButton : public CefButton {
   // MenuButton.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefMenuButton> AsMenuButton() =0;
+  virtual CefRefPtr<CefMenuButton> AsMenuButton() = 0;
 
   ///
   // Sets the text shown on the LabelButton. By default |text| will also be used
   // as the accessible name.
   ///
   /*--cef()--*/
-  virtual void SetText(const CefString& text) =0;
+  virtual void SetText(const CefString& text) = 0;
 
   ///
   // Returns the text shown on the LabelButton.
   ///
   /*--cef()--*/
-  virtual CefString GetText() =0;
+  virtual CefString GetText() = 0;
 
   ///
   // Sets the image shown for |button_state|. When this Button is drawn if no
@@ -93,26 +93,27 @@ class CefLabelButton : public CefButton {
   ///
   /*--cef(optional_param=image)--*/
   virtual void SetImage(cef_button_state_t button_state,
-                        CefRefPtr<CefImage> image) =0;
+                        CefRefPtr<CefImage> image) = 0;
 
   ///
   // Returns the image shown for |button_state|. If no image exists for that
   // state then the image for CEF_BUTTON_STATE_NORMAL will be returned.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefImage> GetImage(cef_button_state_t button_state) =0;
+  virtual CefRefPtr<CefImage> GetImage(cef_button_state_t button_state) = 0;
 
   ///
   // Sets the text color shown for the specified button |for_state| to |color|.
   ///
   /*--cef()--*/
-  virtual void SetTextColor(cef_button_state_t for_state, cef_color_t color) =0;
+  virtual void SetTextColor(cef_button_state_t for_state,
+                            cef_color_t color) = 0;
 
   ///
   // Sets the text colors shown for the non-disabled states to |color|.
   ///
   /*--cef()--*/
-  virtual void SetEnabledTextColors(cef_color_t color) =0;
+  virtual void SetEnabledTextColors(cef_color_t color) = 0;
 
   ///
   // Sets the font list. The format is "<FONT_FAMILY_LIST>,[STYLES] <SIZE>",
@@ -127,26 +128,26 @@ class CefLabelButton : public CefButton {
   // - "Arial, 14px"
   ///
   /*--cef()--*/
-  virtual void SetFontList(const CefString& font_list) =0;
+  virtual void SetFontList(const CefString& font_list) = 0;
 
   ///
   // Sets the horizontal alignment; reversed in RTL. Default is
   // CEF_HORIZONTAL_ALIGNMENT_CENTER.
   ///
   /*--cef()--*/
-  virtual void SetHorizontalAlignment(cef_horizontal_alignment_t alignment) =0;
+  virtual void SetHorizontalAlignment(cef_horizontal_alignment_t alignment) = 0;
 
   ///
   // Reset the minimum size of this LabelButton to |size|.
   ///
   /*--cef()--*/
-  virtual void SetMinimumSize(const CefSize& size) =0;
+  virtual void SetMinimumSize(const CefSize& size) = 0;
 
   ///
   // Reset the maximum size of this LabelButton to |size|.
   ///
   /*--cef()--*/
-  virtual void SetMaximumSize(const CefSize& size) =0;
+  virtual void SetMaximumSize(const CefSize& size) = 0;
 };
 
 #endif  // CEF_INCLUDE_VIEWS_CEF_LABEL_BUTTON_H_
diff --git a/src/include/views/cef_layout.h b/src/include/views/cef_layout.h
index 5f1fcf4e..454ff01b 100644
--- a/src/include/views/cef_layout.h
+++ b/src/include/views/cef_layout.h
@@ -55,19 +55,19 @@ class CefLayout : public CefBaseRefCounted {
   // Returns this Layout as a BoxLayout or NULL if this is not a BoxLayout.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefBoxLayout> AsBoxLayout() =0;
+  virtual CefRefPtr<CefBoxLayout> AsBoxLayout() = 0;
 
   ///
   // Returns this Layout as a FillLayout or NULL if this is not a FillLayout.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefFillLayout> AsFillLayout() =0;
+  virtual CefRefPtr<CefFillLayout> AsFillLayout() = 0;
 
   ///
   // Returns true if this Layout is valid.
   ///
   /*--cef()--*/
-  virtual bool IsValid() =0;
+  virtual bool IsValid() = 0;
 };
 
 #endif  // CEF_INCLUDE_VIEWS_CEF_LAYOUT_H_
diff --git a/src/include/views/cef_menu_button.h b/src/include/views/cef_menu_button.h
index 60f803c4..965c49b4 100644
--- a/src/include/views/cef_menu_button.h
+++ b/src/include/views/cef_menu_button.h
@@ -77,14 +77,14 @@ class CefMenuButton : public CefLabelButton {
   /*--cef()--*/
   virtual void ShowMenu(CefRefPtr<CefMenuModel> menu_model,
                         const CefPoint& screen_point,
-                        cef_menu_anchor_position_t anchor_position) =0;
+                        cef_menu_anchor_position_t anchor_position) = 0;
 
   ///
   // Show the menu for this button. Results in a call to
   // CefMenuButtonDelegate::OnMenuButtonPressed().
   ///
   /*--cef()--*/
-  virtual void TriggerMenu() =0;
+  virtual void TriggerMenu() = 0;
 };
 
 #endif  // CEF_INCLUDE_VIEWS_CEF_MENU_BUTTON_H_
diff --git a/src/include/views/cef_menu_button_delegate.h b/src/include/views/cef_menu_button_delegate.h
index 43bce7ed..787b179c 100644
--- a/src/include/views/cef_menu_button_delegate.h
+++ b/src/include/views/cef_menu_button_delegate.h
@@ -42,6 +42,12 @@
 
 class CefMenuButton;
 
+///
+// MenuButton pressed lock is released when this object is destroyed.
+///
+/*--cef(source=library)--*/
+class CefMenuButtonPressedLock : public CefBaseRefCounted {};
+
 ///
 // Implement this interface to handle MenuButton events. The methods of this
 // class will be called on the browser process UI thread unless otherwise
@@ -51,12 +57,16 @@ class CefMenuButton;
 class CefMenuButtonDelegate : public CefButtonDelegate {
  public:
   ///
-  // Called when |button| is pressed. Call CefMenuButton::ShowMenu() to show the
-  // resulting menu at |screen_point|.
+  // Called when |button| is pressed. Call CefMenuButton::ShowMenu() to show a
+  // popup menu at |screen_point|. When showing a custom popup such as a window
+  // keep a reference to |button_pressed_lock| until the popup is hidden to
+  // maintain the pressed button state.
   ///
   /*--cef()--*/
-  virtual void OnMenuButtonPressed(CefRefPtr<CefMenuButton> menu_button,
-                                   const CefPoint& screen_point) =0;
+  virtual void OnMenuButtonPressed(
+      CefRefPtr<CefMenuButton> menu_button,
+      const CefPoint& screen_point,
+      CefRefPtr<CefMenuButtonPressedLock> button_pressed_lock) = 0;
 };
 
 #endif  // CEF_INCLUDE_VIEWS_CEF_MENU_BUTTON_DELEGATE_H_
diff --git a/src/include/views/cef_panel.h b/src/include/views/cef_panel.h
index 2c5a2b11..4a4fb909 100644
--- a/src/include/views/cef_panel.h
+++ b/src/include/views/cef_panel.h
@@ -38,8 +38,8 @@
 #define CEF_INCLUDE_VIEWS_CEF_PANEL_H_
 #pragma once
 
-#include "include/views/cef_view.h"
 #include "include/views/cef_panel_delegate.h"
+#include "include/views/cef_view.h"
 
 class CefBoxLayout;
 class CefFillLayout;
@@ -64,80 +64,78 @@ class CefPanel : public CefView {
   // Returns this Panel as a Window or NULL if this is not a Window.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefWindow> AsWindow() =0;
+  virtual CefRefPtr<CefWindow> AsWindow() = 0;
 
   ///
   // Set this Panel's Layout to FillLayout and return the FillLayout object.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefFillLayout> SetToFillLayout() =0;
+  virtual CefRefPtr<CefFillLayout> SetToFillLayout() = 0;
 
   ///
   // Set this Panel's Layout to BoxLayout and return the BoxLayout object.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefBoxLayout> SetToBoxLayout(
-      const CefBoxLayoutSettings& settings) =0;
+      const CefBoxLayoutSettings& settings) = 0;
 
   ///
   // Get the Layout.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefLayout> GetLayout() =0;
+  virtual CefRefPtr<CefLayout> GetLayout() = 0;
 
   ///
   // Lay out the child Views (set their bounds based on sizing heuristics
   // specific to the current Layout).
   ///
   /*--cef()--*/
-  virtual void Layout() =0;
+  virtual void Layout() = 0;
 
   ///
   // Add a child View.
   ///
   /*--cef()--*/
-  virtual void AddChildView(CefRefPtr<CefView> view) =0;
+  virtual void AddChildView(CefRefPtr<CefView> view) = 0;
 
   ///
   // Add a child View at the specified |index|. If |index| matches the result of
   // GetChildCount() then the View will be added at the end.
   ///
   /*--cef(index_param=index)--*/
-  virtual void AddChildViewAt(CefRefPtr<CefView> view,
-                              int index) =0;
+  virtual void AddChildViewAt(CefRefPtr<CefView> view, int index) = 0;
 
   ///
   // Move the child View to the specified |index|. A negative value for |index|
   // will move the View to the end.
   ///
   /*--cef()--*/
-  virtual void ReorderChildView(CefRefPtr<CefView> view,
-                                int index) =0;
+  virtual void ReorderChildView(CefRefPtr<CefView> view, int index) = 0;
 
   ///
   // Remove a child View. The View can then be added to another Panel.
   ///
   /*--cef()--*/
-  virtual void RemoveChildView(CefRefPtr<CefView> view) =0;
+  virtual void RemoveChildView(CefRefPtr<CefView> view) = 0;
 
   ///
   // Remove all child Views. The removed Views will be deleted if the client
   // holds no references to them.
   ///
   /*--cef()--*/
-  virtual void RemoveAllChildViews() =0;
+  virtual void RemoveAllChildViews() = 0;
 
   ///
   // Returns the number of child Views.
   ///
   /*--cef()--*/
-  virtual size_t GetChildViewCount() =0;
+  virtual size_t GetChildViewCount() = 0;
 
   ///
   // Returns the child View at the specified |index|.
   ///
   /*--cef(index_param=index)--*/
-  virtual CefRefPtr<CefView> GetChildViewAt(int index) =0;
+  virtual CefRefPtr<CefView> GetChildViewAt(int index) = 0;
 };
 
 #endif  // CEF_INCLUDE_VIEWS_CEF_PANEL_H_
diff --git a/src/include/views/cef_panel_delegate.h b/src/include/views/cef_panel_delegate.h
index 099a5e6d..cd496119 100644
--- a/src/include/views/cef_panel_delegate.h
+++ b/src/include/views/cef_panel_delegate.h
@@ -45,7 +45,6 @@
 // will be called on the browser process UI thread unless otherwise indicated.
 ///
 /*--cef(source=client)--*/
-class CefPanelDelegate : public CefViewDelegate {
-};
+class CefPanelDelegate : public CefViewDelegate {};
 
 #endif  // CEF_INCLUDE_VIEWS_CEF_PANEL_DELEGATE_H_
diff --git a/src/include/views/cef_scroll_view.h b/src/include/views/cef_scroll_view.h
index 65378d81..da472bd4 100644
--- a/src/include/views/cef_scroll_view.h
+++ b/src/include/views/cef_scroll_view.h
@@ -60,43 +60,43 @@ class CefScrollView : public CefView {
   // via CefView::SetBounds or CefViewDelegate::GetPreferredSize).
   ///
   /*--cef()--*/
-  virtual void SetContentView(CefRefPtr<CefView> view) =0;
+  virtual void SetContentView(CefRefPtr<CefView> view) = 0;
 
   ///
   // Returns the content View.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefView> GetContentView() =0;
+  virtual CefRefPtr<CefView> GetContentView() = 0;
 
   ///
   // Returns the visible region of the content View.
   ///
   /*--cef()--*/
-  virtual CefRect GetVisibleContentRect() =0;
+  virtual CefRect GetVisibleContentRect() = 0;
 
   ///
   // Returns true if the horizontal scrollbar is currently showing.
   ///
   /*--cef()--*/
-  virtual bool HasHorizontalScrollbar() =0;
+  virtual bool HasHorizontalScrollbar() = 0;
 
   ///
   // Returns the height of the horizontal scrollbar.
   ///
   /*--cef()--*/
-  virtual int GetHorizontalScrollbarHeight() =0;
+  virtual int GetHorizontalScrollbarHeight() = 0;
 
   ///
   // Returns true if the vertical scrollbar is currently showing.
   ///
   /*--cef()--*/
-  virtual bool HasVerticalScrollbar() =0;
+  virtual bool HasVerticalScrollbar() = 0;
 
   ///
   // Returns the width of the vertical scrollbar.
   ///
   /*--cef()--*/
-  virtual int GetVerticalScrollbarWidth() =0;
+  virtual int GetVerticalScrollbarWidth() = 0;
 };
 
 #endif  // CEF_INCLUDE_VIEWS_CEF_SCROLL_VIEW_H_
diff --git a/src/include/views/cef_textfield.h b/src/include/views/cef_textfield.h
index 8f562f09..9b53f722 100644
--- a/src/include/views/cef_textfield.h
+++ b/src/include/views/cef_textfield.h
@@ -38,8 +38,8 @@
 #define CEF_INCLUDE_VIEWS_CEF_TEXTFIELD_H_
 #pragma once
 
-#include "include/views/cef_view.h"
 #include "include/views/cef_textfield_delegate.h"
+#include "include/views/cef_view.h"
 
 ///
 // A Textfield supports editing of text. This control is custom rendered with no
@@ -60,62 +60,62 @@ class CefTextfield : public CefView {
   // Sets whether the text will be displayed as asterisks.
   ///
   /*--cef()--*/
-  virtual void SetPasswordInput(bool password_input) =0;
+  virtual void SetPasswordInput(bool password_input) = 0;
 
   ///
   // Returns true if the text will be displayed as asterisks.
   ///
   /*--cef()--*/
-  virtual bool IsPasswordInput() =0;
+  virtual bool IsPasswordInput() = 0;
 
   ///
   // Sets whether the text will read-only.
   ///
   /*--cef()--*/
-  virtual void SetReadOnly(bool read_only) =0;
+  virtual void SetReadOnly(bool read_only) = 0;
 
   ///
   // Returns true if the text is read-only.
   ///
   /*--cef()--*/
-  virtual bool IsReadOnly() =0;
+  virtual bool IsReadOnly() = 0;
 
   ///
   // Returns the currently displayed text.
   ///
   /*--cef()--*/
-  virtual CefString GetText() =0;
+  virtual CefString GetText() = 0;
 
   ///
   // Sets the contents to |text|. The cursor will be moved to end of the text if
   // the current position is outside of the text range.
   ///
   /*--cef()--*/
-  virtual void SetText(const CefString& text) =0;
+  virtual void SetText(const CefString& text) = 0;
 
   ///
   // Appends |text| to the previously-existing text.
   ///
   /*--cef()--*/
-  virtual void AppendText(const CefString& text) =0;
+  virtual void AppendText(const CefString& text) = 0;
 
   ///
   // Inserts |text| at the current cursor position replacing any selected text.
   ///
   /*--cef()--*/
-  virtual void InsertOrReplaceText(const CefString& text) =0;
+  virtual void InsertOrReplaceText(const CefString& text) = 0;
 
   ///
   // Returns true if there is any selected text.
   ///
   /*--cef()--*/
-  virtual bool HasSelection() =0;
+  virtual bool HasSelection() = 0;
 
   ///
   // Returns the currently selected text.
   ///
   /*--cef()--*/
-  virtual CefString GetSelectedText() =0;
+  virtual CefString GetSelectedText() = 0;
 
   ///
   // Selects all text. If |reversed| is true the range will end at the logical
@@ -123,67 +123,67 @@ class CefTextfield : public CefView {
   // that overflows its display area.
   ///
   /*--cef()--*/
-  virtual void SelectAll(bool reversed) =0;
-  
+  virtual void SelectAll(bool reversed) = 0;
+
   ///
   // Clears the text selection and sets the caret to the end.
   ///
   /*--cef()--*/
-  virtual void ClearSelection() =0;
+  virtual void ClearSelection() = 0;
 
   ///
   // Returns the selected logical text range.
   ///
   /*--cef()--*/
-  virtual CefRange GetSelectedRange() =0;
-  
+  virtual CefRange GetSelectedRange() = 0;
+
   ///
   // Selects the specified logical text range.
   ///
   /*--cef()--*/
-  virtual void SelectRange(const CefRange& range) =0;
-  
+  virtual void SelectRange(const CefRange& range) = 0;
+
   ///
   // Returns the current cursor position.
   ///
   /*--cef()--*/
-  virtual size_t GetCursorPosition() =0;
+  virtual size_t GetCursorPosition() = 0;
 
   ///
   // Sets the text color.
   ///
   /*--cef()--*/
-  virtual void SetTextColor(cef_color_t color) =0;
+  virtual void SetTextColor(cef_color_t color) = 0;
 
   ///
   // Returns the text color.
   ///
   /*--cef()--*/
-  virtual cef_color_t GetTextColor() =0;
+  virtual cef_color_t GetTextColor() = 0;
 
   ///
   // Sets the selection text color.
   ///
   /*--cef()--*/
-  virtual void SetSelectionTextColor(cef_color_t color) =0;
+  virtual void SetSelectionTextColor(cef_color_t color) = 0;
 
   ///
   // Returns the selection text color.
   ///
   /*--cef()--*/
-  virtual cef_color_t GetSelectionTextColor() =0;
+  virtual cef_color_t GetSelectionTextColor() = 0;
 
   ///
   // Sets the selection background color.
   ///
   /*--cef()--*/
-  virtual void SetSelectionBackgroundColor(cef_color_t color) =0;
+  virtual void SetSelectionBackgroundColor(cef_color_t color) = 0;
 
   ///
   // Returns the selection background color.
   ///
   /*--cef()--*/
-  virtual cef_color_t GetSelectionBackgroundColor() =0;
+  virtual cef_color_t GetSelectionBackgroundColor() = 0;
 
   ///
   // Sets the font list. The format is "<FONT_FAMILY_LIST>,[STYLES] <SIZE>",
@@ -198,7 +198,7 @@ class CefTextfield : public CefView {
   // - "Arial, 14px"
   ///
   /*--cef()--*/
-  virtual void SetFontList(const CefString& font_list) =0;
+  virtual void SetFontList(const CefString& font_list) = 0;
 
   ///
   // Applies |color| to the specified |range| without changing the default
@@ -206,8 +206,7 @@ class CefTextfield : public CefView {
   // contents.
   ///
   /*--cef()--*/
-  virtual void ApplyTextColor(cef_color_t color,
-                              const CefRange& range) =0;
+  virtual void ApplyTextColor(cef_color_t color, const CefRange& range) = 0;
 
   ///
   // Applies |style| to the specified |range| without changing the default
@@ -218,14 +217,14 @@ class CefTextfield : public CefView {
   /*--cef()--*/
   virtual void ApplyTextStyle(cef_text_style_t style,
                               bool add,
-                              const CefRange& range) =0;
+                              const CefRange& range) = 0;
 
   ///
   // Returns true if the action associated with the specified command id is
   // enabled. See additional comments on ExecuteCommand().
   ///
   /*--cef()--*/
-  virtual bool IsCommandEnabled(int command_id) =0;
+  virtual bool IsCommandEnabled(int command_id) = 0;
 
   ///
   // Performs the action associated with the specified command id. Valid values
@@ -234,39 +233,39 @@ class CefTextfield : public CefView {
   // IDS_MOVE_*. See include/cef_pack_strings.h for definitions.
   ///
   /*--cef()--*/
-  virtual void ExecuteCommand(int command_id) =0;
-  
+  virtual void ExecuteCommand(int command_id) = 0;
+
   ///
   // Clears Edit history.
   ///
   /*--cef()--*/
-  virtual void ClearEditHistory() =0;
+  virtual void ClearEditHistory() = 0;
 
   ///
   // Sets the placeholder text that will be displayed when the Textfield is
   // empty.
   ///
   /*--cef()--*/
-  virtual void SetPlaceholderText(const CefString& text) =0;
+  virtual void SetPlaceholderText(const CefString& text) = 0;
 
   ///
   // Returns the placeholder text that will be displayed when the Textfield is
   // empty.
   ///
   /*--cef()--*/
-  virtual CefString GetPlaceholderText() =0;
+  virtual CefString GetPlaceholderText() = 0;
 
   ///
   // Sets the placeholder text color.
   ///
   /*--cef()--*/
-  virtual void SetPlaceholderTextColor(cef_color_t color) =0;
+  virtual void SetPlaceholderTextColor(cef_color_t color) = 0;
 
   ///
   // Set the accessible name that will be exposed to assistive technology (AT).
   ///
   /*--cef()--*/
-  virtual void SetAccessibleName(const CefString& name) =0;
+  virtual void SetAccessibleName(const CefString& name) = 0;
 };
 
 #endif  // CEF_INCLUDE_VIEWS_CEF_TEXTFIELD_H_
diff --git a/src/include/views/cef_textfield_delegate.h b/src/include/views/cef_textfield_delegate.h
index ed3f607a..c3fddafd 100644
--- a/src/include/views/cef_textfield_delegate.h
+++ b/src/include/views/cef_textfield_delegate.h
@@ -57,7 +57,9 @@ class CefTextfieldDelegate : public CefViewDelegate {
   ///
   /*--cef()--*/
   virtual bool OnKeyEvent(CefRefPtr<CefTextfield> textfield,
-                          const CefKeyEvent& event) { return false; }
+                          const CefKeyEvent& event) {
+    return false;
+  }
 
   ///
   // Called after performing a user action that may change |textfield|.
diff --git a/src/include/views/cef_view.h b/src/include/views/cef_view.h
index 78422fec..eed14f31 100644
--- a/src/include/views/cef_view.h
+++ b/src/include/views/cef_view.h
@@ -60,38 +60,38 @@ class CefView : public CefBaseRefCounted {
   // Returns this View as a BrowserView or NULL if this is not a BrowserView.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefBrowserView> AsBrowserView() =0;
+  virtual CefRefPtr<CefBrowserView> AsBrowserView() = 0;
 
   ///
   // Returns this View as a Button or NULL if this is not a Button.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefButton> AsButton() =0;
+  virtual CefRefPtr<CefButton> AsButton() = 0;
 
   ///
   // Returns this View as a Panel or NULL if this is not a Panel.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefPanel> AsPanel() =0;
+  virtual CefRefPtr<CefPanel> AsPanel() = 0;
 
   ///
   // Returns this View as a ScrollView or NULL if this is not a ScrollView.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefScrollView> AsScrollView() =0;
+  virtual CefRefPtr<CefScrollView> AsScrollView() = 0;
 
   ///
   // Returns this View as a Textfield or NULL if this is not a Textfield.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefTextfield> AsTextfield() =0;
+  virtual CefRefPtr<CefTextfield> AsTextfield() = 0;
 
   ///
   // Returns the type of this View as a string. Used primarily for testing
   // purposes.
   ///
   /*--cef()--*/
-  virtual CefString GetTypeString() =0;
+  virtual CefString GetTypeString() = 0;
 
   ///
   // Returns a string representation of this View which includes the type and
@@ -99,57 +99,57 @@ class CefView : public CefBaseRefCounted {
   // any child Views will also be included. Used primarily for testing purposes.
   ///
   /*--cef()--*/
-  virtual CefString ToString(bool include_children) =0;
+  virtual CefString ToString(bool include_children) = 0;
 
   ///
   // Returns true if this View is valid.
   ///
   /*--cef()--*/
-  virtual bool IsValid() =0;
+  virtual bool IsValid() = 0;
 
   ///
   // Returns true if this View is currently attached to another View. A View can
   // only be attached to one View at a time.
   ///
   /*--cef()--*/
-  virtual bool IsAttached() =0;
+  virtual bool IsAttached() = 0;
 
   ///
   // Returns true if this View is the same as |that| View.
   ///
   /*--cef()--*/
-  virtual bool IsSame(CefRefPtr<CefView> that) =0;
+  virtual bool IsSame(CefRefPtr<CefView> that) = 0;
 
   ///
   // Returns the delegate associated with this View, if any.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefViewDelegate> GetDelegate() =0;
+  virtual CefRefPtr<CefViewDelegate> GetDelegate() = 0;
 
   ///
   // Returns the top-level Window hosting this View, if any.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefWindow> GetWindow() =0;
+  virtual CefRefPtr<CefWindow> GetWindow() = 0;
 
   ///
   // Returns the ID for this View.
   ///
   /*--cef()--*/
-  virtual int GetID() =0;
+  virtual int GetID() = 0;
 
   ///
   // Sets the ID for this View. ID should be unique within the subtree that you
   // intend to search for it. 0 is the default ID for views.
   ///
   /*--cef()--*/
-  virtual void SetID(int id) =0;
+  virtual void SetID(int id) = 0;
 
   ///
   // Returns the group id of this View, or -1 if not set.
   ///
   /*--cef()--*/
-  virtual int GetGroupID() =0;
+  virtual int GetGroupID() = 0;
 
   ///
   // A group id is used to tag Views which are part of the same logical group.
@@ -157,13 +157,13 @@ class CefView : public CefBaseRefCounted {
   // The group id is immutable once it's set.
   ///
   /*--cef()--*/
-  virtual void SetGroupID(int group_id) =0;
+  virtual void SetGroupID(int group_id) = 0;
 
   ///
   // Returns the View that contains this View, if any.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefView> GetParentView() =0;
+  virtual CefRefPtr<CefView> GetParentView() = 0;
 
   ///
   // Recursively descends the view tree starting at this View, and returns the
@@ -171,83 +171,83 @@ class CefView : public CefBaseRefCounted {
   // matching child view is found.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefView> GetViewForID(int id) =0;
+  virtual CefRefPtr<CefView> GetViewForID(int id) = 0;
 
   ///
   // Sets the bounds (size and position) of this View. Position is in parent
   // coordinates.
   ///
   /*--cef()--*/
-  virtual void SetBounds(const CefRect& bounds) =0;
+  virtual void SetBounds(const CefRect& bounds) = 0;
 
   ///
   // Returns the bounds (size and position) of this View. Position is in parent
   // coordinates.
   ///
   /*--cef()--*/
-  virtual CefRect GetBounds() =0;
+  virtual CefRect GetBounds() = 0;
 
   ///
   // Returns the bounds (size and position) of this View. Position is in screen
   // coordinates.
   ///
   /*--cef()--*/
-  virtual CefRect GetBoundsInScreen() =0;
+  virtual CefRect GetBoundsInScreen() = 0;
 
   ///
   // Sets the size of this View without changing the position.
   ///
   /*--cef()--*/
-  virtual void SetSize(const CefSize& size) =0;
+  virtual void SetSize(const CefSize& size) = 0;
 
   ///
   // Returns the size of this View.
   ///
   /*--cef()--*/
-  virtual CefSize GetSize() =0;
+  virtual CefSize GetSize() = 0;
 
   ///
   // Sets the position of this View without changing the size. |position| is in
   // parent coordinates.
   ///
   /*--cef()--*/
-  virtual void SetPosition(const CefPoint& position) =0;
+  virtual void SetPosition(const CefPoint& position) = 0;
 
   ///
   // Returns the position of this View. Position is in parent coordinates.
   ///
   /*--cef()--*/
-  virtual CefPoint GetPosition() =0;
+  virtual CefPoint GetPosition() = 0;
 
   ///
   // Returns the size this View would like to be if enough space is available.
   ///
   /*--cef()--*/
-  virtual CefSize GetPreferredSize() =0;
+  virtual CefSize GetPreferredSize() = 0;
 
   ///
   // Size this View to its preferred size.
   ///
   /*--cef()--*/
-  virtual void SizeToPreferredSize() =0;
+  virtual void SizeToPreferredSize() = 0;
 
   ///
   // Returns the minimum size for this View.
   ///
   /*--cef()--*/
-  virtual CefSize GetMinimumSize() =0;
+  virtual CefSize GetMinimumSize() = 0;
 
   ///
   // Returns the maximum size for this View.
   ///
   /*--cef()--*/
-  virtual CefSize GetMaximumSize() =0;
+  virtual CefSize GetMaximumSize() = 0;
 
   ///
   // Returns the height necessary to display this View with the provided width.
   ///
   /*--cef()--*/
-  virtual int GetHeightForWidth(int width) =0;
+  virtual int GetHeightForWidth(int width) = 0;
 
   ///
   // Indicate that this View and all parent Views require a re-layout. This
@@ -255,7 +255,7 @@ class CefView : public CefBaseRefCounted {
   // bounds of parent Views do not change.
   ///
   /*--cef()--*/
-  virtual void InvalidateLayout() =0;
+  virtual void InvalidateLayout() = 0;
 
   ///
   // Sets whether this View is visible. Windows are hidden by default and other
@@ -267,7 +267,7 @@ class CefView : public CefBaseRefCounted {
   // equivalent to calling the Window Show() and Hide() methods.
   ///
   /*--cef()--*/
-  virtual void SetVisible(bool visible) =0;
+  virtual void SetVisible(bool visible) = 0;
 
   ///
   // Returns whether this View is visible. A view may be visible but still not
@@ -278,7 +278,7 @@ class CefView : public CefBaseRefCounted {
   // drawn.
   ///
   /*--cef()--*/
-  virtual bool IsVisible() =0;
+  virtual bool IsVisible() = 0;
 
   ///
   // Returns whether this View is visible and drawn in a Window. A view is drawn
@@ -288,7 +288,7 @@ class CefView : public CefBaseRefCounted {
   // IsVisible() on the Window.
   ///
   /*--cef()--*/
-  virtual bool IsDrawn() =0;
+  virtual bool IsDrawn() = 0;
 
   ///
   // Set whether this View is enabled. A disabled View does not receive keyboard
@@ -296,13 +296,13 @@ class CefView : public CefBaseRefCounted {
   // be repainted. Also, clears focus if the focused View is disabled.
   ///
   /*--cef()--*/
-  virtual void SetEnabled(bool enabled) =0;
+  virtual void SetEnabled(bool enabled) = 0;
 
   ///
   // Returns whether this View is enabled.
   ///
   /*--cef()--*/
-  virtual bool IsEnabled() =0;
+  virtual bool IsEnabled() = 0;
 
   ///
   // Sets whether this View is capable of taking focus. It will clear focus if
@@ -310,39 +310,39 @@ class CefView : public CefBaseRefCounted {
   // that a View used as a container does not get the focus.
   ///
   /*--cef()--*/
-  virtual void SetFocusable(bool focusable) =0;
+  virtual void SetFocusable(bool focusable) = 0;
 
   ///
   // Returns true if this View is focusable, enabled and drawn.
   ///
   /*--cef()--*/
-  virtual bool IsFocusable() =0;
+  virtual bool IsFocusable() = 0;
 
   ///
   // Return whether this View is focusable when the user requires full keyboard
   // access, even though it may not be normally focusable.
   ///
   /*--cef()--*/
-  virtual bool IsAccessibilityFocusable() =0;
+  virtual bool IsAccessibilityFocusable() = 0;
 
   ///
   // Request keyboard focus. If this View is focusable it will become the
   // focused View.
   ///
   /*--cef()--*/
-  virtual void RequestFocus() =0;
+  virtual void RequestFocus() = 0;
 
   ///
   // Sets the background color for this View.
   ///
   /*--cef()--*/
-  virtual void SetBackgroundColor(cef_color_t color) =0;
+  virtual void SetBackgroundColor(cef_color_t color) = 0;
 
   ///
   // Returns the background color for this View.
   ///
   /*--cef()--*/
-  virtual cef_color_t GetBackgroundColor() =0;
+  virtual cef_color_t GetBackgroundColor() = 0;
 
   ///
   // Convert |point| from this View's coordinate system to that of the screen.
@@ -352,7 +352,7 @@ class CefView : public CefBaseRefCounted {
   // conversion to display-specific pixel coordinates is desired.
   ///
   /*--cef()--*/
-  virtual bool ConvertPointToScreen(CefPoint& point) =0;
+  virtual bool ConvertPointToScreen(CefPoint& point) = 0;
 
   ///
   // Convert |point| to this View's coordinate system from that of the screen.
@@ -362,7 +362,7 @@ class CefView : public CefBaseRefCounted {
   // conversion from display-specific pixel coordinates is necessary.
   ///
   /*--cef()--*/
-  virtual bool ConvertPointFromScreen(CefPoint& point) =0;
+  virtual bool ConvertPointFromScreen(CefPoint& point) = 0;
 
   ///
   // Convert |point| from this View's coordinate system to that of the Window.
@@ -370,7 +370,7 @@ class CefView : public CefBaseRefCounted {
   // the conversion is successful or false otherwise.
   ///
   /*--cef()--*/
-  virtual bool ConvertPointToWindow(CefPoint& point) =0;
+  virtual bool ConvertPointToWindow(CefPoint& point) = 0;
 
   ///
   // Convert |point| to this View's coordinate system from that of the Window.
@@ -378,7 +378,7 @@ class CefView : public CefBaseRefCounted {
   // the conversion is successful or false otherwise.
   ///
   /*--cef()--*/
-  virtual bool ConvertPointFromWindow(CefPoint& point) =0;
+  virtual bool ConvertPointFromWindow(CefPoint& point) = 0;
 
   ///
   // Convert |point| from this View's coordinate system to that of |view|.
@@ -386,8 +386,7 @@ class CefView : public CefBaseRefCounted {
   // hierarchy. Returns true if the conversion is successful or false otherwise.
   ///
   /*--cef()--*/
-  virtual bool ConvertPointToView(CefRefPtr<CefView> view,
-                                  CefPoint& point) =0;
+  virtual bool ConvertPointToView(CefRefPtr<CefView> view, CefPoint& point) = 0;
 
   ///
   // Convert |point| to this View's coordinate system from that |view|. |view|
@@ -396,7 +395,7 @@ class CefView : public CefBaseRefCounted {
   ///
   /*--cef()--*/
   virtual bool ConvertPointFromView(CefRefPtr<CefView> view,
-                                    CefPoint& point) =0;
+                                    CefPoint& point) = 0;
 };
 
 #endif  // CEF_INCLUDE_VIEWS_CEF_VIEW_H_
diff --git a/src/include/views/cef_view_delegate.h b/src/include/views/cef_view_delegate.h
index 523b0528..438896c2 100644
--- a/src/include/views/cef_view_delegate.h
+++ b/src/include/views/cef_view_delegate.h
@@ -62,17 +62,13 @@ class CefViewDelegate : public virtual CefBaseRefCounted {
   // Return the minimum size for |view|.
   ///
   /*--cef()--*/
-  virtual CefSize GetMinimumSize(CefRefPtr<CefView> view) {
-    return CefSize();
-  }
+  virtual CefSize GetMinimumSize(CefRefPtr<CefView> view) { return CefSize(); }
 
   ///
   // Return the maximum size for |view|.
   ///
   /*--cef()--*/
-  virtual CefSize GetMaximumSize(CefRefPtr<CefView> view) {
-    return CefSize();
-  }
+  virtual CefSize GetMaximumSize(CefRefPtr<CefView> view) { return CefSize(); }
 
   ///
   // Return the height necessary to display |view| with the provided |width|.
diff --git a/src/include/views/cef_window.h b/src/include/views/cef_window.h
index a89ab63a..2dce0685 100644
--- a/src/include/views/cef_window.h
+++ b/src/include/views/cef_window.h
@@ -65,136 +65,136 @@ class CefWindow : public CefPanel {
   // Show the Window.
   ///
   /*--cef()--*/
-  virtual void Show() =0;
+  virtual void Show() = 0;
 
   ///
   // Hide the Window.
   ///
   /*--cef()--*/
-  virtual void Hide() =0;
+  virtual void Hide() = 0;
 
   ///
   // Sizes the Window to |size| and centers it in the current display.
   ///
   /*--cef()--*/
-  virtual void CenterWindow(const CefSize& size) =0;
+  virtual void CenterWindow(const CefSize& size) = 0;
 
   ///
   // Close the Window.
   ///
   /*--cef()--*/
-  virtual void Close() =0;
+  virtual void Close() = 0;
 
   ///
   // Returns true if the Window has been closed.
   ///
   /*--cef()--*/
-  virtual bool IsClosed() =0;
+  virtual bool IsClosed() = 0;
 
   ///
   // Activate the Window, assuming it already exists and is visible.
   ///
   /*--cef()--*/
-  virtual void Activate() =0;
+  virtual void Activate() = 0;
 
   ///
   // Deactivate the Window, making the next Window in the Z order the active
   // Window.
   ///
   /*--cef()--*/
-  virtual void Deactivate() =0;
+  virtual void Deactivate() = 0;
 
   ///
   // Returns whether the Window is the currently active Window.
   ///
   /*--cef()--*/
-  virtual bool IsActive() =0;
+  virtual bool IsActive() = 0;
 
   ///
   // Bring this Window to the top of other Windows in the Windowing system.
   ///
   /*--cef()--*/
-  virtual void BringToTop() =0;
+  virtual void BringToTop() = 0;
 
   ///
   // Set the Window to be on top of other Windows in the Windowing system.
   ///
   /*--cef()--*/
-  virtual void SetAlwaysOnTop(bool on_top) =0;
+  virtual void SetAlwaysOnTop(bool on_top) = 0;
 
   ///
   // Returns whether the Window has been set to be on top of other Windows in
   // the Windowing system.
   ///
   /*--cef()--*/
-  virtual bool IsAlwaysOnTop() =0;
+  virtual bool IsAlwaysOnTop() = 0;
 
   ///
   // Maximize the Window.
   ///
   /*--cef()--*/
-  virtual void Maximize() =0;
+  virtual void Maximize() = 0;
 
   ///
   // Minimize the Window.
   ///
   /*--cef()--*/
-  virtual void Minimize() =0;
+  virtual void Minimize() = 0;
 
   ///
   // Restore the Window.
   ///
   /*--cef()--*/
-  virtual void Restore() =0;
+  virtual void Restore() = 0;
 
   ///
   // Set fullscreen Window state.
   ///
   /*--cef()--*/
-  virtual void SetFullscreen(bool fullscreen) =0;
-  
+  virtual void SetFullscreen(bool fullscreen) = 0;
+
   ///
   // Returns true if the Window is maximized.
   ///
   /*--cef()--*/
-  virtual bool IsMaximized() =0;
+  virtual bool IsMaximized() = 0;
 
   ///
   // Returns true if the Window is minimized.
   ///
   /*--cef()--*/
-  virtual bool IsMinimized() =0;
+  virtual bool IsMinimized() = 0;
 
   ///
   // Returns true if the Window is fullscreen.
   ///
   /*--cef()--*/
-  virtual bool IsFullscreen() =0;
+  virtual bool IsFullscreen() = 0;
 
   ///
   // Set the Window title.
   ///
   /*--cef(optional_param=title)--*/
-  virtual void SetTitle(const CefString& title) =0;
+  virtual void SetTitle(const CefString& title) = 0;
 
   ///
   // Get the Window title.
   ///
   /*--cef()--*/
-  virtual CefString GetTitle() =0;
+  virtual CefString GetTitle() = 0;
 
   ///
   // Set the Window icon. This should be a 16x16 icon suitable for use in the
   // Windows's title bar.
   ///
   /*--cef()--*/
-  virtual void SetWindowIcon(CefRefPtr<CefImage> image) =0;
+  virtual void SetWindowIcon(CefRefPtr<CefImage> image) = 0;
 
   ///
   // Get the Window icon.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefImage> GetWindowIcon() =0;
+  virtual CefRefPtr<CefImage> GetWindowIcon() = 0;
 
   ///
   // Set the Window App icon. This should be a larger icon for use in the host
@@ -203,13 +203,13 @@ class CefWindow : public CefPanel {
   // if no Window App icon is specified.
   ///
   /*--cef()--*/
-  virtual void SetWindowAppIcon(CefRefPtr<CefImage> image) =0;
+  virtual void SetWindowAppIcon(CefRefPtr<CefImage> image) = 0;
 
   ///
   // Get the Window App icon.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefImage> GetWindowAppIcon() =0;
+  virtual CefRefPtr<CefImage> GetWindowAppIcon() = 0;
 
   ///
   // Show a menu with contents |menu_model|. |screen_point| specifies the menu
@@ -219,27 +219,27 @@ class CefWindow : public CefPanel {
   /*--cef()--*/
   virtual void ShowMenu(CefRefPtr<CefMenuModel> menu_model,
                         const CefPoint& screen_point,
-                        cef_menu_anchor_position_t anchor_position) =0;
+                        cef_menu_anchor_position_t anchor_position) = 0;
 
   ///
   // Cancel the menu that is currently showing, if any.
   ///
   /*--cef()--*/
-  virtual void CancelMenu() =0;
+  virtual void CancelMenu() = 0;
 
   ///
   // Returns the Display that most closely intersects the bounds of this Window.
   // May return NULL if this Window is not currently displayed.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefDisplay> GetDisplay() =0;
+  virtual CefRefPtr<CefDisplay> GetDisplay() = 0;
 
   ///
   // Returns the bounds (size and position) of this Window's client area.
   // Position is in screen coordinates.
   ///
   /*--cef()--*/
-  virtual CefRect GetClientAreaBoundsInScreen() =0;
+  virtual CefRect GetClientAreaBoundsInScreen() = 0;
 
   ///
   // Set the regions where mouse events will be intercepted by this Window to
@@ -249,13 +249,13 @@ class CefWindow : public CefPanel {
   ///
   /*--cef(optional_param=regions)--*/
   virtual void SetDraggableRegions(
-      const std::vector<CefDraggableRegion>& regions) =0;
+      const std::vector<CefDraggableRegion>& regions) = 0;
 
   ///
   // Retrieve the platform window handle for this Window.
   ///
   /*--cef()--*/
-  virtual CefWindowHandle GetWindowHandle() =0;
+  virtual CefWindowHandle GetWindowHandle() = 0;
 
   ///
   // Simulate a key press. |key_code| is the VKEY_* value from Chromium's
@@ -265,8 +265,7 @@ class CefWindow : public CefPanel {
   // primarily for testing purposes.
   ///
   /*--cef()--*/
-  virtual void SendKeyPress(int key_code,
-                            uint32 event_flags) =0;
+  virtual void SendKeyPress(int key_code, uint32 event_flags) = 0;
 
   ///
   // Simulate a mouse move. The mouse cursor will be moved to the specified
@@ -274,7 +273,7 @@ class CefWindow : public CefPanel {
   // purposes.
   ///
   /*--cef()--*/
-  virtual void SendMouseMove(int screen_x, int screen_y) =0;
+  virtual void SendMouseMove(int screen_x, int screen_y) = 0;
 
   ///
   // Simulate mouse down and/or mouse up events. |button| is the mouse button
@@ -288,7 +287,7 @@ class CefWindow : public CefPanel {
   /*--cef()--*/
   virtual void SendMouseEvents(cef_mouse_button_type_t button,
                                bool mouse_down,
-                               bool mouse_up) =0;
+                               bool mouse_up) = 0;
   ///
   // Set the keyboard accelerator for the specified |command_id|. |key_code| can
   // be any virtual key or character value. CefWindowDelegate::OnAccelerator
@@ -300,19 +299,19 @@ class CefWindow : public CefPanel {
                               int key_code,
                               bool shift_pressed,
                               bool ctrl_pressed,
-                              bool alt_pressed) =0;
+                              bool alt_pressed) = 0;
 
   ///
   // Remove the keyboard accelerator for the specified |command_id|.
   ///
   /*--cef()--*/
-  virtual void RemoveAccelerator(int command_id) =0;
+  virtual void RemoveAccelerator(int command_id) = 0;
 
   ///
   // Remove all keyboard accelerators.
   ///
   /*--cef()--*/
-  virtual void RemoveAllAccelerators() =0;
+  virtual void RemoveAllAccelerators() = 0;
 };
 
 #endif  // CEF_INCLUDE_VIEWS_CEF_WINDOW_H_
diff --git a/src/include/views/cef_window_delegate.h b/src/include/views/cef_window_delegate.h
index a50e1fc4..65e0f0b5 100644
--- a/src/include/views/cef_window_delegate.h
+++ b/src/include/views/cef_window_delegate.h
@@ -63,6 +63,21 @@ class CefWindowDelegate : public CefPanelDelegate {
   /*--cef()--*/
   virtual void OnWindowDestroyed(CefRefPtr<CefWindow> window) {}
 
+  ///
+  // Return the parent for |window| or NULL if the |window| does not have a
+  // parent. Windows with parents will not get a taskbar button. Set |is_menu|
+  // to true if |window| will be displayed as a menu, in which case it will not
+  // be clipped to the parent window bounds. Set |can_activate_menu| to false
+  // if |is_menu| is true and |window| should not be activated (given keyboard
+  // focus) when displayed.
+  ///
+  /*--cef()--*/
+  virtual CefRefPtr<CefWindow> GetParentWindow(CefRefPtr<CefWindow> window,
+                                               bool* is_menu,
+                                               bool* can_activate_menu) {
+    return NULL;
+  }
+
   ///
   // Return true if |window| should be created without a frame or title bar. The
   // window will be resizable if CanResize() returns true. Use
@@ -102,8 +117,9 @@ class CefWindowDelegate : public CefPanelDelegate {
   // handled or false otherwise.
   ///
   /*--cef()--*/
-  virtual bool OnAccelerator(CefRefPtr<CefWindow> window,
-                             int command_id) { return false; }
+  virtual bool OnAccelerator(CefRefPtr<CefWindow> window, int command_id) {
+    return false;
+  }
 
   ///
   // Called after all other controls in the window have had a chance to
@@ -112,8 +128,9 @@ class CefWindowDelegate : public CefPanelDelegate {
   ///
   /*--cef()--*/
   virtual bool OnKeyEvent(CefRefPtr<CefWindow> window,
-                          const CefKeyEvent& event) { return false; }
-
+                          const CefKeyEvent& event) {
+    return false;
+  }
 };
 
 #endif  // CEF_INCLUDE_VIEWS_CEF_WINDOW_DELEGATE_H_
diff --git a/src/include/wrapper/cef_closure_task.h b/src/include/wrapper/cef_closure_task.h
index d9b559b6..71f54b5c 100644
--- a/src/include/wrapper/cef_closure_task.h
+++ b/src/include/wrapper/cef_closure_task.h
@@ -95,7 +95,8 @@ bool CefPostTask(CefThreadId threadId, const base::Closure& closure);
 ///
 // Post a Closure for delayed execution on the specified thread.
 ///
-bool CefPostDelayedTask(CefThreadId threadId, const base::Closure& closure,
+bool CefPostDelayedTask(CefThreadId threadId,
+                        const base::Closure& closure,
                         int64 delay_ms);
 
 #endif  // CEF_INCLUDE_WRAPPER_CEF_CLOSURE_TASK_H_
diff --git a/src/include/wrapper/cef_helpers.h b/src/include/wrapper/cef_helpers.h
index 639cde8c..0c5820db 100644
--- a/src/include/wrapper/cef_helpers.h
+++ b/src/include/wrapper/cef_helpers.h
@@ -46,12 +46,11 @@
 #include "include/base/cef_macros.h"
 #include "include/cef_task.h"
 
-#define CEF_REQUIRE_UI_THREAD()       DCHECK(CefCurrentlyOn(TID_UI));
-#define CEF_REQUIRE_IO_THREAD()       DCHECK(CefCurrentlyOn(TID_IO));
-#define CEF_REQUIRE_FILE_THREAD()     DCHECK(CefCurrentlyOn(TID_FILE));
+#define CEF_REQUIRE_UI_THREAD() DCHECK(CefCurrentlyOn(TID_UI));
+#define CEF_REQUIRE_IO_THREAD() DCHECK(CefCurrentlyOn(TID_IO));
+#define CEF_REQUIRE_FILE_THREAD() DCHECK(CefCurrentlyOn(TID_FILE));
 #define CEF_REQUIRE_RENDERER_THREAD() DCHECK(CefCurrentlyOn(TID_RENDERER));
 
-
 // Use this struct in conjuction with refcounted types to ensure that an
 // object is deleted on the specified thread. For example:
 //
@@ -72,9 +71,9 @@
 // foo->DoSomething();
 // foo = NULL;  // Deletion of |foo| will occur on the UI thread.
 //
-template<CefThreadId thread>
+template <CefThreadId thread>
 struct CefDeleteOnThread {
-  template<typename T>
+  template <typename T>
   static void Destruct(const T* x) {
     if (CefCurrentlyOn(thread)) {
       delete x;
@@ -85,11 +84,10 @@ struct CefDeleteOnThread {
   }
 };
 
-struct CefDeleteOnUIThread : public CefDeleteOnThread<TID_UI> { };
-struct CefDeleteOnIOThread : public CefDeleteOnThread<TID_IO> { };
-struct CefDeleteOnFileThread : public CefDeleteOnThread<TID_FILE> { };
-struct CefDeleteOnRendererThread : public CefDeleteOnThread<TID_RENDERER> { };
-
+struct CefDeleteOnUIThread : public CefDeleteOnThread<TID_UI> {};
+struct CefDeleteOnIOThread : public CefDeleteOnThread<TID_IO> {};
+struct CefDeleteOnFileThread : public CefDeleteOnThread<TID_FILE> {};
+struct CefDeleteOnRendererThread : public CefDeleteOnThread<TID_RENDERER> {};
 
 ///
 // Helper class to manage a scoped copy of |argv|.
@@ -105,9 +103,7 @@ class CefScopedArgArray {
     }
     array_[argc] = NULL;
   }
-  ~CefScopedArgArray() {
-    delete [] array_;
-  }
+  ~CefScopedArgArray() { delete[] array_; }
 
   char** array() const { return array_; }
 
@@ -117,7 +113,7 @@ class CefScopedArgArray {
   // Keep values in a vector separate from |array_| because various users may
   // modify |array_| and we still want to clean up memory properly.
   std::vector<std::string> values_;
-  
+
   DISALLOW_COPY_AND_ASSIGN(CefScopedArgArray);
 };
 
diff --git a/src/include/wrapper/cef_message_router.h b/src/include/wrapper/cef_message_router.h
index 23510ddc..9765be76 100644
--- a/src/include/wrapper/cef_message_router.h
+++ b/src/include/wrapper/cef_message_router.h
@@ -155,7 +155,8 @@
 //    CefMessageRouterBrowserSide class documentation for the complete list of
 //    methods.
 //
-// 5. Create an instance of CefMessageRouterRendererSide in the renderer process.
+// 5. Create an instance of CefMessageRouterRendererSide in the renderer
+// process.
 //    You might choose to make it a member of your CefApp implementation, for
 //    example.
 //
@@ -193,8 +194,8 @@
 
 ///
 // Used to configure the query router. The same values must be passed to both
-// CefMessageRouterBrowserSide and CefMessageRouterRendererSide. If using multiple
-// router pairs make sure to choose values that do not conflict.
+// CefMessageRouterBrowserSide and CefMessageRouterRendererSide. If using
+// multiple router pairs make sure to choose values that do not conflict.
 ///
 struct CefMessageRouterConfig {
   CefMessageRouterConfig();
@@ -212,8 +213,8 @@ struct CefMessageRouterConfig {
 // Implements the browser side of query routing. The methods of this class may
 // be called on any browser process thread unless otherwise indicated.
 ///
-class CefMessageRouterBrowserSide :
-    public base::RefCountedThreadSafe<CefMessageRouterBrowserSide> {
+class CefMessageRouterBrowserSide
+    : public base::RefCountedThreadSafe<CefMessageRouterBrowserSide> {
  public:
   ///
   // Callback associated with a single pending asynchronous query. Execute the
@@ -229,13 +230,13 @@ class CefMessageRouterBrowserSide :
     // Notify the associated JavaScript onSuccess callback that the query has
     // completed successfully with the specified |response|.
     ///
-    virtual void Success(const CefString& response) =0;
+    virtual void Success(const CefString& response) = 0;
 
     ///
     // Notify the associated JavaScript onFailure callback that the query has
     // failed with the specified |error_code| and |error_message|.
     ///
-    virtual void Failure(int error_code, const CefString& error_message) =0;
+    virtual void Failure(int error_code, const CefString& error_message) = 0;
   };
 
   ///
@@ -294,7 +295,7 @@ class CefMessageRouterBrowserSide :
   // added. Must be called on the browser process UI thread. The Handler object
   // must either outlive the router or be removed before deletion.
   ///
-  virtual bool AddHandler(Handler* handler, bool first) =0;
+  virtual bool AddHandler(Handler* handler, bool first) = 0;
 
   ///
   // Remove an existing query handler. Any pending queries associated with the
@@ -304,7 +305,7 @@ class CefMessageRouterBrowserSide :
   // if the handler is not found. Must be called on the browser process UI
   // thread.
   ///
-  virtual bool RemoveHandler(Handler* handler) =0;
+  virtual bool RemoveHandler(Handler* handler) = 0;
 
   ///
   // Cancel all pending queries associated with either |browser| or |handler|.
@@ -314,7 +315,7 @@ class CefMessageRouterBrowserSide :
   // code of -1.
   ///
   virtual void CancelPending(CefRefPtr<CefBrowser> browser,
-                             Handler* handler) =0;
+                             Handler* handler) = 0;
 
   ///
   // Returns the number of queries currently pending for the specified |browser|
@@ -322,19 +323,18 @@ class CefMessageRouterBrowserSide :
   // browser process UI thread.
   ///
   virtual int GetPendingCount(CefRefPtr<CefBrowser> browser,
-                              Handler* handler) =0;
-
+                              Handler* handler) = 0;
 
   // The below methods should be called from other CEF handlers. They must be
   // called exactly as documented for the router to function correctly.
 
   ///
   // Call from CefLifeSpanHandler::OnBeforeClose. Any pending queries associated
-  // with |browser| will be canceled and Handler::OnQueryCanceled will be called.
-  // No JavaScript callbacks will be executed since this indicates destruction
-  // of the browser.
+  // with |browser| will be canceled and Handler::OnQueryCanceled will be
+  // called. No JavaScript callbacks will be executed since this indicates
+  // destruction of the browser.
   ///
-  virtual void OnBeforeClose(CefRefPtr<CefBrowser> browser) =0;
+  virtual void OnBeforeClose(CefRefPtr<CefBrowser> browser) = 0;
 
   ///
   // Call from CefRequestHandler::OnRenderProcessTerminated. Any pending queries
@@ -342,7 +342,7 @@ class CefMessageRouterBrowserSide :
   // will be called. No JavaScript callbacks will be executed since this
   // indicates destruction of the context.
   ///
-  virtual void OnRenderProcessTerminated(CefRefPtr<CefBrowser> browser) =0;
+  virtual void OnRenderProcessTerminated(CefRefPtr<CefBrowser> browser) = 0;
 
   ///
   // Call from CefRequestHandler::OnBeforeBrowse only if the navigation is
@@ -352,7 +352,7 @@ class CefMessageRouterBrowserSide :
   // indicates destruction of the context.
   ///
   virtual void OnBeforeBrowse(CefRefPtr<CefBrowser> browser,
-                              CefRefPtr<CefFrame> frame) =0;
+                              CefRefPtr<CefFrame> frame) = 0;
 
   ///
   // Call from CefClient::OnProcessMessageReceived. Returns true if the message
@@ -361,7 +361,7 @@ class CefMessageRouterBrowserSide :
   virtual bool OnProcessMessageReceived(
       CefRefPtr<CefBrowser> browser,
       CefProcessId source_process,
-      CefRefPtr<CefProcessMessage> message) =0;
+      CefRefPtr<CefProcessMessage> message) = 0;
 
  protected:
   // Protect against accidental deletion of this object.
@@ -373,8 +373,8 @@ class CefMessageRouterBrowserSide :
 // Implements the renderer side of query routing. The methods of this class must
 // be called on the render process main thread.
 ///
-class CefMessageRouterRendererSide :
-    public base::RefCountedThreadSafe<CefMessageRouterRendererSide> {
+class CefMessageRouterRendererSide
+    : public base::RefCountedThreadSafe<CefMessageRouterRendererSide> {
  public:
   ///
   // Create a new router with the specified configuration.
@@ -387,8 +387,7 @@ class CefMessageRouterRendererSide :
   // and/or |context|. Either or both values may be empty.
   ///
   virtual int GetPendingCount(CefRefPtr<CefBrowser> browser,
-                              CefRefPtr<CefV8Context> context) =0;
-
+                              CefRefPtr<CefV8Context> context) = 0;
 
   // The below methods should be called from other CEF handlers. They must be
   // called exactly as documented for the router to function correctly.
@@ -399,7 +398,7 @@ class CefMessageRouterRendererSide :
   ///
   virtual void OnContextCreated(CefRefPtr<CefBrowser> browser,
                                 CefRefPtr<CefFrame> frame,
-                                CefRefPtr<CefV8Context> context) =0;
+                                CefRefPtr<CefV8Context> context) = 0;
 
   ///
   // Call from CefRenderProcessHandler::OnContextReleased. Any pending queries
@@ -408,8 +407,8 @@ class CefMessageRouterRendererSide :
   ///
   virtual void OnContextReleased(CefRefPtr<CefBrowser> browser,
                                  CefRefPtr<CefFrame> frame,
-                                 CefRefPtr<CefV8Context> context) =0;
-  
+                                 CefRefPtr<CefV8Context> context) = 0;
+
   ///
   // Call from CefRenderProcessHandler::OnProcessMessageReceived. Returns true
   // if the message is handled by this router or false otherwise.
@@ -417,7 +416,7 @@ class CefMessageRouterRendererSide :
   virtual bool OnProcessMessageReceived(
       CefRefPtr<CefBrowser> browser,
       CefProcessId source_process,
-      CefRefPtr<CefProcessMessage> message) =0;
+      CefRefPtr<CefProcessMessage> message) = 0;
 
  protected:
   // Protect against accidental deletion of this object.
diff --git a/src/include/wrapper/cef_resource_manager.h b/src/include/wrapper/cef_resource_manager.h
index 9ab8afad..91190b77 100644
--- a/src/include/wrapper/cef_resource_manager.h
+++ b/src/include/wrapper/cef_resource_manager.h
@@ -55,8 +55,9 @@
 // Request object for additional usage information. The methods of this class
 // may be called on any browser process thread unless otherwise indicated.
 ///
-class CefResourceManager :
-    public base::RefCountedThreadSafe<CefResourceManager, CefDeleteOnIOThread> {
+class CefResourceManager
+    : public base::RefCountedThreadSafe<CefResourceManager,
+                                        CefDeleteOnIOThread> {
  public:
   ///
   // Provides an opportunity to modify |url| before it is passed to a provider.
@@ -64,15 +65,14 @@ class CefResourceManager :
   // file extension. |url| will be fully qualified and may contain query or
   // fragment components.
   ///
-  typedef base::Callback<std::string(
-      const std::string& /*url*/)> UrlFilter;
+  typedef base::Callback<std::string(const std::string& /*url*/)> UrlFilter;
 
   ///
   // Used to resolve mime types for URLs, usually based on the file extension.
   // |url| will be fully qualified and may contain query or fragment components.
   ///
-  typedef base::Callback<std::string(
-      const std::string& /*url*/)> MimeTypeResolver;
+  typedef base::Callback<std::string(const std::string& /*url*/)>
+      MimeTypeResolver;
 
  private:
   // Values that stay with a request as it moves between providers.
@@ -95,7 +95,7 @@ class CefResourceManager :
   // will no longer trigger) after Request::Continue or Request::Stop is called.
   // A request passed to Provider::OnRequestCanceled will already have been
   // detached. The methods of this class may be called on any browser process
-  // thread. 
+  // thread.
   ///
   class Request : public base::RefCountedThreadSafe<Request> {
    public:
@@ -110,7 +110,7 @@ class CefResourceManager :
     // Returns the CefBrowser associated with this request.
     ///
     CefRefPtr<CefBrowser> browser() const { return params_.browser_; }
- 
+
     ///
     // Returns the CefFrame associated with this request.
     ///
@@ -141,7 +141,7 @@ class CefResourceManager :
     // returned via CefResourceManager::GetResourceHandler. If |handler| is NULL
     // then the next provider in order, if any, will be called. If there are no
     // additional providers then NULL will be returned via CefResourceManager::
-    // GetResourceHandler. 
+    // GetResourceHandler.
     ///
     void Continue(CefRefPtr<CefResourceHandler> handler);
 
@@ -151,7 +151,7 @@ class CefResourceManager :
     ///
     void Stop();
 
-  private:
+   private:
     // Only allow deletion via scoped_refptr.
     friend class base::RefCountedThreadSafe<Request>;
 
@@ -178,8 +178,7 @@ class CefResourceManager :
     DISALLOW_COPY_AND_ASSIGN(Request);
   };
 
-  typedef std::list<scoped_refptr<Request> > RequestList;
-
+  typedef std::list<scoped_refptr<Request>> RequestList;
 
   ///
   // Interface implemented by resource providers. A provider may be created on
@@ -195,7 +194,7 @@ class CefResourceManager :
     // asynchronously to indicate completion. See comments on Request for
     // additional usage information.
     ///
-    virtual bool OnRequest(scoped_refptr<Request> request) =0;
+    virtual bool OnRequest(scoped_refptr<Request> request) = 0;
 
     ///
     // Called when a request has been canceled. It is still safe to dereference
@@ -232,7 +231,7 @@ class CefResourceManager :
                             const std::string& directory_path,
                             int order,
                             const std::string& identifier);
-                    
+
   ///
   // Add a provider that maps requests that start with |url_path| to files
   // stored in the archive file at |archive_path|. |url_path| should include an
@@ -284,7 +283,6 @@ class CefResourceManager :
   ///
   void SetMimeTypeResolver(const MimeTypeResolver& resolver);
 
-
   // The below methods should be called from other CEF handlers. They must be
   // called exactly as documented for the manager to function correctly.
 
@@ -314,7 +312,7 @@ class CefResourceManager :
                                           CefDeleteOnIOThread>;
 
   ~CefResourceManager();
-  
+
   // Provider and associated information.
   struct ProviderEntry;
   typedef std::list<ProviderEntry*> ProviderEntryList;
@@ -358,14 +356,14 @@ class CefResourceManager :
   ProviderEntryList providers_;
 
   // Map of response ID to pending CefResourceHandler object.
-  typedef std::map<uint64, CefRefPtr<CefResourceHandler> > PendingHandlersMap;
+  typedef std::map<uint64, CefRefPtr<CefResourceHandler>> PendingHandlersMap;
   PendingHandlersMap pending_handlers_;
 
   UrlFilter url_filter_;
   MimeTypeResolver mime_type_resolver_;
 
   // Must be the last member. Created and accessed on the IO thread.
-  scoped_ptr<base::WeakPtrFactory<CefResourceManager> > weak_ptr_factory_;
+  scoped_ptr<base::WeakPtrFactory<CefResourceManager>> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CefResourceManager);
 };
diff --git a/src/include/wrapper/cef_stream_resource_handler.h b/src/include/wrapper/cef_stream_resource_handler.h
index af7fe4af..8e549ddf 100644
--- a/src/include/wrapper/cef_stream_resource_handler.h
+++ b/src/include/wrapper/cef_stream_resource_handler.h
@@ -80,8 +80,7 @@ class CefStreamResourceHandler : public CefResourceHandler {
   virtual void Cancel() OVERRIDE;
 
  private:
-  void ReadOnFileThread(int bytes_to_read,
-                        CefRefPtr<CefCallback> callback);
+  void ReadOnFileThread(int bytes_to_read, CefRefPtr<CefCallback> callback);
 
   const int status_code_;
   const CefString status_text_;
diff --git a/src/include/wrapper/cef_xml_object.h b/src/include/wrapper/cef_xml_object.h
index bf175543..9315adcb 100644
--- a/src/include/wrapper/cef_xml_object.h
+++ b/src/include/wrapper/cef_xml_object.h
@@ -73,8 +73,8 @@ class CefStreamReader;
 ///
 class CefXmlObject : public base::RefCountedThreadSafe<CefXmlObject> {
  public:
-  typedef std::vector<CefRefPtr<CefXmlObject> > ObjectVector;
-  typedef std::map<CefString, CefString > AttributeMap;
+  typedef std::vector<CefRefPtr<CefXmlObject>> ObjectVector;
+  typedef std::map<CefString, CefString> AttributeMap;
 
   ///
   // Create a new object with the specified name. An object name must always be
@@ -88,7 +88,8 @@ class CefXmlObject : public base::RefCountedThreadSafe<CefXmlObject> {
   ///
   bool Load(CefRefPtr<CefStreamReader> stream,
             CefXmlReader::EncodingType encodingType,
-            const CefString& URI, CefString* loadError);
+            const CefString& URI,
+            CefString* loadError);
 
   ///
   // Set the name, children and attributes of this object to a duplicate of the
diff --git a/src/include/wrapper/cef_zip_archive.h b/src/include/wrapper/cef_zip_archive.h
index 5de0960f..9eb28125 100644
--- a/src/include/wrapper/cef_zip_archive.h
+++ b/src/include/wrapper/cef_zip_archive.h
@@ -67,20 +67,20 @@ class CefZipArchive : public base::RefCountedThreadSafe<CefZipArchive> {
     ///
     // Returns the read-only data contained in the file.
     ///
-    virtual const unsigned char* GetData() const =0;
+    virtual const unsigned char* GetData() const = 0;
 
     ///
     // Returns the size of the data in the file.
     ///
-    virtual size_t GetDataSize() const =0;
+    virtual size_t GetDataSize() const = 0;
 
     ///
     // Returns a CefStreamReader object for streaming the contents of the file.
     ///
-    virtual CefRefPtr<CefStreamReader> GetStreamReader() const =0;
+    virtual CefRefPtr<CefStreamReader> GetStreamReader() const = 0;
   };
 
-  typedef std::map<CefString, CefRefPtr<File> > FileMap;
+  typedef std::map<CefString, CefRefPtr<File>> FileMap;
 
   ///
   // Create a new object.

From f5f678d3bc1abb9647d11225831d8688d44c1446 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Thu, 24 May 2018 13:41:36 +0200
Subject: [PATCH 045/238] Update API docs and create a log of CEF changes in
 regards v66 update

---
 api/ApplicationSettings.md   |  13 +++-
 api/Browser.md               |  16 +++-
 api/BrowserSettings.md       |  15 ++--
 api/DragData.md              |  16 ++--
 api/LifespanHandler.md       |  39 +++++-----
 api/Request.md               |   4 +
 api/WindowInfo.md            |  18 ++---
 api/cefpython.md             |  10 +--
 src/cef_v32..v51_changes.txt | 139 +++++++++++++++++++++++++++++++++
 src/cef_v59..v66_changes.txt | 141 +++++++++++++++++++++++++++++++++
 src/cefpython.pyx            | 146 -----------------------------------
 11 files changed, 353 insertions(+), 204 deletions(-)
 create mode 100644 src/cef_v32..v51_changes.txt
 create mode 100644 src/cef_v59..v66_changes.txt

diff --git a/api/ApplicationSettings.md b/api/ApplicationSettings.md
index be86c4b7..5a2f664d 100644
--- a/api/ApplicationSettings.md
+++ b/api/ApplicationSettings.md
@@ -107,10 +107,15 @@ Example values that can be set in Win7 DPI settings (Control Panel Appearance an
 ### background_color
 
 (int)
-Opaque background color used for accelerated content. By default the
-background color will be white. Only the RGB compontents of the specified
-value will be used. The alpha component must greater than 0 to enable use
-of the background color but will be otherwise ignored.
+Description from upstream CEF:
+> Background color used for the browser before a document is loaded and when
+> no document color is specified. The alpha component must be either fully
+> opaque (0xFF) or fully transparent (0x00). If the alpha component is fully
+> opaque then the RGB components will be used as the background color. If the
+> alpha component is fully transparent for a windowed browser then the
+> default value of opaque white be used. If the alpha component is fully
+> transparent for a windowless (off-screen) browser then transparent painting
+> will be enabled.
 
 32-bit ARGB color value, not premultiplied. The color components are always
 in a known order. Equivalent to the `SkColor` type.
diff --git a/api/Browser.md b/api/Browser.md
index 219e1bc1..90aa224f 100644
--- a/api/Browser.md
+++ b/api/Browser.md
@@ -313,15 +313,24 @@ Calling javascript from native code synchronously is not possible in CEF 3. It i
 
 | Parameter | Type |
 | --- | --- |
-| searchID | int |
+| searchId | int |
 | searchText | string |
 | forward | bool |
 | matchCase | bool |
 | findNext | bool |
 | __Return__ | void |
 
-Search for |searchText|. |searchID| can be custom, it is so that you can  have multiple searches running simultaneously. |forward| indicates whether to search forward or backward within the page. |matchCase| indicates whether the search should be case-sensitive. |findNext| indicates whether this is the first request or a follow-up. The CefFindHandler instance, if any, returned via CefClient::GetFindHandler will be called to report find results.
+Description from upstream CEF:
 
+> Search for |searchText|. |identifier| must be a unique ID and these IDs
+> must strictly increase so that newer requests always have greater IDs than
+> older requests. If |identifier| is zero or less than the previous ID value
+> then it will be automatically assigned a new valid ID. |forward| indicates
+> whether to search forward or backward within the page. |matchCase|
+> indicates whether the search should be case-sensitive. |findNext| indicates
+> whether this is the first request or a follow-up. The CefFindHandler
+> instance, if any, returned via CefClient::GetFindHandler will be called to
+> report find results.
 
 ### GetClientCallback
 
@@ -493,7 +502,8 @@ Returns an inner or outer window handle for the browser. If the browser was crea
 | --- | --- |
 | __Return__ | int |
 
-Returns the globally unique identifier for this browser.
+Returns the globally unique identifier for this browser. This value is also
+used as the tabId for extension APIs.
 
 
 ### GetZoomLevel
diff --git a/api/BrowserSettings.md b/api/BrowserSettings.md
index 0cc2816d..d3d4a998 100644
--- a/api/BrowserSettings.md
+++ b/api/BrowserSettings.md
@@ -77,12 +77,15 @@ empty then "en-US,en" will be used.
 ### background_color
 
 (int)
-Opaque background color used for the browser before a document is loaded
-and when no document color is specified. By default the background color
-will be the same as CefSettings.background_color. Only the RGB compontents
-of the specified value will be used. The alpha component must greater than
-0 to enable use of the background color but will be otherwise ignored.
-
+Description from upstream CEF:
+> Background color used for the browser before a document is loaded and when
+> no document color is specified. The alpha component must be either fully
+> opaque (0xFF) or fully transparent (0x00). If the alpha component is fully
+> opaque then the RGB components will be used as the background color. If the
+> alpha component is fully transparent for a windowed browser then the
+> CefSettings.background_color value will be used. If the alpha component is
+> fully transparent for a windowless (off-screen) browser then transparent
+> painting will be enabled.
 
 ### databases_disabled
 
diff --git a/api/DragData.md b/api/DragData.md
index cc7dee86..70901a24 100644
--- a/api/DragData.md
+++ b/api/DragData.md
@@ -81,10 +81,12 @@ Return the text/html fragment that is being dragged.
 | --- | --- |
 | __Return__ | [Image](Image.md) |
 
-Linux-only currently (#251).
+Description from upstream CEF:
+> Get the image representation of drag data. May return NULL if no image
+> representation is available.
 
-Get image representation of drag data. Check with HasImage() first,
-otherwise if there is no image an exception is thrown.
+Check with HasImage() first, otherwise if there is no image an exception
+is thrown.
 
 
 ### GetImageHotspot
@@ -93,9 +95,7 @@ otherwise if there is no image an exception is thrown.
 | --- | --- |
 | __Return__ | [Image](Image.md) |
 
-Linux-only currently (#251).
-
-Get image hotspot (drag start location relative to image dimensions).
+Get the image hotspot (drag start location relative to image dimensions).
 
 
 ### HasImage
@@ -104,7 +104,5 @@ Get image hotspot (drag start location relative to image dimensions).
 | --- | --- |
 | __Return__ | bool |
 
-Linux-only currently (#251).
-
-Whether image representation of drag data is available.
+Returns true if an image representation of drag data is available.
 
diff --git a/api/LifespanHandler.md b/api/LifespanHandler.md
index e4bac696..d3bad5c3 100644
--- a/api/LifespanHandler.md
+++ b/api/LifespanHandler.md
@@ -36,24 +36,27 @@ Table of contents:
 | no_javascript_access_out | list[bool] |
 | __Return__ | bool |
 
-Called on the IO thread before a new popup browser is created. The
-|browser| and |frame| values represent the source of the popup request. The
-|target_url| and |target_frame_name| values indicate where the popup
-browser should navigate and may be empty if not specified with the request.
-The |target_disposition| value indicates where the user intended to open
-the popup (e.g. current tab, new tab, etc). The |user_gesture| value will
-be true if the popup was opened via explicit user gesture (e.g. clicking a
-link) or false if the popup opened automatically (e.g. via the
-DomContentLoaded event). The |popup_features| structure contains additional
-information about the requested popup window. To allow creation of the
-popup browser optionally modify |windowInfo|, |client|, |browserSettings| and
-|no_javascript_access| and return false. To cancel creation of the popup
-browser return true. The |client| and |settings| values will default to the
-source browser's values. If the |no_javascript_access| value is set to
-false the new browser will not be scriptable and may not be hosted in the
-same renderer process as the source browser. Any modifications to
-|window_info| will be ignored if the parent browser is wrapped in a
-CefBrowserView.
+Description from upstream CEF:
+> Called on the UI thread before a new popup browser is created. The
+> |browser| and |frame| values represent the source of the popup request. The
+> |target_url| and |target_frame_name| values indicate where the popup
+> browser should navigate and may be empty if not specified with the request.
+> The |target_disposition| value indicates where the user intended to open
+> the popup (e.g. current tab, new tab, etc). The |user_gesture| value will
+> be true if the popup was opened via explicit user gesture (e.g. clicking a
+> link) or false if the popup opened automatically (e.g. via the
+> DomContentLoaded event). The |popup_features| structure contains additional
+> information about the requested popup window. To allow creation of the
+> popup browser optionally modify |windowInfo|, |client|, |browserSettings| and
+> |no_javascript_access| and return false. To cancel creation of the popup
+> browser return true. The |client| and |settings| values will default to the
+> source browser's values. If the |no_javascript_access| value is set to
+> false the new browser will not be scriptable and may not be hosted in the
+> same renderer process as the source browser. Any modifications to
+> |window_info| will be ignored if the parent browser is wrapped in a
+> CefBrowserView. Popup browser creation will be canceled if the parent
+> browser is destroyed before the popup browser creation completes (indicated
+> by a call to OnAfterCreated for the popup browser).
 
 Note that if you return True and create the popup window yourself, then
 the popup window and parent window will not be able to script each other.
diff --git a/api/Request.md b/api/Request.md
index 47e8b462..961ef8b0 100644
--- a/api/Request.md
+++ b/api/Request.md
@@ -170,6 +170,9 @@ Available flags (access via `cefpython.Request.Flags["xxx"]`):
 
 * **None** - Default behavior.
 * **SkipCache** - If set the cache will be skipped when handling the request.
+  Setting this value is equivalent to specifying the "Cache-Control: no-cache"
+  request header. Setting this value in combination with UR_FLAG_ONLY_FROM_CACHE
+  will cause the request to fail.
 * **AllowCachedCredentials** - If set user name, password, and cookies may be
       sent with the request, and cookies may be saved from the response.
 * **ReportUploadProgress** - If set upload progress events will be generated when a request has a body.
@@ -185,6 +188,7 @@ Available flags (access via `cefpython.Request.Flags["xxx"]`):
 | __Return__ | void |
 
 Set the flags used in combination with [WebRequest](WebRequest.md).
+See GetFlags() for possible values.
 
 
 ### GetFirstPartyForCookies
diff --git a/api/WindowInfo.md b/api/WindowInfo.md
index 319e0d6f..78b5dee5 100644
--- a/api/WindowInfo.md
+++ b/api/WindowInfo.md
@@ -58,13 +58,14 @@ CefRenderHandler interface. The |parent| value will be used to identify
 monitor info and to act as the parent window 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 window 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
+correctly. In order to create windowless browsers the
 CefSettings.windowless_rendering_enabled value must be set to true.
+Transparent painting is enabled by default but can be disabled by setting
+CefBrowserSettings.background_color to an opaque value.
 
 Call this method to disable windowed rendering and to use
-[RenderHandler](RenderHandler.md). See the Panda3D and Kivy examples.
+[RenderHandler](RenderHandler.md). See the pysdl2, screenshot, panda3d
+and kivy examples.
 
 In order to create windowless browsers the
 ApplicationSettings.[windowless_rendering_enabled](ApplicationSettings.md#windowless_rendering_enabled)
@@ -73,12 +74,3 @@ value must be set to true.
 You can pass 0 as `parentWindowHandle`, but then some things like
 context menus and plugins may not display correctly.
 
-
-### SetTransparentPainting
-
-| Parameter | Type |
-| --- | --- |
-| transparentPainting | bool |
-| __Return__ | void |
-
-This method is intended for use with off-screen rendering only.
diff --git a/api/cefpython.md b/api/cefpython.md
index ea7c54cd..fe36900a 100644
--- a/api/cefpython.md
+++ b/api/cefpython.md
@@ -240,16 +240,16 @@ Post a task for execution on the thread associated with this task runner. Execut
 An example usage is in the wxpython.py example on Windows, in implementation of LifespanHandler.OnBeforePopup().
 
 List of threads in the Browser process:
-* cef.TID_UI: The main thread in the browser. This will be the same as the main application thread if cefpython.Initialize() is called with a ApplicationSettings.multi_threaded_message_loop value of false.
+* cef.TID_UI: The main thread in the browser. This will be the same as the main application thread if cefpython.Initialize() is called with a ApplicationSettings.multi_threaded_message_loop value of false. Do not perform blocking tasks on this thread. All tasks posted after CefBrowserProcessHandler::OnContextInitialized() and before CefShutdown() are guaranteed to run. This thread will outlive all other CEF threads.
 * cef.TID_DB: Used to interact with the database.
-* cef.TID_FILE: Used to interact with the file system.
-* cef.TID_FILE_USER_BLOCKING: Used for file system operations that block user interactions. Responsiveness of this thread affects users.
+* cef.TID_FILE: Used for blocking tasks (e.g. file system access) where the user won't notice if the task takes an arbitrarily long time to complete. All tasks posted after CefBrowserProcessHandler::OnContextInitialized() and before CefShutdown() are guaranteed to run.
+* cef.TID_FILE_USER_BLOCKING: Used for blocking tasks (e.g. file system access) that affect UI immediately after a user interaction. All tasks posted after CefBrowserProcessHandler::OnContextInitialized() and before CefShutdown() are guaranteed to run. Example: Generating data shown in the UI immediately after a click.
 * cef.TID_PROCESS_LAUNCHER: Used to launch and terminate browser processes.
 * cef.TID_CACHE: Used to handle slow HTTP cache operations.
-* cef.TID_IO: Used to process IPC and network messages.
+* cef.TID_IO: Used to process IPC and network messages. Do not perform blocking tasks on this thread. All tasks posted after CefBrowserProcessHandler::OnContextInitialized() and before CefShutdown() are guaranteed to run.
 
 List of threads in the Renderer process:
-* cef.TID_RENDERER: The main thread in the renderer. Used for all webkit and V8 interaction.
+* cef.TID_RENDERER: Tasks may be posted to this thread after CefRenderProcessHandler::OnRenderThreadCreated but are not guaranteed to run before sub-process termination (sub-processes may be killed at any time without warning).
 
 
 ### PostDelayedTask
diff --git a/src/cef_v32..v51_changes.txt b/src/cef_v32..v51_changes.txt
new file mode 100644
index 00000000..d14c1f12
--- /dev/null
+++ b/src/cef_v32..v51_changes.txt
@@ -0,0 +1,139 @@
+Changes in v31..v51.
+Not all changes are listed here.
+
+CefEnableHighDPISupport()
+
+CefRequestContext
+    NEW BROWSER SETTINGS that can be get/set using request context:
+        * GetAllPreferences - all preferences for browser's request context
+        * SetPreference
+        * many more methods has/get/canset...
+    _cef_request_context_settings_t:
+        cache_path
+        persist_session_cookies
+        persist_user_preferences
+        ignore_certificate_errors
+    PurgePluginListCache
+    GetDefaultCookieManager
+    GetCachePath
+    IsSharingWith - possible to create new context that shares
+                    storage with another context
+    more methods...
+
+CefRequestContextHandler
+    OnBeforePluginLoad
+
+CefBrowserSettings
+    windowless_frame_rate - **OSR**
+
+CefBrowserHost
+    GetNavigationEntries
+    PrintToPDF
+    ParentWindowWillClose() - REMOVED, update .py examples
+    SetWindowVisibility()
+    ShowDevTools(WindowInfo, CefClient, BrowserSettings, inspect_element_at)
+    CloseDevTools [DONE]
+    ReplaceMisspelling
+    AddWordToDictionary
+    Invalidate
+    NotifyMoveOrResizeStarted() - call in WM_MOVE, WM_MOVING, WM_SIZING on Win
+    GetWindowlessFrameRate - **OSR**
+    SetWindowlessFrameRate - **OSR**
+    DragTargetDragEnter
+    DragTargetDragOver
+    DragTargetDragLeave
+    DragTargetDrop
+    DragSourceEndedAt
+    DragSourceSystemDragEnded
+    HasDevTools
+    DownloadImage
+    HasView
+
+CefRequestHandler
+    OnOpenURLFromTab
+    OnBeforeResourceLoad - new arg CefRequestCallback
+    OnResourceResponse
+    GetResourceResponseFilter - easy way to alter response, no need for the
+                         complicated wxpython-response.py example (Issue #229)
+    OnResourceLoadComplete
+    OnCertificateError - new args: browser and ssl_info.
+                         No more need to set it using
+                         cefpython.SetGlobalClientCallback()
+    OnRenderViewReady
+
+Support for handling onbeforeunload in LifespanHandler::DoClose with
+the use of Browser.TryCloseBrowser() or Browser.CloseBrowser.
+
+CefRequest
+    SetReferrer
+    GetReferrerURL
+    GetReferrerPolicy
+    GetIdentifier
+
+CefResponse
+    GetError
+    SetError
+
+CEF exposes Views/Aura framework as an alternative API
+for client applications. This can be a replacement for
+WinAPI/GTK/X11/Cocoa UI frameworks. See for more info:
+https://bitbucket.org/chromiumembedded/cef/issues/1749
+
+CefPrintHandler - Linux only
+CefPrintSettings
+
+CefDisplayHandler
+    OnFaviconURLChange
+    OnFullscreenModeChange
+
+CefRenderHandler
+    OnCursorChange - new args: type and custom_cursor_info
+    StartDragging
+    UpdateDragCursor
+    OnScrollOffsetChanged - new args: x,y
+
+
+In upstream cefclient:
+1. g_signal_connect(G_OBJECT(window_), "configure-event",
+                    G_CALLBACK(&RootWindowGtk::WindowConfigure), this);
+   browser->GetHost()->NotifyMoveOrResizeStarted();
+2. g_signal_connect(G_OBJECT(window_), "focus-in-event",
+                    G_CALLBACK(&RootWindowGtk::WindowFocusIn), this);
+   self->browser_window_->SetFocus(true);
+
+When window is minimized set browser size to 0x0 to reduce resource usage.
+See cefclient:
+- on Windows see https://github.com/cztomczak/phpdesktop/issues/179
+- on Linux see root_window_gtk.cc > WindowState
+
+CefContextMenuHandler
+    RunContextMenu
+CefContextMenuParams
+    GetMisspelledWord
+    GetDictionarySuggestions
+    IsSpellCheckEnabled
+    IsCustomMenu
+    IsPepperMenu
+
+CefCompletionCallback - added to many cookie functions to run asynchronously
+                        on the IO thread
+
+include/cef_parser.h - url/css/json/etc parsers
+
+CefResourceBundle
+CefResponseFilter
+
+CefValue
+
+cef_get_current_platform_thread_id()
+cef_get_current_platform_thread_handle()
+
+cef_get_xdisplay();
+
+include/cef_ssl_info.h
+include/wrapper/cef_helpers.h - CefDeleteOnThread() free object on
+                                the specified thread
+include/wrapper/cef_resource_manager.h
+
+CefPostData
+    HasExcludedElements
diff --git a/src/cef_v59..v66_changes.txt b/src/cef_v59..v66_changes.txt
new file mode 100644
index 00000000..dabce18e
--- /dev/null
+++ b/src/cef_v59..v66_changes.txt
@@ -0,0 +1,141 @@
+Changes in v59..v66
+
+BREAKAGE (needs updating Migration Guide doc)
+--------
+
+cef_display_handler.h
+- OnConsoleMessage: new param 'level'
+- update migration guide
+
+cef_life_span_handler.h
+- OnBeforePopup: created on UI thread instead of IO thread
+  - update checks for thread
+  - update migration guide
+
+cef_print_handler.h
+- Modify subprocess/print_handler_gtk.h and .cpp files
+- OnPrintSettings new param
+- OnPrintDialog new param
+- OnPrintJob new param
+- OnPrintReset new param
+
+cef_render_process_handler.h
+- Remove OnBeforeNavigation in subprocess/cefpython_app.h and .cpp files
+
+cef_request_handler.h
+- OnBeforeBrowse: new param 'user_gesture'
+
+internal/cef_linux.h
+internal/cef_types_linux.h
+internal/cef_mac.h
+internal/cef_types_mac.h
+internal/cef_win.h
+internal/cef_types_win.h
+- OSR windows are transparent by default. To change it set
+  CefBrowserSettings.background_color .
+- CefWindowInfo (cef_window_info_t): transparent_painting_enabled option removed
+- CefWindowInfo.SetAsWindowless: 'transparent' param removed
+- Deprecate WindowInfo.SetTransparentPainting method. When set
+  to True do nothing. If set to False then raise Exception
+  and provide info on CefBrowserSettings.background_color.
+  - Update Migration Guide doc
+
+internal/cef_types.h
+- cef_settings_t:
+  - javascript_open_windows option removed (keep a dummy for BC)
+- cef_thread_id_t:
+  - TID_DB removed (update Migration Guide)
+  - TID_PROCESS_LAUNCHER removed
+  - TID_CACHE removed
+
+
+NEW FEATURES
+------------
+
+internal/cef_types.h
+- cef_log_severity_t: new key LOGSEVERITY_DEBUG
+- cef_settings_t:
+  - background_color: OSR windows can set an ARGB background color
+- cef_path_key_t (informational only):
+  - PK_DIR_RESOURCES new key
+- cef_urlrequest_flags_t (expose in cefpython.Request.Flags):
+  - UR_FLAG_ONLY_FROM_CACHE new flag
+  - UR_FLAG_STOP_ON_REDIRECT new flag
+  - enum values have changed due to new key
+- cef_thread_id_t:
+  - TID_FILE_BACKGROUND (deprecated TID_FILE)
+  - TID_FILE_USER_VISIBLE
+- cef_popup_features_t: some keys removed (not exposed, informational only)
+- cef_referrer_policy_t changes (not exposed)
+
+cef_accessibility_handler.h
+- CefAccessibilityHandler
+- CefRenderHandler::GetAccessibilityHandler
+
+cef_render_handler.h
+- OnTextSelectionChanged
+
+cef_browser.h
+- SetAccessibilityState
+- SetAutoResizeEnabled
+- GetExtension
+- IsBackgroundHost
+
+cef_cookie.h
+- GetBlockingManager
+
+cef_display_handler.h
+- OnAutoResize
+- OnLoadingProgressChange
+
+cef_drag_data.h
+- GetImage (cross-platform)
+- GetImageHotspot (cross-platform)
+- HasImage (cross-platform)
+
+cef_extension.h
+- CefExtension
+- Will require exposing CefRequestContext object and its methods
+  LoadExtension, DidLoadExtension, etc.
+
+cef_request_context.h
+- LoadExtension
+- DidLoadExtension
+- HasExtension
+- GetExtensions
+- GetExtension
+
+cef_request_context_handler.h
+- OnRequestContextInitialized
+
+cef_extension_handler.h
+- CefGetExtensionResourceCallback
+- CefExtensionHandler
+
+cef_file_util.h
+- CefLoadCRLSetsFile
+
+cef_request_handler.h
+- CanGetCookies
+- CanSetCookie
+
+cef_response.h
+- GetURL
+- SetURL
+
+cef_server.h
+- You can easily start a web server in Python, so exposing this API
+  doesn't seem to be of great value?
+- CefServer: a web server that supports HTTP and WebSocket requests
+- CefServerHandler
+
+cef_urlrequest.h
+- ResponseWasCached
+
+cef_v8.h
+- CefV8ArrayBufferReleaseCallback
+- CefV8Value new methods:
+  - CreateArrayBuffer (does not own the buffer)
+  - IsArrayBuffer
+  - GetArrayBufferReleaseCallback
+  - NeuterArrayBuffer
\ No newline at end of file
diff --git a/src/cefpython.pyx b/src/cefpython.pyx
index b83af619..87e594d2 100644
--- a/src/cefpython.pyx
+++ b/src/cefpython.pyx
@@ -2,152 +2,6 @@
 # All rights reserved. Licensed under BSD 3-clause license.
 # Project website: https://github.com/cztomczak/cefpython
 
-"""
-CHANGES in CEF since v31..v51.
-Below are listed new or modified functions/classes, but not all of them.
--------------------------------------------------------------------------------
-
-CefEnableHighDPISupport()
-
-CefRequestContext
-    NEW BROWSER SETTINGS that can be get/set using request context:
-        * GetAllPreferences - all preferences for browser's request context
-        * SetPreference
-        * many more methods has/get/canset...
-    _cef_request_context_settings_t:
-        cache_path
-        persist_session_cookies
-        persist_user_preferences
-        ignore_certificate_errors
-    PurgePluginListCache
-    GetDefaultCookieManager
-    GetCachePath
-    IsSharingWith - possible to create new context that shares
-                    storage with another context
-    more methods...
-
-CefRequestContextHandler
-    OnBeforePluginLoad
-
-CefBrowserSettings
-    windowless_frame_rate - **OSR**
-
-CefBrowserHost
-    GetNavigationEntries
-    PrintToPDF
-    ParentWindowWillClose() - REMOVED, update .py examples
-    SetWindowVisibility()
-    ShowDevTools(WindowInfo, CefClient, BrowserSettings, inspect_element_at)
-    CloseDevTools [DONE]
-    ReplaceMisspelling
-    AddWordToDictionary
-    Invalidate
-    NotifyMoveOrResizeStarted() - call in WM_MOVE, WM_MOVING, WM_SIZING on Win
-    GetWindowlessFrameRate - **OSR**
-    SetWindowlessFrameRate - **OSR**
-    DragTargetDragEnter
-    DragTargetDragOver
-    DragTargetDragLeave
-    DragTargetDrop
-    DragSourceEndedAt
-    DragSourceSystemDragEnded
-    HasDevTools
-    DownloadImage
-    HasView
-
-CefRequestHandler
-    OnOpenURLFromTab
-    OnBeforeResourceLoad - new arg CefRequestCallback
-    OnResourceResponse
-    GetResourceResponseFilter - easy way to alter response, no need for the
-                         complicated wxpython-response.py example (Issue #229)
-    OnResourceLoadComplete
-    OnCertificateError - new args: browser and ssl_info.
-                         No more need to set it using
-                         cefpython.SetGlobalClientCallback()
-    OnRenderViewReady
-
-Support for handling onbeforeunload in LifespanHandler::DoClose with
-the use of Browser.TryCloseBrowser() or Browser.CloseBrowser.
-
-CefRequest
-    SetReferrer
-    GetReferrerURL
-    GetReferrerPolicy
-    GetIdentifier
-
-CefResponse
-    GetError
-    SetError
-
-CEF exposes Views/Aura framework as an alternative API
-for client applications. This can be a replacement for
-WinAPI/GTK/X11/Cocoa UI frameworks. See for more info:
-https://bitbucket.org/chromiumembedded/cef/issues/1749
-
-CefPrintHandler - Linux only
-CefPrintSettings
-
-CefDisplayHandler
-    OnFaviconURLChange
-    OnFullscreenModeChange
-
-CefRenderHandler
-    OnCursorChange - new args: type and custom_cursor_info
-    StartDragging
-    UpdateDragCursor
-    OnScrollOffsetChanged - new args: x,y
-
-
-In upstream cefclient:
-1. g_signal_connect(G_OBJECT(window_), "configure-event",
-                    G_CALLBACK(&RootWindowGtk::WindowConfigure), this);
-   browser->GetHost()->NotifyMoveOrResizeStarted();
-2. g_signal_connect(G_OBJECT(window_), "focus-in-event",
-                    G_CALLBACK(&RootWindowGtk::WindowFocusIn), this);
-   self->browser_window_->SetFocus(true);
-
-When window is minimized set browser size to 0x0 to reduce resource usage.
-See cefclient:
-- on Windows see https://github.com/cztomczak/phpdesktop/issues/179
-- on Linux see root_window_gtk.cc > WindowState
-
-CefContextMenuHandler
-    RunContextMenu
-CefContextMenuParams
-    GetMisspelledWord
-    GetDictionarySuggestions
-    IsSpellCheckEnabled
-    IsCustomMenu
-    IsPepperMenu
-
-CefCompletionCallback - added to many cookie functions to run asynchronously
-                        on the IO thread
-
-include/cef_parser.h - url/css/json/etc parsers
-
-CefResourceBundle
-CefResponseFilter
-
-CefValue
-
-cef_get_current_platform_thread_id()
-cef_get_current_platform_thread_handle()
-
-cef_get_xdisplay();
-
-include/cef_ssl_info.h
-include/wrapper/cef_helpers.h - CefDeleteOnThread() free object on
-                                the specified thread
-include/wrapper/cef_resource_manager.h
-
-CefPostData
-    HasExcludedElements
-
--------------------------------------------------------------------------------
-END OF: CHANGES in CEF since v31..v47.
-"""
-
 # IMPORTANT notes:
 #
 # - cdef/cpdef functions returning something other than a Python object

From f5dc3a54196e4c3fa82476b1cc06f6150d251a5d Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Thu, 24 May 2018 18:57:09 +0200
Subject: [PATCH 046/238] Update DisplayHandler.OnConsoleMessage, add new param
 'level'

---
 api/DisplayHandler.md                  |  4 ++++
 api/WindowInfo.md                      |  1 -
 docs/Migration-guide.md                | 10 +++++++++-
 src/cef_v59..v66_changes.txt           |  6 +++---
 src/cefpython.pyx                      |  1 +
 src/client_handler/display_handler.cpp | 10 ++++++----
 src/client_handler/display_handler.h   |  1 +
 src/handlers/display_handler.pyx       |  6 ++++--
 8 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/api/DisplayHandler.md b/api/DisplayHandler.md
index 11c860d3..4e45efaf 100644
--- a/api/DisplayHandler.md
+++ b/api/DisplayHandler.md
@@ -75,6 +75,7 @@ Called when the browser receives a status message.
 | Parameter | Type |
 | --- | --- |
 | browser | [Browser](Browser.md) |
+| level | int |
 | message | string |
 | source | string |
 | line | int |
@@ -82,3 +83,6 @@ Called when the browser receives a status message.
 
 Called to display a console message. Return true to stop the message from
 being output to the console.
+
+|level| can be one of the same values as in ApplicationSettings.[log_severity](ApplicationSettings.md#log_severity).
+
diff --git a/api/WindowInfo.md b/api/WindowInfo.md
index 78b5dee5..091eb3f1 100644
--- a/api/WindowInfo.md
+++ b/api/WindowInfo.md
@@ -15,7 +15,6 @@ Table of contents:
   * [SetAsChild](#setaschild)
   * [SetAsPopup](#setaspopup)
   * [SetAsOffscreen](#setasoffscreen)
-  * [SetTransparentPainting](#settransparentpainting)
 
 ## Methods
 
diff --git a/docs/Migration-guide.md b/docs/Migration-guide.md
index b2eed623..435ea6e9 100644
--- a/docs/Migration-guide.md
+++ b/docs/Migration-guide.md
@@ -37,6 +37,7 @@ Table of contents:
 * [v56+ MacOS 10.9+ required to run](#v56-macos-109-required-to-run)
 * [v57.1+ High DPI support on Windows](#v571-high-dpi-support-on-windows)
 * [v66.0+ Linux patch that fixed HTTPS cache problems on pages with certificate errors was disabled](#v660-linux-patch-that-fixed-https-cache-problems-on-pages-with-certificate-errors-was-disabled)
+* [v66.0+ DisplayHandler.OnConsoleMessage new param 'level'](#v660-displayhandleronconsolemessage-new-param-level)
 
 
 
@@ -299,6 +300,13 @@ then you should change it to an empty string now.
 
 ## v66.0+ Linux patch that fixed HTTPS cache problems on pages with certificate errors was disabled
 
-See Issue [#125](../../../issues/125) for more details.
+That patch allowed for HTTPS caching to work when using self-signed
+certificates (or any invalid certificate). This doesn't work anymore. See
+Issue [#125](../../../issues/125) for more details.
+
+
+## v66.0+ DisplayHandler.OnConsoleMessage new param 'level'
 
+The DisplayHandler.[OnConsoleMessage](../api/DisplayHandler.md#onconsolemessage)
+callback has a new param `level`.
 
diff --git a/src/cef_v59..v66_changes.txt b/src/cef_v59..v66_changes.txt
index dabce18e..e710e4ac 100644
--- a/src/cef_v59..v66_changes.txt
+++ b/src/cef_v59..v66_changes.txt
@@ -3,9 +3,9 @@ Changes in v59..v66
 BREAKAGE (needs updating Migration Guide doc)
 --------
 
-cef_display_handler.h
-- OnConsoleMessage: new param 'level'
-- update migration guide
++ cef_display_handler.h
+- + OnConsoleMessage: new param 'level'
+- + update migration guide
 
 cef_life_span_handler.h
 - OnBeforePopup: created on UI thread instead of IO thread
diff --git a/src/cefpython.pyx b/src/cefpython.pyx
index 87e594d2..d66eb666 100644
--- a/src/cefpython.pyx
+++ b/src/cefpython.pyx
@@ -245,6 +245,7 @@ from cef_types cimport (
     CefKeyEvent, CefMouseEvent, CefScreenInfo,
     PathKey, PK_DIR_EXE, PK_DIR_MODULE,
     int32, uint32, int64, uint64,
+    cef_log_severity_t,
 )
 
 # noinspection PyUnresolvedReferences
diff --git a/src/client_handler/display_handler.cpp b/src/client_handler/display_handler.cpp
index a30109d0..8e770510 100644
--- a/src/client_handler/display_handler.cpp
+++ b/src/client_handler/display_handler.cpp
@@ -39,10 +39,12 @@ void DisplayHandler::OnStatusMessage(CefRefPtr<CefBrowser> browser,
 
 
 bool DisplayHandler::OnConsoleMessage(CefRefPtr<CefBrowser> browser,
-                                     const CefString& message,
-                                     const CefString& source,
-                                     int line)
+                                      cef_log_severity_t level,
+                                      const CefString& message,
+                                      const CefString& source,
+                                      int line)
 {
     REQUIRE_UI_THREAD();
-    return DisplayHandler_OnConsoleMessage(browser, message, source, line);
+    return DisplayHandler_OnConsoleMessage(browser, level, message, source,
+                                           line);
 }
diff --git a/src/client_handler/display_handler.h b/src/client_handler/display_handler.h
index 6b6810ca..f6f4c865 100644
--- a/src/client_handler/display_handler.h
+++ b/src/client_handler/display_handler.h
@@ -28,6 +28,7 @@ class DisplayHandler : public CefDisplayHandler
                          const CefString& value) override;
 
     bool OnConsoleMessage(CefRefPtr<CefBrowser> browser,
+                          cef_log_severity_t level,
                           const CefString& message,
                           const CefString& source,
                           int line) override;
diff --git a/src/handlers/display_handler.pyx b/src/handlers/display_handler.pyx
index d67cb4d1..3ad7a7f6 100644
--- a/src/handlers/display_handler.pyx
+++ b/src/handlers/display_handler.pyx
@@ -85,6 +85,7 @@ cdef public void DisplayHandler_OnStatusMessage(
 
 cdef public cpp_bool DisplayHandler_OnConsoleMessage(
         CefRefPtr[CefBrowser] cefBrowser,
+        cef_log_severity_t level,
         const CefString& cefMessage,
         const CefString& cefSource,
         int line
@@ -100,8 +101,9 @@ cdef public cpp_bool DisplayHandler_OnConsoleMessage(
         pySource = CefToPyString(cefSource)
         callback = pyBrowser.GetClientCallback("OnConsoleMessage")
         if callback:
-            returnValue = callback(browser=pyBrowser, message=pyMessage,
-                                   source=pySource, line=line)
+            returnValue = callback(browser=pyBrowser, level=level,
+                                   message=pyMessage, source=pySource,
+                                   line=line)
             return bool(returnValue)
         return False
     except:

From 898910dfb068824ac236aa6b84523dbeb93e4890 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Thu, 24 May 2018 19:09:07 +0200
Subject: [PATCH 047/238] Update automate.py, copy cef_version.h when creating
 prebuilt binaries

---
 tools/automate.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tools/automate.py b/tools/automate.py
index 4ba57b17..da667574 100644
--- a/tools/automate.py
+++ b/tools/automate.py
@@ -834,6 +834,12 @@ def copy_app(app):
     shutil.copy(os.path.join(src, "README.txt"), dst)
     shutil.copy(os.path.join(src, "LICENSE.txt"), dst)
 
+    # Copy cef_version.h
+    cef_version_file = os.path.join(dst, "cef_version_{os_postfix}.h".format(
+                                    os_postfix=OS_POSTFIX))
+    shutil.copy(os.path.join(src, "include", "cef_version.h"),
+                cef_version_file)
+
     print("[automate.py] OK prebuilt binaries created in '%s/'" % dst)
 
 

From 148be269feed36a73c8ffd488656fbb99dacc8c6 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Thu, 24 May 2018 19:17:41 +0200
Subject: [PATCH 048/238] Update version header file for Linux (#403)

---
 src/version/cef_version_linux.h | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/version/cef_version_linux.h b/src/version/cef_version_linux.h
index 526e4630..50e9b4ef 100644
--- a/src/version/cef_version_linux.h
+++ b/src/version/cef_version_linux.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2018 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.3029.1604.g364cd86"
+#define CEF_VERSION "3.3359.1774.gd49d25f"
 #define CEF_VERSION_MAJOR 3
-#define CEF_COMMIT_NUMBER 1604
-#define CEF_COMMIT_HASH "364cd863b14617f21e6bf8fd3ca3faea01e2ef38"
-#define COPYRIGHT_YEAR 2017
+#define CEF_COMMIT_NUMBER 1774
+#define CEF_COMMIT_HASH "d49d25f881b68f418e243e12801cbbb7caebb563"
+#define COPYRIGHT_YEAR 2018
 
-#define CHROME_VERSION_MAJOR 58
+#define CHROME_VERSION_MAJOR 66
 #define CHROME_VERSION_MINOR 0
-#define CHROME_VERSION_BUILD 3029
-#define CHROME_VERSION_PATCH 81
+#define CHROME_VERSION_BUILD 3359
+#define CHROME_VERSION_PATCH 181
 
 #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 "f0e835273a00acd02a699af272fc8f6ff9c5645c"
+#define CEF_API_HASH_UNIVERSAL "84263345b0b1143139aba560e5e5ed16fb6a9628"
 #if defined(OS_WIN)
-#define CEF_API_HASH_PLATFORM "3cf7ac2b9aa61adfb9e5decdf0d32fbf78813355"
+#define CEF_API_HASH_PLATFORM "cf092ef692a2ff18b0fc732b58bde9b8b8655fcc"
 #elif defined(OS_MACOSX)
-#define CEF_API_HASH_PLATFORM "f1d2ed00ab93e03a215fd787e6da9127e2949fd8"
+#define CEF_API_HASH_PLATFORM "34f636bde2f02cb43c10061f384af4fc51c26e1f"
 #elif defined(OS_LINUX)
-#define CEF_API_HASH_PLATFORM "698e69c4297cc63b9893558a8591e7bd7aeeb0d4"
+#define CEF_API_HASH_PLATFORM "6b57a640612f8d459042917ad2568b1526a70af4"
 #endif
 
 // Returns CEF version information for the libcef library. The |entry|

From 05822d1aa9ba6db12ec5be46b388aa56537cc158 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Thu, 24 May 2018 19:29:10 +0200
Subject: [PATCH 049/238] LifespanHandler.OnBeforePopup is now called on UI
 thread (#403)

---
 api/cefpython.md                        |  2 --
 docs/Migration-guide.md                 | 22 ++++++++++++++++------
 src/cef_v59..v66_changes.txt            |  8 ++++----
 src/client_handler/lifespan_handler.cpp |  2 +-
 4 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/api/cefpython.md b/api/cefpython.md
index fe36900a..dd868d00 100644
--- a/api/cefpython.md
+++ b/api/cefpython.md
@@ -237,8 +237,6 @@ Description from upstream CEF:
 
 Post a task for execution on the thread associated with this task runner. Execution will occur asynchronously. Only Browser process threads are allowed.
 
-An example usage is in the wxpython.py example on Windows, in implementation of LifespanHandler.OnBeforePopup().
-
 List of threads in the Browser process:
 * cef.TID_UI: The main thread in the browser. This will be the same as the main application thread if cefpython.Initialize() is called with a ApplicationSettings.multi_threaded_message_loop value of false. Do not perform blocking tasks on this thread. All tasks posted after CefBrowserProcessHandler::OnContextInitialized() and before CefShutdown() are guaranteed to run. This thread will outlive all other CEF threads.
 * cef.TID_DB: Used to interact with the database.
diff --git a/docs/Migration-guide.md b/docs/Migration-guide.md
index 435ea6e9..e6b804ce 100644
--- a/docs/Migration-guide.md
+++ b/docs/Migration-guide.md
@@ -36,8 +36,9 @@ Table of contents:
 * [v55.3+ Handlers' callbacks and other interfaces](#v553-handlers-callbacks-and-other-interfaces)
 * [v56+ MacOS 10.9+ required to run](#v56-macos-109-required-to-run)
 * [v57.1+ High DPI support on Windows](#v571-high-dpi-support-on-windows)
-* [v66.0+ Linux patch that fixed HTTPS cache problems on pages with certificate errors was disabled](#v660-linux-patch-that-fixed-https-cache-problems-on-pages-with-certificate-errors-was-disabled)
-* [v66.0+ DisplayHandler.OnConsoleMessage new param 'level'](#v660-displayhandleronconsolemessage-new-param-level)
+* [v66+ Linux patch that fixed HTTPS cache problems on pages with certificate errors was disabled](#v66-linux-patch-that-fixed-https-cache-problems-on-pages-with-certificate-errors-was-disabled)
+* [v66+ DisplayHandler.OnConsoleMessage has new param 'level'](#v66-displayhandleronconsolemessage-has-new-param-level)
+* [v66+ LifespanHandler.OnBeforePopup is now called on UI thread](#v66-lifespanhandleronbeforepopup-is-now-called-on-ui-thread)
 
 
 
@@ -298,15 +299,24 @@ for High DPI support. In previous versions the default value was
 "system_dpi" and if you have set it explicitilly in your application,
 then you should change it to an empty string now.
 
-## v66.0+ Linux patch that fixed HTTPS cache problems on pages with certificate errors was disabled
+
+## v66+ Linux patch that fixed HTTPS cache problems on pages with certificate errors was disabled
 
 That patch allowed for HTTPS caching to work when using self-signed
-certificates (or any invalid certificate). This doesn't work anymore. See
-Issue [#125](../../../issues/125) for more details.
+certificates (or any invalid certificate). This doesn't work anymore.
+If you need this feature then you can build from sources and apply
+the patch yourself. See Issue [#125](../../../issues/125) for more details.
 
 
-## v66.0+ DisplayHandler.OnConsoleMessage new param 'level'
+## v66+ DisplayHandler.OnConsoleMessage has new param 'level'
 
 The DisplayHandler.[OnConsoleMessage](../api/DisplayHandler.md#onconsolemessage)
 callback has a new param `level`.
 
+
+## v66+ LifespanHandler.OnBeforePopup is now called on UI thread
+
+The LifespanHandler.[OnBeforePopup](../api/LifespanHandler.md#onbeforepopup)
+callback is now called on UI thread. Previously it was called on
+IO thread.
+
diff --git a/src/cef_v59..v66_changes.txt b/src/cef_v59..v66_changes.txt
index e710e4ac..1f1513b7 100644
--- a/src/cef_v59..v66_changes.txt
+++ b/src/cef_v59..v66_changes.txt
@@ -7,10 +7,10 @@ BREAKAGE (needs updating Migration Guide doc)
 - + OnConsoleMessage: new param 'level'
 - + update migration guide
 
-cef_life_span_handler.h
-- OnBeforePopup: created on UI thread instead of IO thread
-  - update checks for thread
-  - update migration guide
++ cef_life_span_handler.h
+- + OnBeforePopup: created on UI thread instead of IO thread
+  - + update checks for thread
+  - + update migration guide
 
 cef_print_handler.h
 - Modify subprocess/print_handler_gtk.h and .cpp files
diff --git a/src/client_handler/lifespan_handler.cpp b/src/client_handler/lifespan_handler.cpp
index d54f5f0a..b4d7d52f 100644
--- a/src/client_handler/lifespan_handler.cpp
+++ b/src/client_handler/lifespan_handler.cpp
@@ -21,7 +21,7 @@ bool LifespanHandler::OnBeforePopup(CefRefPtr<CefBrowser> browser,
                                     CefBrowserSettings& settings,
                                     bool* no_javascript_access)
 {
-    REQUIRE_IO_THREAD();
+    REQUIRE_UI_THREAD();
     // Note: passing popupFeatures is not yet supported.
     const int popupFeaturesNotImpl = 0;
     return LifespanHandler_OnBeforePopup(browser, frame, target_url,

From 9398d68081a976dce53d63ddb38aeb64351ab490 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Thu, 24 May 2018 20:25:04 +0200
Subject: [PATCH 050/238] Update print handler on Linux (#403)

---
 src/cef_v59..v66_changes.txt           |  13 +-
 src/subprocess/print_handler_gtk.cpp   | 560 ++++++++++++++-----------
 src/subprocess/print_handler_gtk.h     |  53 +--
 src/subprocess/print_handler_gtk.patch |  79 ++++
 4 files changed, 429 insertions(+), 276 deletions(-)
 create mode 100644 src/subprocess/print_handler_gtk.patch

diff --git a/src/cef_v59..v66_changes.txt b/src/cef_v59..v66_changes.txt
index 1f1513b7..857d0e77 100644
--- a/src/cef_v59..v66_changes.txt
+++ b/src/cef_v59..v66_changes.txt
@@ -12,12 +12,13 @@ BREAKAGE (needs updating Migration Guide doc)
   - + update checks for thread
   - + update migration guide
 
-cef_print_handler.h
-- Modify subprocess/print_handler_gtk.h and .cpp files
-- OnPrintSettings new param
-- OnPrintDialog new param
-- OnPrintJob new param
-- OnPrintReset new param
++ cef_print_handler.h
+- + Modify subprocess/print_handler_gtk.h and .cpp files
+    (copy from upstream cefclient)
+- + OnPrintSettings new param
+- + OnPrintDialog new param
+- + OnPrintJob new param
+- + OnPrintReset new param
 
 cef_render_process_handler.h
 - Remove OnBeforeNavigation in subprocess/cefpython_app.h and .cpp files
diff --git a/src/subprocess/print_handler_gtk.cpp b/src/subprocess/print_handler_gtk.cpp
index 387ab108..cfccbaff 100644
--- a/src/subprocess/print_handler_gtk.cpp
+++ b/src/subprocess/print_handler_gtk.cpp
@@ -1,5 +1,5 @@
-// COPIED from upstream cef/tests/cefclient/browser/
-// with minor modifications.
+// COPIED from upstream "cef/tests/cefclient/browser/" directory
+// with minor modifications. See the .patch file in current directory.
 
 // Copyright (c) 2014 The Chromium Embedded Framework Authors.
 // Portions Copyright (c) 2012 The Chromium Authors. All rights reserved.
@@ -10,6 +10,9 @@
 
 #include <vector>
 
+#include <gtk/gtk.h>
+#include <gtk/gtkunixprint.h>
+
 #include "include/base/cef_logging.h"
 #include "include/base/cef_macros.h"
 #include "include/wrapper/cef_helpers.h"
@@ -58,15 +61,12 @@ const float kLetterHeightInch = 11.0f;
 
 class StickyPrintSettingGtk {
  public:
-  StickyPrintSettingGtk() : last_used_settings_(gtk_print_settings_new()) {
-  }
+  StickyPrintSettingGtk() : last_used_settings_(gtk_print_settings_new()) {}
   ~StickyPrintSettingGtk() {
     NOTREACHED();  // The instance is intentionally leaked.
   }
 
-  GtkPrintSettings* settings() {
-    return last_used_settings_;
-  }
+  GtkPrintSettings* settings() { return last_used_settings_; }
 
   void SetLastUsedSettings(GtkPrintSettings* settings) {
     DCHECK(last_used_settings_);
@@ -104,9 +104,7 @@ class GtkPrinterList {
 
   // Can return NULL if there's no default printer. E.g. Printer on a laptop
   // is "home_printer", but the laptop is at work.
-  GtkPrinter* default_printer() {
-    return default_printer_;
-  }
+  GtkPrinter* default_printer() { return default_printer_; }
 
   // Can return NULL if the printer cannot be found due to:
   // - Printer list out of sync with printer dialog UI.
@@ -246,9 +244,8 @@ void InitPrintSettings(GtkPrintSettings* settings,
     dpi = kPixelsPerInch;
     double page_width_in_pixel = kLetterWidthInch * dpi;
     double page_height_in_pixel = kLetterHeightInch * dpi;
-    physical_size_device_units.Set(
-        static_cast<int>(page_width_in_pixel),
-        static_cast<int>(page_height_in_pixel));
+    physical_size_device_units.Set(static_cast<int>(page_width_in_pixel),
+                                   static_cast<int>(page_height_in_pixel));
     printable_area_device_units.Set(
         static_cast<int>(kLeftMarginInInch * dpi),
         static_cast<int>(kTopMarginInInch * dpi),
@@ -269,182 +266,350 @@ void InitPrintSettings(GtkPrintSettings* settings,
   // Set before SetPrinterPrintableArea to make it flip area if necessary.
   print_settings->SetOrientation(orientation == GTK_PAGE_ORIENTATION_LANDSCAPE);
   print_settings->SetPrinterPrintableArea(physical_size_device_units,
-                                          printable_area_device_units,
-                                          true);
+                                          printable_area_device_units, true);
 }
 
 }  // namespace
 
+struct ClientPrintHandlerGtk::PrintHandler {
+  PrintHandler(CefRefPtr<CefBrowser> browser)
+      : browser_(browser),
+        dialog_(NULL),
+        gtk_settings_(NULL),
+        page_setup_(NULL),
+        printer_(NULL) {}
+
+  ~PrintHandler() {
+    if (dialog_) {
+      gtk_widget_destroy(dialog_);
+      dialog_ = NULL;
+    }
+    if (gtk_settings_) {
+      g_object_unref(gtk_settings_);
+      gtk_settings_ = NULL;
+    }
+    if (page_setup_) {
+      g_object_unref(page_setup_);
+      page_setup_ = NULL;
+    }
+    if (printer_) {
+      g_object_unref(printer_);
+      printer_ = NULL;
+    }
+  }
 
-ClientPrintHandlerGtk::ClientPrintHandlerGtk()
-    : dialog_(NULL),
-      gtk_settings_(NULL),
-      page_setup_(NULL),
-      printer_(NULL) {
-}
-
-void ClientPrintHandlerGtk::OnPrintStart(CefRefPtr<CefBrowser> browser) {
-}
+  void OnPrintSettings(CefRefPtr<CefPrintSettings> settings,
+                       bool get_defaults) {
+    if (get_defaults) {
+      DCHECK(!page_setup_);
+      DCHECK(!printer_);
 
-void ClientPrintHandlerGtk::OnPrintSettings(
-    CefRefPtr<CefPrintSettings> settings,
-    bool get_defaults) {
-  if (get_defaults) {
-    DCHECK(!page_setup_);
-    DCHECK(!printer_);
-
-    // |gtk_settings_| is a new copy.
-    gtk_settings_ =
-        gtk_print_settings_copy(GetLastUsedSettings()->settings());
-    page_setup_ = gtk_page_setup_new();
-  } else {
-    if (!gtk_settings_) {
+      // |gtk_settings_| is a new copy.
       gtk_settings_ =
           gtk_print_settings_copy(GetLastUsedSettings()->settings());
-    }
+      page_setup_ = gtk_page_setup_new();
+    } else {
+      if (!gtk_settings_) {
+        gtk_settings_ =
+            gtk_print_settings_copy(GetLastUsedSettings()->settings());
+      }
 
-    GtkPrinterList* printer_list = new GtkPrinterList;
-    printer_ = printer_list->GetPrinterWithName(settings->GetDeviceName());
-    if (printer_) {
-      g_object_ref(printer_);
-      gtk_print_settings_set_printer(gtk_settings_,
-                                     gtk_printer_get_name(printer_));
-      if (!page_setup_) {
-        page_setup_ = gtk_printer_get_default_page_size(printer_);
+      GtkPrinterList* printer_list = new GtkPrinterList;
+      printer_ = printer_list->GetPrinterWithName(settings->GetDeviceName());
+      if (printer_) {
+        g_object_ref(printer_);
+        gtk_print_settings_set_printer(gtk_settings_,
+                                       gtk_printer_get_name(printer_));
+        if (!page_setup_) {
+          page_setup_ = gtk_printer_get_default_page_size(printer_);
+        }
+      }
+
+      gtk_print_settings_set_n_copies(gtk_settings_, settings->GetCopies());
+      gtk_print_settings_set_collate(gtk_settings_, settings->WillCollate());
+
+      std::string color_value;
+      std::string color_setting_name;
+      GetColorModelForMode(settings->GetColorModel(), &color_setting_name,
+                           &color_value);
+      gtk_print_settings_set(gtk_settings_, color_setting_name.c_str(),
+                             color_value.c_str());
+
+      if (settings->GetDuplexMode() != DUPLEX_MODE_UNKNOWN) {
+        const char* cups_duplex_mode = NULL;
+        switch (settings->GetDuplexMode()) {
+          case DUPLEX_MODE_LONG_EDGE:
+            cups_duplex_mode = kDuplexNoTumble;
+            break;
+          case DUPLEX_MODE_SHORT_EDGE:
+            cups_duplex_mode = kDuplexTumble;
+            break;
+          case DUPLEX_MODE_SIMPLEX:
+            cups_duplex_mode = kDuplexNone;
+            break;
+          default:  // UNKNOWN_DUPLEX_MODE
+            NOTREACHED();
+            break;
+        }
+        gtk_print_settings_set(gtk_settings_, kCUPSDuplex, cups_duplex_mode);
       }
+
+      if (!page_setup_)
+        page_setup_ = gtk_page_setup_new();
+
+      gtk_print_settings_set_orientation(gtk_settings_,
+                                         settings->IsLandscape()
+                                             ? GTK_PAGE_ORIENTATION_LANDSCAPE
+                                             : GTK_PAGE_ORIENTATION_PORTRAIT);
+
+      delete printer_list;
     }
 
-    gtk_print_settings_set_n_copies(gtk_settings_, settings->GetCopies());
-    gtk_print_settings_set_collate(gtk_settings_, settings->WillCollate());
-
-    std::string color_value;
-    std::string color_setting_name;
-    GetColorModelForMode(settings->GetColorModel(), &color_setting_name,
-                         &color_value);
-    gtk_print_settings_set(gtk_settings_, color_setting_name.c_str(),
-                           color_value.c_str());
-
-    if (settings->GetDuplexMode() != DUPLEX_MODE_UNKNOWN) {
-      const char* cups_duplex_mode = NULL;
-      switch (settings->GetDuplexMode()) {
-        case DUPLEX_MODE_LONG_EDGE:
-          cups_duplex_mode = kDuplexNoTumble;
-          break;
-        case DUPLEX_MODE_SHORT_EDGE:
-          cups_duplex_mode = kDuplexTumble;
-          break;
-        case DUPLEX_MODE_SIMPLEX:
-          cups_duplex_mode = kDuplexNone;
-          break;
-        default:  // UNKNOWN_DUPLEX_MODE
-          NOTREACHED();
-          break;
+    InitPrintSettings(gtk_settings_, page_setup_, settings);
+  }
+
+  bool OnPrintDialog(bool has_selection,
+                     CefRefPtr<CefPrintDialogCallback> callback) {
+    dialog_callback_ = callback;
+
+    GtkWindow* parent = GetWindow();
+    // TODO(estade): We need a window title here.
+    dialog_ = gtk_print_unix_dialog_new(NULL, parent);
+    g_signal_connect(dialog_, "delete-event",
+                     G_CALLBACK(gtk_widget_hide_on_delete), NULL);
+
+    // Set modal so user cannot focus the same tab and press print again.
+    gtk_window_set_modal(GTK_WINDOW(dialog_), TRUE);
+
+    // Since we only generate PDF, only show printers that support PDF.
+    // TODO(thestig) Add more capabilities to support?
+    GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>(
+        GTK_PRINT_CAPABILITY_GENERATE_PDF | GTK_PRINT_CAPABILITY_PAGE_SET |
+        GTK_PRINT_CAPABILITY_COPIES | GTK_PRINT_CAPABILITY_COLLATE |
+        GTK_PRINT_CAPABILITY_REVERSE);
+    gtk_print_unix_dialog_set_manual_capabilities(
+        GTK_PRINT_UNIX_DIALOG(dialog_), cap);
+    gtk_print_unix_dialog_set_embed_page_setup(GTK_PRINT_UNIX_DIALOG(dialog_),
+                                               TRUE);
+    gtk_print_unix_dialog_set_support_selection(GTK_PRINT_UNIX_DIALOG(dialog_),
+                                                TRUE);
+    gtk_print_unix_dialog_set_has_selection(GTK_PRINT_UNIX_DIALOG(dialog_),
+                                            has_selection);
+    gtk_print_unix_dialog_set_settings(GTK_PRINT_UNIX_DIALOG(dialog_),
+                                       gtk_settings_);
+    g_signal_connect(dialog_, "response", G_CALLBACK(OnDialogResponseThunk),
+                     this);
+    gtk_widget_show(dialog_);
+
+    return true;
+  }
+
+  bool OnPrintJob(const CefString& document_name,
+                  const CefString& pdf_file_path,
+                  CefRefPtr<CefPrintJobCallback> callback) {
+    // If |printer_| is NULL then somehow the GTK printer list changed out under
+    // us. In which case, just bail out.
+    if (!printer_)
+      return false;
+
+    job_callback_ = callback;
+
+    // Save the settings for next time.
+    GetLastUsedSettings()->SetLastUsedSettings(gtk_settings_);
+
+    GtkPrintJob* print_job = gtk_print_job_new(
+        document_name.ToString().c_str(), printer_, gtk_settings_, page_setup_);
+    gtk_print_job_set_source_file(print_job, pdf_file_path.ToString().c_str(),
+                                  NULL);
+    gtk_print_job_send(print_job, OnJobCompletedThunk, this, NULL);
+
+    return true;
+  }
+
+ private:
+  // Returns the GtkWindow* for the browser. Will return NULL when using the
+  // Views framework.
+  GtkWindow* GetWindow() {
+    // TODO(cefpython): Test the code that is commented out whether it works
+    /*
+    CefWindowHandle hwnd = browser_->GetWindowHandle();
+    if (hwnd)
+      return GTK_WINDOW(hwnd);
+    */
+    return NULL;
+  }
+
+  void OnDialogResponse(GtkDialog* dialog, gint response_id) {
+    int num_matched_handlers = g_signal_handlers_disconnect_by_func(
+        dialog_, reinterpret_cast<gpointer>(&OnDialogResponseThunk), this);
+    DCHECK_EQ(1, num_matched_handlers);
+
+    gtk_widget_hide(dialog_);
+
+    switch (response_id) {
+      case GTK_RESPONSE_OK: {
+        if (gtk_settings_)
+          g_object_unref(gtk_settings_);
+        gtk_settings_ =
+            gtk_print_unix_dialog_get_settings(GTK_PRINT_UNIX_DIALOG(dialog_));
+
+        if (printer_)
+          g_object_unref(printer_);
+        printer_ = gtk_print_unix_dialog_get_selected_printer(
+            GTK_PRINT_UNIX_DIALOG(dialog_));
+        g_object_ref(printer_);
+
+        if (page_setup_)
+          g_object_unref(page_setup_);
+        page_setup_ = gtk_print_unix_dialog_get_page_setup(
+            GTK_PRINT_UNIX_DIALOG(dialog_));
+        g_object_ref(page_setup_);
+
+        // Handle page ranges.
+        CefPrintSettings::PageRangeList ranges_vector;
+        gint num_ranges;
+        bool print_selection_only = false;
+        switch (gtk_print_settings_get_print_pages(gtk_settings_)) {
+          case GTK_PRINT_PAGES_RANGES: {
+            GtkPageRange* gtk_range =
+                gtk_print_settings_get_page_ranges(gtk_settings_, &num_ranges);
+            if (gtk_range) {
+              for (int i = 0; i < num_ranges; ++i) {
+                ranges_vector.push_back(
+                    CefRange(gtk_range[i].start, gtk_range[i].end));
+              }
+              g_free(gtk_range);
+            }
+            break;
+          }
+          case GTK_PRINT_PAGES_SELECTION:
+            print_selection_only = true;
+            break;
+          case GTK_PRINT_PAGES_ALL:
+            // Leave |ranges_vector| empty to indicate print all pages.
+            break;
+          case GTK_PRINT_PAGES_CURRENT:
+          default:
+            NOTREACHED();
+            break;
+        }
+
+        CefRefPtr<CefPrintSettings> settings = CefPrintSettings::Create();
+        settings->SetPageRanges(ranges_vector);
+        settings->SetSelectionOnly(print_selection_only);
+        InitPrintSettings(gtk_settings_, page_setup_, settings);
+        dialog_callback_->Continue(settings);
+        dialog_callback_ = NULL;
+        return;
       }
-      gtk_print_settings_set(gtk_settings_, kCUPSDuplex, cups_duplex_mode);
+      case GTK_RESPONSE_DELETE_EVENT:  // Fall through.
+      case GTK_RESPONSE_CANCEL: {
+        dialog_callback_->Cancel();
+        dialog_callback_ = NULL;
+        return;
+      }
+      case GTK_RESPONSE_APPLY:
+      default: { NOTREACHED(); }
     }
+  }
 
-    if (!page_setup_)
-      page_setup_ = gtk_page_setup_new();
+  void OnJobCompleted(GtkPrintJob* print_job, GError* error) {
+    // Continue() will result in a call to ClientPrintHandlerGtk::OnPrintReset
+    // which deletes |this|. Execute it asnychronously so the call stack has a
+    // chance to unwind.
+    CefPostTask(TID_UI, base::Bind(&CefPrintJobCallback::Continue,
+                                   job_callback_.get()));
+    job_callback_ = NULL;
+  }
 
-    gtk_print_settings_set_orientation(
-        gtk_settings_,
-        settings->IsLandscape() ? GTK_PAGE_ORIENTATION_LANDSCAPE :
-                                  GTK_PAGE_ORIENTATION_PORTRAIT);
+  static void OnDialogResponseThunk(GtkDialog* dialog,
+                                    gint response_id,
+                                    PrintHandler* handler) {
+    handler->OnDialogResponse(dialog, response_id);
+  }
 
-    delete printer_list;
+  static void OnJobCompletedThunk(GtkPrintJob* print_job,
+                                  void* handler,
+                                  GError* error) {
+    static_cast<PrintHandler*>(handler)->OnJobCompleted(print_job, error);
   }
 
-  InitPrintSettings(gtk_settings_, page_setup_, settings);
+  CefRefPtr<CefBrowser> browser_;
+
+  GtkWidget* dialog_;               // Owned.
+  GtkPrintSettings* gtk_settings_;  // Referenced.
+  GtkPageSetup* page_setup_;        // Referenced.
+  GtkPrinter* printer_;             // Referenced.
+
+  CefRefPtr<CefPrintDialogCallback> dialog_callback_;
+  CefRefPtr<CefPrintJobCallback> job_callback_;
+};
+
+ClientPrintHandlerGtk::ClientPrintHandlerGtk() {}
+
+ClientPrintHandlerGtk::~ClientPrintHandlerGtk() {
+  DCHECK(print_handler_map_.empty());
+}
+
+void ClientPrintHandlerGtk::OnPrintStart(CefRefPtr<CefBrowser> browser) {
+  CEF_REQUIRE_UI_THREAD();
+
+  const int browser_id = browser->GetIdentifier();
+
+#ifndef _NDEBUG
+  // Print handler should not already exist for the browser.
+  PrintHandlerMap::const_iterator it = print_handler_map_.find(browser_id);
+  DCHECK(it == print_handler_map_.end());
+#endif
+
+  // Create a new print handler.
+  PrintHandler* ph = new PrintHandler(browser);
+  print_handler_map_.insert(std::make_pair(browser_id, ph));
+}
+
+void ClientPrintHandlerGtk::OnPrintSettings(
+    CefRefPtr<CefBrowser> browser,
+    CefRefPtr<CefPrintSettings> settings,
+    bool get_defaults) {
+  CEF_REQUIRE_UI_THREAD();
+
+  GetPrintHandler(browser)->OnPrintSettings(settings, get_defaults);
 }
 
 bool ClientPrintHandlerGtk::OnPrintDialog(
+    CefRefPtr<CefBrowser> browser,
     bool has_selection,
     CefRefPtr<CefPrintDialogCallback> callback) {
-  dialog_callback_ = callback;
-
-  // TODO(cef): Identify the correct parent window.
-  GtkWindow* parent = NULL;
-  // TODO(estade): We need a window title here.
-  dialog_ = gtk_print_unix_dialog_new(NULL, parent);
-  g_signal_connect(dialog_, "delete-event",
-                   G_CALLBACK(gtk_widget_hide_on_delete), NULL);
-
-
-  // Set modal so user cannot focus the same tab and press print again.
-  gtk_window_set_modal(GTK_WINDOW(dialog_), TRUE);
-
-  // Since we only generate PDF, only show printers that support PDF.
-  // TODO(thestig) Add more capabilities to support?
-  GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>(
-      GTK_PRINT_CAPABILITY_GENERATE_PDF |
-      GTK_PRINT_CAPABILITY_PAGE_SET |
-      GTK_PRINT_CAPABILITY_COPIES |
-      GTK_PRINT_CAPABILITY_COLLATE |
-      GTK_PRINT_CAPABILITY_REVERSE);
-  gtk_print_unix_dialog_set_manual_capabilities(GTK_PRINT_UNIX_DIALOG(dialog_),
-                                                cap);
-  gtk_print_unix_dialog_set_embed_page_setup(GTK_PRINT_UNIX_DIALOG(dialog_),
-                                             TRUE);
-  gtk_print_unix_dialog_set_support_selection(GTK_PRINT_UNIX_DIALOG(dialog_),
-                                              TRUE);
-  gtk_print_unix_dialog_set_has_selection(GTK_PRINT_UNIX_DIALOG(dialog_),
-                                          has_selection);
-  gtk_print_unix_dialog_set_settings(GTK_PRINT_UNIX_DIALOG(dialog_),
-                                     gtk_settings_);
-  g_signal_connect(dialog_, "response", G_CALLBACK(OnDialogResponseThunk),
-                   this);
-  gtk_widget_show(dialog_);
-
-  return true;
+  CEF_REQUIRE_UI_THREAD();
+
+  return GetPrintHandler(browser)->OnPrintDialog(has_selection, callback);
 }
 
 bool ClientPrintHandlerGtk::OnPrintJob(
+    CefRefPtr<CefBrowser> browser,
     const CefString& document_name,
     const CefString& pdf_file_path,
     CefRefPtr<CefPrintJobCallback> callback) {
-  // If |printer_| is NULL then somehow the GTK printer list changed out under
-  // us. In which case, just bail out.
-  if (!printer_)
-    return false;
-
-  job_callback_ = callback;
-
-  // Save the settings for next time.
-  GetLastUsedSettings()->SetLastUsedSettings(gtk_settings_);
-
-  GtkPrintJob* print_job = gtk_print_job_new(
-      document_name.ToString().c_str(),
-      printer_,
-      gtk_settings_,
-      page_setup_);
-  gtk_print_job_set_source_file(print_job,
-                                pdf_file_path.ToString().c_str(),
-                                NULL);
-  gtk_print_job_send(print_job, OnJobCompletedThunk, this, NULL);
-
-  return true;
+  CEF_REQUIRE_UI_THREAD();
+
+  return GetPrintHandler(browser)->OnPrintJob(document_name, pdf_file_path,
+                                              callback);
 }
 
-void ClientPrintHandlerGtk::OnPrintReset() {
-  if (dialog_) {
-    gtk_widget_destroy(dialog_);
-    dialog_ = NULL;
-  }
-  if (gtk_settings_) {
-    g_object_unref(gtk_settings_);
-    gtk_settings_ = NULL;
-  }
-  if (page_setup_) {
-    g_object_unref(page_setup_);
-    page_setup_ = NULL;
-  }
-  if (printer_) {
-    g_object_unref(printer_);
-    printer_ = NULL;
-  }
+void ClientPrintHandlerGtk::OnPrintReset(CefRefPtr<CefBrowser> browser) {
+  CEF_REQUIRE_UI_THREAD();
+
+  // Delete the print handler.
+  PrintHandlerMap::iterator it =
+      print_handler_map_.find(browser->GetIdentifier());
+  DCHECK(it != print_handler_map_.end());
+  delete it->second;
+  print_handler_map_.erase(it);
 }
 
 CefSize ClientPrintHandlerGtk::GetPdfPaperSize(int device_units_per_inch) {
+  CEF_REQUIRE_UI_THREAD();
+
   GtkPageSetup* page_setup = gtk_page_setup_new();
 
   float width = gtk_page_setup_get_paper_width(page_setup, GTK_UNIT_INCH);
@@ -455,85 +620,10 @@ CefSize ClientPrintHandlerGtk::GetPdfPaperSize(int device_units_per_inch) {
   return CefSize(width * device_units_per_inch, height * device_units_per_inch);
 }
 
-void ClientPrintHandlerGtk::OnDialogResponse(GtkDialog *dialog,
-                                             gint response_id) {
-  int num_matched_handlers = g_signal_handlers_disconnect_by_func(
-      dialog_, reinterpret_cast<gpointer>(&OnDialogResponseThunk), this);
-  DCHECK_EQ(1, num_matched_handlers);
-
-  gtk_widget_hide(dialog_);
-
-  switch (response_id) {
-    case GTK_RESPONSE_OK: {
-      if (gtk_settings_)
-        g_object_unref(gtk_settings_);
-      gtk_settings_ = gtk_print_unix_dialog_get_settings(
-          GTK_PRINT_UNIX_DIALOG(dialog_));
-
-      if (printer_)
-        g_object_unref(printer_);
-      printer_ = gtk_print_unix_dialog_get_selected_printer(
-          GTK_PRINT_UNIX_DIALOG(dialog_));
-      g_object_ref(printer_);
-
-      if (page_setup_)
-        g_object_unref(page_setup_);
-      page_setup_ = gtk_print_unix_dialog_get_page_setup(
-          GTK_PRINT_UNIX_DIALOG(dialog_));
-      g_object_ref(page_setup_);
-
-      // Handle page ranges.
-      CefPrintSettings::PageRangeList ranges_vector;
-      gint num_ranges;
-      bool print_selection_only = false;
-      switch (gtk_print_settings_get_print_pages(gtk_settings_)) {
-        case GTK_PRINT_PAGES_RANGES: {
-          GtkPageRange* gtk_range =
-              gtk_print_settings_get_page_ranges(gtk_settings_, &num_ranges);
-          if (gtk_range) {
-            for (int i = 0; i < num_ranges; ++i) {
-              ranges_vector.push_back(
-                  CefRange(gtk_range[i].start, gtk_range[i].end));
-            }
-            g_free(gtk_range);
-          }
-          break;
-        }
-        case GTK_PRINT_PAGES_SELECTION:
-          print_selection_only = true;
-          break;
-        case GTK_PRINT_PAGES_ALL:
-          // Leave |ranges_vector| empty to indicate print all pages.
-          break;
-        case GTK_PRINT_PAGES_CURRENT:
-        default:
-          NOTREACHED();
-          break;
-      }
-
-      CefRefPtr<CefPrintSettings> settings = CefPrintSettings::Create();
-      settings->SetPageRanges(ranges_vector);
-      settings->SetSelectionOnly(print_selection_only);
-      InitPrintSettings(gtk_settings_, page_setup_, settings);
-      dialog_callback_->Continue(settings);
-      dialog_callback_ = NULL;
-      return;
-    }
-    case GTK_RESPONSE_DELETE_EVENT:  // Fall through.
-    case GTK_RESPONSE_CANCEL: {
-      dialog_callback_->Cancel();
-      dialog_callback_ = NULL;
-      return;
-    }
-    case GTK_RESPONSE_APPLY:
-    default: {
-      NOTREACHED();
-    }
-  }
-}
-
-void ClientPrintHandlerGtk::OnJobCompleted(GtkPrintJob* print_job,
-                                           GError* error) {
-  job_callback_->Continue();
-  job_callback_ = NULL;
+ClientPrintHandlerGtk::PrintHandler* ClientPrintHandlerGtk::GetPrintHandler(
+    CefRefPtr<CefBrowser> browser) {
+  PrintHandlerMap::const_iterator it =
+      print_handler_map_.find(browser->GetIdentifier());
+  DCHECK(it != print_handler_map_.end());
+  return it->second;
 }
diff --git a/src/subprocess/print_handler_gtk.h b/src/subprocess/print_handler_gtk.h
index aaeb4f19..f7878416 100644
--- a/src/subprocess/print_handler_gtk.h
+++ b/src/subprocess/print_handler_gtk.h
@@ -1,5 +1,5 @@
-// COPIED from upstream cef/tests/cefclient/browser/
-// with minor modifications.
+// COPIED from upstream "cef/tests/cefclient/browser/" directory
+// with minor modifications. See the .patch file in current directory.
 
 // Copyright (c) 2014 The Chromium Embedded Framework Authors.
 // Portions Copyright (c) 2012 The Chromium Authors. All rights reserved.
@@ -10,55 +10,38 @@
 #define CEF_TESTS_CEFCLIENT_BROWSER_PRINT_HANDLER_GTK_H_
 #pragma once
 
-#include <gtk/gtk.h>
-#include <gtk/gtkunixprint.h>
+#include <map>
 
 #include "include/cef_print_handler.h"
 
 class ClientPrintHandlerGtk : public CefPrintHandler {
  public:
   ClientPrintHandlerGtk();
+  virtual ~ClientPrintHandlerGtk();
 
   // CefPrintHandler methods.
   void OnPrintStart(CefRefPtr<CefBrowser> browser) OVERRIDE;
-  void OnPrintSettings(CefRefPtr<CefPrintSettings> settings,
+  void OnPrintSettings(CefRefPtr<CefBrowser> browser,
+                       CefRefPtr<CefPrintSettings> settings,
                        bool get_defaults) OVERRIDE;
-  bool OnPrintDialog(
-      bool has_selection,
-      CefRefPtr<CefPrintDialogCallback> callback) OVERRIDE;
-  bool OnPrintJob(const CefString& document_name,
+  bool OnPrintDialog(CefRefPtr<CefBrowser> browser,
+                     bool has_selection,
+                     CefRefPtr<CefPrintDialogCallback> callback) OVERRIDE;
+  bool OnPrintJob(CefRefPtr<CefBrowser> browser,
+                  const CefString& document_name,
                   const CefString& pdf_file_path,
                   CefRefPtr<CefPrintJobCallback> callback) OVERRIDE;
-  void OnPrintReset() OVERRIDE;
+  void OnPrintReset(CefRefPtr<CefBrowser> browser) OVERRIDE;
   CefSize GetPdfPaperSize(int device_units_per_inch) OVERRIDE;
 
  private:
-  void OnDialogResponse(GtkDialog *dialog,
-                        gint response_id);
-  void OnJobCompleted(GtkPrintJob* print_job,
-                      GError* error);
+  // Print handler.
+  struct PrintHandler;
+  PrintHandler* GetPrintHandler(CefRefPtr<CefBrowser> browser);
 
-  static void OnDialogResponseThunk(GtkDialog *dialog,
-                                    gint response_id,
-                                    ClientPrintHandlerGtk* handler) {
-    handler->OnDialogResponse(dialog, response_id);
-  }
-  static void OnJobCompletedThunk(GtkPrintJob* print_job,
-                                  void* handler,
-                                  GError* error) {
-    static_cast<ClientPrintHandlerGtk*>(handler)->
-        OnJobCompleted(print_job, error);
-  }
-
-  // Print dialog settings. ClientPrintHandlerGtk owns |dialog_| and holds
-  // references to the other objects.
-  GtkWidget* dialog_;
-  GtkPrintSettings* gtk_settings_;
-  GtkPageSetup* page_setup_;
-  GtkPrinter* printer_;
-
-  CefRefPtr<CefPrintDialogCallback> dialog_callback_;
-  CefRefPtr<CefPrintJobCallback> job_callback_;
+  // Map of browser ID to print handler.
+  typedef std::map<int, PrintHandler*> PrintHandlerMap;
+  PrintHandlerMap print_handler_map_;
 
   IMPLEMENT_REFCOUNTING(ClientPrintHandlerGtk);
   DISALLOW_COPY_AND_ASSIGN(ClientPrintHandlerGtk);
diff --git a/src/subprocess/print_handler_gtk.patch b/src/subprocess/print_handler_gtk.patch
new file mode 100644
index 00000000..98f49960
--- /dev/null
+++ b/src/subprocess/print_handler_gtk.patch
@@ -0,0 +1,79 @@
+diff --git print_handler_gtk.cc print_handler_gtk.cc
+index 9a822b7a..cfccbaff 100644
+--- print_handler_gtk.cc
++++ print_handler_gtk.cc
+@@ -1,9 +1,12 @@
++// COPIED from upstream "cef/tests/cefclient/browser/" directory
++// with minor modifications. See the .patch file in current directory.
++
+ // Copyright (c) 2014 The Chromium Embedded Framework Authors.
+ // Portions Copyright (c) 2012 The Chromium Authors. All rights reserved.
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+ 
+-#include "tests/cefclient/browser/print_handler_gtk.h"
++#include "print_handler_gtk.h"
+ 
+ #include <vector>
+ 
+@@ -14,10 +17,6 @@
+ #include "include/base/cef_macros.h"
+ #include "include/wrapper/cef_helpers.h"
+ 
+-#include "tests/cefclient/browser/root_window.h"
+-
+-namespace client {
+-
+ namespace {
+ 
+ // CUPS Duplex attribute and values.
+@@ -431,10 +430,12 @@ struct ClientPrintHandlerGtk::PrintHandler {
+   // Returns the GtkWindow* for the browser. Will return NULL when using the
+   // Views framework.
+   GtkWindow* GetWindow() {
+-    scoped_refptr<RootWindow> root_window =
+-        RootWindow::GetForBrowser(browser_->GetIdentifier());
+-    if (root_window)
+-      return GTK_WINDOW(root_window->GetWindowHandle());
++    // TODO(cefpython): Test the code that is commented out whether it works
++    /*
++    CefWindowHandle hwnd = browser_->GetWindowHandle();
++    if (hwnd)
++      return GTK_WINDOW(hwnd);
++    */
+     return NULL;
+   }
+ 
+@@ -626,5 +627,3 @@ ClientPrintHandlerGtk::PrintHandler* ClientPrintHandlerGtk::GetPrintHandler(
+   DCHECK(it != print_handler_map_.end());
+   return it->second;
+ }
+-
+-}  // namespace client
+diff --git print_handler_gtk.h print_handler_gtk.h
+index 857b8c72..f7878416 100644
+--- print_handler_gtk.h
++++ print_handler_gtk.h
+@@ -1,3 +1,6 @@
++// COPIED from upstream "cef/tests/cefclient/browser/" directory
++// with minor modifications. See the .patch file in current directory.
++
+ // Copyright (c) 2014 The Chromium Embedded Framework Authors.
+ // Portions Copyright (c) 2012 The Chromium Authors. All rights reserved.
+ // Use of this source code is governed by a BSD-style license that can be
+@@ -11,8 +14,6 @@
+ 
+ #include "include/cef_print_handler.h"
+ 
+-namespace client {
+-
+ class ClientPrintHandlerGtk : public CefPrintHandler {
+  public:
+   ClientPrintHandlerGtk();
+@@ -46,6 +47,4 @@ class ClientPrintHandlerGtk : public CefPrintHandler {
+   DISALLOW_COPY_AND_ASSIGN(ClientPrintHandlerGtk);
+ };
+ 
+-}  // namespace client
+-
+ #endif  // CEF_TESTS_CEFCLIENT_BROWSER_PRINT_HANDLER_GTK_H_

From 44a74adb998bbd531401a69bb67e393cb656abfd Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Thu, 24 May 2018 20:31:40 +0200
Subject: [PATCH 051/238] Remove OnBeforeNavigation callback in renderer
 process (#403)

---
 src/cef_v59..v66_changes.txt     | 10 ++++++----
 src/subprocess/cefpython_app.cpp |  8 --------
 src/subprocess/cefpython_app.h   |  7 -------
 3 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/cef_v59..v66_changes.txt b/src/cef_v59..v66_changes.txt
index 857d0e77..51b7daa0 100644
--- a/src/cef_v59..v66_changes.txt
+++ b/src/cef_v59..v66_changes.txt
@@ -20,11 +20,12 @@ BREAKAGE (needs updating Migration Guide doc)
 - + OnPrintJob new param
 - + OnPrintReset new param
 
-cef_render_process_handler.h
-- Remove OnBeforeNavigation in subprocess/cefpython_app.h and .cpp files
++ cef_render_process_handler.h
+- + Remove OnBeforeNavigation in subprocess/cefpython_app.h and .cpp files
 
 cef_request_handler.h
 - OnBeforeBrowse: new param 'user_gesture'
+- update Migration Guide
 
 internal/cef_linux.h
 internal/cef_types_linux.h
@@ -44,10 +45,11 @@ internal/cef_types_win.h
 internal/cef_types.h
 - cef_settings_t:
   - javascript_open_windows option removed (keep a dummy for BC)
+    - update Migration Guide
 - cef_thread_id_t:
   - TID_DB removed (update Migration Guide)
-  - TID_PROCESS_LAUNCHER removed
-  - TID_CACHE removed
+  - TID_PROCESS_LAUNCHER removed (update Migration Guide)
+  - TID_CACHE removed (update Migration Guide)
 
 
 NEW FEATURES
diff --git a/src/subprocess/cefpython_app.cpp b/src/subprocess/cefpython_app.cpp
index 269da21b..9105da3c 100644
--- a/src/subprocess/cefpython_app.cpp
+++ b/src/subprocess/cefpython_app.cpp
@@ -259,14 +259,6 @@ void CefPythonApp::OnBrowserDestroyed(CefRefPtr<CefBrowser> browser) {
     RemoveJavascriptBindings(browser);
 }
 
-bool CefPythonApp::OnBeforeNavigation(CefRefPtr<CefBrowser> browser,
-                                      CefRefPtr<CefFrame> frame,
-                                      CefRefPtr<CefRequest> request,
-                                      cef_navigation_type_t navigation_type,
-                                      bool is_redirect) {
-    return false;
-}
-
 void CefPythonApp::OnContextCreated(CefRefPtr<CefBrowser> browser,
                                     CefRefPtr<CefFrame> frame,
                                     CefRefPtr<CefV8Context> context) {
diff --git a/src/subprocess/cefpython_app.h b/src/subprocess/cefpython_app.h
index e12fd570..6b2048a4 100644
--- a/src/subprocess/cefpython_app.h
+++ b/src/subprocess/cefpython_app.h
@@ -74,13 +74,6 @@ class CefPythonApp :
   void OnBrowserDestroyed(CefRefPtr<CefBrowser> browser)
         override;
 
-  bool OnBeforeNavigation(CefRefPtr<CefBrowser> browser,
-                                  CefRefPtr<CefFrame> frame,
-                                  CefRefPtr<CefRequest> request,
-                                  cef_navigation_type_t navigation_type,
-                                  bool is_redirect)
-        override;
-
   void OnContextCreated(CefRefPtr<CefBrowser> browser,
                                 CefRefPtr<CefFrame> frame,
                                 CefRefPtr<CefV8Context> context)

From 5f7a3f1cb723542c7254c82741fbd560e575cd47 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Fri, 25 May 2018 09:03:26 +0200
Subject: [PATCH 052/238] RequestHandler.OnBeforeBrowse hsa a new param
 'user_gesture' (#403)

---
 api/RequestHandler.md                  | 21 ++++++++++++---------
 docs/Migration-guide.md                | 17 +++++++++++++----
 src/cef_v59..v66_changes.txt           |  6 +++---
 src/client_handler/request_handler.cpp |  4 +++-
 src/client_handler/request_handler.h   |  1 +
 src/handlers/request_handler.pyx       |  8 ++++----
 6 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/api/RequestHandler.md b/api/RequestHandler.md
index 01b2ea99..6a7c145d 100644
--- a/api/RequestHandler.md
+++ b/api/RequestHandler.md
@@ -44,18 +44,21 @@ Table of contents:
 | browser | [Browser](Browser.md) |
 | frame | [Frame](Frame.md) |
 | request | [Request](Request.md) |
+| user_gesture | bool |
 | is_redirect | bool |
 | __Return__ | bool |
 
-Called on the UI thread before browser navigation. Return true to cancel
-the navigation or false to allow the navigation to proceed. The |request|
-object cannot be modified in this callback.
-[DisplayHandler](DisplayHandler.md).`OnLoadingStateChange` will be
-called twice in all cases.
-If the navigation is allowed [LoadHandler](LoadHandler.md).`OnLoadStart` and
-`OnLoadEnd` will be called. If the navigation is canceled
-[LoadHandler](LoadHandler.md).`OnLoadError` will be called with
-an |error_code| value of ERR_ABORTED.
+Description from upstream CEF:
+> Called on the UI thread before browser navigation. Return true to cancel
+> the navigation or false to allow the navigation to proceed. The |request|
+> object cannot be modified in this callback.
+> CefLoadHandler::OnLoadingStateChange will be called twice in all cases.
+> If the navigation is allowed CefLoadHandler::OnLoadStart and
+> CefLoadHandler::OnLoadEnd will be called. If the navigation is canceled
+> CefLoadHandler::OnLoadError will be called with an |errorCode| value of
+> ERR_ABORTED. The |user_gesture| value will be true if the browser
+> navigated via explicit user gesture (e.g. clicking a link) or false if it
+> navigated automatically (e.g. via the DomContentLoaded event).
 
 
 ### OnBeforeResourceLoad
diff --git a/docs/Migration-guide.md b/docs/Migration-guide.md
index e6b804ce..6b0d7660 100644
--- a/docs/Migration-guide.md
+++ b/docs/Migration-guide.md
@@ -33,12 +33,13 @@ Table of contents:
 * [v54+ GTK 3 example doesn't work anymore on Linux](#v54-gtk-3-example-doesnt-work-anymore-on-linux)
 * [v54+ libcef.so library is stripped from symbols on Linux](#v54-libcefso-library-is-stripped-from-symbols-on-linux)
 * [v55+ HTTPS cache problems on pages with certificate errors](#v55-https-cache-problems-on-pages-with-certificate-errors)
-* [v55.3+ Handlers' callbacks and other interfaces](#v553-handlers-callbacks-and-other-interfaces)
+* [v55.3+ Handlers' callbacks and other interfaces are now called using keyword args](#v553-handlers-callbacks-and-other-interfaces-are-now-called-using-keyword-args)
 * [v56+ MacOS 10.9+ required to run](#v56-macos-109-required-to-run)
 * [v57.1+ High DPI support on Windows](#v571-high-dpi-support-on-windows)
 * [v66+ Linux patch that fixed HTTPS cache problems on pages with certificate errors was disabled](#v66-linux-patch-that-fixed-https-cache-problems-on-pages-with-certificate-errors-was-disabled)
-* [v66+ DisplayHandler.OnConsoleMessage has new param 'level'](#v66-displayhandleronconsolemessage-has-new-param-level)
+* [v66+ DisplayHandler.OnConsoleMessage has a new param 'level'](#v66-displayhandleronconsolemessage-has-a-new-param-level)
 * [v66+ LifespanHandler.OnBeforePopup is now called on UI thread](#v66-lifespanhandleronbeforepopup-is-now-called-on-ui-thread)
+* [V66+ RequestHandler.OnBeforeBrowse has a new param 'user_gesture'](#v66-requesthandleronbeforebrowse-has-a-new-param-user_gesture)
 
 
 
@@ -212,6 +213,8 @@ API ref: Request.[GetHeaderMap](../api/Request.md#getheadermap)
 
 ## v54+ GTK 3 example doesn't work anymore on Linux
 
+Update: GTK 3 example is back working in v57+.
+
 Currently GTK 3 example is broken on Linux. You can either
 downgrade to an old cefpython v53 (available on GitHub release
 page) or use GTK 2 example. For more details on the problem see
@@ -236,7 +239,7 @@ cefpython starts using CEF prebuilt binaries from Spotify.
 See Issue [#125](../../../issues/125) for more details.
 
 
-## v55.3+ Handlers' callbacks and other interfaces
+## v55.3+ Handlers' callbacks and other interfaces are now called using keyword args
 
 Since v55.3 all handlers' callbacks and other interfaces such as
 CookieVisitor, StringVisitor and WebRequestClient, are now called
@@ -308,7 +311,7 @@ If you need this feature then you can build from sources and apply
 the patch yourself. See Issue [#125](../../../issues/125) for more details.
 
 
-## v66+ DisplayHandler.OnConsoleMessage has new param 'level'
+## v66+ DisplayHandler.OnConsoleMessage has a new param 'level'
 
 The DisplayHandler.[OnConsoleMessage](../api/DisplayHandler.md#onconsolemessage)
 callback has a new param `level`.
@@ -320,3 +323,9 @@ The LifespanHandler.[OnBeforePopup](../api/LifespanHandler.md#onbeforepopup)
 callback is now called on UI thread. Previously it was called on
 IO thread.
 
+
+## V66+ RequestHandler.OnBeforeBrowse has a new param 'user_gesture'
+
+The RequestHandler.[OnBeforeBrowse](../api/RequestHandler.md#onbeforebrowse)
+callback has a new param `user_gesture`.
+
diff --git a/src/cef_v59..v66_changes.txt b/src/cef_v59..v66_changes.txt
index 51b7daa0..2ae04d86 100644
--- a/src/cef_v59..v66_changes.txt
+++ b/src/cef_v59..v66_changes.txt
@@ -23,9 +23,9 @@ BREAKAGE (needs updating Migration Guide doc)
 + cef_render_process_handler.h
 - + Remove OnBeforeNavigation in subprocess/cefpython_app.h and .cpp files
 
-cef_request_handler.h
-- OnBeforeBrowse: new param 'user_gesture'
-- update Migration Guide
++ cef_request_handler.h
+- + OnBeforeBrowse: new param 'user_gesture'
+- + update Migration Guide
 
 internal/cef_linux.h
 internal/cef_types_linux.h
diff --git a/src/client_handler/request_handler.cpp b/src/client_handler/request_handler.cpp
index c06e098d..ea681559 100644
--- a/src/client_handler/request_handler.cpp
+++ b/src/client_handler/request_handler.cpp
@@ -9,10 +9,12 @@
 bool RequestHandler::OnBeforeBrowse(CefRefPtr<CefBrowser> browser,
                                     CefRefPtr<CefFrame> frame,
                                     CefRefPtr<CefRequest> request,
+                                    bool user_gesture,
                                     bool is_redirect)
 {
     REQUIRE_UI_THREAD();
-    return RequestHandler_OnBeforeBrowse(browser, frame, request, is_redirect);
+    return RequestHandler_OnBeforeBrowse(browser, frame, request,
+                                         user_gesture, is_redirect);
 }
 
 
diff --git a/src/client_handler/request_handler.h b/src/client_handler/request_handler.h
index afaf3f83..a56760b2 100644
--- a/src/client_handler/request_handler.h
+++ b/src/client_handler/request_handler.h
@@ -17,6 +17,7 @@ class RequestHandler : public CefRequestHandler
     bool OnBeforeBrowse(CefRefPtr<CefBrowser> browser,
                         CefRefPtr<CefFrame> frame,
                         CefRefPtr<CefRequest> request,
+                        bool user_gesture,
                         bool is_redirect) override;
 
     ReturnValue OnBeforeResourceLoad(CefRefPtr<CefBrowser> browser,
diff --git a/src/handlers/request_handler.pyx b/src/handlers/request_handler.pyx
index 0df1d867..ff8799c2 100644
--- a/src/handlers/request_handler.pyx
+++ b/src/handlers/request_handler.pyx
@@ -59,26 +59,26 @@ cdef public cpp_bool RequestHandler_OnBeforeBrowse(
         CefRefPtr[CefBrowser] cefBrowser,
         CefRefPtr[CefFrame] cefFrame,
         CefRefPtr[CefRequest] cefRequest,
-        cpp_bool cefIsRedirect
+        cpp_bool user_gesture,
+        cpp_bool is_redirect
         ) except * with gil:
     cdef PyBrowser pyBrowser
     cdef PyFrame pyFrame
     cdef PyRequest pyRequest
-    cdef py_bool pyIsRedirect
     cdef object clientCallback
     cdef py_bool returnValue
     try:
         pyBrowser = GetPyBrowser(cefBrowser, "OnBeforeBrowse")
         pyFrame = GetPyFrame(cefFrame)
         pyRequest = CreatePyRequest(cefRequest)
-        pyIsRedirect = bool(cefIsRedirect)
         clientCallback = pyBrowser.GetClientCallback("OnBeforeBrowse")
         if clientCallback:
             returnValue = clientCallback(
                     browser=pyBrowser,
                     frame=pyFrame,
                     request=pyRequest,
-                    is_redirect=pyIsRedirect)
+                    user_gesture=user_gesture,
+                    is_redirect=is_redirect)
             return bool(returnValue)
         else:
             return False

From f699c592fc78c4c8304984b3b27eeacade35cd19 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Fri, 25 May 2018 09:23:37 +0200
Subject: [PATCH 053/238] Change window transparency behavior (#403)

---
 README.md                    | 11 +++++------
 api/API-index.md             |  1 -
 docs/Migration-guide.md      | 19 +++++++++++++++++--
 src/cef_v59..v66_changes.txt | 28 ++++++++++++++--------------
 src/extern/cef/cef_linux.pxd |  3 +--
 src/extern/cef/cef_mac.pxd   |  3 +--
 src/extern/cef/cef_win.pxd   |  3 +--
 src/window_info.pyx          | 15 +++++++++------
 8 files changed, 48 insertions(+), 35 deletions(-)

diff --git a/README.md b/README.md
index 9c4fa340..3b79dcba 100644
--- a/README.md
+++ b/README.md
@@ -257,8 +257,8 @@ Additional information for v31.2 release:
 - [Tutorial](docs/Tutorial.md)
 
 
-### API categories
-
+### API categories
+
 #### Modules
 
  * [cefpython](api/cefpython.md#cefpython) module
@@ -313,9 +313,9 @@ Additional information for v31.2 release:
  * [StringVisitor](api/StringVisitor.md#stringvisitor-interface) interface
  * [WebRequestClient](api/WebRequestClient.md#webrequestclient-interface) interface
 
-
-### API index
-
+
+### API index
+
 * [Application settings](api/ApplicationSettings.md#application-settings)
   * [accept_language_list](api/ApplicationSettings.md#accept_language_list)
   * [app_user_model_id](api/ApplicationSettings.md#app_user_model_id)
@@ -748,7 +748,6 @@ Additional information for v31.2 release:
   * [SetAsChild](api/WindowInfo.md#setaschild)
   * [SetAsPopup](api/WindowInfo.md#setaspopup)
   * [SetAsOffscreen](api/WindowInfo.md#setasoffscreen)
-  * [SetTransparentPainting](api/WindowInfo.md#settransparentpainting)
 * [WindowUtils (class)](api/WindowUtils.md#windowutils-class)
   * [OnSetFocus ](api/WindowUtils.md#onsetfocus-win)
   * [OnSize ](api/WindowUtils.md#onsize-win)
diff --git a/api/API-index.md b/api/API-index.md
index 79fb2591..4227a373 100644
--- a/api/API-index.md
+++ b/api/API-index.md
@@ -434,7 +434,6 @@
   * [SetAsChild](WindowInfo.md#setaschild)
   * [SetAsPopup](WindowInfo.md#setaspopup)
   * [SetAsOffscreen](WindowInfo.md#setasoffscreen)
-  * [SetTransparentPainting](WindowInfo.md#settransparentpainting)
 * [WindowUtils (class)](WindowUtils.md#windowutils-class)
   * [OnSetFocus ](WindowUtils.md#onsetfocus-win)
   * [OnSize ](WindowUtils.md#onsize-win)
diff --git a/docs/Migration-guide.md b/docs/Migration-guide.md
index 6b0d7660..6f015606 100644
--- a/docs/Migration-guide.md
+++ b/docs/Migration-guide.md
@@ -39,7 +39,8 @@ Table of contents:
 * [v66+ Linux patch that fixed HTTPS cache problems on pages with certificate errors was disabled](#v66-linux-patch-that-fixed-https-cache-problems-on-pages-with-certificate-errors-was-disabled)
 * [v66+ DisplayHandler.OnConsoleMessage has a new param 'level'](#v66-displayhandleronconsolemessage-has-a-new-param-level)
 * [v66+ LifespanHandler.OnBeforePopup is now called on UI thread](#v66-lifespanhandleronbeforepopup-is-now-called-on-ui-thread)
-* [V66+ RequestHandler.OnBeforeBrowse has a new param 'user_gesture'](#v66-requesthandleronbeforebrowse-has-a-new-param-user_gesture)
+* [v66+ RequestHandler.OnBeforeBrowse has a new param 'user_gesture'](#v66-requesthandleronbeforebrowse-has-a-new-param-user_gesture)
+* [v66+ Window transparency changes](#v66-window-transparency-changes)
 
 
 
@@ -324,8 +325,22 @@ callback is now called on UI thread. Previously it was called on
 IO thread.
 
 
-## V66+ RequestHandler.OnBeforeBrowse has a new param 'user_gesture'
+## v66+ RequestHandler.OnBeforeBrowse has a new param 'user_gesture'
 
 The RequestHandler.[OnBeforeBrowse](../api/RequestHandler.md#onbeforebrowse)
 callback has a new param `user_gesture`.
 
+
+## v66+ Window transparency changes
+
+1. OSR windows (off-screen rendering, also known as windowless) are now
+transparent by default. You can control its transperency with
+ApplicationSettings.[background_color](../api/ApplicationSettings.md#background_color) and BrowserSettings.[background_color](../api/BrowserSettings.md#background_color) options.
+The WindowInfo.`SetTransparentPainting` method is now deprecated. Calling
+it with True will do nothing, and calling it with False **will result
+in exception**.
+
+2. It is now possible to have
+transparent windows also in **windowed mode**. This seems to be working
+only on Linux (got it working on Fedora with just a change in window setting).
+
diff --git a/src/cef_v59..v66_changes.txt b/src/cef_v59..v66_changes.txt
index 2ae04d86..0ad8e8d4 100644
--- a/src/cef_v59..v66_changes.txt
+++ b/src/cef_v59..v66_changes.txt
@@ -27,20 +27,20 @@ BREAKAGE (needs updating Migration Guide doc)
 - + OnBeforeBrowse: new param 'user_gesture'
 - + update Migration Guide
 
-internal/cef_linux.h
-internal/cef_types_linux.h
-internal/cef_mac.h
-internal/cef_types_mac.h
-internal/cef_win.h
-internal/cef_types_win.h
-- OSR windows are transparent by default. To change it set
-  CefBrowserSettings.background_color .
-- CefWindowInfo (cef_window_info_t): transparent_painting_enabled option removed
-- CefWindowInfo.SetAsWindowless: 'transparent' param removed
-- Deprecate WindowInfo.SetTransparentPainting method. When set
-  to True do nothing. If set to False then raise Exception
-  and provide info on CefBrowserSettings.background_color.
-  - Update Migration Guide doc
++ internal/cef_linux.h
++ internal/cef_types_linux.h
++ internal/cef_mac.h
++ internal/cef_types_mac.h
++ internal/cef_win.h
++ internal/cef_types_win.h
+- + OSR windows are transparent by default. To change it set
+    CefBrowserSettings.background_color .
+- + CefWindowInfo (cef_window_info_t): transparent_painting_enabled option removed
+- + CefWindowInfo.SetAsWindowless: 'transparent' param removed
+- + Deprecate WindowInfo.SetTransparentPainting method. When set
+    to True do nothing. If set to False then raise Exception
+    and provide info on CefBrowserSettings.background_color.
+  - + Update Migration Guide doc
 
 internal/cef_types.h
 - cef_settings_t:
diff --git a/src/extern/cef/cef_linux.pxd b/src/extern/cef/cef_linux.pxd
index e42b9dd5..4ae54bf9 100644
--- a/src/extern/cef/cef_linux.pxd
+++ b/src/extern/cef/cef_linux.pxd
@@ -15,8 +15,7 @@ cdef extern from "include/internal/cef_linux.h":
     cdef cppclass CefWindowInfo:
         void SetAsChild(CefWindowHandle parent,
                         const CefRect& windowRect)
-        void SetAsWindowless(CefWindowHandle parent,
-                             cpp_bool transparent)
+        void SetAsWindowless(CefWindowHandle parent)
 
     cdef cppclass CefMainArgs:
         CefMainArgs()
diff --git a/src/extern/cef/cef_mac.pxd b/src/extern/cef/cef_mac.pxd
index ec6a0898..5bc92f49 100644
--- a/src/extern/cef/cef_mac.pxd
+++ b/src/extern/cef/cef_mac.pxd
@@ -14,8 +14,7 @@ cdef extern from "include/internal/cef_mac.h":
     cdef cppclass CefWindowInfo:
         void SetAsChild(CefWindowHandle parent,
                         int x, int y, int width, int height)
-        void SetAsWindowless(CefWindowHandle parent,
-                             cpp_bool transparent)
+        void SetAsWindowless(CefWindowHandle parent)
 
     cdef cppclass CefMainArgs:
         CefMainArgs()
diff --git a/src/extern/cef/cef_win.pxd b/src/extern/cef/cef_win.pxd
index ce742d79..5e341b75 100644
--- a/src/extern/cef/cef_win.pxd
+++ b/src/extern/cef/cef_win.pxd
@@ -21,8 +21,7 @@ cdef extern from "include/internal/cef_win.h":
                         RECT windowRect)
         void SetAsPopup(CefWindowHandle parent,
                         const CefString& windowName)
-        void SetAsWindowless(CefWindowHandle parent,
-                        cpp_bool transparent)
+        void SetAsWindowless(CefWindowHandle parent)
 
     cdef cppclass CefMainArgs:
         CefMainArgs()
diff --git a/src/window_info.pyx b/src/window_info.pyx
index a2e0f251..8bf76660 100644
--- a/src/window_info.pyx
+++ b/src/window_info.pyx
@@ -63,21 +63,17 @@ cdef void SetCefWindowInfo(
                     <CefWindowHandle>windowInfo.parentWindowHandle,
                     windowName)
 
-    cdef cpp_bool transparent = bool(windowInfo.transparentPainting)
     if windowInfo.windowType == "offscreen":
         cefWindowInfo.SetAsWindowless(
-                <CefWindowHandle>windowInfo.parentWindowHandle,
-                transparent)
+                <CefWindowHandle>windowInfo.parentWindowHandle)
 
 cdef class WindowInfo:
     cdef public str windowType
     cdef public WindowHandle parentWindowHandle
     cdef public list windowRect # [left, top, right, bottom]
     cdef public py_string windowName
-    cdef public py_bool transparentPainting
 
     def __init__(self, title=""):
-        self.transparentPainting = False
         self.windowName = ""
         if title:
             self.windowName = title
@@ -135,4 +131,11 @@ cdef class WindowInfo:
 
     cpdef py_void SetTransparentPainting(self,
             py_bool transparentPainting):
-        self.transparentPainting = transparentPainting
+        """Deprecated."""
+        if transparentPainting:
+            # Do nothing, since v66 OSR windows are transparent by default
+            pass
+        else:
+            raise Exception("This method is deprecated since v66, see "
+                            "Migration Guide document.")
+

From 37fecd8331c8e7f4018248157d9c6296e3e1ba14 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Fri, 25 May 2018 09:33:49 +0200
Subject: [PATCH 054/238] Remove
 BrowserSettings.javascript_open_windows_disallowed option (#403)

---
 README.md                    | 1 -
 api/API-index.md             | 1 -
 api/BrowserSettings.md       | 6 ------
 docs/Migration-guide.md      | 7 +++++++
 src/cef_v59..v66_changes.txt | 6 +++---
 src/extern/cef/cef_types.pxd | 1 -
 src/settings.pyx             | 7 +------
 7 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 3b79dcba..04114394 100644
--- a/README.md
+++ b/README.md
@@ -436,7 +436,6 @@ Additional information for v31.2 release:
   * [file_access_from_file_urls_allowed](api/BrowserSettings.md#file_access_from_file_urls_allowed)
   * [image_load_disabled](api/BrowserSettings.md#image_load_disabled)
   * [javascript_disabled](api/BrowserSettings.md#javascript_disabled)
-  * [javascript_open_windows_disallowed](api/BrowserSettings.md#javascript_open_windows_disallowed)
   * [javascript_close_windows_disallowed](api/BrowserSettings.md#javascript_close_windows_disallowed)
   * [javascript_access_clipboard_disallowed](api/BrowserSettings.md#javascript_access_clipboard_disallowed)
   * [local_storage_disabled](api/BrowserSettings.md#local_storage_disabled)
diff --git a/api/API-index.md b/api/API-index.md
index 4227a373..1e081bdd 100644
--- a/api/API-index.md
+++ b/api/API-index.md
@@ -122,7 +122,6 @@
   * [file_access_from_file_urls_allowed](BrowserSettings.md#file_access_from_file_urls_allowed)
   * [image_load_disabled](BrowserSettings.md#image_load_disabled)
   * [javascript_disabled](BrowserSettings.md#javascript_disabled)
-  * [javascript_open_windows_disallowed](BrowserSettings.md#javascript_open_windows_disallowed)
   * [javascript_close_windows_disallowed](BrowserSettings.md#javascript_close_windows_disallowed)
   * [javascript_access_clipboard_disallowed](BrowserSettings.md#javascript_access_clipboard_disallowed)
   * [local_storage_disabled](BrowserSettings.md#local_storage_disabled)
diff --git a/api/BrowserSettings.md b/api/BrowserSettings.md
index d3d4a998..9fd1a380 100644
--- a/api/BrowserSettings.md
+++ b/api/BrowserSettings.md
@@ -17,7 +17,6 @@ Table of contents:
   * [file_access_from_file_urls_allowed](#file_access_from_file_urls_allowed)
   * [image_load_disabled](#image_load_disabled)
   * [javascript_disabled](#javascript_disabled)
-  * [javascript_open_windows_disallowed](#javascript_open_windows_disallowed)
   * [javascript_close_windows_disallowed](#javascript_close_windows_disallowed)
   * [javascript_access_clipboard_disallowed](#javascript_access_clipboard_disallowed)
   * [local_storage_disabled](#local_storage_disabled)
@@ -117,11 +116,6 @@ Description from upstream CEF:
 (bool) Controls whether Javascript can be executed. Also configurable using the --disable-javascript switch.
 
 
-### javascript_open_windows_disallowed
-
-(bool) Controls whether Javascript can be used for opening windows. Also configurable using the --disable-javascript-open-windows switch.
-
-
 ### javascript_close_windows_disallowed
 
 (bool) Controls whether JavaScript can be used to close windows that were not
diff --git a/docs/Migration-guide.md b/docs/Migration-guide.md
index 6f015606..c83d702f 100644
--- a/docs/Migration-guide.md
+++ b/docs/Migration-guide.md
@@ -41,6 +41,7 @@ Table of contents:
 * [v66+ LifespanHandler.OnBeforePopup is now called on UI thread](#v66-lifespanhandleronbeforepopup-is-now-called-on-ui-thread)
 * [v66+ RequestHandler.OnBeforeBrowse has a new param 'user_gesture'](#v66-requesthandleronbeforebrowse-has-a-new-param-user_gesture)
 * [v66+ Window transparency changes](#v66-window-transparency-changes)
+* [v66+ BrowserSettings.javascript_open_windows_disallowed option was removed](#v66-browsersettingsjavascript_open_windows_disallowed-option-was-removed)
 
 
 
@@ -344,3 +345,9 @@ in exception**.
 transparent windows also in **windowed mode**. This seems to be working
 only on Linux (got it working on Fedora with just a change in window setting).
 
+
+## v66+ BrowserSettings.javascript_open_windows_disallowed option was removed
+
+The BrowserSettings.`javascript_open_windows_disallowed` option was removed
+(setting it will do nothing).
+
diff --git a/src/cef_v59..v66_changes.txt b/src/cef_v59..v66_changes.txt
index 0ad8e8d4..f9a1d58f 100644
--- a/src/cef_v59..v66_changes.txt
+++ b/src/cef_v59..v66_changes.txt
@@ -43,9 +43,9 @@ BREAKAGE (needs updating Migration Guide doc)
   - + Update Migration Guide doc
 
 internal/cef_types.h
-- cef_settings_t:
-  - javascript_open_windows option removed (keep a dummy for BC)
-    - update Migration Guide
+- + cef_settings_t:
+  - + javascript_open_windows option removed (keep a dummy for BC)
+    - + update Migration Guide
 - cef_thread_id_t:
   - TID_DB removed (update Migration Guide)
   - TID_PROCESS_LAUNCHER removed (update Migration Guide)
diff --git a/src/extern/cef/cef_types.pxd b/src/extern/cef/cef_types.pxd
index 43572629..f242cee7 100644
--- a/src/extern/cef/cef_types.pxd
+++ b/src/extern/cef/cef_types.pxd
@@ -78,7 +78,6 @@ cdef extern from "include/internal/cef_types.h":
         cef_string_t default_encoding
         cef_state_t remote_fonts
         cef_state_t javascript
-        cef_state_t javascript_open_windows
         cef_state_t javascript_close_windows
         cef_state_t javascript_access_clipboard
         cef_state_t javascript_dom_paste
diff --git a/src/settings.pyx b/src/settings.pyx
index be8667ae..154a40d0 100644
--- a/src/settings.pyx
+++ b/src/settings.pyx
@@ -191,12 +191,7 @@ cdef void SetBrowserSettings(
             else:
                 cefBrowserSettings.javascript = cef_types.STATE_ENABLED
         elif key == "javascript_open_windows_disallowed":
-            if browserSettings[key]:
-                cefBrowserSettings.javascript_open_windows = (
-                        cef_types.STATE_DISABLED)
-            else:
-                cefBrowserSettings.javascript_open_windows = (
-                        cef_types.STATE_ENABLED)
+            Debug("DEPRECATED: 'javascript_open_windows_disallowed' setting")
         elif key == "javascript_close_windows_disallowed":
             if browserSettings[key]:
                 cefBrowserSettings.javascript_close_windows = (

From b1769a52a0680225810d304791fcb7fba5d2c7d3 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Fri, 25 May 2018 13:33:58 +0200
Subject: [PATCH 055/238] Remove threads: TID_DB, TID_CACHE,
 TID_PROCESS_LAUNCHER and add new (#403)

---
 api/cefpython.md             |  9 +++++----
 docs/Migration-guide.md      | 10 ++++++++++
 src/cef_v59..v66_changes.txt |  9 +++++----
 src/extern/cef/cef_types.pxd |  5 ++---
 src/task.pyx                 |  4 ++--
 src/utils.pyx                |  9 ++++-----
 6 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/api/cefpython.md b/api/cefpython.md
index dd868d00..e68d0231 100644
--- a/api/cefpython.md
+++ b/api/cefpython.md
@@ -239,11 +239,12 @@ Post a task for execution on the thread associated with this task runner. Execut
 
 List of threads in the Browser process:
 * cef.TID_UI: The main thread in the browser. This will be the same as the main application thread if cefpython.Initialize() is called with a ApplicationSettings.multi_threaded_message_loop value of false. Do not perform blocking tasks on this thread. All tasks posted after CefBrowserProcessHandler::OnContextInitialized() and before CefShutdown() are guaranteed to run. This thread will outlive all other CEF threads.
-* cef.TID_DB: Used to interact with the database.
-* cef.TID_FILE: Used for blocking tasks (e.g. file system access) where the user won't notice if the task takes an arbitrarily long time to complete. All tasks posted after CefBrowserProcessHandler::OnContextInitialized() and before CefShutdown() are guaranteed to run.
+* cef.TID_FILE (alias cef.TID_FILE_BACKGROUND): Used for blocking tasks (e.g. file system access) where the user won't notice if the task takes an arbitrarily long time to complete. All tasks posted after CefBrowserProcessHandler::OnContextInitialized() and before CefShutdown() are guaranteed to run.
+* cef.TID_FILE_USER_VISIBLE: Used for blocking tasks (e.g. file system access) that affect UI or responsiveness of future user interactions. Do not use if an immediate response to a user interaction is expected. All tasks posted after CefBrowserProcessHandler::OnContextInitialized() and before CefShutdown() are guaranteed to run. Examples:
+  - Updating the UI to reflect progress on a long task.
+  - Loading data that might be shown in the UI after a future user
+    interaction.
 * cef.TID_FILE_USER_BLOCKING: Used for blocking tasks (e.g. file system access) that affect UI immediately after a user interaction. All tasks posted after CefBrowserProcessHandler::OnContextInitialized() and before CefShutdown() are guaranteed to run. Example: Generating data shown in the UI immediately after a click.
-* cef.TID_PROCESS_LAUNCHER: Used to launch and terminate browser processes.
-* cef.TID_CACHE: Used to handle slow HTTP cache operations.
 * cef.TID_IO: Used to process IPC and network messages. Do not perform blocking tasks on this thread. All tasks posted after CefBrowserProcessHandler::OnContextInitialized() and before CefShutdown() are guaranteed to run.
 
 List of threads in the Renderer process:
diff --git a/docs/Migration-guide.md b/docs/Migration-guide.md
index c83d702f..2361a8ff 100644
--- a/docs/Migration-guide.md
+++ b/docs/Migration-guide.md
@@ -42,6 +42,7 @@ Table of contents:
 * [v66+ RequestHandler.OnBeforeBrowse has a new param 'user_gesture'](#v66-requesthandleronbeforebrowse-has-a-new-param-user_gesture)
 * [v66+ Window transparency changes](#v66-window-transparency-changes)
 * [v66+ BrowserSettings.javascript_open_windows_disallowed option was removed](#v66-browsersettingsjavascript_open_windows_disallowed-option-was-removed)
+* [v66+ Threads removed: TID_DB, TID_PROCESS_LAUNCHER, TID_CACHE](#v66-threads-removed-tid_db-tid_process_launcher-tid_cache)
 
 
 
@@ -351,3 +352,12 @@ only on Linux (got it working on Fedora with just a change in window setting).
 The BrowserSettings.`javascript_open_windows_disallowed` option was removed
 (setting it will do nothing).
 
+
+## v66+ Threads removed: TID_DB, TID_PROCESS_LAUNCHER, TID_CACHE
+
+These threads and their corresponding constants in the cefpython module
+were removed: TID_DB, TID_PROCESS_LAUNCHER, TID_CACHE.
+
+New threads were added, see cefpython.[PostTask](../api/cefpython.md#posttask)
+description for a complete list of threads.
+
diff --git a/src/cef_v59..v66_changes.txt b/src/cef_v59..v66_changes.txt
index f9a1d58f..8a5cf161 100644
--- a/src/cef_v59..v66_changes.txt
+++ b/src/cef_v59..v66_changes.txt
@@ -46,10 +46,11 @@ internal/cef_types.h
 - + cef_settings_t:
   - + javascript_open_windows option removed (keep a dummy for BC)
     - + update Migration Guide
-- cef_thread_id_t:
-  - TID_DB removed (update Migration Guide)
-  - TID_PROCESS_LAUNCHER removed (update Migration Guide)
-  - TID_CACHE removed (update Migration Guide)
+- + cef_thread_id_t:
+  - + TID_DB removed (update Migration Guide)
+  - + TID_PROCESS_LAUNCHER removed (update Migration Guide)
+  - + TID_CACHE removed (update Migration Guide)
+  - + Added threads: TID_FILE_BACKGROUND, TID_FILE_USER_VISIBLE
 
 
 NEW FEATURES
diff --git a/src/extern/cef/cef_types.pxd b/src/extern/cef/cef_types.pxd
index f242cee7..2ce54c0f 100644
--- a/src/extern/cef/cef_types.pxd
+++ b/src/extern/cef/cef_types.pxd
@@ -122,11 +122,10 @@ cdef extern from "include/internal/cef_types.h":
 
     ctypedef enum cef_thread_id_t:
         TID_UI,
-        TID_DB,
+        TID_FILE_BACKGROUND
         TID_FILE,
+        TID_FILE_USER_VISIBLE
         TID_FILE_USER_BLOCKING,
-        TID_PROCESS_LAUNCHER,
-        TID_CACHE,
         TID_IO,
         TID_RENDERER
 
diff --git a/src/task.pyx b/src/task.pyx
index 2af14983..c8d7e1a6 100644
--- a/src/task.pyx
+++ b/src/task.pyx
@@ -12,7 +12,7 @@ def PostTask(int thread, object func, *args):
 
     # Validate threadId.
     if thread not in g_browserProcessThreads:
-        raise Exception("PoastTask failed: requires a browser process thread")
+        raise Exception("PostTask failed: requires a browser process thread")
 
     # Validate func.
     if not IsFunctionOrMethod(type(func)):
@@ -39,7 +39,7 @@ def PostDelayedTask(int thread, int delay_ms, object func, *args):
 
     # Validate threadId.
     if thread not in g_browserProcessThreads:
-        raise Exception("PoastTask failed: requires a browser process thread")
+        raise Exception("PostTask failed: requires a browser process thread")
 
     # Validate func.
     if not IsFunctionOrMethod(type(func)):
diff --git a/src/utils.pyx b/src/utils.pyx
index e253e9f7..2832d730 100644
--- a/src/utils.pyx
+++ b/src/utils.pyx
@@ -8,20 +8,19 @@ include "cefpython.pyx"
 cimport cef_types
 
 TID_UI = cef_types.TID_UI
-TID_DB = cef_types.TID_DB
+TID_FILE_BACKGROUND = cef_types.TID_FILE_BACKGROUND
 TID_FILE = cef_types.TID_FILE
+TID_FILE_USER_VISIBLE = cef_types.TID_FILE_USER_VISIBLE
 TID_FILE_USER_BLOCKING = cef_types.TID_FILE_USER_BLOCKING
-TID_PROCESS_LAUNCHER = cef_types.TID_PROCESS_LAUNCHER
-TID_CACHE = cef_types.TID_CACHE
 TID_IO = cef_types.TID_IO
 TID_RENDERER = cef_types.TID_RENDERER
 
 g_browserProcessThreads = [
     TID_UI,
-    TID_DB,
+    TID_FILE_BACKGROUND,
     TID_FILE,
+    TID_FILE_USER_VISIBLE
     TID_FILE_USER_BLOCKING,
-    TID_CACHE,
     TID_IO,
 ]
 

From 322389d1dcba0b530c49555349a5006852e391c5 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Fri, 25 May 2018 14:59:24 +0200
Subject: [PATCH 056/238] Fix build errors (#403)

Change cef.Request.Flags options.
---
 .gitignore                             |  6 ++++++
 api/Request.md                         | 16 +++++++++-------
 docs/Migration-guide.md                | 15 +++++++++++++++
 src/cef_v59..v66_changes.txt           | 10 +++++++---
 src/extern/cef/cef_types.pxd           | 16 +++++++++-------
 src/request.pyx                        | 26 ++++++++++++++++++++++----
 src/subprocess/print_handler_gtk.cpp   |  2 ++
 src/subprocess/print_handler_gtk.patch | 20 ++++++++++++--------
 src/utils.pyx                          |  2 +-
 9 files changed, 83 insertions(+), 30 deletions(-)

diff --git a/.gitignore b/.gitignore
index 68c99713..ed3648c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,9 @@ webcache/
 examples/screenshot.png
 examples/pyinstaller/build/
 examples/pyinstaller/dist/
+examples/GPUCache/
+examples/blob_storage/
+examples/webrtc_event_logs/
+unittests/GPUCache/
+unittests/blob_storage/
+unittests/webrtc_event_logs/
diff --git a/api/Request.md b/api/Request.md
index 961ef8b0..3fcf5032 100644
--- a/api/Request.md
+++ b/api/Request.md
@@ -166,18 +166,20 @@ be removed and ignored.
 
 Get the flags used in combination with WebRequest.
 
-Available flags (access via `cefpython.Request.Flags["xxx"]`):
+Available flags below. Can be accessed via `cefpython.Request.Flags["xxx"]`.
+These flags are also defined as constants starting with "UR_FLAG_"
+in the cefpython module.requ
 
 * **None** - Default behavior.
-* **SkipCache** - If set the cache will be skipped when handling the request.
-  Setting this value is equivalent to specifying the "Cache-Control: no-cache"
-  request header. Setting this value in combination with UR_FLAG_ONLY_FROM_CACHE
-  will cause the request to fail.
-* **AllowCachedCredentials** - If set user name, password, and cookies may be
-      sent with the request, and cookies may be saved from the response.
+* **SkipCache** - If set the cache will be skipped when handling the request. Setting this value is equivalent to specifying the "Cache-Control: no-cache" request header. Setting this value in combination with UR_FLAG_ONLY_FROM_CACHE will cause the request to fail.
+* **OnlyFromCache** - If set the request will fail if it cannot be served from the cache (or some equivalent local store). Setting this value is equivalent to specifying the "Cache-Control: only-if-cached" request header. Setting this value in combination with UR_FLAG_SKIP_CACHE will cause the request to fail.
+* **AllowStoredCredentials** - If set user name, password, and cookies may be sent with the request, and cookies may be saved from the response.
 * **ReportUploadProgress** - If set upload progress events will be generated when a request has a body.
 * **NoDownloadData** - If set the [WebRequestClient](WebRequestClient.md)::`OnDownloadData` method will not be called.
 * **NoRetryOn5xx** - If set 5xx redirect errors will be propagated to the observer instead of automatically re-tried. This currently only applies for requests originated in the browser process.
+* **StopOnRedirect** - If set 3XX responses will cause the fetch to halt immediately rather than continue through the redirect.
+
+
 
 
 ### SetFlags
diff --git a/docs/Migration-guide.md b/docs/Migration-guide.md
index 2361a8ff..04f39f0d 100644
--- a/docs/Migration-guide.md
+++ b/docs/Migration-guide.md
@@ -43,6 +43,7 @@ Table of contents:
 * [v66+ Window transparency changes](#v66-window-transparency-changes)
 * [v66+ BrowserSettings.javascript_open_windows_disallowed option was removed](#v66-browsersettingsjavascript_open_windows_disallowed-option-was-removed)
 * [v66+ Threads removed: TID_DB, TID_PROCESS_LAUNCHER, TID_CACHE](#v66-threads-removed-tid_db-tid_process_launcher-tid_cache)
+* [v66+ cef.Request.Flags changed](#v66-cefrequestflags-changed)
 
 
 
@@ -361,3 +362,17 @@ were removed: TID_DB, TID_PROCESS_LAUNCHER, TID_CACHE.
 New threads were added, see cefpython.[PostTask](../api/cefpython.md#posttask)
 description for a complete list of threads.
 
+
+## v66+ cef.Request.Flags changed
+
+Flags removed:
+- AllowCachedCredentials
+
+Flags added:
+- OnlyFromCache
+- AllowStoredCredentials
+- StopOnRedirect
+
+See a complete list of flags in the description of
+cef.Request.[GetFlags](../api/Request.md#getflags) method.
+
diff --git a/src/cef_v59..v66_changes.txt b/src/cef_v59..v66_changes.txt
index 8a5cf161..3443fe9d 100644
--- a/src/cef_v59..v66_changes.txt
+++ b/src/cef_v59..v66_changes.txt
@@ -53,6 +53,13 @@ internal/cef_types.h
   - + Added threads: TID_FILE_BACKGROUND, TID_FILE_USER_VISIBLE
 
 
++ cef_urlrequest.h
+- + cef_urlrequest_flags_t:
+  - + Add: UR_FLAG_ONLY_FROM_CACHE, UR_FLAG_ALLOW_STORED_CREDENTIALS,
+           UR_FLAG_STOP_ON_REDIRECT
+  - + Remove: UR_FLAG_ALLOW_CACHED_CREDENTIALS
+
+
 NEW FEATURES
 ------------
 
@@ -133,9 +140,6 @@ cef_server.h
 - CefServer: a web server that supports HTTP and WebSocket requests
 - CefServerHandler
 
-cef_urlrequest.h
-- ResponseWasCached
-
 cef_v8.h
 - CefV8ArrayBufferReleaseCallback
 - CefV8Value new methods:
diff --git a/src/extern/cef/cef_types.pxd b/src/extern/cef/cef_types.pxd
index 2ce54c0f..e70ec5ac 100644
--- a/src/extern/cef/cef_types.pxd
+++ b/src/extern/cef/cef_types.pxd
@@ -124,7 +124,7 @@ cdef extern from "include/internal/cef_types.h":
         TID_UI,
         TID_FILE_BACKGROUND
         TID_FILE,
-        TID_FILE_USER_VISIBLE
+        TID_FILE_USER_VISIBLE,
         TID_FILE_USER_BLOCKING,
         TID_IO,
         TID_RENDERER
@@ -160,12 +160,14 @@ cdef extern from "include/internal/cef_types.h":
         
     # WebRequest
     ctypedef enum cef_urlrequest_flags_t:
-        UR_FLAG_NONE                      = 0,
-        UR_FLAG_SKIP_CACHE                = 1 << 0,
-        UR_FLAG_ALLOW_CACHED_CREDENTIALS  = 1 << 1,
-        UR_FLAG_REPORT_UPLOAD_PROGRESS    = 1 << 3,
-        UR_FLAG_NO_DOWNLOAD_DATA          = 1 << 6,
-        UR_FLAG_NO_RETRY_ON_5XX           = 1 << 7,
+        UR_FLAG_NONE = 0,
+        UR_FLAG_SKIP_CACHE = 1 << 0,
+        UR_FLAG_ONLY_FROM_CACHE = 1 << 1,
+        UR_FLAG_ALLOW_STORED_CREDENTIALS = 1 << 2,
+        UR_FLAG_REPORT_UPLOAD_PROGRESS = 1 << 3,
+        UR_FLAG_NO_DOWNLOAD_DATA = 1 << 4,
+        UR_FLAG_NO_RETRY_ON_5XX = 1 << 5,
+        UR_FLAG_STOP_ON_REDIRECT = 1 << 6,
 
     # CefListValue, CefDictionaryValue - types.
     ctypedef enum cef_value_type_t:
diff --git a/src/request.pyx b/src/request.pyx
index 95bf45ba..0f770b20 100644
--- a/src/request.pyx
+++ b/src/request.pyx
@@ -4,17 +4,35 @@
 
 include "cefpython.pyx"
 
+# noinspection PyUnresolvedReferences
+cimport cef_types
+
+# cef_urlrequest_flags_t
+UR_FLAG_NONE = cef_types.UR_FLAG_NONE
+UR_FLAG_SKIP_CACHE = cef_types.UR_FLAG_SKIP_CACHE
+UR_FLAG_ONLY_FROM_CACHE = cef_types.UR_FLAG_ONLY_FROM_CACHE
+UR_FLAG_ALLOW_STORED_CREDENTIALS = cef_types.UR_FLAG_ALLOW_STORED_CREDENTIALS
+UR_FLAG_REPORT_UPLOAD_PROGRESS = cef_types.UR_FLAG_REPORT_UPLOAD_PROGRESS
+UR_FLAG_NO_DOWNLOAD_DATA = cef_types.UR_FLAG_NO_DOWNLOAD_DATA
+UR_FLAG_NO_RETRY_ON_5XX = cef_types.UR_FLAG_NO_RETRY_ON_5XX
+UR_FLAG_STOP_ON_REDIRECT = cef_types.UR_FLAG_STOP_ON_REDIRECT
+
+
 class Request:
+    # TODO: autocomplete in PyCharm doesn't work for these flags
     Flags = {
         "None": cef_types.UR_FLAG_NONE,
         "SkipCache": cef_types.UR_FLAG_SKIP_CACHE,
-        "AllowCachedCredentials": cef_types.UR_FLAG_ALLOW_CACHED_CREDENTIALS,
-        "AllowCookies": 0, # keep for BC
+        "OnlyFromCache": cef_types.UR_FLAG_ONLY_FROM_CACHE,
+        "AllowCachedCredentials": 0, # keep dummy for BC
+        "AllowStoredCredentials": cef_types.UR_FLAG_ALLOW_STORED_CREDENTIALS,
+        "AllowCookies": 0, # keep dummy for BC
         "ReportUploadProgress": cef_types.UR_FLAG_REPORT_UPLOAD_PROGRESS,
-        "ReportLoadTiming": 0, # keep for BC
-        "ReportRawHeaders": 0, # keep for BC
+        "ReportLoadTiming": 0, # keep dummy for BC
+        "ReportRawHeaders": 0, # keep dummy for BC
         "NoDownloadData": cef_types.UR_FLAG_NO_DOWNLOAD_DATA,
         "NoRetryOn5xx": cef_types.UR_FLAG_NO_RETRY_ON_5XX,
+        "StopOnRedirect": cef_types.UR_FLAG_STOP_ON_REDIRECT,
     }
     
     def __init__(self):
diff --git a/src/subprocess/print_handler_gtk.cpp b/src/subprocess/print_handler_gtk.cpp
index cfccbaff..18c8c1c4 100644
--- a/src/subprocess/print_handler_gtk.cpp
+++ b/src/subprocess/print_handler_gtk.cpp
@@ -13,9 +13,11 @@
 #include <gtk/gtk.h>
 #include <gtk/gtkunixprint.h>
 
+#include "include/base/cef_bind.h"
 #include "include/base/cef_logging.h"
 #include "include/base/cef_macros.h"
 #include "include/wrapper/cef_helpers.h"
+#include "include/wrapper/cef_closure_task.h"
 
 namespace {
 
diff --git a/src/subprocess/print_handler_gtk.patch b/src/subprocess/print_handler_gtk.patch
index 98f49960..75dcff42 100644
--- a/src/subprocess/print_handler_gtk.patch
+++ b/src/subprocess/print_handler_gtk.patch
@@ -1,8 +1,8 @@
 diff --git print_handler_gtk.cc print_handler_gtk.cc
-index 9a822b7a..cfccbaff 100644
+index 9a822b7a..18c8c1c4 100644
 --- print_handler_gtk.cc
 +++ print_handler_gtk.cc
-@@ -1,9 +1,12 @@
+@@ -1,22 +1,23 @@
 +// COPIED from upstream "cef/tests/cefclient/browser/" directory
 +// with minor modifications. See the .patch file in current directory.
 +
@@ -16,18 +16,22 @@ index 9a822b7a..cfccbaff 100644
  
  #include <vector>
  
-@@ -14,10 +17,6 @@
+ #include <gtk/gtk.h>
+ #include <gtk/gtkunixprint.h>
+ 
++#include "include/base/cef_bind.h"
+ #include "include/base/cef_logging.h"
  #include "include/base/cef_macros.h"
  #include "include/wrapper/cef_helpers.h"
- 
+-
 -#include "tests/cefclient/browser/root_window.h"
 -
 -namespace client {
--
++#include "include/wrapper/cef_closure_task.h"
+ 
  namespace {
  
- // CUPS Duplex attribute and values.
-@@ -431,10 +430,12 @@ struct ClientPrintHandlerGtk::PrintHandler {
+@@ -431,10 +432,12 @@ struct ClientPrintHandlerGtk::PrintHandler {
    // Returns the GtkWindow* for the browser. Will return NULL when using the
    // Views framework.
    GtkWindow* GetWindow() {
@@ -44,7 +48,7 @@ index 9a822b7a..cfccbaff 100644
      return NULL;
    }
  
-@@ -626,5 +627,3 @@ ClientPrintHandlerGtk::PrintHandler* ClientPrintHandlerGtk::GetPrintHandler(
+@@ -626,5 +629,3 @@ ClientPrintHandlerGtk::PrintHandler* ClientPrintHandlerGtk::GetPrintHandler(
    DCHECK(it != print_handler_map_.end());
    return it->second;
  }
diff --git a/src/utils.pyx b/src/utils.pyx
index 2832d730..03bfd1e3 100644
--- a/src/utils.pyx
+++ b/src/utils.pyx
@@ -19,7 +19,7 @@ g_browserProcessThreads = [
     TID_UI,
     TID_FILE_BACKGROUND,
     TID_FILE,
-    TID_FILE_USER_VISIBLE
+    TID_FILE_USER_VISIBLE,
     TID_FILE_USER_BLOCKING,
     TID_IO,
 ]

From c5469572802cba27063f465efd06599a2f5db077 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Fri, 25 May 2018 20:57:15 +0200
Subject: [PATCH 057/238] Fix GetCookieManager 'browser' param NULL exception
 (#429)

---
 api/RequestHandler.md            | 6 +++---
 docs/Migration-guide.md          | 8 ++++++++
 src/handlers/request_handler.pyx | 5 ++++-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/api/RequestHandler.md b/api/RequestHandler.md
index 6a7c145d..ce97443b 100644
--- a/api/RequestHandler.md
+++ b/api/RequestHandler.md
@@ -206,6 +206,9 @@ is the URL of the top-level frame. Cookies managers can be unique
 per browser or shared across multiple browsers. The global cookie
 manager will be used if this method returns None.
 
+**IMPORTANT**: In some cases the `browser` parameter can be
+None, so you should handle such case.
+
 To successfully implement separate cookie manager per browser session,
 you have to set ApplicationSettings.`unique_request_context_per_browser`
 to True. Otherwise the browser param passed to this callback will
@@ -221,9 +224,6 @@ the window on your own and embed browser in it.
 The `CreateAnotherBrowser` function from the old v31 wxpython
 example does that.
 
-IMPORTANT: in an exceptional case the `browser` parameter could be
-None, so you should handle such case. During testing this issue did
-not occur, but it may happen in some yet unknown scenarios.
 
 
 ### OnProtocolExecution
diff --git a/docs/Migration-guide.md b/docs/Migration-guide.md
index 04f39f0d..32f301e1 100644
--- a/docs/Migration-guide.md
+++ b/docs/Migration-guide.md
@@ -44,6 +44,7 @@ Table of contents:
 * [v66+ BrowserSettings.javascript_open_windows_disallowed option was removed](#v66-browsersettingsjavascript_open_windows_disallowed-option-was-removed)
 * [v66+ Threads removed: TID_DB, TID_PROCESS_LAUNCHER, TID_CACHE](#v66-threads-removed-tid_db-tid_process_launcher-tid_cache)
 * [v66+ cef.Request.Flags changed](#v66-cefrequestflags-changed)
+* [v66+ RequestHandler.GetCookieManager 'browser' param may be None](#v66-requesthandlergetcookiemanager-browser-param-may-be-none)
 
 
 
@@ -376,3 +377,10 @@ Flags added:
 See a complete list of flags in the description of
 cef.Request.[GetFlags](../api/Request.md#getflags) method.
 
+
+## v66+ RequestHandler.GetCookieManager 'browser' param may be None
+
+In some cases in RequestHandler.[GetCookieManager](../api/RequestHandler.md#getcookiemanager)
+callback, the `browser` parameter may be None due to a race condition.
+See Issue [#429](../../../issues/429) for details.
+
diff --git a/src/handlers/request_handler.pyx b/src/handlers/request_handler.pyx
index ff8799c2..be50b8af 100644
--- a/src/handlers/request_handler.pyx
+++ b/src/handlers/request_handler.pyx
@@ -291,7 +291,10 @@ cdef public CefRefPtr[CefCookieManager] RequestHandler_GetCookieManager(
     cdef object clientCallback
     cdef PyCookieManager returnValue
     try:
-        pyBrowser = GetPyBrowser(cefBrowser, "GetCookieManager")
+        if cefBrowser.get():
+            pyBrowser = GetPyBrowser(cefBrowser, "GetCookieManager")
+        else:
+            pyBrowser = None
         pyMainUrl = CefToPyString(cefMainUrl)
         if pyBrowser:
             # Browser may be empty.

From c599c59cad92487240f9a5db2545aa97b1034f3d Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Fri, 25 May 2018 21:07:54 +0200
Subject: [PATCH 058/238] Update GetCookieManager bug and reopen issue (#429)

---
 api/RequestHandler.md            |  4 ++--
 docs/Migration-guide.md          |  8 ++++----
 src/handlers/request_handler.pyx | 13 ++++++-------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/api/RequestHandler.md b/api/RequestHandler.md
index ce97443b..7d7423cf 100644
--- a/api/RequestHandler.md
+++ b/api/RequestHandler.md
@@ -206,8 +206,8 @@ is the URL of the top-level frame. Cookies managers can be unique
 per browser or shared across multiple browsers. The global cookie
 manager will be used if this method returns None.
 
-**IMPORTANT**: In some cases the `browser` parameter can be
-None, so you should handle such case.
+**IMPORTANT**: In some cases this callback is not called due to a
+race condition. See Issue [#429](../../../issues/429) for details.
 
 To successfully implement separate cookie manager per browser session,
 you have to set ApplicationSettings.`unique_request_context_per_browser`
diff --git a/docs/Migration-guide.md b/docs/Migration-guide.md
index 32f301e1..3e419176 100644
--- a/docs/Migration-guide.md
+++ b/docs/Migration-guide.md
@@ -378,9 +378,9 @@ See a complete list of flags in the description of
 cef.Request.[GetFlags](../api/Request.md#getflags) method.
 
 
-## v66+ RequestHandler.GetCookieManager 'browser' param may be None
+## v66+ RequestHandler.GetCookieManager not getting called in some cases
 
-In some cases in RequestHandler.[GetCookieManager](../api/RequestHandler.md#getcookiemanager)
-callback, the `browser` parameter may be None due to a race condition.
-See Issue [#429](../../../issues/429) for details.
+In some cases the RequestHandler.[GetCookieManager](../api/RequestHandler.md#getcookiemanager)
+callback is not getting called due to a race condition.
+This bug is to be fixed in Issue [#429](../../../issues/429).
 
diff --git a/src/handlers/request_handler.pyx b/src/handlers/request_handler.pyx
index be50b8af..02bbc15d 100644
--- a/src/handlers/request_handler.pyx
+++ b/src/handlers/request_handler.pyx
@@ -291,14 +291,13 @@ cdef public CefRefPtr[CefCookieManager] RequestHandler_GetCookieManager(
     cdef object clientCallback
     cdef PyCookieManager returnValue
     try:
-        if cefBrowser.get():
-            pyBrowser = GetPyBrowser(cefBrowser, "GetCookieManager")
-        else:
-            pyBrowser = None
+        if not cefBrowser.get():
+            # Bug: In some cases due to a race condition the browser
+            #      may be NULL. Issue #429.
+            return <CefRefPtr[CefCookieManager]>NULL
+        pyBrowser = GetPyBrowser(cefBrowser, "GetCookieManager")
         pyMainUrl = CefToPyString(cefMainUrl)
-        if pyBrowser:
-            # Browser may be empty.
-            clientCallback = pyBrowser.GetClientCallback("GetCookieManager")
+        clientCallback = pyBrowser.GetClientCallback("GetCookieManager")
         if clientCallback:
             returnValue = clientCallback(
                     browser=pyBrowser,

From e3226dba99f819e9f36f930a8991704b0ce724a1 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Mon, 28 May 2018 22:37:59 +0200
Subject: [PATCH 059/238] Implement Browser.GetImage on Linux (#427)

---
 README.md                                 |  1 +
 api/API-index.md                          |  1 +
 api/Browser.md                            | 24 +++++++++
 src/browser.pyx                           | 29 +++++++++++
 src/cef_v59..v66_changes.txt              |  7 +++
 src/cefpython.pyx                         |  2 +
 src/client_handler/dialog_handler_gtk.cpp | 45 ++--------------
 src/client_handler/x11.cpp                | 62 +++++++++++++++++++++++
 src/client_handler/x11.h                  |  6 +++
 src/extern/linux.pxd                      | 23 +++++++++
 src/extern/x11.pxd                        |  2 +
 tools/cython_setup.py                     |  3 ++
 12 files changed, 163 insertions(+), 42 deletions(-)

diff --git a/README.md b/README.md
index 04114394..63a920f0 100644
--- a/README.md
+++ b/README.md
@@ -374,6 +374,7 @@ Additional information for v31.2 release:
   * [GetFrameCount](api/Browser.md#getframecount)
   * [GetFrameIdentifiers](api/Browser.md#getframeidentifiers)
   * [GetFrameNames](api/Browser.md#getframenames)
+  * [GetImage](api/Browser.md#getimage)
   * [GetJavascriptBindings](api/Browser.md#getjavascriptbindings)
   * [GetMainFrame](api/Browser.md#getmainframe)
   * [GetNSTextInputContext](api/Browser.md#getnstextinputcontext)
diff --git a/api/API-index.md b/api/API-index.md
index 1e081bdd..3382f363 100644
--- a/api/API-index.md
+++ b/api/API-index.md
@@ -60,6 +60,7 @@
   * [GetFrameCount](Browser.md#getframecount)
   * [GetFrameIdentifiers](Browser.md#getframeidentifiers)
   * [GetFrameNames](Browser.md#getframenames)
+  * [GetImage](Browser.md#getimage)
   * [GetJavascriptBindings](Browser.md#getjavascriptbindings)
   * [GetMainFrame](Browser.md#getmainframe)
   * [GetNSTextInputContext](Browser.md#getnstextinputcontext)
diff --git a/api/Browser.md b/api/Browser.md
index 90aa224f..47b3752b 100644
--- a/api/Browser.md
+++ b/api/Browser.md
@@ -39,6 +39,7 @@ Table of contents:
   * [GetFrameCount](#getframecount)
   * [GetFrameIdentifiers](#getframeidentifiers)
   * [GetFrameNames](#getframenames)
+  * [GetImage](#getimage)
   * [GetJavascriptBindings](#getjavascriptbindings)
   * [GetMainFrame](#getmainframe)
   * [GetNSTextInputContext](#getnstextinputcontext)
@@ -420,6 +421,29 @@ Returns the identifiers of all existing frames.
 Returns the names of all existing frames. This list does not include the main frame.
 
 
+### GetImage
+
+| | |
+| --- | --- |
+| __Return__ | tuple(bytes buffer, int width, int height) |
+
+Currently works only on Linux (Issue [#427](../../../issues/427)).
+
+Get browser contents as image. Only screen visible contents are returned.
+
+Returns an RGB buffer which can be converted to an image
+using PIL library with such code:
+
+```py
+from PIL import Image, ImageFile
+buffer_len = (width * 3 + 3) & -4
+image = Image.frombytes("RGB", (width, height), data,
+                         "raw", "RGB", buffer_len, 1)
+ImageFile.MAXBLOCK = width * height
+image.save("image.png", "PNG")
+```
+
+
 ### GetJavascriptBindings
 
 | | |
diff --git a/src/browser.pyx b/src/browser.pyx
index 406a01c9..03e43e39 100644
--- a/src/browser.pyx
+++ b/src/browser.pyx
@@ -274,6 +274,35 @@ cdef class PyBrowser:
     cpdef JavascriptBindings GetJavascriptBindings(self):
         return self.javascriptBindings
 
+    cdef bytes b(self, int x):
+        return struct.pack(b'<B', x)
+
+    cpdef object GetImage(self):
+        IF UNAME_SYSNAME == "Linux":
+            cdef XImage* image
+            image = x11.CefBrowser_GetImage(self.cefBrowser)
+            if not image:
+                return None
+            cdef int width = image.width
+            cdef int height = image.height
+            cdef list pixels = [b'0'] * (3 * width * height)
+            cdef int x, y, blue, green, red, offset
+            cdef unsigned long pixel
+            for x in range(width):
+                for y in range(height):
+                    pixel = XGetPixel(image, x, y)
+                    blue = pixel & 255
+                    green = (pixel & 65280) >> 8
+                    red = (pixel & 16711680) >> 16
+                    offset = (x + width * y) * 3
+                    pixels[offset:offset+3] = self.b(red), self.b(green),\
+                                              self.b(blue)
+            XDestroyImage(image)
+            return b''.join(pixels), width, height
+        ELSE:
+            NonCriticalError("GetImage not implemented on this platform")
+            return None
+
     # --------------
     # CEF API.
     # --------------
diff --git a/src/cef_v59..v66_changes.txt b/src/cef_v59..v66_changes.txt
index 3443fe9d..4b57eba2 100644
--- a/src/cef_v59..v66_changes.txt
+++ b/src/cef_v59..v66_changes.txt
@@ -60,6 +60,13 @@ internal/cef_types.h
   - + Remove: UR_FLAG_ALLOW_CACHED_CREDENTIALS
 
 
+TODO
+----
+1. Compare src/handler/dialog_handler_gtk.cpp (and .h) with upstream
+   cefclient files
+2. In subprocess/print_handler_gtk.cpp use GetWindow implementation
+   from x11.cpp
+
 NEW FEATURES
 ------------
 
diff --git a/src/cefpython.pyx b/src/cefpython.pyx
index d66eb666..dd3f9f49 100644
--- a/src/cefpython.pyx
+++ b/src/cefpython.pyx
@@ -132,6 +132,8 @@ import json
 import datetime
 # noinspection PyUnresolvedReferences
 import random
+# noinspection PyUnresolvedReferences
+import struct
 
 if sys.version_info.major == 2:
     # noinspection PyUnresolvedReferences
diff --git a/src/client_handler/dialog_handler_gtk.cpp b/src/client_handler/dialog_handler_gtk.cpp
index 3d53e78a..6c119910 100644
--- a/src/client_handler/dialog_handler_gtk.cpp
+++ b/src/client_handler/dialog_handler_gtk.cpp
@@ -138,49 +138,10 @@ void AddFilters(GtkFileChooser* chooser,
   }
 }
 
-GtkWindow* GetWindow(CefRefPtr<CefBrowser> browser) {
-  // -- REWRITTEN FOR CEF PYTHON USE CASE --
-  // X11 window handle
-  ::Window xwindow = browser->GetHost()->GetWindowHandle();
-  // X11 display
-  ::Display* xdisplay = cef_get_xdisplay();
-  // GDK display
-  GdkDisplay* gdk_display = NULL;
-  if (xdisplay) {
-    // See if we can find GDK display using X11 display
-    gdk_display = gdk_x11_lookup_xdisplay(xdisplay);
-  }
-  if (!gdk_display) {
-    // If not then get the default display
-    gdk_display = gdk_display_get_default();
-  }
-  if (!gdk_display) {
-    // The tkinter_.py and hello_world.py examples do not use GTK
-    // internally, so GTK wasn't yet initialized and must do it
-    // now, so that display is available. Also must install X11
-    // error handlers to avoid 'BadWindow' errors.
-    LOG(INFO) << "[Browser process] Initialize GTK";
-    gtk_init(0, NULL);
-    InstallX11ErrorHandlers();
-    // Now the display is available
-    gdk_display = gdk_display_get_default();
-  }
-  // In kivy_.py example getting error message:
-  // > Can't create GtkPlug as child of non-GtkSocket
-  // However dialog handler works just fine.
-  GtkWidget* widget = gtk_plug_new_for_display(gdk_display, xwindow);
-  // Getting top level widget doesn't seem to be required.
-  // OFF: GtkWidget* toplevel = gtk_widget_get_toplevel(widget);
-  GtkWindow* window = GTK_WINDOW(widget);
-  if (!window) {
-    LOG(ERROR) << "No GtkWindow for browser";
-  }
-  return window;
-}
-
 }  // namespace
 
 
+
 ClientDialogHandlerGtk::ClientDialogHandlerGtk()
     : gtk_dialog_(NULL) {
 }
@@ -238,7 +199,7 @@ bool ClientDialogHandlerGtk::OnFileDialog(
     }
   }
 
-  GtkWindow* window = GetWindow(browser);
+  GtkWindow* window = CefBrowser_GetGtkWindow(browser);
   if (!window)
     return false;
 
@@ -378,7 +339,7 @@ bool ClientDialogHandlerGtk::OnJSDialog(
     // title += CefFormatUrlForSecurityDisplay(origin_url).ToString();
   }
 
-  GtkWindow* window = GetWindow(browser);
+  GtkWindow* window = CefBrowser_GetGtkWindow(browser);
   if (!window)
     return false;
 
diff --git a/src/client_handler/x11.cpp b/src/client_handler/x11.cpp
index 18f7ce03..9ebfe2c8 100644
--- a/src/client_handler/x11.cpp
+++ b/src/client_handler/x11.cpp
@@ -46,3 +46,65 @@ void SetX11WindowTitle(CefRefPtr<CefBrowser> browser, char* title) {
     ::Display* xdisplay = cef_get_xdisplay();
     XStoreName(xdisplay, xwindow, title);
 }
+
+GtkWindow* CefBrowser_GetGtkWindow(CefRefPtr<CefBrowser> browser) {
+  // -- REWRITTEN FOR CEF PYTHON USE CASE --
+  // X11 window handle
+  ::Window xwindow = browser->GetHost()->GetWindowHandle();
+  // X11 display
+  ::Display* xdisplay = cef_get_xdisplay();
+  // GDK display
+  GdkDisplay* gdk_display = NULL;
+  if (xdisplay) {
+    // See if we can find GDK display using X11 display
+    gdk_display = gdk_x11_lookup_xdisplay(xdisplay);
+  }
+  if (!gdk_display) {
+    // If not then get the default display
+    gdk_display = gdk_display_get_default();
+  }
+  if (!gdk_display) {
+    // The tkinter_.py and hello_world.py examples do not use GTK
+    // internally, so GTK wasn't yet initialized and must do it
+    // now, so that display is available. Also must install X11
+    // error handlers to avoid 'BadWindow' errors.
+    LOG(INFO) << "[Browser process] Initialize GTK";
+    gtk_init(0, NULL);
+    InstallX11ErrorHandlers();
+    // Now the display is available
+    gdk_display = gdk_display_get_default();
+  }
+  // In kivy_.py example getting error message:
+  // > Can't create GtkPlug as child of non-GtkSocket
+  // However dialog handler works just fine.
+  GtkWidget* widget = gtk_plug_new_for_display(gdk_display, xwindow);
+  // Getting top level widget doesn't seem to be required.
+  // OFF: GtkWidget* toplevel = gtk_widget_get_toplevel(widget);
+  GtkWindow* window = GTK_WINDOW(widget);
+  if (!window) {
+    LOG(ERROR) << "No GtkWindow for browser";
+  }
+  return window;
+}
+
+XImage* CefBrowser_GetImage(CefRefPtr<CefBrowser> browser) {
+    ::Display* display = cef_get_xdisplay();
+    if (!display) {
+        LOG(ERROR) << "XOpenDisplay failed in CefBrowser_GetImage";
+        return NULL;
+    }
+    ::Window browser_window = browser->GetHost()->GetWindowHandle();
+    XWindowAttributes attrs;
+    if (!XGetWindowAttributes(display, browser_window, &attrs)) {
+        LOG(ERROR) << "XGetWindowAttributes failed in CefBrowser_GetImage";
+        return NULL;
+    }
+    XImage* image = XGetImage(display, browser_window,
+                              0, 0, attrs.width, attrs.height,
+                              AllPlanes, ZPixmap);
+    if (!image) {
+        LOG(ERROR) << "XGetImage failed in CefBrowser_GetImage";
+        return NULL;
+    }
+    return image;
+}
diff --git a/src/client_handler/x11.h b/src/client_handler/x11.h
index cd593187..d92ee41e 100644
--- a/src/client_handler/x11.h
+++ b/src/client_handler/x11.h
@@ -5,9 +5,15 @@
 #pragma once
 
 #include <X11/Xlib.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
+
 #include "include/cef_browser.h"
 
 void InstallX11ErrorHandlers();
 void SetX11WindowBounds(CefRefPtr<CefBrowser> browser,
                         int x, int y, int width, int height);
 void SetX11WindowTitle(CefRefPtr<CefBrowser> browser, char* title);
+
+GtkWindow* CefBrowser_GetGtkWindow(CefRefPtr<CefBrowser> browser);
+XImage* CefBrowser_GetImage(CefRefPtr<CefBrowser> browser);
diff --git a/src/extern/linux.pxd b/src/extern/linux.pxd
index fb565243..b2da7068 100644
--- a/src/extern/linux.pxd
+++ b/src/extern/linux.pxd
@@ -7,3 +7,26 @@ cdef extern from "gtk/gtk.h" nogil:
     ctypedef void* GtkWidget
     cdef GtkWidget* gtk_plug_new(GdkNativeWindow socket_id)
     cdef void gtk_widget_show(GtkWidget* widget)
+
+    ctypedef char* XPointer
+    ctypedef struct XImage:
+        int width
+        int height
+        int xoffset             # number of pixels offset in X direction
+        int format              # XYBitmap, XYPixmap, ZPixmap
+        char *data              # pointer to image data
+        int byte_order          # data byte order, LSBFirst, MSBFirst
+        int bitmap_unit         # quant. of scanline 8, 16, 32
+        int bitmap_bit_order    # LSBFirst, MSBFirst
+        int bitmap_pad          # 8, 16, 32 either XY or ZPixmap
+        int depth               # depth of image
+        int bytes_per_line      # accelerator to next scanline
+        int bits_per_pixel      # bits per pixel (ZPixmap)
+        unsigned long red_mask  # bits in z arrangement
+        unsigned long green_mask
+        unsigned long blue_mask
+        XPointer *obdata
+        void *funcs
+    void XDestroyImage(XImage *ximage)
+    unsigned long XGetPixel(XImage* image, int x, int y)
+
diff --git a/src/extern/x11.pxd b/src/extern/x11.pxd
index 4e481f24..e60b31a0 100644
--- a/src/extern/x11.pxd
+++ b/src/extern/x11.pxd
@@ -5,9 +5,11 @@
 from cef_ptr cimport CefRefPtr
 # noinspection PyUnresolvedReferences
 from cef_browser cimport CefBrowser
+from linux cimport XImage
 
 cdef extern from "client_handler/x11.h" nogil:
     void InstallX11ErrorHandlers()
     void SetX11WindowBounds(CefRefPtr[CefBrowser] browser,
                             int x, int y, int width, int height)
     void SetX11WindowTitle(CefRefPtr[CefBrowser] browser, char* title)
+    XImage* CefBrowser_GetImage(CefRefPtr[CefBrowser] browser)
diff --git a/tools/cython_setup.py b/tools/cython_setup.py
index 29baa755..ea9443e5 100644
--- a/tools/cython_setup.py
+++ b/tools/cython_setup.py
@@ -360,6 +360,9 @@ def get_libraries():
             "gobject-2.0",
             "glib-2.0",
             "gtk-x11-2.0",
+            "gdk-x11-2.0",
+            # "gdk_pixbuf-2.0",
+            # "gdk_pixbuf_xlib-2.0",
             # CEF and CEF Python libraries
             "cef_dll_wrapper",
             "cefpythonapp",

From 8cfc8217866a7dbed5350bcdaf1cf022026c84af Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Tue, 29 May 2018 13:19:06 +0200
Subject: [PATCH 060/238] Build v66 on Windows (#403).

All examples run fine, except the tkinter example which hanged.
---
 src/version/cef_version_win.h | 24 ++++++++++++------------
 tools/automate.py             | 31 ++++++++++++++++++-------------
 2 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/src/version/cef_version_win.h b/src/version/cef_version_win.h
index 526e4630..50e9b4ef 100644
--- a/src/version/cef_version_win.h
+++ b/src/version/cef_version_win.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2018 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.3029.1604.g364cd86"
+#define CEF_VERSION "3.3359.1774.gd49d25f"
 #define CEF_VERSION_MAJOR 3
-#define CEF_COMMIT_NUMBER 1604
-#define CEF_COMMIT_HASH "364cd863b14617f21e6bf8fd3ca3faea01e2ef38"
-#define COPYRIGHT_YEAR 2017
+#define CEF_COMMIT_NUMBER 1774
+#define CEF_COMMIT_HASH "d49d25f881b68f418e243e12801cbbb7caebb563"
+#define COPYRIGHT_YEAR 2018
 
-#define CHROME_VERSION_MAJOR 58
+#define CHROME_VERSION_MAJOR 66
 #define CHROME_VERSION_MINOR 0
-#define CHROME_VERSION_BUILD 3029
-#define CHROME_VERSION_PATCH 81
+#define CHROME_VERSION_BUILD 3359
+#define CHROME_VERSION_PATCH 181
 
 #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 "f0e835273a00acd02a699af272fc8f6ff9c5645c"
+#define CEF_API_HASH_UNIVERSAL "84263345b0b1143139aba560e5e5ed16fb6a9628"
 #if defined(OS_WIN)
-#define CEF_API_HASH_PLATFORM "3cf7ac2b9aa61adfb9e5decdf0d32fbf78813355"
+#define CEF_API_HASH_PLATFORM "cf092ef692a2ff18b0fc732b58bde9b8b8655fcc"
 #elif defined(OS_MACOSX)
-#define CEF_API_HASH_PLATFORM "f1d2ed00ab93e03a215fd787e6da9127e2949fd8"
+#define CEF_API_HASH_PLATFORM "34f636bde2f02cb43c10061f384af4fc51c26e1f"
 #elif defined(OS_LINUX)
-#define CEF_API_HASH_PLATFORM "698e69c4297cc63b9893558a8591e7bd7aeeb0d4"
+#define CEF_API_HASH_PLATFORM "6b57a640612f8d459042917ad2568b1526a70af4"
 #endif
 
 // Returns CEF version information for the libcef library. The |entry|
diff --git a/tools/automate.py b/tools/automate.py
index da667574..a618cee5 100644
--- a/tools/automate.py
+++ b/tools/automate.py
@@ -64,10 +64,10 @@
     --gyp-generators=<gen>   Set GYP_GENERATORS [default: ninja].
     --gyp-msvs-version=<v>   Set GYP_MSVS_VERSION.
     --use-system-freetype    Use system Freetype library on Linux (Issue #402)
-    --no-depot-tools-update  Do not update depot_tools/ directory. When building
-                             old unsupported versions of Chromium you want to
-                             manually checkout an old version of depot tools
-                             from the time of the release.
+    --no-depot-tools-update  Do not update depot_tools/ directory. When
+                             building old unsupported versions of Chromium
+                             you want to manually checkout an old version
+                             of depot tools from the time of the release.
 
 """
 
@@ -574,11 +574,15 @@ def fix_cmake_variables_for_MD_library(undo=False, try_undo=False):
     # This replacements must be unique for the undo operation
     # to be reliable.
 
-    mt_find = r"/MT "
-    mt_replace = r"/MD /wd4275 "
+    mt_find = r'CEF_RUNTIME_LIBRARY_FLAG "/MT"'
+    mt_replace = r'CEF_RUNTIME_LIBRARY_FLAG "/MD"'
 
-    mtd_find = r"/MTd "
-    mtd_replace = r"/MDd /wd4275 "
+    wd4275_find = ('/wd4244       '
+                   '# Ignore "conversion possible loss of data" warning')
+    wd4275_replace = ('/wd4244       '
+                      '# Ignore "conversion possible loss of data" warning'
+                      '\r\n'
+                      '    /wd4275 # Ignore "non dll-interface class"')
 
     cmake_variables = os.path.join(Options.cef_binary, "cmake",
                                    "cef_variables.cmake")
@@ -587,7 +591,7 @@ def fix_cmake_variables_for_MD_library(undo=False, try_undo=False):
 
     if try_undo:
         matches1 = re.findall(re.escape(mt_replace), contents)
-        matches2 = re.findall(re.escape(mtd_replace), contents)
+        matches2 = re.findall(re.escape(wd4275_replace), contents)
         if len(matches1) or len(matches2):
             undo = True
         else:
@@ -596,15 +600,16 @@ def fix_cmake_variables_for_MD_library(undo=False, try_undo=False):
     if undo:
         (contents, count) = re.subn(re.escape(mt_replace), mt_find,
                                     contents)
-        assert count == 2
-        (contents, count) = re.subn(re.escape(mtd_replace), mtd_find,
+        assert count == 1
+        (contents, count) = re.subn(re.escape(wd4275_replace), wd4275_find,
                                     contents)
         assert count == 1
     else:
         (contents, count) = re.subn(re.escape(mt_find), mt_replace,
                                     contents)
-        assert count == 2
-        (contents, count) = re.subn(re.escape(mtd_find), mtd_replace,
+        print(re.escape(mt_find))
+        assert count == 1
+        (contents, count) = re.subn(re.escape(wd4275_find), wd4275_replace,
                                     contents)
         assert count == 1
 

From ef1b90f1bfeb8f0fb2ae54d67bfd08918720504d Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Wed, 30 May 2018 10:58:09 +0200
Subject: [PATCH 061/238] Update README

---
 README.md | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 63a920f0..ddb39381 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 Table of contents:
 * [Introduction](#introduction)
 * [Sponsors](#sponsors)
-* [Funding for v66.0 release](#funding-for-v660-release)
+* [Funding for the v66 release](#funding-for-the-v66-release)
 * [Install](#install)
 * [Tutorial](#tutorial)
 * [Examples](#examples)
@@ -92,12 +92,13 @@ See the [Support development](#support-development) section for a list of
 all the individuals and companies supporting CEF Python.
 
 
-## Funding for v66.0 release
+## Funding for the v66 release
 
 I am happy to announce that Lampix is sponsoring the v66 release of cefpython.
 Lampix is the first hardware and software solution that turns any surface
 into a smart, augmented reality or interactive surface. Please visit its
-website here: https://lampix.com/
+website here: https://lampix.com/ . See the [v66 milestone](../../milestone/13)
+to see progress on the new release.
 
 [![lampix600](https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/lampix600.png)](https://lampix.com/)
 
@@ -257,8 +258,8 @@ Additional information for v31.2 release:
 - [Tutorial](docs/Tutorial.md)
 
 
-### API categories
-
+### API categories
+
 #### Modules
 
  * [cefpython](api/cefpython.md#cefpython) module
@@ -313,9 +314,9 @@ Additional information for v31.2 release:
  * [StringVisitor](api/StringVisitor.md#stringvisitor-interface) interface
  * [WebRequestClient](api/WebRequestClient.md#webrequestclient-interface) interface
 
-
-### API index
-
+
+### API index
+
 * [Application settings](api/ApplicationSettings.md#application-settings)
   * [accept_language_list](api/ApplicationSettings.md#accept_language_list)
   * [app_user_model_id](api/ApplicationSettings.md#app_user_model_id)

From 357a7fbaac184205e7016076d120ec369006e107 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Mon, 11 Jun 2018 18:38:53 +0200
Subject: [PATCH 062/238] Update dialog_handler_gtk files with changes from
 upstream (#403).

Generate a patch file with changes.
---
 src/cef_v59..v66_changes.txt                |  10 +-
 src/client_handler/dialog_handler_gtk.cpp   |  72 ++++-------
 src/client_handler/dialog_handler_gtk.h     |  16 ++-
 src/client_handler/dialog_handler_gtk.patch | 127 ++++++++++++++++++++
 4 files changed, 163 insertions(+), 62 deletions(-)
 create mode 100644 src/client_handler/dialog_handler_gtk.patch

diff --git a/src/cef_v59..v66_changes.txt b/src/cef_v59..v66_changes.txt
index 4b57eba2..36ce50d5 100644
--- a/src/cef_v59..v66_changes.txt
+++ b/src/cef_v59..v66_changes.txt
@@ -60,12 +60,12 @@ internal/cef_types.h
   - + Remove: UR_FLAG_ALLOW_CACHED_CREDENTIALS
 
 
-TODO
+MISC
 ----
-1. Compare src/handler/dialog_handler_gtk.cpp (and .h) with upstream
-   cefclient files
-2. In subprocess/print_handler_gtk.cpp use GetWindow implementation
-   from x11.cpp
++ Compare src/client_handler/dialog_handler_gtk.cpp (and .h) with upstream
+  cefclient files
+- In subprocess/print_handler_gtk.cpp use GetWindow implementation
+  from x11.cpp
 
 NEW FEATURES
 ------------
diff --git a/src/client_handler/dialog_handler_gtk.cpp b/src/client_handler/dialog_handler_gtk.cpp
index 6c119910..ce5a4d4e 100644
--- a/src/client_handler/dialog_handler_gtk.cpp
+++ b/src/client_handler/dialog_handler_gtk.cpp
@@ -1,8 +1,5 @@
-// Default dialog handler implementation on Linux.
-// Copied from upstream cefclient with changes:
-// - Rewrote GetWindow() func
-// - Removed "client" namespace
-// - Changed titles of JS alerts, removed URL and "Javascript" word
+// COPIED from upstream "cef/tests/cefclient/browser/" directory
+// with minor modifications. See the .patch file in current directory.
 
 // Copyright (c) 2015 The Chromium Embedded Framework Authors. All rights
 // reserved. Use of this source code is governed by a BSD-style license that
@@ -10,16 +7,12 @@
 
 #include <libgen.h>
 #include <sys/stat.h>
-#include <X11/Xlib.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
 
 #include "include/cef_browser.h"
 #include "include/cef_parser.h"
 #include "include/wrapper/cef_helpers.h"
 
 #include "include/base/cef_logging.h"
-
 #include "dialog_handler_gtk.h"
 #include "x11.h"
 
@@ -43,10 +36,10 @@ std::string GetDescriptionFromMimeType(const std::string& mime_type) {
     const char* mime_type;
     const char* label;
   } kWildCardMimeTypes[] = {
-    { "audio", "Audio Files" },
-    { "image", "Image Files" },
-    { "text", "Text Files" },
-    { "video", "Video Files" },
+      {"audio", "Audio Files"},
+      {"image", "Image Files"},
+      {"text", "Text Files"},
+      {"video", "Video Files"},
   };
 
   for (size_t i = 0;
@@ -140,11 +133,7 @@ void AddFilters(GtkFileChooser* chooser,
 
 }  // namespace
 
-
-
-ClientDialogHandlerGtk::ClientDialogHandlerGtk()
-    : gtk_dialog_(NULL) {
-}
+ClientDialogHandlerGtk::ClientDialogHandlerGtk() : gtk_dialog_(NULL) {}
 
 bool ClientDialogHandlerGtk::OnFileDialog(
     CefRefPtr<CefBrowser> browser,
@@ -161,7 +150,7 @@ bool ClientDialogHandlerGtk::OnFileDialog(
 
   // Remove any modifier flags.
   FileDialogMode mode_type =
-     static_cast<FileDialogMode>(mode & FILE_DIALOG_TYPE_MASK);
+      static_cast<FileDialogMode>(mode & FILE_DIALOG_TYPE_MASK);
 
   if (mode_type == FILE_DIALOG_OPEN || mode_type == FILE_DIALOG_OPEN_MULTIPLE) {
     action = GTK_FILE_CHOOSER_ACTION_OPEN;
@@ -204,20 +193,15 @@ bool ClientDialogHandlerGtk::OnFileDialog(
     return false;
 
   GtkWidget* dialog = gtk_file_chooser_dialog_new(
-      title_str.c_str(),
-      GTK_WINDOW(window),
-      action,
-      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-      accept_button, GTK_RESPONSE_ACCEPT,
-      NULL);
+      title_str.c_str(), GTK_WINDOW(window), action, GTK_STOCK_CANCEL,
+      GTK_RESPONSE_CANCEL, accept_button, GTK_RESPONSE_ACCEPT, NULL);
 
   if (mode_type == FILE_DIALOG_OPEN_MULTIPLE)
     gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), TRUE);
 
   if (mode_type == FILE_DIALOG_SAVE) {
     gtk_file_chooser_set_do_overwrite_confirmation(
-        GTK_FILE_CHOOSER(dialog),
-        !!(mode & FILE_DIALOG_OVERWRITEPROMPT_FLAG));
+        GTK_FILE_CHOOSER(dialog), !!(mode & FILE_DIALOG_OVERWRITEPROMPT_FLAG));
   }
 
   gtk_file_chooser_set_show_hidden(GTK_FILE_CHOOSER(dialog),
@@ -230,8 +214,7 @@ bool ClientDialogHandlerGtk::OnFileDialog(
     struct stat sb;
     if (stat(file_path.c_str(), &sb) == 0 && S_ISREG(sb.st_mode)) {
       // Use the directory and name of the existing file.
-      gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog),
-                                    file_path.data());
+      gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), file_path.data());
       exists = true;
     }
 
@@ -298,14 +281,13 @@ bool ClientDialogHandlerGtk::OnFileDialog(
   return true;
 }
 
-bool ClientDialogHandlerGtk::OnJSDialog(
-    CefRefPtr<CefBrowser> browser,
-    const CefString& origin_url,
-    JSDialogType dialog_type,
-    const CefString& message_text,
-    const CefString& default_prompt_text,
-    CefRefPtr<CefJSDialogCallback> callback,
-    bool& suppress_message) {
+bool ClientDialogHandlerGtk::OnJSDialog(CefRefPtr<CefBrowser> browser,
+                                        const CefString& origin_url,
+                                        JSDialogType dialog_type,
+                                        const CefString& message_text,
+                                        const CefString& default_prompt_text,
+                                        CefRefPtr<CefJSDialogCallback> callback,
+                                        bool& suppress_message) {
   CEF_REQUIRE_UI_THREAD();
 
   GtkButtonsType buttons = GTK_BUTTONS_NONE;
@@ -343,22 +325,16 @@ bool ClientDialogHandlerGtk::OnJSDialog(
   if (!window)
     return false;
 
-  gtk_dialog_ = gtk_message_dialog_new(GTK_WINDOW(window),
-                                       GTK_DIALOG_MODAL,
-                                       gtk_message_type,
-                                       buttons,
-                                       "%s",
+  gtk_dialog_ = gtk_message_dialog_new(GTK_WINDOW(window), GTK_DIALOG_MODAL,
+                                       gtk_message_type, buttons, "%s",
                                        message_text.ToString().c_str());
-  g_signal_connect(gtk_dialog_,
-                   "delete-event",
-                   G_CALLBACK(gtk_widget_hide_on_delete),
-                   NULL);
+  g_signal_connect(gtk_dialog_, "delete-event",
+                   G_CALLBACK(gtk_widget_hide_on_delete), NULL);
 
   gtk_window_set_title(GTK_WINDOW(gtk_dialog_), title.c_str());
 
   GtkWidget* ok_button = gtk_dialog_add_button(GTK_DIALOG(gtk_dialog_),
-                                               GTK_STOCK_OK,
-                                               GTK_RESPONSE_OK);
+                                               GTK_STOCK_OK, GTK_RESPONSE_OK);
 
   if (dialog_type != JSDIALOGTYPE_PROMPT)
     gtk_widget_grab_focus(ok_button);
diff --git a/src/client_handler/dialog_handler_gtk.h b/src/client_handler/dialog_handler_gtk.h
index aba4857a..59f65eda 100644
--- a/src/client_handler/dialog_handler_gtk.h
+++ b/src/client_handler/dialog_handler_gtk.h
@@ -1,6 +1,5 @@
-// Default dialog handler implementation on Linux.
-// Copied from upstream cefclient with changes:
-// - Removed "client" namespace
+// COPIED from upstream "cef/tests/cefclient/browser/" directory
+// with minor modifications. See the .patch file in current directory.
 
 // Copyright (c) 2015 The Chromium Embedded Framework Authors. All rights
 // reserved. Use of this source code is governed by a BSD-style license that
@@ -37,15 +36,14 @@ class ClientDialogHandlerGtk : public CefDialogHandler,
                   const CefString& default_prompt_text,
                   CefRefPtr<CefJSDialogCallback> callback,
                   bool& suppress_message) OVERRIDE;
-  bool OnBeforeUnloadDialog(
-      CefRefPtr<CefBrowser> browser,
-      const CefString& message_text,
-      bool is_reload,
-      CefRefPtr<CefJSDialogCallback> callback) OVERRIDE;
+  bool OnBeforeUnloadDialog(CefRefPtr<CefBrowser> browser,
+                            const CefString& message_text,
+                            bool is_reload,
+                            CefRefPtr<CefJSDialogCallback> callback) OVERRIDE;
   void OnResetDialogState(CefRefPtr<CefBrowser> browser) OVERRIDE;
 
  private:
-  static void OnDialogResponse(GtkDialog *dialog,
+  static void OnDialogResponse(GtkDialog* dialog,
                                gint response_id,
                                ClientDialogHandlerGtk* handler);
 
diff --git a/src/client_handler/dialog_handler_gtk.patch b/src/client_handler/dialog_handler_gtk.patch
new file mode 100644
index 00000000..78492921
--- /dev/null
+++ b/src/client_handler/dialog_handler_gtk.patch
@@ -0,0 +1,127 @@
+diff --git dialog_handler_gtk.cc dialog_handler_gtk.cc
+index 042be2ca..ce5a4d4e 100644
+--- dialog_handler_gtk.cc
++++ dialog_handler_gtk.cc
+@@ -1,18 +1,20 @@
++// COPIED from upstream "cef/tests/cefclient/browser/" directory
++// with minor modifications. See the .patch file in current directory.
++
+ // Copyright (c) 2015 The Chromium Embedded Framework Authors. All rights
+ // reserved. Use of this source code is governed by a BSD-style license that
+ // can be found in the LICENSE file.
+ 
+-#include "tests/cefclient/browser/dialog_handler_gtk.h"
+-
+ #include <libgen.h>
+ #include <sys/stat.h>
+ 
+ #include "include/cef_browser.h"
+ #include "include/cef_parser.h"
+ #include "include/wrapper/cef_helpers.h"
+-#include "tests/cefclient/browser/root_window.h"
+ 
+-namespace client {
++#include "include/base/cef_logging.h"
++#include "dialog_handler_gtk.h"
++#include "x11.h"
+ 
+ namespace {
+ 
+@@ -129,18 +131,6 @@ void AddFilters(GtkFileChooser* chooser,
+   }
+ }
+ 
+-GtkWindow* GetWindow(CefRefPtr<CefBrowser> browser) {
+-  scoped_refptr<RootWindow> root_window =
+-      RootWindow::GetForBrowser(browser->GetIdentifier());
+-  if (root_window) {
+-    GtkWindow* window = GTK_WINDOW(root_window->GetWindowHandle());
+-    if (!window)
+-      LOG(ERROR) << "No GtkWindow for browser";
+-    return window;
+-  }
+-  return NULL;
+-}
+-
+ }  // namespace
+ 
+ ClientDialogHandlerGtk::ClientDialogHandlerGtk() : gtk_dialog_(NULL) {}
+@@ -198,7 +188,7 @@ bool ClientDialogHandlerGtk::OnFileDialog(
+     }
+   }
+ 
+-  GtkWindow* window = GetWindow(browser);
++  GtkWindow* window = CefBrowser_GetGtkWindow(browser);
+   if (!window)
+     return false;
+ 
+@@ -308,30 +298,30 @@ bool ClientDialogHandlerGtk::OnJSDialog(CefRefPtr<CefBrowser> browser,
+     case JSDIALOGTYPE_ALERT:
+       buttons = GTK_BUTTONS_NONE;
+       gtk_message_type = GTK_MESSAGE_WARNING;
+-      title = "JavaScript Alert";
++      title = "Alert";
+       break;
+ 
+     case JSDIALOGTYPE_CONFIRM:
+       buttons = GTK_BUTTONS_CANCEL;
+       gtk_message_type = GTK_MESSAGE_QUESTION;
+-      title = "JavaScript Confirm";
++      title = "Confirm";
+       break;
+ 
+     case JSDIALOGTYPE_PROMPT:
+       buttons = GTK_BUTTONS_CANCEL;
+       gtk_message_type = GTK_MESSAGE_QUESTION;
+-      title = "JavaScript Prompt";
++      title = "Prompt";
+       break;
+   }
+ 
+   js_dialog_callback_ = callback;
+ 
+   if (!origin_url.empty()) {
+-    title += " - ";
+-    title += CefFormatUrlForSecurityDisplay(origin_url).ToString();
++    // title += " - ";
++    // title += CefFormatUrlForSecurityDisplay(origin_url).ToString();
+   }
+ 
+-  GtkWindow* window = GetWindow(browser);
++  GtkWindow* window = CefBrowser_GetGtkWindow(browser);
+   if (!window)
+     return false;
+ 
+@@ -413,5 +403,3 @@ void ClientDialogHandlerGtk::OnDialogResponse(GtkDialog* dialog,
+ 
+   handler->OnResetDialogState(NULL);
+ }
+-
+-}  // namespace client
+diff --git dialog_handler_gtk.h dialog_handler_gtk.h
+index 163d0a35..59f65eda 100644
+--- dialog_handler_gtk.h
++++ dialog_handler_gtk.h
+@@ -1,3 +1,6 @@
++// COPIED from upstream "cef/tests/cefclient/browser/" directory
++// with minor modifications. See the .patch file in current directory.
++
+ // Copyright (c) 2015 The Chromium Embedded Framework Authors. All rights
+ // reserved. Use of this source code is governed by a BSD-style license that
+ // can be found in the LICENSE file.
+@@ -11,8 +14,6 @@
+ #include "include/cef_dialog_handler.h"
+ #include "include/cef_jsdialog_handler.h"
+ 
+-namespace client {
+-
+ class ClientDialogHandlerGtk : public CefDialogHandler,
+                                public CefJSDialogHandler {
+  public:
+@@ -53,6 +54,4 @@ class ClientDialogHandlerGtk : public CefDialogHandler,
+   DISALLOW_COPY_AND_ASSIGN(ClientDialogHandlerGtk);
+ };
+ 
+-}  // namespace client
+-
+ #endif  // CEF_TESTS_CEFCLIENT_BROWSER_DIALOG_HANDLER_GTK_H_

From d688f4297da48d6ef2abc7629cae59a276e63d6b Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Mon, 11 Jun 2018 19:45:30 +0200
Subject: [PATCH 063/238] Update print handler on Linux (#403) and fix print
 dialog error (#435)

---
 src/cef_v59..v66_changes.txt            |  2 +-
 src/client_handler/x11.cpp              |  9 +++++++++
 src/subprocess/Makefile                 |  4 ++--
 src/subprocess/Makefile-libcefpythonapp |  2 +-
 src/subprocess/cefpython_app.cpp        |  5 +++++
 src/subprocess/print_handler_gtk.cpp    | 16 +++-------------
 6 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/cef_v59..v66_changes.txt b/src/cef_v59..v66_changes.txt
index 36ce50d5..600f194d 100644
--- a/src/cef_v59..v66_changes.txt
+++ b/src/cef_v59..v66_changes.txt
@@ -64,7 +64,7 @@ MISC
 ----
 + Compare src/client_handler/dialog_handler_gtk.cpp (and .h) with upstream
   cefclient files
-- In subprocess/print_handler_gtk.cpp use GetWindow implementation
++ In subprocess/print_handler_gtk.cpp use GetWindow implementation
   from x11.cpp
 
 NEW FEATURES
diff --git a/src/client_handler/x11.cpp b/src/client_handler/x11.cpp
index 9ebfe2c8..2e97a6e9 100644
--- a/src/client_handler/x11.cpp
+++ b/src/client_handler/x11.cpp
@@ -2,6 +2,9 @@
 // All rights reserved. Licensed under BSD 3-clause license.
 // Project website: https://github.com/cztomczak/cefpython
 
+// NOTE: This file is also used by "subprocess" and "libcefpythonapp"
+//       targets during build.
+
 #include "x11.h"
 #include "include/base/cef_logging.h"
 
@@ -24,6 +27,7 @@ void InstallX11ErrorHandlers() {
     // Copied from upstream cefclient.
     // Install xlib error handlers so that the application won't be terminated
     // on non-fatal errors. Must be done after initializing GTK.
+    LOG(INFO) << "[Browser process] Install X11 error handlers";
     XSetErrorHandler(XErrorHandlerImpl);
     XSetIOErrorHandler(XIOErrorHandlerImpl);
 }
@@ -48,6 +52,7 @@ void SetX11WindowTitle(CefRefPtr<CefBrowser> browser, char* title) {
 }
 
 GtkWindow* CefBrowser_GetGtkWindow(CefRefPtr<CefBrowser> browser) {
+  // TODO: Should return NULL when using the Views framework
   // -- REWRITTEN FOR CEF PYTHON USE CASE --
   // X11 window handle
   ::Window xwindow = browser->GetHost()->GetWindowHandle();
@@ -68,6 +73,10 @@ GtkWindow* CefBrowser_GetGtkWindow(CefRefPtr<CefBrowser> browser) {
     // internally, so GTK wasn't yet initialized and must do it
     // now, so that display is available. Also must install X11
     // error handlers to avoid 'BadWindow' errors.
+    // --
+    // A similar code is in cefpython_app.cpp and it might already
+    // been executed. If making changes here, make changes there
+    // as well.
     LOG(INFO) << "[Browser process] Initialize GTK";
     gtk_init(0, NULL);
     InstallX11ErrorHandlers();
diff --git a/src/subprocess/Makefile b/src/subprocess/Makefile
index b6f003be..f52b72df 100644
--- a/src/subprocess/Makefile
+++ b/src/subprocess/Makefile
@@ -35,8 +35,8 @@ else ifeq ($(UNAME_S), Darwin)
 endif
 
 ifeq ($(UNAME_S), Linux)
-	CPP_FILES = print_handler_gtk.cpp
-	LIBS = -lcef -lgobject-2.0 -lglib-2.0 -lgtk-x11-2.0
+	CPP_FILES = print_handler_gtk.cpp ../client_handler/x11.cpp
+	LIBS = -lcef -lX11 -lgobject-2.0 -lglib-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0
 else ifeq ($(UNAME_S), Darwin)
 	CPP_FILES =
 	# Include framework before libcef_dll_wrapper
diff --git a/src/subprocess/Makefile-libcefpythonapp b/src/subprocess/Makefile-libcefpythonapp
index e811a32f..57f3dcce 100644
--- a/src/subprocess/Makefile-libcefpythonapp
+++ b/src/subprocess/Makefile-libcefpythonapp
@@ -12,7 +12,7 @@ UNAME_S = $(shell uname -s)
 CCFLAGS = -fPIC -DBROWSER_PROCESS $(CEF_CCFLAGS)
 
 ifeq ($(UNAME_S), Linux)
-	SRC_MORE = print_handler_gtk.cpp \
+	SRC_MORE = print_handler_gtk.cpp ../client_handler/x11.cpp \
 			main_message_loop/main_message_loop_external_pump_linux.cpp
 else ifeq ($(UNAME_S), Darwin)
     SRC_MORE = main_message_loop/main_message_loop_external_pump_mac.mm
diff --git a/src/subprocess/cefpython_app.cpp b/src/subprocess/cefpython_app.cpp
index 9105da3c..a02a7cd5 100644
--- a/src/subprocess/cefpython_app.cpp
+++ b/src/subprocess/cefpython_app.cpp
@@ -21,6 +21,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
+#include "client_handler/x11.h"
 #include "print_handler_gtk.h"
 #endif  // OS_LINUX
 #endif  // BROWSER_PROCESS
@@ -221,10 +222,14 @@ CefRefPtr<CefPrintHandler> CefPythonApp::GetPrintHandler() {
 #if defined(OS_LINUX)
     // For print handler to work GTK must be initialized. This is
     // required for some of the examples.
+    // --
+    // A similar code is in client_handler/x11.cpp. If making changes here,
+    // make changes there as well.
     GdkDisplay* gdk_display = gdk_display_get_default();
     if (!gdk_display) {
         LOG(INFO) << "[Browser process] Initialize GTK";
         gtk_init(0, NULL);
+        InstallX11ErrorHandlers();
     }
 #endif
 #endif
diff --git a/src/subprocess/print_handler_gtk.cpp b/src/subprocess/print_handler_gtk.cpp
index 18c8c1c4..3bfc30c5 100644
--- a/src/subprocess/print_handler_gtk.cpp
+++ b/src/subprocess/print_handler_gtk.cpp
@@ -19,6 +19,8 @@
 #include "include/wrapper/cef_helpers.h"
 #include "include/wrapper/cef_closure_task.h"
 
+#include "client_handler/x11.h"
+
 namespace {
 
 // CUPS Duplex attribute and values.
@@ -374,7 +376,7 @@ struct ClientPrintHandlerGtk::PrintHandler {
                      CefRefPtr<CefPrintDialogCallback> callback) {
     dialog_callback_ = callback;
 
-    GtkWindow* parent = GetWindow();
+    GtkWindow* parent = CefBrowser_GetGtkWindow(browser_);
     // TODO(estade): We need a window title here.
     dialog_ = gtk_print_unix_dialog_new(NULL, parent);
     g_signal_connect(dialog_, "delete-event",
@@ -429,18 +431,6 @@ struct ClientPrintHandlerGtk::PrintHandler {
   }
 
  private:
-  // Returns the GtkWindow* for the browser. Will return NULL when using the
-  // Views framework.
-  GtkWindow* GetWindow() {
-    // TODO(cefpython): Test the code that is commented out whether it works
-    /*
-    CefWindowHandle hwnd = browser_->GetWindowHandle();
-    if (hwnd)
-      return GTK_WINDOW(hwnd);
-    */
-    return NULL;
-  }
-
   void OnDialogResponse(GtkDialog* dialog, gint response_id) {
     int num_matched_handlers = g_signal_handlers_disconnect_by_func(
         dialog_, reinterpret_cast<gpointer>(&OnDialogResponseThunk), this);

From ced25bf284d523e0d883b0d8fada8cfb3261cd41 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Mon, 11 Jun 2018 19:51:38 +0200
Subject: [PATCH 064/238] Update print handler gtk patch (#403)

---
 src/subprocess/print_handler_gtk.patch | 46 ++++++++++++++++----------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/subprocess/print_handler_gtk.patch b/src/subprocess/print_handler_gtk.patch
index 75dcff42..8ee62a2a 100644
--- a/src/subprocess/print_handler_gtk.patch
+++ b/src/subprocess/print_handler_gtk.patch
@@ -1,8 +1,8 @@
 diff --git print_handler_gtk.cc print_handler_gtk.cc
-index 9a822b7a..18c8c1c4 100644
+index 9a822b7a..3bfc30c5 100644
 --- print_handler_gtk.cc
 +++ print_handler_gtk.cc
-@@ -1,22 +1,23 @@
+@@ -1,22 +1,25 @@
 +// COPIED from upstream "cef/tests/cefclient/browser/" directory
 +// with minor modifications. See the .patch file in current directory.
 +
@@ -23,32 +23,42 @@ index 9a822b7a..18c8c1c4 100644
  #include "include/base/cef_logging.h"
  #include "include/base/cef_macros.h"
  #include "include/wrapper/cef_helpers.h"
--
++#include "include/wrapper/cef_closure_task.h"
+ 
 -#include "tests/cefclient/browser/root_window.h"
 -
 -namespace client {
-+#include "include/wrapper/cef_closure_task.h"
++#include "client_handler/x11.h"
  
  namespace {
  
-@@ -431,10 +432,12 @@ struct ClientPrintHandlerGtk::PrintHandler {
-   // Returns the GtkWindow* for the browser. Will return NULL when using the
-   // Views framework.
-   GtkWindow* GetWindow() {
+@@ -373,7 +376,7 @@ struct ClientPrintHandlerGtk::PrintHandler {
+                      CefRefPtr<CefPrintDialogCallback> callback) {
+     dialog_callback_ = callback;
+ 
+-    GtkWindow* parent = GetWindow();
++    GtkWindow* parent = CefBrowser_GetGtkWindow(browser_);
+     // TODO(estade): We need a window title here.
+     dialog_ = gtk_print_unix_dialog_new(NULL, parent);
+     g_signal_connect(dialog_, "delete-event",
+@@ -428,16 +431,6 @@ struct ClientPrintHandlerGtk::PrintHandler {
+   }
+ 
+  private:
+-  // Returns the GtkWindow* for the browser. Will return NULL when using the
+-  // Views framework.
+-  GtkWindow* GetWindow() {
 -    scoped_refptr<RootWindow> root_window =
 -        RootWindow::GetForBrowser(browser_->GetIdentifier());
 -    if (root_window)
 -      return GTK_WINDOW(root_window->GetWindowHandle());
-+    // TODO(cefpython): Test the code that is commented out whether it works
-+    /*
-+    CefWindowHandle hwnd = browser_->GetWindowHandle();
-+    if (hwnd)
-+      return GTK_WINDOW(hwnd);
-+    */
-     return NULL;
-   }
- 
-@@ -626,5 +629,3 @@ ClientPrintHandlerGtk::PrintHandler* ClientPrintHandlerGtk::GetPrintHandler(
+-    return NULL;
+-  }
+-
+   void OnDialogResponse(GtkDialog* dialog, gint response_id) {
+     int num_matched_handlers = g_signal_handlers_disconnect_by_func(
+         dialog_, reinterpret_cast<gpointer>(&OnDialogResponseThunk), this);
+@@ -626,5 +619,3 @@ ClientPrintHandlerGtk::PrintHandler* ClientPrintHandlerGtk::GetPrintHandler(
    DCHECK(it != print_handler_map_.end());
    return it->second;
  }

From 0634b90b0f04c729866b3138e3dc418121eaf68a Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Tue, 12 Jun 2018 14:47:28 +0200
Subject: [PATCH 065/238] Update log severity constants (#403)

---
 api/ApplicationSettings.md   | 1 -
 src/cef_v59..v66_changes.txt | 3 ++-
 src/extern/cef/cef_types.pxd | 1 +
 src/settings.pyx             | 5 +++++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/api/ApplicationSettings.md b/api/ApplicationSettings.md
index 5a2f664d..87bad879 100644
--- a/api/ApplicationSettings.md
+++ b/api/ApplicationSettings.md
@@ -314,7 +314,6 @@ Accepted values - constants available in the cefpython module:
 * LOGSEVERITY_INFO
 * LOGSEVERITY_WARNING
 * LOGSEVERITY_ERROR (default)
-* LOGSEVERITY_ERROR_REPORT
 * LOGSEVERITY_DISABLE
 
 
diff --git a/src/cef_v59..v66_changes.txt b/src/cef_v59..v66_changes.txt
index 600f194d..1f1deac4 100644
--- a/src/cef_v59..v66_changes.txt
+++ b/src/cef_v59..v66_changes.txt
@@ -71,7 +71,8 @@ NEW FEATURES
 ------------
 
 internal/cef_types.h
-- cef_log_severity_t: new key LOGSEVERITY_DEBUG
++ cef_log_severity_t: new key LOGSEVERITY_DEBUG (no need to expose,
+  same as LOGSEVERITY_VERBOSE, see code comments in setting.pyx
 - cef_settings_t:
   - background_color: OSR windows can set an ARGB background color
 - cef_path_key_t (informational only):
diff --git a/src/extern/cef/cef_types.pxd b/src/extern/cef/cef_types.pxd
index e70ec5ac..5fcd3fa7 100644
--- a/src/extern/cef/cef_types.pxd
+++ b/src/extern/cef/cef_types.pxd
@@ -115,6 +115,7 @@ cdef extern from "include/internal/cef_types.h":
     ctypedef enum cef_log_severity_t:
         LOGSEVERITY_DEFAULT,
         LOGSEVERITY_VERBOSE,
+        LOGSEVERITY_DEBUG = LOGSEVERITY_VERBOSE,
         LOGSEVERITY_INFO,
         LOGSEVERITY_WARNING,
         LOGSEVERITY_ERROR,
diff --git a/src/settings.pyx b/src/settings.pyx
index 154a40d0..08204491 100644
--- a/src/settings.pyx
+++ b/src/settings.pyx
@@ -12,6 +12,11 @@ cimport cef_types
 
 LOGSEVERITY_DEFAULT = cef_types.LOGSEVERITY_DEFAULT
 LOGSEVERITY_VERBOSE = cef_types.LOGSEVERITY_VERBOSE
+# LOGSEVERITY_DEBUG is not exposed, as it is the same
+# as LOGSEVERITY_VERBOSE, and because it would be confusing
+# as currently passing --debug arg to app causes it to
+# set logseverity to LOGSEVERITY_INFO. Verbose logseverity
+# contains too much information.
 LOGSEVERITY_INFO = cef_types.LOGSEVERITY_INFO
 LOGSEVERITY_WARNING = cef_types.LOGSEVERITY_WARNING
 LOGSEVERITY_ERROR = cef_types.LOGSEVERITY_ERROR

From bd63e306eb8739adde51dbe6de547d91868acbdc Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Tue, 12 Jun 2018 14:52:19 +0200
Subject: [PATCH 066/238] Update background_color option in app/browser
 settings (#403)

---
 api/ApplicationSettings.md   | 2 +-
 api/BrowserSettings.md       | 4 ++++
 api/WindowInfo.md            | 2 +-
 src/cef_v59..v66_changes.txt | 4 ++--
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/api/ApplicationSettings.md b/api/ApplicationSettings.md
index 87bad879..b5a81900 100644
--- a/api/ApplicationSettings.md
+++ b/api/ApplicationSettings.md
@@ -118,7 +118,7 @@ Description from upstream CEF:
 > will be enabled.
 
 32-bit ARGB color value, not premultiplied. The color components are always
-in a known order. Equivalent to the `SkColor` type.
+in a known order. Equivalent to the `SkColor` type in Chromium.
 
 
 ### browser_subprocess_path
diff --git a/api/BrowserSettings.md b/api/BrowserSettings.md
index 9fd1a380..4b1b13af 100644
--- a/api/BrowserSettings.md
+++ b/api/BrowserSettings.md
@@ -86,6 +86,10 @@ Description from upstream CEF:
 > fully transparent for a windowless (off-screen) browser then transparent
 > painting will be enabled.
 
+32-bit ARGB color value, not premultiplied. The color components are always
+in a known order. Equivalent to the `SkColor` type in Chromium.
+
+
 ### databases_disabled
 
 (bool) Controls whether databases can be used. Also configurable using the --disable-databases switch.
diff --git a/api/WindowInfo.md b/api/WindowInfo.md
index 091eb3f1..957b8757 100644
--- a/api/WindowInfo.md
+++ b/api/WindowInfo.md
@@ -50,7 +50,7 @@ Available only on Windows.
 | parentWindowHandle | int |
 | __Return__ | void |
 
-Upstream CEF description:
+Description from upstream CEF:
 > Create the browser using windowless (off-screen) rendering. No window
 will be created for the browser and all rendering will occur via the
 CefRenderHandler interface. The |parent| value will be used to identify
diff --git a/src/cef_v59..v66_changes.txt b/src/cef_v59..v66_changes.txt
index 1f1deac4..1feb6f1c 100644
--- a/src/cef_v59..v66_changes.txt
+++ b/src/cef_v59..v66_changes.txt
@@ -73,8 +73,8 @@ NEW FEATURES
 internal/cef_types.h
 + cef_log_severity_t: new key LOGSEVERITY_DEBUG (no need to expose,
   same as LOGSEVERITY_VERBOSE, see code comments in setting.pyx
-- cef_settings_t:
-  - background_color: OSR windows can set an ARGB background color
++ cef_settings_t:
+  + background_color: OSR windows can set an ARGB background color
 - cef_path_key_t (informational only):
   - PK_DIR_RESOURCES new key
 - cef_urlrequest_flags_t (expose in cefpython.Request.Flags):

From 1ff451429d33fec293d36931992833545f515e7c Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Tue, 12 Jun 2018 14:59:46 +0200
Subject: [PATCH 067/238] Update cef_path_key_t (#403).

PK_DIR_RESOURCES should not be included in CefOverridePath patch
(Issue #231), since there is already a way to set resources dir
path using CefSettings.resources_dir_path.
---
 src/extern/cef/cef_types.pxd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/extern/cef/cef_types.pxd b/src/extern/cef/cef_types.pxd
index 5fcd3fa7..70263780 100644
--- a/src/extern/cef/cef_types.pxd
+++ b/src/extern/cef/cef_types.pxd
@@ -344,6 +344,7 @@ cdef extern from "include/internal/cef_types.h":
         PK_FILE_MODULE,
         PK_LOCAL_APP_DATA,
         PK_USER_DATA,
+        PK_DIR_RESOURCES,
     ctypedef cef_path_key_t PathKey
 
     ctypedef enum cef_plugin_policy_t:

From 0e85431f7d6d0cf5ef541660bb8f629804155ccf Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Mon, 18 Jun 2018 13:48:24 +0200
Subject: [PATCH 068/238] Update build instructions for 32-bit (#403)

---
 docs/Build-instructions.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/Build-instructions.md b/docs/Build-instructions.md
index 507cbc92..5e698af4 100644
--- a/docs/Build-instructions.md
+++ b/docs/Build-instructions.md
@@ -196,13 +196,14 @@ requirements common for all platforms.
     * Official binaries are built on Ubuntu 14.04 (cmake 2.8.12, g++ 4.8.4)
     * Download [ninja](https://github.com/ninja-build/ninja/releases) 1.7.1 or later
       and copy it to /usr/bin and chmod 755.
-    * Install/upgrade required packages using one of the three methods below
+    * Install/upgrade required packages using one of the four methods below
       (these packages should be upgraded each time you update to newer CEF):
-        1. Type command: `sudo apt-get install bison build-essential cdbs curl devscripts dpkg-dev elfutils fakeroot flex g++ git-core git-svn gperf libapache2-mod-php5 libasound2-dev libav-tools libbrlapi-dev libbz2-dev libcairo2-dev libcap-dev libcups2-dev libcurl4-gnutls-dev libdrm-dev libelf-dev libexif-dev libffi-dev libgconf2-dev libgconf-2-4 libgl1-mesa-dev libglib2.0-dev libglu1-mesa-dev libgnome-keyring-dev libgtk2.0-dev libkrb5-dev libnspr4-dev libnss3-dev libpam0g-dev libpci-dev libpulse-dev libsctp-dev libspeechd-dev libsqlite3-dev libssl-dev libudev-dev libwww-perl libxslt1-dev libxss-dev libxt-dev libxtst-dev mesa-common-dev openbox patch perl php5-cgi pkg-config python python-cherrypy3 python-crypto python-dev python-psutil python-numpy python-opencv python-openssl python-yaml rpm ruby subversion ttf-dejavu-core ttf-indic-fonts ttf-kochi-gothic ttf-kochi-mincho fonts-thai-tlwg wdiff wget zip`
-        2. See the list of packages on the
+        1. For 64-bit build, type this command: `sudo apt-get install bison build-essential cdbs curl devscripts dpkg-dev elfutils fakeroot flex g++ git-core git-svn gperf libapache2-mod-php5 libasound2-dev libav-tools libbrlapi-dev libbz2-dev libcairo2-dev libcap-dev libcups2-dev libcurl4-gnutls-dev libdrm-dev libelf-dev libexif-dev libffi-dev libgconf2-dev libgconf-2-4 libgl1-mesa-dev libglib2.0-dev libglu1-mesa-dev libgnome-keyring-dev libgtk2.0-dev libkrb5-dev libnspr4-dev libnss3-dev libpam0g-dev libpci-dev libpulse-dev libsctp-dev libspeechd-dev libsqlite3-dev libssl-dev libudev-dev libwww-perl libxslt1-dev libxss-dev libxt-dev libxtst-dev mesa-common-dev openbox patch perl php5-cgi pkg-config python python-cherrypy3 python-crypto python-dev python-psutil python-numpy python-opencv python-openssl python-yaml rpm ruby subversion ttf-dejavu-core ttf-indic-fonts ttf-kochi-gothic ttf-kochi-mincho fonts-thai-tlwg wdiff wget zip`
+        2. For 32-bit build, type this command: `bison build-essential cdbs curl devscripts dpkg-dev elfutils fakeroot flex g++ git-core git-svn gperf libapache2-mod-php5 libasound2-dev libav-tools libbrlapi-dev libbz2-dev libcairo2-dev libcap-dev libcups2-dev libcurl4-gnutls-dev libdrm-dev libelf-dev libexif-dev libffi-dev libgconf2-dev libgl1-mesa-dev libglib2.0-dev libglu1-mesa-dev libgnome-keyring-dev libgtk2.0-dev libkrb5-dev libnspr4-dev libnss3-dev libpam0g-dev libpci-dev libpulse-dev libsctp-dev libspeechd-dev libsqlite3-dev libssl-dev libudev-dev libwww-perl libxslt1-dev libxss-dev libxt-dev libxtst-dev mesa-common-dev openbox patch perl php5-cgi pkg-config python python-cherrypy3 python-crypto python-dev python-psutil python-numpy python-opencv python-openssl python-yaml rpm ruby subversion ttf-dejavu-core ttf-indic-fonts ttf-kochi-gothic ttf-kochi-mincho fonts-thai-tlwg wdiff wget zip lib32gcc1 lib32stdc++6 libc6-i386 linux-libc-dev:i386 libasound2:i386 libcap2:i386 libelf-dev:i386 libfontconfig1:i386 libgconf-2-4:i386 libglib2.0-0:i386 libgpm2:i386 libgtk2.0-0:i386 libgtk-3-0:i386 libncurses5:i386 libnss3:i386 libpango1.0-0:i386 libssl1.0.0:i386 libtinfo-dev:i386 libxcomposite1:i386 libxcursor1:i386 libxdamage1:i386 libxi6:i386 libxrandr2:i386 libxss1:i386 libxtst6:i386`
+        3. See the list of packages on the
            [cef/AutomatedBuildSetup.md](https://bitbucket.org/chromiumembedded/cef/wiki/AutomatedBuildSetup.md#markdown-header-linux-configuration)
             wiki page.
-        2. Run the install-build-deps.sh script -
+        4. Run the install-build-deps.sh script -
            instructions provided further down on this page.
     * To build on Debian 7 see
       [cef/BuildingOnDebian7.md](https://bitbucket.org/chromiumembedded/cef/wiki/BuildingOnDebian7.md) and

From 1c616296538fd2526961fe989f70cc735372b13f Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Tue, 31 Jul 2018 15:00:13 +0200
Subject: [PATCH 069/238] Support for Python 3.7 (#433). Still needs testing.

---
 README.md                              |  6 +++---
 docs/Knowledge-Base.md                 |  4 ++--
 src/cef_v59..v66_changes.txt           | 15 ++++-----------
 src/common/cefpython_public_api.h      |  2 ++
 tools/build_distrib.py                 | 17 +++++++++++++----
 tools/common.py                        |  2 ++
 tools/installer/cefpython3.__init__.py |  5 ++++-
 tools/installer/cefpython3.setup.py    |  3 ++-
 8 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index ddb39381..f478a96c 100644
--- a/README.md
+++ b/README.md
@@ -218,9 +218,9 @@ support old operating systems then choose the v31 release.
 
 OS | Py2 | Py3 | 32bit | 64bit | Requirements
 --- | --- | --- | --- | --- | ---
-Windows | 2.7 | 3.4 / 3.5 / 3.6 | Yes | Yes | Windows 7+
-Linux | 2.7 | 3.4 / 3.5 / 3.6 | Yes | Yes | Debian 7+ / Ubuntu 12.04+
-Mac | 2.7 | 3.4 / 3.5 / 3.6 | No | Yes | MacOS 10.9+
+Windows | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | Yes | Yes | Windows 7+
+Linux | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | Yes | Yes | Debian 7+ / Ubuntu 12.04+
+Mac | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | No | Yes | MacOS 10.9+
 
 These platforms are not supported yet:
 - ARM - see [Issue #267](../../issues/267)
diff --git a/docs/Knowledge-Base.md b/docs/Knowledge-Base.md
index cf1deba5..5e49162f 100644
--- a/docs/Knowledge-Base.md
+++ b/docs/Knowledge-Base.md
@@ -33,9 +33,9 @@ ImportError: DLL load failed: The specified module could not be found.
 ```
 
 Then most probably this is caused, because you are missing
-"msvcp140.dll" dependency (for Python 3.5/3.6 for example). This
+"msvcp140.dll" dependency (for Python 3.5/3.6/3.7 for example). This
 is a dependency for Python C++ extensions (eg. cefpython_py36.pyd
-depends on it). For Python 3.5/3.6 to fix this download
+depends on it). For Python 3.5/3.6/3.7 to fix this download
 [Visual C++ Redistributable for VS2015](https://www.microsoft.com/en-us/download/details.aspx?id=52685)
 (13 MB) - this is just a VC++ redistributable, not a Visual Studio
 package. For 32-bit download "vc_redist.x86.exe" file and for
diff --git a/src/cef_v59..v66_changes.txt b/src/cef_v59..v66_changes.txt
index 1feb6f1c..38a071e4 100644
--- a/src/cef_v59..v66_changes.txt
+++ b/src/cef_v59..v66_changes.txt
@@ -75,17 +75,10 @@ internal/cef_types.h
   same as LOGSEVERITY_VERBOSE, see code comments in setting.pyx
 + cef_settings_t:
   + background_color: OSR windows can set an ARGB background color
-- cef_path_key_t (informational only):
-  - PK_DIR_RESOURCES new key
-- cef_urlrequest_flags_t (expose in cefpython.Request.Flags):
-  - UR_FLAG_ONLY_FROM_CACHE new flag
-  - UR_FLAG_STOP_ON_REDIRECT new flag
-  - enum values have changed due to new key
-- cef_thread_id_t:
-  - TID_FILE_BACKGROUND (deprecated TID_FILE)
-  - TID_FILE_USER_VISIBLE
-- cef_popup_features_t: some keys removed (not exposed, informational only)
-- cef_referrer_policy_t changes (not exposed)
++ cef_path_key_t (informational only):
+  + PK_DIR_RESOURCES new key
++ cef_popup_features_t: some keys removed (not exposed, informational only)
++ cef_referrer_policy_t changes (not exposed, info only)
 
 cef_accessibility_handler.h
 - CefAccessibilityHandler
diff --git a/src/common/cefpython_public_api.h b/src/common/cefpython_public_api.h
index 0fbd60a5..53ad62c6 100644
--- a/src/common/cefpython_public_api.h
+++ b/src/common/cefpython_public_api.h
@@ -44,6 +44,8 @@
 #include "../../build/build_cefpython/cefpython_py35_fixed.h"
 #elif PY_MINOR_VERSION == 6
 #include "../../build/build_cefpython/cefpython_py36_fixed.h"
+#elif PY_MINOR_VERSION == 7
+#include "../../build/build_cefpython/cefpython_py37_fixed.h"
 #endif // PY_MINOR_VERSION
 #endif // PY_MAJOR_VERSION
 
diff --git a/tools/build_distrib.py b/tools/build_distrib.py
index 3c2abef8..08af1ec5 100644
--- a/tools/build_distrib.py
+++ b/tools/build_distrib.py
@@ -20,6 +20,9 @@
                        allows to use CEF prebuilt binaries and libraries
                        downloaded from CEF Python's Github releases to
                        build distribution pacakges.
+    --allow-partial    Do not require all supported Python versions to
+                       be installed. If some are missing they just won't
+                       be included in distribution.
 
 
 This script does the following:
@@ -73,9 +76,10 @@
 NO_RUN_EXAMPLES = False
 NO_REBUILD = False
 NO_AUTOMATE = False
+ALLOW_PARTIAL = False
 
 # Python versions
-SUPPORTED_PYTHON_VERSIONS = [(2, 7), (3, 4), (3, 5), (3, 6)]
+SUPPORTED_PYTHON_VERSIONS = [(2, 7), (3, 4), (3, 5), (3, 6), (3, 7)]
 
 # Python search paths. It will use first Python found for specific version.
 # Supports replacement of one environment variable in path eg.: %ENV_KEY%.
@@ -148,7 +152,7 @@ def main():
 
 
 def command_line_args():
-    global VERSION, NO_RUN_EXAMPLES, NO_REBUILD, NO_AUTOMATE
+    global VERSION, NO_RUN_EXAMPLES, NO_REBUILD, NO_AUTOMATE, ALLOW_PARTIAL
     version = get_version_from_command_line_args(__file__)
     if not version or "--help" in sys.argv:
         print(__doc__)
@@ -163,6 +167,9 @@ def command_line_args():
     if "--no-automate" in sys.argv:
         NO_AUTOMATE = True
         sys.argv.remove("--no-automate")
+    if "--allow-partial" in sys.argv:
+        ALLOW_PARTIAL = True
+        sys.argv.remove("--allow-partial")
     args = sys.argv[1:]
     for arg in args:
         if arg == version:
@@ -295,7 +302,8 @@ def check_pythons(pythons_32bit, pythons_64bit):
     if pythons_32bit:
         print("[build_distrib.py] Pythons 32-bit found:")
         pp.pprint(pythons_32bit)
-    if check_32bit and len(pythons_32bit) != len(SUPPORTED_PYTHON_VERSIONS):
+    if check_32bit and len(pythons_32bit) != len(SUPPORTED_PYTHON_VERSIONS) \
+            and not ALLOW_PARTIAL:
         print("[build_distrib.py] ERROR: Couldn't find all supported"
               " python 32-bit installations. Found: {found}."
               .format(found=len(pythons_32bit)))
@@ -303,7 +311,8 @@ def check_pythons(pythons_32bit, pythons_64bit):
     if pythons_64bit:
         print("[build_distrib.py] Pythons 64-bit found:")
         pp.pprint(pythons_64bit)
-    if check_64bit and len(pythons_64bit) != len(SUPPORTED_PYTHON_VERSIONS):
+    if check_64bit and len(pythons_64bit) != len(SUPPORTED_PYTHON_VERSIONS) \
+            and not ALLOW_PARTIAL:
         print("[build_distrib.py] ERROR: Couldn't find all supported"
               " python 64-bit installations. Found: {found}."
               .format(found=len(pythons_64bit)))
diff --git a/tools/common.py b/tools/common.py
index 4ca34d73..6e44dc02 100644
--- a/tools/common.py
+++ b/tools/common.py
@@ -424,6 +424,8 @@ def get_msvs_for_python(vs_prefix=False):
         return "VS2015" if vs_prefix else "2015"
     elif sys.version_info[:2] == (3, 6):
         return "VS2015" if vs_prefix else "2015"
+    elif sys.version_info[:2] == (3, 7):
+        return "VS2015" if vs_prefix else "2015"
     else:
         print("ERROR: This version of Python is not supported")
         sys.exit(1)
diff --git a/tools/installer/cefpython3.__init__.py b/tools/installer/cefpython3.__init__.py
index d7463248..fc00000d 100644
--- a/tools/installer/cefpython3.__init__.py
+++ b/tools/installer/cefpython3.__init__.py
@@ -44,7 +44,7 @@
     libcef = os.path.join(package_dir, "libcef.so")
     ctypes.CDLL(libcef, ctypes.RTLD_GLOBAL)
 
-# Load the cefpython module for proper Python version
+# Load the cefpython module for given Python version
 if sys.version_info[:2] == (2, 7):
     # noinspection PyUnresolvedReferences
     from . import cefpython_py27 as cefpython
@@ -57,5 +57,8 @@
 elif sys.version_info[:2] == (3, 6):
     # noinspection PyUnresolvedReferences
     from . import cefpython_py36 as cefpython
+elif sys.version_info[:2] == (3, 7):
+    # noinspection PyUnresolvedReferences
+    from . import cefpython_py37 as cefpython
 else:
     raise Exception("Python version not supported: " + sys.version)
diff --git a/tools/installer/cefpython3.setup.py b/tools/installer/cefpython3.setup.py
index 08065ebd..c8e52699 100644
--- a/tools/installer/cefpython3.setup.py
+++ b/tools/installer/cefpython3.setup.py
@@ -129,7 +129,7 @@ def main():
                          "https://github.com/cztomczak/cefpython",
         license="BSD 3-clause",
         author="Czarek Tomczak",
-        author_email="czarek.tomczak@@gmail.com",
+        author_email="czarek.tomczak2@@gmail.com",
         url="https://github.com/cztomczak/cefpython",
         download_url="https://github.com/cztomczak/cefpython/releases",
         platforms=["{{SYSCONFIG_PLATFORM}}"],
@@ -147,6 +147,7 @@ def main():
             "Programming Language :: Python :: 3.4",
             "Programming Language :: Python :: 3.5",
             "Programming Language :: Python :: 3.6",
+            "Programming Language :: Python :: 3.7",
             "Topic :: Desktop Environment",
             "Topic :: Internet",
             "Topic :: Internet :: WWW/HTTP",

From 732fbc98aca28072ab43fd587454183c6b4304ed Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Tue, 31 Jul 2018 15:35:16 +0200
Subject: [PATCH 070/238] Update to Cython 0.28.4 (#433, #250). Tested only on
 Linux.

---
 src/extern/cef/cef_task.pxd | 1 -
 tools/requirements.txt      | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/extern/cef/cef_task.pxd b/src/extern/cef/cef_task.pxd
index 806cbe89..fbc0181e 100644
--- a/src/extern/cef/cef_task.pxd
+++ b/src/extern/cef/cef_task.pxd
@@ -9,7 +9,6 @@ from cef_types cimport int64
 from cef_ptr cimport CefRefPtr
 
 cdef extern from "include/cef_task.h":
-    ctypedef int CefThreadId
     ctypedef cef_types.cef_thread_id_t CefThreadId
     
     cdef cpp_bool CefCurrentlyOn(CefThreadId)
diff --git a/tools/requirements.txt b/tools/requirements.txt
index e8f345b1..81ebc0c5 100644
--- a/tools/requirements.txt
+++ b/tools/requirements.txt
@@ -1,4 +1,4 @@
-Cython == 0.25.2
+Cython == 0.28.4
 docopt >= 0.6.2
 setuptools
 wheel

From b34600d5e224e9c1e07bed2dc66e26f4688c8773 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Tue, 31 Jul 2018 15:46:36 +0200
Subject: [PATCH 071/238] Update automate.py

---
 tools/automate.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/automate.py b/tools/automate.py
index a618cee5..655e7c4c 100644
--- a/tools/automate.py
+++ b/tools/automate.py
@@ -786,7 +786,8 @@ def copy_app(app):
                 shutil.copy(app, bindir)
 
     if not MAC:
-        # Currently do not copy apps on Mac
+        # Currently do not copy apps on Mac, as they take lots of
+        # additional space (cefsimple is 157 MB).
         copy_app(cefclient)
         copy_app(cefsimple)
         copy_app(ceftests)

From d1c72668c2080b444fec4c62c30ca88610da4adf Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Tue, 31 Jul 2018 16:12:25 +0200
Subject: [PATCH 072/238] Fix warnings in windows.pxd

---
 src/extern/windows.pxd | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/extern/windows.pxd b/src/extern/windows.pxd
index 82355a60..b6e1c772 100644
--- a/src/extern/windows.pxd
+++ b/src/extern/windows.pxd
@@ -23,6 +23,8 @@ cdef extern from "Windows.h" nogil:
     ctypedef HICON HCURSOR
 
     ctypedef unsigned int UINT
+    ctypedef unsigned int UINT_PTR
+
     # noinspection PyUnresolvedReferences
     ctypedef wchar_t* LPCTSTR
     # noinspection PyUnresolvedReferences
@@ -49,7 +51,11 @@ cdef extern from "Windows.h" nogil:
     cdef size_t mbstowcs(wchar_t *wcstr, const_char *mbstr, size_t count)
 
     ctypedef void* HDWP
+
     cdef int SWP_NOZORDER
+    cdef int SWP_NOACTIVATE
+    cdef int SWP_FRAMECHANGED
+
     cdef HDWP BeginDeferWindowPos(int nNumWindows)
     cdef HDWP DeferWindowPos(
             HDWP hWinPosInfo, HWND hWnd, HWND hWndInsertAfter,
@@ -64,8 +70,6 @@ cdef extern from "Windows.h" nogil:
     cdef BOOL PostMessage(
             HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
 
-    ctypedef unsigned int UINT_PTR
-    ctypedef unsigned int UINT
     ctypedef struct TIMERPROC:
         pass
     cdef UINT_PTR SetTimer(
@@ -108,9 +112,6 @@ cdef extern from "Windows.h" nogil:
     cdef BOOL SetWindowPos(
             HWND hWnd, HWND hWndInsertAfter,
             int X, int Y, int cx, int cy, UINT uFlags)
-    cdef int SWP_NOZORDER
-    cdef int SWP_NOACTIVATE
-    cdef int SWP_FRAMECHANGED
 
     cdef DWORD GetLastError()
     cdef BOOL IsWindow(HWND hWnd)

From 18c873556b7b59f1b8d7e68f8e8a3114b66b194c Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Tue, 31 Jul 2018 16:25:04 +0200
Subject: [PATCH 073/238] Fix run_examples.py on Windows

---
 tools/run_examples.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tools/run_examples.py b/tools/run_examples.py
index 2948012c..5ec43fcb 100644
--- a/tools/run_examples.py
+++ b/tools/run_examples.py
@@ -14,6 +14,7 @@
 
 import importlib
 import os
+import subprocess
 import sys
 
 
@@ -189,9 +190,10 @@ def check_installed_packages():
 def check_gi_installed():
     # Cannot import both gtk and gi in the same script, thus
     # need another way of checking if gi package is installed.
-    command = ("\"{python}\" -c \"import gi\""
-               .format(python=sys.executable))
-    code = os.system(command)
+    code = subprocess.call([sys.executable, "-c", "import gi"])
+    if code != 0:
+        print("[run_examples.py] gi module not found (PyGI / GTK 3).")
+        print("                  Import error above can be safely ignored.")
     return True if code == 0 else False
 
 

From 6fdadb4f38e79b29052bc0589abfc36f3eb54ba7 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Tue, 31 Jul 2018 16:58:50 +0200
Subject: [PATCH 074/238] Fix C4305 warnings on Windows with Cython 0.28.4
 (#250)

---
 tools/cython_setup.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/tools/cython_setup.py b/tools/cython_setup.py
index ea9443e5..99b567a4 100644
--- a/tools/cython_setup.py
+++ b/tools/cython_setup.py
@@ -151,9 +151,18 @@ def set_compiler_options(options):
         #   function "public: virtual bool __thiscall
         #   ClientHandler::OnProcessMessageReceived
         #
+        # /wd4305 - disable warnnings such as this:
+        #
+        #   warning C4305: '=' : truncation from 'int' to 'bool'
+        #   Code: > cdef public cpp_bool ExecutePythonCallback(...) except *:
+        #         >     return True
+        #   Discussed on cython group error 4800 which is similar to this,
+        #   but there is no other way to fix this warning:
+        #   https://groups.google.com/d/topic/cython-users/X_X0lfIBCqo/discussion
+        #
         # The above warning LNK4217 is caused by the warning below which occurs
         # when building the client_handler.lib static library:
-        extra_compile_args.extend(["/EHsc"])
+        extra_compile_args.extend(["/EHsc", "/wd4305"])
         extra_link_args.extend(["/ignore:4217"])
 
     if LINUX or MAC:

From 0867dbeff3882e5f766ea4cc706a1e3a441f414b Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Tue, 31 Jul 2018 20:40:31 +0200
Subject: [PATCH 075/238] Create tools/requirements.py

---
 tools/requirements.py | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 tools/requirements.py

diff --git a/tools/requirements.py b/tools/requirements.py
new file mode 100644
index 00000000..e1637904
--- /dev/null
+++ b/tools/requirements.py
@@ -0,0 +1,22 @@
+"""
+Installs Python dependencies using the pip tool.
+See the requirements.txt file.
+pip install --upgrade -r ../tools/requirements.txt
+"""
+
+from common import *
+import subprocess
+
+
+def main():
+    args = []
+    if sys.executable.startswith("/usr/"):
+        args.append("sudo")
+    requirements = os.path.join(TOOLS_DIR, "requirements.txt")
+    args.extend(["pip", "install", "--upgrade", "-r", requirements])
+    retcode = subprocess.call(args)
+    sys.exit(retcode)
+
+
+if __name__ == "__main__":
+    main()

From 72adaf27739c2a227374b1e3f9ae6e3166c91750 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Tue, 31 Jul 2018 21:04:03 +0200
Subject: [PATCH 076/238] Fix GPUCache/ folder creation when using in-memory
 cache (#419)

---
 src/cefpython.pyx | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/cefpython.pyx b/src/cefpython.pyx
index dd3f9f49..96e1b46a 100644
--- a/src/cefpython.pyx
+++ b/src/cefpython.pyx
@@ -583,6 +583,15 @@ def Initialize(applicationSettings=None, commandLineSwitches=None, **kwargs):
         application_settings["single_process"] = False
     # ------------------------------------------------------------------------
 
+    # ------------------------------------------------------------------------
+    # Fix GPUCache/ folder creation when using in-memory cache (Issue #419)
+    # ------------------------------------------------------------------------
+    if not "cache_path" in application_settings:
+        application_settings["cache_path"] = ""
+    if not application_settings["cache_path"]:
+        g_commandLineSwitches["disable-gpu-shader-disk-cache"] = ""
+
+
     cdef CefRefPtr[CefApp] cefApp = <CefRefPtr[CefApp]?>new CefPythonApp()
 
     IF UNAME_SYSNAME == "Windows":

From bf0e6e3f7a4fda5ecd66c3c77805ff534a4f5c7c Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Wed, 1 Aug 2018 18:02:16 +0200
Subject: [PATCH 077/238] Update README - Debian 7 and Ubuntu 12/13 no more
 supported since v66

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f478a96c..c51d7d4d 100644
--- a/README.md
+++ b/README.md
@@ -219,7 +219,7 @@ support old operating systems then choose the v31 release.
 OS | Py2 | Py3 | 32bit | 64bit | Requirements
 --- | --- | --- | --- | --- | ---
 Windows | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | Yes | Yes | Windows 7+
-Linux | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | Yes | Yes | Debian 7+ / Ubuntu 12.04+
+Linux | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | Yes | Yes | Debian 8+ / Ubuntu 14.04+
 Mac | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | No | Yes | MacOS 10.9+
 
 These platforms are not supported yet:

From ef76811e003b98c46cfe977c76a851bab041ee5c Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Wed, 1 Aug 2018 18:44:37 +0200
Subject: [PATCH 078/238] Add flags to build.py: --enable-profiling and
 --enable-line-tracing (#424)

---
 tools/build.py        | 66 ++++++++++++++++++++++++++++++++++---------
 tools/cython_setup.py | 20 +++++++++++--
 2 files changed, 70 insertions(+), 16 deletions(-)

diff --git a/tools/build.py b/tools/build.py
index 1ae47b73..0f9512ca 100644
--- a/tools/build.py
+++ b/tools/build.py
@@ -22,12 +22,14 @@
                      [--hello-world]
 
 Options:
-    VERSION            Version number eg. 50.0
-    --no-run-examples  Do not run examples after build, only unit tests
-    --fast             Fast mode
-    --clean            Clean C++ projects build files on Linux/Mac
-    --kivy             Run only Kivy example
-    --hello-world      Run only Hello World example
+    VERSION                Version number eg. 50.0
+    --no-run-examples      Do not run examples after build, only unit tests
+    --fast                 Fast mode
+    --clean                Clean C++ projects build files on Linux/Mac
+    --kivy                 Run only Kivy example
+    --hello-world          Run only Hello World example
+    --enable-profiling     Enable cProfile profiling
+    --enable-line-tracing  Enable cProfile line tracing
 """
 
 # --rebuild-cpp      Force rebuild of .vcproj C++ projects (DISABLED)
@@ -82,6 +84,8 @@
 KIVY_FLAG = False
 HELLO_WORLD_FLAG = False
 REBUILD_CPP = False
+ENABLE_PROFILING = False
+ENABLE_LINE_TRACING = False
 
 # First run
 FIRST_RUN = False
@@ -122,48 +126,72 @@ def command_line_args():
            REBUILD_CPP, VERSION, NO_RUN_EXAMPLES
 
     VERSION = get_version_from_command_line_args(__file__)
+    # Other scripts called by this script expect that version number
+    # is available in sys.argv, so don't remove it like it's done
+    # for all other args starting with "--".
     if not VERSION:
         print(__doc__)
         sys.exit(1)
 
     print("[build.py] Parse command line arguments")
 
-    # --no-run-examples
     if "--no-run-examples" in sys.argv:
         NO_RUN_EXAMPLES = True
         print("[build.py] Running examples disabled (--no-run-examples)")
+        sys.argv.remove("--no-run-examples")
 
-    # -- debug
     if "--debug" in sys.argv:
         DEBUG_FLAG = True
         print("[build.py] DEBUG mode On")
+        sys.argv.remove("--debug")
 
-    # --fast
     if "--fast" in sys.argv:
         # Fast mode doesn't delete C++ .o .a files.
         # Fast mode also disables optimization flags in setup/setup.py .
         FAST_FLAG = True
         print("[build.py] FAST mode On")
+        sys.argv.remove("--fast")
 
-    # --clean
     if "--clean" in sys.argv:
         CLEAN_FLAG = True
+        sys.argv.remove("--clean")
 
-    # --kivy
     if "--kivy" in sys.argv:
         KIVY_FLAG = True
         print("[build.py] KIVY example")
+        sys.argv.remove("--kivy")
 
-    # --kivy
     if "--hello-world" in sys.argv:
         HELLO_WORLD_FLAG = True
         print("[build.py] HELLO WORLD example")
+        sys.argv.remove("--hello-world")
 
-    # --rebuild-cpp
     # Rebuild c++ projects
     if "--rebuild-cpp" in sys.argv:
         REBUILD_CPP = True
         print("[build.py] REBUILD_CPP mode enabled")
+        sys.argv.remove("--rebuild-cpp")
+
+    global ENABLE_PROFILING
+    if "--enable-profiling" in sys.argv:
+        print("[build.py] cProfile profiling enabled")
+        ENABLE_PROFILING = True
+        sys.argv.remove("--enable-profiling")
+
+    global ENABLE_LINE_TRACING
+    if "--enable-line-tracing" in sys.argv:
+        print("[build.py] cProfile line tracing enabled")
+        ENABLE_LINE_TRACING = True
+        sys.argv.remove("--enable-line-tracing")
+
+    for arg in sys.argv:
+        if arg.startswith("--"):
+            print("ERROR: invalid arg {0}".format(arg))
+            sys.exit(1)
+
+    if len(sys.argv) <= 1:
+        print(__doc__)
+        sys.exit(1)
 
     print("[build.py] VERSION=%s" % VERSION)
 
@@ -726,8 +754,18 @@ def build_cefpython_module():
 
     os.chdir(BUILD_CEFPYTHON)
 
+    enable_profiling = ""
+    if ENABLE_PROFILING:
+        enable_profiling = "--enable-profiling"
+    enable_line_tracing = ""
+    if ENABLE_LINE_TRACING:
+        enable_line_tracing = "--enable-line-tracing"
+
     command = ("\"{python}\" {tools_dir}/cython_setup.py build_ext"
-               .format(python=sys.executable, tools_dir=TOOLS_DIR))
+               " {enable_profiling} {enable_line_tracing}"
+               .format(python=sys.executable, tools_dir=TOOLS_DIR,
+                       enable_profiling=enable_profiling,
+                       enable_line_tracing=enable_line_tracing))
     if FAST_FLAG:
         command += " --fast"
     ret = subprocess.call(command, shell=True)
diff --git a/tools/cython_setup.py b/tools/cython_setup.py
index 99b567a4..0d2cb5b7 100644
--- a/tools/cython_setup.py
+++ b/tools/cython_setup.py
@@ -65,8 +65,10 @@ def generate_extern_c_macro_definition(self, code):
             generate_extern_c_macro_definition)
 
 
-# Constants
+# Command line args
 FAST_FLAG = False
+ENABLE_PROFILING = False
+ENABLE_LINE_TRACING = False
 
 # Cython options. Stop on first error, otherwise hundreds
 # of errors appear in the console.
@@ -80,12 +82,24 @@ def main():
     print("[cython_setup.py] Cython version: %s" % Cython.__version__)
 
     global FAST_FLAG
-    if len(sys.argv) > 1 and "--fast" in sys.argv:
+    if "--fast" in sys.argv:
         # Fast mode disables optimization flags
         print("[cython_setup.py] FAST mode enabled")
         FAST_FLAG = True
         sys.argv.remove("--fast")
 
+    global ENABLE_PROFILING
+    if "--enable-profiling" in sys.argv:
+        print("[cython_setup.py] cProfile profiling enabled")
+        ENABLE_PROFILING = True
+        sys.argv.remove("--enable-profiling")
+
+    global ENABLE_LINE_TRACING
+    if "--enable-line-tracing" in sys.argv:
+        print("[cython_setup.py] cProfile line tracing enabled")
+        ENABLE_LINE_TRACING = True
+        sys.argv.remove("--enable-line-tracing")
+
     if len(sys.argv) <= 1:
         print(__doc__)
         sys.exit(1)
@@ -393,6 +407,8 @@ def get_ext_modules(options):
             # Any conversion to unicode must be explicit using .decode().
             "c_string_type": "bytes",
             "c_string_encoding": "utf-8",
+            "profile": ENABLE_PROFILING,
+            "linetrace": ENABLE_LINE_TRACING,
         },
 
         language="c++",

From 5030b89ef5f3b17e6ea780f74b194ef1b8b354eb Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Wed, 1 Aug 2018 21:54:46 +0200
Subject: [PATCH 079/238] Include C++ extension dependencies (msvcpxx.dll) with
 binaries (#359)

---
 tools/build_distrib.py  | 35 +++++++++++++++---
 tools/common.py         |  6 ++-
 tools/make_installer.py | 82 ++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 115 insertions(+), 8 deletions(-)

diff --git a/tools/build_distrib.py b/tools/build_distrib.py
index 08af1ec5..3d0a8105 100644
--- a/tools/build_distrib.py
+++ b/tools/build_distrib.py
@@ -131,22 +131,22 @@ def main():
             run_automate_prebuilt_cef(pythons_32bit[0])
         pack_prebuilt_cef("32bit")
         if LINUX:
-            reduce_package_size_issue_262("32bit")
+            reduce_package_size_issue262("32bit")
         remove_unnecessary_package_files("32bit")
     if pythons_64bit:
         if not NO_AUTOMATE:
             run_automate_prebuilt_cef(pythons_64bit[0])
         pack_prebuilt_cef("64bit")
         if LINUX:
-            reduce_package_size_issue_262("64bit")
+            reduce_package_size_issue262("64bit")
         remove_unnecessary_package_files("64bit")
     if not NO_REBUILD:
         build_cefpython_modules(pythons_32bit, "32bit")
         build_cefpython_modules(pythons_64bit, "64bit")
     if pythons_32bit:
-        make_packages(pythons_32bit[0], "32bit")
+        make_packages(pythons_32bit[0], "32bit", pythons_32bit)
     if pythons_64bit:
-        make_packages(pythons_64bit[0], "64bit")
+        make_packages(pythons_64bit[0], "64bit", pythons_64bit)
     test_wheel_packages(pythons_32bit + pythons_64bit)
     show_summary(pythons_32bit, pythons_64bit)
 
@@ -432,7 +432,7 @@ def zip_directory(path, base_path, archive):
     os.chdir(original_dir)
 
 
-def reduce_package_size_issue_262(arch):
+def reduce_package_size_issue262(arch):
     """Linux only: libcef.so is huge (500 MB) in Chrome v54+. Issue #262."""
     print("[build_distrib.py] Reduce package size for {arch} (Issue #262)"
           .format(arch=arch))
@@ -533,7 +533,7 @@ def restore_subprocess_executable_issue342(arch):
     shutil.copy(src, dst)
 
 
-def make_packages(python, arch):
+def make_packages(python, arch, all_pythons):
     """Make setup and wheel packages."""
     print("[build_distrib.py] Make setup package for {arch}..."
           .format(arch=arch))
@@ -556,6 +556,7 @@ def make_packages(python, arch):
     setup_basename = get_setup_installer_basename(
             VERSION, get_os_postfix2_for_arch(arch))
     setup_dir = os.path.join(BUILD_DIR, setup_basename)
+    check_cpp_extension_dependencies_issue359(setup_dir, all_pythons)
     archive = pack_directory(setup_dir, BUILD_DIR)
     shutil.move(archive, DISTRIB_DIR)
 
@@ -583,6 +584,28 @@ def make_packages(python, arch):
     shutil.rmtree(setup_dir)
 
 
+def check_cpp_extension_dependencies_issue359(setup_dir, all_pythons):
+    """Windows only: check if msvcpXX.dll exist for all Python versions.
+    Issue #359."""
+    if not WINDOWS:
+        return
+    checked_any = False
+    for python in all_pythons:
+        if python["version2"] in ((3, 5), (3, 6), (3, 7)):
+            checked_any = True
+            if not os.path.exists(os.path.join(setup_dir, "msvcp140.dll")):
+                raise Exception("C++ ext dependency missing: msvcp140.dll")
+        elif python["version2"] == (3, 4):
+            checked_any = True
+            if not os.path.exists(os.path.join(setup_dir, "msvcp100.dll")):
+                raise Exception("C++ ext dependency missing: msvcp100.dll")
+        elif python["version2"] == (2, 7):
+            if not os.path.exists(os.path.join(setup_dir, "msvcp90.dll")):
+                raise Exception("C++ ext dependency missing: msvcp100.dll")
+            checked_any = True
+    assert checked_any
+
+
 def test_wheel_packages(pythons):
     """Test wheel packages installation and run unit tests."""
     uninstall_cefpython3_packages(pythons)
diff --git a/tools/common.py b/tools/common.py
index 6e44dc02..b0c21b90 100644
--- a/tools/common.py
+++ b/tools/common.py
@@ -15,7 +15,7 @@
 # These sample apps will be deleted when creating setup/wheel packages
 CEF_SAMPLE_APPS = ["cefclient", "cefsimple", "ceftests", "chrome-sandbox"]
 
-# Architecture and OS postfixes
+# Python architecture and OS postfixes
 ARCH32 = (8 * struct.calcsize('P') == 32)
 ARCH64 = (8 * struct.calcsize('P') == 64)
 # Make sure platform.architecture()[0] shows correctly 32bit when
@@ -26,6 +26,10 @@
     assert platform.architecture()[0] == "64bit"
 ARCH_STR = platform.architecture()[0]
 
+# Operating system architecture
+SYSTEM64 = platform.machine().endswith('64')
+SYSTEM32 = not SYSTEM64
+
 # OS_POSTFIX is for directories/files names in cefpython sources
 #            and doesn't include architecture type, just OS name.
 
diff --git a/tools/make_installer.py b/tools/make_installer.py
index 4220710f..bc3b5cef 100644
--- a/tools/make_installer.py
+++ b/tools/make_installer.py
@@ -102,6 +102,8 @@ def main():
     create_empty_log_file(os.path.join(PKG_DIR, "debug.log"))
     create_empty_log_file(os.path.join(PKG_DIR, "examples/debug.log"))
 
+    copy_cpp_extension_dependencies_issue359(PKG_DIR)
+
     print("[make_installer.py] Done. Installer package created: {setup_dir}"
           .format(setup_dir=SETUP_DIR))
 
@@ -184,7 +186,7 @@ def replace_template_vars(string, dictionary):
         string = string.replace("{{"+key+"}}", value)
     if string == orig_string:
         raise Exception("Nothing to format")
-    if re.search(r"\{\{[a-zA-Z0-9_]+\}\}", string):
+    if re.search(r"{{[a-zA-Z0-9_]+}}", string):
         raise Exception("Not all strings were formatted")
     return string
 
@@ -334,6 +336,84 @@ def create_empty_log_file(log_file):
         subprocess.check_call(command, shell=True)
 
 
+def copy_cpp_extension_dependencies_issue359(pkg_dir):
+    """CEF Python module is written in Cython and is a Python C++
+    extension and depends on msvcpXX.dll. For Python 3.5 / 3.6 / 3.7
+    msvcp140.dll is required. See Issue #359. For Python 2.7
+    msvcp90.dll is required. Etc. These dependencies are not included
+    with Python binaries from Python.org."""
+    if not WINDOWS:
+        return
+
+    windows_dir = os.environ["SYSTEMROOT"]
+    if SYSTEM64:
+        system32 = os.path.join(windows_dir, "SysWOW64")
+        system64 = os.path.join(windows_dir, "System32")
+    else:
+        system32 = os.path.join(windows_dir, "")
+        system64 = None
+    if ARCH64:
+        system = system64
+    else:
+        system = system32
+
+    root_search_paths = []
+
+    # Need to check for .pyd files for all Python version, because
+    # the builder/installer work in a way that previous cefpython
+    # module builds for other Python versions are also included
+    # in the package. Thus if included, msvcpxx.dll dependency is
+    # required as well.
+
+    # Python 3.5 / 3.6 / 3.7
+    if os.path.exists(os.path.join(pkg_dir, "cefpython_py35.pyd")) \
+            or os.path.exists(os.path.join(pkg_dir, "cefpython_py36.pyd")) \
+            or os.path.exists(os.path.join(pkg_dir, "cefpython_py37.pyd")):
+        search_paths = [
+            # This is where Microsoft Visual C++ 2015 Update 3 installs
+            # (14.00.24212).
+            os.path.join(system, "msvcp140.dll"),
+        ]
+        root_search_paths.append(search_paths)
+
+    # Python 3.4
+    if os.path.exists(os.path.join(pkg_dir, "cefpython_py34.pyd")):
+        search_paths = [
+            # 10.00.40219.325 installs here on my system.
+            os.path.join(system, "msvcp100.dll"),
+        ]
+        root_search_paths.append(search_paths)
+
+    # Python 2.7
+    if os.path.exists(os.path.join(pkg_dir, "cefpython_py27.pyd")):
+        if ARCH32:
+            search_paths = [
+                # This runtime version is shipped with Python 2.7.14
+                r"c:\Windows\winsxs\x86_microsoft.vc90.crt_1fc8b3b9a1e18e3b"
+                r"_9.0.30729.1_none_e163563597edeada\msvcp90.dll",
+            ]
+        else:
+            search_paths = [
+                # This runtime version is shipped with Python 2.7.14
+                r"c:\Windows\winsxs\amd64_microsoft.vc90.crt_1fc8b3b9a1e18e3b"
+                r"_9.0.30729.1_none_99b61f5e8371c1d4\msvcp90.dll",
+            ]
+        root_search_paths.append(search_paths)
+
+    assert len(root_search_paths)
+
+    for search_paths in root_search_paths:
+        found = False
+        for path in search_paths:
+            if os.path.exists(path):
+                shutil.copy(path, pkg_dir)
+                found = True
+        if not found:
+            raise Exception("C++ extension dll dependency not found."
+                            " Search paths: {0}"
+                            .format(", ".join(search_paths)))
+
+
 def short_src_path(path):
     # Very long: \build\cef55_3.2883.1553.g80bd606_win32\
     find = os.path.basename(CEF_BINARIES_LIBRARIES)

From c8526856b3d22e7b97d71d745ad65075b9cb35ad Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Wed, 1 Aug 2018 21:56:42 +0200
Subject: [PATCH 080/238] Update Knowledge Base doc (#359)

---
 docs/Knowledge-Base.md | 35 -----------------------------------
 1 file changed, 35 deletions(-)

diff --git a/docs/Knowledge-Base.md b/docs/Knowledge-Base.md
index 5e49162f..91d5a516 100644
--- a/docs/Knowledge-Base.md
+++ b/docs/Knowledge-Base.md
@@ -1,7 +1,6 @@
 # Knowledge Base
 
 Table of contents:
-* [ImportError: DLL load failed (Windows)](#importerror-dll-load-failed-windows)
 * [Notifications about new releases / commits](#notifications-about-new-releases--commits)
 * [Changes in API after CEF updates](#changes-in-api-after-cef-updates)
 * [Differences between Python 2 and Python 3](#differences-between-python-2-and-python-3)
@@ -20,40 +19,6 @@ Table of contents:
 * [Security](#security)
 
 
-## ImportError: DLL load failed (Windows)
-
-If you get such an error on Windows:
-```Text
-import cefpython3
-Traceback (most recent call last):
-  File "<stdin>", line 1, in <module>
-  File "C:\Python3\lib\site-packages\cefpython3\__init__.py", line 59, in <module>
-    from . import cefpython_py36 as cefpython
-ImportError: DLL load failed: The specified module could not be found.
-```
-
-Then most probably this is caused, because you are missing
-"msvcp140.dll" dependency (for Python 3.5/3.6/3.7 for example). This
-is a dependency for Python C++ extensions (eg. cefpython_py36.pyd
-depends on it). For Python 3.5/3.6/3.7 to fix this download
-[Visual C++ Redistributable for VS2015](https://www.microsoft.com/en-us/download/details.aspx?id=52685)
-(13 MB) - this is just a VC++ redistributable, not a Visual Studio
-package. For 32-bit download "vc_redist.x86.exe" file and for
-64-bit download "vc_redist.x64.exe" file.
-
-Explanation: msvcp140.dll is the DLL for the C++ runtime library.
-This dependency is added by Cython when building CEF Python
-module. It seems that Python 3.6 only ships "vcruntime140.dll"
-which is the DLL for the C runtime library.
-
-On a side note, when using pyinstaller/py2exe tools for
-freezing application into exe then these tools should
-automatically detect the msvcp140.dll dependency and ship it
-with your application.
-
-Created [Issue #359](../../../issues/359) to track this problem.
-
-
 ## Notifications about new releases / commits
 
 To be notified of new releases subscribe to this [RSS/Atom feed](../../../releases.atom).

From 4a1d759ca13b4ca28572f8e07c4c15b847d00221 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Wed, 1 Aug 2018 23:41:32 +0200
Subject: [PATCH 081/238] Expose PaintBuffer attrs: length, width, height
 (#443)

---
 src/paint_buffer.pyx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/paint_buffer.pyx b/src/paint_buffer.pyx
index 8e7be430..d99f19d0 100644
--- a/src/paint_buffer.pyx
+++ b/src/paint_buffer.pyx
@@ -14,9 +14,9 @@ cdef PaintBuffer CreatePaintBuffer(const void* buffer_, int width, int height):
 
 cdef class PaintBuffer:
     cdef const void* buffer
-    cdef int width
-    cdef int height
-    cdef Py_ssize_t length
+    cdef public int width
+    cdef public int height
+    cdef public Py_ssize_t length
 
     cpdef uintptr_t GetPointer(self) except *:
         # BEFORE MODIFYING CODE:

From 5525fbbd6a4c450d6e3979e60caf99fcc6d5b85d Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Wed, 1 Aug 2018 23:46:41 +0200
Subject: [PATCH 082/238] Rename PaintBuffer.GetString to GetBytes. Update
 docs.

---
 api/PaintBuffer.md     | 4 ++--
 examples/screenshot.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/api/PaintBuffer.md b/api/PaintBuffer.md
index edd9376d..c6509db2 100644
--- a/api/PaintBuffer.md
+++ b/api/PaintBuffer.md
@@ -9,7 +9,7 @@ This object used in: [RenderHandler](RenderHandler.md).OnPaint().
 Table of contents:
 * [Methods](#methods)
   * [GetIntPointer](#getintpointer)
-  * [GetString](#getstring)
+  * [GetBytes](#getbytes)
 
 
 ## Methods
@@ -28,7 +28,7 @@ Description from upstream CEF:
 > image with an upper-left origin.
 
 
-### GetString
+### GetBytes
 
 | Parameter | Type |
 | --- | --- |
diff --git a/examples/screenshot.py b/examples/screenshot.py
index e99c2fe6..c27e72d0 100644
--- a/examples/screenshot.py
+++ b/examples/screenshot.py
@@ -205,8 +205,8 @@ def OnPaint(self, browser, element_type, paint_buffer, **_):
             # reasons it would be better not to copy this string.
             # I think that Python makes a copy of that string when
             # passing it to SetUserData.
-            buffer_string = paint_buffer.GetString(mode="rgba",
-                                                   origin="top-left")
+            buffer_string = paint_buffer.GetBytes(mode="rgba",
+                                                  origin="top-left")
             # Browser object provides GetUserData/SetUserData methods
             # for storing custom data associated with browser.
             browser.SetUserData("OnPaint.buffer_string", buffer_string)

From 92b1895acd9a294e67cbe28c40110d6094c3e5a9 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Thu, 2 Aug 2018 13:49:55 +0200
Subject: [PATCH 083/238] Update build_distrib - restore sample apps in cef
 prebuilt directories

---
 tools/automate.py | 13 +++++++++----
 tools/common.py   | 37 ++++++++++++++++++++++++++++++-------
 2 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/tools/automate.py b/tools/automate.py
index 655e7c4c..a9992f38 100644
--- a/tools/automate.py
+++ b/tools/automate.py
@@ -744,7 +744,9 @@ def create_prebuilt_binaries():
             "build_cefclient", "tests", "cefclient",
             Options.build_type,
             "cefclient" + APP_EXT)
-    if LINUX and os.path.exists(cefclient):
+    if not MAC:
+        assert os.path.exists(cefclient)
+    if LINUX:
         # On Windows resources/*.html files are embedded inside exe
         cefclient_files = os.path.join(
                 src,
@@ -759,6 +761,8 @@ def create_prebuilt_binaries():
             "build_cefclient", "tests", "cefsimple",
             Options.build_type,
             "cefsimple" + APP_EXT)
+    if not MAC:
+        assert os.path.exists(cefsimple)
 
     # ceftests
     ceftests = os.path.join(
@@ -766,7 +770,9 @@ def create_prebuilt_binaries():
             "build_cefclient", "tests", "ceftests",
             Options.build_type,
             "ceftests" + APP_EXT)
-    if LINUX and os.path.exists(ceftests):
+    if not MAC:
+        assert os.path.exists(ceftests)
+    if LINUX:
         # On Windows resources/*.html files are embedded inside exe
         ceftests_files = os.path.join(
                 src,
@@ -776,8 +782,7 @@ def create_prebuilt_binaries():
         cpdir(ceftests_files, os.path.join(bindir, "ceftests_files"))
 
     def copy_app(app):
-        if os.path.exists(app):
-            if os.path.isdir(app):
+            if MAC:
                 # On Mac app is a directory
                 shutil.copytree(app,
                                 os.path.join(bindir,
diff --git a/tools/common.py b/tools/common.py
index b0c21b90..ab51af8a 100644
--- a/tools/common.py
+++ b/tools/common.py
@@ -4,6 +4,7 @@
 
 # Common stuff for tools such as automate.py, build.py, etc.
 
+import atexit
 import glob
 import os
 import platform
@@ -11,6 +12,7 @@
 import shutil
 import struct
 import sys
+import tempfile
 
 # These sample apps will be deleted when creating setup/wheel packages
 CEF_SAMPLE_APPS = ["cefclient", "cefsimple", "ceftests", "chrome-sandbox"]
@@ -268,9 +270,12 @@ def get_python_include_path():
                 return results[0]
     return ".\\" if WINDOWS else "./"
 
+g_deleted_sample_apps = []
+
 
 def delete_cef_sample_apps(caller_script, bin_dir):
     """Delete CEF sample apps to reduce package size."""
+    atexit.register(restore_cef_sample_apps, caller_script)
     for sample_app_name in CEF_SAMPLE_APPS:
         sample_app = os.path.join(bin_dir, sample_app_name + APP_EXT)
         # Not on all platforms sample apps may be available
@@ -278,16 +283,34 @@ def delete_cef_sample_apps(caller_script, bin_dir):
             print("[{script}] Delete {sample_app}"
                   .format(script=os.path.basename(caller_script),
                           sample_app=os.path.basename(sample_app)))
-            if os.path.isdir(sample_app):
-                shutil.rmtree(sample_app)
-            else:
-                os.remove(sample_app)
+            tmpdir = tempfile.mkdtemp()
+            g_deleted_sample_apps.append((bin_dir,
+                                          os.path.basename(sample_app),
+                                          tmpdir))
+            shutil.move(sample_app, tmpdir)
             # Also delete subdirs eg. cefclient_files/, ceftests_files/
             files_subdir = os.path.join(bin_dir, sample_app_name + "_files")
             if os.path.isdir(files_subdir):
-                print("[build_distrib.py] Delete directory: {dir}/"
-                      .format(dir=os.path.basename(files_subdir)))
-                shutil.rmtree(files_subdir)
+                print("[{script}] Delete directory: {dir}/"
+                      .format(script=os.path.basename(caller_script),
+                              dir=os.path.basename(files_subdir)))
+                tmpdir = tempfile.mkdtemp()
+                g_deleted_sample_apps.append((bin_dir,
+                                              os.path.basename(files_subdir),
+                                              tmpdir))
+                shutil.move(files_subdir, tmpdir)
+
+
+def restore_cef_sample_apps(caller_script):
+    for deleted in g_deleted_sample_apps:
+        bin_dir = deleted[0]
+        tmp = os.path.join(deleted[2], deleted[1])
+        print("[{script}] Restore: {path}"
+              .format(script=os.path.basename(caller_script),
+                      path=os.path.join(bin_dir, deleted[1])))
+        shutil.move(tmp, bin_dir)
+        shutil.rmtree(deleted[2])
+    del g_deleted_sample_apps[0:len(g_deleted_sample_apps)]
 
 
 def _detect_cef_binaries_libraries_dir():

From 7aeee773321930c62c5053a17b2e8072510585d8 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Thu, 2 Aug 2018 16:41:30 +0200
Subject: [PATCH 084/238] Update to handling of browser and frame references
 (#365)

There are still some strange issues with CEF. For example I can
see that OnContextReleased is executed twice for that same frame.
---
 src/browser.pyx                   |  7 ++++++-
 src/cefpython.pyx                 | 11 ++++++-----
 src/frame.pyx                     | 27 ++++++++++++++++++++++++---
 src/handlers/lifespan_handler.pyx | 17 ++++++++++++-----
 4 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/src/browser.pyx b/src/browser.pyx
index 03e43e39..8c57460e 100644
--- a/src/browser.pyx
+++ b/src/browser.pyx
@@ -74,7 +74,8 @@ cdef PyBrowser GetPyBrowser(CefRefPtr[CefBrowser] cefBrowser,
     cdef JavascriptBindings javascriptBindings
     cdef PyBrowser tempPyBrowser
 
-    if browserId in g_unreferenced_browsers:
+    if browserId in g_unreferenced_browsers \
+            or browserId in g_closed_browsers:
         # This browser was already unreferenced due to OnBeforeClose
         # was already called. An incomplete new instance of Browser
         # object is created. This instance doesn't have the client
@@ -119,9 +120,13 @@ cdef PyBrowser GetPyBrowser(CefRefPtr[CefBrowser] cefBrowser,
 cdef void RemovePyBrowser(int browserId) except *:
     # Called from LifespanHandler_OnBeforeClose().
     global g_pyBrowsers, g_unreferenced_browsers
+    cdef PyBrowser pyBrowser
     if browserId in g_pyBrowsers:
         # noinspection PyUnresolvedReferences
         Debug("del g_pyBrowsers[%s]" % browserId)
+        pyBrowser = g_pyBrowsers[browserId]
+        pyBrowser.cefBrowser.Assign(NULL)
+        del pyBrowser
         del g_pyBrowsers[browserId]
         g_unreferenced_browsers.append(browserId)
     else:
diff --git a/src/cefpython.pyx b/src/cefpython.pyx
index 96e1b46a..3deebbc1 100644
--- a/src/cefpython.pyx
+++ b/src/cefpython.pyx
@@ -843,11 +843,6 @@ def QuitMessageLoop():
 def Shutdown():
     Debug("Shutdown()")
 
-    # Release shared request context. This is sometimes causing
-    # segmentation fault, so disabling it for now. See Issue #333:
-    # https://github.com/cztomczak/cefpython/issues/333
-    # OFF: g_shared_request_context.Assign(NULL)
-
     # Run some message loop work, force closing browsers and then run
     # some message loop work again for the browsers to close cleanly.
     #
@@ -929,6 +924,12 @@ def Shutdown():
         NonCriticalError("Shutdown called, but there are still browser"
                          " references alive")
 
+    # Release shared request context. In the past this was sometimes
+    # causing segmentation fault. See Issue #333:
+    # https://github.com/cztomczak/cefpython/issues/333
+    # Debug("Free g_shared_request_context")
+    # g_shared_request_context.Assign(NULL)
+
     Debug("CefShutdown()")
     with nogil:
         CefShutdown()
diff --git a/src/frame.pyx b/src/frame.pyx
index 6535791d..504637ab 100644
--- a/src/frame.pyx
+++ b/src/frame.pyx
@@ -7,6 +7,10 @@ include "browser.pyx"
 
 cdef dict g_pyFrames = {}
 
+# If a frame was unreferenced (browser closed or OnContextReleased)
+# it shouldn't be kept global anymore.
+cdef list g_unreferenced_frames = []  # [str unique identifier, ..]
+
 cdef object GetUniqueFrameId(int browserId, object frameId):
     return str(browserId) +"#"+ str(frameId)
 
@@ -24,6 +28,11 @@ cdef PyFrame GetPyFrame(CefRefPtr[CefFrame] cefFrame):
 
     cdef PyFrame pyFrame
     cdef object frameId = cefFrame.get().GetIdentifier()  # int64
+    if frameId < 0:
+        # Underlying frame does not yet exist.
+        Debug("GetPyFrame(): underlying frame does not yet exist"
+              ", frameId = {0}".format(frameId))
+        return None
     cdef int browserId = cefFrame.get().GetBrowser().get().GetIdentifier()
     assert (frameId and browserId), "frameId or browserId empty"
     cdef object uniqueFrameId = GetUniqueFrameId(browserId, frameId)
@@ -46,9 +55,12 @@ cdef PyFrame GetPyFrame(CefRefPtr[CefFrame] cefFrame):
     pyFrame = PyFrame(browserId, frameId)
     pyFrame.cefFrame = cefFrame
 
-    if browserId in g_unreferenced_browsers:
+    if uniqueFrameId in g_unreferenced_frames \
+            or browserId in g_unreferenced_browsers \
+            or browserId in g_closed_browsers:
         # Browser was already globally unreferenced in OnBeforeClose,
-        # thus all frames are globally unreferenced too. Create a new
+        # thus all frames are globally unreferenced too, or frame
+        # was unreferenced in OnContextReleased. Create a new
         # incomplete instance of PyFrame object. Read comments in
         # browser.pyx > GetPyBrowser and in Browser.md for what
         # "incomplete" means.
@@ -60,17 +72,22 @@ cdef PyFrame GetPyFrame(CefRefPtr[CefFrame] cefFrame):
         # SIDE EFFECT: two calls to GetPyFrame for the same frame object
         #              may return two different PyFrame objects. Compare
         #              frame objects always using GetIdentifier().
-        # Debug("GetPyFrame(): create new PyFrame, frameId=%s" % frameId)
+        Debug("GetPyFrame(): create new PyFrame, frameId=%s" % frameId)
         g_pyFrames[uniqueFrameId] = pyFrame
     return pyFrame
 
 cdef void RemovePyFrame(int browserId, object frameId) except *:
     # Called from V8ContextHandler_OnContextReleased().
     global g_pyFrames
+    cdef PyFrame pyFrame
     cdef object uniqueFrameId = GetUniqueFrameId(browserId, frameId)
     if uniqueFrameId in g_pyFrames:
         Debug("del g_pyFrames[%s]" % uniqueFrameId)
+        pyFrame = g_pyFrames[uniqueFrameId]
+        pyFrame.cefFrame.Assign(NULL)
+        del pyFrame
         del g_pyFrames[uniqueFrameId]
+        g_unreferenced_frames.append(uniqueFrameId)
     else:
         Debug("RemovePyFrame() FAILED: uniqueFrameId = %s" % uniqueFrameId)
 
@@ -85,7 +102,11 @@ cdef void RemovePyFramesForBrowser(int browserId) except *:
             toRemove.append(uniqueFrameId)
     for uniqueFrameId in toRemove:
         Debug("del g_pyFrames[%s]" % uniqueFrameId)
+        pyFrame = g_pyFrames[uniqueFrameId]
+        pyFrame.cefFrame.Assign(NULL)
+        del pyFrame
         del g_pyFrames[uniqueFrameId]
+        g_unreferenced_frames.append(uniqueFrameId)
 
 cdef class PyFrame:
     cdef CefRefPtr[CefFrame] cefFrame
diff --git a/src/handlers/lifespan_handler.pyx b/src/handlers/lifespan_handler.pyx
index 32a3f0c4..40ab8f9a 100644
--- a/src/handlers/lifespan_handler.pyx
+++ b/src/handlers/lifespan_handler.pyx
@@ -110,6 +110,7 @@ cdef public void LifespanHandler_OnBeforeClose(
         CefRefPtr[CefBrowser] cefBrowser
         ) except * with gil:
     cdef PyBrowser pyBrowser
+    cdef int browserId
     cdef object callback
     try:
         Debug("LifespanHandler_OnBeforeClose")
@@ -126,14 +127,20 @@ cdef public void LifespanHandler_OnBeforeClose(
         callback = pyBrowser.GetClientCallback("OnBeforeClose")
         if callback:
             callback(browser=pyBrowser)
-        RemovePythonCallbacksForBrowser(pyBrowser.GetIdentifier())
-        RemovePyFramesForBrowser(pyBrowser.GetIdentifier())
-        RemovePyBrowser(pyBrowser.GetIdentifier())
+
+        browserId = pyBrowser.GetIdentifier()
+        pyBrowser.cefBrowser.Assign(NULL)
+        cefBrowser.Assign(NULL)
+        del pyBrowser
+
+        RemovePythonCallbacksForBrowser(browserId)
+        RemovePyFramesForBrowser(browserId)
+        RemovePyBrowser(browserId)
+
         if g_MessageLoop_called and not len(g_pyBrowsers):
             # Automatically quit message loop when last browser was closed.
             # This is required for hello_world.py example to work.
-            QuitMessageLoop()
-
+            PostTask(TID_UI, QuitMessageLoop)
     except:
         (exc_type, exc_value, exc_trace) = sys.exc_info()
         sys.excepthook(exc_type, exc_value, exc_trace)

From c78619aa8ef7c38b486f9f245cb9c518276f892c Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Thu, 2 Aug 2018 17:19:37 +0200
Subject: [PATCH 085/238] Fix flushing cookies to disk when closing app
 immediately (#365).

Expose CookieManager.FlushStore method.
---
 api/CookieManager.md                            |  6 +++---
 src/browser.pyx                                 | 14 ++++++++++++++
 src/cookie.pyx                                  |  5 +++++
 src/extern/cef/cef_browser.pxd                  |  3 +++
 src/extern/cef/cef_cookie.pxd                   |  2 +-
 src/extern/cef/cef_cookie_manager_namespace.pxd |  4 ++++
 src/extern/cef/cef_request_context.pxd          |  4 ++++
 src/handlers/lifespan_handler.pyx               |  9 +++++++++
 8 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/api/CookieManager.md b/api/CookieManager.md
index db53c9e0..6c70b153 100644
--- a/api/CookieManager.md
+++ b/api/CookieManager.md
@@ -174,11 +174,11 @@ browsers do not persist them. Returns false if cookies cannot be accessed.
 
 | Parameter | Type |
 | --- | --- |
-| handler | CompletionHandler |
+| callback | CompletionHandler (optional) |
 | __Return__ | bool |
 
-Not yet implemented.
-
 Flush the backing store (if any) to disk. If |callback| is non-NULL it will
 be executed asnychronously on the IO thread after the flush is complete.
 Returns false if cookies cannot be accessed.
+
+The callback arg is not implemented.
diff --git a/src/browser.pyx b/src/browser.pyx
index 8c57460e..87d8047b 100644
--- a/src/browser.pyx
+++ b/src/browser.pyx
@@ -328,7 +328,21 @@ cdef class PyBrowser:
         pass
 
     cpdef py_void CloseBrowser(self, py_bool forceClose=False):
+        # Browser can be closed in two ways. Either by calling
+        # CloseBrowser explicitilly or by destroying window
+        # object and in such case lifespanHandler.OnBeforeClose
+        # will be called.
         Debug("CefBrowser::CloseBrowser(%s)" % forceClose)
+
+        # Flush cookies to disk. Temporary solution for Issue #365.
+        # A similar call is made in LifespanHandler_OnBeforeClose.
+        # If using GetCookieManager to implement custom cookie managers
+        # then flushing of cookies would need to be handled manually.
+        self.GetCefBrowserHost().get().GetRequestContext().get() \
+                .GetDefaultCookieManager(
+                        <CefRefPtr[CefCompletionCallback]?>NULL) \
+                .get().FlushStore(<CefRefPtr[CefCompletionCallback]?>NULL)
+
         cdef int browserId = self.GetCefBrowser().get().GetIdentifier()
         self.GetCefBrowserHost().get().CloseBrowser(bool(forceClose))
         global g_closed_browsers
diff --git a/src/cookie.pyx b/src/cookie.pyx
index 45b692cc..4ccf8844 100644
--- a/src/cookie.pyx
+++ b/src/cookie.pyx
@@ -268,6 +268,11 @@ cdef class PyCookieManager:
                 PyToCefStringValue(path), bool(persistSessionCookies),
                 <CefRefPtr[CefCompletionCallback]?>NULL)
 
+    cpdef py_bool FlushStore(self, callback=None):
+        return self.cefCookieManager.get().FlushStore(
+                <CefRefPtr[CefCompletionCallback]?>NULL)
+
+
 # ------------------------------------------------------------------------------
 # PyCookieVisitor
 # ------------------------------------------------------------------------------
diff --git a/src/extern/cef/cef_browser.pxd b/src/extern/cef/cef_browser.pxd
index 50a70393..d0b16483 100644
--- a/src/extern/cef/cef_browser.pxd
+++ b/src/extern/cef/cef_browser.pxd
@@ -15,6 +15,7 @@ from cef_types cimport int64
 from cef_types cimport CefBrowserSettings, CefPoint
 from cef_drag_data cimport CefDragData
 from cef_types cimport CefMouseEvent
+from cef_request_context cimport CefRequestContext
 
 from cef_process_message cimport CefProcessMessage, CefProcessId
 
@@ -62,6 +63,8 @@ cdef extern from "include/cef_browser.h":
                           const CefPoint& inspect_element_at)
         void CloseDevTools()
 
+        CefRefPtr[CefRequestContext] GetRequestContext()
+
         void Find(int identifier, const CefString& searchText, cpp_bool forward,
                 cpp_bool matchCase, cpp_bool findNext)
         void StopFinding(cpp_bool clearSelection)
diff --git a/src/extern/cef/cef_cookie.pxd b/src/extern/cef/cef_cookie.pxd
index 94263a6b..e1778786 100644
--- a/src/extern/cef/cef_cookie.pxd
+++ b/src/extern/cef/cef_cookie.pxd
@@ -47,7 +47,7 @@ cdef extern from "include/cef_cookie.h":
         cpp_bool SetStoragePath(const CefString& path,
                                 cpp_bool persist_session_cookies,
                                 CefRefPtr[CefCompletionCallback] callback)
-        # cpp_bool FlushStore(CefRefPtr[CefCompletionCallback] handler)
+        cpp_bool FlushStore(CefRefPtr[CefCompletionCallback] callback)
 
     cdef cppclass CefCookieVisitor:
         pass
diff --git a/src/extern/cef/cef_cookie_manager_namespace.pxd b/src/extern/cef/cef_cookie_manager_namespace.pxd
index bcc8a1b3..daf1a0f3 100644
--- a/src/extern/cef/cef_cookie_manager_namespace.pxd
+++ b/src/extern/cef/cef_cookie_manager_namespace.pxd
@@ -10,6 +10,8 @@ from cef_cookie cimport CefCookie
 # noinspection PyUnresolvedReferences
 from cef_cookie cimport CefSetCookieCallback, CefDeleteCookiesCallback
 from cef_ptr cimport CefRefPtr
+# noinspection PyUnresolvedReferences
+from cef_callback cimport CefCompletionCallback
 
 # We need to pass C++ class methods by reference to a function,
 # it is not possible with such syntax:
@@ -28,3 +30,5 @@ cdef extern from "include/cef_cookie.h" namespace "CefCookieManager":
     cpp_bool DeleteCookies(const CefString& url,
                            const CefString& cookie_name,
                            CefRefPtr[CefDeleteCookiesCallback] callback)
+
+    cpp_bool FlushStore(CefRefPtr[CefCompletionCallback] callback)
diff --git a/src/extern/cef/cef_request_context.pxd b/src/extern/cef/cef_request_context.pxd
index 811cf72f..11674174 100644
--- a/src/extern/cef/cef_request_context.pxd
+++ b/src/extern/cef/cef_request_context.pxd
@@ -5,6 +5,8 @@
 from cef_ptr cimport CefRefPtr
 # noinspection PyUnresolvedReferences
 from cef_request_context_handler cimport CefRequestContextHandler
+from cef_callback cimport CefCompletionCallback
+from cef_cookie cimport CefCookieManager
 
 cdef extern from "include/cef_request_context.h":
     cdef cppclass CefRequestContext:
@@ -14,3 +16,5 @@ cdef extern from "include/cef_request_context.h":
         CefRefPtr[CefRequestContext] CreateContext(
                 CefRefPtr[CefRequestContext] other,
                 CefRefPtr[CefRequestContextHandler] handler)
+        CefRefPtr[CefCookieManager] GetDefaultCookieManager(
+                CefRefPtr[CefCompletionCallback] callback)
diff --git a/src/handlers/lifespan_handler.pyx b/src/handlers/lifespan_handler.pyx
index 40ab8f9a..bfe22bd1 100644
--- a/src/handlers/lifespan_handler.pyx
+++ b/src/handlers/lifespan_handler.pyx
@@ -128,6 +128,15 @@ cdef public void LifespanHandler_OnBeforeClose(
         if callback:
             callback(browser=pyBrowser)
 
+        # Flush cookies to disk. Temporary solution for Issue #365.
+        # A similar call is made in Browser.CloseBrowser. If using
+        # GetCookieManager to implement custom cookie managers then
+        # flushing of cookies would need to be handled manually.
+        cefBrowser.get().GetHost().get().GetRequestContext().get() \
+                .GetDefaultCookieManager(
+                        <CefRefPtr[CefCompletionCallback]?>NULL) \
+                .get().FlushStore(<CefRefPtr[CefCompletionCallback]?>NULL)
+
         browserId = pyBrowser.GetIdentifier()
         pyBrowser.cefBrowser.Assign(NULL)
         cefBrowser.Assign(NULL)

From bff458e3bb20068c7027b583452f0c7b14bed59b Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Thu, 2 Aug 2018 17:33:29 +0200
Subject: [PATCH 086/238] Fix frame.ExecuteFunction throwing error in
 tutorial.py example

---
 src/frame.pyx | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/frame.pyx b/src/frame.pyx
index 504637ab..6ff7873c 100644
--- a/src/frame.pyx
+++ b/src/frame.pyx
@@ -28,17 +28,21 @@ cdef PyFrame GetPyFrame(CefRefPtr[CefFrame] cefFrame):
 
     cdef PyFrame pyFrame
     cdef object frameId = cefFrame.get().GetIdentifier()  # int64
-    if frameId < 0:
-        # Underlying frame does not yet exist.
-        Debug("GetPyFrame(): underlying frame does not yet exist"
-              ", frameId = {0}".format(frameId))
-        return None
     cdef int browserId = cefFrame.get().GetBrowser().get().GetIdentifier()
     assert (frameId and browserId), "frameId or browserId empty"
     cdef object uniqueFrameId = GetUniqueFrameId(browserId, frameId)
 
-    if uniqueFrameId in g_pyFrames:
-        return g_pyFrames[uniqueFrameId]
+    if frameId < 0:
+        # Underlying frame does not yet exist. In such case PyFrame
+        # is not stored in g_pyFrames since frameId is invalid.
+        # However even though frame is not supposed to exist, you
+        # can still call CefFrame.ExecuteFunction and it works fine
+        # in tutorial.py example.
+        Debug("GetPyFrame(): underlying frame does not yet exist:"
+              " browserId = {0}, frameId = {1}".format(browserId, frameId))
+    else:
+        if uniqueFrameId in g_pyFrames:
+            return g_pyFrames[uniqueFrameId]
 
     # This code probably ain't needed.
     # ----
@@ -56,6 +60,7 @@ cdef PyFrame GetPyFrame(CefRefPtr[CefFrame] cefFrame):
     pyFrame.cefFrame = cefFrame
 
     if uniqueFrameId in g_unreferenced_frames \
+            or frameId < 0 \
             or browserId in g_unreferenced_browsers \
             or browserId in g_closed_browsers:
         # Browser was already globally unreferenced in OnBeforeClose,

From 9f86c427ea2e60eb8c0ab3ded58552449649b46e Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Fri, 3 Aug 2018 00:01:02 +0200
Subject: [PATCH 087/238] When implementing custom cookie managers you must
 call FlushStore() (#365)

---
 api/RequestHandler.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/api/RequestHandler.md b/api/RequestHandler.md
index 7d7423cf..e7f48224 100644
--- a/api/RequestHandler.md
+++ b/api/RequestHandler.md
@@ -86,7 +86,7 @@ false.
 
 Called on the IO thread before a resource is loaded. To allow the resource
 to load normally return None. To specify a handler for the resource return
-a [ResourceHandler](ResourceHandler.md) object. The |request| object should 
+a [ResourceHandler](ResourceHandler.md) object. The |request| object should
 not be modified in this callback.
 
 The [ResourceHandler](ResourceHandler.md) object is a python class that
@@ -215,6 +215,12 @@ to True. Otherwise the browser param passed to this callback will
 always be the same first browser that was created using
 [cefpython](cefpython.md).`CreateBrowserSync`.
 
+**NOTE**: If implementing custom cookie managers you will encounter
+problems similar to [Issue #365](../../../issues/365) ("Cookies not
+flushed to disk when closing app immediately"). To resolve
+it you have to call CookieManager.[FlushStore](CookieManager.md#flushstore)
+method when closing associated browser.
+
 Popup browsers created javascript's window.open share the same
 renderer process and request context. If you want to have separate
 cookie managers for popups created using window.open then you have

From 7c614c3f0b3363f0bf87e379003df5e22d72477e Mon Sep 17 00:00:00 2001
From: Czarek Tomczak <cztomczak@users.noreply.github.com>
Date: Fri, 3 Aug 2018 11:47:24 +0200
Subject: [PATCH 088/238] Update README.md

---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index c51d7d4d..6940fade 100644
--- a/README.md
+++ b/README.md
@@ -113,10 +113,6 @@ also download packages for offline installation available on the
 pip install cefpython3==57.0
 ```
 
-If you get an error when importing the cefpython3 package on
-Windows then see this section in the Knowledge Base document:
-[ImportError: DLL load failed (Windows)](docs/Knowledge-Base.md#importerror-dll-load-failed-windows).
-
 ## Tutorial
 
 See the [Tutorial.md](docs/Tutorial.md) file.

From 2a0b06082b70694d98be57334dc598d443324300 Mon Sep 17 00:00:00 2001
From: Czarek Tomczak <cztomczak@users.noreply.github.com>
Date: Sun, 5 Aug 2018 12:41:12 +0200
Subject: [PATCH 089/238] Update Tutorial.md

---
 docs/Tutorial.md | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/docs/Tutorial.md b/docs/Tutorial.md
index e79815a4..71dc6b57 100644
--- a/docs/Tutorial.md
+++ b/docs/Tutorial.md
@@ -431,18 +431,15 @@ however these APIs were not yet exposed to CEF Python.
 
 ## Javascript exceptions and Python exceptions
 
-There are cases when executing Javascript code may end up with
-Python exception being thrown:
+When a Python function is invoked from Javascript and it fails,
+a Python exception will be thrown. When Python executes a Javascript
+callback and it fails, a Javascript exception will be thrown.
 
-1. When a Python function is invoked from Javascript and it fails,
-   a Python exception will be thrown
-2. When Python executes a Javascript callback and it fails,
-   a Python exception will be thrown
-
-In other cases to see Javascript exceptions open Developer Tools
+To see Javascript exceptions open Developer Tools
 window using mouse context menu and switch to Console tab.
 
-There are multiple ways to catch/intercept javascript exceptions:
+There are multiple ways to intercept javascript exceptions programmaticaly
+in CEF:
 
 1. In Javascript you can register "window.onerror" event to
    catch all Javascript exceptions

From 3e6eaf0a6e745fc29bffb21a919c87b26368c84f Mon Sep 17 00:00:00 2001
From: Czarek Tomczak <cztomczak@users.noreply.github.com>
Date: Sun, 5 Aug 2018 12:57:47 +0200
Subject: [PATCH 090/238] Update Tutorial.md

---
 docs/Tutorial.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/Tutorial.md b/docs/Tutorial.md
index 71dc6b57..c6c0fcf7 100644
--- a/docs/Tutorial.md
+++ b/docs/Tutorial.md
@@ -409,7 +409,8 @@ html_to_data_uri("test", js_callback_1);
 
 Python and Javascript can also communicate using http requests
 by running an internal web-server. See for example [SimpleHTTPServer](https://docs.python.org/2/library/simplehttpserver.html)
-in Python docs.
+in Python docs. In upstream CEF there is available a fast built-in
+web server and [Issue #445](../../../issues/445) is to expose its API.
 
 With http requests it is possible for synchronous
 communication from Javascript to Python by performing

From 5bf5d194209cff433ec272e9f091361046be7374 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Mon, 6 Aug 2018 13:24:27 +0200
Subject: [PATCH 091/238] Add --use-gtk3 flag to automate.py (#446)

---
 tools/automate.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tools/automate.py b/tools/automate.py
index a9992f38..63aa55d7 100644
--- a/tools/automate.py
+++ b/tools/automate.py
@@ -34,6 +34,7 @@
                 [--ninja-jobs JOBS] [--gyp-generators GENERATORS]
                 [--gyp-msvs-version MSVS]
                 [--use-system-freetype USE_SYSTEM_FREETYPE]
+                [--use-gtk3 USE_GTK3]
                 [--no-depot-tools-update NO_DEPOT_TOOLS_UPDATE]
     automate.py (-h | --help) [type -h to show full description for options]
 
@@ -64,6 +65,7 @@
     --gyp-generators=<gen>   Set GYP_GENERATORS [default: ninja].
     --gyp-msvs-version=<v>   Set GYP_MSVS_VERSION.
     --use-system-freetype    Use system Freetype library on Linux (Issue #402)
+    --use-gtk3               Link CEF with GTK 3 libraries (Issue #446)
     --no-depot-tools-update  Do not update depot_tools/ directory. When
                              building old unsupported versions of Chromium
                              you want to manually checkout an old version
@@ -111,6 +113,7 @@ class Options(object):
     gyp_generators = "ninja"  # Even though CEF uses now GN, still some GYP
     gyp_msvs_version = ""     # env variables are being used.
     use_system_freetype = False
+    use_gtk3 = False
     no_depot_tools_update = False
 
     # Internal options
@@ -897,14 +900,18 @@ def getenv():
     env["CEF_USE_GN"] = "1"
     # Issue #73 patch applied here with "use_allocator=none"
     env["GN_DEFINES"] = "use_sysroot=true use_allocator=none symbol_level=1"
-    # env["GN_DEFINES"] += " use_gtk3=false"
+
+    # Link with GTK 3 (Issue #446)
+    if Options.use_gtk3:
+        env["GN_DEFINES"] += " use_gtk3=true"
+
     # To perform an official build set GYP_DEFINES=buildtype=Official.
     # This will disable debugging code and enable additional link-time
     # optimizations in Release builds.
     if Options.release_build and not Options.fast_build:
         env["GN_DEFINES"] += " is_official_build=true"
 
-    # Isssue #402 - Blurry font rendering on Linux
+    # Blurry font rendering on Linux (Isssue #402)
     if Options.use_system_freetype:
         env["GN_DEFINES"] += " use_system_freetype=true"
 

From 1a3ca6bf748f2068410f0126621d36128c225e72 Mon Sep 17 00:00:00 2001
From: Czarek Tomczak <cztomczak@users.noreply.github.com>
Date: Tue, 7 Aug 2018 09:28:56 +0200
Subject: [PATCH 092/238] Update ApplicationSettings.md

---
 api/ApplicationSettings.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/api/ApplicationSettings.md b/api/ApplicationSettings.md
index b5a81900..d0ec2a7d 100644
--- a/api/ApplicationSettings.md
+++ b/api/ApplicationSettings.md
@@ -187,15 +187,16 @@ Default: False
 
 EXPERIMENTAL: So far this was tested only on Linux and actually made app
               significantly slower. Windows and Mac platforms were not
-              tested yet. Reported issue in upstream, see [Issue #246]
-              (https://github.com/cztomczak/cefpython/issues/246) for details.
+              tested yet. Reported issue in upstream, see
+              [Issue #246](https://github.com/cztomczak/cefpython/issues/246) 
+              for details.
 
 It is recommended to use this option as a replacement for calls to
 cefpython.MessageLoopWork(). CEF Python will do these calls automatically
 using CEF's OnScheduleMessagePumpWork. This results in improved performance
 on Windows and Mac and resolves some bugs with missing keyboard events
-on these platforms. See [Issue #246]
-(https://github.com/cztomczak/cefpython/issues/246) for more details.
+on these platforms. See [Issue #246](https://github.com/cztomczak/cefpython/issues/246)
+for more details.
 
 Description from upstream CEF:
 > Set to true (1) to control browser process main (UI) thread message pump

From c760eb5c1470a92746f92cfbc80c324dfd8bd519 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Tue, 7 Aug 2018 12:36:20 +0200
Subject: [PATCH 093/238] Fix external message pump implementation (#246).

Update CEF to branch 3359 on Mac.
---
 .gitignore                                    |  1 +
 src/cefpython.pyx                             | 18 ++++++++------
 src/extern/cef/cef_scoped_ptr.pxd             |  2 ++
 src/subprocess/Makefile-libcefpythonapp       |  2 +-
 .../main_message_loop_external_pump.cpp       |  4 +++-
 .../main_message_loop_external_pump_mac.mm    |  1 +
 src/version/cef_version_mac.h                 | 24 +++++++++----------
 7 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index ed3648c1..b786188b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ examples/webrtc_event_logs/
 unittests/GPUCache/
 unittests/blob_storage/
 unittests/webrtc_event_logs/
+.DS_Store
diff --git a/src/cefpython.pyx b/src/cefpython.pyx
index 3deebbc1..369f8f2e 100644
--- a/src/cefpython.pyx
+++ b/src/cefpython.pyx
@@ -622,8 +622,11 @@ def Initialize(applicationSettings=None, commandLineSwitches=None, **kwargs):
     # External message pump
     if GetAppSetting("external_message_pump")\
             and not g_external_message_pump.get():
-        g_external_message_pump.reset(
-                MainMessageLoopExternalPump.Create().get())
+        Debug("Create external message pump")
+        # Using .reset() here to assign new instance was causing
+        # MainMessageLoopExternalPump destructor to be called. Strange.
+        g_external_message_pump.Assign(
+                MainMessageLoopExternalPump.Create())
 
     Debug("CefInitialize()")
     cdef cpp_bool ret
@@ -930,15 +933,16 @@ def Shutdown():
     # Debug("Free g_shared_request_context")
     # g_shared_request_context.Assign(NULL)
 
-    Debug("CefShutdown()")
-    with nogil:
-        CefShutdown()
-
-    # Release external message pump, as in cefclient after Shutdown
+    # Release external message pump before CefShutdown, so that
+    # message pump timer is killed.
     if g_external_message_pump.get():
+        Debug("Reset external message pump")
         # Reset will set it to NULL
         g_external_message_pump.reset()
 
+    Debug("CefShutdown()")
+    with nogil:
+        CefShutdown()
 
 def SetOsModalLoop(py_bool modalLoop):
     cdef cpp_bool cefModalLoop = bool(modalLoop)
diff --git a/src/extern/cef/cef_scoped_ptr.pxd b/src/extern/cef/cef_scoped_ptr.pxd
index 4498360c..2e770a5b 100644
--- a/src/extern/cef/cef_scoped_ptr.pxd
+++ b/src/extern/cef/cef_scoped_ptr.pxd
@@ -13,3 +13,5 @@ cdef extern from "include/base/cef_scoped_ptr.h":
         void reset(T* p)
         # noinspection PyUnresolvedReferences
         T* get()
+        # noinspection PyUnresolvedReferences
+        scoped_ptr[T]& Assign "operator="(scoped_ptr[T] p)
diff --git a/src/subprocess/Makefile-libcefpythonapp b/src/subprocess/Makefile-libcefpythonapp
index 57f3dcce..23fbde39 100644
--- a/src/subprocess/Makefile-libcefpythonapp
+++ b/src/subprocess/Makefile-libcefpythonapp
@@ -15,7 +15,7 @@ ifeq ($(UNAME_S), Linux)
 	SRC_MORE = print_handler_gtk.cpp ../client_handler/x11.cpp \
 			main_message_loop/main_message_loop_external_pump_linux.cpp
 else ifeq ($(UNAME_S), Darwin)
-    SRC_MORE = main_message_loop/main_message_loop_external_pump_mac.mm
+	SRC_MORE = main_message_loop/main_message_loop_external_pump_mac.mm
 endif
 
 SRC = cefpython_app.cpp v8function_handler.cpp v8utils.cpp \
diff --git a/src/subprocess/main_message_loop/main_message_loop_external_pump.cpp b/src/subprocess/main_message_loop/main_message_loop_external_pump.cpp
index abd81a84..18b14289 100644
--- a/src/subprocess/main_message_loop/main_message_loop_external_pump.cpp
+++ b/src/subprocess/main_message_loop/main_message_loop_external_pump.cpp
@@ -22,7 +22,7 @@ const int32 kTimerDelayPlaceholder = INT_MAX;
 // DoWork().
 const int64 kMaxTimerDelay = 1000 / 30;  // 30fps
 
-MainMessageLoopExternalPump* g_external_message_pump = NULL;
+::MainMessageLoopExternalPump* g_external_message_pump = NULL;
 
 } // namespace
 
@@ -43,6 +43,8 @@ MainMessageLoopExternalPump* MainMessageLoopExternalPump::Get() {
 
 void MainMessageLoopExternalPump::OnScheduleWork(int64 delay_ms) {
   REQUIRE_MAIN_THREAD();
+  // LOG(INFO) << "MainMessageLoopExternalPump::OnScheduleWork";
+  // LOG(INFO) << delay_ms << " ms";
 
   if (delay_ms == kTimerDelayPlaceholder && IsTimerPending()) {
     // Don't set the maximum timer requested from DoWork() if a timer event is
diff --git a/src/subprocess/main_message_loop/main_message_loop_external_pump_mac.mm b/src/subprocess/main_message_loop/main_message_loop_external_pump_mac.mm
index f77c4d27..c446b59b 100644
--- a/src/subprocess/main_message_loop/main_message_loop_external_pump_mac.mm
+++ b/src/subprocess/main_message_loop/main_message_loop_external_pump_mac.mm
@@ -92,6 +92,7 @@ - (void)timerTimeout:(id)obj {
 }
 
 int MainMessageLoopExternalPumpMac::Run() {
+  LOG(INFO) << "MainMessageLoopExternalPumpMac::Run";
   // Run the message loop.
   [NSApp run];
 
diff --git a/src/version/cef_version_mac.h b/src/version/cef_version_mac.h
index 11454273..50e9b4ef 100644
--- a/src/version/cef_version_mac.h
+++ b/src/version/cef_version_mac.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2018 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.2987.1601.gf035232"
+#define CEF_VERSION "3.3359.1774.gd49d25f"
 #define CEF_VERSION_MAJOR 3
-#define CEF_COMMIT_NUMBER 1601
-#define CEF_COMMIT_HASH "f035232c082f837d2b85bd7821a93a54fc742775"
-#define COPYRIGHT_YEAR 2017
+#define CEF_COMMIT_NUMBER 1774
+#define CEF_COMMIT_HASH "d49d25f881b68f418e243e12801cbbb7caebb563"
+#define COPYRIGHT_YEAR 2018
 
-#define CHROME_VERSION_MAJOR 57
+#define CHROME_VERSION_MAJOR 66
 #define CHROME_VERSION_MINOR 0
-#define CHROME_VERSION_BUILD 2987
-#define CHROME_VERSION_PATCH 133
+#define CHROME_VERSION_BUILD 3359
+#define CHROME_VERSION_PATCH 181
 
 #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 "b0a24e3e202f3d8b72f2fbc1ebc5864f96ec16ae"
+#define CEF_API_HASH_UNIVERSAL "84263345b0b1143139aba560e5e5ed16fb6a9628"
 #if defined(OS_WIN)
-#define CEF_API_HASH_PLATFORM "1c6a27f840ac87c8c971350c907edbe2c5fa0387"
+#define CEF_API_HASH_PLATFORM "cf092ef692a2ff18b0fc732b58bde9b8b8655fcc"
 #elif defined(OS_MACOSX)
-#define CEF_API_HASH_PLATFORM "1567db600ee83cc2a59bb8c17ca416d11a7c9b8a"
+#define CEF_API_HASH_PLATFORM "34f636bde2f02cb43c10061f384af4fc51c26e1f"
 #elif defined(OS_LINUX)
-#define CEF_API_HASH_PLATFORM "1f9f9e15bf7cf13de2557ddd411dfc9f694503b0"
+#define CEF_API_HASH_PLATFORM "6b57a640612f8d459042917ad2568b1526a70af4"
 #endif
 
 // Returns CEF version information for the libcef library. The |entry|

From b20c79b35a522380b6aac2f4e84668128a7bd74e Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Tue, 7 Aug 2018 14:18:59 +0200
Subject: [PATCH 094/238] Fix qt.py and wxpython.py examples on Mac (#442).

Enable external message pump to temporarily fix Issue #442.
---
 api/ApplicationSettings.md | 20 +++++++++++++++-----
 examples/qt.py             |  9 ++++++++-
 examples/wxpython.py       |  6 ++++++
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/api/ApplicationSettings.md b/api/ApplicationSettings.md
index d0ec2a7d..82ca5b23 100644
--- a/api/ApplicationSettings.md
+++ b/api/ApplicationSettings.md
@@ -185,11 +185,13 @@ Downloads are handled automatically. A default `SaveAs` file dialog provided by
 (bool)
 Default: False
 
-EXPERIMENTAL: So far this was tested only on Linux and actually made app
-              significantly slower. Windows and Mac platforms were not
-              tested yet. Reported issue in upstream, see
-              [Issue #246](https://github.com/cztomczak/cefpython/issues/246) 
-              for details.
+This option is for use on Mac and Linux only. On Windows for best
+performance you should use a multi-threaded message loop instead
+of calling CefDoMessageLoopWork in a timer.
+
+EXPERIMENTAL (Linux): There are issues with this option on Linux. See
+                      [Issue #246](https://github.com/cztomczak/cefpython/issues/246) 
+                      for details.
 
 It is recommended to use this option as a replacement for calls to
 cefpython.MessageLoopWork(). CEF Python will do these calls automatically
@@ -198,6 +200,14 @@ on Windows and Mac and resolves some bugs with missing keyboard events
 on these platforms. See [Issue #246](https://github.com/cztomczak/cefpython/issues/246)
 for more details.
 
+IMPORTANT: Currently there are issues on Mac with both message loop work
+           and external message pump. The working solution is to call
+           a message loop work in a timer and enable external message pump
+           both at the same time (an incorrect approach, but it works).
+           This is just a temporary solution and how this affects
+           performance was not tested. See [Issue #442](../../../issues/442)
+           for more details.
+
 Description from upstream CEF:
 > Set to true (1) to control browser process main (UI) thread message pump
 > scheduling via the CefBrowserProcessHandler::OnScheduleMessagePumpWork()
diff --git a/examples/qt.py b/examples/qt.py
index 731ac2e0..dc8f944a 100644
--- a/examples/qt.py
+++ b/examples/qt.py
@@ -76,7 +76,14 @@
 def main():
     check_versions()
     sys.excepthook = cef.ExceptHook  # To shutdown all CEF processes on error
-    cef.Initialize()
+    settings = {}
+    if MAC:
+        # Issue #442 requires enabling message pump on Mac
+        # and calling message loop work in a timer both at
+        # the same time. This is an incorrect approach
+        # and only a temporary solution.
+        settings["external_message_pump"] = True
+    cef.Initialize(settings)
     app = CefApplication(sys.argv)
     main_window = MainWindow()
     main_window.show()
diff --git a/examples/wxpython.py b/examples/wxpython.py
index 6adfa9c4..bafcdaec 100644
--- a/examples/wxpython.py
+++ b/examples/wxpython.py
@@ -33,6 +33,12 @@ def main():
     check_versions()
     sys.excepthook = cef.ExceptHook  # To shutdown all CEF processes on error
     settings = {}
+    if MAC:
+        # Issue #442 requires enabling message pump on Mac
+        # and calling message loop work in a timer both at
+        # the same time. This is an incorrect approach
+        # and only a temporary solution.
+        settings["external_message_pump"] = True
     if WINDOWS:
         # noinspection PyUnresolvedReferences, PyArgumentList
         cef.DpiAware.EnableHighDpiSupport()

From 4e77c936b88caf3efc3984878ba4b03f865e9155 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Tue, 7 Aug 2018 21:04:59 +0200
Subject: [PATCH 095/238] Update Migration Guide document. Changes to Mac apps
 that integrate into existing message loops (Qt, wxPython) (#442).

---
 README.md               | 12 ++++++------
 api/API-index.md        |  2 +-
 docs/Migration-guide.md | 19 ++++++++++++++++++-
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 6940fade..de38333b 100644
--- a/README.md
+++ b/README.md
@@ -254,8 +254,8 @@ Additional information for v31.2 release:
 - [Tutorial](docs/Tutorial.md)
 
 
-### API categories
-
+### API categories
+
 #### Modules
 
  * [cefpython](api/cefpython.md#cefpython) module
@@ -310,9 +310,9 @@ Additional information for v31.2 release:
  * [StringVisitor](api/StringVisitor.md#stringvisitor-interface) interface
  * [WebRequestClient](api/WebRequestClient.md#webrequestclient-interface) interface
 
-
-### API index
-
+
+### API index
+
 * [Application settings](api/ApplicationSettings.md#application-settings)
   * [accept_language_list](api/ApplicationSettings.md#accept_language_list)
   * [app_user_model_id](api/ApplicationSettings.md#app_user_model_id)
@@ -652,7 +652,7 @@ Additional information for v31.2 release:
   * [ERR_UNSAFE_REDIRECT](api/NetworkError.md#err_unsafe_redirect)
 * [PaintBuffer (object)](api/PaintBuffer.md#paintbuffer-object)
   * [GetIntPointer](api/PaintBuffer.md#getintpointer)
-  * [GetString](api/PaintBuffer.md#getstring)
+  * [GetBytes](api/PaintBuffer.md#getbytes)
 * [RenderHandler (interface)](api/RenderHandler.md#renderhandler-interface)
   * [GetRootScreenRect](api/RenderHandler.md#getrootscreenrect)
   * [GetViewRect](api/RenderHandler.md#getviewrect)
diff --git a/api/API-index.md b/api/API-index.md
index 3382f363..a6f81ba0 100644
--- a/api/API-index.md
+++ b/api/API-index.md
@@ -341,7 +341,7 @@
   * [ERR_UNSAFE_REDIRECT](NetworkError.md#err_unsafe_redirect)
 * [PaintBuffer (object)](PaintBuffer.md#paintbuffer-object)
   * [GetIntPointer](PaintBuffer.md#getintpointer)
-  * [GetString](PaintBuffer.md#getstring)
+  * [GetBytes](PaintBuffer.md#getbytes)
 * [RenderHandler (interface)](RenderHandler.md#renderhandler-interface)
   * [GetRootScreenRect](RenderHandler.md#getrootscreenrect)
   * [GetViewRect](RenderHandler.md#getviewrect)
diff --git a/docs/Migration-guide.md b/docs/Migration-guide.md
index 3e419176..b211f355 100644
--- a/docs/Migration-guide.md
+++ b/docs/Migration-guide.md
@@ -44,7 +44,8 @@ Table of contents:
 * [v66+ BrowserSettings.javascript_open_windows_disallowed option was removed](#v66-browsersettingsjavascript_open_windows_disallowed-option-was-removed)
 * [v66+ Threads removed: TID_DB, TID_PROCESS_LAUNCHER, TID_CACHE](#v66-threads-removed-tid_db-tid_process_launcher-tid_cache)
 * [v66+ cef.Request.Flags changed](#v66-cefrequestflags-changed)
-* [v66+ RequestHandler.GetCookieManager 'browser' param may be None](#v66-requesthandlergetcookiemanager-browser-param-may-be-none)
+* [v66+ RequestHandler.GetCookieManager not getting called in some cases](#v66-requesthandlergetcookiemanager-not-getting-called-in-some-cases)
+* [v66+ Changes to Mac apps that integrate into existing message loops (Qt, wxPython)](#v66-changes-to-mac-apps-that-integrate-into-existing-message-loops-qt-wxpython)
 
 
 
@@ -384,3 +385,19 @@ In some cases the RequestHandler.[GetCookieManager](../api/RequestHandler.md#get
 callback is not getting called due to a race condition.
 This bug is to be fixed in Issue [#429](../../../issues/429).
 
+
+## v66+ Changes to Mac apps that integrate into existing message loops (Qt, wxPython)
+
+The `qt.py` and `wxpython.py` examples were modified to set
+ApplicationSettings.[external_message_pump](../api/ApplicationSettings.md#external_message_pump)
+to `True`. Due to Issue [#442](../../../issues/442) it is required
+to implement both approaches to integrating with existing message
+loops at the same time:
+1. Call `cef.DoMessageLoopWork` in a 10ms timer
+2. Set `ApplicationSettings.external_message_pump` to True
+
+This is not a correct approach and is only a temporary fix. More
+testing is required to check if that resolves all the issues with message
+loop freezing. Only basic testing was performed. It was not tested of
+how this change affects performance.
+

From d32f4b628a5d46bbfbb14462f62efb132938dd85 Mon Sep 17 00:00:00 2001
From: Czarek Tomczak <cztomczak@users.noreply.github.com>
Date: Wed, 8 Aug 2018 10:13:39 +0200
Subject: [PATCH 096/238] Update compile_time_constants.pxi

---
 src/compile_time_constants.pxi | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/compile_time_constants.pxi b/src/compile_time_constants.pxi
index 632aab59..609470c1 100644
--- a/src/compile_time_constants.pxi
+++ b/src/compile_time_constants.pxi
@@ -1,3 +1,7 @@
 # This file was generated by setup.py
+
+# Type this command to ignore changes to this file:
+#   git update-index --assume-unchanged src/compile_time_constants.pxi
+
 DEF UNAME_SYSNAME = "Windows"
 DEF PY_MAJOR_VERSION = 3

From 18c4a5860af24770d3f304ea5421d2579143ed5a Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Wed, 8 Aug 2018 12:44:40 +0200
Subject: [PATCH 097/238] Further changes to message loop issues on Mac (#442).

Minor fix to CefAppProtocol implementation, see CEF Forum
topic for details.

Updated Qt example so that message loop work is not
called in a timer when message pump is enabled. This
is not required.

In wxPython apps it is still required to enable both
message pump and message looper timer work.
---
 api/ApplicationSettings.md     |  6 ++++--
 docs/Migration-guide.md        | 26 ++++++++++++++++----------
 examples/qt.py                 | 12 +++++++-----
 examples/wxpython.py           | 33 ++++++++++++++++++---------------
 src/cefpython.pyx              |  8 +++++---
 src/client_handler/util_mac.h  |  1 +
 src/client_handler/util_mac.mm | 24 +++++++++++++++++++++---
 src/extern/mac.pxd             |  1 +
 8 files changed, 73 insertions(+), 38 deletions(-)

diff --git a/api/ApplicationSettings.md b/api/ApplicationSettings.md
index 82ca5b23..a9ad20f1 100644
--- a/api/ApplicationSettings.md
+++ b/api/ApplicationSettings.md
@@ -201,8 +201,10 @@ on these platforms. See [Issue #246](https://github.com/cztomczak/cefpython/issu
 for more details.
 
 IMPORTANT: Currently there are issues on Mac with both message loop work
-           and external message pump. The working solution is to call
-           a message loop work in a timer and enable external message pump
+           and external message pump. In Qt apps calling message loop
+           work in a timer doesn't work anymore, you have to use external
+           message pump. In wxPython apps it is required to call a message
+           loop work in a timer and enable external message pump
            both at the same time (an incorrect approach, but it works).
            This is just a temporary solution and how this affects
            performance was not tested. See [Issue #442](../../../issues/442)
diff --git a/docs/Migration-guide.md b/docs/Migration-guide.md
index b211f355..3063ada1 100644
--- a/docs/Migration-guide.md
+++ b/docs/Migration-guide.md
@@ -45,7 +45,7 @@ Table of contents:
 * [v66+ Threads removed: TID_DB, TID_PROCESS_LAUNCHER, TID_CACHE](#v66-threads-removed-tid_db-tid_process_launcher-tid_cache)
 * [v66+ cef.Request.Flags changed](#v66-cefrequestflags-changed)
 * [v66+ RequestHandler.GetCookieManager not getting called in some cases](#v66-requesthandlergetcookiemanager-not-getting-called-in-some-cases)
-* [v66+ Changes to Mac apps that integrate into existing message loops (Qt, wxPython)](#v66-changes-to-mac-apps-that-integrate-into-existing-message-loops-qt-wxpython)
+* [v66+ Changes to Mac apps that integrate into existing message loop (Qt, wxPython)](#v66-changes-to-mac-apps-that-integrate-into-existing-message-loop-qt-wxpython)
 
 
 
@@ -386,18 +386,24 @@ callback is not getting called due to a race condition.
 This bug is to be fixed in Issue [#429](../../../issues/429).
 
 
-## v66+ Changes to Mac apps that integrate into existing message loops (Qt, wxPython)
+## v66+ Changes to Mac apps that integrate into existing message loop (Qt, wxPython)
 
-The `qt.py` and `wxpython.py` examples were modified to set
+In Qt apps calling message loop work in a timer doesn't work anymore.
+You have to enable external message pump by setting
 ApplicationSettings.[external_message_pump](../api/ApplicationSettings.md#external_message_pump)
-to `True`. Due to Issue [#442](../../../issues/442) it is required
-to implement both approaches to integrating with existing message
-loops at the same time:
+to `True`. The `qt.py` example was updated to disable calling
+message loop work in a timer. External message pump
+is a recommended way over calling message loop work in a timer on Mac,
+so this should make Qt apps work smoothly.
+
+In wxPython apps you have to implement both approaches for
+integrating with existing message loop at the same time:
 1. Call `cef.DoMessageLoopWork` in a 10ms timer
 2. Set `ApplicationSettings.external_message_pump` to True
 
-This is not a correct approach and is only a temporary fix. More
-testing is required to check if that resolves all the issues with message
-loop freezing. Only basic testing was performed. It was not tested of
-how this change affects performance.
+This is not a correct approach and is only a temporary fix for wxPython
+apps. More testing is required to check if that resolves all the issues
+with message loop freezing. Only basic testing was performed. It was not
+tested of how this change affects performance.
 
+See Issue [#442](../../../issues/442) for more details on the issues.
diff --git a/examples/qt.py b/examples/qt.py
index dc8f944a..d0ed3300 100644
--- a/examples/qt.py
+++ b/examples/qt.py
@@ -79,10 +79,10 @@ def main():
     settings = {}
     if MAC:
         # Issue #442 requires enabling message pump on Mac
-        # and calling message loop work in a timer both at
-        # the same time. This is an incorrect approach
-        # and only a temporary solution.
+        # in Qt example. Calling cef.DoMessageLoopWork in a timer
+        # doesn't work anymore.
         settings["external_message_pump"] = True
+
     cef.Initialize(settings)
     app = CefApplication(sys.argv)
     main_window = MainWindow()
@@ -90,7 +90,8 @@ def main():
     main_window.activateWindow()
     main_window.raise_()
     app.exec_()
-    app.stopTimer()
+    if not cef.GetAppSetting("external_message_pump"):
+        app.stopTimer()
     del main_window  # Just to be safe, similarly to "del app"
     del app  # Must destroy app object before calling Shutdown
     cef.Shutdown()
@@ -266,7 +267,8 @@ def resizeEvent(self, event):
 class CefApplication(QApplication):
     def __init__(self, args):
         super(CefApplication, self).__init__(args)
-        self.timer = self.createTimer()
+        if not cef.GetAppSetting("external_message_pump"):
+            self.timer = self.createTimer()
         self.setupIcon()
 
     def createTimer(self):
diff --git a/examples/wxpython.py b/examples/wxpython.py
index bafcdaec..91adea2d 100644
--- a/examples/wxpython.py
+++ b/examples/wxpython.py
@@ -21,6 +21,17 @@
 LINUX = (platform.system() == "Linux")
 MAC = (platform.system() == "Darwin")
 
+if MAC:
+    try:
+        # noinspection PyUnresolvedReferences
+        from AppKit import NSApp
+    except ImportError:
+        print("[wxpython.py] Error: PyObjC package is missing, "
+              "cannot fix Issue #371")
+        print("[wxpython.py] To install PyObjC type: "
+              "pip install -U pyobjc")
+        sys.exit(1)
+
 # Configuration
 WIDTH = 800
 HEIGHT = 600
@@ -37,7 +48,7 @@ def main():
         # Issue #442 requires enabling message pump on Mac
         # and calling message loop work in a timer both at
         # the same time. This is an incorrect approach
-        # and only a temporary solution.
+        # and only a temporary fix.
         settings["external_message_pump"] = True
     if WINDOWS:
         # noinspection PyUnresolvedReferences, PyArgumentList
@@ -87,20 +98,12 @@ def __init__(self):
         self.browser_panel.Bind(wx.EVT_SIZE, self.OnSize)
 
         if MAC:
-            try:
-                # noinspection PyUnresolvedReferences
-                from AppKit import NSApp
-                # Make the content view for the window have a layer.
-                # This will make all sub-views have layers. This is
-                # necessary to ensure correct layer ordering of all
-                # child views and their layers. This fixes Window
-                # glitchiness during initial loading on Mac (Issue #371).
-                NSApp.windows()[0].contentView().setWantsLayer_(True)
-            except ImportError:
-                print("[wxpython.py] Warning: PyObjC package is missing, "
-                      "cannot fix Issue #371")
-                print("[wxpython.py] To install PyObjC type: "
-                      "pip install -U pyobjc")
+            # Make the content view for the window have a layer.
+            # This will make all sub-views have layers. This is
+            # necessary to ensure correct layer ordering of all
+            # child views and their layers. This fixes Window
+            # glitchiness during initial loading on Mac (Issue #371).
+            NSApp.windows()[0].contentView().setWantsLayer_(True)
 
         if LINUX:
             # On Linux must show before embedding browser, so that handle
diff --git a/src/cefpython.pyx b/src/cefpython.pyx
index 369f8f2e..05a12217 100644
--- a/src/cefpython.pyx
+++ b/src/cefpython.pyx
@@ -499,9 +499,7 @@ def Initialize(applicationSettings=None, commandLineSwitches=None, **kwargs):
 
     Debug("Initialize() called")
 
-    # Mac initialization. Need to call NSApplication.sharedApplication()
-    # and do NSApplication methods swizzling to implement
-    # CrAppControlProtocol. See Issue 156.
+    # Additional initialization on Mac, see util_mac.mm.
     IF UNAME_SYSNAME == "Darwin":
         MacInitialize()
 
@@ -944,6 +942,10 @@ def Shutdown():
     with nogil:
         CefShutdown()
 
+    # Additional cleanup on Mac, see util_mac.mm.
+    IF UNAME_SYSNAME == "Darwin":
+        MacShutdown()
+
 def SetOsModalLoop(py_bool modalLoop):
     cdef cpp_bool cefModalLoop = bool(modalLoop)
     with nogil:
diff --git a/src/client_handler/util_mac.h b/src/client_handler/util_mac.h
index 37ec7266..63ee1dff 100644
--- a/src/client_handler/util_mac.h
+++ b/src/client_handler/util_mac.h
@@ -11,6 +11,7 @@
 #include "include/cef_browser.h"
 
 void MacInitialize();
+void MacShutdown();
 void MacSetWindowTitle(CefRefPtr<CefBrowser> browser, char* title);
 
 #endif  // CEFPYTHON_UTIL_MAC_H_
diff --git a/src/client_handler/util_mac.mm b/src/client_handler/util_mac.mm
index f2e14cd1..4916b253 100644
--- a/src/client_handler/util_mac.mm
+++ b/src/client_handler/util_mac.mm
@@ -2,6 +2,16 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
+// Copyright (c) 2015 CEF Python, see the Authors file.
+// All rights reserved. Licensed under BSD 3-clause license.
+// Project website: https://github.com/cztomczak/cefpython
+
+// Some code was copied from here:
+// java-cef: src/master/native/util_mac.mm
+// upstream cef: src/tests/ceftests/run_all_unittests_mac.mm
+// upstream cef: src/tests/cefclient/cefclient_mac.mm
+// upstream cef: src/tests/cefsimple/cefsimple_mac.mm
+
 #import "util_mac.h"
 #import <Cocoa/Cocoa.h>
 #include <objc/runtime.h>
@@ -11,13 +21,14 @@
 
 namespace {
 
+// static NSAutoreleasePool* g_autopool = nil;
 BOOL g_handling_send_event = false;
 
 }  // namespace
 
-// Add the necessary CrAppControlProtocol
-// functionality to NSApplication using categories and swizzling.
-@interface NSApplication (CEFPythonApplication)
+// Add the necessary CefAppProtocol functionality to NSApplication
+// using categories and swizzling (Issue #442, Issue #156).
+@interface NSApplication (CEFPythonApplication)<CefAppProtocol>
 
 - (BOOL)isHandlingSendEvent;
 - (void)setHandlingSendEvent:(BOOL)handlingSendEvent;
@@ -63,9 +74,16 @@ - (void)_swizzled_terminate:(id)sender {
 @end
 
 void MacInitialize() {
+    // OFF: it's causing a crash during shutdown release
+    // g_autopool = [[NSAutoreleasePool alloc] init];
     [NSApplication sharedApplication];
 }
 
+void MacShutdown() {
+    // OFF: it's causing a crash during shutdown release
+    // [g_autopool release];
+}
+
 void MacSetWindowTitle(CefRefPtr<CefBrowser> browser, char* title) {
     NSView* view = browser->GetHost()->GetWindowHandle();
     NSString* nstitle = [NSString stringWithFormat:@"%s" , title];
diff --git a/src/extern/mac.pxd b/src/extern/mac.pxd
index cca038b9..e23b4b98 100644
--- a/src/extern/mac.pxd
+++ b/src/extern/mac.pxd
@@ -7,4 +7,5 @@ from cef_browser cimport CefBrowser
 
 cdef extern from "client_handler/util_mac.h":
     void MacInitialize()
+    void MacShutdown()
     void MacSetWindowTitle(CefRefPtr[CefBrowser] browser, char* title)

From 4c5cf09c453b27808938ad50d1ddfc32d359c111 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Mon, 13 Aug 2018 11:27:38 +0200
Subject: [PATCH 098/238] Fix Request.SetPostData in Python 3 (#228)

---
 api/Request.md                | 11 ++++++-----
 src/cefpython.pyx             | 18 +++++++++++-------
 src/extern/cef/cef_string.pxd |  2 +-
 src/request.pyx               | 21 ++++++++++-----------
 src/string_utils.pyx          |  8 ++++++++
 unittests/main_test.py        | 21 +++++++++++++++++++++
 6 files changed, 57 insertions(+), 24 deletions(-)

diff --git a/api/Request.md b/api/Request.md
index 3fcf5032..d9d0ece3 100644
--- a/api/Request.md
+++ b/api/Request.md
@@ -95,9 +95,10 @@ Set the request method type.
 | --- | --- |
 | __Return__ | list/dict |
 
-Get the post data. If the form content type is "multipart/form-data"
-then the post data will be returned as a list. If the form content
-type is "application/x-www-form-urlencoded" then the post data will
+Get the post data. All strings are byte strings. If the form content
+type is "multipart/form-data" then the post data will be returned
+as a list. If the form content type is
+"application/x-www-form-urlencoded" then the post data will
 be returned as a dict.
 
 
@@ -108,8 +109,8 @@ be returned as a dict.
 | postData | list/dict |
 | __Return__ | void |
 
-Set the post data. See GetPostData() for an explanation of the
-postData type.
+Set the post data. All strings are expected to be byte strings.
+See GetPostData() for an explanation of the postData type.
 
 ### GetHeaderMap
 
diff --git a/src/cefpython.pyx b/src/cefpython.pyx
index 05a12217..493a53d9 100644
--- a/src/cefpython.pyx
+++ b/src/cefpython.pyx
@@ -135,19 +135,23 @@ import random
 # noinspection PyUnresolvedReferences
 import struct
 
-if sys.version_info.major == 2:
+# Must use compile-time condition instead of checking sys.version_info.major
+# otherwise results in "ImportError: cannot import name urlencode" strange
+# error in Python 3.6.
+IF PY_MAJOR_VERSION == 2:
     # noinspection PyUnresolvedReferences
     import urlparse
-else:
-    # noinspection PyUnresolvedReferences
-    from urllib import parse as urlparse
-
-if sys.version_info.major == 2:
     # noinspection PyUnresolvedReferences
     from urllib import pathname2url as urllib_pathname2url
-else:
+    # noinspection PyUnresolvedReferences
+    from urllib import urlencode as urllib_urlencode
+ELSE:
+    # noinspection PyUnresolvedReferences
+    from urllib import parse as urlparse
     # noinspection PyUnresolvedReferences
     from urllib.request import pathname2url as urllib_pathname2url
+    # noinspection PyUnresolvedReferences
+    from urllib.parse import urlencode as urllib_urlencode
 
 # noinspection PyUnresolvedReferences
 from cpython.version cimport PY_MAJOR_VERSION
diff --git a/src/extern/cef/cef_string.pxd b/src/extern/cef/cef_string.pxd
index 74f2e342..0986d7a6 100644
--- a/src/extern/cef/cef_string.pxd
+++ b/src/extern/cef/cef_string.pxd
@@ -21,5 +21,5 @@ cdef extern from "include/internal/cef_string.h":
         cpp_bool FromString(cpp_string& str)
         cpp_string ToString()
         cpp_wstring ToWString()
-        char* c_str()
+        const char* c_str()
         size_t length()
diff --git a/src/request.pyx b/src/request.pyx
index 0f770b20..ed097638 100644
--- a/src/request.pyx
+++ b/src/request.pyx
@@ -99,10 +99,10 @@ cdef class PyRequest:
         # pyData is really of type "str", but Cython will throw
         # an error if we use that type: "Cannot convert 'bytes'
         # object to str implicitly. This is not portable to Py3."
-        cdef object pyData 
+        cdef bytes pyData
         cdef size_t bytesCount
         cdef void* voidData
-        cdef str pyFile
+        cdef bytes pyFile
         while iterator != elementVector.end():
             postDataElement = deref(iterator)
             if postDataElement.get().GetType() == cef_types.PDE_TYPE_EMPTY:
@@ -112,9 +112,9 @@ cdef class PyRequest:
                 bytesCount = postDataElement.get().GetBytesCount()
                 voidData = <void*>malloc(bytesCount)
                 postDataElement.get().GetBytes(bytesCount, voidData)
-                pyData = VoidPtrToString(voidData, bytesCount)
+                pyData = VoidPtrToBytes(voidData, bytesCount)
                 free(voidData)
-                if pyData.startswith('--') or retMultipart:
+                if pyData.startswith(b'--') or retMultipart:
                     # Content-Type: multipart/form-data
                     retMultipart.append(pyData)
                 else:
@@ -122,8 +122,8 @@ cdef class PyRequest:
                     retUrlEncoded.update(urlparse.parse_qsl(qs=pyData, 
                             keep_blank_values=True))
             elif postDataElement.get().GetType() == cef_types.PDE_TYPE_FILE:
-                pyFile = CefToPyString(postDataElement.get().GetFile())
-                retMultipart.append("@"+pyFile)
+                pyFile = CefToPyBytes(postDataElement.get().GetFile())
+                retMultipart.append(b"@"+pyFile)
             else:
                 raise Exception("Invalid type of CefPostDataElement")
             preinc(iterator)
@@ -135,15 +135,15 @@ cdef class PyRequest:
     cpdef py_void SetPostData(self, object pyPostData):
         cdef CefRefPtr[CefPostData] postData = CefPostData_Create()
         cdef CefRefPtr[CefPostDataElement] postDataElement
-        cdef py_string pyElement
+        cdef bytes pyElement
         cdef CefString sfile
         if type(pyPostData) == list:
             for pyElement in pyPostData:
-                if pyElement.startswith('--'):
+                if pyElement.startswith(b'--'):
                     postDataElement = CefPostDataElement_Create()
                     postDataElement.get().SetToBytes(len(pyElement), 
                             <char*>pyElement)
-                elif pyElement.startswith('@'):
+                elif pyElement.startswith(b'@'):
                     postDataElement = CefPostDataElement_Create()
                     PyToCefString(pyElement[1:], sfile)
                     postDataElement.get().SetToFile(sfile)
@@ -156,8 +156,7 @@ cdef class PyRequest:
                 postData.get().AddElement(postDataElement)
             self.GetCefRequest().get().SetPostData(postData)
         elif type(pyPostData) == dict:
-            pyElement = urllib.urlencode(pyPostData)
-            pyElement = str(pyElement)
+            pyElement = urllib_urlencode(pyPostData).encode()
             postDataElement = CefPostDataElement_Create()
             postDataElement.get().SetToBytes(len(pyElement), <char*>pyElement)
             postData.get().AddElement(postDataElement)
diff --git a/src/string_utils.pyx b/src/string_utils.pyx
index 3129b1a3..c5980b94 100644
--- a/src/string_utils.pyx
+++ b/src/string_utils.pyx
@@ -94,6 +94,10 @@ cdef py_string CefToPyString(
                     g_applicationSettings["string_encoding"],
                     errors=BYTES_DECODE_ERRORS))
 
+cdef bytes CefToPyBytes(
+        ConstCefString& cefString):
+    return <bytes>cefString.ToString()
+
 cdef void PyToCefString(
         py_string pyString,
         CefString& cefString
@@ -148,3 +152,7 @@ cdef py_string VoidPtrToString(const void* data, size_t dataLength):
         return <unicode>((<bytes>(<char*>data)[:dataLength]).decode(
                 g_applicationSettings["string_encoding"],
                 errors=BYTES_DECODE_ERRORS))
+
+cdef bytes VoidPtrToBytes(const void* data, size_t dataLength):
+    return <bytes>((<char*>data)[:dataLength])
+
diff --git a/unittests/main_test.py b/unittests/main_test.py
index ecc0f9c3..766e3552 100644
--- a/unittests/main_test.py
+++ b/unittests/main_test.py
@@ -11,6 +11,7 @@
 from cefpython3 import cefpython as cef
 import time
 import base64
+import os
 import sys
 
 # To show the window for an extended period of time increase this number.
@@ -159,6 +160,26 @@ def test_main(self):
         browser.SetJavascriptBindings(bindings)
         subtest_message("browser.SetJavascriptBindings() ok")
 
+        # Test Request.SetPostData(list)
+        req = cef.Request.CreateRequest()
+        req_file = os.path.dirname(os.path.abspath(__file__))
+        req_file = os.path.join(req_file, "main_test.py")
+        if sys.version_info.major > 2:
+            req_file = req_file.encode()
+        req_data = [b"--key=value", b"@"+req_file]
+        req.SetMethod("POST")
+        req.SetPostData(req_data)
+        self.assertEqual(req_data, req.GetPostData())
+        subtest_message("cef.Request.SetPostData(list) ok")
+
+        # Test Request.SetPostData(dict)
+        req = cef.Request.CreateRequest()
+        req_data = {b"key": b"value"}
+        req.SetMethod("POST")
+        req.SetPostData(req_data)
+        self.assertEqual(req_data, req.GetPostData())
+        subtest_message("cef.Request.SetPostData(dict) ok")
+
         # Run message loop for some time.
         # noinspection PyTypeChecker
         for i in range(MESSAGE_LOOP_RANGE):

From e0bdca3d246daeff8aa1835bef87efe2564a6c16 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Tue, 14 Aug 2018 10:18:47 +0200
Subject: [PATCH 099/238] Support for Visual Studio 2008 build tools in
 automate.py. Previously only Visual C++ for Python 2.7 was supported.

---
 tools/build.py        |  6 ++++++
 tools/common.py       | 24 +++++++++++-------------
 tools/cython_setup.py |  4 ++++
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/tools/build.py b/tools/build.py
index 0f9512ca..4ad74015 100644
--- a/tools/build.py
+++ b/tools/build.py
@@ -469,6 +469,12 @@ def build_vcproj_DEPRECATED(vcproj):
     # msbuild /p:BuildProjectReferences=false project.proj
     # MSBuild.exe MyProject.proj /t:build
 
+    VS2008_BUILD = ("%LocalAppData%\\Programs\\Common\\"
+                    "Microsoft\\Visual C++ for Python\\9.0\\"
+                    "VC\\bin\\amd64\\vcbuild.exe")
+    VS2008_BUILD = VS2008_BUILD.replace("%LocalAppData%",
+                                        os.environ["LOCALAPPDATA"])
+
     if PYVERSION == "27":
         args = list()
         args.append(VS2008_VCVARS)
diff --git a/tools/common.py b/tools/common.py
index ab51af8a..d4336b03 100644
--- a/tools/common.py
+++ b/tools/common.py
@@ -191,30 +191,28 @@
 SUBPROCESS_EXE = os.path.join(BUILD_SUBPROCESS,
                               "subprocess" + EXECUTABLE_EXT)
 
-# Visual Studio constants
+# These Visual Studio constants are used by automate.py tool
+# to build upstream C++ projects. CEF Python C++ code is built
+# with setuptools/distutils in the build_cpp_projects.py tool.
+# -----------------------------------------------------------------------------
+
 VS_PLATFORM_ARG = "x86" if ARCH32 else "amd64"
 
 VS2015_VCVARS = ("C:\\Program Files (x86)\\Microsoft Visual Studio 14.0"
                  "\\VC\\vcvarsall.bat")
 
-# For CEF build
 VS2013_VCVARS = ("C:\\Program Files (x86)\\Microsoft Visual Studio 12.0"
                  "\\VC\\vcvarsall.bat")
 
-# VS2010 vcvarsall not used, using detection with setuptools instead
 VS2010_VCVARS = ("C:\\Program Files (x86)\\Microsoft Visual Studio 10.0"
                  "\\VC\\vcvarsall.bat")
 
-VS2008_VCVARS = ("%LocalAppData%\\Programs\\Common\\Microsoft"
-                 "\\Visual C++ for Python\\9.0\\vcvarsall.bat")
-VS2008_BUILD = ("%LocalAppData%\\Programs\\Common\\"
-                "Microsoft\\Visual C++ for Python\\9.0\\"
-                "VC\\bin\\amd64\\vcbuild.exe")
-if "LOCALAPPDATA" in os.environ:
-    VS2008_VCVARS = VS2008_VCVARS.replace("%LocalAppData%",
-                                          os.environ["LOCALAPPDATA"])
-    VS2008_BUILD = VS2008_BUILD.replace("%LocalAppData%",
-                                        os.environ["LOCALAPPDATA"])
+VS2008_VCVARS = ("C:\\Program Files (x86)\\Microsoft Visual Studio 9.0"
+                 "\\VC\\vcvarsall.bat")
+
+if not os.path.exists(VS2008_VCVARS):
+    VS2008_VCVARS = (os.environ["LOCALAPPDATA"]+"\\Programs\\Common\\Microsoft"
+                     "\\Visual C++ for Python\\9.0\\vcvarsall.bat")
 
 # -----------------------------------------------------------------------------
 
diff --git a/tools/cython_setup.py b/tools/cython_setup.py
index 0d2cb5b7..e033cf84 100644
--- a/tools/cython_setup.py
+++ b/tools/cython_setup.py
@@ -127,11 +127,15 @@ def get_winsdk_lib():
             winsdk_libs = [
                 r"C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\\Lib",
                 r"C:\\Program Files\\Microsoft SDKs\\Windows\\v7.0\\Lib",
+                # Visual Studio 2008 installation
+                r"C:\\Program Files\\Microsoft SDKs\\Windows\\v6.0A\\Lib",
             ]
         elif ARCH64:
             winsdk_libs = [
                 r"C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\\Lib\\x64",
                 r"C:\\Program Files\\Microsoft SDKs\\Windows\\v7.0\\Lib\\x64",
+                # Visual Studio 2008 installation
+                r"C:\\Program Files\\Microsoft SDKs\\Windows\\v6.0A\\Lib\\x64",
             ]
         else:
             raise Exception("Unknown architecture")

From cc5695711c7a28600eb2ebeb6206944924aa6ab6 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Thu, 16 Aug 2018 14:43:13 +0200
Subject: [PATCH 100/238] Fix common.py in tools

---
 tools/common.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/common.py b/tools/common.py
index d4336b03..da24e8f6 100644
--- a/tools/common.py
+++ b/tools/common.py
@@ -210,7 +210,7 @@
 VS2008_VCVARS = ("C:\\Program Files (x86)\\Microsoft Visual Studio 9.0"
                  "\\VC\\vcvarsall.bat")
 
-if not os.path.exists(VS2008_VCVARS):
+if WINDOWS and not os.path.exists(VS2008_VCVARS):
     VS2008_VCVARS = (os.environ["LOCALAPPDATA"]+"\\Programs\\Common\\Microsoft"
                      "\\Visual C++ for Python\\9.0\\vcvarsall.bat")
 

From 8a20fdb0881322964e7db3de5b7a2a5661731ff8 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Thu, 16 Aug 2018 15:25:01 +0200
Subject: [PATCH 101/238] Fix and handle more keyboard shortcuts on Mac (#161)

Handle: copy, paste, cut, undo, redo, select all.
---
 src/handlers/keyboard_handler.pyx | 67 ++++++++++++++++++++++---------
 1 file changed, 48 insertions(+), 19 deletions(-)

diff --git a/src/handlers/keyboard_handler.pyx b/src/handlers/keyboard_handler.pyx
index c895b9b5..30c04e2f 100644
--- a/src/handlers/keyboard_handler.pyx
+++ b/src/handlers/keyboard_handler.pyx
@@ -3,6 +3,7 @@
 # Project website: https://github.com/cztomczak/cefpython
 
 include "../cefpython.pyx"
+include "../browser.pyx"
 
 # noinspection PyUnresolvedReferences
 cimport cef_types
@@ -72,39 +73,67 @@ cdef public cpp_bool KeyboardHandler_OnPreKeyEvent(
         (exc_type, exc_value, exc_trace) = sys.exc_info()
         sys.excepthook(exc_type, exc_value, exc_trace)
 
+
+cdef py_bool HandleKeyboardShortcuts(PyBrowser browser, dict event):
+    """Default implementation for keyboard shortcuts on Mac (Issue #161)."""
+    if platform.system() == "Darwin":
+        if event["modifiers"] == 128 \
+                and event["type"] != KEYEVENT_RAWKEYDOWN:
+            # Copy and paste was handled in RAWKEYDOWN, return True
+            if event["native_key_code"] in [8, 9]:
+                return True
+        if event["modifiers"] == 128 \
+                and event["type"] == KEYEVENT_RAWKEYDOWN:
+            # Select all: command + a
+            if event["native_key_code"] == 0:
+                browser.GetMainFrame().SelectAll()
+                return True
+            # Copy: command + c
+            elif event["native_key_code"] == 8:
+                browser.GetMainFrame().Copy()
+                return True
+            # Paste: command + v
+            elif event["native_key_code"] == 9:
+                browser.GetMainFrame().Paste()
+                return True
+            # Cut: command + x
+            elif event["native_key_code"] == 7:
+                browser.GetMainFrame().Cut()
+                return True
+            # Undo: command + z
+            elif event["native_key_code"] == 6:
+                browser.GetMainFrame().Undo()
+                return True
+        elif event["modifiers"] == 130 \
+                and event["type"] == KEYEVENT_RAWKEYDOWN:
+            # Redo: command + shift + z
+            if event["native_key_code"] == 6:
+                browser.GetMainFrame().Redo()
+                return True
+    return False
+
 cdef public cpp_bool KeyboardHandler_OnKeyEvent(
         CefRefPtr[CefBrowser] cefBrowser,
         const cef_types.CefKeyEvent& cefEvent,
         cef_types.CefEventHandle cefEventHandle
         ) except * with gil:
-    cdef PyBrowser pyBrowser
-    cdef dict pyEvent
+    cdef PyBrowser browser
+    cdef dict event
     cdef py_bool returnValue
     cdef object callback
     try:
-        pyBrowser = GetPyBrowser(cefBrowser, "OnKeyEvent")
-        pyEvent = CefToPyKeyEvent(cefEvent)
-        callback = pyBrowser.GetClientCallback("OnKeyEvent")
+        browser = GetPyBrowser(cefBrowser, "OnKeyEvent")
+        event = CefToPyKeyEvent(cefEvent)
+        callback = browser.GetClientCallback("OnKeyEvent")
         if callback:
             returnValue = callback(
-                    browser=pyBrowser,
-                    event=pyEvent,
+                    browser=browser,
+                    event=event,
                     event_handle=<object>PyLong_FromVoidPtr(cefEventHandle))
             # If returnValue is False then handle copy/paste on Mac
             if returnValue:
                 return bool(returnValue)
-        if platform.system() == "Darwin":
-            # Handle copy: command + c
-            if pyEvent["modifiers"] == 128 \
-                    and pyEvent["native_key_code"] == 8:
-                pyBrowser.GetFocusedFrame().Copy()
-                return True
-            # Handle paste: command + v
-            elif pyEvent["modifiers"] == 128 \
-                    and pyEvent["native_key_code"] == 9:
-                pyBrowser.GetFocusedFrame().Paste()
-                return True
-        return False
+        return bool(HandleKeyboardShortcuts(browser, event))
     except:
         (exc_type, exc_value, exc_trace) = sys.exc_info()
         sys.excepthook(exc_type, exc_value, exc_trace)

From e6bcf2c3fdf5e34ab7781a2af38ebb517e36695e Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Thu, 16 Aug 2018 16:59:45 +0200
Subject: [PATCH 102/238] Fix & enhance HighDPI support on Windows in wxPython
 example (#398, #399)

Fix DpiAware.GetSystemDpi, CalculateWindowSize (deprecated now).
Add DpiAware.Scale.
---
 README.md                    | 109 ++++++++++++++++++-----------------
 api/API-index.md             |   1 +
 api/DpiAware.md              |  30 ++++++++--
 examples/tkinter_.py         |   2 +-
 examples/wxpython.py         |  39 +++++++++++--
 src/dpi_aware_win.pyx        |  51 +++++++++++-----
 src/extern/dpi_aware_win.pxd |   1 -
 src/extern/windows.pxd       |   2 +
 8 files changed, 156 insertions(+), 79 deletions(-)

diff --git a/README.md b/README.md
index de38333b..e2883112 100644
--- a/README.md
+++ b/README.md
@@ -256,60 +256,60 @@ Additional information for v31.2 release:
 
 ### API categories
 
-#### Modules
-
- * [cefpython](api/cefpython.md#cefpython) module
-
-
-#### Settings
-
- * [ApplicationSettings](api/ApplicationSettings.md#application-settings) dictionary
- * [BrowserSettings](api/BrowserSettings.md#browser-settings) dictionary
- * [CommandLineSwitches](api/CommandLineSwitches.md#command-line-switches) dictionary
-
-
-#### Classes and objects
-
- * [Browser](api/Browser.md#browser-object) object
- * [Callback](api/Callback.md#callback-object) object
- * [Cookie](api/Cookie.md#cookie-class) class
- * [CookieManager](api/CookieManager.md#cookiemanager-class) class
- * [DpiAware](api/DpiAware.md#dpiaware-class) class (Win)
- * [DragData](api/DragData.md#dragdata-object) object
- * [Frame](api/Frame.md#frame-object) object
- * [Image](api/Image.md#image-object) object
- * [JavascriptBindings](api/JavascriptBindings.md#javascriptbindings-class) class
- * [JavascriptCallback](api/JavascriptCallback.md#javascriptcallback-object) object
- * [PaintBuffer](api/PaintBuffer.md#paintbuffer-object) object
- * [Request](api/Request.md#request-class) class
- * [Response](api/Response.md#response-object) object
- * [WebPluginInfo](api/WebPluginInfo.md#webplugininfo-object) object
- * [WebRequest](api/WebRequest.md#webrequest-class) class
- * [WindowInfo](api/WindowInfo.md#windowinfo-class) class
- * [WindowUtils](api/WindowUtils.md#windowutils-class) class
-
-
-#### Client handlers (interfaces)
-
- * [DisplayHandler](api/DisplayHandler.md#displayhandler-interface)
- * [DownloadHandler](api/DownloadHandler.md#downloadhandler)
- * [FocusHandler](api/FocusHandler.md#focushandler-interface)
- * [JavascriptDialogHandler](api/JavascriptDialogHandler.md#javascriptdialoghandler-interface)
- * [KeyboardHandler](api/KeyboardHandler.md#keyboardhandler-interface)
- * [LifespanHandler](api/LifespanHandler.md#lifespanhandler-interface)
- * [LoadHandler](api/LoadHandler.md#loadhandler-interface)
- * [RenderHandler](api/RenderHandler.md#renderhandler-interface)
- * [RequestHandler](api/RequestHandler.md#requesthandler-interface)
- * [ResourceHandler](api/ResourceHandler.md#resourcehandler-interface)
- * [V8ContextHandler](api/V8ContextHandler.md#v8contexthandler-interface)
-
-
-#### Other interfaces
-
- * [CookieVisitor](api/CookieVisitor.md#cookievisitor-interface) interface
- * [StringVisitor](api/StringVisitor.md#stringvisitor-interface) interface
- * [WebRequestClient](api/WebRequestClient.md#webrequestclient-interface) interface
-
+#### Modules
+
+ * [cefpython](api/cefpython.md#cefpython) module
+
+
+#### Settings
+
+ * [ApplicationSettings](api/ApplicationSettings.md#application-settings) dictionary
+ * [BrowserSettings](api/BrowserSettings.md#browser-settings) dictionary
+ * [CommandLineSwitches](api/CommandLineSwitches.md#command-line-switches) dictionary
+
+
+#### Classes and objects
+
+ * [Browser](api/Browser.md#browser-object) object
+ * [Callback](api/Callback.md#callback-object) object
+ * [Cookie](api/Cookie.md#cookie-class) class
+ * [CookieManager](api/CookieManager.md#cookiemanager-class) class
+ * [DpiAware](api/DpiAware.md#dpiaware-class) class (Win)
+ * [DragData](api/DragData.md#dragdata-object) object
+ * [Frame](api/Frame.md#frame-object) object
+ * [Image](api/Image.md#image-object) object
+ * [JavascriptBindings](api/JavascriptBindings.md#javascriptbindings-class) class
+ * [JavascriptCallback](api/JavascriptCallback.md#javascriptcallback-object) object
+ * [PaintBuffer](api/PaintBuffer.md#paintbuffer-object) object
+ * [Request](api/Request.md#request-class) class
+ * [Response](api/Response.md#response-object) object
+ * [WebPluginInfo](api/WebPluginInfo.md#webplugininfo-object) object
+ * [WebRequest](api/WebRequest.md#webrequest-class) class
+ * [WindowInfo](api/WindowInfo.md#windowinfo-class) class
+ * [WindowUtils](api/WindowUtils.md#windowutils-class) class
+
+
+#### Client handlers (interfaces)
+
+ * [DisplayHandler](api/DisplayHandler.md#displayhandler-interface)
+ * [DownloadHandler](api/DownloadHandler.md#downloadhandler)
+ * [FocusHandler](api/FocusHandler.md#focushandler-interface)
+ * [JavascriptDialogHandler](api/JavascriptDialogHandler.md#javascriptdialoghandler-interface)
+ * [KeyboardHandler](api/KeyboardHandler.md#keyboardhandler-interface)
+ * [LifespanHandler](api/LifespanHandler.md#lifespanhandler-interface)
+ * [LoadHandler](api/LoadHandler.md#loadhandler-interface)
+ * [RenderHandler](api/RenderHandler.md#renderhandler-interface)
+ * [RequestHandler](api/RequestHandler.md#requesthandler-interface)
+ * [ResourceHandler](api/ResourceHandler.md#resourcehandler-interface)
+ * [V8ContextHandler](api/V8ContextHandler.md#v8contexthandler-interface)
+
+
+#### Other interfaces
+
+ * [CookieVisitor](api/CookieVisitor.md#cookievisitor-interface) interface
+ * [StringVisitor](api/StringVisitor.md#stringvisitor-interface) interface
+ * [WebRequestClient](api/WebRequestClient.md#webrequestclient-interface) interface
+
 
 ### API index
 
@@ -524,6 +524,7 @@ Additional information for v31.2 release:
   * [GetSystemDpi](api/DpiAware.md#getsystemdpi)
   * [IsProcessDpiAware](api/DpiAware.md#isprocessdpiaware)
   * [SetProcessDpiAware](api/DpiAware.md#setprocessdpiaware)
+  * [Scale](api/DpiAware.md#scale)
 * [DragData (object)](api/DragData.md#dragdata-object)
   * [IsLink](api/DragData.md#islink)
   * [IsFragment](api/DragData.md#isfragment)
diff --git a/api/API-index.md b/api/API-index.md
index a6f81ba0..74971115 100644
--- a/api/API-index.md
+++ b/api/API-index.md
@@ -213,6 +213,7 @@
   * [GetSystemDpi](DpiAware.md#getsystemdpi)
   * [IsProcessDpiAware](DpiAware.md#isprocessdpiaware)
   * [SetProcessDpiAware](DpiAware.md#setprocessdpiaware)
+  * [Scale](DpiAware.md#scale)
 * [DragData (object)](DragData.md#dragdata-object)
   * [IsLink](DragData.md#islink)
   * [IsFragment](DragData.md#isfragment)
diff --git a/api/DpiAware.md b/api/DpiAware.md
index a86d85d3..5a335b21 100644
--- a/api/DpiAware.md
+++ b/api/DpiAware.md
@@ -16,6 +16,7 @@ Table of contents:
   * [GetSystemDpi](#getsystemdpi)
   * [IsProcessDpiAware](#isprocessdpiaware)
   * [SetProcessDpiAware](#setprocessdpiaware)
+  * [Scale](#scale)
 
 
 
@@ -37,13 +38,13 @@ Enabling High DPI support in app can be done by embedding a DPI awareness xml ma
 | height | int |
 | __Return__ | tuple |
 
+Deprecated. Use `Scale()` method instead which can handle
+non standard DPI settings such as '132%' on Windows 10.
+
 This utility function will adjust width/height using
 OS DPI settings. For 800/600 with Win7 DPI settings
 being set to "Larger 150%" will return 1200/900.
 
-Calculation for DPI < 96 is not yet supported. Use
-the `GetSystemDpi` method for that.
-
 
 ### EnableHighDpiSupport
 
@@ -68,20 +69,29 @@ Description from upstream CEF:
 
 Returns tuple(int dpix, int dpiy).
 
+Returns Windows DPI settings ("Custom scaling" on Win10).
+
 Win7 DPI (Control Panel > Appearance and Personalization > Display):
 
   * text size Larger 150% => dpix/dpiy 144
   * text size Medium 125% => dpix/dpiy 120
   * text size Smaller 100% => dpix/dpiy 96
 
-Example zoom levels based on DPI. For use with the ApplicationSettings.`auto_zooming` option.
+Example zoom levels based on DPI. For use with the
+ApplicationSettings.`auto_zooming` option.
 
   * dpix=96 zoomlevel=0.0
   * dpix=120 zoomlevel=1.0
   * dpix=144 zoomlevel=2.0
   * dpix=72 zoomlevel=-1.0
 
-If DPI awareness wasn't yet enabled, then `GetSystemDpi` will always return a default 96 DPI.
+If DPI awareness wasn't yet enabled, then `GetSystemDpi` will always
+return a default 96 DPI.
+
+DPI settings should not be cached. When `SetProcessDpiAware`
+is not yet called, then OS returns 96 DPI, even though it
+is set to 144 DPI. After DPI Awareness is enabled for the
+running process it will return the correct 144 DPI.
 
 
 ### IsProcessDpiAware
@@ -106,3 +116,13 @@ See [Issue #358](../../../issues/358) for how the behavior changed in
 latest CEF. This method now internally calls `EnableHighDpiSupport()`.
 
 Enables DPI awareness for the running process. Embedding a DPI manifest in .exe is the prefered way, as it gives more reliable results, otherwise some display bugs may appear (discussed in the "Introduction" section on this page).
+
+
+### Scale
+
+| Parameter | Type |
+| --- | --- |
+| size | int/tuple/list |
+| __Return__ | tuple |
+
+Scale units for high DPI devices.
diff --git a/examples/tkinter_.py b/examples/tkinter_.py
index 024e0feb..e3d01c9e 100644
--- a/examples/tkinter_.py
+++ b/examples/tkinter_.py
@@ -67,7 +67,7 @@ def __init__(self, root):
         self.navigation_bar = None
 
         # Root
-        root.geometry("800x600")
+        root.geometry("900x640")
         tk.Grid.rowconfigure(root, 0, weight=1)
         tk.Grid.columnconfigure(root, 0, weight=1)
 
diff --git a/examples/wxpython.py b/examples/wxpython.py
index 91adea2d..1f63ab97 100644
--- a/examples/wxpython.py
+++ b/examples/wxpython.py
@@ -33,8 +33,8 @@
         sys.exit(1)
 
 # Configuration
-WIDTH = 800
-HEIGHT = 600
+WIDTH = 900
+HEIGHT = 640
 
 # Globals
 g_count_windows = 0
@@ -71,11 +71,26 @@ def check_versions():
     assert cef.__version__ >= "55.3", "CEF Python v55.3+ required to run this"
 
 
+def scale_window_size_for_high_dpi(width, height):
+    """Scale window size for high DPI devices. This func can be
+    called on all operating systems, but scales only for Windows.
+    If scaled value is bigger than the work area on the display
+    then it will be reduced."""
+    if not WINDOWS:
+        return width, height
+    (_, _, max_width, max_height) = wx.GetClientDisplayRect().Get()
+    # noinspection PyUnresolvedReferences, PyArgumentList
+    (width, height) = cef.DpiAware.Scale((width, height))
+    if width > max_width:
+        width = max_width
+    if height > max_height:
+        height = max_height
+    return width, height
+
+
 class MainFrame(wx.Frame):
 
     def __init__(self):
-        wx.Frame.__init__(self, parent=None, id=wx.ID_ANY,
-                          title='wxPython example', size=(WIDTH, HEIGHT))
         self.browser = None
 
         # Must ignore X11 errors like 'BadWindow' and others by
@@ -87,6 +102,22 @@ def __init__(self):
         global g_count_windows
         g_count_windows += 1
 
+        # noinspection PyUnresolvedReferences, PyArgumentList
+        print("[wxpython.py] System DPI settings: %s"
+              % str(cef.DpiAware.GetSystemDpi()))
+        print("[wxpython.py] wx.GetDisplayPPI = %s" % wx.GetDisplayPPI())
+        print("[wxpython.py] wx.GetDisplaySize = %s" % wx.GetDisplaySize())
+
+        print("[wxpython.py] MainFrame declared size: %s" % str((WIDTH, HEIGHT)))
+        size = scale_window_size_for_high_dpi(WIDTH, HEIGHT)
+        print("[wxpython.py] MainFrame DPI scaled size: %s" % str(size))
+
+        wx.Frame.__init__(self, parent=None, id=wx.ID_ANY,
+                          title='wxPython example', size=size)
+        # wxPython will set a smaller size when it is bigger
+        # than desktop size.
+        print("[wxpython.py] MainFrame actual size: %s" % self.GetSize())
+
         self.setup_icon()
         self.create_menu()
         self.Bind(wx.EVT_CLOSE, self.OnClose)
diff --git a/src/dpi_aware_win.pyx b/src/dpi_aware_win.pyx
index 4a02184c..b6ed169c 100644
--- a/src/dpi_aware_win.pyx
+++ b/src/dpi_aware_win.pyx
@@ -8,28 +8,51 @@ class DpiAware:
 
     @staticmethod
     def GetSystemDpi():
-        # Win7 DPI (Control Panel > Appearance and Personalization > Display):
-        # text size Larger 150% => dpix/dpiy 144
-        # text size Medium 125% => dpix/dpiy 120
-        # text size Smaller 100% => dpix/dpiy 96
-        #
-        # dpix=96 zoomlevel=0.0
-        # dpix=120 zoomlevel=1.0
-        # dpix=144 zoomlevel=2.0
-        # dpix=72 zoomlevel=-1.0
-        #
-        # If DPI awareness wasn't yet enabled, then GetSystemDpi
-        # will always return a default 96 DPI.
+        """Returns Windows DPI settings ("Custom scaling" on Win10).
+
+        Win7 DPI (Control Panel > Appearance and Personalization > Display):
+        text size Larger 150% => dpix/dpiy 144
+        text size Medium 125% => dpix/dpiy 120
+        text size Smaller 100% => dpix/dpiy 96
+
+        DPI settings should not be cached. When SetProcessDpiAware
+        is not yet called, then OS returns 96 DPI, even though it
+        is set to 144 DPI. After DPI Awareness is enabled for the
+        running process it will return the correct 144 DPI.
+        """
         cdef int dpix = 0
         cdef int dpiy = 0
         GetSystemDpi(&dpix, &dpiy)
-        return tuple(dpix, dpiy)
+        return dpix, dpiy
 
     @staticmethod
     def CalculateWindowSize(int width, int height):
+        """@DEPRECATED. Use Scale() method instead."""
         # Calculation for DPI < 96 is not yet supported.
         GetDpiAwareWindowSize(&width, &height)
-        return tuple(width, height)
+        return width, height
+
+    @staticmethod
+    def Scale(arg):
+        """Scale units for high DPI devices. Argument can be an int,
+        tuple or list."""
+        (dpix, dpiy) = DpiAware.GetSystemDpi()
+        # - Using only "dpix" value to calculate zoom level since all
+        #   modern displays have equal horizontal and vertical resolution.
+        default_dpix = 96
+        scale = MulDiv(dpix, 100, default_dpix)
+        if isinstance(arg, (int, long)):
+            v = arg
+            new_value = MulDiv(v, scale, 100)
+            return new_value
+        ret_tuple = isinstance(arg, tuple)
+        ret = list()
+        for i,v in enumerate(arg):
+            v = int(v)
+            ret.append(MulDiv(v, scale, 100))
+        if ret_tuple:
+            return tuple(ret)
+        return ret
 
     @staticmethod
     def IsProcessDpiAware():
diff --git a/src/extern/dpi_aware_win.pxd b/src/extern/dpi_aware_win.pxd
index 3842062a..fd9a3cbe 100644
--- a/src/extern/dpi_aware_win.pxd
+++ b/src/extern/dpi_aware_win.pxd
@@ -9,4 +9,3 @@ cdef extern from "client_handler/dpi_aware.h":
     cdef void GetDpiAwareWindowSize(int* width, int* height)
     cdef void SetProcessDpiAware()
     cdef cpp_bool IsProcessDpiAware()
-
diff --git a/src/extern/windows.pxd b/src/extern/windows.pxd
index b6e1c772..5e329b2a 100644
--- a/src/extern/windows.pxd
+++ b/src/extern/windows.pxd
@@ -128,3 +128,5 @@ cdef extern from "Windows.h" nogil:
     cdef int ICON_SMALL
     cdef HWND GetParent(HWND hwnd)
 
+    cdef int MulDiv(int number, int numerator, int denominator)
+

From c0a80111655e05864f8fb441efee01bfc751f039 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Thu, 16 Aug 2018 17:37:40 +0200
Subject: [PATCH 103/238] Expose DragData image APIs on all platforms (#251)

---
 api/Browser.md    |  2 +-
 src/cefpython.pyx |  6 +-----
 src/drag_data.pyx | 30 +++++++++++++-----------------
 3 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/api/Browser.md b/api/Browser.md
index 47b3752b..768adeca 100644
--- a/api/Browser.md
+++ b/api/Browser.md
@@ -427,7 +427,7 @@ Returns the names of all existing frames. This list does not include the main fr
 | --- | --- |
 | __Return__ | tuple(bytes buffer, int width, int height) |
 
-Currently works only on Linux (Issue [#427](../../../issues/427)).
+Currently available only on Linux (Issue [#427](../../../issues/427)).
 
 Get browser contents as image. Only screen visible contents are returned.
 
diff --git a/src/cefpython.pyx b/src/cefpython.pyx
index 493a53d9..2ed752c5 100644
--- a/src/cefpython.pyx
+++ b/src/cefpython.pyx
@@ -368,11 +368,7 @@ include "command_line.pyx"
 include "app.pyx"
 include "drag_data.pyx"
 include "helpers.pyx"
-
-# Currently used only on Linux via DragData. Do not include on other
-# platforms otherwise warning about unused function appears.
-IF UNAME_SYSNAME == "Linux":
-    include "image.pyx"
+include "image.pyx"
 
 # Handlers
 include "handlers/browser_process_handler.pyx"
diff --git a/src/drag_data.pyx b/src/drag_data.pyx
index ddb7d9f9..5da99a6f 100644
--- a/src/drag_data.pyx
+++ b/src/drag_data.pyx
@@ -36,20 +36,16 @@ cdef class DragData:
     cpdef py_string GetFragmentHtml(self):
         return CefToPyString(self.cef_drag_data.get().GetFragmentHtml())
 
-    IF UNAME_SYSNAME == "Linux":
-
-        cpdef PyImage GetImage(self):
-            cdef CefRefPtr[CefImage] cef_image =\
-                    self.cef_drag_data.get().GetImage()
-            if not cef_image.get():
-                raise Exception("Image is not available")
-            return PyImage_Init(cef_image)
-
-        cpdef tuple GetImageHotspot(self):
-            cdef CefPoint point = self.cef_drag_data.get().GetImageHotspot()
-            return (point.x, point.y)
-
-        cpdef py_bool HasImage(self):
-            return self.cef_drag_data.get().HasImage()
-
-    # END IF UNAME_SYSNAME == "Linux":
+    cpdef PyImage GetImage(self):
+        cdef CefRefPtr[CefImage] cef_image =\
+                self.cef_drag_data.get().GetImage()
+        if not cef_image.get():
+            raise Exception("Image is not available")
+        return PyImage_Init(cef_image)
+
+    cpdef tuple GetImageHotspot(self):
+        cdef CefPoint point = self.cef_drag_data.get().GetImageHotspot()
+        return point.x, point.y
+
+    cpdef py_bool HasImage(self):
+        return self.cef_drag_data.get().HasImage()

From 8ade567bcc992b909747cc1e9c7c346a39d6dee4 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Thu, 16 Aug 2018 17:54:09 +0200
Subject: [PATCH 104/238] Do not auto run tkinter_.py example on Windows with
 Python 2.7 (#441)

---
 tools/run_examples.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/run_examples.py b/tools/run_examples.py
index 5ec43fcb..a3a4ce84 100644
--- a/tools/run_examples.py
+++ b/tools/run_examples.py
@@ -103,6 +103,9 @@ def main():
         # This example often crashes on Mac (Issue #309)
         print("[run_examples.py] PASS: tkinter_.py (Issue #309)")
         passed.append("tkinter_.py (Issue #309)")
+    elif WINDOWS and sys.version_info.major == 2:
+        print("[run_examples.py] PASS: tkinter_.py (Issue #441)")
+        passed.append("tkinter_.py (Issue #441)")
     elif packages["tkinter"] or packages["Tkinter"]:
         examples.append("tkinter_.py")
     else:

From 84502b5881639215669d729f1116e1d8c0015fe2 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Thu, 16 Aug 2018 18:00:57 +0200
Subject: [PATCH 105/238] Fix wxpython.py example on non-Windows platforms

---
 examples/wxpython.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/examples/wxpython.py b/examples/wxpython.py
index 1f63ab97..50f585fb 100644
--- a/examples/wxpython.py
+++ b/examples/wxpython.py
@@ -103,8 +103,9 @@ def __init__(self):
         g_count_windows += 1
 
         # noinspection PyUnresolvedReferences, PyArgumentList
-        print("[wxpython.py] System DPI settings: %s"
-              % str(cef.DpiAware.GetSystemDpi()))
+        if WINDOWS:
+            print("[wxpython.py] System DPI settings: %s"
+                  % str(cef.DpiAware.GetSystemDpi()))
         print("[wxpython.py] wx.GetDisplayPPI = %s" % wx.GetDisplayPPI())
         print("[wxpython.py] wx.GetDisplaySize = %s" % wx.GetDisplaySize())
 

From a1c1981c296dcdc972b7e988e521b3a860949d21 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Thu, 16 Aug 2018 21:44:19 +0200
Subject: [PATCH 106/238] Fix wxpython.py example on Linux with wxPython 2.8

---
 examples/wxpython.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/examples/wxpython.py b/examples/wxpython.py
index 50f585fb..71ab0372 100644
--- a/examples/wxpython.py
+++ b/examples/wxpython.py
@@ -106,7 +106,8 @@ def __init__(self):
         if WINDOWS:
             print("[wxpython.py] System DPI settings: %s"
                   % str(cef.DpiAware.GetSystemDpi()))
-        print("[wxpython.py] wx.GetDisplayPPI = %s" % wx.GetDisplayPPI())
+        if hasattr(wx, "GetDisplayPPI"):
+            print("[wxpython.py] wx.GetDisplayPPI = %s" % wx.GetDisplayPPI())
         print("[wxpython.py] wx.GetDisplaySize = %s" % wx.GetDisplaySize())
 
         print("[wxpython.py] MainFrame declared size: %s" % str((WIDTH, HEIGHT)))

From 89587eb052820959b40c4a7bcfd7d059c2180e06 Mon Sep 17 00:00:00 2001
From: Elliot Woods <elliot@kimchiandchips.com>
Date: Fri, 17 Aug 2018 11:36:19 +0900
Subject: [PATCH 107/238] Update README-examples.md

add mention of method for passing exceptions from python to js
---
 examples/README-examples.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/examples/README-examples.md b/examples/README-examples.md
index 8517e4ef..2135cea6 100644
--- a/examples/README-examples.md
+++ b/examples/README-examples.md
@@ -90,6 +90,7 @@ yet ported to latest CEF. Some of them are externally maintained.
   example in the cefpython31 branch.
 - Example of using Python network library (urllib3/openssl) instead of Chromium's
   network library - see [gist by Massimiliano Dal Cero](https://gist.github.com/yattamax/0252a3c5dc54a2f81650d5c0eafabf99)
+- Example of passing exceptions from Python to Javascript and using await syntax to receive values from python return values - see [Managed python calls example by Elliot Woods)(https://github.com/elliotwoods/cefpython-tests/tree/0180b22eac10a1bde08820ca192fdc30eb93f00d/6.%20Managed%20python%20calls)
 
 ## More examples to come
 

From 6a5b683bd697bd4d61787df10de1e5abb634fd4d Mon Sep 17 00:00:00 2001
From: Czarek Tomczak <cztomczak@users.noreply.github.com>
Date: Fri, 17 Aug 2018 10:42:58 +0200
Subject: [PATCH 108/238] Update README-examples.md

Fix link
---
 examples/README-examples.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/README-examples.md b/examples/README-examples.md
index 2135cea6..179b0d69 100644
--- a/examples/README-examples.md
+++ b/examples/README-examples.md
@@ -90,7 +90,7 @@ yet ported to latest CEF. Some of them are externally maintained.
   example in the cefpython31 branch.
 - Example of using Python network library (urllib3/openssl) instead of Chromium's
   network library - see [gist by Massimiliano Dal Cero](https://gist.github.com/yattamax/0252a3c5dc54a2f81650d5c0eafabf99)
-- Example of passing exceptions from Python to Javascript and using await syntax to receive values from python return values - see [Managed python calls example by Elliot Woods)(https://github.com/elliotwoods/cefpython-tests/tree/0180b22eac10a1bde08820ca192fdc30eb93f00d/6.%20Managed%20python%20calls)
+- Example of passing exceptions from Python to Javascript and using await syntax to receive values from python return values - see [Managed python calls example by Elliot Woods](https://github.com/elliotwoods/cefpython-tests/tree/0180b22eac10a1bde08820ca192fdc30eb93f00d/6.%20Managed%20python%20calls)
 
 ## More examples to come
 

From f64dff531bf389d21a5215c3bbd10ddbbe9b84c1 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Fri, 17 Aug 2018 14:18:32 +0200
Subject: [PATCH 109/238] Update README-examples.md and wxpython.py example

---
 examples/README-examples.md | 5 ++---
 examples/wxpython.py        | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/examples/README-examples.md b/examples/README-examples.md
index 8517e4ef..f1477878 100644
--- a/examples/README-examples.md
+++ b/examples/README-examples.md
@@ -37,7 +37,6 @@ workarounds.
   discussed in great details in Tutorial in the [Off-screen rendering](../docs/Tutorial.md#off-screen-rendering)
   section.
 
-
 **Embedding using various GUI frameworks**
 
 - [gtk2.py](gtk2.py): example for [PyGTK](http://www.pygtk.org/)
@@ -55,14 +54,14 @@ workarounds.
 - [tkinter_.py](tkinter_.py): example for [Tkinter](https://wiki.python.org/moin/TkInter).
   Currently broken on Mac ([#309](../../../issues/309)).
 - [wxpython.py](wxpython.py): example for [wxPython](https://wxpython.org/)
-  toolkit
+  toolkit. This example implements High DPI support on Windows.
 
 
 **Build executable using Python packagers**
 
 - [PyInstaller example](pyinstaller/README-pyinstaller.md):
   example of packaging app using [PyInstaller](http://www.pyinstaller.org/)
-  packager
+  packager (currently example supports only Windows platform)
 
 
 **Unit tests**
diff --git a/examples/wxpython.py b/examples/wxpython.py
index 71ab0372..c42d3fe7 100644
--- a/examples/wxpython.py
+++ b/examples/wxpython.py
@@ -5,7 +5,7 @@
 # - wxPython 4.0 on Windows/Mac/Linux
 # - wxPython 3.0 on Windows/Mac
 # - wxPython 2.8 on Linux
-# - CEF Python v55.4+
+# - CEF Python v66.0+
 
 import wx
 from cefpython3 import cefpython as cef
@@ -68,7 +68,7 @@ def check_versions():
             ver=platform.python_version(), arch=platform.architecture()[0]))
     print("[wxpython.py] wxPython {ver}".format(ver=wx.version()))
     # CEF Python version requirement
-    assert cef.__version__ >= "55.3", "CEF Python v55.3+ required to run this"
+    assert cef.__version__ >= "66.0", "CEF Python v66.0+ required to run this"
 
 
 def scale_window_size_for_high_dpi(width, height):

From cf0761e9fc8cfa16c1184c61ff07347177874297 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Fri, 17 Aug 2018 14:41:50 +0200
Subject: [PATCH 110/238] Fix style issues in wxpython.py

---
 examples/wxpython.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/examples/wxpython.py b/examples/wxpython.py
index c42d3fe7..915f7dff 100644
--- a/examples/wxpython.py
+++ b/examples/wxpython.py
@@ -102,15 +102,16 @@ def __init__(self):
         global g_count_windows
         g_count_windows += 1
 
-        # noinspection PyUnresolvedReferences, PyArgumentList
         if WINDOWS:
+            # noinspection PyUnresolvedReferences, PyArgumentList
             print("[wxpython.py] System DPI settings: %s"
                   % str(cef.DpiAware.GetSystemDpi()))
         if hasattr(wx, "GetDisplayPPI"):
             print("[wxpython.py] wx.GetDisplayPPI = %s" % wx.GetDisplayPPI())
         print("[wxpython.py] wx.GetDisplaySize = %s" % wx.GetDisplaySize())
 
-        print("[wxpython.py] MainFrame declared size: %s" % str((WIDTH, HEIGHT)))
+        print("[wxpython.py] MainFrame declared size: %s"
+              % str((WIDTH, HEIGHT)))
         size = scale_window_size_for_high_dpi(WIDTH, HEIGHT)
         print("[wxpython.py] MainFrame DPI scaled size: %s" % str(size))
 

From a010e6819e935888e6d70e3194544fb0f3c99f72 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Fri, 17 Aug 2018 17:40:46 +0200
Subject: [PATCH 111/238] Fix errors due to NULL frames sent from Renderer
 process (#431).

Remove Python callback references properly.

Fix PyCharm code inspection warnings in main_test.py.
---
 src/client_handler/client_handler.cpp | 33 +++++++++--------
 src/frame.pyx                         |  3 ++
 src/handlers/v8context_handler.pyx    | 15 ++++----
 src/handlers/v8function_handler.pyx   | 52 ++++++++++++++-------------
 src/python_callback.pyx               | 40 ++++++++++-----------
 src/subprocess/cefpython_app.cpp      | 11 ++----
 unittests/main_test.py                |  6 +++-
 7 files changed, 81 insertions(+), 79 deletions(-)

diff --git a/src/client_handler/client_handler.cpp b/src/client_handler/client_handler.cpp
index f55da812..daf9a4e5 100644
--- a/src/client_handler/client_handler.cpp
+++ b/src/client_handler/client_handler.cpp
@@ -30,6 +30,7 @@ bool ClientHandler::OnProcessMessageReceived(
                                         CefProcessId source_process,
                                         CefRefPtr<CefProcessMessage> message)
 {
+    // Return true if message was handled.
     if (source_process != PID_RENDERER) {
         return false;
     }
@@ -42,6 +43,12 @@ bool ClientHandler::OnProcessMessageReceived(
         if (arguments->GetSize() == 1 && arguments->GetType(0) == VTYPE_INT) {
             int64 frameId = arguments->GetInt(0);
             CefRefPtr<CefFrame> frame = browser->GetFrame(frameId);
+            if (!frame.get()) {
+                // Frame was already destroyed while IPC messaging was
+                // executing. Issue #431. User callback will not be
+                // executed in such case.
+                return true;
+            }
             V8ContextHandler_OnContextCreated(browser, frame);
             return true;
         } else {
@@ -56,6 +63,11 @@ bool ClientHandler::OnProcessMessageReceived(
                 && arguments->GetType(1) == VTYPE_INT) {
             int browserId = arguments->GetInt(0);
             int64 frameId = arguments->GetInt(1);
+            // Even if frame was alrady destroyed (Issue #431) you still
+            // want to call V8ContextHandler_OnContextReleased as it releases
+            // some resources. Thus passing IDs instead of actual
+            // objects. Cython code in V8ContextHandler_OnContextReleased
+            // will handle a case when frame is already destroyed.
             V8ContextHandler_OnContextReleased(browserId, frameId);
             return true;
         } else {
@@ -75,8 +87,13 @@ bool ClientHandler::OnProcessMessageReceived(
             int64 frameId = arguments->GetInt(0);
             CefString functionName = arguments->GetString(1);
             CefRefPtr<CefListValue> functionArguments = arguments->GetList(2);
-            CefRefPtr<CefFrame> frame = browser->GetFrame(frameId);
-            V8FunctionHandler_Execute(browser, frame, functionName,
+            // Even if frame was already destroyed (Issue #431) you still
+            // want to call V8FunctionHandler_Execute, as it can run
+            // Python code without issues and doesn't require an actual
+            // frame. Thus passing IDs instead of actual objects. Cython
+            // code in V8FunctionHandler_Execute will handle a case when
+            // frame is already destroyed.
+            V8FunctionHandler_Execute(browser, frameId, functionName,
                                       functionArguments);
             return true;
         } else {
@@ -100,18 +117,6 @@ bool ClientHandler::OnProcessMessageReceived(
                           " messageName=ExecutePythonCallback";
             return false;
         }
-    } else if (messageName == "RemovePythonCallbacksForFrame") {
-        CefRefPtr<CefListValue> arguments = message->GetArgumentList();
-        if (arguments->GetSize() == 1 && arguments->GetType(0) == VTYPE_INT) {
-            int frameId = arguments->GetInt(0);
-            RemovePythonCallbacksForFrame(frameId);
-            return true;
-        } else {
-            LOG(ERROR) << "[Browser process] OnProcessMessageReceived():"
-                          " invalid arguments,"
-                          " messageName=ExecutePythonCallback";
-            return false;
-        }
     }
     return false;
 }
diff --git a/src/frame.pyx b/src/frame.pyx
index 6ff7873c..ec3ef8bc 100644
--- a/src/frame.pyx
+++ b/src/frame.pyx
@@ -93,6 +93,7 @@ cdef void RemovePyFrame(int browserId, object frameId) except *:
         del pyFrame
         del g_pyFrames[uniqueFrameId]
         g_unreferenced_frames.append(uniqueFrameId)
+        RemovePythonCallbacksForFrame(frameId)
     else:
         Debug("RemovePyFrame() FAILED: uniqueFrameId = %s" % uniqueFrameId)
 
@@ -112,6 +113,8 @@ cdef void RemovePyFramesForBrowser(int browserId) except *:
         del pyFrame
         del g_pyFrames[uniqueFrameId]
         g_unreferenced_frames.append(uniqueFrameId)
+    # RemovePythonCallbacksForBrowser already called
+    # in LifespanHandler_OnBeforeClose.
 
 cdef class PyFrame:
     cdef CefRefPtr[CefFrame] cefFrame
diff --git a/src/handlers/v8context_handler.pyx b/src/handlers/v8context_handler.pyx
index 704f6ad9..fccdad56 100644
--- a/src/handlers/v8context_handler.pyx
+++ b/src/handlers/v8context_handler.pyx
@@ -10,6 +10,7 @@
 
 include "../cefpython.pyx"
 include "../browser.pyx"
+include "../frame.pyx"
 
 cdef public void V8ContextHandler_OnContextCreated(
         CefRefPtr[CefBrowser] cefBrowser,
@@ -23,7 +24,7 @@ cdef public void V8ContextHandler_OnContextCreated(
         pyBrowser = GetPyBrowser(cefBrowser, "OnContextCreated")
         pyBrowser.SetUserData("__v8ContextCreated", True)
         pyFrame = GetPyFrame(cefFrame)
-        # User defined callback.
+        # User defined callback
         clientCallback = pyBrowser.GetClientCallback("OnContextCreated")
         if clientCallback:
             clientCallback(browser=pyBrowser, frame=pyFrame)
@@ -52,19 +53,15 @@ cdef public void V8ContextHandler_OnContextReleased(
         if not pyBrowser:
             Debug("OnContextReleased: Browser doesn't exist anymore, id={id}"
                   .format(id=str(browserId)))
+            RemovePyFrame(browserId, frameId)
             return
         pyFrame = GetPyFrameById(browserId, frameId)
-        if pyBrowser and pyFrame:
+        # Frame may already be destroyed while IPC messaging was executing
+        # (Issue #431).
+        if pyFrame:
             clientCallback = pyBrowser.GetClientCallback("OnContextReleased")
             if clientCallback:
                 clientCallback(browser=pyBrowser, frame=pyFrame)
-        else:
-            if not pyBrowser:
-                Debug("V8ContextHandler_OnContextReleased() WARNING: "
-                        "PyBrowser not found")
-            if not pyFrame:
-                Debug("V8ContextHandler_OnContextReleased() WARNING: "
-                        "PyFrame not found")
         RemovePyFrame(browserId, frameId)
     except:
         (exc_type, exc_value, exc_trace) = sys.exc_info()
diff --git a/src/handlers/v8function_handler.pyx b/src/handlers/v8function_handler.pyx
index 2c9b3f1c..ee73619f 100644
--- a/src/handlers/v8function_handler.pyx
+++ b/src/handlers/v8function_handler.pyx
@@ -4,46 +4,48 @@
 
 include "../cefpython.pyx"
 include "../browser.pyx"
+include "../frame.pyx"
 
 cdef public void V8FunctionHandler_Execute(
         CefRefPtr[CefBrowser] cefBrowser,
-        CefRefPtr[CefFrame] cefFrame,
-        CefString& cefFunctionName,
-        CefRefPtr[CefListValue] cefFunctionArguments
+        int64 frameId,
+        CefString& cefFuncName,
+        CefRefPtr[CefListValue] cefFuncArgs
         ) except * with gil:
     cdef PyBrowser pyBrowser
-    cdef PyFrame pyFrame
-    cdef py_string functionName
-    cdef object function
-    cdef list functionArguments
+    cdef CefRefPtr[CefFrame] cefFrame
+    cdef PyFrame pyFrame  # may be None
+    cdef py_string funcName
+    cdef object func
+    cdef list funcArgs
     cdef object returnValue
-    cdef py_string jsErrorMessage
+    cdef py_string errorMessage
     try:
         pyBrowser = GetPyBrowser(cefBrowser, "V8FunctionHandler_Execute")
-        pyFrame = GetPyFrame(cefFrame)
-        functionName = CefToPyString(cefFunctionName)
-        Debug("V8FunctionHandler_Execute(): functionName=%s" % functionName)
+        cefFrame = cefBrowser.get().GetFrame(frameId)
+        if cefFrame.get():
+            pyFrame = GetPyFrame(cefFrame)
+        else:
+            pyFrame = None
+        funcName = CefToPyString(cefFuncName)
+        Debug("V8FunctionHandler_Execute(): funcName=%s" % funcName)
         jsBindings = pyBrowser.GetJavascriptBindings()
-        function = jsBindings.GetFunctionOrMethod(functionName)
-        if not function:
+        func = jsBindings.GetFunctionOrMethod(funcName)
+        if not func:
             # The Renderer process already checks whether function
             # name is valid before calling V8FunctionHandler_Execute(),
             # but it is possible for the javascript bindings to change
             # during execution, so it's possible for the Browser/Renderer
             # bindings to be out of sync due to delay in process messaging.
-            jsErrorMessage = "V8FunctionHandler_Execute() FAILED: " \
-                    "python function not found: %s" % functionName
-            Debug(jsErrorMessage)
-            # Raise a javascript exception in that frame.
-            pyFrame.ExecuteJavascript("throw '%s';" % jsErrorMessage)
+            errorMessage = "V8FunctionHandler_Execute() FAILED: " \
+                           "python function not found: %s" % funcName
+            NonCriticalError(errorMessage)
+            # Raise a javascript exception in that frame if it still exists
+            if pyFrame:
+                pyFrame.ExecuteJavascript("throw '%s';" % errorMessage)
             return
-        functionArguments = CefListValueToPyList(cefBrowser, 
-                cefFunctionArguments)
-        returnValue = function(*functionArguments)
-        if returnValue is not None:
-            Debug("V8FunctionHandler_Execute() WARNING: function returned" \
-                    "value, but returning values to javascript is not " \
-                    "supported, functionName=%s" % functionName)
+        funcArgs = CefListValueToPyList(cefBrowser, cefFuncArgs)
+        func(*funcArgs)
     except:
         (exc_type, exc_value, exc_trace) = sys.exc_info()
         sys.excepthook(exc_type, exc_value, exc_trace)
diff --git a/src/python_callback.pyx b/src/python_callback.pyx
index 705e0f54..c76f7ce3 100644
--- a/src/python_callback.pyx
+++ b/src/python_callback.pyx
@@ -5,10 +5,12 @@
 include "cefpython.pyx"
 
 cdef int g_pythonCallbackMaxId = 0
+# [callbackId] = (browserId, frameId, func)
 cdef dict g_pythonCallbacks = {}
 
 # TODO: send callbackId using CefBinaryNamedValue, see:
-# http://www.magpcss.org/ceforum/viewtopic.php?f=6&t=10881
+#       http://www.magpcss.org/ceforum/viewtopic.php?f=6&t=10881
+
 cdef struct PythonCallback:
     int callbackId
     char uniqueCefBinaryValueSize[16]
@@ -16,7 +18,7 @@ cdef struct PythonCallback:
 cdef CefRefPtr[CefBinaryValue] PutPythonCallback(
         object browserId,
         object frameId, 
-        object function
+        object func
         ) except *:
     global g_pythonCallbacks
     global g_pythonCallbackMaxId
@@ -29,12 +31,11 @@ cdef CefRefPtr[CefBinaryValue] PutPythonCallback(
     pyCallback.callbackId = g_pythonCallbackMaxId
     cdef CefRefPtr[CefBinaryValue] binaryValue = CefBinaryValue_Create(
             &pyCallback, sizeof(pyCallback))
-    # [0] browserId, [1] frameId, [2] function.
-    g_pythonCallbacks[g_pythonCallbackMaxId] = (browserId, frameId, function)
+    g_pythonCallbacks[g_pythonCallbackMaxId] = (browserId, frameId, func)
     return binaryValue
 
 cdef public void RemovePythonCallbacksForFrame(
-        int frameId
+        object frameId
         ) except * with gil:
     # Cannot remove elements from g_pythonCallbacks (dict) while iterating.
     cdef list toRemove = []
@@ -46,8 +47,8 @@ cdef public void RemovePythonCallbacksForFrame(
         for callbackId in toRemove:
             del g_pythonCallbacks[callbackId]
             Debug("RemovePythonCallbacksForFrame(): " \
-                    "removed python callback, callbackId = %s" \
-                    % callbackId)
+                  "removed python callback, callbackId = %s" \
+                  % callbackId)
     except:
         (exc_type, exc_value, exc_trace) = sys.exc_info()
         sys.excepthook(exc_type, exc_value, exc_trace)
@@ -62,33 +63,28 @@ cdef void RemovePythonCallbacksForBrowser(
     for callbackId in toRemove:
         del g_pythonCallbacks[callbackId]
         Debug("RemovePythonCallbacksForBrowser(): " \
-                "removed python callback, callbackId = %s" \
-                % callbackId)
+              "removed python callback, callbackId = %s" \
+              % callbackId)
 
 cdef public cpp_bool ExecutePythonCallback(
         CefRefPtr[CefBrowser] cefBrowser,
         int callbackId, 
-        CefRefPtr[CefListValue] cefFunctionArguments,
+        CefRefPtr[CefListValue] cefFuncArgs,
         ) except * with gil:
-    cdef object function
-    cdef list functionArguments
+    cdef object func
+    cdef list funcArgs
     cdef object returnValue
     try:
         global g_pythonCallbacks
         if callbackId in g_pythonCallbacks:
-            # [0] browserId, [1] frameId, [2] function.
-            function = g_pythonCallbacks[callbackId][2]
-            functionArguments = CefListValueToPyList(
-                    cefBrowser, cefFunctionArguments)
-            returnValue = function(*functionArguments)
-            if returnValue is not None:
-                Debug("ExecutePythonCallback() WARNING: function returned" \
-                        "value, but returning values to javascript is not " \
-                        "supported, function name = %s" % function.__name__)
+            func = g_pythonCallbacks[callbackId][2]
+            funcArgs = CefListValueToPyList(
+                    cefBrowser, cefFuncArgs)
+            func(*funcArgs)
             return True
         else:
             Debug("ExecutePythonCallback() FAILED: callback not found, " \
-                    "callbackId = %s" % callbackId)
+                  "callbackId = %s" % callbackId)
             return False
     except:
         (exc_type, exc_value, exc_trace) = sys.exc_info()
diff --git a/src/subprocess/cefpython_app.cpp b/src/subprocess/cefpython_app.cpp
index a02a7cd5..786a919d 100644
--- a/src/subprocess/cefpython_app.cpp
+++ b/src/subprocess/cefpython_app.cpp
@@ -337,15 +337,10 @@ void CefPythonApp::OnContextReleased(CefRefPtr<CefBrowser> browser,
     // ------------------------------------------------------------------------
     // 2. Remove python callbacks for a frame.
     // ------------------------------------------------------------------------
-    // If this is the main frame then the message won't arrive
-    // to the browser process, as browser is being destroyed,
-    // but it doesn't matter because in LifespanHandler_BeforeClose()
+    // This is already done via RemovePyFrame called from
+    // V8ContextHandler_OnContextReleased.
+    // If this is the main frame then in LifespanHandler_BeforeClose()
     // we're calling RemovePythonCallbacksForBrowser().
-    message = CefProcessMessage::Create("RemovePythonCallbacksForFrame");
-    arguments = message->GetArgumentList();
-    // TODO: int64 precision lost
-    arguments->SetInt(0, (int)(frame->GetIdentifier()));
-    browser->SendProcessMessage(PID_BROWSER, message);
     // ------------------------------------------------------------------------
     // 3. Clear javascript callbacks.
     // ------------------------------------------------------------------------
diff --git a/unittests/main_test.py b/unittests/main_test.py
index 766e3552..b0d16f40 100644
--- a/unittests/main_test.py
+++ b/unittests/main_test.py
@@ -154,13 +154,15 @@ def test_main(self):
         # supports passing functions as callbacks when called from
         # javascript, and as a side effect any value and in this case
         # a property can also be a function.
-        bindings.SetProperty("test_property3_function", external.test_property3_function)
+        bindings.SetProperty("test_property3_function",
+                             external.test_property3_function)
         bindings.SetProperty("cefpython_version", cef.GetVersion())
         bindings.SetObject("external", external)
         browser.SetJavascriptBindings(bindings)
         subtest_message("browser.SetJavascriptBindings() ok")
 
         # Test Request.SetPostData(list)
+        # noinspection PyArgumentList
         req = cef.Request.CreateRequest()
         req_file = os.path.dirname(os.path.abspath(__file__))
         req_file = os.path.join(req_file, "main_test.py")
@@ -173,6 +175,7 @@ def test_main(self):
         subtest_message("cef.Request.SetPostData(list) ok")
 
         # Test Request.SetPostData(dict)
+        # noinspection PyArgumentList
         req = cef.Request.CreateRequest()
         req_data = {b"key": b"value"}
         req.SetMethod("POST")
@@ -199,6 +202,7 @@ def test_main(self):
             time.sleep(0.01)
 
         # Automatic check of asserts in handlers and in external
+        # noinspection PyTypeChecker
         for obj in [] + client_handlers + [global_handler, external]:
             test_for_True = False  # Test whether asserts are working correctly
             for key, value in obj.__dict__.items():

From 66107b258657c06e35319d14d1c860f1379b77a6 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Fri, 17 Aug 2018 18:02:05 +0200
Subject: [PATCH 112/238] Fix crash on exit when closing browser immediately
 (#454)

---
 src/browser.pyx | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/browser.pyx b/src/browser.pyx
index 87d8047b..f09c3a57 100644
--- a/src/browser.pyx
+++ b/src/browser.pyx
@@ -334,6 +334,17 @@ cdef class PyBrowser:
         # will be called.
         Debug("CefBrowser::CloseBrowser(%s)" % forceClose)
 
+        # Fix Issue #454 "Crash on exit when closing browser
+        #                 immediately during initial loading".
+        if not self.cefBrowser.get():
+            Debug("cefBrowser.get() failed in CloseBrowser")
+            return
+        # From testing it seems that only cefBrowser.get() can fail,
+        # however let's check the host as well just to be safe.
+        if not self.cefBrowser.get().GetHost().get():
+            Debug("cefBrowser.get().GetHost() failed in CloseBrowser")
+            return
+
         # Flush cookies to disk. Temporary solution for Issue #365.
         # A similar call is made in LifespanHandler_OnBeforeClose.
         # If using GetCookieManager to implement custom cookie managers

From a276fd8538e22fce329144f8d494f09ba45f4e86 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Fri, 17 Aug 2018 18:43:10 +0200
Subject: [PATCH 113/238] Add safety checks in request handler to possibly fix
 crash on exit (#455)

---
 src/browser.pyx                  | 14 +++++++
 src/handlers/request_handler.pyx | 63 ++++++++++++++++++++++++++++++--
 2 files changed, 74 insertions(+), 3 deletions(-)

diff --git a/src/browser.pyx b/src/browser.pyx
index f09c3a57..60194e54 100644
--- a/src/browser.pyx
+++ b/src/browser.pyx
@@ -33,6 +33,20 @@ cdef PyBrowser GetPyBrowserById(int browserId):
         return g_pyBrowsers[browserId]
     return None
 
+cdef py_bool IsBrowserClosed(CefRefPtr[CefBrowser] cefBrowser):
+    """Possibly fix Issue #455 by using this helper function to detect
+    if browser is closing/closed."""
+    # CefBrowser may sometimes be NULL e.g. Issue #429, Issue #454.
+    if not cefBrowser.get():
+        return True
+    if not cefBrowser.get().GetHost().get():
+        return True
+    cdef int browserId = cefBrowser.get().GetIdentifier()
+    if browserId in g_unreferenced_browsers \
+            or browserId in g_closed_browsers:
+        return True
+    return False
+
 cdef PyBrowser GetPyBrowser(CefRefPtr[CefBrowser] cefBrowser,
                                     callerIdStr="GetPyBrowser"):
     """The second argument 'callerIdStr' is so that a debug
diff --git a/src/handlers/request_handler.pyx b/src/handlers/request_handler.pyx
index 02bbc15d..d89c5a1b 100644
--- a/src/handlers/request_handler.pyx
+++ b/src/handlers/request_handler.pyx
@@ -68,6 +68,11 @@ cdef public cpp_bool RequestHandler_OnBeforeBrowse(
     cdef object clientCallback
     cdef py_bool returnValue
     try:
+        # Issue #455: CefRequestHandler callbacks still executed after
+        # browser was closed.
+        if IsBrowserClosed(cefBrowser):
+            return False
+
         pyBrowser = GetPyBrowser(cefBrowser, "OnBeforeBrowse")
         pyFrame = GetPyFrame(cefFrame)
         pyRequest = CreatePyRequest(cefRequest)
@@ -98,6 +103,11 @@ cdef public cpp_bool RequestHandler_OnBeforeResourceLoad(
     cdef object clientCallback
     cdef py_bool returnValue
     try:
+        # Issue #455: CefRequestHandler callbacks still executed after
+        # browser was closed.
+        if IsBrowserClosed(cefBrowser):
+            return False
+
         pyBrowser = GetPyBrowser(cefBrowser, "OnBeforeResourceLoad")
         pyFrame = GetPyFrame(cefFrame)
         pyRequest = CreatePyRequest(cefRequest)
@@ -126,6 +136,11 @@ cdef public CefRefPtr[CefResourceHandler] RequestHandler_GetResourceHandler(
     cdef object clientCallback
     cdef object returnValue
     try:
+        # Issue #455: CefRequestHandler callbacks still executed after
+        # browser was closed.
+        if IsBrowserClosed(cefBrowser):
+            return <CefRefPtr[CefResourceHandler]>NULL
+
         pyBrowser = GetPyBrowser(cefBrowser, "GetResourceHandler")
         pyFrame = GetPyFrame(cefFrame)
         pyRequest = CreatePyRequest(cefRequest)
@@ -162,6 +177,11 @@ cdef public void RequestHandler_OnResourceRedirect(
     cdef PyResponse pyResponse
     cdef object clientCallback
     try:
+        # Issue #455: CefRequestHandler callbacks still executed after
+        # browser was closed.
+        if IsBrowserClosed(cefBrowser):
+            return
+
         pyBrowser = GetPyBrowser(cefBrowser, "OnResourceRedirect")
         pyFrame = GetPyFrame(cefFrame)
         pyOldUrl = CefToPyString(cefOldUrl)
@@ -207,6 +227,11 @@ cdef public cpp_bool RequestHandler_GetAuthCredentials(
     cdef list pyPasswordOut
     cdef object clientCallback
     try:
+        # Issue #455: CefRequestHandler callbacks still executed after
+        # browser was closed.
+        if IsBrowserClosed(cefBrowser):
+            return False
+
         pyBrowser = GetPyBrowser(cefBrowser, "GetAuthCredentials")
         pyFrame = GetPyFrame(cefFrame)
         pyIsProxy = bool(cefIsProxy)
@@ -261,6 +286,11 @@ cdef public cpp_bool RequestHandler_OnQuotaRequest(
     cdef py_bool returnValue
     cdef object clientCallback
     try:
+        # Issue #455: CefRequestHandler callbacks still executed after
+        # browser was closed.
+        if IsBrowserClosed(cefBrowser):
+            return False
+
         pyBrowser = GetPyBrowser(cefBrowser, "OnQuotaRequest")
         pyOriginUrl = CefToPyString(cefOriginUrl)
         clientCallback = pyBrowser.GetClientCallback("OnQuotaRequest")
@@ -291,10 +321,16 @@ cdef public CefRefPtr[CefCookieManager] RequestHandler_GetCookieManager(
     cdef object clientCallback
     cdef PyCookieManager returnValue
     try:
+        # Issue #429: in some cases due to a race condition the browser
+        # may be NULL.
         if not cefBrowser.get():
-            # Bug: In some cases due to a race condition the browser
-            #      may be NULL. Issue #429.
             return <CefRefPtr[CefCookieManager]>NULL
+
+        # Issue #455: CefRequestHandler callbacks still executed after
+        # browser was closed.
+        if IsBrowserClosed(cefBrowser):
+            return <CefRefPtr[CefCookieManager]>NULL
+
         pyBrowser = GetPyBrowser(cefBrowser, "GetCookieManager")
         pyMainUrl = CefToPyString(cefMainUrl)
         clientCallback = pyBrowser.GetClientCallback("GetCookieManager")
@@ -325,6 +361,11 @@ cdef public void RequestHandler_OnProtocolExecution(
     cdef list pyAllowOSExecutionOut
     cdef object clientCallback
     try:
+        # Issue #455: CefRequestHandler callbacks still executed after
+        # browser was closed.
+        if IsBrowserClosed(cefBrowser):
+            return
+
         pyBrowser = GetPyBrowser(cefBrowser, "OnProtocolExecution")
         pyUrl = CefToPyString(cefUrl)
         pyAllowOSExecutionOut = [bool(cefAllowOSExecution)]
@@ -369,6 +410,12 @@ cdef public cpp_bool RequestHandler_OnBeforePluginLoad(
             Debug("WARNING: RequestHandler_OnBeforePluginLoad() failed,"
                   " Browser object is not available")
             return False
+
+        # Issue #455: CefRequestHandler callbacks still executed after
+        # browser was closed.
+        if IsBrowserClosed(browser):
+            return False
+
         py_browser = GetPyBrowser(browser, "OnBeforePluginLoad")
         py_plugin_info = CreatePyWebPluginInfo(plugin_info)
         clientCallback = GetGlobalClientCallback("OnBeforePluginLoad")
@@ -424,6 +471,11 @@ cdef public void RequestHandler_OnRendererProcessTerminated(
     cdef PyBrowser pyBrowser
     cdef object clientCallback
     try:
+        # Issue #455: CefRequestHandler callbacks still executed after
+        # browser was closed.
+        if IsBrowserClosed(cefBrowser):
+            return
+
         pyBrowser = GetPyBrowser(cefBrowser, "OnRendererProcessTerminated")
         clientCallback = pyBrowser.GetClientCallback(
                 "OnRendererProcessTerminated")
@@ -439,13 +491,18 @@ cdef public void RequestHandler_OnPluginCrashed(
         const CefString& cefPluginPath
         ) except * with gil:
     # TODO: plugin may crash during browser creation. Let this callback 
-    # to be set either through  cefpython.SetGlobalClientCallback() 
+    # to be set either through  cefpython.SetGlobalClientCallback()
     # or PyBrowser.SetClientCallback(). Modify the 
     # PyBrowser.GetClientCallback() implementation to return a global 
     # callback first if set.
     cdef PyBrowser pyBrowser
     cdef object clientCallback
     try:
+        # Issue #455: CefRequestHandler callbacks still executed after
+        # browser was closed.
+        if IsBrowserClosed(cefBrowser):
+            return
+
         pyBrowser = GetPyBrowser(cefBrowser, "OnPluginCrashed")
         clientCallback = pyBrowser.GetClientCallback("OnPluginCrashed")
         if clientCallback:

From cb9628bd755416013ab2f05eea048eb209f6f914 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Fri, 17 Aug 2018 18:49:09 +0200
Subject: [PATCH 114/238] Update run_examples.py (#452)

---
 tools/run_examples.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tools/run_examples.py b/tools/run_examples.py
index a3a4ce84..d78a1a47 100644
--- a/tools/run_examples.py
+++ b/tools/run_examples.py
@@ -78,7 +78,10 @@ def main():
         passed.append("gtk3.py")
 
     # pyqt4
-    if packages["PyQt4"]:
+    if LINUX:
+        print("[run_examples.py] PASS: qt.py pyqt4 (Issue #452)")
+        passed.append("qt.py pyqt4 (Issue #452)")
+    elif packages["PyQt4"]:
         examples.append("qt.py pyqt4")
     else:
         print("[run_examples.py] PASS: qt.py pyqt4 (PyQt4 not installed)")
@@ -92,7 +95,10 @@ def main():
         passed.append("qt.py pyqt5")
 
     # pyside
-    if packages["PySide"]:
+    if LINUX:
+        print("[run_examples.py] PASS: qt.py pyside (Issue #452)")
+        passed.append("qt.py pyside (Issue #452)")
+    elif packages["PySide"]:
         examples.append("qt.py pyside")
     else:
         print("[run_examples.py] PASS: qt.py pyside (PySide not installed)")

From e72609c2874e38bc58ba54bd114861bf32dab8ce Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Sat, 18 Aug 2018 14:46:21 +0200
Subject: [PATCH 115/238] Add accessibility support for both windowed and OSR
 modes (#449).

Add Browser.SetAccessibilityState.
Add AccessibilityHandler (OSR mode).

Add cef.SetGlobalClientHandler.
Add osr_test.py unittest for off-screen rendering mode (#59).
Refactor main_test.py.

Update tools/apidocs.py - generate TOCs by default
Update tools/build_distrib.py - run all unit tests
---
 README.md                                    | 114 +++++-----
 api/API-categories.md                        |   1 +
 api/API-index.md                             |   5 +
 api/AccessibilityHandler.md                  |  50 +++++
 api/Browser.md                               |  39 ++++
 api/cefpython.md                             |  21 +-
 src/browser.pyx                              |   4 +
 src/cef_types.pyx                            |   9 +
 src/cef_v59..v66_changes.txt                 |  15 +-
 src/cefpython.pyx                            |  24 ++-
 src/client_handler/Makefile                  |   2 +-
 src/client_handler/accessibility_handler.cpp |  19 ++
 src/client_handler/accessibility_handler.h   |  20 ++
 src/client_handler/render_handler.h          |   9 +-
 src/extern/cef/cef_browser.pxd               |   4 +-
 src/extern/cef/cef_values.pxd                |  13 ++
 src/handlers/accessibility_handler.pyx       |  34 +++
 src/process_message_utils.pyx                |  83 ++++++--
 tools/apidocs.py                             |  23 +-
 tools/build_distrib.py                       |   2 +-
 tools/common.py                              |   3 +-
 unittests/_common.py                         | 173 +++++++++++++++
 unittests/main_test.py                       | 183 +++-------------
 unittests/osr_test.py                        | 210 +++++++++++++++++++
 24 files changed, 816 insertions(+), 244 deletions(-)
 create mode 100644 api/AccessibilityHandler.md
 create mode 100644 src/cef_types.pyx
 create mode 100644 src/client_handler/accessibility_handler.cpp
 create mode 100644 src/client_handler/accessibility_handler.h
 create mode 100644 src/handlers/accessibility_handler.pyx
 create mode 100644 unittests/_common.py
 create mode 100644 unittests/osr_test.py

diff --git a/README.md b/README.md
index e2883112..3b9f1a21 100644
--- a/README.md
+++ b/README.md
@@ -256,63 +256,67 @@ Additional information for v31.2 release:
 
 ### API categories
 
-#### Modules
-
- * [cefpython](api/cefpython.md#cefpython) module
-
-
-#### Settings
-
- * [ApplicationSettings](api/ApplicationSettings.md#application-settings) dictionary
- * [BrowserSettings](api/BrowserSettings.md#browser-settings) dictionary
- * [CommandLineSwitches](api/CommandLineSwitches.md#command-line-switches) dictionary
-
-
-#### Classes and objects
-
- * [Browser](api/Browser.md#browser-object) object
- * [Callback](api/Callback.md#callback-object) object
- * [Cookie](api/Cookie.md#cookie-class) class
- * [CookieManager](api/CookieManager.md#cookiemanager-class) class
- * [DpiAware](api/DpiAware.md#dpiaware-class) class (Win)
- * [DragData](api/DragData.md#dragdata-object) object
- * [Frame](api/Frame.md#frame-object) object
- * [Image](api/Image.md#image-object) object
- * [JavascriptBindings](api/JavascriptBindings.md#javascriptbindings-class) class
- * [JavascriptCallback](api/JavascriptCallback.md#javascriptcallback-object) object
- * [PaintBuffer](api/PaintBuffer.md#paintbuffer-object) object
- * [Request](api/Request.md#request-class) class
- * [Response](api/Response.md#response-object) object
- * [WebPluginInfo](api/WebPluginInfo.md#webplugininfo-object) object
- * [WebRequest](api/WebRequest.md#webrequest-class) class
- * [WindowInfo](api/WindowInfo.md#windowinfo-class) class
- * [WindowUtils](api/WindowUtils.md#windowutils-class) class
-
-
-#### Client handlers (interfaces)
-
- * [DisplayHandler](api/DisplayHandler.md#displayhandler-interface)
- * [DownloadHandler](api/DownloadHandler.md#downloadhandler)
- * [FocusHandler](api/FocusHandler.md#focushandler-interface)
- * [JavascriptDialogHandler](api/JavascriptDialogHandler.md#javascriptdialoghandler-interface)
- * [KeyboardHandler](api/KeyboardHandler.md#keyboardhandler-interface)
- * [LifespanHandler](api/LifespanHandler.md#lifespanhandler-interface)
- * [LoadHandler](api/LoadHandler.md#loadhandler-interface)
- * [RenderHandler](api/RenderHandler.md#renderhandler-interface)
- * [RequestHandler](api/RequestHandler.md#requesthandler-interface)
- * [ResourceHandler](api/ResourceHandler.md#resourcehandler-interface)
- * [V8ContextHandler](api/V8ContextHandler.md#v8contexthandler-interface)
-
-
-#### Other interfaces
-
- * [CookieVisitor](api/CookieVisitor.md#cookievisitor-interface) interface
- * [StringVisitor](api/StringVisitor.md#stringvisitor-interface) interface
- * [WebRequestClient](api/WebRequestClient.md#webrequestclient-interface) interface
-
+#### Modules
+
+ * [cefpython](api/cefpython.md#cefpython) module
+
+
+#### Settings
+
+ * [ApplicationSettings](api/ApplicationSettings.md#application-settings) dictionary
+ * [BrowserSettings](api/BrowserSettings.md#browser-settings) dictionary
+ * [CommandLineSwitches](api/CommandLineSwitches.md#command-line-switches) dictionary
+
+
+#### Classes and objects
+
+ * [Browser](api/Browser.md#browser-object) object
+ * [Callback](api/Callback.md#callback-object) object
+ * [Cookie](api/Cookie.md#cookie-class) class
+ * [CookieManager](api/CookieManager.md#cookiemanager-class) class
+ * [DpiAware](api/DpiAware.md#dpiaware-class) class (Win)
+ * [DragData](api/DragData.md#dragdata-object) object
+ * [Frame](api/Frame.md#frame-object) object
+ * [Image](api/Image.md#image-object) object
+ * [JavascriptBindings](api/JavascriptBindings.md#javascriptbindings-class) class
+ * [JavascriptCallback](api/JavascriptCallback.md#javascriptcallback-object) object
+ * [PaintBuffer](api/PaintBuffer.md#paintbuffer-object) object
+ * [Request](api/Request.md#request-class) class
+ * [Response](api/Response.md#response-object) object
+ * [WebPluginInfo](api/WebPluginInfo.md#webplugininfo-object) object
+ * [WebRequest](api/WebRequest.md#webrequest-class) class
+ * [WindowInfo](api/WindowInfo.md#windowinfo-class) class
+ * [WindowUtils](api/WindowUtils.md#windowutils-class) class
+
+
+#### Client handlers (interfaces)
+
+ * [AccessibilityHandler](api/AccessibilityHandler.md#accessibilityhandler-interface)
+ * [DisplayHandler](api/DisplayHandler.md#displayhandler-interface)
+ * [DownloadHandler](api/DownloadHandler.md#downloadhandler)
+ * [FocusHandler](api/FocusHandler.md#focushandler-interface)
+ * [JavascriptDialogHandler](api/JavascriptDialogHandler.md#javascriptdialoghandler-interface)
+ * [KeyboardHandler](api/KeyboardHandler.md#keyboardhandler-interface)
+ * [LifespanHandler](api/LifespanHandler.md#lifespanhandler-interface)
+ * [LoadHandler](api/LoadHandler.md#loadhandler-interface)
+ * [RenderHandler](api/RenderHandler.md#renderhandler-interface)
+ * [RequestHandler](api/RequestHandler.md#requesthandler-interface)
+ * [ResourceHandler](api/ResourceHandler.md#resourcehandler-interface)
+ * [V8ContextHandler](api/V8ContextHandler.md#v8contexthandler-interface)
+
+
+#### Other interfaces
+
+ * [CookieVisitor](api/CookieVisitor.md#cookievisitor-interface) interface
+ * [StringVisitor](api/StringVisitor.md#stringvisitor-interface) interface
+ * [WebRequestClient](api/WebRequestClient.md#webrequestclient-interface) interface
+
 
 ### API index
 
+* [AccessibilityHandler (interface)](api/AccessibilityHandler.md#accessibilityhandler-interface)
+  * [_OnAccessibilityTreeChange](api/AccessibilityHandler.md#_onaccessibilitytreechange)
+  * [_OnAccessibilityLocationChange](api/AccessibilityHandler.md#_onaccessibilitylocationchange)
 * [Application settings](api/ApplicationSettings.md#application-settings)
   * [accept_language_list](api/ApplicationSettings.md#accept_language_list)
   * [app_user_model_id](api/ApplicationSettings.md#app_user_model_id)
@@ -408,6 +412,7 @@ Additional information for v31.2 release:
   * [SendMouseWheelEvent](api/Browser.md#sendmousewheelevent)
   * [SendFocusEvent](api/Browser.md#sendfocusevent)
   * [SendCaptureLostEvent](api/Browser.md#sendcapturelostevent)
+  * [SetAccessibilityState](api/Browser.md#setaccessibilitystate)
   * [SetClientCallback](api/Browser.md#setclientcallback)
   * [SetClientHandler](api/Browser.md#setclienthandler)
   * [SetFocus](api/Browser.md#setfocus)
@@ -469,6 +474,7 @@ Additional information for v31.2 release:
   * [PostDelayedTask](api/cefpython.md#postdelayedtask)
   * [QuitMessageLoop](api/cefpython.md#quitmessageloop)
   * [SetGlobalClientCallback](api/cefpython.md#setglobalclientcallback)
+  * [SetGlobalClientHandler](api/cefpython.md#setglobalclienthandler)
   * [SetOsModalLoop](api/cefpython.md#setosmodalloop)
   * [Shutdown](api/cefpython.md#shutdown)
 * [Command line switches](api/CommandLineSwitches.md#command-line-switches)
diff --git a/api/API-categories.md b/api/API-categories.md
index 1f4fc992..d1d7320e 100644
--- a/api/API-categories.md
+++ b/api/API-categories.md
@@ -38,6 +38,7 @@
 
 ### Client handlers (interfaces)
 
+ * [AccessibilityHandler](AccessibilityHandler.md#accessibilityhandler-interface)
  * [DisplayHandler](DisplayHandler.md#displayhandler-interface)
  * [DownloadHandler](DownloadHandler.md#downloadhandler)
  * [FocusHandler](FocusHandler.md#focushandler-interface)
diff --git a/api/API-index.md b/api/API-index.md
index 74971115..fb8c5efe 100644
--- a/api/API-index.md
+++ b/api/API-index.md
@@ -2,6 +2,9 @@
 
 # API index
 
+* [AccessibilityHandler (interface)](AccessibilityHandler.md#accessibilityhandler-interface)
+  * [_OnAccessibilityTreeChange](AccessibilityHandler.md#_onaccessibilitytreechange)
+  * [_OnAccessibilityLocationChange](AccessibilityHandler.md#_onaccessibilitylocationchange)
 * [Application settings](ApplicationSettings.md#application-settings)
   * [accept_language_list](ApplicationSettings.md#accept_language_list)
   * [app_user_model_id](ApplicationSettings.md#app_user_model_id)
@@ -97,6 +100,7 @@
   * [SendMouseWheelEvent](Browser.md#sendmousewheelevent)
   * [SendFocusEvent](Browser.md#sendfocusevent)
   * [SendCaptureLostEvent](Browser.md#sendcapturelostevent)
+  * [SetAccessibilityState](Browser.md#setaccessibilitystate)
   * [SetClientCallback](Browser.md#setclientcallback)
   * [SetClientHandler](Browser.md#setclienthandler)
   * [SetFocus](Browser.md#setfocus)
@@ -158,6 +162,7 @@
   * [PostDelayedTask](cefpython.md#postdelayedtask)
   * [QuitMessageLoop](cefpython.md#quitmessageloop)
   * [SetGlobalClientCallback](cefpython.md#setglobalclientcallback)
+  * [SetGlobalClientHandler](cefpython.md#setglobalclienthandler)
   * [SetOsModalLoop](cefpython.md#setosmodalloop)
   * [Shutdown](cefpython.md#shutdown)
 * [Command line switches](CommandLineSwitches.md#command-line-switches)
diff --git a/api/AccessibilityHandler.md b/api/AccessibilityHandler.md
new file mode 100644
index 00000000..faea2605
--- /dev/null
+++ b/api/AccessibilityHandler.md
@@ -0,0 +1,50 @@
+[API categories](API-categories.md) | [API index](API-index.md)
+
+
+# AccessibilityHandler (interface)
+
+This handler is for use only with off-screen rendering enabled.
+See [RenderHandler](RenderHandler.md) for details.
+
+Implement this interface to receive accessibility notification when
+accessibility events have been registered. The methods of this class will
+be called on the UI thread.
+
+Callbacks in this interface are not associated with any specific browser,
+thus you must call cefpython.[SetGlobalClientHandler] or 
+SetGlobalClientCallback() to use them. The callbacks names were prefixed
+with "`_`" to distinguish this special behavior.
+
+For an example of how to implement handler see [cefpython](cefpython.md).CreateBrowser(). For a list of all handler interfaces see [API > Client handlers](API#Client_handlers).
+
+
+Table of contents:
+* [Callbacks](#callbacks)
+  * [_OnAccessibilityTreeChange](#_onaccessibilitytreechange)
+  * [_OnAccessibilityLocationChange](#_onaccessibilitylocationchange)
+
+
+## Callbacks
+
+
+### _OnAccessibilityTreeChange
+
+| Parameter | Type |
+| --- | --- |
+| value | list |
+| __Return__ | void |
+
+Called after renderer process sends accessibility tree changes to the
+browser process.
+
+
+### _OnAccessibilityLocationChange
+
+| Parameter | Type |
+| --- | --- |
+| value | list |
+| __Return__ | void |
+
+Called after renderer process sends accessibility location changes to the
+browser process.
+
diff --git a/api/Browser.md b/api/Browser.md
index 768adeca..cf2ab61d 100644
--- a/api/Browser.md
+++ b/api/Browser.md
@@ -76,6 +76,7 @@ Table of contents:
   * [SendMouseWheelEvent](#sendmousewheelevent)
   * [SendFocusEvent](#sendfocusevent)
   * [SendCaptureLostEvent](#sendcapturelostevent)
+  * [SetAccessibilityState](#setaccessibilitystate)
   * [SetClientCallback](#setclientcallback)
   * [SetClientHandler](#setclienthandler)
   * [SetFocus](#setfocus)
@@ -844,6 +845,44 @@ Send a focus event to the browser.
 Send a capture lost event to the browser.
 
 
+### SetAccessibilityState
+
+| | |
+| --- | --- |
+| state | cef_state_t |
+| __Return__ | void |
+
+cef_state_t enum values defined in cefpython module:
+- STATE_DEFAULT
+- STATE_ENABLED
+- STATE_DISABLED
+
+Description from upstream CEF:
+> Set accessibility state for all frames. |accessibility_state| may be
+> default, enabled or disabled. If |accessibility_state| is STATE_DEFAULT
+> then accessibility will be disabled by default and the state may be further
+> controlled with the "force-renderer-accessibility" and
+> "disable-renderer-accessibility" command-line switches. If
+> |accessibility_state| is STATE_ENABLED then accessibility will be enabled.
+> If |accessibility_state| is STATE_DISABLED then accessibility will be
+> completely disabled.
+>
+> For windowed browsers accessibility will be enabled in Complete mode (which
+> corresponds to kAccessibilityModeComplete in Chromium). In this mode all
+> platform accessibility objects will be created and managed by Chromium's
+> internal implementation. The client needs only to detect the screen reader
+> and call this method appropriately. For example, on macOS the client can
+> handle the @"AXEnhancedUserInterface" accessibility attribute to detect
+> VoiceOver state changes and on Windows the client can handle WM_GETOBJECT
+> with OBJID_CLIENT to detect accessibility readers.
+>
+> For windowless browsers accessibility will be enabled in TreeOnly mode
+> (which corresponds to kAccessibilityModeWebContentsOnly in Chromium). In
+> this mode renderer accessibility is enabled, the full tree is computed, and
+> events are passed to CefAccessibiltyHandler, but platform accessibility
+> objects are not created. The client may implement platform accessibility
+> objects using CefAccessibiltyHandler callbacks if desired.
+
 ### SetClientCallback
 
 | Parameter | Type |
diff --git a/api/cefpython.md b/api/cefpython.md
index e68d0231..20cb8b9f 100644
--- a/api/cefpython.md
+++ b/api/cefpython.md
@@ -26,6 +26,7 @@ Table of contents:
   * [PostDelayedTask](#postdelayedtask)
   * [QuitMessageLoop](#quitmessageloop)
   * [SetGlobalClientCallback](#setglobalclientcallback)
+  * [SetGlobalClientHandler](#setglobalclienthandler)
   * [SetOsModalLoop](#setosmodalloop)
   * [Shutdown](#shutdown)
 
@@ -133,7 +134,8 @@ Returns the [CommandLineSwitches](CommandLineSwitches.md) switch that was passed
 | name | string |
 | __Return__ | object |
 
-Returns a global client callback that was set using SetGlobalClientCallback(). Returns None if callback was not set.
+Returns a global client callback that was set using SetGlobalClientCallback()
+or SetGlobalClientHandler. Returns None if callback was not set.
 
 
 ### GetModuleDirectory
@@ -290,6 +292,23 @@ Some client callbacks are not associated with any browser. In such case use this
 Example of using SetGlobalClientCallback() is provided in the wxpython.py example.
 
 
+### SetGlobalClientHandler
+
+| Parameter | Type |
+| --- | --- |
+| handler | object |
+| __Return__ | void |
+
+Set client handler object (class instance). Its members will be inspected.
+Private methods that are not meant to be callbacks should have their names
+prepended with two underscores. Methods with single underscore or no
+underscore are treated the same as client callbacks.
+
+You can call this method multiple times to set many handlers. For
+example you can create in your code several objects named AccessibilityHandler,
+RequestHandler etc.
+
+
 ### SetOsModalLoop
 
 | Parameter | Type |
diff --git a/src/browser.pyx b/src/browser.pyx
index 60194e54..5f26e7d7 100644
--- a/src/browser.pyx
+++ b/src/browser.pyx
@@ -5,6 +5,7 @@
 include "cefpython.pyx"
 
 cimport cef_types
+from cef_types cimport cef_state_t
 IF UNAME_SYSNAME == "Linux":
     cimport x11
 
@@ -513,6 +514,9 @@ cdef class PyBrowser:
         ELSE:
             NonCriticalError("SetBounds() not implemented on this platform")
 
+    cpdef py_void SetAccessibilityState(self, cef_state_t state):
+        self.GetCefBrowserHost().get().SetAccessibilityState(state)
+
     cpdef py_void SetFocus(self, enable):
         self.GetCefBrowserHost().get().SetFocus(bool(enable))
 
diff --git a/src/cef_types.pyx b/src/cef_types.pyx
new file mode 100644
index 00000000..6d9ad5fe
--- /dev/null
+++ b/src/cef_types.pyx
@@ -0,0 +1,9 @@
+# Copyright (c) 2014 CEF Python, see the Authors file.
+# All rights reserved. Licensed under BSD 3-clause license.
+# Project website: https://github.com/cztomczak/cefpython
+
+cimport cef_types
+
+STATE_DEFAULT = cef_types.STATE_DEFAULT
+STATE_ENABLED = cef_types.STATE_ENABLED
+STATE_DISABLED = cef_types.STATE_DISABLED
diff --git a/src/cef_v59..v66_changes.txt b/src/cef_v59..v66_changes.txt
index 38a071e4..7a6fc5fb 100644
--- a/src/cef_v59..v66_changes.txt
+++ b/src/cef_v59..v66_changes.txt
@@ -70,6 +70,8 @@ MISC
 NEW FEATURES
 ------------
 
++ unittests/osr_test.py - new test for off-screen rendering mode
+
 internal/cef_types.h
 + cef_log_severity_t: new key LOGSEVERITY_DEBUG (no need to expose,
   same as LOGSEVERITY_VERBOSE, see code comments in setting.pyx
@@ -81,14 +83,15 @@ internal/cef_types.h
 + cef_referrer_policy_t changes (not exposed, info only)
 
 cef_accessibility_handler.h
-- CefAccessibilityHandler
-- CefRenderHandler::GetAccessibilityHandler
++ CefAccessibilityHandler
++ CefRenderHandler::GetAccessibilityHandler
++ cefpython.SetGlobalClientHandler
 
 cef_render_handler.h
 - OnTextSelectionChanged
 
 cef_browser.h
-- SetAccessibilityState
++ SetAccessibilityState
 - SetAutoResizeEnabled
 - GetExtension
 - IsBackgroundHost
@@ -101,9 +104,9 @@ cef_display_handler.h
 - OnLoadingProgressChange
 
 cef_drag_data.h
-- GetImage (cross-platform)
-- GetImageHotspot (cross-platform)
-- HasImage (cross-platform)
++ GetImage (cross-platform)
++ GetImageHotspot (cross-platform)
++ HasImage (cross-platform)
 
 cef_extension.h
 - CefExtension
diff --git a/src/cefpython.pyx b/src/cefpython.pyx
index 2ed752c5..2f3d3ef1 100644
--- a/src/cefpython.pyx
+++ b/src/cefpython.pyx
@@ -329,6 +329,7 @@ cdef dict g_globalClientCallbacks = {}
 
 # -----------------------------------------------------------------------------
 
+include "cef_types.pyx"
 include "utils.pyx"
 include "string_utils.pyx"
 IF UNAME_SYSNAME == "Windows":
@@ -371,6 +372,7 @@ include "helpers.pyx"
 include "image.pyx"
 
 # Handlers
+include "handlers/accessibility_handler.pyx"
 include "handlers/browser_process_handler.pyx"
 include "handlers/display_handler.pyx"
 include "handlers/focus_handler.pyx"
@@ -953,12 +955,32 @@ def SetOsModalLoop(py_bool modalLoop):
 
 cpdef py_void SetGlobalClientCallback(py_string name, object callback):
     global g_globalClientCallbacks
-    if name in ["OnCertificateError", "OnBeforePluginLoad", "OnAfterCreated"]:
+    # Global callbacks are prefixed with "_" in documentation.
+    # Accept both with and without a prefix.
+    if name.startswith("_"):
+        name = name[1:]
+    if name in ["OnCertificateError", "OnBeforePluginLoad", "OnAfterCreated",
+                "OnAccessibilityTreeChange", "OnAccessibilityLocationChange"]:
         g_globalClientCallbacks[name] = callback
     else:
         raise Exception("SetGlobalClientCallback() failed: "\
                 "invalid callback name = %s" % name)
 
+cpdef py_void SetGlobalClientHandler(object clientHandler):
+    if not hasattr(clientHandler, "__class__"):
+        raise Exception("SetGlobalClientHandler() failed: __class__ "
+                        "attribute missing")
+    cdef dict methods = {}
+    cdef py_string key
+    cdef object method
+    cdef tuple value
+    for value in inspect.getmembers(clientHandler,
+            predicate=inspect.ismethod):
+        key = value[0]
+        method = value[1]
+        if key and key[0:2] != '__':
+            SetGlobalClientCallback(key, method)
+
 cpdef object GetGlobalClientCallback(py_string name):
     global g_globalClientCallbacks
     if name in g_globalClientCallbacks:
diff --git a/src/client_handler/Makefile b/src/client_handler/Makefile
index bdb2ee72..d217660e 100644
--- a/src/client_handler/Makefile
+++ b/src/client_handler/Makefile
@@ -23,7 +23,7 @@ SRC = client_handler.cpp cookie_visitor.cpp resource_handler.cpp \
 	download_handler.cpp focus_handler.cpp js_dialog_handler.cpp \
 	keyboard_handler.cpp lifespan_handler.cpp load_handler.cpp \
 	render_handler.cpp request_handler.cpp dialog_handler.cpp \
-	cef_log.cpp \
+	cef_log.cpp accessibility_handler.cpp \
 	$(SRC_MORE)
 
 OBJ = $(filter %.o, $(SRC:.cpp=.o) $(SRC:.mm=.o))
diff --git a/src/client_handler/accessibility_handler.cpp b/src/client_handler/accessibility_handler.cpp
new file mode 100644
index 00000000..a75ab2f6
--- /dev/null
+++ b/src/client_handler/accessibility_handler.cpp
@@ -0,0 +1,19 @@
+// Copyright (c) 2018 CEF Python, see the Authors file.
+// All rights reserved. Licensed under BSD 3-clause license.
+// Project website: https://github.com/cztomczak/cefpython
+
+#include "accessibility_handler.h"
+#include "common/cefpython_public_api.h"
+
+
+void AccessibilityHandler::OnAccessibilityTreeChange(
+                           CefRefPtr<CefValue> value) {
+    REQUIRE_UI_THREAD();
+    AccessibilityHandler_OnAccessibilityTreeChange(value);
+}
+
+void AccessibilityHandler::OnAccessibilityLocationChange(
+                           CefRefPtr<CefValue> value) {
+    REQUIRE_UI_THREAD();
+    AccessibilityHandler_OnAccessibilityLocationChange(value);
+}
diff --git a/src/client_handler/accessibility_handler.h b/src/client_handler/accessibility_handler.h
new file mode 100644
index 00000000..ba18171c
--- /dev/null
+++ b/src/client_handler/accessibility_handler.h
@@ -0,0 +1,20 @@
+// Copyright (c) 2018 CEF Python, see the Authors file.
+// All rights reserved. Licensed under BSD 3-clause license.
+// Project website: https://github.com/cztomczak/cefpython
+
+#include "common/cefpython_public_api.h"
+#include "include/cef_accessibility_handler.h"
+
+
+class AccessibilityHandler : public CefAccessibilityHandler
+{
+public:
+    AccessibilityHandler(){}
+    virtual ~AccessibilityHandler(){}
+
+    virtual void OnAccessibilityTreeChange(CefRefPtr<CefValue> value) override;
+    virtual void OnAccessibilityLocationChange(CefRefPtr<CefValue> value) override;
+
+private:
+    IMPLEMENT_REFCOUNTING(AccessibilityHandler);
+};
diff --git a/src/client_handler/render_handler.h b/src/client_handler/render_handler.h
index 5baae320..b9eb59fa 100644
--- a/src/client_handler/render_handler.h
+++ b/src/client_handler/render_handler.h
@@ -4,14 +4,21 @@
 
 #include "common/cefpython_public_api.h"
 #include "include/cef_render_handler.h"
+#include "accessibility_handler.h"
 
 
-class RenderHandler : public CefRenderHandler
+class RenderHandler : public CefRenderHandler,
+                      public AccessibilityHandler
 {
 public:
     RenderHandler(){}
     virtual ~RenderHandler(){}
 
+    CefRefPtr<CefAccessibilityHandler> GetAccessibilityHandler()
+                override {
+        return this;
+    }
+
     bool GetRootScreenRect(CefRefPtr<CefBrowser> browser,
                            CefRect& rect) override;
 
diff --git a/src/extern/cef/cef_browser.pxd b/src/extern/cef/cef_browser.pxd
index d0b16483..6c5e599a 100644
--- a/src/extern/cef/cef_browser.pxd
+++ b/src/extern/cef/cef_browser.pxd
@@ -11,7 +11,7 @@ from libcpp cimport bool as cpp_bool
 from libcpp.vector cimport vector as cpp_vector
 from cef_frame cimport CefFrame
 cimport cef_types
-from cef_types cimport int64
+from cef_types cimport int64, cef_state_t
 from cef_types cimport CefBrowserSettings, CefPoint
 from cef_drag_data cimport CefDragData
 from cef_types cimport CefMouseEvent
@@ -86,6 +86,8 @@ cdef extern from "include/cef_browser.h":
         void ReplaceMisspelling(const CefString& word)
         void AddWordToDictionary(const CefString& word)
 
+        void SetAccessibilityState(cef_state_t accessibility_state)
+
 
     cdef cppclass CefBrowser:
 
diff --git a/src/extern/cef/cef_values.pxd b/src/extern/cef/cef_values.pxd
index 201bb82b..ee0bf506 100644
--- a/src/extern/cef/cef_values.pxd
+++ b/src/extern/cef/cef_values.pxd
@@ -12,6 +12,19 @@ cdef extern from "include/cef_values.h":
     cdef CefRefPtr[CefBinaryValue] CefBinaryValue_Create \
         "CefBinaryValue::Create"(const void* data, size_t data_size)
 
+    cdef cppclass CefValue:
+        cpp_bool IsValid()
+        cpp_bool IsOwned()
+        cpp_bool IsReadOnly()
+        cef_value_type_t GetType()
+        cpp_bool GetBool()
+        int GetInt()
+        double GetDouble()
+        CefString GetString()
+        CefRefPtr[CefBinaryValue] GetBinary()
+        CefRefPtr[CefDictionaryValue] GetDictionary()
+        CefRefPtr[CefListValue] GetList()
+
     cdef cppclass CefBinaryValue:
         cpp_bool IsValid()
         cpp_bool IsOwned()
diff --git a/src/handlers/accessibility_handler.pyx b/src/handlers/accessibility_handler.pyx
new file mode 100644
index 00000000..055fb61c
--- /dev/null
+++ b/src/handlers/accessibility_handler.pyx
@@ -0,0 +1,34 @@
+# Copyright (c) 2018 CEF Python, see the Authors file.
+# All rights reserved. Licensed under BSD 3-clause license.
+# Project website: https://github.com/cztomczak/cefpython
+
+include "../cefpython.pyx"
+include "../browser.pyx"
+include "../frame.pyx"
+include "../process_message_utils.pyx"
+
+cdef public void AccessibilityHandler_OnAccessibilityTreeChange(
+            CefRefPtr[CefValue] cefValue
+            ) except * with gil:
+    cdef object value = CefValueToPyValue(cefValue)
+    cdef object callback
+    try:
+        callback = GetGlobalClientCallback("OnAccessibilityTreeChange")
+        if callback:
+            callback(value=value)
+    except:
+        (exc_type, exc_value, exc_trace) = sys.exc_info()
+        sys.excepthook(exc_type, exc_value, exc_trace)
+
+cdef public void AccessibilityHandler_OnAccessibilityLocationChange(
+            CefRefPtr[CefValue] cefValue
+            ) except * with gil:
+    cdef object value = CefValueToPyValue(cefValue)
+    cdef object callback
+    try:
+        callback = GetGlobalClientCallback("OnAccessibilityLocationChange")
+        if callback:
+            callback(value=value)
+    except:
+        (exc_type, exc_value, exc_trace) = sys.exc_info()
+        sys.excepthook(exc_type, exc_value, exc_trace)
diff --git a/src/process_message_utils.pyx b/src/process_message_utils.pyx
index a9c10f22..464c8f6b 100644
--- a/src/process_message_utils.pyx
+++ b/src/process_message_utils.pyx
@@ -10,6 +10,7 @@
 # enumerate(), to an int.
 
 include "cefpython.pyx"
+include "utils.pyx"
 
 # -----------------------------------------------------------------------------
 # CEF values to Python values
@@ -36,6 +37,53 @@ cdef object CheckForCefPythonMessageHash(CefRefPtr[CefBrowser] cefBrowser,
             return jsCallback
     return pyString
 
+cdef object CefValueToPyValue(CefRefPtr[CefValue] cefValue):
+    assert cefValue.get().IsValid(), "cefValue is invalid"
+    cdef cef_types.cef_value_type_t valueType = cefValue.get().GetType()
+    cdef CefRefPtr[CefBinaryValue] binaryValue
+    cdef uint32 uint32_value = 0
+    cdef int64 int64_value = 0
+
+    if valueType == cef_types.VTYPE_NULL:
+        return None
+    elif valueType == cef_types.VTYPE_BOOL:
+        return bool(cefValue.get().GetBool())
+    elif valueType == cef_types.VTYPE_INT:
+        return cefValue.get().GetInt()
+    elif valueType == cef_types.VTYPE_DOUBLE:
+        return cefValue.get().GetDouble()
+    elif valueType == cef_types.VTYPE_STRING:
+        return CefToPyString(cefValue.get().GetString())
+    elif valueType == cef_types.VTYPE_DICTIONARY:
+        return CefDictionaryValueToPyDict(
+                <CefRefPtr[CefBrowser]>NULL,
+                cefValue.get().GetDictionary(),
+                1)
+    elif valueType == cef_types.VTYPE_LIST:
+        return CefListValueToPyList(
+                <CefRefPtr[CefBrowser]>NULL,
+                cefValue.get().GetList(),
+                1)
+    elif valueType == cef_types.VTYPE_BINARY:
+        binaryValue = cefValue.get().GetBinary()
+        if binaryValue.get().GetSize() == sizeof(uint32_value):
+            binaryValue.get().GetData(
+                    &uint32_value, sizeof(uint32_value), 0)
+            return uint32_value
+        elif binaryValue.get().GetSize() == sizeof(int64_value):
+            binaryValue.get().GetData(
+                    &int64_value, sizeof(int64_value), 0)
+            return int64_value
+        else:
+            NonCriticalError("Unknown binary value, size=%s" % \
+                    binaryValue.get().GetSize())
+            return None
+    else:
+        raise Exception("Unknown CefValue type=%s" % valueType)
+
+# TODO: Use CefListValue.GetValue to get CefValue and use CefValueToPyValue
+#       for dictionary and lists?
+
 cdef list CefListValueToPyList(
         CefRefPtr[CefBrowser] cefBrowser,
         CefRefPtr[CefListValue] cefListValue,
@@ -49,8 +97,8 @@ cdef list CefListValueToPyList(
     cdef cef_types.cef_value_type_t valueType
     cdef list ret = []
     cdef CefRefPtr[CefBinaryValue] binaryValue
-    cdef uint32 uint32_value
-    cdef int64 int64_value
+    cdef uint32 uint32_value = 0
+    cdef int64 int64_value = 0
     cdef object originallyString
     for index in range(0, size):
         valueType = cefListValue.get().GetType(index)
@@ -65,8 +113,9 @@ cdef list CefListValueToPyList(
         elif valueType == cef_types.VTYPE_STRING:
             originallyString = CefToPyString(
                     cefListValue.get().GetString(index))
-            originallyString = CheckForCefPythonMessageHash(cefBrowser,
-                    originallyString)
+            if cefBrowser.get():
+                originallyString = CheckForCefPythonMessageHash(cefBrowser,
+                        originallyString)
             ret.append(originallyString)
         elif valueType == cef_types.VTYPE_DICTIONARY:
             ret.append(CefDictionaryValueToPyDict(
@@ -89,10 +138,11 @@ cdef list CefListValueToPyList(
                         &int64_value, sizeof(int64_value), 0)
                 ret.append(int64_value)
             else:
-                raise Exception("Unknown binary value, size=%s" % \
-                        binaryValue.get().GetSize())
+                NonCriticalError("Unknown binary value, size=%s" % \
+                    binaryValue.get().GetSize())
+                ret.append(None)
         else:
-            raise Exception("Unknown value type=%s" % valueType)
+            raise Exception("Unknown CefValue type=%s" % valueType)
     return ret
 
 cdef dict CefDictionaryValueToPyDict(
@@ -107,16 +157,19 @@ cdef dict CefDictionaryValueToPyDict(
     cefDictionaryValue.get().GetKeys(keyList)
     cdef cef_types.cef_value_type_t valueType
     cdef dict ret = {}
+    # noinspection PyUnresolvedReferences
     cdef cpp_vector[CefString].iterator iterator = keyList.begin()
     cdef CefString cefKey
     cdef py_string pyKey
     cdef CefRefPtr[CefBinaryValue] binaryValue
-    cdef uint32 uint32_value
-    cdef int64 int64_value
+    cdef uint32 uint32_value = 0
+    cdef int64 int64_value = 0
     cdef object originallyString
     while iterator != keyList.end():
+        # noinspection PyUnresolvedReferences
         cefKey = deref(iterator)
         pyKey = CefToPyString(cefKey)
+        # noinspection PyUnresolvedReferences
         preinc(iterator)
         valueType = cefDictionaryValue.get().GetType(cefKey)
         if valueType == cef_types.VTYPE_NULL:
@@ -130,8 +183,9 @@ cdef dict CefDictionaryValueToPyDict(
         elif valueType == cef_types.VTYPE_STRING:
             originallyString = CefToPyString(
                     cefDictionaryValue.get().GetString(cefKey))
-            originallyString = CheckForCefPythonMessageHash(cefBrowser,
-                    originallyString)
+            if cefBrowser.get():
+                originallyString = CheckForCefPythonMessageHash(cefBrowser,
+                        originallyString)
             ret[pyKey] = originallyString
         elif valueType == cef_types.VTYPE_DICTIONARY:
             ret[pyKey] = CefDictionaryValueToPyDict(
@@ -154,10 +208,11 @@ cdef dict CefDictionaryValueToPyDict(
                         &int64_value, sizeof(int64_value), 0)
                 ret[pyKey] = int64_value
             else:
-                raise Exception("Unknown binary value, size=%s" % \
-                        binaryValue.get().GetSize())
+                NonCriticalError("Unknown binary value, size=%s" % \
+                    binaryValue.get().GetSize())
+                ret[pyKey] = None
         else:
-            raise Exception("Unknown value type = %s" % valueType)
+            raise Exception("Unknown CefValue type = %s" % valueType)
     return ret
 
 # -----------------------------------------------------------------------------
diff --git a/tools/apidocs.py b/tools/apidocs.py
index 8bd8da31..27fc311f 100644
--- a/tools/apidocs.py
+++ b/tools/apidocs.py
@@ -17,10 +17,25 @@
 import glob
 import os
 import re
+import subprocess
 
 
 def main():
     """Main entry point."""
+    # Call toc.py for docs/ and api/ directories
+    print("Running toc.py in {}/ dir".format(os.path.basename(API_DIR)))
+    retcode = subprocess.call([sys.executable,
+                               os.path.join(TOOLS_DIR, "toc.py"),
+                               API_DIR])
+    assert retcode == 0, "Executing toc.py for API_DIR failed"
+
+    print("Running toc.py in {}/ dir".format(os.path.basename(DOCS_DIR)))
+    retcode = subprocess.call([sys.executable,
+                               os.path.join(TOOLS_DIR, "toc.py"),
+                               DOCS_DIR])
+    assert retcode == 0, "Executing toc.py for DOCS_DIR failed"
+
+    # Generate API reference in api/ dir and in root/README.md
     api_links = generate_api_links()
     update_api_index_file(api_links)
     update_readme_file(api_links)
@@ -69,8 +84,8 @@ def update_readme_file(api_links):
     assert re.search(re_find, readme_contents), ("API categories not found"
                                                  " in README")
     contents = re.sub(re_find,
-                      ("### API categories\r\n\r\n{categories_contents}"
-                       "\r\n### API index"
+                      (u"### API categories\r\n\r\n{categories_contents}"
+                       u"\r\n### API index"
                        .format(categories_contents=categories_contents)),
                       contents)
 
@@ -80,7 +95,7 @@ def update_readme_file(api_links):
     assert re.search(re_find, readme_contents), ("API index not found"
                                                  " in README")
     contents = re.sub(re_find,
-                      ("### API index\r\n\r\n{api_links}"
+                      (u"### API index\r\n\r\n{api_links}"
                        .format(api_links=api_links)),
                       contents)
 
@@ -103,7 +118,7 @@ def generate_api_links():
             continue
         with open(file_, "rb") as fo:
             md_contents = fo.read().decode("utf-8")
-        md_contents = re.sub(r"```[\s\S]+?```", "", md_contents)
+        md_contents = re.sub(u"```[\\s\\S]+?```", u"", md_contents)
         matches = re.findall(r"^(#|###)\s+(.*)", md_contents,
                              re.MULTILINE)
         for match in matches:
diff --git a/tools/build_distrib.py b/tools/build_distrib.py
index 3d0a8105..65bfd5ee 100644
--- a/tools/build_distrib.py
+++ b/tools/build_distrib.py
@@ -634,7 +634,7 @@ def test_wheel_packages(pythons):
         command = ("\"{python}\" {unittests}"
                    .format(python=python["executable"],
                            unittests=os.path.join(UNITTESTS_DIR,
-                                                  "main_test.py")))
+                                                  "_test_runner.py")))
         pcode = subprocess.call(command, cwd=DISTRIB_DIR, shell=True)
         if pcode != 0:
             print("[build_distrib.py] ERROR: Unit tests failed for"
diff --git a/tools/common.py b/tools/common.py
index da24e8f6..06ab942e 100644
--- a/tools/common.py
+++ b/tools/common.py
@@ -125,8 +125,9 @@
 assert __file__
 ROOT_DIR = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
 
-# API reference
+# API reference and docs
 API_DIR = os.path.join(ROOT_DIR, "api")
+DOCS_DIR = os.path.join(ROOT_DIR, "docs")
 
 # Build directories
 BUILD_DIR = os.path.join(ROOT_DIR, "build")
diff --git a/unittests/_common.py b/unittests/_common.py
new file mode 100644
index 00000000..2c2e52a9
--- /dev/null
+++ b/unittests/_common.py
@@ -0,0 +1,173 @@
+# Copyright (c) 2018 CEF Python, see the Authors file.
+# All rights reserved. Licensed under BSD 3-clause license.
+# Project website: https://github.com/cztomczak/cefpython
+
+from cefpython3 import cefpython as cef
+
+import base64
+import os
+import sys
+import time
+
+# To show the window for an extended period of time increase this number.
+MESSAGE_LOOP_RANGE = 100  # each iteration is 0.01 sec
+
+g_subtests_ran = 0
+
+
+def subtest_message(message):
+    global g_subtests_ran
+    g_subtests_ran += 1
+    print(str(g_subtests_ran) + ". " + message)
+    sys.stdout.flush()
+
+
+def show_test_summary(pyfile):
+    print("\nRan " + str(g_subtests_ran) + " sub-tests in "
+          + os.path.basename(pyfile))
+
+
+def html_to_data_uri(html):
+    html = html.encode("utf-8", "replace")
+    b64 = base64.b64encode(html).decode("utf-8", "replace")
+    ret = "data:text/html;base64,{data}".format(data=b64)
+    return ret
+
+
+def run_message_loop():
+    # Run message loop for some time.
+    # noinspection PyTypeChecker
+    for i in range(MESSAGE_LOOP_RANGE):
+        cef.MessageLoopWork()
+        time.sleep(0.01)
+    subtest_message("cef.MessageLoopWork() ok")
+
+
+def do_message_loop_work(work_loops):
+    # noinspection PyTypeChecker
+    for i in range(work_loops):
+        cef.MessageLoopWork()
+        time.sleep(0.01)
+
+
+def check_auto_asserts(test_case, objects):
+    # Automatic check of asserts in handlers and in external
+    for obj in objects:
+        test_for_True = False  # Test whether asserts are working correctly
+        for key, value in obj.__dict__.items():
+            if key == "test_for_True":
+                test_for_True = True
+                continue
+            if "_True" in key:
+                test_case.assertTrue(value, "Check assert: " +
+                                     obj.__class__.__name__ + "." + key)
+                subtest_message(obj.__class__.__name__ + "." +
+                                key.replace("_True", "") +
+                                " ok")
+            elif "_False" in key:
+                test_case.assertFalse(value, "Check assert: " +
+                                      obj.__class__.__name__ + "." + key)
+                subtest_message(obj.__class__.__name__ + "." +
+                                key.replace("_False", "") +
+                                " ok")
+        test_case.assertTrue(test_for_True)
+
+
+class DisplayHandler(object):
+    def __init__(self, test_case):
+        self.test_case = test_case
+
+        # Asserts for True/False will be checked just before shutdown
+        self.test_for_True = True  # Test whether asserts are working correctly
+        self.javascript_errors_False = False
+        self.OnConsoleMessage_True = False
+
+    def OnConsoleMessage(self, message, **_):
+        if "error" in message.lower() or "uncaught" in message.lower():
+            self.javascript_errors_False = True
+            raise Exception("Javascript error: " + message)
+        else:
+            # Check whether messages from javascript are coming
+            self.OnConsoleMessage_True = True
+            subtest_message(message)
+
+
+class GlobalHandler(object):
+    def __init__(self, test_case):
+        self.test_case = test_case
+
+        # Asserts for True/False will be checked just before shutdown
+        self.test_for_True = True  # Test whether asserts are working correctly
+        self.OnAfterCreated_True = False
+
+    def _OnAfterCreated(self, browser, **_):
+        # For asserts that are checked automatically before shutdown its
+        # values should be set first, so that when other asserts fail
+        # (the ones called through the test_case member) they are reported
+        # correctly.
+        self.test_case.assertFalse(self.OnAfterCreated_True)
+        self.OnAfterCreated_True = True
+        self.test_case.assertEqual(browser.GetIdentifier(), 1)
+
+
+class LoadHandler(object):
+    def __init__(self, test_case, datauri):
+        self.test_case = test_case
+        self.datauri = datauri
+        self.frame_source_visitor = None
+
+        # Asserts for True/False will be checked just before shutdown
+        self.test_for_True = True  # Test whether asserts are working correctly
+        self.OnLoadStart_True = False
+        self.OnLoadEnd_True = False
+        self.FrameSourceVisitor_True = False
+        # self.OnLoadingStateChange_Start_True = False # FAILS
+        self.OnLoadingStateChange_End_True = False
+
+    def OnLoadStart(self, browser, frame, **_):
+        self.test_case.assertFalse(self.OnLoadStart_True)
+        self.OnLoadStart_True = True
+        self.test_case.assertEqual(browser.GetUrl(), frame.GetUrl())
+        self.test_case.assertEqual(browser.GetUrl(), self.datauri)
+
+    def OnLoadEnd(self, browser, frame, http_code, **_):
+        # OnLoadEnd should be called only once
+        self.test_case.assertFalse(self.OnLoadEnd_True)
+        self.OnLoadEnd_True = True
+        self.test_case.assertEqual(http_code, 200)
+        self.frame_source_visitor = FrameSourceVisitor(self, self.test_case)
+        frame.GetSource(self.frame_source_visitor)
+        browser.ExecuteJavascript("print('LoadHandler.OnLoadEnd() ok')")
+
+    def OnLoadingStateChange(self, browser, is_loading, can_go_back,
+                             can_go_forward, **_):
+        if is_loading:
+            # TODO: this test fails, looks like OnLoadingStaetChange with
+            #       is_loading=False is being called very fast, before
+            #       OnLoadStart and before client handler is set by calling
+            #       browser.SetClientHandler().
+            #       SOLUTION: allow to set OnLoadingStateChange through
+            #       SetGlobalClientCallback similarly to _OnAfterCreated().
+            # self.test_case.assertFalse(self.OnLoadingStateChange_Start_True)
+            # self.OnLoadingStateChange_Start_True = True
+            pass
+        else:
+            self.test_case.assertFalse(self.OnLoadingStateChange_End_True)
+            self.OnLoadingStateChange_End_True = True
+            self.test_case.assertEqual(browser.CanGoBack(), can_go_back)
+            self.test_case.assertEqual(browser.CanGoForward(), can_go_forward)
+
+
+class FrameSourceVisitor(object):
+    """Visitor for Frame.GetSource()."""
+
+    def __init__(self, load_handler, test_case):
+        self.load_handler = load_handler
+        self.test_case = test_case
+
+    def Visit(self, value):
+        self.test_case.assertFalse(self.load_handler.FrameSourceVisitor_True)
+        self.load_handler.FrameSourceVisitor_True = True
+        self.test_case.assertIn("747ef3e6011b6a61e6b3c6e54bdd2dee",
+                                value)
+
diff --git a/unittests/main_test.py b/unittests/main_test.py
index b0d16f40..717daf6d 100644
--- a/unittests/main_test.py
+++ b/unittests/main_test.py
@@ -7,16 +7,13 @@
 import unittest
 # noinspection PyUnresolvedReferences
 import _test_runner
-from os.path import basename
+from _common import *
+
 from cefpython3 import cefpython as cef
-import time
-import base64
+
 import os
 import sys
 
-# To show the window for an extended period of time increase this number.
-MESSAGE_LOOP_RANGE = 200  # each iteration is 0.01 sec
-
 g_datauri_data = """
 <!DOCTYPE html>
 <html>
@@ -91,25 +88,14 @@
 </body>
 </html>
 """
-g_datauri = "data:text/html;base64,"+base64.b64encode(g_datauri_data.encode(
-        "utf-8", "replace")).decode("utf-8", "replace")
-
-g_subtests_ran = 0
-
-
-def subtest_message(message):
-    global g_subtests_ran
-    g_subtests_ran += 1
-    print(str(g_subtests_ran) + ". " + message)
-    sys.stdout.flush()
+g_datauri = html_to_data_uri(g_datauri_data)
 
 
 class MainTest_IsolatedTest(unittest.TestCase):
-
     def test_main(self):
-        """Main entry point."""
-        # All this code must run inside one single test, otherwise strange
-        # things happen.
+        """Main entry point. All the code must run inside one
+        single test, otherwise strange things happen."""
+
         print("")
         print("CEF Python {ver}".format(ver=cef.__version__))
         print("Python {ver}".format(ver=sys.version[:6]))
@@ -126,24 +112,24 @@ def test_main(self):
         cef.Initialize(settings)
         subtest_message("cef.Initialize() ok")
 
-        # Test global handler
+        # Global handler
         global_handler = GlobalHandler(self)
         cef.SetGlobalClientCallback("OnAfterCreated",
                                     global_handler._OnAfterCreated)
         subtest_message("cef.SetGlobalClientCallback() ok")
 
-        # Test creation of browser
+        # Create browser
         browser = cef.CreateBrowserSync(url=g_datauri)
         self.assertIsNotNone(browser, "Browser object")
         subtest_message("cef.CreateBrowserSync() ok")
 
-        # Test other handlers: LoadHandler, DisplayHandler etc.
-        client_handlers = [LoadHandler(self), DisplayHandler(self)]
+        # Client handlers
+        client_handlers = [LoadHandler(self, g_datauri), DisplayHandler(self)]
         for handler in client_handlers:
             browser.SetClientHandler(handler)
         subtest_message("browser.SetClientHandler() ok")
 
-        # Test javascript bindings
+        # Javascript bindings
         external = External(self)
         bindings = cef.JavascriptBindings(
                 bindToFrames=False, bindToPopups=False)
@@ -183,153 +169,32 @@ def test_main(self):
         self.assertEqual(req_data, req.GetPostData())
         subtest_message("cef.Request.SetPostData(dict) ok")
 
-        # Run message loop for some time.
-        # noinspection PyTypeChecker
-        for i in range(MESSAGE_LOOP_RANGE):
-            cef.MessageLoopWork()
-            time.sleep(0.01)
-        subtest_message("cef.MessageLoopWork() ok")
+        # Run message loop
+        run_message_loop()
 
-        # Test browser closing. Remember to clean reference.
+        # Close browser and clean reference
         browser.CloseBrowser(True)
         del browser
         subtest_message("browser.CloseBrowser() ok")
 
-        # Give it some time to close before calling shutdown.
-        # noinspection PyTypeChecker
-        for i in range(25):
-            cef.MessageLoopWork()
-            time.sleep(0.01)
+        # Give it some time to close before checking asserts
+        # and calling shutdown.
+        do_message_loop_work(25)
 
-        # Automatic check of asserts in handlers and in external
         # noinspection PyTypeChecker
-        for obj in [] + client_handlers + [global_handler, external]:
-            test_for_True = False  # Test whether asserts are working correctly
-            for key, value in obj.__dict__.items():
-                if key == "test_for_True":
-                    test_for_True = True
-                    continue
-                if "_True" in key:
-                    self.assertTrue(value, "Check assert: " +
-                                    obj.__class__.__name__ + "." + key)
-                    subtest_message(obj.__class__.__name__ + "." +
-                                    key.replace("_True", "") +
-                                    " ok")
-                elif "_False" in key:
-                    self.assertFalse(value, "Check assert: " +
-                                     obj.__class__.__name__ + "." + key)
-                    subtest_message(obj.__class__.__name__ + "." +
-                                    key.replace("_False", "") +
-                                    " ok")
-            self.assertTrue(test_for_True)
+        check_auto_asserts(self, [] + client_handlers
+                                    + [global_handler,
+                                       external])
 
         # Test shutdown of CEF
         cef.Shutdown()
         subtest_message("cef.Shutdown() ok")
 
-        # Display real number of tests there were run
-        print("\nRan " + str(g_subtests_ran) + " sub-tests in test_main")
+        # Display summary
+        show_test_summary(__file__)
         sys.stdout.flush()
 
 
-class GlobalHandler(object):
-    def __init__(self, test_case):
-        self.test_case = test_case
-
-        # Asserts for True/False will be checked just before shutdown
-        self.test_for_True = True  # Test whether asserts are working correctly
-        self.OnAfterCreated_True = False
-
-    def _OnAfterCreated(self, browser, **_):
-        # For asserts that are checked automatically before shutdown its
-        # values should be set first, so that when other asserts fail
-        # (the ones called through the test_case member) they are reported
-        # correctly.
-        self.test_case.assertFalse(self.OnAfterCreated_True)
-        self.OnAfterCreated_True = True
-        self.test_case.assertEqual(browser.GetIdentifier(), 1)
-
-
-class LoadHandler(object):
-    def __init__(self, test_case):
-        self.test_case = test_case
-        self.frame_source_visitor = None
-
-        # Asserts for True/False will be checked just before shutdown
-        self.test_for_True = True  # Test whether asserts are working correctly
-        self.OnLoadStart_True = False
-        self.OnLoadEnd_True = False
-        self.FrameSourceVisitor_True = False
-        # self.OnLoadingStateChange_Start_True = False # FAILS
-        self.OnLoadingStateChange_End_True = False
-
-    def OnLoadStart(self, browser, frame, **_):
-        self.test_case.assertFalse(self.OnLoadStart_True)
-        self.OnLoadStart_True = True
-        self.test_case.assertEqual(browser.GetUrl(), frame.GetUrl())
-        self.test_case.assertEqual(browser.GetUrl(), g_datauri)
-
-    def OnLoadEnd(self, browser, frame, http_code, **_):
-        # OnLoadEnd should be called only once
-        self.test_case.assertFalse(self.OnLoadEnd_True)
-        self.OnLoadEnd_True = True
-        self.test_case.assertEqual(http_code, 200)
-        self.frame_source_visitor = FrameSourceVisitor(self, self.test_case)
-        frame.GetSource(self.frame_source_visitor)
-        browser.ExecuteJavascript("print('LoadHandler.OnLoadEnd() ok')")
-
-    def OnLoadingStateChange(self, browser, is_loading, can_go_back,
-                             can_go_forward, **_):
-        if is_loading:
-            # TODO: this test fails, looks like OnLoadingStaetChange with
-            #       is_loading=False is being called very fast, before
-            #       OnLoadStart and before client handler is set by calling
-            #       browser.SetClientHandler().
-            #       SOLUTION: allow to set OnLoadingStateChange through
-            #       SetGlobalClientCallback similarly to _OnAfterCreated().
-            # self.test_case.assertFalse(self.OnLoadingStateChange_Start_True)
-            # self.OnLoadingStateChange_Start_True = True
-            pass
-        else:
-            self.test_case.assertFalse(self.OnLoadingStateChange_End_True)
-            self.OnLoadingStateChange_End_True = True
-            self.test_case.assertEqual(browser.CanGoBack(), can_go_back)
-            self.test_case.assertEqual(browser.CanGoForward(), can_go_forward)
-
-
-class DisplayHandler(object):
-    def __init__(self, test_case):
-        self.test_case = test_case
-
-        # Asserts for True/False will be checked just before shutdown
-        self.test_for_True = True  # Test whether asserts are working correctly
-        self.javascript_errors_False = False
-        self.OnConsoleMessage_True = False
-
-    def OnConsoleMessage(self, message, **_):
-        if "error" in message.lower() or "uncaught" in message.lower():
-            self.javascript_errors_False = True
-            raise Exception(message)
-        else:
-            # Check whether messages from javascript are coming
-            self.OnConsoleMessage_True = True
-            subtest_message(message)
-
-
-class FrameSourceVisitor(object):
-    """Visitor for Frame.GetSource()."""
-
-    def __init__(self, load_handler, test_case):
-        self.load_handler = load_handler
-        self.test_case = test_case
-
-    def Visit(self, **_):
-        self.test_case.assertFalse(self.load_handler.FrameSourceVisitor_True)
-        self.load_handler.FrameSourceVisitor_True = True
-        self.test_case.assertIn("747ef3e6011b6a61e6b3c6e54bdd2dee",
-                                g_datauri_data)
-
-
 class External(object):
     """Javascript 'window.external' object."""
 
@@ -367,4 +232,4 @@ def py_callback(msg_from_js):
 
 
 if __name__ == "__main__":
-    _test_runner.main(basename(__file__))
+    _test_runner.main(os.path.basename(__file__))
diff --git a/unittests/osr_test.py b/unittests/osr_test.py
new file mode 100644
index 00000000..e1689329
--- /dev/null
+++ b/unittests/osr_test.py
@@ -0,0 +1,210 @@
+# Copyright (c) 2018 CEF Python, see the Authors file.
+# All rights reserved. Licensed under BSD 3-clause license.
+# Project website: https://github.com/cztomczak/cefpython
+
+"""Off-screen rendering tests."""
+
+import unittest
+# noinspection PyUnresolvedReferences
+import _test_runner
+from _common import *
+
+from cefpython3 import cefpython as cef
+
+import sys
+
+g_datauri_data = """
+<!DOCTYPE html>
+<html>
+<head>
+    <style type="text/css">
+    body,html {
+        font-family: Arial;
+        font-size: 11pt;
+    }
+    </style>
+    
+    <script>
+    function print(msg) {
+        console.log(msg+" [JS]");
+        msg = msg.replace("ok", "<b style='color:green'>ok</b>");
+        msg = msg.replace("error", "<b style='color:red'>error</b>");
+        document.getElementById("console").innerHTML += msg+"<br>";
+    }
+    window.onload = function(){
+        print("window.onload() ok");
+
+        version = cefpython_version
+        print("CEF Python: <b>"+version.version+"</b>");
+        print("Chrome: <b>"+version.chrome_version+"</b>");
+        print("CEF: <b>"+version.cef_version+"</b>");
+    }
+    </script>
+</head>
+<body>
+    <!-- FrameSourceVisitor hash = 747ef3e6011b6a61e6b3c6e54bdd2dee -->
+    <h1>Off-screen rendering test</h1>
+    <div id="console"></div>
+</body>
+</html>
+"""
+g_datauri = html_to_data_uri(g_datauri_data)
+
+
+class OsrTest_IsolatedTest(unittest.TestCase):
+    def test_osr(self):
+        """Main entry point. All the code must run inside one
+        single test, otherwise strange things happen."""
+
+        print("")
+        print("CEF Python {ver}".format(ver=cef.__version__))
+        print("Python {ver}".format(ver=sys.version[:6]))
+
+        # Application settings
+        settings = {
+            "debug": False,
+            "log_severity": cef.LOGSEVERITY_ERROR,
+            "log_file": "",
+            "windowless_rendering_enabled": True
+        }
+        if "--debug" in sys.argv:
+            settings["debug"] = True
+            settings["log_severity"] = cef.LOGSEVERITY_INFO
+
+        # Initialize
+        cef.Initialize(settings)
+        subtest_message("cef.Initialize() ok")
+
+        # Accessibility handler
+        accessibility_handler = AccessibilityHandler(self)
+        cef.SetGlobalClientHandler(accessibility_handler)
+        subtest_message("cef.SetGlobalClientHandler() ok")
+
+        # Global handler
+        global_handler = GlobalHandler(self)
+        cef.SetGlobalClientCallback("OnAfterCreated",
+                                    global_handler._OnAfterCreated)
+        subtest_message("cef.SetGlobalClientCallback() ok")
+
+        # Create browser
+        window_info = cef.WindowInfo()
+        window_info.SetAsOffscreen(0)
+        browser = cef.CreateBrowserSync(window_info=window_info,
+                                        url=g_datauri)
+
+        # Javascript bindings
+        bindings = cef.JavascriptBindings(
+                bindToFrames=False, bindToPopups=False)
+        bindings.SetProperty("cefpython_version", cef.GetVersion())
+        browser.SetJavascriptBindings(bindings)
+        subtest_message("browser.SetJavascriptBindings() ok")
+
+        # Enable accessibility
+        browser.SetAccessibilityState(cef.STATE_ENABLED)
+        subtest_message("cef.SetAccessibilityState(STATE_ENABLED) ok")
+
+        # Client handlers
+        client_handlers = [LoadHandler(self, g_datauri),
+                           DisplayHandler(self),
+                           RenderHandler(self)]
+        for handler in client_handlers:
+            browser.SetClientHandler(handler)
+
+        # Initiate OSR rendering
+        browser.SendFocusEvent(True)
+        browser.WasResized()
+
+        # Message loop
+        run_message_loop()
+
+        # Close browser and clean reference
+        browser.CloseBrowser(True)
+        del browser
+        subtest_message("browser.CloseBrowser() ok")
+
+        # Give it some time to close before checking asserts
+        # and calling shutdown.
+        do_message_loop_work(25)
+
+        # Automatic check of asserts in handlers
+        # noinspection PyTypeChecker
+        check_auto_asserts(self, [] + client_handlers
+                                    + [global_handler,
+                                       accessibility_handler])
+
+        # Test shutdown of CEF
+        cef.Shutdown()
+        subtest_message("cef.Shutdown() ok")
+
+        # Display summary
+        show_test_summary(__file__)
+        sys.stdout.flush()
+
+
+class AccessibilityHandler(object):
+    def __init__(self, test_case):
+        self.test_case = test_case
+
+        # Asserts for True/False will be checked just before shutdown.
+        # Test whether asserts are working correctly.
+        self.test_for_True = True
+
+        self.javascript_errors_False = False
+        self._OnAccessibilityTreeChange_True = False
+        self._OnAccessibilityLocationChange_True = False
+        self.loadComplete_True = False
+        self.layoutComplete_True = False
+
+    def _OnAccessibilityTreeChange(self, value):
+        self._OnAccessibilityTreeChange_True = True
+        for event in value:
+            if "event_type" in event:
+                if event["event_type"] == "loadComplete":
+                    # LoadHandler.OnLoadEnd is called after this event
+                    self.test_case.assertFalse(self.loadComplete_True)
+                    self.loadComplete_True = True
+                elif event["event_type"] == "layoutComplete":
+                    # layoutComplete event occurs twice, one when a blank
+                    # page is loaded and second time when loading datauri.
+                    if self.loadComplete_True:
+                        self.test_case.assertFalse(self.layoutComplete_True)
+                        self.layoutComplete_True = True
+
+    def _OnAccessibilityLocationChange(self, **_):
+        self._OnAccessibilityLocationChange_True = True
+
+
+class RenderHandler(object):
+    def __init__(self, test_case):
+        self.test_case = test_case
+
+        # Asserts for True/False will be checked just before shutdown.
+        # Test whether asserts are working correctly.
+        self.test_for_True = True
+
+        self.GetViewRect_True = False
+        self.OnPaint_True = False
+
+    def GetViewRect(self, rect_out, **_):
+        """Called to retrieve the view rectangle which is relative
+        to screen coordinates. Return True if the rectangle was
+        provided."""
+        # rect_out --> [x, y, width, height]
+        self.GetViewRect_True = True
+        rect_out.extend([0, 0, 800, 600])
+        return True
+
+    def OnPaint(self, element_type, paint_buffer, **_):
+        """Called when an element should be painted."""
+        if element_type == cef.PET_VIEW:
+            self.test_case.assertEqual(paint_buffer.width, 800)
+            self.test_case.assertEqual(paint_buffer.height, 600)
+            if not self.OnPaint_True:
+                self.OnPaint_True = True
+                subtest_message("RenderHandler.OnPaint: viewport ok")
+        else:
+            raise Exception("Unsupported element_type in OnPaint")
+
+
+if __name__ == "__main__":
+    _test_runner.main(os.path.basename(__file__))

From a737d26cad764c7ccfaf9c8151515dcbc2dce09d Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Sat, 18 Aug 2018 15:37:47 +0200
Subject: [PATCH 116/238] Enhance unit tests reliability of js bindings (#59)

---
 unittests/_common.py   | 16 +++++++++++++++-
 unittests/main_test.py | 23 +++++++++++++++++++----
 unittests/osr_test.py  | 22 ++++++++++++++++++----
 3 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/unittests/_common.py b/unittests/_common.py
index 2c2e52a9..5011bda4 100644
--- a/unittests/_common.py
+++ b/unittests/_common.py
@@ -13,6 +13,7 @@
 MESSAGE_LOOP_RANGE = 100  # each iteration is 0.01 sec
 
 g_subtests_ran = 0
+g_js_code_completed = False
 
 
 def subtest_message(message):
@@ -50,7 +51,21 @@ def do_message_loop_work(work_loops):
         time.sleep(0.01)
 
 
+def js_code_completed():
+    """Sometimes window.onload can execute before javascript bindings
+    are ready if the document loads very fast. When setting javascript
+    bindings it can take some time, because these bindings are sent
+    via IPC messaging to the Renderer process."""
+    global g_js_code_completed
+    assert not g_js_code_completed
+    g_js_code_completed = True
+    subtest_message("js_code_completed() ok")
+
+
 def check_auto_asserts(test_case, objects):
+    # Check if js code completed
+    test_case.assertTrue(g_js_code_completed)
+
     # Automatic check of asserts in handlers and in external
     for obj in objects:
         test_for_True = False  # Test whether asserts are working correctly
@@ -170,4 +185,3 @@ def Visit(self, value):
         self.load_handler.FrameSourceVisitor_True = True
         self.test_case.assertIn("747ef3e6011b6a61e6b3c6e54bdd2dee",
                                 value)
-
diff --git a/unittests/main_test.py b/unittests/main_test.py
index 717daf6d..58fec488 100644
--- a/unittests/main_test.py
+++ b/unittests/main_test.py
@@ -31,9 +31,17 @@
         msg = msg.replace("error", "<b style='color:red'>error</b>");
         document.getElementById("console").innerHTML += msg+"<br>";
     }
-    window.onload = function(){
-        print("window.onload() ok");
-
+    function onload_helper() {
+        if (!window.hasOwnProperty("cefpython_version")) {
+            // Sometimes page could finish loading before javascript
+            // bindings are available. Javascript bindings are sent
+            // from the browser process to the renderer process via
+            // IPC messaging and it can take some time (5-10ms). If
+            // the page loads very fast window.onload could execute
+            // before bindings are available.
+            setTimeout(onload_helper, 10);
+            return;
+        }
         version = cefpython_version
         print("CEF Python: <b>"+version.version+"</b>");
         print("Chrome: <b>"+version.chrome_version+"</b>");
@@ -78,7 +86,12 @@
             py_callback("String sent from Javascript");
             print("py_callback() ok");
         });
-    };
+        js_code_completed();
+    }
+    window.onload = function() {
+        print("window.onload() ok");
+        onload_helper();
+    }
     </script>
 </head>
 <body>
@@ -133,6 +146,7 @@ def test_main(self):
         external = External(self)
         bindings = cef.JavascriptBindings(
                 bindToFrames=False, bindToPopups=False)
+        bindings.SetFunction("js_code_completed", js_code_completed)
         bindings.SetFunction("test_function", external.test_function)
         bindings.SetProperty("test_property1", external.test_property1)
         bindings.SetProperty("test_property2", external.test_property2)
@@ -181,6 +195,7 @@ def test_main(self):
         # and calling shutdown.
         do_message_loop_work(25)
 
+        # Asserts before shutdown
         # noinspection PyTypeChecker
         check_auto_asserts(self, [] + client_handlers
                                     + [global_handler,
diff --git a/unittests/osr_test.py b/unittests/osr_test.py
index e1689329..4c26cb8f 100644
--- a/unittests/osr_test.py
+++ b/unittests/osr_test.py
@@ -31,13 +31,26 @@
         msg = msg.replace("error", "<b style='color:red'>error</b>");
         document.getElementById("console").innerHTML += msg+"<br>";
     }
-    window.onload = function(){
-        print("window.onload() ok");
-
+    function onload_helper() {
+        if (!window.hasOwnProperty("cefpython_version")) {
+            // Sometimes page could finish loading before javascript
+            // bindings are available. Javascript bindings are sent
+            // from the browser process to the renderer process via
+            // IPC messaging and it can take some time (5-10ms). If
+            // the page loads very fast window.onload could execute
+            // before bindings are available.
+            setTimeout(onload_helper, 10);
+            return;
+        }
         version = cefpython_version
         print("CEF Python: <b>"+version.version+"</b>");
         print("Chrome: <b>"+version.chrome_version+"</b>");
         print("CEF: <b>"+version.cef_version+"</b>");
+        js_code_completed();
+    }
+    window.onload = function() {
+        print("window.onload() ok");
+        onload_helper();
     }
     </script>
 </head>
@@ -95,6 +108,7 @@ def test_osr(self):
         # Javascript bindings
         bindings = cef.JavascriptBindings(
                 bindToFrames=False, bindToPopups=False)
+        bindings.SetFunction("js_code_completed", js_code_completed)
         bindings.SetProperty("cefpython_version", cef.GetVersion())
         browser.SetJavascriptBindings(bindings)
         subtest_message("browser.SetJavascriptBindings() ok")
@@ -126,7 +140,7 @@ def test_osr(self):
         # and calling shutdown.
         do_message_loop_work(25)
 
-        # Automatic check of asserts in handlers
+        # Asserts before shutdown
         # noinspection PyTypeChecker
         check_auto_asserts(self, [] + client_handlers
                                     + [global_handler,

From 073f9d2abcb48091f7bd2288f20825bec44ad44f Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Sat, 18 Aug 2018 15:46:36 +0200
Subject: [PATCH 117/238] Fix run_examples.py on Mac with PyQt5

---
 tools/run_examples.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tools/run_examples.py b/tools/run_examples.py
index d78a1a47..87fe1296 100644
--- a/tools/run_examples.py
+++ b/tools/run_examples.py
@@ -188,8 +188,12 @@ def check_installed_packages():
     }
     for package in packages:
         try:
-            importlib.import_module(package)
-            packages[package] = True
+            if package == "PyQt5":
+                # Strange issue on Mac, PyQt5 is an empty built-in module
+                from PyQt5 import QtGui
+            else:
+                importlib.import_module(package)
+                packages[package] = True
         except ImportError:
             packages[package] = False
     packages["gi"] = check_gi_installed()

From 1671a40361b283c6b6036614b0615b2898d9872a Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Sat, 18 Aug 2018 19:11:10 +0200
Subject: [PATCH 118/238] Add RenderHandler.OnTextSelectionChanged and
 Browser.Invalidate (#403).

Add tests for OnTextSelectionChanged.
Add on_load_end() helper func in unit tests.
---
 api/Browser.md                        | 17 +++++++++++++++
 api/RenderHandler.md                  | 19 +++++++++++++++++
 src/browser.pyx                       |  7 ++++++-
 src/cef_v59..v66_changes.txt          |  5 +++--
 src/client_handler/render_handler.cpp |  8 +++++++
 src/client_handler/render_handler.h   |  4 ++++
 src/extern/cef/cef_browser.pxd        |  3 ++-
 src/extern/cef/cef_types.pxd          |  4 ++++
 src/handlers/render_handler.pyx       | 19 +++++++++++++++++
 unittests/_common.py                  | 12 +++++++++++
 unittests/osr_test.py                 | 30 ++++++++++++++++++++++++++-
 11 files changed, 123 insertions(+), 5 deletions(-)

diff --git a/api/Browser.md b/api/Browser.md
index cf2ab61d..beda31e5 100644
--- a/api/Browser.md
+++ b/api/Browser.md
@@ -591,6 +591,23 @@ machinery.
 Returns true if a document has been loaded in the browser.
 
 
+### Invalidate
+
+| | |
+| --- | --- |
+| element_type | PaintElementType |
+| __Return__ | void |
+
+Description from upstream CEF:
+> Invalidate the view. The browser will call CefRenderHandler::OnPaint
+> asynchronously. This method is only used when window rendering is
+> disabled.
+
+`PaintElementType` enum values defined in cefpython module:
+* PET_VIEW
+* PET_POPUP
+
+
 ### IsFullscreen
 
 | | |
diff --git a/api/RenderHandler.md b/api/RenderHandler.md
index bb25ac01..3b0d0f0d 100644
--- a/api/RenderHandler.md
+++ b/api/RenderHandler.md
@@ -177,6 +177,25 @@ Called when the browser's cursor has changed. If |type| is CT_CUSTOM then
 Called when the scroll offset has changed.
 
 
+### OnTextSelectionChanged
+
+| Parameter | Type |
+| --- | --- |
+| browser | [Browser](Browser.md) |
+| selected_text | str |
+| selected_range | list[x, y] |
+| __Return__ | void |
+
+Description from upstream CEF:
+> Called when text selection has changed for the specified |browser|.
+> |selected_text| is the currently selected text and |selected_range| is
+> the character range.
+
+NOTE: this callback seems to be called only when selecting text
+with a mouse. When selecting text programmatically using javascript
+code it doesn't get called.
+
+
 ### StartDragging
 
 | Parameter | Type |
diff --git a/src/browser.pyx b/src/browser.pyx
index 5f26e7d7..335654d6 100644
--- a/src/browser.pyx
+++ b/src/browser.pyx
@@ -247,7 +247,8 @@ cdef class PyBrowser:
                     "GetScreenRect",
                     "OnPopupShow", "OnPopupSize", "OnPaint", "OnCursorChange",
                     "OnScrollOffsetChanged",
-                    "StartDragging", "UpdateDragCursor"]
+                    "StartDragging", "UpdateDragCursor",
+                    "OnTextSelectionChanged"]
             # JavascriptDialogHandler
             self.allowedClientCallbacks += ["OnJavascriptDialog",
                     "OnBeforeUnloadJavascriptDialog",
@@ -476,6 +477,10 @@ cdef class PyBrowser:
     cpdef py_bool HasDocument(self):
         return self.GetCefBrowser().get().HasDocument()
 
+    cpdef py_void Invalidate(self,
+                             cef_types.cef_paint_element_type_t element_type):
+        return self.GetCefBrowserHost().get().Invalidate(element_type)
+
     cpdef py_bool IsFullscreen(self):
         return bool(self.isFullscreen)
 
diff --git a/src/cef_v59..v66_changes.txt b/src/cef_v59..v66_changes.txt
index 7a6fc5fb..2bb23ccf 100644
--- a/src/cef_v59..v66_changes.txt
+++ b/src/cef_v59..v66_changes.txt
@@ -71,6 +71,8 @@ NEW FEATURES
 ------------
 
 + unittests/osr_test.py - new test for off-screen rendering mode
++ cefpython.SetGlobalClientHandler
++ Browser.Invalidate
 
 internal/cef_types.h
 + cef_log_severity_t: new key LOGSEVERITY_DEBUG (no need to expose,
@@ -85,10 +87,9 @@ internal/cef_types.h
 cef_accessibility_handler.h
 + CefAccessibilityHandler
 + CefRenderHandler::GetAccessibilityHandler
-+ cefpython.SetGlobalClientHandler
 
 cef_render_handler.h
-- OnTextSelectionChanged
++ OnTextSelectionChanged
 
 cef_browser.h
 + SetAccessibilityState
diff --git a/src/client_handler/render_handler.cpp b/src/client_handler/render_handler.cpp
index f6b4d5be..cf45d15e 100644
--- a/src/client_handler/render_handler.cpp
+++ b/src/client_handler/render_handler.cpp
@@ -106,3 +106,11 @@ void RenderHandler::UpdateDragCursor(CefRefPtr<CefBrowser> browser,
     REQUIRE_UI_THREAD();
     RenderHandler_UpdateDragCursor(browser, operation);
 }
+
+void RenderHandler::OnTextSelectionChanged(CefRefPtr<CefBrowser> browser,
+                            const CefString& selected_text,
+                            const CefRange& selected_range) {
+    REQUIRE_UI_THREAD();
+    RenderHandler_OnTextSelectionChanged(browser, selected_text,
+                                         selected_range);
+}
diff --git a/src/client_handler/render_handler.h b/src/client_handler/render_handler.h
index b9eb59fa..75eee86c 100644
--- a/src/client_handler/render_handler.h
+++ b/src/client_handler/render_handler.h
@@ -64,6 +64,10 @@ class RenderHandler : public CefRenderHandler,
     void UpdateDragCursor(CefRefPtr<CefBrowser> browser,
                           cef_drag_operations_mask_t operation) override;
 
+    void OnTextSelectionChanged(CefRefPtr<CefBrowser> browser,
+                                const CefString& selected_text,
+                                const CefRange& selected_range) override;
+
 private:
     IMPLEMENT_REFCOUNTING(RenderHandler);
 };
diff --git a/src/extern/cef/cef_browser.pxd b/src/extern/cef/cef_browser.pxd
index 6c5e599a..31a4a29d 100644
--- a/src/extern/cef/cef_browser.pxd
+++ b/src/extern/cef/cef_browser.pxd
@@ -11,7 +11,7 @@ from libcpp cimport bool as cpp_bool
 from libcpp.vector cimport vector as cpp_vector
 from cef_frame cimport CefFrame
 cimport cef_types
-from cef_types cimport int64, cef_state_t
+from cef_types cimport int64, cef_state_t, PaintElementType
 from cef_types cimport CefBrowserSettings, CefPoint
 from cef_drag_data cimport CefDragData
 from cef_types cimport CefMouseEvent
@@ -87,6 +87,7 @@ cdef extern from "include/cef_browser.h":
         void AddWordToDictionary(const CefString& word)
 
         void SetAccessibilityState(cef_state_t accessibility_state)
+        void Invalidate(cef_types.cef_paint_element_type_t type)
 
 
     cdef cppclass CefBrowser:
diff --git a/src/extern/cef/cef_types.pxd b/src/extern/cef/cef_types.pxd
index 70263780..6bd21ba4 100644
--- a/src/extern/cef/cef_types.pxd
+++ b/src/extern/cef/cef_types.pxd
@@ -377,3 +377,7 @@ cdef extern from "include/internal/cef_types.h":
     ctypedef enum cef_focus_source_t:
         FOCUS_SOURCE_NAVIGATION,
         FOCUS_SOURCE_SYSTEM,
+
+    cdef cppclass CefRange:
+        int from_val "from"
+        int to_val "to"
diff --git a/src/handlers/render_handler.pyx b/src/handlers/render_handler.pyx
index 1594d6bd..a8ad4912 100644
--- a/src/handlers/render_handler.pyx
+++ b/src/handlers/render_handler.pyx
@@ -4,8 +4,10 @@
 
 include "../cefpython.pyx"
 include "../browser.pyx"
+include "../string_utils.pyx"
 
 cimport cef_types
+from cef_types cimport CefRange
 
 # cef_paint_element_type_t, PaintElementType
 PET_VIEW = cef_types.PET_VIEW
@@ -288,3 +290,20 @@ cdef public void RenderHandler_UpdateDragCursor(
         (exc_type, exc_value, exc_trace) = sys.exc_info()
         sys.excepthook(exc_type, exc_value, exc_trace)
 
+cdef public void RenderHandler_OnTextSelectionChanged(
+        CefRefPtr[CefBrowser] cef_browser,
+        const CefString& selected_text,
+        const CefRange& selected_range
+        ) except * with gil:
+    cdef PyBrowser browser
+    try:
+        browser = GetPyBrowser(cef_browser, "OnTextSelectionChanged")
+        callback = browser.GetClientCallback("OnTextSelectionChanged")
+        if callback:
+            callback(browser=browser,
+                     selected_text=CefToPyString(selected_text),
+                     selected_range=[selected_range.from_val,
+                                     selected_range.to_val])
+    except:
+        (exc_type, exc_value, exc_trace) = sys.exc_info()
+        sys.excepthook(exc_type, exc_value, exc_trace)
diff --git a/unittests/_common.py b/unittests/_common.py
index 5011bda4..59052583 100644
--- a/unittests/_common.py
+++ b/unittests/_common.py
@@ -14,6 +14,7 @@
 
 g_subtests_ran = 0
 g_js_code_completed = False
+g_on_load_end_callbacks = []
 
 
 def subtest_message(message):
@@ -51,6 +52,11 @@ def do_message_loop_work(work_loops):
         time.sleep(0.01)
 
 
+def on_load_end(callback, *args):
+    global g_on_load_end_callbacks
+    g_on_load_end_callbacks.append([callback, args])
+
+
 def js_code_completed():
     """Sometimes window.onload can execute before javascript bindings
     are ready if the document loads very fast. When setting javascript
@@ -154,6 +160,12 @@ def OnLoadEnd(self, browser, frame, http_code, **_):
         frame.GetSource(self.frame_source_visitor)
         browser.ExecuteJavascript("print('LoadHandler.OnLoadEnd() ok')")
 
+        subtest_message("Executing callbacks registered with on_load_end()")
+        global g_on_load_end_callbacks
+        for callback_data in g_on_load_end_callbacks:
+            callback_data[0](*callback_data[1])
+        del g_on_load_end_callbacks
+
     def OnLoadingStateChange(self, browser, is_loading, can_go_back,
                              can_go_forward, **_):
         if is_loading:
diff --git a/unittests/osr_test.py b/unittests/osr_test.py
index 4c26cb8f..323f2de6 100644
--- a/unittests/osr_test.py
+++ b/unittests/osr_test.py
@@ -58,6 +58,7 @@
     <!-- FrameSourceVisitor hash = 747ef3e6011b6a61e6b3c6e54bdd2dee -->
     <h1>Off-screen rendering test</h1>
     <div id="console"></div>
+    <div id="OnTextSelectionChanged">Test selection.</div>
 </body>
 </html>
 """
@@ -128,6 +129,9 @@ def test_osr(self):
         browser.SendFocusEvent(True)
         browser.WasResized()
 
+        # Test selection
+        on_load_end(select_h1_text, browser)
+
         # Message loop
         run_message_loop()
 
@@ -188,6 +192,17 @@ def _OnAccessibilityLocationChange(self, **_):
         self._OnAccessibilityLocationChange_True = True
 
 
+def select_h1_text(browser):
+    browser.SendMouseClickEvent(0, 0, cef.MOUSEBUTTON_LEFT,
+                                mouseUp=False, clickCount=1)
+    browser.SendMouseMoveEvent(400, 20, mouseLeave=False,
+                               modifiers=cef.EVENTFLAG_LEFT_MOUSE_BUTTON)
+    browser.SendMouseClickEvent(400, 20, cef.MOUSEBUTTON_LEFT,
+                                mouseUp=True, clickCount=1)
+    browser.Invalidate(cef.PET_VIEW)
+    subtest_message("select_h1_text() ok")
+
+
 class RenderHandler(object):
     def __init__(self, test_case):
         self.test_case = test_case
@@ -198,6 +213,7 @@ def __init__(self, test_case):
 
         self.GetViewRect_True = False
         self.OnPaint_True = False
+        self.OnTextSelectionChanged_True = False
 
     def GetViewRect(self, rect_out, **_):
         """Called to retrieve the view rectangle which is relative
@@ -208,7 +224,7 @@ def GetViewRect(self, rect_out, **_):
         rect_out.extend([0, 0, 800, 600])
         return True
 
-    def OnPaint(self, element_type, paint_buffer, **_):
+    def OnPaint(self, browser, element_type, paint_buffer, **_):
         """Called when an element should be painted."""
         if element_type == cef.PET_VIEW:
             self.test_case.assertEqual(paint_buffer.width, 800)
@@ -219,6 +235,18 @@ def OnPaint(self, element_type, paint_buffer, **_):
         else:
             raise Exception("Unsupported element_type in OnPaint")
 
+    def OnTextSelectionChanged(self, selected_text, selected_range, **_):
+        if not self.OnTextSelectionChanged_True:
+            self.OnTextSelectionChanged_True = True
+            # First call
+            self.test_case.assertEqual(selected_text, "")
+            self.test_case.assertEqual(selected_range, [0, 0])
+        else:
+            # Second call.
+            # <h1> tag should be selected.
+            self.test_case.assertEqual(selected_text,
+                                       "Off-screen rendering test")
+
 
 if __name__ == "__main__":
     _test_runner.main(os.path.basename(__file__))

From f8a460f4afdc0887aaf866da2b024f86646fbf56 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Sat, 18 Aug 2018 20:23:29 +0200
Subject: [PATCH 119/238] Add DisplayHandler.OnAutoResize and
 Browser.SetAutoResizeEnabled (#403)

---
 README.md                              | 114 +++++++++++++------------
 api/API-index.md                       |   4 +
 api/Browser.md                         |  17 ++++
 api/DisplayHandler.md                  |  17 ++++
 api/RenderHandler.md                   |   1 +
 src/browser.pyx                        |  13 ++-
 src/cef_v59..v66_changes.txt           |   4 +-
 src/client_handler/display_handler.cpp |   6 ++
 src/client_handler/display_handler.h   |   3 +
 src/extern/cef/cef_browser.pxd         |   7 +-
 src/handlers/display_handler.pyx       |  19 +++++
 unittests/_common.py                   |   9 ++
 unittests/main_test.py                 |  26 +++++-
 13 files changed, 179 insertions(+), 61 deletions(-)

diff --git a/README.md b/README.md
index 3b9f1a21..dafbf9ff 100644
--- a/README.md
+++ b/README.md
@@ -256,61 +256,61 @@ Additional information for v31.2 release:
 
 ### API categories
 
-#### Modules
-
- * [cefpython](api/cefpython.md#cefpython) module
-
-
-#### Settings
-
- * [ApplicationSettings](api/ApplicationSettings.md#application-settings) dictionary
- * [BrowserSettings](api/BrowserSettings.md#browser-settings) dictionary
- * [CommandLineSwitches](api/CommandLineSwitches.md#command-line-switches) dictionary
-
-
-#### Classes and objects
-
- * [Browser](api/Browser.md#browser-object) object
- * [Callback](api/Callback.md#callback-object) object
- * [Cookie](api/Cookie.md#cookie-class) class
- * [CookieManager](api/CookieManager.md#cookiemanager-class) class
- * [DpiAware](api/DpiAware.md#dpiaware-class) class (Win)
- * [DragData](api/DragData.md#dragdata-object) object
- * [Frame](api/Frame.md#frame-object) object
- * [Image](api/Image.md#image-object) object
- * [JavascriptBindings](api/JavascriptBindings.md#javascriptbindings-class) class
- * [JavascriptCallback](api/JavascriptCallback.md#javascriptcallback-object) object
- * [PaintBuffer](api/PaintBuffer.md#paintbuffer-object) object
- * [Request](api/Request.md#request-class) class
- * [Response](api/Response.md#response-object) object
- * [WebPluginInfo](api/WebPluginInfo.md#webplugininfo-object) object
- * [WebRequest](api/WebRequest.md#webrequest-class) class
- * [WindowInfo](api/WindowInfo.md#windowinfo-class) class
- * [WindowUtils](api/WindowUtils.md#windowutils-class) class
-
-
-#### Client handlers (interfaces)
-
- * [AccessibilityHandler](api/AccessibilityHandler.md#accessibilityhandler-interface)
- * [DisplayHandler](api/DisplayHandler.md#displayhandler-interface)
- * [DownloadHandler](api/DownloadHandler.md#downloadhandler)
- * [FocusHandler](api/FocusHandler.md#focushandler-interface)
- * [JavascriptDialogHandler](api/JavascriptDialogHandler.md#javascriptdialoghandler-interface)
- * [KeyboardHandler](api/KeyboardHandler.md#keyboardhandler-interface)
- * [LifespanHandler](api/LifespanHandler.md#lifespanhandler-interface)
- * [LoadHandler](api/LoadHandler.md#loadhandler-interface)
- * [RenderHandler](api/RenderHandler.md#renderhandler-interface)
- * [RequestHandler](api/RequestHandler.md#requesthandler-interface)
- * [ResourceHandler](api/ResourceHandler.md#resourcehandler-interface)
- * [V8ContextHandler](api/V8ContextHandler.md#v8contexthandler-interface)
-
-
-#### Other interfaces
-
- * [CookieVisitor](api/CookieVisitor.md#cookievisitor-interface) interface
- * [StringVisitor](api/StringVisitor.md#stringvisitor-interface) interface
- * [WebRequestClient](api/WebRequestClient.md#webrequestclient-interface) interface
-
+#### Modules
+
+ * [cefpython](api/cefpython.md#cefpython) module
+
+
+#### Settings
+
+ * [ApplicationSettings](api/ApplicationSettings.md#application-settings) dictionary
+ * [BrowserSettings](api/BrowserSettings.md#browser-settings) dictionary
+ * [CommandLineSwitches](api/CommandLineSwitches.md#command-line-switches) dictionary
+
+
+#### Classes and objects
+
+ * [Browser](api/Browser.md#browser-object) object
+ * [Callback](api/Callback.md#callback-object) object
+ * [Cookie](api/Cookie.md#cookie-class) class
+ * [CookieManager](api/CookieManager.md#cookiemanager-class) class
+ * [DpiAware](api/DpiAware.md#dpiaware-class) class (Win)
+ * [DragData](api/DragData.md#dragdata-object) object
+ * [Frame](api/Frame.md#frame-object) object
+ * [Image](api/Image.md#image-object) object
+ * [JavascriptBindings](api/JavascriptBindings.md#javascriptbindings-class) class
+ * [JavascriptCallback](api/JavascriptCallback.md#javascriptcallback-object) object
+ * [PaintBuffer](api/PaintBuffer.md#paintbuffer-object) object
+ * [Request](api/Request.md#request-class) class
+ * [Response](api/Response.md#response-object) object
+ * [WebPluginInfo](api/WebPluginInfo.md#webplugininfo-object) object
+ * [WebRequest](api/WebRequest.md#webrequest-class) class
+ * [WindowInfo](api/WindowInfo.md#windowinfo-class) class
+ * [WindowUtils](api/WindowUtils.md#windowutils-class) class
+
+
+#### Client handlers (interfaces)
+
+ * [AccessibilityHandler](api/AccessibilityHandler.md#accessibilityhandler-interface)
+ * [DisplayHandler](api/DisplayHandler.md#displayhandler-interface)
+ * [DownloadHandler](api/DownloadHandler.md#downloadhandler)
+ * [FocusHandler](api/FocusHandler.md#focushandler-interface)
+ * [JavascriptDialogHandler](api/JavascriptDialogHandler.md#javascriptdialoghandler-interface)
+ * [KeyboardHandler](api/KeyboardHandler.md#keyboardhandler-interface)
+ * [LifespanHandler](api/LifespanHandler.md#lifespanhandler-interface)
+ * [LoadHandler](api/LoadHandler.md#loadhandler-interface)
+ * [RenderHandler](api/RenderHandler.md#renderhandler-interface)
+ * [RequestHandler](api/RequestHandler.md#requesthandler-interface)
+ * [ResourceHandler](api/ResourceHandler.md#resourcehandler-interface)
+ * [V8ContextHandler](api/V8ContextHandler.md#v8contexthandler-interface)
+
+
+#### Other interfaces
+
+ * [CookieVisitor](api/CookieVisitor.md#cookievisitor-interface) interface
+ * [StringVisitor](api/StringVisitor.md#stringvisitor-interface) interface
+ * [WebRequestClient](api/WebRequestClient.md#webrequestclient-interface) interface
+
 
 ### API index
 
@@ -391,6 +391,7 @@ Additional information for v31.2 release:
   * [HandleKeyEventAfterTextInputClient](api/Browser.md#handlekeyeventaftertextinputclient)
   * [HandleKeyEventBeforeTextInputClient](api/Browser.md#handlekeyeventbeforetextinputclient)
   * [HasDocument](api/Browser.md#hasdocument)
+  * [Invalidate](api/Browser.md#invalidate)
   * [IsFullscreen](api/Browser.md#isfullscreen)
   * [IsLoading](api/Browser.md#isloading)
   * [IsMouseCursorChangeDisabled](api/Browser.md#ismousecursorchangedisabled)
@@ -405,6 +406,7 @@ Additional information for v31.2 release:
   * [Reload](api/Browser.md#reload)
   * [ReloadIgnoreCache](api/Browser.md#reloadignorecache)
   * [ReplaceMisspelling](api/Browser.md#replacemisspelling)
+  * [SetAutoResizeEnabled](api/Browser.md#setautoresizeenabled)
   * [SetBounds](api/Browser.md#setbounds)
   * [SendKeyEvent](api/Browser.md#sendkeyevent)
   * [SendMouseClickEvent](api/Browser.md#sendmouseclickevent)
@@ -519,6 +521,7 @@ Additional information for v31.2 release:
   * [Visit](api/CookieVisitor.md#visit)
 * [DisplayHandler (interface)](api/DisplayHandler.md#displayhandler-interface)
   * [OnAddressChange](api/DisplayHandler.md#onaddresschange)
+  * [OnAutoResize](api/DisplayHandler.md#onautoresize)
   * [OnTitleChange](api/DisplayHandler.md#ontitlechange)
   * [OnTooltip](api/DisplayHandler.md#ontooltip)
   * [OnStatusMessage](api/DisplayHandler.md#onstatusmessage)
@@ -670,6 +673,7 @@ Additional information for v31.2 release:
   * [OnPaint](api/RenderHandler.md#onpaint)
   * [OnCursorChange](api/RenderHandler.md#oncursorchange)
   * [OnScrollOffsetChanged](api/RenderHandler.md#onscrolloffsetchanged)
+  * [OnTextSelectionChanged](api/RenderHandler.md#ontextselectionchanged)
   * [StartDragging](api/RenderHandler.md#startdragging)
   * [UpdateDragCursor](api/RenderHandler.md#updatedragcursor)
 * [Request (class)](api/Request.md#request-class)
diff --git a/api/API-index.md b/api/API-index.md
index fb8c5efe..9c5374da 100644
--- a/api/API-index.md
+++ b/api/API-index.md
@@ -79,6 +79,7 @@
   * [HandleKeyEventAfterTextInputClient](Browser.md#handlekeyeventaftertextinputclient)
   * [HandleKeyEventBeforeTextInputClient](Browser.md#handlekeyeventbeforetextinputclient)
   * [HasDocument](Browser.md#hasdocument)
+  * [Invalidate](Browser.md#invalidate)
   * [IsFullscreen](Browser.md#isfullscreen)
   * [IsLoading](Browser.md#isloading)
   * [IsMouseCursorChangeDisabled](Browser.md#ismousecursorchangedisabled)
@@ -93,6 +94,7 @@
   * [Reload](Browser.md#reload)
   * [ReloadIgnoreCache](Browser.md#reloadignorecache)
   * [ReplaceMisspelling](Browser.md#replacemisspelling)
+  * [SetAutoResizeEnabled](Browser.md#setautoresizeenabled)
   * [SetBounds](Browser.md#setbounds)
   * [SendKeyEvent](Browser.md#sendkeyevent)
   * [SendMouseClickEvent](Browser.md#sendmouseclickevent)
@@ -207,6 +209,7 @@
   * [Visit](CookieVisitor.md#visit)
 * [DisplayHandler (interface)](DisplayHandler.md#displayhandler-interface)
   * [OnAddressChange](DisplayHandler.md#onaddresschange)
+  * [OnAutoResize](DisplayHandler.md#onautoresize)
   * [OnTitleChange](DisplayHandler.md#ontitlechange)
   * [OnTooltip](DisplayHandler.md#ontooltip)
   * [OnStatusMessage](DisplayHandler.md#onstatusmessage)
@@ -358,6 +361,7 @@
   * [OnPaint](RenderHandler.md#onpaint)
   * [OnCursorChange](RenderHandler.md#oncursorchange)
   * [OnScrollOffsetChanged](RenderHandler.md#onscrolloffsetchanged)
+  * [OnTextSelectionChanged](RenderHandler.md#ontextselectionchanged)
   * [StartDragging](RenderHandler.md#startdragging)
   * [UpdateDragCursor](RenderHandler.md#updatedragcursor)
 * [Request (class)](Request.md#request-class)
diff --git a/api/Browser.md b/api/Browser.md
index beda31e5..977d9005 100644
--- a/api/Browser.md
+++ b/api/Browser.md
@@ -55,6 +55,7 @@ Table of contents:
   * [HandleKeyEventAfterTextInputClient](#handlekeyeventaftertextinputclient)
   * [HandleKeyEventBeforeTextInputClient](#handlekeyeventbeforetextinputclient)
   * [HasDocument](#hasdocument)
+  * [Invalidate](#invalidate)
   * [IsFullscreen](#isfullscreen)
   * [IsLoading](#isloading)
   * [IsMouseCursorChangeDisabled](#ismousecursorchangedisabled)
@@ -69,6 +70,7 @@ Table of contents:
   * [Reload](#reload)
   * [ReloadIgnoreCache](#reloadignorecache)
   * [ReplaceMisspelling](#replacemisspelling)
+  * [SetAutoResizeEnabled](#setautoresizeenabled)
   * [SetBounds](#setbounds)
   * [SendKeyEvent](#sendkeyevent)
   * [SendMouseClickEvent](#sendmouseclickevent)
@@ -753,6 +755,21 @@ If a misspelled word is currently selected in an editable node calling
 this method will replace it with the specified |word|.
 
 
+### SetAutoResizeEnabled
+
+| Parameter | Type |
+| --- | --- |
+| enabled | bool |
+| min_size | list[width, height] |
+| max_size | list[width, heifght] |
+| __Return__ | void |
+
+Description from upstream CEF:
+> Enable notifications of auto resize via CefDisplayHandler::OnAutoResize.
+> Notifications are disabled by default. |min_size| and |max_size| define the
+> range of allowed sizes.
+
+
 ### SetBounds
 
 | Parameter | Type |
diff --git a/api/DisplayHandler.md b/api/DisplayHandler.md
index 4e45efaf..43f6342f 100644
--- a/api/DisplayHandler.md
+++ b/api/DisplayHandler.md
@@ -11,6 +11,7 @@ For an example of how to implement handler see [cefpython](cefpython.md).CreateB
 Table of contents:
 * [Callbacks](#callbacks)
   * [OnAddressChange](#onaddresschange)
+  * [OnAutoResize](#onautoresize)
   * [OnTitleChange](#ontitlechange)
   * [OnTooltip](#ontooltip)
   * [OnStatusMessage](#onstatusmessage)
@@ -32,6 +33,22 @@ Table of contents:
 Called when a frame's address has changed.
 
 
+
+### OnAutoResize
+
+| Parameter | Type |
+| --- | --- |
+| browser | [Browser](Browser.md) |
+| new_size | list[width, height] |
+| __Return__ | bool |
+
+Description from upstream CEF:
+> Called when auto-resize is enabled via CefBrowserHost::SetAutoResizeEnabled
+> and the contents have auto-resized. |new_size| will be the desired size in
+> view coordinates. Return true if the resize was handled or false for
+> default handling.
+
+
 ### OnTitleChange
 
 | Parameter | Type |
diff --git a/api/RenderHandler.md b/api/RenderHandler.md
index 3b0d0f0d..a33a2154 100644
--- a/api/RenderHandler.md
+++ b/api/RenderHandler.md
@@ -22,6 +22,7 @@ Table of contents:
   * [OnPaint](#onpaint)
   * [OnCursorChange](#oncursorchange)
   * [OnScrollOffsetChanged](#onscrolloffsetchanged)
+  * [OnTextSelectionChanged](#ontextselectionchanged)
   * [StartDragging](#startdragging)
   * [UpdateDragCursor](#updatedragcursor)
 
diff --git a/src/browser.pyx b/src/browser.pyx
index 335654d6..44ec439d 100644
--- a/src/browser.pyx
+++ b/src/browser.pyx
@@ -218,7 +218,7 @@ cdef class PyBrowser:
             # DisplayHandler
             self.allowedClientCallbacks += [
                     "OnAddressChange", "OnTitleChange", "OnTooltip",
-                    "OnStatusMessage", "OnConsoleMessage"]
+                    "OnStatusMessage", "OnConsoleMessage", "OnAutoResize"]
             # KeyboardHandler
             self.allowedClientCallbacks += ["OnPreKeyEvent", "OnKeyEvent"]
             # RequestHandler
@@ -513,6 +513,17 @@ cdef class PyBrowser:
         PyToCefString(word, cef_word)
         self.GetCefBrowserHost().get().ReplaceMisspelling(cef_word)
 
+    cpdef py_void SetAutoResizeEnabled(self,
+                                       py_bool enabled,
+                                       list min_size,
+                                       list max_size):
+        self.GetCefBrowserHost().get().SetAutoResizeEnabled(
+            bool(enabled),
+            CefSize(min_size[0], min_size[1]),
+            CefSize(max_size[0], max_size[1])
+        )
+
+
     cpdef py_void SetBounds(self, int x, int y, int width, int height):
         IF UNAME_SYSNAME == "Linux":
             x11.SetX11WindowBounds(self.GetCefBrowser(), x, y, width, height)
diff --git a/src/cef_v59..v66_changes.txt b/src/cef_v59..v66_changes.txt
index 2bb23ccf..27260280 100644
--- a/src/cef_v59..v66_changes.txt
+++ b/src/cef_v59..v66_changes.txt
@@ -93,7 +93,7 @@ cef_render_handler.h
 
 cef_browser.h
 + SetAccessibilityState
-- SetAutoResizeEnabled
++ SetAutoResizeEnabled
 - GetExtension
 - IsBackgroundHost
 
@@ -101,7 +101,7 @@ cef_cookie.h
 - GetBlockingManager
 
 cef_display_handler.h
-- OnAutoResize
++ OnAutoResize
 - OnLoadingProgressChange
 
 cef_drag_data.h
diff --git a/src/client_handler/display_handler.cpp b/src/client_handler/display_handler.cpp
index 8e770510..f5ad596e 100644
--- a/src/client_handler/display_handler.cpp
+++ b/src/client_handler/display_handler.cpp
@@ -48,3 +48,9 @@ bool DisplayHandler::OnConsoleMessage(CefRefPtr<CefBrowser> browser,
     return DisplayHandler_OnConsoleMessage(browser, level, message, source,
                                            line);
 }
+
+bool DisplayHandler::OnAutoResize(CefRefPtr<CefBrowser> browser,
+                                  const CefSize& new_size) {
+    REQUIRE_UI_THREAD();
+    return DisplayHandler_OnAutoResize(browser, new_size);
+}
diff --git a/src/client_handler/display_handler.h b/src/client_handler/display_handler.h
index f6f4c865..f058c475 100644
--- a/src/client_handler/display_handler.h
+++ b/src/client_handler/display_handler.h
@@ -33,6 +33,9 @@ class DisplayHandler : public CefDisplayHandler
                           const CefString& source,
                           int line) override;
 
+    bool OnAutoResize(CefRefPtr<CefBrowser> browser,
+                      const CefSize& new_size) override;
+
 private:
     IMPLEMENT_REFCOUNTING(DisplayHandler);
 };
diff --git a/src/extern/cef/cef_browser.pxd b/src/extern/cef/cef_browser.pxd
index 31a4a29d..042d0194 100644
--- a/src/extern/cef/cef_browser.pxd
+++ b/src/extern/cef/cef_browser.pxd
@@ -11,7 +11,7 @@ from libcpp cimport bool as cpp_bool
 from libcpp.vector cimport vector as cpp_vector
 from cef_frame cimport CefFrame
 cimport cef_types
-from cef_types cimport int64, cef_state_t, PaintElementType
+from cef_types cimport int64, cef_state_t, CefSize
 from cef_types cimport CefBrowserSettings, CefPoint
 from cef_drag_data cimport CefDragData
 from cef_types cimport CefMouseEvent
@@ -87,7 +87,10 @@ cdef extern from "include/cef_browser.h":
         void AddWordToDictionary(const CefString& word)
 
         void SetAccessibilityState(cef_state_t accessibility_state)
-        void Invalidate(cef_types.cef_paint_element_type_t type)
+        void Invalidate(cef_types.cef_paint_element_type_t element_type)
+        void SetAutoResizeEnabled(cpp_bool enabled,
+                                  const CefSize& min_size,
+                                  const CefSize& max_size)
 
 
     cdef cppclass CefBrowser:
diff --git a/src/handlers/display_handler.pyx b/src/handlers/display_handler.pyx
index 3ad7a7f6..c60e49bc 100644
--- a/src/handlers/display_handler.pyx
+++ b/src/handlers/display_handler.pyx
@@ -25,6 +25,25 @@ cdef public void DisplayHandler_OnAddressChange(
         (exc_type, exc_value, exc_trace) = sys.exc_info()
         sys.excepthook(exc_type, exc_value, exc_trace)
 
+
+cdef public cpp_bool DisplayHandler_OnAutoResize(
+        CefRefPtr[CefBrowser] cef_browser,
+        const CefSize& new_size
+        ) except * with gil:
+    cdef PyBrowser browser
+    cdef object callback
+    try:
+        browser = GetPyBrowser(cef_browser, "OnAutoResize")
+        callback = browser.GetClientCallback("OnAutoResize")
+        if callback:
+            return bool(callback(browser=browser, new_size=[new_size.width,
+                                                  new_size.height]))
+        return False
+    except:
+        (exc_type, exc_value, exc_trace) = sys.exc_info()
+        sys.excepthook(exc_type, exc_value, exc_trace)
+
+
 cdef public void DisplayHandler_OnTitleChange(
         CefRefPtr[CefBrowser] cefBrowser,
         const CefString& cefTitle
diff --git a/unittests/_common.py b/unittests/_common.py
index 59052583..b71c92f4 100644
--- a/unittests/_common.py
+++ b/unittests/_common.py
@@ -6,9 +6,18 @@
 
 import base64
 import os
+import platform
 import sys
 import time
 
+# Platforms
+SYSTEM = platform.system().upper()
+if SYSTEM == "DARWIN":
+    SYSTEM = "MAC"
+WINDOWS = SYSTEM if SYSTEM == "WINDOWS" else False
+LINUX = SYSTEM if SYSTEM == "LINUX" else False
+MAC = SYSTEM if SYSTEM == "MAC" else False
+
 # To show the window for an extended period of time increase this number.
 MESSAGE_LOOP_RANGE = 100  # each iteration is 0.01 sec
 
diff --git a/unittests/main_test.py b/unittests/main_test.py
index 58fec488..bfa1514c 100644
--- a/unittests/main_test.py
+++ b/unittests/main_test.py
@@ -14,6 +14,7 @@
 import os
 import sys
 
+
 g_datauri_data = """
 <!DOCTYPE html>
 <html>
@@ -134,10 +135,13 @@ def test_main(self):
         # Create browser
         browser = cef.CreateBrowserSync(url=g_datauri)
         self.assertIsNotNone(browser, "Browser object")
+        browser.SetFocus(True)
         subtest_message("cef.CreateBrowserSync() ok")
 
         # Client handlers
-        client_handlers = [LoadHandler(self, g_datauri), DisplayHandler(self)]
+        client_handlers = [LoadHandler(self, g_datauri),
+                           DisplayHandler(self),
+                           DisplayHandler2(self)]
         for handler in client_handlers:
             browser.SetClientHandler(handler)
         subtest_message("browser.SetClientHandler() ok")
@@ -161,6 +165,12 @@ def test_main(self):
         browser.SetJavascriptBindings(bindings)
         subtest_message("browser.SetJavascriptBindings() ok")
 
+        # Set auto resize. Call it after js bindings were set.
+        browser.SetAutoResizeEnabled(enabled=True,
+                                     min_size=[800, 600],
+                                     max_size=[800, 600])
+        subtest_message("browser.SetAutoResizeEnabled() ok")
+
         # Test Request.SetPostData(list)
         # noinspection PyArgumentList
         req = cef.Request.CreateRequest()
@@ -210,6 +220,20 @@ def test_main(self):
         sys.stdout.flush()
 
 
+class DisplayHandler2(object):
+    def __init__(self, test_case):
+        self.test_case = test_case
+        # Asserts for True/False will be checked just before shutdown.
+        # Test whether asserts are working correctly.
+        self.test_for_True = True
+        self.OnAutoResize_True = False
+
+    def OnAutoResize(self, new_size, **_):
+        assert not self.OnAutoResize_True
+        self.OnAutoResize_True = True
+        self.test_case.assertEqual(new_size, [800, 600])
+
+
 class External(object):
     """Javascript 'window.external' object."""
 

From c559f44f70238ac695fbcb380991399cb8b561c4 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Sat, 18 Aug 2018 20:39:42 +0200
Subject: [PATCH 120/238] Fix AutoResize unit tests on Linux

---
 unittests/main_test.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/unittests/main_test.py b/unittests/main_test.py
index bfa1514c..91f27cc8 100644
--- a/unittests/main_test.py
+++ b/unittests/main_test.py
@@ -23,6 +23,8 @@
     body,html {
         font-family: Arial;
         font-size: 11pt;
+        width: 800px;
+        heiht: 600px;
     }
     </style>
     <script>
@@ -168,7 +170,7 @@ def test_main(self):
         # Set auto resize. Call it after js bindings were set.
         browser.SetAutoResizeEnabled(enabled=True,
                                      min_size=[800, 600],
-                                     max_size=[800, 600])
+                                     max_size=[1024, 768])
         subtest_message("browser.SetAutoResizeEnabled() ok")
 
         # Test Request.SetPostData(list)
@@ -229,9 +231,11 @@ def __init__(self, test_case):
         self.OnAutoResize_True = False
 
     def OnAutoResize(self, new_size, **_):
-        assert not self.OnAutoResize_True
         self.OnAutoResize_True = True
-        self.test_case.assertEqual(new_size, [800, 600])
+        self.test_case.assertGreaterEqual(new_size[0], 800)
+        self.test_case.assertLessEqual(new_size[0], 1024)
+        self.test_case.assertGreaterEqual(new_size[1], 600)
+        self.test_case.assertLessEqual(new_size[1], 768)
 
 
 class External(object):

From a0b1040971f9c0db326a2d5f96b9a0525ede85a5 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Sat, 18 Aug 2018 20:40:44 +0200
Subject: [PATCH 121/238] Fix AutoResize unit test on Linux #2

---
 unittests/main_test.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/unittests/main_test.py b/unittests/main_test.py
index 91f27cc8..4ecc2e2a 100644
--- a/unittests/main_test.py
+++ b/unittests/main_test.py
@@ -23,8 +23,10 @@
     body,html {
         font-family: Arial;
         font-size: 11pt;
-        width: 800px;
-        heiht: 600px;
+    }
+    body {
+        width: 810px;
+        heiht: 610px;
     }
     </style>
     <script>

From 2778bc51dab86198266864672a9917ee28aec724 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Sat, 18 Aug 2018 20:52:35 +0200
Subject: [PATCH 122/238] Update README-examples.md

---
 examples/README-examples.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/examples/README-examples.md b/examples/README-examples.md
index bb27e336..eb64b0d4 100644
--- a/examples/README-examples.md
+++ b/examples/README-examples.md
@@ -50,7 +50,9 @@ workarounds.
   library
 - [qt.py](qt.py): example for [PyQt4](https://wiki.python.org/moin/PyQt4),
   [PyQt5](https://pypi.python.org/pypi/PyQt5)
-  and [PySide](https://wiki.qt.io/PySide) libraries
+  and [PySide](https://wiki.qt.io/PySide) libraries.
+  PyQt4 and PySide examples are currently broken on Linux, see
+  [Issue #452](../../../issues/452).
 - [tkinter_.py](tkinter_.py): example for [Tkinter](https://wiki.python.org/moin/TkInter).
   Currently broken on Mac ([#309](../../../issues/309)).
 - [wxpython.py](wxpython.py): example for [wxPython](https://wxpython.org/)

From f5d4696024e680b26770fbda63a0e342cb95eee8 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Sun, 19 Aug 2018 10:34:08 +0200
Subject: [PATCH 123/238] Add CookieManager.GetBlockingManager (#403)

---
 README.md                     |  1 +
 api/API-index.md              |  1 +
 api/CookieManager.md          | 36 +++++++++++++++++++++++++++++------
 examples/wxpython.py          |  4 ++--
 src/cef_v59..v66_changes.txt  |  3 ++-
 src/cookie.pyx                | 32 +++++++++++++++++++++++++------
 src/extern/cef/cef_cookie.pxd |  6 ++++++
 unittests/main_test.py        |  9 +++++++++
 8 files changed, 77 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index dafbf9ff..04897140 100644
--- a/README.md
+++ b/README.md
@@ -509,6 +509,7 @@ Additional information for v31.2 release:
   * [GetExpires](api/Cookie.md#getexpires)
 * [CookieManager (class)](api/CookieManager.md#cookiemanager-class)
   * [GetGlobalManager](api/CookieManager.md#getglobalmanager)
+  * [GetBlockingManager](api/CookieManager.md#getblockingmanager)
   * [CreateManager](api/CookieManager.md#createmanager)
   * [SetSupportedSchemes](api/CookieManager.md#setsupportedschemes)
   * [VisitAllCookies](api/CookieManager.md#visitallcookies)
diff --git a/api/API-index.md b/api/API-index.md
index 9c5374da..d236471d 100644
--- a/api/API-index.md
+++ b/api/API-index.md
@@ -197,6 +197,7 @@
   * [GetExpires](Cookie.md#getexpires)
 * [CookieManager (class)](CookieManager.md#cookiemanager-class)
   * [GetGlobalManager](CookieManager.md#getglobalmanager)
+  * [GetBlockingManager](CookieManager.md#getblockingmanager)
   * [CreateManager](CookieManager.md#createmanager)
   * [SetSupportedSchemes](CookieManager.md#setsupportedschemes)
   * [VisitAllCookies](CookieManager.md#visitallcookies)
diff --git a/api/CookieManager.md b/api/CookieManager.md
index 6c70b153..b0d06a91 100644
--- a/api/CookieManager.md
+++ b/api/CookieManager.md
@@ -3,10 +3,11 @@
 
 # CookieManager (class)
 
-This class cannot be instantiated directly, use the CreateManager()
-static method for this purpose.
+Class used for managing cookies. The methods of this class may be called on
+any thread unless otherwise indicated.
 
-The cookie tests can be found in the wxpython.py script.
+Use the `CookieManager.CreateManager` static method to instantiate
+this class.
 
 TODO: in upstream CEF some methods here have a callback parameter
 that when non-NULL will execute asynchronously on the IO thread
@@ -17,6 +18,7 @@ also have an OnComplete callback.
 Table of contents:
 * [Methods](#methods)
   * [GetGlobalManager](#getglobalmanager)
+  * [GetBlockingManager](#getblockingmanager)
   * [CreateManager](#createmanager)
   * [SetSupportedSchemes](#setsupportedschemes)
   * [VisitAllCookies](#visitallcookies)
@@ -34,11 +36,33 @@ Table of contents:
 
 | | |
 | --- | --- |
-| __Return__ | static [CookieManager](CookieManager.md) |
+| __Return__ | [CookieManager](CookieManager.md) |
 
 Returns the global cookie manager. By default data will be stored at
 [ApplicationSettings](ApplicationSettings.md).cache_path if specified or in memory otherwise.
 
+Description from upstream CEF:
+> Returns the global cookie manager. By default data will be stored at
+> CefSettings.cache_path if specified or in memory otherwise. If |callback|
+> is non-NULL it will be executed asnychronously on the IO thread after the
+> manager's storage has been initialized. Using this method is equivalent to
+> calling CefRequestContext::GetGlobalContext()->GetDefaultCookieManager()
+
+
+### GetBlockingManager
+
+| | |
+| --- | --- |
+| __Return__ | [CookieManager](CookieManager.md) |
+
+Description from upstream CEF:
+> Returns a cookie manager that neither stores nor retrieves cookies. All
+> usage of cookies will be blocked including cookies accessed via the network
+> (request/response headers), via JavaScript (document.cookie), and via
+> CefCookieManager methods. No cookies will be displayed in DevTools. If you
+> wish to only block cookies sent via the network use the CefRequestHandler
+> CanGetCookies and CanSetCookie methods instead.
+
 
 ### CreateManager
 
@@ -46,7 +70,7 @@ Returns the global cookie manager. By default data will be stored at
 | --- | --- |
 | path | string |
 | persistSessionCookies=False | bool |
-| __Return__ | static [CookieManager](CookieManager.md) |
+| __Return__ | [CookieManager](CookieManager.md) |
 
 Creates a new cookie manager. Otherwise, data will be stored at the
 specified |path|. To persist session cookies (cookies without an expiry
@@ -181,4 +205,4 @@ Flush the backing store (if any) to disk. If |callback| is non-NULL it will
 be executed asnychronously on the IO thread after the flush is complete.
 Returns false if cookies cannot be accessed.
 
-The callback arg is not implemented.
+The callback arg is not implemented yet.
diff --git a/examples/wxpython.py b/examples/wxpython.py
index 915f7dff..6f3892c7 100644
--- a/examples/wxpython.py
+++ b/examples/wxpython.py
@@ -79,7 +79,7 @@ def scale_window_size_for_high_dpi(width, height):
     if not WINDOWS:
         return width, height
     (_, _, max_width, max_height) = wx.GetClientDisplayRect().Get()
-    # noinspection PyUnresolvedReferences, PyArgumentList
+    # noinspection PyUnresolvedReferences
     (width, height) = cef.DpiAware.Scale((width, height))
     if width > max_width:
         width = max_width
@@ -174,7 +174,7 @@ def create_menu(self):
     def embed_browser(self):
         window_info = cef.WindowInfo()
         (width, height) = self.browser_panel.GetClientSize().Get()
-        assert self.browser_panel.GetHandle(), "Window handle not available yet"
+        assert self.browser_panel.GetHandle(), "Window handle not available"
         window_info.SetAsChild(self.browser_panel.GetHandle(),
                                [0, 0, width, height])
         self.browser = cef.CreateBrowserSync(window_info,
diff --git a/src/cef_v59..v66_changes.txt b/src/cef_v59..v66_changes.txt
index 27260280..64f45a31 100644
--- a/src/cef_v59..v66_changes.txt
+++ b/src/cef_v59..v66_changes.txt
@@ -73,6 +73,7 @@ NEW FEATURES
 + unittests/osr_test.py - new test for off-screen rendering mode
 + cefpython.SetGlobalClientHandler
 + Browser.Invalidate
++ CookieManager.FlushStore
 
 internal/cef_types.h
 + cef_log_severity_t: new key LOGSEVERITY_DEBUG (no need to expose,
@@ -98,7 +99,7 @@ cef_browser.h
 - IsBackgroundHost
 
 cef_cookie.h
-- GetBlockingManager
++ GetBlockingManager
 
 cef_display_handler.h
 + OnAutoResize
diff --git a/src/cookie.pyx b/src/cookie.pyx
index 4ccf8844..ce078c10 100644
--- a/src/cookie.pyx
+++ b/src/cookie.pyx
@@ -181,9 +181,12 @@ cdef class Cookie:
 # CookieManager
 # ------------------------------------------------------------------------------
 
-class CookieManager:
-    @staticmethod
-    def GetGlobalManager():
+class CookieManager(object):
+    """Class used for managing cookies. To instantiate this class
+    call CreateManager() static method."""
+
+    @classmethod
+    def GetGlobalManager(cls):
         global g_globalCookieManager
         cdef CefRefPtr[CefCookieManager] cefCookieManager
         if not g_globalCookieManager:
@@ -192,11 +195,28 @@ class CookieManager:
             g_globalCookieManager = CreatePyCookieManager(cefCookieManager)
         return g_globalCookieManager
 
-    @staticmethod
-    def CreateManager(py_string path, py_bool persistSessionCookies=False):
+    @classmethod
+    def GetBlockingManager(cls):
+        return CreatePyCookieManager(CefCookieManager_GetBlockingManager())
+
+    @classmethod
+    def CreateManager(cls, py_string path,
+                      py_bool persist_session_cookies=False):
+        """
+        Create a new cookie manager.
+        :param path:
+        :type path: str
+        :param persist_session_cookies:
+        :type path: bool
+        :return: CookieManager object
+        :rtype: CookieManager
+        """
+        # When PyCharm generates a stub for the cefpython module
+        # it doesn't use the above docstring for code inspections.
+        # No idea why.
         cdef CefRefPtr[CefCookieManager] cefCookieManager
         cefCookieManager = CefCookieManager_CreateManager(
-                PyToCefStringValue(path), bool(persistSessionCookies),
+                PyToCefStringValue(path), bool(persist_session_cookies),
                 <CefRefPtr[CefCompletionCallback]?>NULL)
         if <void*>cefCookieManager != NULL and cefCookieManager.get():
             return CreatePyCookieManager(cefCookieManager)
diff --git a/src/extern/cef/cef_cookie.pxd b/src/extern/cef/cef_cookie.pxd
index e1778786..c113aea9 100644
--- a/src/extern/cef/cef_cookie.pxd
+++ b/src/extern/cef/cef_cookie.pxd
@@ -27,11 +27,17 @@ cdef extern from "include/cef_cookie.h":
     cdef CefRefPtr[CefCookieManager] CefCookieManager_GetGlobalManager \
             "CefCookieManager::GetGlobalManager"(
                 CefRefPtr[CefCompletionCallback] callback)
+
+    cdef CefRefPtr[CefCookieManager] CefCookieManager_GetBlockingManager \
+            "CefCookieManager::GetBlockingManager"()
+
+
     cdef CefRefPtr[CefCookieManager] CefCookieManager_CreateManager \
             "CefCookieManager::CreateManager"(
                 const CefString& path,
                 cpp_bool persist_session_cookies,
                 CefRefPtr[CefCompletionCallback] callback)
+
     cdef cppclass CefCookieManager:
         void SetSupportedSchemes(const cpp_vector[CefString]& schemes,
                                  CefRefPtr[CefCompletionCallback] callback)
diff --git a/unittests/main_test.py b/unittests/main_test.py
index 4ecc2e2a..0b141a67 100644
--- a/unittests/main_test.py
+++ b/unittests/main_test.py
@@ -197,6 +197,15 @@ def test_main(self):
         self.assertEqual(req_data, req.GetPostData())
         subtest_message("cef.Request.SetPostData(dict) ok")
 
+        # Cookie manager
+        self.assertIsInstance(cef.CookieManager.CreateManager(path=""),
+                              cef.PyCookieManager)
+        self.assertIsInstance(cef.CookieManager.GetGlobalManager(),
+                              cef.PyCookieManager)
+        self.assertIsInstance(cef.CookieManager.GetBlockingManager(),
+                              cef.PyCookieManager)
+        subtest_message("cef.CookieManager ok")
+
         # Run message loop
         run_message_loop()
 

From 5c15c72db9dc2199df54bea04f121ba16afadd88 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Sun, 19 Aug 2018 13:24:57 +0200
Subject: [PATCH 124/238] Fix code inspection in PyCharm (#456), ehhance tests
 and add new APIs.

Add Browser.GetSetting.
Add Browser.HasDevTools.
Add cef.GetBrowserByIdentifier.
Add BrowserSettings.inherit_client_handlers_for_popups.
---
 README.md                      |  4 +++
 api/API-index.md               |  4 +++
 api/Browser.md                 | 24 +++++++++++++++
 api/BrowserSettings.md         | 16 ++++++++++
 api/cefpython.md               | 12 ++++++++
 examples/wxpython.py           | 13 ++++----
 src/browser.pyx                | 33 ++++++++++++++++++--
 src/cef_v59..v66_changes.txt   |  4 +++
 src/cefpython.pyx              | 15 +++++++++-
 src/dpi_aware_win.pyx          | 24 +++++++--------
 src/extern/cef/cef_browser.pxd |  1 +
 src/settings.pyx               |  5 +++-
 src/window_utils_linux.pyx     | 35 +++++++++++-----------
 src/window_utils_mac.pyx       | 27 +++++++++--------
 src/window_utils_win.pyx       | 36 +++++++++++-----------
 unittests/_common.py           | 55 ++++++++++++++++++++++++++++++----
 unittests/main_test.py         | 52 +++++++++++++++++++++++++++++++-
 17 files changed, 282 insertions(+), 78 deletions(-)

diff --git a/README.md b/README.md
index 04897140..cbe04d95 100644
--- a/README.md
+++ b/README.md
@@ -381,6 +381,7 @@ Additional information for v31.2 release:
   * [GetNSTextInputContext](api/Browser.md#getnstextinputcontext)
   * [GetOpenerWindowHandle](api/Browser.md#getopenerwindowhandle)
   * [GetOuterWindowHandle](api/Browser.md#getouterwindowhandle)
+  * [GetSetting](api/Browser.md#getsetting)
   * [GetUrl](api/Browser.md#geturl)
   * [GetUserData](api/Browser.md#getuserdata)
   * [GetWindowHandle](api/Browser.md#getwindowhandle)
@@ -390,6 +391,7 @@ Additional information for v31.2 release:
   * [GoForward](api/Browser.md#goforward)
   * [HandleKeyEventAfterTextInputClient](api/Browser.md#handlekeyeventaftertextinputclient)
   * [HandleKeyEventBeforeTextInputClient](api/Browser.md#handlekeyeventbeforetextinputclient)
+  * [HasDevTools](api/Browser.md#hasdevtools)
   * [HasDocument](api/Browser.md#hasdocument)
   * [Invalidate](api/Browser.md#invalidate)
   * [IsFullscreen](api/Browser.md#isfullscreen)
@@ -439,6 +441,7 @@ Additional information for v31.2 release:
   * [default_encoding](api/BrowserSettings.md#default_encoding)
   * [dom_paste_disabled](api/BrowserSettings.md#dom_paste_disabled)
   * [file_access_from_file_urls_allowed](api/BrowserSettings.md#file_access_from_file_urls_allowed)
+  * [inherit_client_handlers_for_popups](api/BrowserSettings.md#inherit_client_handlers_for_popups)
   * [image_load_disabled](api/BrowserSettings.md#image_load_disabled)
   * [javascript_disabled](api/BrowserSettings.md#javascript_disabled)
   * [javascript_close_windows_disallowed](api/BrowserSettings.md#javascript_close_windows_disallowed)
@@ -463,6 +466,7 @@ Additional information for v31.2 release:
   * [ExceptHook](api/cefpython.md#excepthook)
   * [GetAppSetting](api/cefpython.md#getappsetting)
   * [GetAppPath](api/cefpython.md#getapppath)
+  * [GetBrowserByIdentifier](api/cefpython.md#getbrowserbyidentifier)
   * [GetBrowserByWindowHandle](api/cefpython.md#getbrowserbywindowhandle)
   * [GetCommandLineSwitch](api/cefpython.md#getcommandlineswitch)
   * [GetGlobalClientCallback](api/cefpython.md#getglobalclientcallback)
diff --git a/api/API-index.md b/api/API-index.md
index d236471d..a7b17aaf 100644
--- a/api/API-index.md
+++ b/api/API-index.md
@@ -69,6 +69,7 @@
   * [GetNSTextInputContext](Browser.md#getnstextinputcontext)
   * [GetOpenerWindowHandle](Browser.md#getopenerwindowhandle)
   * [GetOuterWindowHandle](Browser.md#getouterwindowhandle)
+  * [GetSetting](Browser.md#getsetting)
   * [GetUrl](Browser.md#geturl)
   * [GetUserData](Browser.md#getuserdata)
   * [GetWindowHandle](Browser.md#getwindowhandle)
@@ -78,6 +79,7 @@
   * [GoForward](Browser.md#goforward)
   * [HandleKeyEventAfterTextInputClient](Browser.md#handlekeyeventaftertextinputclient)
   * [HandleKeyEventBeforeTextInputClient](Browser.md#handlekeyeventbeforetextinputclient)
+  * [HasDevTools](Browser.md#hasdevtools)
   * [HasDocument](Browser.md#hasdocument)
   * [Invalidate](Browser.md#invalidate)
   * [IsFullscreen](Browser.md#isfullscreen)
@@ -127,6 +129,7 @@
   * [default_encoding](BrowserSettings.md#default_encoding)
   * [dom_paste_disabled](BrowserSettings.md#dom_paste_disabled)
   * [file_access_from_file_urls_allowed](BrowserSettings.md#file_access_from_file_urls_allowed)
+  * [inherit_client_handlers_for_popups](BrowserSettings.md#inherit_client_handlers_for_popups)
   * [image_load_disabled](BrowserSettings.md#image_load_disabled)
   * [javascript_disabled](BrowserSettings.md#javascript_disabled)
   * [javascript_close_windows_disallowed](BrowserSettings.md#javascript_close_windows_disallowed)
@@ -151,6 +154,7 @@
   * [ExceptHook](cefpython.md#excepthook)
   * [GetAppSetting](cefpython.md#getappsetting)
   * [GetAppPath](cefpython.md#getapppath)
+  * [GetBrowserByIdentifier](cefpython.md#getbrowserbyidentifier)
   * [GetBrowserByWindowHandle](cefpython.md#getbrowserbywindowhandle)
   * [GetCommandLineSwitch](cefpython.md#getcommandlineswitch)
   * [GetGlobalClientCallback](cefpython.md#getglobalclientcallback)
diff --git a/api/Browser.md b/api/Browser.md
index 977d9005..0d9c32e3 100644
--- a/api/Browser.md
+++ b/api/Browser.md
@@ -45,6 +45,7 @@ Table of contents:
   * [GetNSTextInputContext](#getnstextinputcontext)
   * [GetOpenerWindowHandle](#getopenerwindowhandle)
   * [GetOuterWindowHandle](#getouterwindowhandle)
+  * [GetSetting](#getsetting)
   * [GetUrl](#geturl)
   * [GetUserData](#getuserdata)
   * [GetWindowHandle](#getwindowhandle)
@@ -54,6 +55,7 @@ Table of contents:
   * [GoForward](#goforward)
   * [HandleKeyEventAfterTextInputClient](#handlekeyeventaftertextinputclient)
   * [HandleKeyEventBeforeTextInputClient](#handlekeyeventbeforetextinputclient)
+  * [HasDevTools](#hasdevtools)
   * [HasDocument](#hasdocument)
   * [Invalidate](#invalidate)
   * [IsFullscreen](#isfullscreen)
@@ -495,6 +497,17 @@ Retrieve the CEF-internal (inner or outer) window handle of the browser that ope
 Get the most outer window handle.
 
 
+### GetSetting
+
+| Parameter | Type |
+| --- | --- |
+| key | str |
+| __Return__ | mixed |
+
+Get a browser setting. You can set browser settings by passing
+`settings` parameter to `cef.CreateBrowserSync`.
+
+
 ### GetUrl
 
 | | |
@@ -584,6 +597,17 @@ Handles a keyDown event prior to passing it through the NSTextInputClient
 machinery.
 
 
+### HasDevTools
+
+| | |
+| --- | --- |
+| __Return__ | bool |
+
+Description from upstream CEF:
+> Returns true if this browser currently has an associated DevTools browser.
+> Must be called on the browser process UI thread.
+
+
 ### HasDocument
 
 | | |
diff --git a/api/BrowserSettings.md b/api/BrowserSettings.md
index 4b1b13af..ed2b2e50 100644
--- a/api/BrowserSettings.md
+++ b/api/BrowserSettings.md
@@ -15,6 +15,7 @@ Table of contents:
   * [default_encoding](#default_encoding)
   * [dom_paste_disabled](#dom_paste_disabled)
   * [file_access_from_file_urls_allowed](#file_access_from_file_urls_allowed)
+  * [inherit_client_handlers_for_popups](#inherit_client_handlers_for_popups)
   * [image_load_disabled](#image_load_disabled)
   * [javascript_disabled](#javascript_disabled)
   * [javascript_close_windows_disallowed](#javascript_close_windows_disallowed)
@@ -110,6 +111,21 @@ in a known order. Equivalent to the `SkColor` type in Chromium.
 (bool) Controls whether file URLs will have access to other file URLs. Also configurable using the --allow-access-from-files switch. Other similar switches are: --allow-file-access and --allow-file-access-from-files.
 
 
+### inherit_client_handlers_for_popups
+
+
+(bool) Default: True.
+
+Whether to inherit client handlers and callbacks for popup windows
+opened with "window.open". For example when you set a handler using
+`browser.SetClientHandler` then this handler will also be resued
+for popup windows that are created implicitilly via "window.open"
+call in javascript or similar. If you implement
+`LifespanHandler.OnBeforePopup` then you can control explicitilly
+what handlers are set for the popup browser. To disable the default
+behavior set this option to False.
+
+
 ### image_load_disabled
 
 (bool) Controls whether image URLs will be loaded from the network. A cached image will still be rendered if requested. Also configurable using the --disable-image-loading switch.
diff --git a/api/cefpython.md b/api/cefpython.md
index 20cb8b9f..efeed621 100644
--- a/api/cefpython.md
+++ b/api/cefpython.md
@@ -13,6 +13,7 @@ Table of contents:
   * [ExceptHook](#excepthook)
   * [GetAppSetting](#getappsetting)
   * [GetAppPath](#getapppath)
+  * [GetBrowserByIdentifier](#getbrowserbyidentifier)
   * [GetBrowserByWindowHandle](#getbrowserbywindowhandle)
   * [GetCommandLineSwitch](#getcommandlineswitch)
   * [GetGlobalClientCallback](#getglobalclientcallback)
@@ -107,6 +108,17 @@ to Initialize(). Returns None if key is not found.
 Get path to where application resides.
 
 
+### GetBrowserByIdentifier
+
+| Parameter | Type |
+| --- | --- |
+| identifier | int |
+| __Return__ | void |
+
+Get browser by identifier. Browser identifier can be obtained by
+calling `Browser.GetIdentifier`.
+
+
 ### GetBrowserByWindowHandle
 
 | Parameter | Type |
diff --git a/examples/wxpython.py b/examples/wxpython.py
index 6f3892c7..92dd7d83 100644
--- a/examples/wxpython.py
+++ b/examples/wxpython.py
@@ -13,9 +13,6 @@
 import sys
 import os
 
-# Fix for PyCharm hints warnings when using static methods
-WindowUtils = cef.WindowUtils()
-
 # Platforms
 WINDOWS = (platform.system() == "Windows")
 LINUX = (platform.system() == "Linux")
@@ -97,7 +94,7 @@ def __init__(self):
         # installing X11 error handlers. This must be done after
         # wx was intialized.
         if LINUX:
-            WindowUtils.InstallX11ErrorHandlers()
+            cef.WindowUtils.InstallX11ErrorHandlers()
 
         global g_count_windows
         g_count_windows += 1
@@ -185,16 +182,16 @@ def OnSetFocus(self, _):
         if not self.browser:
             return
         if WINDOWS:
-            WindowUtils.OnSetFocus(self.browser_panel.GetHandle(),
-                                   0, 0, 0)
+            cef.WindowUtils.OnSetFocus(self.browser_panel.GetHandle(),
+                                       0, 0, 0)
         self.browser.SetFocus(True)
 
     def OnSize(self, _):
         if not self.browser:
             return
         if WINDOWS:
-            WindowUtils.OnSize(self.browser_panel.GetHandle(),
-                               0, 0, 0)
+            cef.WindowUtils.OnSize(self.browser_panel.GetHandle(),
+                                   0, 0, 0)
         elif LINUX:
             (x, y) = (0, 0)
             (width, height) = self.browser_panel.GetSize().Get()
diff --git a/src/browser.pyx b/src/browser.pyx
index 44ec439d..bec49de2 100644
--- a/src/browser.pyx
+++ b/src/browser.pyx
@@ -19,6 +19,8 @@ MOUSEBUTTON_RIGHT = cef_types.MBT_RIGHT
 
 cdef dict g_pyBrowsers = {}
 
+# See also g_browser_settings defined in cefpython.pyx
+
 # Unreferenced browsers are added to this list in OnBeforeClose().
 # Must keep a list of unreferenced browsers so that a new reference
 # is not created in GetPyBrowser() when browser was closed.
@@ -122,9 +124,15 @@ cdef PyBrowser GetPyBrowser(CefRefPtr[CefBrowser] cefBrowser,
             openerHandle = pyBrowser.GetOpenerWindowHandle()
             for identifier, tempPyBrowser in g_pyBrowsers.items():
                 if tempPyBrowser.GetWindowHandle() == openerHandle:
-                    clientCallbacks = tempPyBrowser.GetClientCallbacksDict()
-                    if clientCallbacks:
-                        pyBrowser.SetClientCallbacksDict(clientCallbacks)
+                    # tempPyBrowser is a parent browser
+                    if tempPyBrowser.GetSetting("inherit_client_handlers_for_popups"):
+                        if pyBrowser.GetIdentifier() not in g_browser_settings:
+                            g_browser_settings[pyBrowser.GetIdentifier()] = {}
+                        g_browser_settings[pyBrowser.GetIdentifier()]["inherit_client_handlers_for_popups"] =\
+                            tempPyBrowser.GetSetting("inherit_client_handlers_for_popups")
+                        clientCallbacks = tempPyBrowser.GetClientCallbacksDict()
+                        if clientCallbacks:
+                            pyBrowser.SetClientCallbacksDict(clientCallbacks)
                     javascriptBindings = tempPyBrowser.GetJavascriptBindings()
                     if javascriptBindings:
                         if javascriptBindings.GetBindToPopups():
@@ -158,6 +166,15 @@ cpdef PyBrowser GetBrowserByWindowHandle(WindowHandle windowHandle):
             return pyBrowser
     return None
 
+
+cpdef PyBrowser GetBrowserByIdentifier(int identifier):
+    cdef PyBrowser pyBrowser
+    for browserId in g_pyBrowsers:
+        pyBrowser = g_pyBrowsers[browserId]
+        if pyBrowser.GetIdentifier() == identifier:
+            return pyBrowser
+    return None
+
 cdef public void PyBrowser_ShowDevTools(CefRefPtr[CefBrowser] cefBrowser
         ) except * with gil:
     # Called from ClientHandler::OnContextMenuCommand
@@ -324,6 +341,13 @@ cdef class PyBrowser:
             NonCriticalError("GetImage not implemented on this platform")
             return None
 
+    cpdef object GetSetting(self, py_string key):
+        cdef int browser_id = self.GetIdentifier()
+        if browser_id in g_browser_settings:
+            if key in g_browser_settings[browser_id]:
+                return g_browser_settings[browser_id][key]
+        return None
+
     # --------------
     # CEF API.
     # --------------
@@ -474,6 +498,9 @@ cdef class PyBrowser:
     cpdef py_void GoForward(self):
         self.GetCefBrowser().get().GoForward()
 
+    cpdef py_bool HasDevTools(self):
+        return self.GetCefBrowserHost().get().HasDevTools()
+
     cpdef py_bool HasDocument(self):
         return self.GetCefBrowser().get().HasDocument()
 
diff --git a/src/cef_v59..v66_changes.txt b/src/cef_v59..v66_changes.txt
index 64f45a31..73e8ed2f 100644
--- a/src/cef_v59..v66_changes.txt
+++ b/src/cef_v59..v66_changes.txt
@@ -74,6 +74,10 @@ NEW FEATURES
 + cefpython.SetGlobalClientHandler
 + Browser.Invalidate
 + CookieManager.FlushStore
++ BrowserSettings.inherit_client_handlers_for_popups
++ Browser.GetSetting
++ cefpython.GetBrowserByIdentifier
++ Browser.HasDevTools
 
 internal/cef_types.h
 + cef_log_severity_t: new key LOGSEVERITY_DEBUG (no need to expose,
diff --git a/src/cefpython.pyx b/src/cefpython.pyx
index 2f3d3ef1..cf7d7e46 100644
--- a/src/cefpython.pyx
+++ b/src/cefpython.pyx
@@ -312,6 +312,7 @@ g_debug = False
 # The string_encoding key must be set early here and also in Initialize.
 g_applicationSettings = {"string_encoding": "utf-8"}
 g_commandLineSwitches = {}
+g_browser_settings = {}
 
 # If ApplicationSettings.unique_request_context_per_browser is False
 # then a shared request context is used for all browsers. Otherwise
@@ -721,9 +722,12 @@ def CreateBrowserSync(windowInfo=None,
     if window_title and windowInfo.parentWindowHandle == 0:
         windowInfo.windowName = window_title
 
+    # Browser settings
     if not browserSettings:
         browserSettings = {}
-
+    # CEF Python only settings
+    if "inherit_client_handlers_for_popups" not in browserSettings:
+        browserSettings["inherit_client_handlers_for_popups"] = True
     cdef CefBrowserSettings cefBrowserSettings
     SetBrowserSettings(browserSettings, &cefBrowserSettings)
 
@@ -774,6 +778,15 @@ def CreateBrowserSync(windowInfo=None,
     Debug("CefBrowser window handle = "
           +str(<uintptr_t>cefBrowser.get().GetHost().get().GetWindowHandle()))
 
+    # Make a copy as browserSettings is a reference only that might
+    # get destroyed later.
+    global g_browser_settings
+    cdef int browser_id = cefBrowser.get().GetIdentifier()
+    g_browser_settings[browser_id] = {}
+    for key in browserSettings:
+        g_browser_settings[browser_id][key] =\
+            copy.deepcopy(browserSettings[key])
+
     # Request context - part 2/2.
     if g_applicationSettings["unique_request_context_per_browser"]:
         requestContextHandler.get().SetBrowser(cefBrowser)
diff --git a/src/dpi_aware_win.pyx b/src/dpi_aware_win.pyx
index b6ed169c..a7fc345f 100644
--- a/src/dpi_aware_win.pyx
+++ b/src/dpi_aware_win.pyx
@@ -6,8 +6,8 @@ include "cefpython.pyx"
 
 class DpiAware:
 
-    @staticmethod
-    def GetSystemDpi():
+    @classmethod
+    def GetSystemDpi(cls):
         """Returns Windows DPI settings ("Custom scaling" on Win10).
 
         Win7 DPI (Control Panel > Appearance and Personalization > Display):
@@ -25,15 +25,15 @@ class DpiAware:
         GetSystemDpi(&dpix, &dpiy)
         return dpix, dpiy
 
-    @staticmethod
-    def CalculateWindowSize(int width, int height):
+    @classmethod
+    def CalculateWindowSize(cls, int width, int height):
         """@DEPRECATED. Use Scale() method instead."""
         # Calculation for DPI < 96 is not yet supported.
         GetDpiAwareWindowSize(&width, &height)
         return width, height
 
-    @staticmethod
-    def Scale(arg):
+    @classmethod
+    def Scale(cls, arg):
         """Scale units for high DPI devices. Argument can be an int,
         tuple or list."""
         (dpix, dpiy) = DpiAware.GetSystemDpi()
@@ -54,17 +54,17 @@ class DpiAware:
             return tuple(ret)
         return ret
 
-    @staticmethod
-    def IsProcessDpiAware():
+    @classmethod
+    def IsProcessDpiAware(cls):
         return IsProcessDpiAware()
 
-    @staticmethod
-    def SetProcessDpiAware():
+    @classmethod
+    def SetProcessDpiAware(cls):
         """Deprecated."""
         DpiAware.EnableHighDpiSupport()
 
-    @staticmethod
-    def EnableHighDpiSupport():
+    @classmethod
+    def EnableHighDpiSupport(cls):
         # This CEF function sets process to be DPI aware. This
         # CEF func is also called in subprocesses.
         CefEnableHighDPISupport()
diff --git a/src/extern/cef/cef_browser.pxd b/src/extern/cef/cef_browser.pxd
index 042d0194..da209d5c 100644
--- a/src/extern/cef/cef_browser.pxd
+++ b/src/extern/cef/cef_browser.pxd
@@ -62,6 +62,7 @@ cdef extern from "include/cef_browser.h":
                           const CefBrowserSettings& settings,
                           const CefPoint& inspect_element_at)
         void CloseDevTools()
+        cpp_bool HasDevTools()
 
         CefRefPtr[CefRequestContext] GetRequestContext()
 
diff --git a/src/settings.pyx b/src/settings.pyx
index 08204491..d7052eae 100644
--- a/src/settings.pyx
+++ b/src/settings.pyx
@@ -139,7 +139,10 @@ cdef void SetBrowserSettings(
     cdef CefString* cefString
 
     for key in browserSettings:
-        if key == "accept_language_list":
+        if key == "inherit_client_handlers_for_popups":
+            # CEF Python only options. These are not to be found in CEF.
+            continue
+        elif key == "accept_language_list":
             cefString = new CefString(&cefBrowserSettings.accept_language_list)
             PyToCefStringPointer(browserSettings[key], cefString)
             del cefString
diff --git a/src/window_utils_linux.pyx b/src/window_utils_linux.pyx
index 63dda9c8..51691a42 100644
--- a/src/window_utils_linux.pyx
+++ b/src/window_utils_linux.pyx
@@ -8,46 +8,47 @@ class WindowUtils:
     # You have to overwrite this class and provide implementations
     # for these methods.
 
-    @staticmethod
-    def OnSetFocus(WindowHandle windowHandle, long msg, long wparam,
+    @classmethod
+    def OnSetFocus(cls, WindowHandle windowHandle, long msg, long wparam,
                    long lparam):
         # Available only on Windows, but have it available on other
         # platforms so that PyCharm doesn't warn about unresolved reference.
         pass
 
-    @staticmethod
-    def OnSize(WindowHandle windowHandle, long msg, long wparam, long lparam):
+    @classmethod
+    def OnSize(cls, WindowHandle windowHandle, long msg, long wparam,
+               long lparam):
         # Available only on Windows, but have it available on other
         # platforms so that PyCharm doesn't warn about unresolved reference.
         pass
 
-    @staticmethod
-    def OnEraseBackground(WindowHandle windowHandle, long msg, long wparam,
-                          long lparam):
+    @classmethod
+    def OnEraseBackground(cls, WindowHandle windowHandle, long msg,
+                          long wparam, long lparam):
         # Available only on Windows, but have it available on other
         # platforms so that PyCharm doesn't warn about unresolved reference.
         pass
 
-    @staticmethod
-    def GetParentHandle(WindowHandle windowHandle):
+    @classmethod
+    def GetParentHandle(cls, WindowHandle windowHandle):
         Debug("WindowUtils::GetParentHandle() not implemented (returns 0)")
         return 0
 
-    @staticmethod
-    def IsWindowHandle(WindowHandle windowHandle):
+    @classmethod
+    def IsWindowHandle(cls, WindowHandle windowHandle):
         Debug("WindowUtils::IsWindowHandle() not implemented (always True)")
         return True
 
-    @staticmethod
-    def gtk_plug_new(WindowHandle gdkNativeWindow):
+    @classmethod
+    def gtk_plug_new(cls, WindowHandle gdkNativeWindow):
         return <WindowHandle>gtk_plug_new(<GdkNativeWindow>gdkNativeWindow)
 
-    @staticmethod
-    def gtk_widget_show(WindowHandle gtkWidgetPtr):
+    @classmethod
+    def gtk_widget_show(cls, WindowHandle gtkWidgetPtr):
         with nogil:
             gtk_widget_show(<GtkWidget*>gtkWidgetPtr)
 
-    @staticmethod
-    def InstallX11ErrorHandlers():
+    @classmethod
+    def InstallX11ErrorHandlers(cls):
         with nogil:
             x11.InstallX11ErrorHandlers()
diff --git a/src/window_utils_mac.pyx b/src/window_utils_mac.pyx
index d683daf8..31a90095 100644
--- a/src/window_utils_mac.pyx
+++ b/src/window_utils_mac.pyx
@@ -8,36 +8,37 @@ class WindowUtils:
     # You have to overwrite this class and provide implementations
     # for these methods.
 
-    @staticmethod
-    def OnSetFocus(WindowHandle windowHandle, long msg, long wparam,
+    @classmethod
+    def OnSetFocus(cls, WindowHandle windowHandle, long msg, long wparam,
                    long lparam):
         # Available only on Windows, but have it available on other
         # platforms so that PyCharm doesn't warn about unresolved reference.
         pass
 
-    @staticmethod
-    def OnSize(WindowHandle windowHandle, long msg, long wparam, long lparam):
+    @classmethod
+    def OnSize(cls, WindowHandle windowHandle, long msg, long wparam,
+               long lparam):
         # Available only on Windows, but have it available on other
         # platforms so that PyCharm doesn't warn about unresolved reference.
         pass
 
-    @staticmethod
-    def OnEraseBackground(WindowHandle windowHandle, long msg, long wparam,
-                          long lparam):
+    @classmethod
+    def OnEraseBackground(cls, WindowHandle windowHandle, long msg,
+                          long wparam, long lparam):
         # Available only on Windows, but have it available on other
         # platforms so that PyCharm doesn't warn about unresolved reference.
         pass
 
-    @staticmethod
-    def GetParentHandle(WindowHandle windowHandle):
+    @classmethod
+    def GetParentHandle(cls, WindowHandle windowHandle):
         Debug("WindowUtils::GetParentHandle() not implemented (returns 0)")
         return 0
 
-    @staticmethod
-    def IsWindowHandle(WindowHandle windowHandle):
+    @classmethod
+    def IsWindowHandle(cls, WindowHandle windowHandle):
         Debug("WindowUtils::IsWindowHandle() not implemented (always True)")
         return True
 
-    @staticmethod
-    def InstallX11ErrorHandlers():
+    @classmethod
+    def InstallX11ErrorHandlers(cls):
         pass
diff --git a/src/window_utils_win.pyx b/src/window_utils_win.pyx
index 0dd9ee70..2bd3eb77 100644
--- a/src/window_utils_win.pyx
+++ b/src/window_utils_win.pyx
@@ -6,16 +6,18 @@ include "cefpython.pyx"
 
 class WindowUtils(object):
 
-    @staticmethod
-    def OnSetFocus(WindowHandle windowHandle, long msg, long wparam, long lparam):
+    @classmethod
+    def OnSetFocus(cls, WindowHandle windowHandle, long msg, long wparam,
+                   long lparam):
         cdef PyBrowser pyBrowser = GetBrowserByWindowHandle(windowHandle)
         if not pyBrowser:
             return 0
         pyBrowser.SetFocus(True)
         return 0
 
-    @staticmethod
-    def OnSize(WindowHandle windowHandle, long msg, long wparam, long lparam):
+    @classmethod
+    def OnSize(cls, WindowHandle windowHandle, long msg, long wparam,
+               long lparam):
         cdef PyBrowser pyBrowser = GetBrowserByWindowHandle(windowHandle)
         if not pyBrowser:
             return DefWindowProc(<HWND>windowHandle, msg, wparam, lparam)
@@ -34,9 +36,9 @@ class WindowUtils(object):
 
         return DefWindowProc(<HWND>windowHandle, msg, wparam, lparam)
 
-    @staticmethod
-    def OnEraseBackground(WindowHandle windowHandle, long msg, long wparam,
-                          long lparam):
+    @classmethod
+    def OnEraseBackground(cls, WindowHandle windowHandle, long msg,
+                          long wparam, long lparam):
         cdef PyBrowser pyBrowser = GetBrowserByWindowHandle(windowHandle)
         if not pyBrowser:
             return DefWindowProc(<HWND>windowHandle, msg, wparam, lparam)
@@ -48,8 +50,8 @@ class WindowUtils(object):
 
         return DefWindowProc(<HWND>windowHandle, msg, wparam, lparam)
 
-    @staticmethod
-    def SetTitle(PyBrowser pyBrowser, str pyTitle):
+    @classmethod
+    def SetTitle(cls, PyBrowser pyBrowser, str pyTitle):
         # Each browser window should have a title (Issue 3).
         # When popup is created, the window that sits in taskbar
         # has no title.
@@ -86,8 +88,8 @@ class WindowUtils(object):
             # is displayed currently.
             SetWindowTextW(<HWND>windowHandle, cefTitle.ToWString().c_str())
 
-    @staticmethod
-    def SetIcon(PyBrowser pyBrowser, py_string icon="inherit"):
+    @classmethod
+    def SetIcon(cls, PyBrowser pyBrowser, py_string icon="inherit"):
         # `icon` parameter is not implemented.
         # Popup window inherits icon from the main window.
 
@@ -135,17 +137,17 @@ class WindowUtils(object):
                 SendMessage(<HWND>windowHandle, WM_SETICON,
                             ICON_SMALL, parentIconSmall)
 
-    @staticmethod
-    def GetParentHandle(WindowHandle windowHandle):
+    @classmethod
+    def GetParentHandle(cls, WindowHandle windowHandle):
         return <WindowHandle>GetParent(<HWND>windowHandle)
 
-    @staticmethod
-    def IsWindowHandle(WindowHandle windowHandle):
+    @classmethod
+    def IsWindowHandle(cls, WindowHandle windowHandle):
         IF UNAME_SYSNAME == "Windows":
             return bool(IsWindow(<HWND>windowHandle))
         ELSE:
             return False
 
-    @staticmethod
-    def InstallX11ErrorHandlers():
+    @classmethod
+    def InstallX11ErrorHandlers(cls):
         pass
diff --git a/unittests/_common.py b/unittests/_common.py
index b71c92f4..a0dc1fd3 100644
--- a/unittests/_common.py
+++ b/unittests/_common.py
@@ -19,7 +19,10 @@
 MAC = SYSTEM if SYSTEM == "MAC" else False
 
 # To show the window for an extended period of time increase this number.
-MESSAGE_LOOP_RANGE = 100  # each iteration is 0.01 sec
+MESSAGE_LOOP_RANGE = 200  # each iteration is 0.01 sec
+
+MAIN_BROWSER_ID = 1
+POPUP_BROWSER_ID = 2
 
 g_subtests_ran = 0
 g_js_code_completed = False
@@ -122,22 +125,64 @@ def OnConsoleMessage(self, message, **_):
             subtest_message(message)
 
 
+def close_popup(global_handler, browser):
+    browser.CloseBrowser()
+    global_handler.PopupClosed_True = True
+
+    # Test developer tools popup
+    main_browser = cef.GetBrowserByIdentifier(MAIN_BROWSER_ID)
+    main_browser.ShowDevTools()
+    cef.PostDelayedTask(cef.TID_UI, 1500, close_devtools, global_handler)
+    cef.PostDelayedTask(cef.TID_UI, 500, main_browser.SetFocus, True)
+
+
+def close_devtools(global_handler):
+    main_browser = cef.GetBrowserByIdentifier(MAIN_BROWSER_ID)
+    global_handler.HasDevTools_True = main_browser.HasDevTools()
+    main_browser.CloseDevTools()
+    subtest_message("DevTools popup ok")
+
+
 class GlobalHandler(object):
     def __init__(self, test_case):
         self.test_case = test_case
 
         # Asserts for True/False will be checked just before shutdown
         self.test_for_True = True  # Test whether asserts are working correctly
-        self.OnAfterCreated_True = False
+        self.OnAfterCreatedMain_True = False
+
+        if "main_test" in test_case.id():
+            self.OnAfterCreatedPopup_True = False
+            self.PopupClosed_True = False
+            self.HasDevTools_True = False
 
     def _OnAfterCreated(self, browser, **_):
         # For asserts that are checked automatically before shutdown its
         # values should be set first, so that when other asserts fail
         # (the ones called through the test_case member) they are reported
         # correctly.
-        self.test_case.assertFalse(self.OnAfterCreated_True)
-        self.OnAfterCreated_True = True
-        self.test_case.assertEqual(browser.GetIdentifier(), 1)
+        if not self.OnAfterCreatedMain_True:
+            # First call for main browser.
+            # browser.GetUrl() returns empty at this moment.
+            self.OnAfterCreatedMain_True = True
+            self.test_case.assertEqual(browser.GetIdentifier(),
+                                       MAIN_BROWSER_ID)
+            self.test_case.assertFalse(browser.IsPopup())
+        else:
+            # Second call for implicit popup browser opened via js.
+            # Should execute only for main test.
+            # Should not execute for DevTools window.
+            assert "main_test" in self.test_case.id()
+            assert not self.OnAfterCreatedPopup_True
+            self.OnAfterCreatedPopup_True = True
+            self.test_case.assertEqual(browser.GetIdentifier(),
+                                       POPUP_BROWSER_ID)
+            # browser.GetUrl() returns empty at this moment.
+            self.test_case.assertTrue(browser.IsPopup())
+            if WINDOWS:
+                cef.WindowUtils.SetTitle(browser, "Popup test")
+            # Close the popup browser after 250 ms
+            cef.PostDelayedTask(cef.TID_UI, 250, close_popup, self, browser)
 
 
 class LoadHandler(object):
diff --git a/unittests/main_test.py b/unittests/main_test.py
index 0b141a67..5f856591 100644
--- a/unittests/main_test.py
+++ b/unittests/main_test.py
@@ -91,6 +91,11 @@
             py_callback("String sent from Javascript");
             print("py_callback() ok");
         });
+
+        // Test popup
+        window.open("about:blank");
+
+        // Done
         js_code_completed();
     }
     window.onload = function() {
@@ -130,6 +135,22 @@ def test_main(self):
         cef.Initialize(settings)
         subtest_message("cef.Initialize() ok")
 
+        # High DPI on Windows
+        if WINDOWS:
+            self.assertIsInstance(cef.DpiAware.GetSystemDpi(), tuple)
+            window_size = cef.DpiAware.CalculateWindowSize(800, 600)
+            self.assertIsInstance(window_size, tuple)
+            self.assertGreater(window_size[0], 0)
+            self.assertGreater(cef.DpiAware.Scale((800, 600))[0], 0)
+            cef.DpiAware.EnableHighDpiSupport()
+            self.assertTrue(cef.DpiAware.IsProcessDpiAware())
+            # Make some calls again after DPI Aware was set
+            self.assertIsInstance(cef.DpiAware.GetSystemDpi(), tuple)
+            self.assertGreater(cef.DpiAware.Scale([800, 600])[0], 0)
+            self.assertIsInstance(cef.DpiAware.Scale(800), int)
+            self.assertGreater(cef.DpiAware.Scale(800), 0)
+            subtest_message("cef.DpiAware ok")
+
         # Global handler
         global_handler = GlobalHandler(self)
         cef.SetGlobalClientCallback("OnAfterCreated",
@@ -137,7 +158,11 @@ def test_main(self):
         subtest_message("cef.SetGlobalClientCallback() ok")
 
         # Create browser
-        browser = cef.CreateBrowserSync(url=g_datauri)
+        browser_settings = {
+            "inherit_client_handlers_for_popups": False,
+        }
+        browser = cef.CreateBrowserSync(url=g_datauri,
+                                        settings=browser_settings)
         self.assertIsNotNone(browser, "Browser object")
         browser.SetFocus(True)
         subtest_message("cef.CreateBrowserSync() ok")
@@ -206,9 +231,34 @@ def test_main(self):
                               cef.PyCookieManager)
         subtest_message("cef.CookieManager ok")
 
+        # Window Utils
+        if WINDOWS:
+            hwnd = 1  # When using 0 getting issues with OnautoResize
+            self.assertFalse(cef.WindowUtils.IsWindowHandle(hwnd))
+            cef.WindowUtils.OnSetFocus(hwnd, 0, 0, 0)
+            cef.WindowUtils.OnSize(hwnd, 0, 0, 0)
+            cef.WindowUtils.OnEraseBackground(hwnd, 0, 0, 0)
+            cef.WindowUtils.GetParentHandle(hwnd)
+            cef.WindowUtils.SetTitle(browser, "Main test")
+            subtest_message("cef.WindowUtils ok")
+        elif LINUX:
+            cef.WindowUtils.InstallX11ErrorHandlers()
+            subtest_message("cef.WindowUtils ok")
+        elif MAC:
+            hwnd = 0
+            cef.WindowUtils.GetParentHandle(hwnd)
+            cef.WindowUtils.IsWindowHandle(hwnd)
+            subtest_message("cef.WindowUtils ok")
+
         # Run message loop
         run_message_loop()
 
+        # Make sure popup browser was destroyed
+        self.assertIsInstance(cef.GetBrowserByIdentifier(MAIN_BROWSER_ID),
+                              cef.PyBrowser)
+        self.assertIsNone(cef.GetBrowserByIdentifier(POPUP_BROWSER_ID))
+        subtest_message("cef.GetBrowserByIdentifier() ok")
+
         # Close browser and clean reference
         browser.CloseBrowser(True)
         del browser

From be46962ec25b4ed3bf10260f3cc56825f6488a0e Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Sun, 19 Aug 2018 13:55:46 +0200
Subject: [PATCH 125/238] Add DisplayHandler.OnLoadingProgressChange (#403)

---
 README.md                              |  5 +-
 api/API-index.md                       |  5 +-
 api/DisplayHandler.md                  | 66 +++++++++++++++-----------
 src/browser.pyx                        |  3 +-
 src/cef_v59..v66_changes.txt           |  2 +-
 src/client_handler/display_handler.cpp |  6 +++
 src/client_handler/display_handler.h   |  3 ++
 src/handlers/display_handler.pyx       | 15 ++++++
 unittests/main_test.py                 | 11 ++++-
 9 files changed, 82 insertions(+), 34 deletions(-)

diff --git a/README.md b/README.md
index cbe04d95..f736baef 100644
--- a/README.md
+++ b/README.md
@@ -527,10 +527,11 @@ Additional information for v31.2 release:
 * [DisplayHandler (interface)](api/DisplayHandler.md#displayhandler-interface)
   * [OnAddressChange](api/DisplayHandler.md#onaddresschange)
   * [OnAutoResize](api/DisplayHandler.md#onautoresize)
+  * [OnConsoleMessage](api/DisplayHandler.md#onconsolemessage)
+  * [OnLoadingProgressChange](api/DisplayHandler.md#onloadingprogresschange)
+  * [OnStatusMessage](api/DisplayHandler.md#onstatusmessage)
   * [OnTitleChange](api/DisplayHandler.md#ontitlechange)
   * [OnTooltip](api/DisplayHandler.md#ontooltip)
-  * [OnStatusMessage](api/DisplayHandler.md#onstatusmessage)
-  * [OnConsoleMessage](api/DisplayHandler.md#onconsolemessage)
 * [DownloadHandler](api/DownloadHandler.md#downloadhandler)
 * [DpiAware (class)](api/DpiAware.md#dpiaware-class)
   * [CalculateWindowSize](api/DpiAware.md#calculatewindowsize)
diff --git a/api/API-index.md b/api/API-index.md
index a7b17aaf..050fb753 100644
--- a/api/API-index.md
+++ b/api/API-index.md
@@ -215,10 +215,11 @@
 * [DisplayHandler (interface)](DisplayHandler.md#displayhandler-interface)
   * [OnAddressChange](DisplayHandler.md#onaddresschange)
   * [OnAutoResize](DisplayHandler.md#onautoresize)
+  * [OnConsoleMessage](DisplayHandler.md#onconsolemessage)
+  * [OnLoadingProgressChange](DisplayHandler.md#onloadingprogresschange)
+  * [OnStatusMessage](DisplayHandler.md#onstatusmessage)
   * [OnTitleChange](DisplayHandler.md#ontitlechange)
   * [OnTooltip](DisplayHandler.md#ontooltip)
-  * [OnStatusMessage](DisplayHandler.md#onstatusmessage)
-  * [OnConsoleMessage](DisplayHandler.md#onconsolemessage)
 * [DownloadHandler](DownloadHandler.md#downloadhandler)
 * [DpiAware (class)](DpiAware.md#dpiaware-class)
   * [CalculateWindowSize](DpiAware.md#calculatewindowsize)
diff --git a/api/DisplayHandler.md b/api/DisplayHandler.md
index 43f6342f..2c32ec1f 100644
--- a/api/DisplayHandler.md
+++ b/api/DisplayHandler.md
@@ -3,19 +3,19 @@
 
 # DisplayHandler (interface)
 
-Implement this interface to handle events related to browser display state. The methods of this class will be called on the UI thread.
-
-For an example of how to implement handler see [cefpython](cefpython.md).CreateBrowser(). For a list of all handler interfaces see [API > Client handlers](API#Client_handlers).
+Implement this interface to handle events related to browser display
+state. The methods of this class will be called on the UI thread.
 
 
 Table of contents:
 * [Callbacks](#callbacks)
   * [OnAddressChange](#onaddresschange)
   * [OnAutoResize](#onautoresize)
+  * [OnConsoleMessage](#onconsolemessage)
+  * [OnLoadingProgressChange](#onloadingprogresschange)
+  * [OnStatusMessage](#onstatusmessage)
   * [OnTitleChange](#ontitlechange)
   * [OnTooltip](#ontooltip)
-  * [OnStatusMessage](#onstatusmessage)
-  * [OnConsoleMessage](#onconsolemessage)
 
 
 ## Callbacks
@@ -49,31 +49,34 @@ Description from upstream CEF:
 > default handling.
 
 
-### OnTitleChange
+### OnConsoleMessage
 
 | Parameter | Type |
 | --- | --- |
 | browser | [Browser](Browser.md) |
-| title | string |
-| __Return__ | void |
+| level | int |
+| message | string |
+| source | string |
+| line | int |
+| __Return__ | bool |
 
-Called when the page title changes.
+Called to display a console message. Return true to stop the message from
+being output to the console.
 
+|level| can be one of the same values as in ApplicationSettings.[log_severity](ApplicationSettings.md#log_severity).
 
-### OnTooltip
+
+### OnLoadingProgressChange
 
 | Parameter | Type |
 | --- | --- |
 | browser | [Browser](Browser.md) |
-| text_out | list |
-| __Return__ | bool |
+| progress | double |
+| __Return__ | void |
 
-Called when the browser is about to display a tooltip. `text_out[0]` contains the
-text that will be displayed in the tooltip. To handle the display of the
-tooltip yourself return true. Otherwise, you can optionally modify `text_out[0]`
-and then return false to allow the browser to display the tooltip.
-When window rendering is disabled the application is responsible for
-drawing tooltips and the return value is ignored.
+Description from upstream CEF:
+> Called when the overall page loading progress has changed. |progress|
+> ranges from 0.0 to 1.0.
 
 
 ### OnStatusMessage
@@ -87,19 +90,28 @@ drawing tooltips and the return value is ignored.
 Called when the browser receives a status message.
 
 
-### OnConsoleMessage
+### OnTitleChange
 
 | Parameter | Type |
 | --- | --- |
 | browser | [Browser](Browser.md) |
-| level | int |
-| message | string |
-| source | string |
-| line | int |
-| __Return__ | bool |
+| title | string |
+| __Return__ | void |
 
-Called to display a console message. Return true to stop the message from
-being output to the console.
+Called when the page title changes.
 
-|level| can be one of the same values as in ApplicationSettings.[log_severity](ApplicationSettings.md#log_severity).
 
+### OnTooltip
+
+| Parameter | Type |
+| --- | --- |
+| browser | [Browser](Browser.md) |
+| text_out | list |
+| __Return__ | bool |
+
+Called when the browser is about to display a tooltip. `text_out[0]` contains the
+text that will be displayed in the tooltip. To handle the display of the
+tooltip yourself return true. Otherwise, you can optionally modify `text_out[0]`
+and then return false to allow the browser to display the tooltip.
+When window rendering is disabled the application is responsible for
+drawing tooltips and the return value is ignored.
diff --git a/src/browser.pyx b/src/browser.pyx
index bec49de2..c6060d44 100644
--- a/src/browser.pyx
+++ b/src/browser.pyx
@@ -235,7 +235,8 @@ cdef class PyBrowser:
             # DisplayHandler
             self.allowedClientCallbacks += [
                     "OnAddressChange", "OnTitleChange", "OnTooltip",
-                    "OnStatusMessage", "OnConsoleMessage", "OnAutoResize"]
+                    "OnStatusMessage", "OnConsoleMessage", "OnAutoResize",
+                    "OnLoadingProgressChange"]
             # KeyboardHandler
             self.allowedClientCallbacks += ["OnPreKeyEvent", "OnKeyEvent"]
             # RequestHandler
diff --git a/src/cef_v59..v66_changes.txt b/src/cef_v59..v66_changes.txt
index 73e8ed2f..a0429e0c 100644
--- a/src/cef_v59..v66_changes.txt
+++ b/src/cef_v59..v66_changes.txt
@@ -107,7 +107,7 @@ cef_cookie.h
 
 cef_display_handler.h
 + OnAutoResize
-- OnLoadingProgressChange
++ OnLoadingProgressChange
 
 cef_drag_data.h
 + GetImage (cross-platform)
diff --git a/src/client_handler/display_handler.cpp b/src/client_handler/display_handler.cpp
index f5ad596e..b00bf6a5 100644
--- a/src/client_handler/display_handler.cpp
+++ b/src/client_handler/display_handler.cpp
@@ -54,3 +54,9 @@ bool DisplayHandler::OnAutoResize(CefRefPtr<CefBrowser> browser,
     REQUIRE_UI_THREAD();
     return DisplayHandler_OnAutoResize(browser, new_size);
 }
+
+void DisplayHandler::OnLoadingProgressChange(CefRefPtr<CefBrowser> browser,
+                                             double progress) {
+    REQUIRE_UI_THREAD();
+    return DisplayHandler_OnLoadingProgressChange(browser, progress);
+}
\ No newline at end of file
diff --git a/src/client_handler/display_handler.h b/src/client_handler/display_handler.h
index f058c475..a281713d 100644
--- a/src/client_handler/display_handler.h
+++ b/src/client_handler/display_handler.h
@@ -36,6 +36,9 @@ class DisplayHandler : public CefDisplayHandler
     bool OnAutoResize(CefRefPtr<CefBrowser> browser,
                       const CefSize& new_size) override;
 
+    void OnLoadingProgressChange(CefRefPtr<CefBrowser> browser,
+                                 double progress) override;
+
 private:
     IMPLEMENT_REFCOUNTING(DisplayHandler);
 };
diff --git a/src/handlers/display_handler.pyx b/src/handlers/display_handler.pyx
index c60e49bc..7d66d00f 100644
--- a/src/handlers/display_handler.pyx
+++ b/src/handlers/display_handler.pyx
@@ -128,3 +128,18 @@ cdef public cpp_bool DisplayHandler_OnConsoleMessage(
     except:
         (exc_type, exc_value, exc_trace) = sys.exc_info()
         sys.excepthook(exc_type, exc_value, exc_trace)
+
+cdef public void DisplayHandler_OnLoadingProgressChange(
+        CefRefPtr[CefBrowser] cefBrowser,
+        double progress
+        ) except * with gil:
+    cdef PyBrowser pyBrowser
+    cdef object callback
+    try:
+        pyBrowser = GetPyBrowser(cefBrowser, "OnLoadingProgressChange")
+        callback = pyBrowser.GetClientCallback("OnLoadingProgressChange")
+        if callback:
+            callback(browser=pyBrowser, progress=progress)
+    except:
+        (exc_type, exc_value, exc_trace) = sys.exc_info()
+        sys.excepthook(exc_type, exc_value, exc_trace)
diff --git a/unittests/main_test.py b/unittests/main_test.py
index 5f856591..3ffd1d4f 100644
--- a/unittests/main_test.py
+++ b/unittests/main_test.py
@@ -168,9 +168,10 @@ def test_main(self):
         subtest_message("cef.CreateBrowserSync() ok")
 
         # Client handlers
+        display_handler2 = DisplayHandler2(self)
         client_handlers = [LoadHandler(self, g_datauri),
                            DisplayHandler(self),
-                           DisplayHandler2(self)]
+                           display_handler2]
         for handler in client_handlers:
             browser.SetClientHandler(handler)
         subtest_message("browser.SetClientHandler() ok")
@@ -269,6 +270,8 @@ def test_main(self):
         do_message_loop_work(25)
 
         # Asserts before shutdown
+        self.assertEqual(display_handler2.OnLoadingProgressChange_Progress,
+                         1.0)
         # noinspection PyTypeChecker
         check_auto_asserts(self, [] + client_handlers
                                     + [global_handler,
@@ -290,6 +293,8 @@ def __init__(self, test_case):
         # Test whether asserts are working correctly.
         self.test_for_True = True
         self.OnAutoResize_True = False
+        self.OnLoadingProgressChange_True = False
+        self.OnLoadingProgressChange_Progress = 0.0
 
     def OnAutoResize(self, new_size, **_):
         self.OnAutoResize_True = True
@@ -298,6 +303,10 @@ def OnAutoResize(self, new_size, **_):
         self.test_case.assertGreaterEqual(new_size[1], 600)
         self.test_case.assertLessEqual(new_size[1], 768)
 
+    def OnLoadingProgressChange(self, progress, **_):
+        self.OnLoadingProgressChange_True = True
+        self.OnLoadingProgressChange_Progress = progress
+
 
 class External(object):
     """Javascript 'window.external' object."""

From 33ba7517b7e4a2ed9684dc499c1c0fa5b578f9fa Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Sun, 19 Aug 2018 14:04:53 +0200
Subject: [PATCH 126/238] Fix build.py

---
 tools/build.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/build.py b/tools/build.py
index 4ad74015..977d916a 100644
--- a/tools/build.py
+++ b/tools/build.py
@@ -76,6 +76,7 @@
     pass
 
 # Command line args variables
+SYS_ARGV_ORIGINAL = None
 VERSION = ""
 NO_RUN_EXAMPLES = False
 DEBUG_FLAG = False
@@ -135,6 +136,9 @@ def command_line_args():
 
     print("[build.py] Parse command line arguments")
 
+    global SYS_ARGV_ORIGINAL
+    SYS_ARGV_ORIGINAL = sys.argv
+
     if "--no-run-examples" in sys.argv:
         NO_RUN_EXAMPLES = True
         print("[build.py] Running examples disabled (--no-run-examples)")
@@ -802,7 +806,7 @@ def build_cefpython_module():
             args.append("\"{python}\"".format(python=sys.executable))
             args.append(os.path.join(TOOLS_DIR, os.path.basename(__file__)))
             assert __file__ in sys.argv[0]
-            args.extend(sys.argv[1:])
+            args.extend(SYS_ARGV_ORIGINAL[1:])
             command = " ".join(args)
             ret = subprocess.call(command, shell=True)
             # Always pass fixed value to sys.exit, read note at

From 2eb33a38df68958277b163bc51dca26d3e716182 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Sun, 19 Aug 2018 14:15:47 +0200
Subject: [PATCH 127/238] Fix build.py again

---
 tools/build.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/tools/build.py b/tools/build.py
index 977d916a..d1df20e0 100644
--- a/tools/build.py
+++ b/tools/build.py
@@ -60,6 +60,7 @@
 # 6. More commands: http://docs.cython.org/src/userguide/debugging.html
 
 from common import *
+import copy
 import sys
 import os
 import glob
@@ -137,7 +138,7 @@ def command_line_args():
     print("[build.py] Parse command line arguments")
 
     global SYS_ARGV_ORIGINAL
-    SYS_ARGV_ORIGINAL = sys.argv
+    SYS_ARGV_ORIGINAL = copy.copy(sys.argv)
 
     if "--no-run-examples" in sys.argv:
         NO_RUN_EXAMPLES = True
@@ -656,8 +657,8 @@ def copy_and_fix_pyx_files():
     shutil.copy("../../src/%s" % mainfile_original, "./%s" % mainfile_newname)
     with open("./%s" % mainfile_newname, "rb") as fo:
         content = fo.read().decode("utf-8")
-        (content, subs) = re.subn(r"^include \"handlers/",
-                                  "include \"",
+        (content, subs) = re.subn(ur"^include \"handlers/",
+                                  u"include \"",
                                   content,
                                   flags=re.MULTILINE)
         # Add __version__ variable in cefpython.pyx
@@ -685,8 +686,8 @@ def copy_and_fix_pyx_files():
             # Do not remove the newline - so that line numbers
             # are exact with originals.
             (content, subs) = re.subn(
-                    r"^include[\t ]+[\"'][^\"'\n\r]+[\"'][\t ]*",
-                    "",
+                    ur"^include[\t ]+[\"'][^\"'\n\r]+[\"'][\t ]*",
+                    u"",
                     content,
                     flags=re.MULTILINE)
             if subs:
@@ -808,6 +809,7 @@ def build_cefpython_module():
             assert __file__ in sys.argv[0]
             args.extend(SYS_ARGV_ORIGINAL[1:])
             command = " ".join(args)
+            print("[build.py] Running command: %s" % command)
             ret = subprocess.call(command, shell=True)
             # Always pass fixed value to sys.exit, read note at
             # the top of the script about os.system and sys.exit

From b0e2e8a895aa9799a028545befd66a06f80ffe29 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Sun, 19 Aug 2018 14:20:34 +0200
Subject: [PATCH 128/238] Python 3.7 doesn't work with ur"" strings - syntax
 error

---
 tools/build.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/build.py b/tools/build.py
index d1df20e0..66d1244e 100644
--- a/tools/build.py
+++ b/tools/build.py
@@ -657,7 +657,7 @@ def copy_and_fix_pyx_files():
     shutil.copy("../../src/%s" % mainfile_original, "./%s" % mainfile_newname)
     with open("./%s" % mainfile_newname, "rb") as fo:
         content = fo.read().decode("utf-8")
-        (content, subs) = re.subn(ur"^include \"handlers/",
+        (content, subs) = re.subn(u"^include \"handlers/",
                                   u"include \"",
                                   content,
                                   flags=re.MULTILINE)
@@ -686,7 +686,7 @@ def copy_and_fix_pyx_files():
             # Do not remove the newline - so that line numbers
             # are exact with originals.
             (content, subs) = re.subn(
-                    ur"^include[\t ]+[\"'][^\"'\n\r]+[\"'][\t ]*",
+                    u"^include[\\t ]+[\"'][^\"'\\n\\r]+[\"'][\\t ]*",
                     u"",
                     content,
                     flags=re.MULTILINE)

From fd8ea5bbd1cfa0b3c07336b3da61e4f4053f4077 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Sun, 19 Aug 2018 15:04:23 +0200
Subject: [PATCH 129/238] Add cef.LoadCrlSetsFile (#403)

---
 README.md                        |  1 +
 api/API-index.md                 |  1 +
 api/cefpython.md                 | 17 +++++++++++++++++
 src/cef_v59..v66_changes.txt     |  2 +-
 src/cefpython.pyx                |  4 ++++
 src/extern/cef/cef_file_util.pxd |  8 ++++++++
 src/utils.pyx                    |  1 +
 unittests/main_test.py           | 27 ++++++++++++++++++++++++++-
 8 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 src/extern/cef/cef_file_util.pxd

diff --git a/README.md b/README.md
index f736baef..9e2cc4fa 100644
--- a/README.md
+++ b/README.md
@@ -474,6 +474,7 @@ Additional information for v31.2 release:
   * [GetVersion](api/cefpython.md#getversion)
   * [Initialize](api/cefpython.md#initialize)
   * [IsThread](api/cefpython.md#isthread)
+  * [LoadCrlSetsFile](api/cefpython.md#loadcrlsetsfile)
   * [MessageLoop](api/cefpython.md#messageloop)
   * [MessageLoopWork](api/cefpython.md#messageloopwork)
   * [PostTask](api/cefpython.md#posttask)
diff --git a/api/API-index.md b/api/API-index.md
index 050fb753..9946b5b5 100644
--- a/api/API-index.md
+++ b/api/API-index.md
@@ -162,6 +162,7 @@
   * [GetVersion](cefpython.md#getversion)
   * [Initialize](cefpython.md#initialize)
   * [IsThread](cefpython.md#isthread)
+  * [LoadCrlSetsFile](cefpython.md#loadcrlsetsfile)
   * [MessageLoop](cefpython.md#messageloop)
   * [MessageLoopWork](cefpython.md#messageloopwork)
   * [PostTask](cefpython.md#posttask)
diff --git a/api/cefpython.md b/api/cefpython.md
index efeed621..239bf400 100644
--- a/api/cefpython.md
+++ b/api/cefpython.md
@@ -21,6 +21,7 @@ Table of contents:
   * [GetVersion](#getversion)
   * [Initialize](#initialize)
   * [IsThread](#isthread)
+  * [LoadCrlSetsFile](#loadcrlsetsfile)
   * [MessageLoop](#messageloop)
   * [MessageLoopWork](#messageloopwork)
   * [PostTask](#posttask)
@@ -200,6 +201,22 @@ CEF maintains multiple internal threads that are used for handling different typ
 See PostTask() for a list of threads.
 
 
+### LoadCrlSetsFile
+
+| Parameter | Type |
+| --- | --- |
+| path | bytes |
+| __Return__ | bool |
+
+Description from upstream CEF:
+> Loads the existing "Certificate Revocation Lists" file that is managed by
+> Google Chrome. This file can generally be found in Chrome's User Data
+> directory (e.g. "C:\Users\[User]\AppData\Local\Google\Chrome\User Data\" on
+> Windows) and is updated periodically by Chrome's component updater service.
+> Must be called in the browser process after the context has been initialized.
+> See https://dev.chromium.org/Home/chromium-security/crlsets for background.
+
+
 ### MessageLoop
 
 | | |
diff --git a/src/cef_v59..v66_changes.txt b/src/cef_v59..v66_changes.txt
index a0429e0c..e6dbfb2c 100644
--- a/src/cef_v59..v66_changes.txt
+++ b/src/cef_v59..v66_changes.txt
@@ -134,7 +134,7 @@ cef_extension_handler.h
 - CefExtensionHandler
 
 cef_file_util.h
-- CefLoadCRLSetsFile
++ CefLoadCRLSetsFile
 
 cef_request_handler.h
 - CanGetCookies
diff --git a/src/cefpython.pyx b/src/cefpython.pyx
index cf7d7e46..5a526bcd 100644
--- a/src/cefpython.pyx
+++ b/src/cefpython.pyx
@@ -300,6 +300,7 @@ from main_message_loop cimport *
 # noinspection PyUnresolvedReferences
 from cef_views cimport *
 from cef_log cimport *
+from cef_file_util cimport *
 
 # -----------------------------------------------------------------------------
 # GLOBAL VARIABLES
@@ -1019,3 +1020,6 @@ cpdef dict GetVersion():
         cef_commit_hash=__cef_commit_hash__,
         cef_commit_number=__cef_commit_number__,
     )
+
+cpdef LoadCrlSetsFile(py_string path):
+    CefLoadCRLSetsFile(PyToCefStringValue(path))
diff --git a/src/extern/cef/cef_file_util.pxd b/src/extern/cef/cef_file_util.pxd
new file mode 100644
index 00000000..52e62580
--- /dev/null
+++ b/src/extern/cef/cef_file_util.pxd
@@ -0,0 +1,8 @@
+# Copyright (c) 2018 CEF Python, see the Authors file.
+# All rights reserved. Licensed under BSD 3-clause license.
+# Project website: https://github.com/cztomczak/cefpython
+
+from cef_string cimport CefString
+
+cdef extern from "include/cef_file_util.h":
+    void CefLoadCRLSetsFile(const CefString& path)
diff --git a/src/utils.pyx b/src/utils.pyx
index 03bfd1e3..0e499554 100644
--- a/src/utils.pyx
+++ b/src/utils.pyx
@@ -3,6 +3,7 @@
 # Project website: https://github.com/cztomczak/cefpython
 
 include "cefpython.pyx"
+include "string_utils.pyx"
 
 # noinspection PyUnresolvedReferences
 cimport cef_types
diff --git a/unittests/main_test.py b/unittests/main_test.py
index 3ffd1d4f..0640b2d3 100644
--- a/unittests/main_test.py
+++ b/unittests/main_test.py
@@ -11,6 +11,7 @@
 
 from cefpython3 import cefpython as cef
 
+import glob
 import os
 import sys
 
@@ -126,15 +127,39 @@ def test_main(self):
         # Test initialization of CEF
         settings = {
             "debug": False,
-            "log_severity": cef.LOGSEVERITY_ERROR,
+            "log_severity": cef.LOGSEVERITY_WARNING,
             "log_file": "",
         }
         if "--debug" in sys.argv:
             settings["debug"] = True
             settings["log_severity"] = cef.LOGSEVERITY_INFO
+        if "--debug-warning" in sys.argv:
+            settings["debug"] = True
+            settings["log_severity"] = cef.LOGSEVERITY_WARNING
         cef.Initialize(settings)
         subtest_message("cef.Initialize() ok")
 
+        # CRL set file
+        certrevoc_dir = ""
+        if WINDOWS:
+            certrevoc_dir = r"C:\localappdata\Google\Chrome\User Data" \
+                            r"\CertificateRevocation"
+        elif LINUX:
+            certrevoc_dir = r"/home/*/.config/google-chrome" \
+                            r"/CertificateRevocation"
+        elif MAC:
+            certrevoc_dir = r"/Users/*/Library/Application Support/Google" \
+                            r"/Chrome/CertificateRevocation"
+        if os.path.exists(certrevoc_dir):
+            crlset_files = glob.iglob(os.path.join(certrevoc_dir, "*",
+                                                   "crl-set"))
+            crlset = ""
+            for crlset in crlset_files:
+                pass
+            if os.path.exists(crlset):
+                cef.LoadCrlSetsFile(crlset)
+                subtest_message("cef.LoadCrlSetsFile ok")
+
         # High DPI on Windows
         if WINDOWS:
             self.assertIsInstance(cef.DpiAware.GetSystemDpi(), tuple)

From 7d69c8c8fc9cdb1372a1511471311c71ff4bad5e Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Sun, 19 Aug 2018 15:10:01 +0200
Subject: [PATCH 130/238] Fix unit tests

---
 unittests/main_test.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/unittests/main_test.py b/unittests/main_test.py
index 0640b2d3..502aea68 100644
--- a/unittests/main_test.py
+++ b/unittests/main_test.py
@@ -127,7 +127,7 @@ def test_main(self):
         # Test initialization of CEF
         settings = {
             "debug": False,
-            "log_severity": cef.LOGSEVERITY_WARNING,
+            "log_severity": cef.LOGSEVERITY_ERROR,
             "log_file": "",
         }
         if "--debug" in sys.argv:
@@ -150,15 +150,14 @@ def test_main(self):
         elif MAC:
             certrevoc_dir = r"/Users/*/Library/Application Support/Google" \
                             r"/Chrome/CertificateRevocation"
-        if os.path.exists(certrevoc_dir):
-            crlset_files = glob.iglob(os.path.join(certrevoc_dir, "*",
-                                                   "crl-set"))
-            crlset = ""
-            for crlset in crlset_files:
-                pass
-            if os.path.exists(crlset):
-                cef.LoadCrlSetsFile(crlset)
-                subtest_message("cef.LoadCrlSetsFile ok")
+        crlset_files = glob.iglob(os.path.join(certrevoc_dir, "*",
+                                               "crl-set"))
+        crlset = ""
+        for crlset in crlset_files:
+            pass
+        if os.path.exists(crlset):
+            cef.LoadCrlSetsFile(crlset)
+            subtest_message("cef.LoadCrlSetsFile ok")
 
         # High DPI on Windows
         if WINDOWS:

From 56f74198c5a933cab716a54476ee7f0cb55c50d6 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Sun, 19 Aug 2018 15:18:19 +0200
Subject: [PATCH 131/238] Update unit tests logging

---
 unittests/main_test.py | 4 ++++
 unittests/osr_test.py  | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/unittests/main_test.py b/unittests/main_test.py
index 502aea68..25405ce0 100644
--- a/unittests/main_test.py
+++ b/unittests/main_test.py
@@ -130,6 +130,10 @@ def test_main(self):
             "log_severity": cef.LOGSEVERITY_ERROR,
             "log_file": "",
         }
+        if not LINUX:
+            # On Linux you get a lot of "X error received" messages
+            # from Chromium's "x11_util.cc", so do not show them.
+            settings["log_severity"] = cef.LOGSEVERITY_WARNING
         if "--debug" in sys.argv:
             settings["debug"] = True
             settings["log_severity"] = cef.LOGSEVERITY_INFO
diff --git a/unittests/osr_test.py b/unittests/osr_test.py
index 323f2de6..a5a3753b 100644
--- a/unittests/osr_test.py
+++ b/unittests/osr_test.py
@@ -81,9 +81,16 @@ def test_osr(self):
             "log_file": "",
             "windowless_rendering_enabled": True
         }
+        if not LINUX:
+            # On Linux you get a lot of "X error received" messages
+            # from Chromium's "x11_util.cc", so do not show them.
+            settings["log_severity"] = cef.LOGSEVERITY_WARNING
         if "--debug" in sys.argv:
             settings["debug"] = True
             settings["log_severity"] = cef.LOGSEVERITY_INFO
+        if "--debug-warning" in sys.argv:
+            settings["debug"] = True
+            settings["log_severity"] = cef.LOGSEVERITY_WARNING
 
         # Initialize
         cef.Initialize(settings)

From ccc03c8e3194bd3155cedc352324331989e4d16a Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Sun, 19 Aug 2018 17:20:37 +0200
Subject: [PATCH 132/238] Add onbeforeclose.py snippet

---
 examples/snippets/onbeforeclose.py | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 examples/snippets/onbeforeclose.py

diff --git a/examples/snippets/onbeforeclose.py b/examples/snippets/onbeforeclose.py
new file mode 100644
index 00000000..73c3bafe
--- /dev/null
+++ b/examples/snippets/onbeforeclose.py
@@ -0,0 +1,24 @@
+# Implement LifespanHandler.OnBeforeClose to execute custom
+# code before browser window closes.
+
+from cefpython3 import cefpython as cef
+
+
+def main():
+    cef.Initialize()
+    browser = cef.CreateBrowserSync(url="https://www.google.com/",
+                                    window_title="OnBeforeClose")
+    browser.SetClientHandler(LifespanHandler())
+    cef.MessageLoop()
+    del browser
+    cef.Shutdown()
+
+
+class LifespanHandler(object):
+    def OnBeforeClose(self, browser):
+        print("Browser ID: {}".format(browser.GetIdentifier()))
+        print("Browser will close and app will exit")
+
+
+if __name__ == '__main__':
+    main()

From 2b78a3e9b09bc5bbcaab00292a0f38c39be040de Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Sun, 19 Aug 2018 18:27:49 +0200
Subject: [PATCH 133/238] Add RequestHandler.CanGetCookies and CanSetCookie
 (#403).

Add network_cookies.py snippet.
---
 README.md                              |  20 +-
 api/API-index.md                       |  20 +-
 api/LifespanHandler.md                 | 104 ++++-----
 api/RequestHandler.md                  | 302 ++++++++++++++-----------
 examples/README-examples.md            |  25 +-
 examples/snippets/network_cookies.py   |  47 ++++
 src/browser.pyx                        |   2 +-
 src/cef_v59..v66_changes.txt           |   7 +-
 src/client_handler/request_handler.cpp |  15 ++
 src/client_handler/request_handler.h   |   9 +
 src/handlers/request_handler.pyx       |  73 ++++++
 11 files changed, 410 insertions(+), 214 deletions(-)
 create mode 100644 examples/snippets/network_cookies.py

diff --git a/README.md b/README.md
index 9e2cc4fa..8e6259bc 100644
--- a/README.md
+++ b/README.md
@@ -607,10 +607,10 @@ Additional information for v31.2 release:
   * [OnPreKeyEvent](api/KeyboardHandler.md#onprekeyevent)
   * [OnKeyEvent](api/KeyboardHandler.md#onkeyevent)
 * [LifespanHandler (interface)](api/LifespanHandler.md#lifespanhandler-interface)
-  * [OnBeforePopup](api/LifespanHandler.md#onbeforepopup)
-  * [_OnAfterCreated](api/LifespanHandler.md#_onaftercreated)
   * [DoClose](api/LifespanHandler.md#doclose)
+  * [_OnAfterCreated](api/LifespanHandler.md#_onaftercreated)
   * [OnBeforeClose](api/LifespanHandler.md#onbeforeclose)
+  * [OnBeforePopup](api/LifespanHandler.md#onbeforepopup)
 * [LoadHandler (interface)](api/LoadHandler.md#loadhandler-interface)
   * [OnLoadingStateChange](api/LoadHandler.md#onloadingstatechange)
   * [OnLoadStart](api/LoadHandler.md#onloadstart)
@@ -703,19 +703,21 @@ Additional information for v31.2 release:
   * [GetResourceType](api/Request.md#getresourcetype)
   * [GetTransitionType](api/Request.md#gettransitiontype)
 * [RequestHandler (interface)](api/RequestHandler.md#requesthandler-interface)
+  * [CanGetCookies](api/RequestHandler.md#cangetcookies)
+  * [CanSetCookie](api/RequestHandler.md#cansetcookie)
+  * [GetAuthCredentials](api/RequestHandler.md#getauthcredentials)
+  * [GetCookieManager](api/RequestHandler.md#getcookiemanager)
+  * [GetResourceHandler](api/RequestHandler.md#getresourcehandler)
   * [OnBeforeBrowse](api/RequestHandler.md#onbeforebrowse)
+  * [_OnBeforePluginLoad](api/RequestHandler.md#_onbeforepluginload)
   * [OnBeforeResourceLoad](api/RequestHandler.md#onbeforeresourceload)
-  * [GetResourceHandler](api/RequestHandler.md#getresourcehandler)
+  * [_OnCertificateError](api/RequestHandler.md#_oncertificateerror)
+  * [OnQuotaRequest](api/RequestHandler.md#onquotarequest)
   * [OnResourceRedirect](api/RequestHandler.md#onresourceredirect)
   * [OnResourceResponse](api/RequestHandler.md#onresourceresponse)
-  * [GetAuthCredentials](api/RequestHandler.md#getauthcredentials)
-  * [OnQuotaRequest](api/RequestHandler.md#onquotarequest)
-  * [GetCookieManager](api/RequestHandler.md#getcookiemanager)
+  * [OnPluginCrashed](api/RequestHandler.md#onplugincrashed)
   * [OnProtocolExecution](api/RequestHandler.md#onprotocolexecution)
-  * [_OnBeforePluginLoad](api/RequestHandler.md#_onbeforepluginload)
-  * [_OnCertificateError](api/RequestHandler.md#_oncertificateerror)
   * [OnRendererProcessTerminated](api/RequestHandler.md#onrendererprocessterminated)
-  * [OnPluginCrashed](api/RequestHandler.md#onplugincrashed)
 * [ResourceHandler (interface)](api/ResourceHandler.md#resourcehandler-interface)
   * [ProcessRequest](api/ResourceHandler.md#processrequest)
   * [GetResponseHeaders](api/ResourceHandler.md#getresponseheaders)
diff --git a/api/API-index.md b/api/API-index.md
index 9946b5b5..d5e3efcb 100644
--- a/api/API-index.md
+++ b/api/API-index.md
@@ -295,10 +295,10 @@
   * [OnPreKeyEvent](KeyboardHandler.md#onprekeyevent)
   * [OnKeyEvent](KeyboardHandler.md#onkeyevent)
 * [LifespanHandler (interface)](LifespanHandler.md#lifespanhandler-interface)
-  * [OnBeforePopup](LifespanHandler.md#onbeforepopup)
-  * [_OnAfterCreated](LifespanHandler.md#_onaftercreated)
   * [DoClose](LifespanHandler.md#doclose)
+  * [_OnAfterCreated](LifespanHandler.md#_onaftercreated)
   * [OnBeforeClose](LifespanHandler.md#onbeforeclose)
+  * [OnBeforePopup](LifespanHandler.md#onbeforepopup)
 * [LoadHandler (interface)](LoadHandler.md#loadhandler-interface)
   * [OnLoadingStateChange](LoadHandler.md#onloadingstatechange)
   * [OnLoadStart](LoadHandler.md#onloadstart)
@@ -391,19 +391,21 @@
   * [GetResourceType](Request.md#getresourcetype)
   * [GetTransitionType](Request.md#gettransitiontype)
 * [RequestHandler (interface)](RequestHandler.md#requesthandler-interface)
+  * [CanGetCookies](RequestHandler.md#cangetcookies)
+  * [CanSetCookie](RequestHandler.md#cansetcookie)
+  * [GetAuthCredentials](RequestHandler.md#getauthcredentials)
+  * [GetCookieManager](RequestHandler.md#getcookiemanager)
+  * [GetResourceHandler](RequestHandler.md#getresourcehandler)
   * [OnBeforeBrowse](RequestHandler.md#onbeforebrowse)
+  * [_OnBeforePluginLoad](RequestHandler.md#_onbeforepluginload)
   * [OnBeforeResourceLoad](RequestHandler.md#onbeforeresourceload)
-  * [GetResourceHandler](RequestHandler.md#getresourcehandler)
+  * [_OnCertificateError](RequestHandler.md#_oncertificateerror)
+  * [OnQuotaRequest](RequestHandler.md#onquotarequest)
   * [OnResourceRedirect](RequestHandler.md#onresourceredirect)
   * [OnResourceResponse](RequestHandler.md#onresourceresponse)
-  * [GetAuthCredentials](RequestHandler.md#getauthcredentials)
-  * [OnQuotaRequest](RequestHandler.md#onquotarequest)
-  * [GetCookieManager](RequestHandler.md#getcookiemanager)
+  * [OnPluginCrashed](RequestHandler.md#onplugincrashed)
   * [OnProtocolExecution](RequestHandler.md#onprotocolexecution)
-  * [_OnBeforePluginLoad](RequestHandler.md#_onbeforepluginload)
-  * [_OnCertificateError](RequestHandler.md#_oncertificateerror)
   * [OnRendererProcessTerminated](RequestHandler.md#onrendererprocessterminated)
-  * [OnPluginCrashed](RequestHandler.md#onplugincrashed)
 * [ResourceHandler (interface)](ResourceHandler.md#resourcehandler-interface)
   * [ProcessRequest](ResourceHandler.md#processrequest)
   * [GetResponseHeaders](ResourceHandler.md#getresponseheaders)
diff --git a/api/LifespanHandler.md b/api/LifespanHandler.md
index d3bad5c3..2b929512 100644
--- a/api/LifespanHandler.md
+++ b/api/LifespanHandler.md
@@ -3,22 +3,71 @@
 
 # LifespanHandler (interface)
 
-Implement this interface to handle events related to browser life span. The methods of this class will be called on the UI thread.
+Implement this interface to handle events related to browser life span.
+The methods of this class will be called on the UI thread.
 
-For an example of how to implement a handler see [cefpython](cefpython.md).CreateBrowser(). For a list of all handler interfaces see [API > Client handlers](API#Client_handlers).
+Related code snippets:
+- [onbeforeclose.py](../examples/snippets/onbeforeclose.py)
 
 
 Table of contents:
 * [Callbacks](#callbacks)
-  * [OnBeforePopup](#onbeforepopup)
-  * [_OnAfterCreated](#_onaftercreated)
   * [DoClose](#doclose)
+  * [_OnAfterCreated](#_onaftercreated)
   * [OnBeforeClose](#onbeforeclose)
+  * [OnBeforePopup](#onbeforepopup)
 
 
 ## Callbacks
 
 
+### DoClose
+
+| Parameter | Type |
+| --- | --- |
+| browser | [Browser](Browser.md) |
+| __Return__ | bool |
+
+Called when a browser has recieved a request to close. This may result
+directly from a call to [Browser](Browser.md).`CloseBrowser` or indirectly
+if the
+browser is a top-level OS window created by CEF and the user attempts to
+close the window. This method will be called after the Javascript
+'onunload' event has been fired. It will not be called for browsers after
+the associated OS window has been destroyed (for those browsers it is no
+longer possible to cancel the close).
+
+See complete description of this callback in [cef_life_span_handler.h]
+(..|src|include|cef_life_span_handler.h).
+
+
+### _OnAfterCreated
+
+| Parameter | Type |
+| --- | --- |
+| browser | [Browser](Browser.md) |
+| __Return__ | void |
+
+Called after a new browser is created. This callback will be the first
+notification that references |browser|.
+
+This callback will be executed during browser creation, thus you must call [cefpython](cefpython.md).SetGlobalClientCallback() to use it. The callback name was prefixed with "`_`" to distinguish this special behavior.
+
+
+### OnBeforeClose
+
+| Parameter | Type |
+| --- | --- |
+| browser | [Browser](Browser.md) |
+| __Return__ | void |
+
+Called just before a browser is destroyed. Release all references to the
+browser object and do not attempt to execute any methods on the browser
+object after this callback returns. This callback will be the last
+notification that references |browser|. See DoClose() documentation for
+additional usage information.
+
+
 ### OnBeforePopup
 
 | Parameter | Type |
@@ -73,50 +122,3 @@ There will be no "window.opener" property available in the popup window.
 * WOD_SAVE_TO_DISK,
 * WOD_OFF_THE_RECORD,
 * WOD_IGNORE_ACTION
-
-
-### _OnAfterCreated
-
-| Parameter | Type |
-| --- | --- |
-| browser | [Browser](Browser.md) |
-| __Return__ | void |
-
-Called after a new browser is created. This callback will be the first
-notification that references |browser|.
-
-This callback will be executed during browser creation, thus you must call [cefpython](cefpython.md).SetGlobalClientCallback() to use it. The callback name was prefixed with "`_`" to distinguish this special behavior.
-
-
-### DoClose
-
-| Parameter | Type |
-| --- | --- |
-| browser | [Browser](Browser.md) |
-| __Return__ | bool |
-
-Called when a browser has recieved a request to close. This may result
-directly from a call to [Browser](Browser.md).`CloseBrowser` or indirectly
-if the
-browser is a top-level OS window created by CEF and the user attempts to
-close the window. This method will be called after the Javascript
-'onunload' event has been fired. It will not be called for browsers after
-the associated OS window has been destroyed (for those browsers it is no
-longer possible to cancel the close).
-
-See complete description of this callback in [cef_life_span_handler.h]
-(..|src|include|cef_life_span_handler.h).
-
-
-### OnBeforeClose
-
-| Parameter | Type |
-| --- | --- |
-| browser | [Browser](Browser.md) |
-| __Return__ | void |
-
-Called just before a browser is destroyed. Release all references to the
-browser object and do not attempt to execute any methods on the browser
-object after this callback returns. This callback will be the last
-notification that references |browser|. See DoClose() documentation for
-additional usage information.
diff --git a/api/RequestHandler.md b/api/RequestHandler.md
index e7f48224..f1ef8bf7 100644
--- a/api/RequestHandler.md
+++ b/api/RequestHandler.md
@@ -4,134 +4,69 @@
 # RequestHandler (interface)
 
 Implement this interface to handle events related to browser requests.
+The methods of this class will be called on the thread indicated.
 
-For an example of how to implement handler see
-[cefpython](cefpython.md).CreateBrowserSync(). For a list of all handler
-interfaces see [API > Client handlers](API#Client_handlers).
-
-The `RequestHandler` tests can be found in the old wxpython.py script (v31).
-
-Not yet exposed in CEF Python:
-* OnOpenURLFromTab
-* OnSelectClientCertificate
+Related code snippets:
+- [network_cookies.py](../examples/snippets/network_cookies.py)
 
+Available in upstream CEF, but not yet exposed to CEF Python:
+- OnOpenURLFromTab
+- OnSelectClientCertificate
 
 
 Table of contents:
 * [Callbacks](#callbacks)
+  * [CanGetCookies](#cangetcookies)
+  * [CanSetCookie](#cansetcookie)
+  * [GetAuthCredentials](#getauthcredentials)
+  * [GetCookieManager](#getcookiemanager)
+  * [GetResourceHandler](#getresourcehandler)
   * [OnBeforeBrowse](#onbeforebrowse)
+  * [_OnBeforePluginLoad](#_onbeforepluginload)
   * [OnBeforeResourceLoad](#onbeforeresourceload)
-  * [GetResourceHandler](#getresourcehandler)
+  * [_OnCertificateError](#_oncertificateerror)
+  * [OnQuotaRequest](#onquotarequest)
   * [OnResourceRedirect](#onresourceredirect)
   * [OnResourceResponse](#onresourceresponse)
-  * [GetAuthCredentials](#getauthcredentials)
-  * [OnQuotaRequest](#onquotarequest)
-  * [GetCookieManager](#getcookiemanager)
+  * [OnPluginCrashed](#onplugincrashed)
   * [OnProtocolExecution](#onprotocolexecution)
-  * [_OnBeforePluginLoad](#_onbeforepluginload)
-  * [_OnCertificateError](#_oncertificateerror)
   * [OnRendererProcessTerminated](#onrendererprocessterminated)
-  * [OnPluginCrashed](#onplugincrashed)
 
 
 ## Callbacks
 
 
-### OnBeforeBrowse
+### CanGetCookies
 
 | Parameter | Type |
 | --- | --- |
 | browser | [Browser](Browser.md) |
 | frame | [Frame](Frame.md) |
 | request | [Request](Request.md) |
-| user_gesture | bool |
-| is_redirect | bool |
 | __Return__ | bool |
 
 Description from upstream CEF:
-> Called on the UI thread before browser navigation. Return true to cancel
-> the navigation or false to allow the navigation to proceed. The |request|
-> object cannot be modified in this callback.
-> CefLoadHandler::OnLoadingStateChange will be called twice in all cases.
-> If the navigation is allowed CefLoadHandler::OnLoadStart and
-> CefLoadHandler::OnLoadEnd will be called. If the navigation is canceled
-> CefLoadHandler::OnLoadError will be called with an |errorCode| value of
-> ERR_ABORTED. The |user_gesture| value will be true if the browser
-> navigated via explicit user gesture (e.g. clicking a link) or false if it
-> navigated automatically (e.g. via the DomContentLoaded event).
+> Called on the IO thread before sending a network request with a "Cookie"
+> request header. Return true to allow cookies to be included in the network
+> request or false to block cookies. The |request| object should not be
+> modified in this callback.
 
 
-### OnBeforeResourceLoad
+### CanSetCookie
 
 | Parameter | Type |
 | --- | --- |
 | browser | [Browser](Browser.md) |
 | frame | [Frame](Frame.md) |
 | request | [Request](Request.md) |
+| cookie | [Cookie](Cookie.md) |
 | __Return__ | bool |
 
-Called on the IO thread before a resource request is loaded. The |request|
-object may be modified. To cancel the request return true otherwise return
-false.
-
-
-### GetResourceHandler
-
-| Parameter | Type |
-| --- | --- |
-| browser | [Browser](Browser.md) |
-| frame | [Frame](Frame.md) |
-| request | [Request](Request.md) |
-| __Return__ | [ResourceHandler](ResourceHandler.md) |
-
-Called on the IO thread before a resource is loaded. To allow the resource
-to load normally return None. To specify a handler for the resource return
-a [ResourceHandler](ResourceHandler.md) object. The |request| object should
-not be modified in this callback.
-
-The [ResourceHandler](ResourceHandler.md) object is a python class that
-implements the `ResourceHandler` callbacks. Remember to keep a strong
-reference to this object while resource is being loaded.
-
-The `GetResourceHandler` example can be found in the old v31
-"wxpython-response.py" script on Linux.
-
-
-### OnResourceRedirect
-
-| Parameter | Type |
-| --- | --- |
-| browser | [Browser](Browser.md) |
-| frame | [Frame](Frame.md) |
-| old_url | string |
-| new_url_out | list[string] |
-| request | [Request](Request.md) |
-| response | [Response](Response.md) |
-| __Return__ | void |
-
 Description from upstream CEF:
-> Called on the IO thread when a resource load is redirected. The |request|
-> parameter will contain the old URL and other request-related information.
-> The |response| parameter will contain the response that resulted in the
-> redirect. The |new_url| parameter will contain the new URL and can be
-> changed if desired. The |request| object cannot be modified in this
-> callback.
-
-
-### OnResourceResponse
-
-| | |
-| --- | --- |
-| __Return__ | void |
-
-Available in upstream CEF, but not yet exposed to CEF Python.
-See Issue #229.
-
-You can implement this functionality by using
-[ResourceHandler](ResourceHandler.md) and [WebRequest](WebRequest.md)
-/ [WebRequestClient](WebRequestClient.md). For an example see the
-_OnResourceResponse() method in the old v31 [wxpython-response.py]
-example.
+> Called on the IO thread when receiving a network request with a
+> "Set-Cookie" response header value represented by |cookie|. Return true to
+> allow the cookie to be stored or false to block the cookie. The |request|
+> object should not be modified in this callback.
 
 
 ### GetAuthCredentials
@@ -171,28 +106,6 @@ Example implementations:
   [[3]](https://github.com/cztomczak/cefpython/blob/cefpython31/cefpython/http_authentication_win.pyx).
 
 
-### OnQuotaRequest
-
-| Parameter | Type |
-| --- | --- |
-| browser | [Browser](Browser.md) |
-| origin_url | string |
-| new_size | long |
-| callback | RequestCallback |
-| __Return__ | bool |
-
-Called on the IO thread when javascript requests a specific storage quota
-size via the `webkitStorageInfo.requestQuota` function. |origin_url| is the
-origin of the page making the request. |new_size| is the requested quota
-size in bytes. Return true to continue the request and call
-CefRequestCallback::Continue() either in this method or at a later time to
-grant or deny the request. Return false to cancel the request immediately.
-
-The `RequestCallback` object methods:
-* void Continue(bool allow)
-* void Cancel()
-
-
 ### GetCookieManager
 
 | Parameter | Type |
@@ -231,27 +144,50 @@ The `CreateAnotherBrowser` function from the old v31 wxpython
 example does that.
 
 
-
-### OnProtocolExecution
+### GetResourceHandler
 
 | Parameter | Type |
 | --- | --- |
 | browser | [Browser](Browser.md) |
-| url | string |
-| allow_execution_out | list[bool] |
-| __Return__ | void |
+| frame | [Frame](Frame.md) |
+| request | [Request](Request.md) |
+| __Return__ | [ResourceHandler](ResourceHandler.md) |
 
-Called on the UI thread to handle requests for URLs with an unknown
-protocol component. Set |allow_execution_out[0]| to True to attempt
-execution via the registered OS protocol handler, if any.
+Called on the IO thread before a resource is loaded. To allow the resource
+to load normally return None. To specify a handler for the resource return
+a [ResourceHandler](ResourceHandler.md) object. The |request| object should
+not be modified in this callback.
 
-__SECURITY NOTE__: You should use this callback to enforce restrictions
-based on scheme, host or other url analysis before allowing OS execution.
+The [ResourceHandler](ResourceHandler.md) object is a python class that
+implements the `ResourceHandler` callbacks. Remember to keep a strong
+reference to this object while resource is being loaded.
 
-There's no default implementation for OnProtocolExecution on Linux,
-you have to make OS system call on your own. You probably also need
-to use [LoadHandler](LoadHandler.md)::OnLoadError() when implementing
-this on Linux.
+The `GetResourceHandler` example can be found in the old v31
+"wxpython-response.py" script on Linux.
+
+
+### OnBeforeBrowse
+
+| Parameter | Type |
+| --- | --- |
+| browser | [Browser](Browser.md) |
+| frame | [Frame](Frame.md) |
+| request | [Request](Request.md) |
+| user_gesture | bool |
+| is_redirect | bool |
+| __Return__ | bool |
+
+Description from upstream CEF:
+> Called on the UI thread before browser navigation. Return true to cancel
+> the navigation or false to allow the navigation to proceed. The |request|
+> object cannot be modified in this callback.
+> CefLoadHandler::OnLoadingStateChange will be called twice in all cases.
+> If the navigation is allowed CefLoadHandler::OnLoadStart and
+> CefLoadHandler::OnLoadEnd will be called. If the navigation is canceled
+> CefLoadHandler::OnLoadError will be called with an |errorCode| value of
+> ERR_ABORTED. The |user_gesture| value will be true if the browser
+> navigated via explicit user gesture (e.g. clicking a link) or false if it
+> navigated automatically (e.g. via the DomContentLoaded event).
 
 
 ### _OnBeforePluginLoad
@@ -284,7 +220,6 @@ Description from upstream CEF:
 > purge the plugin list cache and potentially trigger new calls to this
 > method call CefRequestContext::PurgePluginListCache.
 
-
 Return True to block loading of the plugin.
 
 This callback will be executed during browser creation, thus you must
@@ -297,6 +232,20 @@ This callback is called every time the page tries to load a plugin
 (perhaps even multiple times per plugin).
 
 
+### OnBeforeResourceLoad
+
+| Parameter | Type |
+| --- | --- |
+| browser | [Browser](Browser.md) |
+| frame | [Frame](Frame.md) |
+| request | [Request](Request.md) |
+| __Return__ | bool |
+
+Called on the IO thread before a resource request is loaded. The |request|
+object may be modified. To cancel the request return true otherwise return
+false.
+
+
 ### _OnCertificateError
 
 | Parameter | Type |
@@ -323,21 +272,63 @@ The `RequestCallback` object methods:
   * void Cancel()
 
 
-### OnRendererProcessTerminated
+### OnQuotaRequest
 
 | Parameter | Type |
 | --- | --- |
 | browser | [Browser](Browser.md) |
-| status | TerminationStatus |
+| origin_url | string |
+| new_size | long |
+| callback | RequestCallback |
+| __Return__ | bool |
+
+Called on the IO thread when javascript requests a specific storage quota
+size via the `webkitStorageInfo.requestQuota` function. |origin_url| is the
+origin of the page making the request. |new_size| is the requested quota
+size in bytes. Return true to continue the request and call
+CefRequestCallback::Continue() either in this method or at a later time to
+grant or deny the request. Return false to cancel the request immediately.
+
+The `RequestCallback` object methods:
+* void Continue(bool allow)
+* void Cancel()
+
+
+### OnResourceRedirect
+
+| Parameter | Type |
+| --- | --- |
+| browser | [Browser](Browser.md) |
+| frame | [Frame](Frame.md) |
+| old_url | string |
+| new_url_out | list[string] |
+| request | [Request](Request.md) |
+| response | [Response](Response.md) |
 | __Return__ | void |
 
-Called when the render process terminates unexpectedly. |status| indicates
-how the process terminated.
+Description from upstream CEF:
+> Called on the IO thread when a resource load is redirected. The |request|
+> parameter will contain the old URL and other request-related information.
+> The |response| parameter will contain the response that resulted in the
+> redirect. The |new_url| parameter will contain the new URL and can be
+> changed if desired. The |request| object cannot be modified in this
+> callback.
 
-`TerminationStatus` constants in the cefpython module:
-  * TS_ABNORMAL_TERMINATION - Non-zero exit status.
-  * TS_PROCESS_WAS_KILLED - SIGKILL or task manager kill.
-  * TS_PROCESS_CRASHED - Segmentation fault.
+
+### OnResourceResponse
+
+| | |
+| --- | --- |
+| __Return__ | void |
+
+Available in upstream CEF, but not yet exposed to CEF Python.
+See Issue #229.
+
+You can implement this functionality by using
+[ResourceHandler](ResourceHandler.md) and [WebRequest](WebRequest.md)
+/ [WebRequestClient](WebRequestClient.md). For an example see the
+_OnResourceResponse() method in the old v31 [wxpython-response.py]
+example.
 
 
 ### OnPluginCrashed
@@ -350,3 +341,42 @@ how the process terminated.
 
 Called when a plugin has crashed. |plugin_path| is the path of the plugin
 that crashed.
+
+
+### OnProtocolExecution
+
+| Parameter | Type |
+| --- | --- |
+| browser | [Browser](Browser.md) |
+| url | string |
+| allow_execution_out | list[bool] |
+| __Return__ | void |
+
+Called on the UI thread to handle requests for URLs with an unknown
+protocol component. Set |allow_execution_out[0]| to True to attempt
+execution via the registered OS protocol handler, if any.
+
+__SECURITY NOTE__: You should use this callback to enforce restrictions
+based on scheme, host or other url analysis before allowing OS execution.
+
+There's no default implementation for OnProtocolExecution on Linux,
+you have to make OS system call on your own. You probably also need
+to use [LoadHandler](LoadHandler.md)::OnLoadError() when implementing
+this on Linux.
+
+
+### OnRendererProcessTerminated
+
+| Parameter | Type |
+| --- | --- |
+| browser | [Browser](Browser.md) |
+| status | TerminationStatus |
+| __Return__ | void |
+
+Called when the render process terminates unexpectedly. |status| indicates
+how the process terminated.
+
+`TerminationStatus` constants in the cefpython module:
+  * TS_ABNORMAL_TERMINATION - Non-zero exit status.
+  * TS_PROCESS_WAS_KILLED - SIGKILL or task manager kill.
+  * TS_PROCESS_CRASHED - Segmentation fault.
diff --git a/examples/README-examples.md b/examples/README-examples.md
index eb64b0d4..c4e98961 100644
--- a/examples/README-examples.md
+++ b/examples/README-examples.md
@@ -3,6 +3,11 @@
 Table of contents:
 * [Hello World!](#hello-world)
 * [Supported examples](#supported-examples)
+  * [Featured](#featured)
+  * [GUI frameworks](#gui-frameworks)
+  * [Snippets](#snippets)
+  * [Build executable with PyInstaller](#build-executable-with-pyinstaller)
+  * [Unit tests](#unit-tests)
 * [Other examples](#other-examples)
 * [More examples to come](#more-examples-to-come)
 
@@ -27,7 +32,7 @@ in sources to see whether this is a known issue with available
 workarounds.
 
 
-**Featured**
+### Featured
 
 - [hello_world.py](hello_world.py) - Basic example, doesn't require any
   third party GUI framework to run
@@ -37,7 +42,7 @@ workarounds.
   discussed in great details in Tutorial in the [Off-screen rendering](../docs/Tutorial.md#off-screen-rendering)
   section.
 
-**Embedding using various GUI frameworks**
+### GUI frameworks
 
 - [gtk2.py](gtk2.py): example for [PyGTK](http://www.pygtk.org/)
   library (GTK 2)
@@ -59,17 +64,25 @@ workarounds.
   toolkit. This example implements High DPI support on Windows.
 
 
-**Build executable using Python packagers**
+### Snippets
+
+See small code snippets that test various features in the
+[examples/snippets/](snippets/) directory.
+
+
+### Build executable with PyInstaller
 
 - [PyInstaller example](pyinstaller/README-pyinstaller.md):
   example of packaging app using [PyInstaller](http://www.pyinstaller.org/)
-  packager (currently example supports only Windows platform)
+  packager. Currently this example supports only Windows platform.
 
 
-**Unit tests**
+### Unit tests
 
 There are also available unit tests and its usage of the API can
-be of some use. See [main_test.py](../unittests/main_test.py).
+be of some use. See:
+- [main_test.py](../unittests/main_test.py) - windowed rendering general tests
+- [osr_test.py](../unittests/osr_test.py) - off-screen rendering tests
 
 
 ## Other examples
diff --git a/examples/snippets/network_cookies.py b/examples/snippets/network_cookies.py
new file mode 100644
index 00000000..ec5e474e
--- /dev/null
+++ b/examples/snippets/network_cookies.py
@@ -0,0 +1,47 @@
+# Implement RequestHandler.CanGetCookies and CanSetCookie
+# to block or allow cookies over network requests.
+
+from cefpython3 import cefpython as cef
+
+
+def main():
+    cef.Initialize()
+    browser = cef.CreateBrowserSync(
+        url="http://www.html-kit.com/tools/cookietester/",
+        window_title="Network cookies")
+    browser.SetClientHandler(RequestHandler())
+    cef.MessageLoop()
+    del browser
+    cef.Shutdown()
+
+
+class RequestHandler(object):
+    def __init__(self):
+        self.getcount = 0
+        self.setcount = 0
+
+    def CanGetCookies(self, frame, request, **_):
+        # There are multiple iframes on that website, let's log
+        # cookies only for the main frame.
+        if frame.IsMain():
+            self.getcount += 1
+            print("-- CanGetCookies #"+str(self.getcount))
+            print("url="+request.GetUrl()[0:80])
+            print("")
+        return True
+
+    def CanSetCookie(self, frame, request, cookie, **_):
+        # There are multiple iframes on that website, let's log
+        # cookies only for the main frame.
+        if frame.IsMain():
+            self.setcount += 1
+            print("-- CanSetCookie @"+str(self.setcount))
+            print("url="+request.GetUrl()[0:80])
+            print("Name="+cookie.GetName())
+            print("Value="+cookie.GetValue())
+            print("")
+        return True
+
+
+if __name__ == '__main__':
+    main()
diff --git a/src/browser.pyx b/src/browser.pyx
index c6060d44..34f5e4df 100644
--- a/src/browser.pyx
+++ b/src/browser.pyx
@@ -248,7 +248,7 @@ cdef class PyBrowser:
                     "OnQuotaRequest", "OnProtocolExecution",
                     "GetResourceHandler",
                     "OnBeforeBrowse", "OnRendererProcessTerminated",
-                    "OnPluginCrashed"]
+                    "OnPluginCrashed", "CanGetCookies", "CanSetCookie"]
             # RequestContextHandler
             self.allowedClientCallbacks += ["GetCookieManager"]
             # LoadHandler
diff --git a/src/cef_v59..v66_changes.txt b/src/cef_v59..v66_changes.txt
index e6dbfb2c..f1e3c287 100644
--- a/src/cef_v59..v66_changes.txt
+++ b/src/cef_v59..v66_changes.txt
@@ -78,6 +78,9 @@ NEW FEATURES
 + Browser.GetSetting
 + cefpython.GetBrowserByIdentifier
 + Browser.HasDevTools
++ examples/snippets/
+    + onbeforeclose.py
+    + network_cookies.py
 
 internal/cef_types.h
 + cef_log_severity_t: new key LOGSEVERITY_DEBUG (no need to expose,
@@ -137,8 +140,8 @@ cef_file_util.h
 + CefLoadCRLSetsFile
 
 cef_request_handler.h
-- CanGetCookies
-- CanSetCookie
++ CanGetCookies
++ CanSetCookie
 
 cef_response.h
 - GetURL
diff --git a/src/client_handler/request_handler.cpp b/src/client_handler/request_handler.cpp
index ea681559..5227b892 100644
--- a/src/client_handler/request_handler.cpp
+++ b/src/client_handler/request_handler.cpp
@@ -117,3 +117,18 @@ void RequestHandler::OnPluginCrashed(CefRefPtr<CefBrowser> browser,
     REQUIRE_UI_THREAD();
     RequestHandler_OnPluginCrashed(browser, plugin_path);
 }
+
+bool RequestHandler::CanGetCookies(CefRefPtr<CefBrowser> browser,
+                                   CefRefPtr<CefFrame> frame,
+                                   CefRefPtr<CefRequest> request) {
+    REQUIRE_IO_THREAD();
+    return RequestHandler_CanGetCookies(browser, frame, request);
+}
+
+bool RequestHandler::CanSetCookie(CefRefPtr<CefBrowser> browser,
+                                  CefRefPtr<CefFrame> frame,
+                                  CefRefPtr<CefRequest> request,
+                                  const CefCookie& cookie) {
+    REQUIRE_IO_THREAD();
+    return RequestHandler_CanSetCookie(browser, frame, request, cookie);
+}
diff --git a/src/client_handler/request_handler.h b/src/client_handler/request_handler.h
index a56760b2..7e5e0e6c 100644
--- a/src/client_handler/request_handler.h
+++ b/src/client_handler/request_handler.h
@@ -67,6 +67,15 @@ class RequestHandler : public CefRequestHandler
     void OnPluginCrashed(CefRefPtr<CefBrowser> browser,
                          const CefString& plugin_path) override;
 
+    bool CanGetCookies(CefRefPtr<CefBrowser> browser,
+                       CefRefPtr<CefFrame> frame,
+                       CefRefPtr<CefRequest> request) override;
+
+    bool CanSetCookie(CefRefPtr<CefBrowser> browser,
+                      CefRefPtr<CefFrame> frame,
+                      CefRefPtr<CefRequest> request,
+                      const CefCookie& cookie) override;
+
 private:
     IMPLEMENT_REFCOUNTING(RequestHandler);
 };
diff --git a/src/handlers/request_handler.pyx b/src/handlers/request_handler.pyx
index d89c5a1b..866942bf 100644
--- a/src/handlers/request_handler.pyx
+++ b/src/handlers/request_handler.pyx
@@ -4,6 +4,7 @@
 
 include "../cefpython.pyx"
 include "../browser.pyx"
+include "../cookie.pyx"
 
 # cef_termination_status_t
 cimport cef_types
@@ -512,3 +513,75 @@ cdef public void RequestHandler_OnPluginCrashed(
     except:
         (exc_type, exc_value, exc_trace) = sys.exc_info()
         sys.excepthook(exc_type, exc_value, exc_trace)
+
+
+cdef public cpp_bool RequestHandler_CanGetCookies(
+        CefRefPtr[CefBrowser] cef_browser,
+        CefRefPtr[CefFrame] cef_frame,
+        CefRefPtr[CefRequest] cef_request
+        ) except * with gil:
+    cdef PyBrowser browser
+    cdef PyFrame frame
+    cdef PyRequest request
+    cdef object callback
+    cdef py_bool retval
+    try:
+        # Issue #455: CefRequestHandler callbacks still executed after
+        # browser was closed.
+        if IsBrowserClosed(cef_browser):
+            return False
+
+        browser = GetPyBrowser(cef_browser, "CanGetCookies")
+        frame = GetPyFrame(cef_frame)
+        request = CreatePyRequest(cef_request)
+        callback = browser.GetClientCallback("CanGetCookies")
+        if callback:
+            retval = callback(
+                    browser=browser,
+                    frame=frame,
+                    request=request)
+            return bool(retval)
+        else:
+            # Return True by default
+            return True
+    except:
+        (exc_type, exc_value, exc_trace) = sys.exc_info()
+        sys.excepthook(exc_type, exc_value, exc_trace)
+
+
+cdef public cpp_bool RequestHandler_CanSetCookie(
+        CefRefPtr[CefBrowser] cef_browser,
+        CefRefPtr[CefFrame] cef_frame,
+        CefRefPtr[CefRequest] cef_request,
+        const CefCookie& cef_cookie
+        ) except * with gil:
+    cdef PyBrowser browser
+    cdef PyFrame frame
+    cdef PyRequest request
+    cdef PyCookie cookie
+    cdef object callback
+    cdef py_bool retval
+    try:
+        # Issue #455: CefRequestHandler callbacks still executed after
+        # browser was closed.
+        if IsBrowserClosed(cef_browser):
+            return False
+
+        browser = GetPyBrowser(cef_browser, "CanSetCookie")
+        frame = GetPyFrame(cef_frame)
+        request = CreatePyRequest(cef_request)
+        cookie = CreatePyCookie(cef_cookie)
+        callback = browser.GetClientCallback("CanSetCookie")
+        if callback:
+            retval = callback(
+                    browser=browser,
+                    frame=frame,
+                    request=request,
+                    cookie=cookie)
+            return bool(retval)
+        else:
+            # Return True by default
+            return True
+    except:
+        (exc_type, exc_value, exc_trace) = sys.exc_info()
+        sys.excepthook(exc_type, exc_value, exc_trace)

From 5b51fc356b6931ebfbd04094eb2567255592fc39 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Sun, 19 Aug 2018 19:17:50 +0200
Subject: [PATCH 134/238] Add snippets/mouse_clicks.py (#403)

---
 examples/snippets/mouse_clicks.py    | 46 ++++++++++++++++++++++++++++
 examples/snippets/network_cookies.py |  6 ++--
 examples/snippets/onbeforeclose.py   |  6 ++--
 3 files changed, 54 insertions(+), 4 deletions(-)
 create mode 100644 examples/snippets/mouse_clicks.py

diff --git a/examples/snippets/mouse_clicks.py b/examples/snippets/mouse_clicks.py
new file mode 100644
index 00000000..d3d340f2
--- /dev/null
+++ b/examples/snippets/mouse_clicks.py
@@ -0,0 +1,46 @@
+# Perform mouse clicks and mouse movements programmatically.
+
+from cefpython3 import cefpython as cef
+
+
+def main():
+    cef.Initialize()
+    browser = cef.CreateBrowserSync(
+        url="data:text/html,<h1>Mouse clicks snippet</h1>"
+            "This text will be selected after one second.<br>"
+            "This text will be selected after two seconds.",
+        window_title="Mouse clicks")
+    browser.SetClientHandler(LifespanHandler())
+    cef.MessageLoop()
+    del browser
+    cef.Shutdown()
+
+
+def click_after_1_second(browser):
+    print("Click after 1 second")
+    browser.SendMouseMoveEvent(0, 70, False, 0)
+    browser.SendMouseClickEvent(0, 70, cef.MOUSEBUTTON_LEFT, False, 1)
+    browser.SendMouseMoveEvent(400, 80, False, cef.EVENTFLAG_LEFT_MOUSE_BUTTON)
+    browser.SendMouseClickEvent(400, 80, cef.MOUSEBUTTON_LEFT, True, 1)
+    cef.PostDelayedTask(cef.TID_UI, 1000, click_after_2_seconds, browser)
+
+
+def click_after_2_seconds(browser):
+    print("Click after 2 seconds")
+    browser.SendMouseMoveEvent(0, 90, False, 0)
+    browser.SendMouseClickEvent(0, 90, cef.MOUSEBUTTON_LEFT, False, 1)
+    browser.SendMouseMoveEvent(400, 100, False, cef.EVENTFLAG_LEFT_MOUSE_BUTTON)
+    browser.SendMouseClickEvent(400, 100, cef.MOUSEBUTTON_LEFT, True, 1)
+    cef.PostDelayedTask(cef.TID_UI, 1000, click_after_1_second, browser)
+
+
+class LifespanHandler(object):
+    def OnLoadEnd(self, browser, **_):
+        # Execute function with a delay of 1 second after page
+        # has completed loading.
+        print("Page completed loading")
+        cef.PostDelayedTask(cef.TID_UI, 1000, click_after_1_second, browser)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/examples/snippets/network_cookies.py b/examples/snippets/network_cookies.py
index ec5e474e..ad1e2c18 100644
--- a/examples/snippets/network_cookies.py
+++ b/examples/snippets/network_cookies.py
@@ -1,5 +1,7 @@
-# Implement RequestHandler.CanGetCookies and CanSetCookie
-# to block or allow cookies over network requests.
+"""
+Implement RequestHandler.CanGetCookies and CanSetCookie
+to block or allow cookies over network requests.
+"""
 
 from cefpython3 import cefpython as cef
 
diff --git a/examples/snippets/onbeforeclose.py b/examples/snippets/onbeforeclose.py
index 73c3bafe..9b072e96 100644
--- a/examples/snippets/onbeforeclose.py
+++ b/examples/snippets/onbeforeclose.py
@@ -1,5 +1,7 @@
-# Implement LifespanHandler.OnBeforeClose to execute custom
-# code before browser window closes.
+"""
+Implement LifespanHandler.OnBeforeClose to execute custom
+code before browser window closes.
+"""
 
 from cefpython3 import cefpython as cef
 

From 3d0f3856cca8f369d17a1428412a111e1200770c Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Sun, 19 Aug 2018 19:23:12 +0200
Subject: [PATCH 135/238] Update snippets/mouse_clicks.py (#403)

---
 examples/snippets/mouse_clicks.py | 5 +++++
 src/cef_v59..v66_changes.txt      | 1 +
 2 files changed, 6 insertions(+)

diff --git a/examples/snippets/mouse_clicks.py b/examples/snippets/mouse_clicks.py
index d3d340f2..f9329c7e 100644
--- a/examples/snippets/mouse_clicks.py
+++ b/examples/snippets/mouse_clicks.py
@@ -18,9 +18,14 @@ def main():
 
 def click_after_1_second(browser):
     print("Click after 1 second")
+    # Mouse move to the top-left corner of the text
     browser.SendMouseMoveEvent(0, 70, False, 0)
+    # Left mouse button click in the top-left corner of the text
     browser.SendMouseClickEvent(0, 70, cef.MOUSEBUTTON_LEFT, False, 1)
+    # Mouse move to the bottom-right corner of the text,
+    # while holding left mouse button.
     browser.SendMouseMoveEvent(400, 80, False, cef.EVENTFLAG_LEFT_MOUSE_BUTTON)
+    # Release left mouse button
     browser.SendMouseClickEvent(400, 80, cef.MOUSEBUTTON_LEFT, True, 1)
     cef.PostDelayedTask(cef.TID_UI, 1000, click_after_2_seconds, browser)
 
diff --git a/src/cef_v59..v66_changes.txt b/src/cef_v59..v66_changes.txt
index f1e3c287..fdf96cb2 100644
--- a/src/cef_v59..v66_changes.txt
+++ b/src/cef_v59..v66_changes.txt
@@ -81,6 +81,7 @@ NEW FEATURES
 + examples/snippets/
     + onbeforeclose.py
     + network_cookies.py
+    + mouse_clicks.py
 
 internal/cef_types.h
 + cef_log_severity_t: new key LOGSEVERITY_DEBUG (no need to expose,

From 1f8693b81998f5f55157f7345dd14bbdc39f09b5 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Sun, 19 Aug 2018 19:23:55 +0200
Subject: [PATCH 136/238] Fix style in mouse_clicks.py

---
 examples/snippets/mouse_clicks.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/snippets/mouse_clicks.py b/examples/snippets/mouse_clicks.py
index f9329c7e..fcdd5280 100644
--- a/examples/snippets/mouse_clicks.py
+++ b/examples/snippets/mouse_clicks.py
@@ -34,8 +34,8 @@ def click_after_2_seconds(browser):
     print("Click after 2 seconds")
     browser.SendMouseMoveEvent(0, 90, False, 0)
     browser.SendMouseClickEvent(0, 90, cef.MOUSEBUTTON_LEFT, False, 1)
-    browser.SendMouseMoveEvent(400, 100, False, cef.EVENTFLAG_LEFT_MOUSE_BUTTON)
-    browser.SendMouseClickEvent(400, 100, cef.MOUSEBUTTON_LEFT, True, 1)
+    browser.SendMouseMoveEvent(400, 99, False, cef.EVENTFLAG_LEFT_MOUSE_BUTTON)
+    browser.SendMouseClickEvent(400, 99, cef.MOUSEBUTTON_LEFT, True, 1)
     cef.PostDelayedTask(cef.TID_UI, 1000, click_after_1_second, browser)
 
 

From 4ba8f585d9b2aa07b5defd7872106876285d427c Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Sun, 19 Aug 2018 19:25:49 +0200
Subject: [PATCH 137/238] Update network_cookies.py snippet

---
 examples/snippets/network_cookies.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/examples/snippets/network_cookies.py b/examples/snippets/network_cookies.py
index ad1e2c18..55a71ec0 100644
--- a/examples/snippets/network_cookies.py
+++ b/examples/snippets/network_cookies.py
@@ -30,6 +30,7 @@ def CanGetCookies(self, frame, request, **_):
             print("-- CanGetCookies #"+str(self.getcount))
             print("url="+request.GetUrl()[0:80])
             print("")
+        # Return True to allow reading cookies and False to block
         return True
 
     def CanSetCookie(self, frame, request, cookie, **_):
@@ -42,6 +43,7 @@ def CanSetCookie(self, frame, request, cookie, **_):
             print("Name="+cookie.GetName())
             print("Value="+cookie.GetValue())
             print("")
+        # Return True to allow setting cookie and False to block
         return True
 
 

From 2415a8f035996c4e10c17394748aee6d859522a4 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Mon, 20 Aug 2018 11:00:32 +0200
Subject: [PATCH 138/238] Add javascript_bindings.py snippet (#403) and others.

Add cef.GetDataUrl().
Update README-examples.md - add Snippets section.
Update PyInstaller example.
---
 README.md                                |  1 +
 api/API-index.md                         |  1 +
 api/cefpython.md                         | 15 +++++
 examples/README-examples.md              | 12 +++-
 examples/pyinstaller/hook-cefpython3.py  |  1 +
 examples/snippets/javascript_bindings.py | 70 ++++++++++++++++++++++++
 examples/snippets/mouse_clicks.py        |  2 +-
 examples/snippets/network_cookies.py     |  4 +-
 src/cef_v59..v66_changes.txt             |  2 +
 src/cefpython.pyx                        |  8 +++
 unittests/_common.py                     |  7 ---
 unittests/main_test.py                   |  2 +-
 unittests/osr_test.py                    |  2 +-
 13 files changed, 114 insertions(+), 13 deletions(-)
 create mode 100644 examples/snippets/javascript_bindings.py

diff --git a/README.md b/README.md
index 8e6259bc..9ecad822 100644
--- a/README.md
+++ b/README.md
@@ -469,6 +469,7 @@ Additional information for v31.2 release:
   * [GetBrowserByIdentifier](api/cefpython.md#getbrowserbyidentifier)
   * [GetBrowserByWindowHandle](api/cefpython.md#getbrowserbywindowhandle)
   * [GetCommandLineSwitch](api/cefpython.md#getcommandlineswitch)
+  * [GetDataUrl](api/cefpython.md#getdataurl)
   * [GetGlobalClientCallback](api/cefpython.md#getglobalclientcallback)
   * [GetModuleDirectory](api/cefpython.md#getmoduledirectory)
   * [GetVersion](api/cefpython.md#getversion)
diff --git a/api/API-index.md b/api/API-index.md
index d5e3efcb..9535cb5b 100644
--- a/api/API-index.md
+++ b/api/API-index.md
@@ -157,6 +157,7 @@
   * [GetBrowserByIdentifier](cefpython.md#getbrowserbyidentifier)
   * [GetBrowserByWindowHandle](cefpython.md#getbrowserbywindowhandle)
   * [GetCommandLineSwitch](cefpython.md#getcommandlineswitch)
+  * [GetDataUrl](cefpython.md#getdataurl)
   * [GetGlobalClientCallback](cefpython.md#getglobalclientcallback)
   * [GetModuleDirectory](cefpython.md#getmoduledirectory)
   * [GetVersion](cefpython.md#getversion)
diff --git a/api/cefpython.md b/api/cefpython.md
index 239bf400..a876bd69 100644
--- a/api/cefpython.md
+++ b/api/cefpython.md
@@ -16,6 +16,7 @@ Table of contents:
   * [GetBrowserByIdentifier](#getbrowserbyidentifier)
   * [GetBrowserByWindowHandle](#getbrowserbywindowhandle)
   * [GetCommandLineSwitch](#getcommandlineswitch)
+  * [GetDataUrl](#getdataurl)
   * [GetGlobalClientCallback](#getglobalclientcallback)
   * [GetModuleDirectory](#getmoduledirectory)
   * [GetVersion](#getversion)
@@ -140,6 +141,20 @@ Get browser by outer or inner window handle. An outer window handle is the one t
 Returns the [CommandLineSwitches](CommandLineSwitches.md) switch that was passed to Initialize(). Returns None if key is not found.
 
 
+### GetDataUrl
+
+| Parameter | Type |
+| --- | --- |
+| data | string |
+| mediatype="html" (optional) | string |
+| __Return__ | object |
+
+Convert data to a Data URL. Only "html" media type is currently supported.
+
+See:
+https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URIs
+
+
 ### GetGlobalClientCallback
 
 | Parameter | Type |
diff --git a/examples/README-examples.md b/examples/README-examples.md
index c4e98961..0f0ef9a4 100644
--- a/examples/README-examples.md
+++ b/examples/README-examples.md
@@ -67,7 +67,17 @@ workarounds.
 ### Snippets
 
 See small code snippets that test various features in the
-[examples/snippets/](snippets/) directory.
+[examples/snippets/](snippets/) directory:
+
+- [javascript_bindings.py](snippets/javascript_bindings.py) - Communicate
+    between Python and Javascript asynchronously using
+    inter-process messaging with the use of Javascript Bindings.
+- [mouse_clicks.py](snippets/mouse_clicks.py) - Perform mouse clicks
+    and mouse movements programmatically.
+- [network_cookies.py](snippets/network_cookies.py) - Implement
+    interfaces to block or allow cookies over network requests.
+- [onbeforeclose.py](snippets/onbeforeclose.py) - Implement interface
+    to execute custom code before browser window closes.
 
 
 ### Build executable with PyInstaller
diff --git a/examples/pyinstaller/hook-cefpython3.py b/examples/pyinstaller/hook-cefpython3.py
index e36c8ed3..d30a2308 100644
--- a/examples/pyinstaller/hook-cefpython3.py
+++ b/examples/pyinstaller/hook-cefpython3.py
@@ -162,6 +162,7 @@ def get_cefpython3_datas():
 # TODO: Write a tool script that would find such imports in
 #       .pyx files automatically.
 hiddenimports = [
+    "base64",
     "codecs",
     "copy",
     "datetime",
diff --git a/examples/snippets/javascript_bindings.py b/examples/snippets/javascript_bindings.py
new file mode 100644
index 00000000..7c7dccc5
--- /dev/null
+++ b/examples/snippets/javascript_bindings.py
@@ -0,0 +1,70 @@
+"""
+Communicate between Python and Javascript asynchronously using
+inter-process messaging with the use of Javascript Bindings.
+"""
+
+from cefpython3 import cefpython as cef
+
+g_htmlcode = """
+<!doctype html>
+<html>
+<head>
+    <style>
+    body, html {
+        font-family: Arial;
+        font-size: 11pt;
+    }
+    </style>
+    <script>
+    function print(msg) {
+        console.log(msg+" [JS]");
+        document.getElementById("console").innerHTML += msg+"<br>";
+    }
+    function js_function(value) {
+        print("Value sent from Python: <b>"+value+"</b>");
+        py_function("I am a Javascript string #1", js_callback);
+    }
+    function js_callback(value, py_callback) {
+        print("Value sent from Python: <b>"+value+"</b>");
+        py_callback("I am a Javascript string #2");
+    }
+    </script>
+</head>
+<body>
+    <h1>Javascript Bindings</h1>
+    <div id=console></div>
+</body>
+</html>
+"""
+
+
+def main():
+    cef.Initialize()
+    browser = cef.CreateBrowserSync(url=cef.GetDataUrl(g_htmlcode),
+                                    window_title="OnBeforeClose")
+    browser.SetClientHandler(LifespanHandler())
+    bindings = cef.JavascriptBindings()
+    bindings.SetFunction("py_function", py_function)
+    bindings.SetFunction("py_callback", py_callback)
+    browser.SetJavascriptBindings(bindings)
+    cef.MessageLoop()
+    del browser
+    cef.Shutdown()
+
+
+def py_function(value, js_callback):
+    print("Value sent from Javascript: "+value)
+    js_callback.Call("I am a Python string #2", py_callback)
+
+
+def py_callback(value):
+    print("Value sent from Javascript: "+value)
+
+
+class LifespanHandler(object):
+    def OnLoadEnd(self, browser, **_):
+        browser.ExecuteFunction("js_function", "I am a Python string #1")
+
+
+if __name__ == '__main__':
+    main()
diff --git a/examples/snippets/mouse_clicks.py b/examples/snippets/mouse_clicks.py
index fcdd5280..e8ace36a 100644
--- a/examples/snippets/mouse_clicks.py
+++ b/examples/snippets/mouse_clicks.py
@@ -43,7 +43,7 @@ class LifespanHandler(object):
     def OnLoadEnd(self, browser, **_):
         # Execute function with a delay of 1 second after page
         # has completed loading.
-        print("Page completed loading")
+        print("Page loading is complete")
         cef.PostDelayedTask(cef.TID_UI, 1000, click_after_1_second, browser)
 
 
diff --git a/examples/snippets/network_cookies.py b/examples/snippets/network_cookies.py
index 55a71ec0..c3631cff 100644
--- a/examples/snippets/network_cookies.py
+++ b/examples/snippets/network_cookies.py
@@ -30,7 +30,7 @@ def CanGetCookies(self, frame, request, **_):
             print("-- CanGetCookies #"+str(self.getcount))
             print("url="+request.GetUrl()[0:80])
             print("")
-        # Return True to allow reading cookies and False to block
+        # Return True to allow reading cookies or False to block
         return True
 
     def CanSetCookie(self, frame, request, cookie, **_):
@@ -43,7 +43,7 @@ def CanSetCookie(self, frame, request, cookie, **_):
             print("Name="+cookie.GetName())
             print("Value="+cookie.GetValue())
             print("")
-        # Return True to allow setting cookie and False to block
+        # Return True to allow setting cookie or False to block
         return True
 
 
diff --git a/src/cef_v59..v66_changes.txt b/src/cef_v59..v66_changes.txt
index fdf96cb2..f78800d3 100644
--- a/src/cef_v59..v66_changes.txt
+++ b/src/cef_v59..v66_changes.txt
@@ -82,6 +82,8 @@ NEW FEATURES
     + onbeforeclose.py
     + network_cookies.py
     + mouse_clicks.py
+    + javascript_bindings.py
++ cef.GetDataUrl
 
 internal/cef_types.h
 + cef_log_severity_t: new key LOGSEVERITY_DEBUG (no need to expose,
diff --git a/src/cefpython.pyx b/src/cefpython.pyx
index 5a526bcd..1631636f 100644
--- a/src/cefpython.pyx
+++ b/src/cefpython.pyx
@@ -134,6 +134,8 @@ import datetime
 import random
 # noinspection PyUnresolvedReferences
 import struct
+# noinspection PyUnresolvedReferences
+import base64
 
 # Must use compile-time condition instead of checking sys.version_info.major
 # otherwise results in "ImportError: cannot import name urlencode" strange
@@ -1023,3 +1025,9 @@ cpdef dict GetVersion():
 
 cpdef LoadCrlSetsFile(py_string path):
     CefLoadCRLSetsFile(PyToCefStringValue(path))
+
+cpdef GetDataUrl(data, mediatype="html"):
+    html = data.encode("utf-8", "replace")
+    b64 = base64.b64encode(html).decode("utf-8", "replace")
+    ret = "data:text/html;base64,{data}".format(data=b64)
+    return ret
diff --git a/unittests/_common.py b/unittests/_common.py
index a0dc1fd3..684a27b1 100644
--- a/unittests/_common.py
+++ b/unittests/_common.py
@@ -41,13 +41,6 @@ def show_test_summary(pyfile):
           + os.path.basename(pyfile))
 
 
-def html_to_data_uri(html):
-    html = html.encode("utf-8", "replace")
-    b64 = base64.b64encode(html).decode("utf-8", "replace")
-    ret = "data:text/html;base64,{data}".format(data=b64)
-    return ret
-
-
 def run_message_loop():
     # Run message loop for some time.
     # noinspection PyTypeChecker
diff --git a/unittests/main_test.py b/unittests/main_test.py
index 25405ce0..b0c2200c 100644
--- a/unittests/main_test.py
+++ b/unittests/main_test.py
@@ -112,7 +112,7 @@
 </body>
 </html>
 """
-g_datauri = html_to_data_uri(g_datauri_data)
+g_datauri = cef.GetDataUrl(g_datauri_data)
 
 
 class MainTest_IsolatedTest(unittest.TestCase):
diff --git a/unittests/osr_test.py b/unittests/osr_test.py
index a5a3753b..0e4191be 100644
--- a/unittests/osr_test.py
+++ b/unittests/osr_test.py
@@ -62,7 +62,7 @@
 </body>
 </html>
 """
-g_datauri = html_to_data_uri(g_datauri_data)
+g_datauri = cef.GetDataUrl(g_datauri_data)
 
 
 class OsrTest_IsolatedTest(unittest.TestCase):

From 6bb2d4ed7c3d498f999d6ac0c042336da1c11b18 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Mon, 20 Aug 2018 12:13:43 +0200
Subject: [PATCH 139/238] Add javascript_erors.py and ondomready.py snippets
 (#403)

---
 docs/Tutorial.md                         |  3 +-
 examples/README-examples.md              | 41 +++++++++-------
 examples/snippets/javascript_bindings.py |  3 +-
 examples/snippets/javascript_errors.py   | 61 ++++++++++++++++++++++++
 examples/snippets/ondomready.py          | 50 +++++++++++++++++++
 src/cef_v59..v66_changes.txt             |  2 +
 6 files changed, 140 insertions(+), 20 deletions(-)
 create mode 100644 examples/snippets/javascript_errors.py
 create mode 100644 examples/snippets/ondomready.py

diff --git a/docs/Tutorial.md b/docs/Tutorial.md
index c6c0fcf7..ea32cb42 100644
--- a/docs/Tutorial.md
+++ b/docs/Tutorial.md
@@ -9,7 +9,8 @@ basics. This tutorial will discuss the three featured examples:
 [hello_world.py](../examples/hello_world.py),
 [tutorial.py](../examples/tutorial.py)
 and [screenshot.py](../examples/screenshot.py). There are many
-more examples that you can find in the [README-examples.md](../examples/README-examples.md)
+more examples that you can find in the
+[README-examples.md](../examples/README-examples.md)
 file, but these examples are out of scope for this tutorial.
 
 
diff --git a/examples/README-examples.md b/examples/README-examples.md
index 0f0ef9a4..4ef36045 100644
--- a/examples/README-examples.md
+++ b/examples/README-examples.md
@@ -4,8 +4,8 @@ Table of contents:
 * [Hello World!](#hello-world)
 * [Supported examples](#supported-examples)
   * [Featured](#featured)
-  * [GUI frameworks](#gui-frameworks)
   * [Snippets](#snippets)
+  * [GUI frameworks](#gui-frameworks)
   * [Build executable with PyInstaller](#build-executable-with-pyinstaller)
   * [Unit tests](#unit-tests)
 * [Other examples](#other-examples)
@@ -42,8 +42,31 @@ workarounds.
   discussed in great details in Tutorial in the [Off-screen rendering](../docs/Tutorial.md#off-screen-rendering)
   section.
 
+
+### Snippets
+
+See small code snippets that show various CEF features in the
+[examples/snippets/](snippets/) directory:
+
+- [javascript_bindings.py](snippets/javascript_bindings.py) - Communicate
+    between Python and Javascript asynchronously using
+    inter-process messaging with the use of Javascript Bindings.
+- [javascript_errors.py](snippets/javascript_errors.py) - Two ways for
+    intercepting Javascript errors.
+- [mouse_clicks.py](snippets/mouse_clicks.py) - Perform mouse clicks
+    and mouse movements programmatically.
+- [network_cookies.py](snippets/network_cookies.py) - Implement
+    interfaces to block or allow cookies over network requests.
+- [onbeforeclose.py](snippets/onbeforeclose.py) - Implement interface
+    to execute custom code before browser window closes.
+- [ondomready.py](snippets/ondomready.py) - Execute custom Python code
+    on a web page as soon as DOM is ready.
+
+
 ### GUI frameworks
 
+Examples of embedding CEF browser using various GUI frameworks:
+
 - [gtk2.py](gtk2.py): example for [PyGTK](http://www.pygtk.org/)
   library (GTK 2)
 - [gtk3.py](gtk3.py): example for [PyGObject / PyGI](https://wiki.gnome.org/Projects/PyGObject)
@@ -64,22 +87,6 @@ workarounds.
   toolkit. This example implements High DPI support on Windows.
 
 
-### Snippets
-
-See small code snippets that test various features in the
-[examples/snippets/](snippets/) directory:
-
-- [javascript_bindings.py](snippets/javascript_bindings.py) - Communicate
-    between Python and Javascript asynchronously using
-    inter-process messaging with the use of Javascript Bindings.
-- [mouse_clicks.py](snippets/mouse_clicks.py) - Perform mouse clicks
-    and mouse movements programmatically.
-- [network_cookies.py](snippets/network_cookies.py) - Implement
-    interfaces to block or allow cookies over network requests.
-- [onbeforeclose.py](snippets/onbeforeclose.py) - Implement interface
-    to execute custom code before browser window closes.
-
-
 ### Build executable with PyInstaller
 
 - [PyInstaller example](pyinstaller/README-pyinstaller.md):
diff --git a/examples/snippets/javascript_bindings.py b/examples/snippets/javascript_bindings.py
index 7c7dccc5..63135463 100644
--- a/examples/snippets/javascript_bindings.py
+++ b/examples/snippets/javascript_bindings.py
@@ -17,7 +17,6 @@
     </style>
     <script>
     function print(msg) {
-        console.log(msg+" [JS]");
         document.getElementById("console").innerHTML += msg+"<br>";
     }
     function js_function(value) {
@@ -41,7 +40,7 @@
 def main():
     cef.Initialize()
     browser = cef.CreateBrowserSync(url=cef.GetDataUrl(g_htmlcode),
-                                    window_title="OnBeforeClose")
+                                    window_title="Javascript Bindings")
     browser.SetClientHandler(LifespanHandler())
     bindings = cef.JavascriptBindings()
     bindings.SetFunction("py_function", py_function)
diff --git a/examples/snippets/javascript_errors.py b/examples/snippets/javascript_errors.py
new file mode 100644
index 00000000..c33ef8d7
--- /dev/null
+++ b/examples/snippets/javascript_errors.py
@@ -0,0 +1,61 @@
+"""
+Two ways for intercepting Javascript errors:
+1. window.onerror event in Javascript
+2. DisplayHandler.OnConsoleMessage in Python
+"""
+
+from cefpython3 import cefpython as cef
+
+g_htmlcode = """
+<!doctype html>
+<html>
+<head>
+    <style>
+    body, html {
+        font-family: Arial;
+        font-size: 11pt;
+    }
+    </style>
+    <script>
+    function print(msg) {
+        document.getElementById("console").innerHTML += msg+"<br>";
+    }
+    window.onerror = function(message, source, lineno, colno, error) {
+        print("[JS:window.onerror] "+error+" (line "+lineno+")");
+        // Return false so that default event handler is fired and
+        // OnConsoleMessage can also intercept this error.
+        return false;
+    };
+    window.onload = function() {
+        forceError();
+    };
+    </script>
+</head>
+<body>
+    <h1>Javascript Errors</h1>
+    <div id=console></div>
+</body>
+</html>
+"""
+
+
+def main():
+    cef.Initialize()
+    browser = cef.CreateBrowserSync(url=cef.GetDataUrl(g_htmlcode),
+                                    window_title="Javascript Errors")
+    browser.SetClientHandler(DisplayHandler())
+    cef.MessageLoop()
+    cef.Shutdown()
+
+
+class DisplayHandler(object):
+    def OnConsoleMessage(self, browser, message, line, **_):
+        if "error" in message.lower() or "uncaught" in message.lower():
+            logmsg = "[Py:OnConsoleMessage] {message} (line {line})" \
+                     .format(message=message, line=line)
+            print(logmsg)
+            browser.ExecuteFunction("print", logmsg)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/examples/snippets/ondomready.py b/examples/snippets/ondomready.py
new file mode 100644
index 00000000..caeacc02
--- /dev/null
+++ b/examples/snippets/ondomready.py
@@ -0,0 +1,50 @@
+"""
+Execute custom Python code on a web page as soon as DOM is ready.
+Implements a custom "_OnDomReady" event in the LifespanHandler object.
+"""
+
+from cefpython3 import cefpython as cef
+
+
+def main():
+    cef.Initialize()
+    browser = cef.CreateBrowserSync(url="https://www.google.com/",
+                                    window_title="_OnDomReady event")
+    lifespan_handler = LifespanHandler(browser)
+    browser.SetClientHandler(lifespan_handler)
+    bindings = cef.JavascriptBindings()
+    bindings.SetFunction("LifespanHandler_OnDomReady",
+                         lifespan_handler["_OnDomReady"])
+    browser.SetJavascriptBindings(bindings)
+    cef.MessageLoop()
+    del lifespan_handler
+    del browser
+    cef.Shutdown()
+
+
+class LifespanHandler(object):
+    def __init__(self, browser):
+        self.browser = browser
+
+    def __getitem__(self, key):
+        return getattr(self, key)
+
+    def OnLoadStart(self, browser, **_):
+        browser.ExecuteJavascript("""
+            if (document.readyState === "complete") {
+                LifespanHandler_OnDomReady();
+            } else {
+                document.addEventListener("DOMContentLoaded", function() {
+                    LifespanHandler_OnDomReady();
+                });
+            }
+        """)
+
+    def _OnDomReady(self):
+        print("DOM is ready!")
+        self.browser.ExecuteFunction("alert",
+                                     "Message from Python: DOM is ready!")
+
+
+if __name__ == '__main__':
+    main()
diff --git a/src/cef_v59..v66_changes.txt b/src/cef_v59..v66_changes.txt
index f78800d3..1024bdaf 100644
--- a/src/cef_v59..v66_changes.txt
+++ b/src/cef_v59..v66_changes.txt
@@ -83,6 +83,8 @@ NEW FEATURES
     + network_cookies.py
     + mouse_clicks.py
     + javascript_bindings.py
+    + javascript_errors.py
+    + ondomready.py
 + cef.GetDataUrl
 
 internal/cef_types.h

From 7448372a26632092876e026a4a9f7711839bb83e Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Mon, 20 Aug 2018 12:46:43 +0200
Subject: [PATCH 140/238] Add onpagecomplete.py snippet (#403) and others.

Add tools/run_snippets.py.
---
 examples/README-examples.md         |  2 ++
 examples/snippets/ondomready.py     | 18 +++++-----
 examples/snippets/onpagecomplete.py | 35 ++++++++++++++++++
 src/cef_v59..v66_changes.txt        |  1 +
 tools/common.py                     |  1 +
 tools/run_examples.py               |  3 +-
 tools/run_snippets.py               | 55 +++++++++++++++++++++++++++++
 7 files changed, 105 insertions(+), 10 deletions(-)
 create mode 100644 examples/snippets/onpagecomplete.py
 create mode 100644 tools/run_snippets.py

diff --git a/examples/README-examples.md b/examples/README-examples.md
index 4ef36045..b877607a 100644
--- a/examples/README-examples.md
+++ b/examples/README-examples.md
@@ -61,6 +61,8 @@ See small code snippets that show various CEF features in the
     to execute custom code before browser window closes.
 - [ondomready.py](snippets/ondomready.py) - Execute custom Python code
     on a web page as soon as DOM is ready.
+- [onpagecomplete.py](snippets/onpagecomplete.py) - Execute custom
+    Python code on a web page when page loading is complete.
 
 
 ### GUI frameworks
diff --git a/examples/snippets/ondomready.py b/examples/snippets/ondomready.py
index caeacc02..8775129c 100644
--- a/examples/snippets/ondomready.py
+++ b/examples/snippets/ondomready.py
@@ -1,6 +1,6 @@
 """
 Execute custom Python code on a web page as soon as DOM is ready.
-Implements a custom "_OnDomReady" event in the LifespanHandler object.
+Implements a custom "_OnDomReady" event in the LoadHandler object.
 """
 
 from cefpython3 import cefpython as cef
@@ -10,19 +10,19 @@ def main():
     cef.Initialize()
     browser = cef.CreateBrowserSync(url="https://www.google.com/",
                                     window_title="_OnDomReady event")
-    lifespan_handler = LifespanHandler(browser)
-    browser.SetClientHandler(lifespan_handler)
+    load_handler = LoadHandler(browser)
+    browser.SetClientHandler(load_handler)
     bindings = cef.JavascriptBindings()
-    bindings.SetFunction("LifespanHandler_OnDomReady",
-                         lifespan_handler["_OnDomReady"])
+    bindings.SetFunction("LoadHandler_OnDomReady",
+                         load_handler["_OnDomReady"])
     browser.SetJavascriptBindings(bindings)
     cef.MessageLoop()
-    del lifespan_handler
+    del load_handler
     del browser
     cef.Shutdown()
 
 
-class LifespanHandler(object):
+class LoadHandler(object):
     def __init__(self, browser):
         self.browser = browser
 
@@ -32,10 +32,10 @@ def __getitem__(self, key):
     def OnLoadStart(self, browser, **_):
         browser.ExecuteJavascript("""
             if (document.readyState === "complete") {
-                LifespanHandler_OnDomReady();
+                LoadHandler_OnDomReady();
             } else {
                 document.addEventListener("DOMContentLoaded", function() {
-                    LifespanHandler_OnDomReady();
+                    LoadHandler_OnDomReady();
                 });
             }
         """)
diff --git a/examples/snippets/onpagecomplete.py b/examples/snippets/onpagecomplete.py
new file mode 100644
index 00000000..e118e8e7
--- /dev/null
+++ b/examples/snippets/onpagecomplete.py
@@ -0,0 +1,35 @@
+"""
+Execute custom Python code on a web page when page loading is complete.
+Implements a custom "_OnPageComplete" event in the LoadHandler object.
+"""
+
+from cefpython3 import cefpython as cef
+
+
+def main():
+    cef.Initialize()
+    browser = cef.CreateBrowserSync(url="https://www.google.com/",
+                                    window_title="_OnPageComplete event")
+    browser.SetClientHandler(LoadHandler())
+    cef.MessageLoop()
+    del browser
+    cef.Shutdown()
+
+
+class LoadHandler(object):
+    def OnLoadingStateChange(self, browser, is_loading, **_):
+        """For detecting if page loading has ended it is recommended
+        to use OnLoadingStateChange which is most reliable. The OnLoadEnd
+        callback also available in LoadHandler can sometimes fail in
+        some cases e.g. when image loading hangs."""
+        if not is_loading:
+            self._OnPageComplete(browser)
+
+    def _OnPageComplete(self, browser):
+        print("Page loading is complete!")
+        browser.ExecuteFunction("alert", "Message from Python: Page loading"
+                                         " is complete!")
+
+
+if __name__ == '__main__':
+    main()
diff --git a/src/cef_v59..v66_changes.txt b/src/cef_v59..v66_changes.txt
index 1024bdaf..9060ad14 100644
--- a/src/cef_v59..v66_changes.txt
+++ b/src/cef_v59..v66_changes.txt
@@ -85,6 +85,7 @@ NEW FEATURES
     + javascript_bindings.py
     + javascript_errors.py
     + ondomready.py
+    + onpagecomplete
 + cef.GetDataUrl
 
 internal/cef_types.h
diff --git a/tools/common.py b/tools/common.py
index 06ab942e..ec92b0fe 100644
--- a/tools/common.py
+++ b/tools/common.py
@@ -158,6 +158,7 @@
 # -- end build directories
 
 EXAMPLES_DIR = os.path.join(ROOT_DIR, "examples")
+SNIPPETS_DIR = os.path.join(EXAMPLES_DIR, "snippets")
 SRC_DIR = os.path.join(ROOT_DIR, "src")
 
 # Subdirectories in src/
diff --git a/tools/run_examples.py b/tools/run_examples.py
index 87fe1296..bf70f045 100644
--- a/tools/run_examples.py
+++ b/tools/run_examples.py
@@ -3,7 +3,8 @@
 # Project website: https://github.com/cztomczak/cefpython
 
 """
-Run all examples that can be run on current configuration.
+Run all examples that can be run on current configuration
+and display a summary at the end.
 
 Note on GTK 2 / GTK 3 on Windows:
     Installing both PyGTK and PyGI on Windows will cause errors.
diff --git a/tools/run_snippets.py b/tools/run_snippets.py
new file mode 100644
index 00000000..193d9558
--- /dev/null
+++ b/tools/run_snippets.py
@@ -0,0 +1,55 @@
+# Copyright (c) 2018 CEF Python, see the Authors file.
+# All rights reserved. Licensed under BSD 3-clause license.
+# Project website: https://github.com/cztomczak/cefpython
+
+"""
+Run all snippets from the examples/snippets/ directory
+and display a summary at the end.
+"""
+
+from common import *
+
+import glob
+import os
+import subprocess
+import sys
+
+
+def main():
+    # Iterate over all snippets
+    snippets_iter = glob.glob(os.path.join(SNIPPETS_DIR, "*.py"))
+    succeeded = []
+    failed = []
+    for snippet in snippets_iter:
+        print("[run_snippets.py] Running '{snippet}'..."
+              .format(snippet=os.path.basename(snippet)))
+        retcode = subprocess.call([sys.executable, snippet])
+        if retcode == 0:
+            succeeded.append(os.path.basename(snippet))
+        else:
+            print("[run_snippets.py] ERROR while running snippet: {snippet}"
+                  .format(snippet=snippet))
+            failed.append(os.path.basename(snippet))
+
+    # Print summary
+    summary = ""
+    for snippet in succeeded:
+        summary += "  OK    {snippet}{nl}"\
+                   .format(snippet=snippet, nl=os.linesep)
+    for snippet in failed:
+        summary += "  ERROR {snippet}{nl}"\
+                   .format(snippet=snippet, nl=os.linesep)
+    summary = summary[:-(len(os.linesep))]
+    print("[run_snippets.py] SUMMARY:")
+    print(summary.format())
+    if len(failed):
+        print("[run_snippets.py] ERRORS ({failed}) while running snippets"
+              .format(failed=len(failed)))
+        sys.exit(1)
+    else:
+        print("[run_snippets.py] OK ({succeeded})"
+              .format(succeeded=len(succeeded)))
+
+
+if __name__ == "__main__":
+    main()

From 9f3ba137d3d243711ee40e21b1b958907bf63abb Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Mon, 20 Aug 2018 13:18:43 +0200
Subject: [PATCH 141/238] Update cefpython.md

---
 api/cefpython.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/api/cefpython.md b/api/cefpython.md
index a876bd69..29720c48 100644
--- a/api/cefpython.md
+++ b/api/cefpython.md
@@ -66,7 +66,8 @@ any third party GUI framework for creation of top-level window.
 
 After the call to CreateBrowserSync() the page is not yet loaded,
 if you want your next lines of code to do some stuff on the
-webpage you will have to implement LoadHandler.[OnLoadingStateChange]((LoadHandler.md#onloadingstatechange))
+webpage you will have to implement
+LoadHandler.[OnLoadingStateChange](LoadHandler.md#onloadingstatechange)
 callback.
 
 

From ef6febb7d3ca751ce86eed0061b11538f2379e64 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Mon, 20 Aug 2018 14:30:14 +0200
Subject: [PATCH 142/238] Fix build_distrib.py tool on Windows (#403)

---
 tools/build_distrib.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/tools/build_distrib.py b/tools/build_distrib.py
index 65bfd5ee..fc8c9db3 100644
--- a/tools/build_distrib.py
+++ b/tools/build_distrib.py
@@ -593,15 +593,18 @@ def check_cpp_extension_dependencies_issue359(setup_dir, all_pythons):
     for python in all_pythons:
         if python["version2"] in ((3, 5), (3, 6), (3, 7)):
             checked_any = True
-            if not os.path.exists(os.path.join(setup_dir, "msvcp140.dll")):
+            if not os.path.exists(os.path.join(setup_dir, "cefpython3",
+                                               "msvcp140.dll")):
                 raise Exception("C++ ext dependency missing: msvcp140.dll")
         elif python["version2"] == (3, 4):
             checked_any = True
-            if not os.path.exists(os.path.join(setup_dir, "msvcp100.dll")):
+            if not os.path.exists(os.path.join(setup_dir, "cefpython3",
+                                               "msvcp100.dll")):
                 raise Exception("C++ ext dependency missing: msvcp100.dll")
         elif python["version2"] == (2, 7):
-            if not os.path.exists(os.path.join(setup_dir, "msvcp90.dll")):
-                raise Exception("C++ ext dependency missing: msvcp100.dll")
+            if not os.path.exists(os.path.join(setup_dir, "cefpython3",
+                                               "msvcp90.dll")):
+                raise Exception("C++ ext dependency missing: msvcp90.dll")
             checked_any = True
     assert checked_any
 

From 209fe5ad81b89529c3e3e0282ae0917da1815103 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Mon, 20 Aug 2018 19:51:17 +0200
Subject: [PATCH 143/238] CEF Python v66.0 release

---
 README.md                           | 136 ++++++++++++++--------------
 api/AccessibilityHandler.md         |   8 +-
 docs/Tutorial.md                    |   2 +-
 examples/README-examples.md         |   2 +-
 examples/pywin32.py                 |   2 +-
 src/cef_v59..v66_changes.txt        |   5 +-
 tools/installer/cefpython3.setup.py |   2 +-
 7 files changed, 81 insertions(+), 76 deletions(-)

diff --git a/README.md b/README.md
index 9ecad822..1e6697e8 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 Table of contents:
 * [Introduction](#introduction)
 * [Sponsors](#sponsors)
-* [Funding for the v66 release](#funding-for-the-v66-release)
+  * [Thanks to Lampix for the v66 release](#thanks-to-lampix-for-the-v66-release)
 * [Install](#install)
 * [Tutorial](#tutorial)
 * [Examples](#examples)
@@ -92,15 +92,15 @@ See the [Support development](#support-development) section for a list of
 all the individuals and companies supporting CEF Python.
 
 
-## Funding for the v66 release
+### Thanks to Lampix for the v66 release
 
-I am happy to announce that Lampix is sponsoring the v66 release of cefpython.
+Many Thanks to Lampix for sponsoring the [v66 release](../../releases) of CEF Python.
 Lampix is the first hardware and software solution that turns any surface
 into a smart, augmented reality or interactive surface. Please visit its
-website here: https://lampix.com/ . See the [v66 milestone](../../milestone/13)
-to see progress on the new release.
+website here: https://lampix.com/ .
+
+[![lampix360](https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/lampix360.png)](https://lampix.com/)
 
-[![lampix600](https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/lampix600.png)](https://lampix.com/)
 
 ## Install
 
@@ -110,9 +110,10 @@ also download packages for offline installation available on the
 [GitHub Releases](../../releases) pages. Command to install with pip:
 
 ```
-pip install cefpython3==57.0
+pip install cefpython3==66.0
 ```
 
+
 ## Tutorial
 
 See the [Tutorial.md](docs/Tutorial.md) file.
@@ -170,6 +171,7 @@ so your company logo and a website link will be visible to many Python developer
 The statistics are from Mar 9, 2018. Complete statistics are available in this topic
 on the Forum: [[ANN] Call for sponsors](https://groups.google.com/d/topic/cefpython/CjkZF2P4rMk/discussion).
 
+
 ### Thanks
 
 * [2018] Many thanks to [Lampix](https://lampix.com/) for sponsoring the v66
@@ -254,66 +256,66 @@ Additional information for v31.2 release:
 - [Tutorial](docs/Tutorial.md)
 
 
-### API categories
-
-#### Modules
-
- * [cefpython](api/cefpython.md#cefpython) module
-
-
-#### Settings
-
- * [ApplicationSettings](api/ApplicationSettings.md#application-settings) dictionary
- * [BrowserSettings](api/BrowserSettings.md#browser-settings) dictionary
- * [CommandLineSwitches](api/CommandLineSwitches.md#command-line-switches) dictionary
-
-
-#### Classes and objects
-
- * [Browser](api/Browser.md#browser-object) object
- * [Callback](api/Callback.md#callback-object) object
- * [Cookie](api/Cookie.md#cookie-class) class
- * [CookieManager](api/CookieManager.md#cookiemanager-class) class
- * [DpiAware](api/DpiAware.md#dpiaware-class) class (Win)
- * [DragData](api/DragData.md#dragdata-object) object
- * [Frame](api/Frame.md#frame-object) object
- * [Image](api/Image.md#image-object) object
- * [JavascriptBindings](api/JavascriptBindings.md#javascriptbindings-class) class
- * [JavascriptCallback](api/JavascriptCallback.md#javascriptcallback-object) object
- * [PaintBuffer](api/PaintBuffer.md#paintbuffer-object) object
- * [Request](api/Request.md#request-class) class
- * [Response](api/Response.md#response-object) object
- * [WebPluginInfo](api/WebPluginInfo.md#webplugininfo-object) object
- * [WebRequest](api/WebRequest.md#webrequest-class) class
- * [WindowInfo](api/WindowInfo.md#windowinfo-class) class
- * [WindowUtils](api/WindowUtils.md#windowutils-class) class
-
-
-#### Client handlers (interfaces)
-
- * [AccessibilityHandler](api/AccessibilityHandler.md#accessibilityhandler-interface)
- * [DisplayHandler](api/DisplayHandler.md#displayhandler-interface)
- * [DownloadHandler](api/DownloadHandler.md#downloadhandler)
- * [FocusHandler](api/FocusHandler.md#focushandler-interface)
- * [JavascriptDialogHandler](api/JavascriptDialogHandler.md#javascriptdialoghandler-interface)
- * [KeyboardHandler](api/KeyboardHandler.md#keyboardhandler-interface)
- * [LifespanHandler](api/LifespanHandler.md#lifespanhandler-interface)
- * [LoadHandler](api/LoadHandler.md#loadhandler-interface)
- * [RenderHandler](api/RenderHandler.md#renderhandler-interface)
- * [RequestHandler](api/RequestHandler.md#requesthandler-interface)
- * [ResourceHandler](api/ResourceHandler.md#resourcehandler-interface)
- * [V8ContextHandler](api/V8ContextHandler.md#v8contexthandler-interface)
-
-
-#### Other interfaces
-
- * [CookieVisitor](api/CookieVisitor.md#cookievisitor-interface) interface
- * [StringVisitor](api/StringVisitor.md#stringvisitor-interface) interface
- * [WebRequestClient](api/WebRequestClient.md#webrequestclient-interface) interface
-
-
-### API index
-
+### API categories
+
+#### Modules
+
+ * [cefpython](api/cefpython.md#cefpython) module
+
+
+#### Settings
+
+ * [ApplicationSettings](api/ApplicationSettings.md#application-settings) dictionary
+ * [BrowserSettings](api/BrowserSettings.md#browser-settings) dictionary
+ * [CommandLineSwitches](api/CommandLineSwitches.md#command-line-switches) dictionary
+
+
+#### Classes and objects
+
+ * [Browser](api/Browser.md#browser-object) object
+ * [Callback](api/Callback.md#callback-object) object
+ * [Cookie](api/Cookie.md#cookie-class) class
+ * [CookieManager](api/CookieManager.md#cookiemanager-class) class
+ * [DpiAware](api/DpiAware.md#dpiaware-class) class (Win)
+ * [DragData](api/DragData.md#dragdata-object) object
+ * [Frame](api/Frame.md#frame-object) object
+ * [Image](api/Image.md#image-object) object
+ * [JavascriptBindings](api/JavascriptBindings.md#javascriptbindings-class) class
+ * [JavascriptCallback](api/JavascriptCallback.md#javascriptcallback-object) object
+ * [PaintBuffer](api/PaintBuffer.md#paintbuffer-object) object
+ * [Request](api/Request.md#request-class) class
+ * [Response](api/Response.md#response-object) object
+ * [WebPluginInfo](api/WebPluginInfo.md#webplugininfo-object) object
+ * [WebRequest](api/WebRequest.md#webrequest-class) class
+ * [WindowInfo](api/WindowInfo.md#windowinfo-class) class
+ * [WindowUtils](api/WindowUtils.md#windowutils-class) class
+
+
+#### Client handlers (interfaces)
+
+ * [AccessibilityHandler](api/AccessibilityHandler.md#accessibilityhandler-interface)
+ * [DisplayHandler](api/DisplayHandler.md#displayhandler-interface)
+ * [DownloadHandler](api/DownloadHandler.md#downloadhandler)
+ * [FocusHandler](api/FocusHandler.md#focushandler-interface)
+ * [JavascriptDialogHandler](api/JavascriptDialogHandler.md#javascriptdialoghandler-interface)
+ * [KeyboardHandler](api/KeyboardHandler.md#keyboardhandler-interface)
+ * [LifespanHandler](api/LifespanHandler.md#lifespanhandler-interface)
+ * [LoadHandler](api/LoadHandler.md#loadhandler-interface)
+ * [RenderHandler](api/RenderHandler.md#renderhandler-interface)
+ * [RequestHandler](api/RequestHandler.md#requesthandler-interface)
+ * [ResourceHandler](api/ResourceHandler.md#resourcehandler-interface)
+ * [V8ContextHandler](api/V8ContextHandler.md#v8contexthandler-interface)
+
+
+#### Other interfaces
+
+ * [CookieVisitor](api/CookieVisitor.md#cookievisitor-interface) interface
+ * [StringVisitor](api/StringVisitor.md#stringvisitor-interface) interface
+ * [WebRequestClient](api/WebRequestClient.md#webrequestclient-interface) interface
+
+
+### API index
+
 * [AccessibilityHandler (interface)](api/AccessibilityHandler.md#accessibilityhandler-interface)
   * [_OnAccessibilityTreeChange](api/AccessibilityHandler.md#_onaccessibilitytreechange)
   * [_OnAccessibilityLocationChange](api/AccessibilityHandler.md#_onaccessibilitylocationchange)
diff --git a/api/AccessibilityHandler.md b/api/AccessibilityHandler.md
index faea2605..3433e003 100644
--- a/api/AccessibilityHandler.md
+++ b/api/AccessibilityHandler.md
@@ -11,12 +11,12 @@ accessibility events have been registered. The methods of this class will
 be called on the UI thread.
 
 Callbacks in this interface are not associated with any specific browser,
-thus you must call cefpython.[SetGlobalClientHandler] or 
-SetGlobalClientCallback() to use them. The callbacks names were prefixed
+thus you must call
+`cefpython`.[SetGlobalClientHandler](cefpython.md#setglobalclienthandler)
+or [SetGlobalClientCallback](cefpython.md#setglobalclientcallback)
+to use them. The callbacks names were prefixed
 with "`_`" to distinguish this special behavior.
 
-For an example of how to implement handler see [cefpython](cefpython.md).CreateBrowser(). For a list of all handler interfaces see [API > Client handlers](API#Client_handlers).
-
 
 Table of contents:
 * [Callbacks](#callbacks)
diff --git a/docs/Tutorial.md b/docs/Tutorial.md
index ea32cb42..d67b6204 100644
--- a/docs/Tutorial.md
+++ b/docs/Tutorial.md
@@ -40,7 +40,7 @@ Run the commands below to install the cefpython3 package, clone
 the repository and run the Hello World example:
 
 ```commandline
-pip install cefpython3==57.0
+pip install cefpython3==66.0
 git clone https://github.com/cztomczak/cefpython.git
 cd cefpython/examples/
 python hello_world.py
diff --git a/examples/README-examples.md b/examples/README-examples.md
index b877607a..de756013 100644
--- a/examples/README-examples.md
+++ b/examples/README-examples.md
@@ -17,7 +17,7 @@ Instructions to install the cefpython3 package, clone the repository
 and run the hello_world.py example:
 
 ```
-pip install cefpython3==57.0
+pip install cefpython3==66.0
 git clone https://github.com/cztomczak/cefpython.git
 cd cefpython/examples/
 python hello_world.py
diff --git a/examples/pywin32.py b/examples/pywin32.py
index d18aa54e..bf8d2b9b 100644
--- a/examples/pywin32.py
+++ b/examples/pywin32.py
@@ -108,7 +108,7 @@ def check_versions():
         pywin32_version = fp.read().strip()
     print("[pywin32.py] pywin32 {ver}".format(ver=pywin32_version))
 
-    assert cef.__version__ >= "57.0", "CEF Python v57.0 required to run this"
+    assert cef.__version__ >= "57.0", "CEF Python v57.0+ required to run this"
 
 
 def create_browser(window_info, settings, url):
diff --git a/src/cef_v59..v66_changes.txt b/src/cef_v59..v66_changes.txt
index 9060ad14..fab7e5e7 100644
--- a/src/cef_v59..v66_changes.txt
+++ b/src/cef_v59..v66_changes.txt
@@ -165,4 +165,7 @@ cef_v8.h
   - CreateArrayBuffer (does not own the buffer)
   - IsArrayBuffer
   - GetArrayBufferReleaseCallback
-  - NeuterArrayBuffer
\ No newline at end of file
+  - NeuterArrayBuffer
+
+cef_urlrequest.h
+- ResponseWasCached
\ No newline at end of file
diff --git a/tools/installer/cefpython3.setup.py b/tools/installer/cefpython3.setup.py
index c8e52699..6814cbb7 100644
--- a/tools/installer/cefpython3.setup.py
+++ b/tools/installer/cefpython3.setup.py
@@ -129,7 +129,7 @@ def main():
                          "https://github.com/cztomczak/cefpython",
         license="BSD 3-clause",
         author="Czarek Tomczak",
-        author_email="czarek.tomczak2@@gmail.com",
+        author_email="czarek.tomczak@gmail.com",
         url="https://github.com/cztomczak/cefpython",
         download_url="https://github.com/cztomczak/cefpython/releases",
         platforms=["{{SYSCONFIG_PLATFORM}}"],

From 2de75b7f884fe12266b701e1ed7cd531346754d3 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Tue, 21 Aug 2018 11:30:08 +0200
Subject: [PATCH 144/238] Update screenshot.py. Note on viewport size limits in
 Chromium.

---
 examples/screenshot.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/examples/screenshot.py b/examples/screenshot.py
index c27e72d0..7392ed5b 100644
--- a/examples/screenshot.py
+++ b/examples/screenshot.py
@@ -24,6 +24,15 @@
 Tested configurations:
 - CEF Python v57.0+
 - Pillow 2.3.0 / 4.1.0
+
+NOTE: There are limits in Chromium on viewport size. For some
+      websites with huge viewport size it won't work. In such
+      case it is required to reduce viewport size to an usual
+      size of a window and perform scrolling programmatically
+      using javascript while making a screenshot for each of
+      the scrolled region. Then at the end combine all the
+      screenshots into one. To force a paint event in OSR
+      mode call cef.Invalidate().
 """
 
 from cefpython3 import cefpython as cef

From 774820848b37da3b01e0f2436354057b1c1faaad Mon Sep 17 00:00:00 2001
From: Czarek Tomczak <cztomczak@users.noreply.github.com>
Date: Wed, 22 Aug 2018 09:29:20 +0200
Subject: [PATCH 145/238] Update Tutorial.md

ExceptHook update
---
 docs/Tutorial.md | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/docs/Tutorial.md b/docs/Tutorial.md
index d67b6204..b4533e34 100644
--- a/docs/Tutorial.md
+++ b/docs/Tutorial.md
@@ -69,10 +69,10 @@ Google website. Let's analyze the code from that example:
 1. `from cefpython3 import cefpython as cef` - Import the cefpython
    module and make a short "cef" alias
 2. `sys.excepthook = cef.ExceptHook` - Overwrite Python's default
-   exception handler so that all CEF sub-processes are terminated
-   when Python exception occurs. To understand this better read the
-   "Architecture" and "Handling Python exceptions" sections
-   further down in this Tutorial.
+   exception handler so that all CEF sub-processes are reliably
+   terminated when Python exception occurs. To understand this
+   better read the "Architecture" and "Handling Python exceptions"
+   sections further down in this Tutorial.
 3. `cef.Initialize()` - Initialize CEF. This function must be called
    somewhere in the beginning of your code. It must be called before
    any application window is created. It must be called only once
@@ -140,9 +140,9 @@ special handling. When Python exception occurs then main process
 is terminated. For CEF this means that the Browser process is
 terminated, however there may still be running CEF sub-processes
 like Renderer process, GPU process, etc. To terminate these
-sub-processes cef.[Shutdown](../api/cefpython.md#shutdown)
+sub-processes cleanly cef.[Shutdown](../api/cefpython.md#shutdown)
 must be called and if running CEF message loop then it must be
-stopped first. In all CEF Python examples you can find such
+stopped first. In most of CEF Python examples you can find such
 a line that overwrites the default exception handler in Python:
 
 ```python
@@ -160,7 +160,8 @@ The cef.ExceptHook helper function does the following:
    which exits the process with status 1, without calling
    cleanup handlers, flushing stdio buffers, etc.
 
-See CEF Python's ExceptHook source code in src/[helpers.pyx](../src/helpers.pyx).
+If you would like to modify `ExceptHook` behavior, see its source code
+in src/[helpers.pyx](../src/helpers.pyx) file.
 
 
 ## Settings

From c160430867ab55a9dcee5e4855852da6f95d9a1a Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Wed, 22 Aug 2018 11:26:24 +0200
Subject: [PATCH 146/238] Auto cleanup in the examples/ directory, so that
 build scripts do not include trash directories. See Issue #432.

---
 tools/common.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/tools/common.py b/tools/common.py
index ec92b0fe..4bee285f 100644
--- a/tools/common.py
+++ b/tools/common.py
@@ -175,6 +175,25 @@
 UNITTESTS_DIR = os.path.abspath(os.path.join(ROOT_DIR, "unittests"))
 # ----------------------------------------------------------------------------
 
+
+# Auto cleanup in the examples/ directory, so that build scripts
+# do not include trash directories. See Issue #432.
+
+shutil.rmtree(os.path.join(EXAMPLES_DIR, "blob_storage"),
+              ignore_errors=True)
+shutil.rmtree(os.path.join(EXAMPLES_DIR, "webrtc_event_logs"),
+              ignore_errors=True)
+shutil.rmtree(os.path.join(EXAMPLES_DIR, "webcache"),
+              ignore_errors=True)
+
+shutil.rmtree(os.path.join(SNIPPETS_DIR, "blob_storage"),
+              ignore_errors=True)
+shutil.rmtree(os.path.join(SNIPPETS_DIR, "webrtc_event_logs"),
+              ignore_errors=True)
+shutil.rmtree(os.path.join(SNIPPETS_DIR, "webcache"),
+              ignore_errors=True)
+
+
 # cefpython API header file and a fixed copy of it
 CEFPYTHON_API_HFILE = os.path.join(BUILD_CEFPYTHON,
                                    "cefpython_py{pyver}.h"

From 3364c8fbcf4b48b0e41446939d23ebe1892d0f63 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Wed, 22 Aug 2018 11:37:40 +0200
Subject: [PATCH 147/238] Add window_size.py snippet

---
 examples/snippets/window_size.py | 34 ++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 examples/snippets/window_size.py

diff --git a/examples/snippets/window_size.py b/examples/snippets/window_size.py
new file mode 100644
index 00000000..6ae1ba54
--- /dev/null
+++ b/examples/snippets/window_size.py
@@ -0,0 +1,34 @@
+"""
+Set initial size of window to 900px / 640px without using
+any third party GUI framework. On Linux/Mac you can set
+window size by calling WindowInfo.SetAsChild. On Windows
+you can accomplish this by calling Windows native functions
+using the ctypes module.
+"""
+
+from cefpython3 import cefpython as cef
+import platform
+
+
+def main():
+    cef.Initialize()
+    window_info = cef.WindowInfo()
+    window_info.SetAsChild(0, [0, 0, 900, 640])
+    browser = cef.CreateBrowserSync(url="https://www.google.com/",
+                                    window_info=window_info,
+                                    window_title="Window size")
+    if platform.system() == "Windows":
+        pass
+    cef.MessageLoop()
+    del browser
+    cef.Shutdown()
+
+
+class LifespanHandler(object):
+    def OnBeforeClose(self, browser):
+        print("Browser ID: {}".format(browser.GetIdentifier()))
+        print("Browser will close and app will exit")
+
+
+if __name__ == '__main__':
+    main()

From f6e7de20300bd33bc1dc2807f480c8efd5b9b689 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Wed, 22 Aug 2018 11:54:44 +0200
Subject: [PATCH 148/238] Update window_size.py snippet. Works on Windows now.

---
 examples/README-examples.md      |  2 ++
 examples/snippets/window_size.py | 15 ++++++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/examples/README-examples.md b/examples/README-examples.md
index de756013..c87eee07 100644
--- a/examples/README-examples.md
+++ b/examples/README-examples.md
@@ -63,6 +63,8 @@ See small code snippets that show various CEF features in the
     on a web page as soon as DOM is ready.
 - [onpagecomplete.py](snippets/onpagecomplete.py) - Execute custom
     Python code on a web page when page loading is complete.
+- [window_size.py](snippets/window_size.py) - Set initial window size
+    without using any third party GUI framework.
 
 
 ### GUI frameworks
diff --git a/examples/snippets/window_size.py b/examples/snippets/window_size.py
index 6ae1ba54..48e99160 100644
--- a/examples/snippets/window_size.py
+++ b/examples/snippets/window_size.py
@@ -1,5 +1,5 @@
 """
-Set initial size of window to 900px / 640px without using
+Set initial window size to 900/600 pixels without using
 any third party GUI framework. On Linux/Mac you can set
 window size by calling WindowInfo.SetAsChild. On Windows
 you can accomplish this by calling Windows native functions
@@ -7,18 +7,27 @@
 """
 
 from cefpython3 import cefpython as cef
+import ctypes
 import platform
 
 
 def main():
     cef.Initialize()
     window_info = cef.WindowInfo()
-    window_info.SetAsChild(0, [0, 0, 900, 640])
+    parent_handle = 0
+    # All rect coordinates are applied including X and Y parameters
+    window_info.SetAsChild(parent_handle, [0, 0, 900, 640])
     browser = cef.CreateBrowserSync(url="https://www.google.com/",
                                     window_info=window_info,
                                     window_title="Window size")
     if platform.system() == "Windows":
-        pass
+        window_handle = browser.GetOuterWindowHandle()
+        # X and Y parameters are ignored by setting the SWP_NOMOVE flag
+        SWP_NOMOVE = 0x0002
+        insert_after_handle = 0
+        # noinspection PyUnresolvedReferences
+        ctypes.windll.user32.SetWindowPos(window_handle, insert_after_handle,
+                                          0, 0, 900, 640, SWP_NOMOVE)
     cef.MessageLoop()
     del browser
     cef.Shutdown()

From 39ca247b0c143b25326f9d1a4b173a22006a916e Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Wed, 22 Aug 2018 11:59:49 +0200
Subject: [PATCH 149/238] Update window_size.py snippet

---
 examples/README-examples.md      |  2 +-
 examples/snippets/window_size.py | 13 ++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/examples/README-examples.md b/examples/README-examples.md
index c87eee07..c8943656 100644
--- a/examples/README-examples.md
+++ b/examples/README-examples.md
@@ -64,7 +64,7 @@ See small code snippets that show various CEF features in the
 - [onpagecomplete.py](snippets/onpagecomplete.py) - Execute custom
     Python code on a web page when page loading is complete.
 - [window_size.py](snippets/window_size.py) - Set initial window size
-    without using any third party GUI framework.
+    without use of any third party GUI framework.
 
 
 ### GUI frameworks
diff --git a/examples/snippets/window_size.py b/examples/snippets/window_size.py
index 48e99160..5a7b04d0 100644
--- a/examples/snippets/window_size.py
+++ b/examples/snippets/window_size.py
@@ -1,5 +1,5 @@
 """
-Set initial window size to 900/600 pixels without using
+Set initial window size to 900/640px without use of
 any third party GUI framework. On Linux/Mac you can set
 window size by calling WindowInfo.SetAsChild. On Windows
 you can accomplish this by calling Windows native functions
@@ -15,16 +15,17 @@ def main():
     cef.Initialize()
     window_info = cef.WindowInfo()
     parent_handle = 0
-    # All rect coordinates are applied including X and Y parameters
+    # This call has effect only on Mac and Linux.
+    # All rect coordinates are applied including X and Y parameters.
     window_info.SetAsChild(parent_handle, [0, 0, 900, 640])
     browser = cef.CreateBrowserSync(url="https://www.google.com/",
                                     window_info=window_info,
                                     window_title="Window size")
     if platform.system() == "Windows":
         window_handle = browser.GetOuterWindowHandle()
+        insert_after_handle = 0
         # X and Y parameters are ignored by setting the SWP_NOMOVE flag
         SWP_NOMOVE = 0x0002
-        insert_after_handle = 0
         # noinspection PyUnresolvedReferences
         ctypes.windll.user32.SetWindowPos(window_handle, insert_after_handle,
                                           0, 0, 900, 640, SWP_NOMOVE)
@@ -33,11 +34,5 @@ def main():
     cef.Shutdown()
 
 
-class LifespanHandler(object):
-    def OnBeforeClose(self, browser):
-        print("Browser ID: {}".format(browser.GetIdentifier()))
-        print("Browser will close and app will exit")
-
-
 if __name__ == '__main__':
     main()

From d61fd8b1114c440c298bf7a224f6f17bc19fc510 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Wed, 22 Aug 2018 18:05:18 +0200
Subject: [PATCH 150/238] Add "setcookie.py" snippet

---
 examples/snippets/setcookie.py | 36 ++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 examples/snippets/setcookie.py

diff --git a/examples/snippets/setcookie.py b/examples/snippets/setcookie.py
new file mode 100644
index 00000000..04a99508
--- /dev/null
+++ b/examples/snippets/setcookie.py
@@ -0,0 +1,36 @@
+"""
+Shows how to set a cookie.
+"""
+
+from cefpython3 import cefpython as cef
+import datetime
+
+
+def main():
+    cef.Initialize()
+    cef.CreateBrowserSync(
+        url="http://www.html-kit.com/tools/cookietester/",
+        window_title="Set a cookie")
+    manager = cef.CookieManager.GetGlobalManager()
+    cookie = cef.Cookie()
+    cookie.Set({
+        "name": "my_cookie",
+        "value": "my_value",
+        # Make sure domain is a valid value otherwise it crashes
+        # app (Issue #459)
+        "domain": "www.html-kit.com",
+        "path": "/",
+        "secure": False,
+        "httpOnly": False,
+        "creation": datetime.datetime(2018, 8, 22),
+        "lastAccess": datetime.datetime(2018, 8, 22),
+        "hasExpires": True,
+        "expires": datetime.datetime(2028, 12, 31, 23, 59, 59),
+    })
+    manager.SetCookie("http://www.html-kit.com/", cookie)
+    cef.MessageLoop()
+    cef.Shutdown()
+
+
+if __name__ == '__main__':
+    main()

From a1ddc14ca1650f84d85535eced76d36cbe806ab0 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Wed, 22 Aug 2018 18:08:08 +0200
Subject: [PATCH 151/238] Update README-examples.md

---
 examples/README-examples.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/examples/README-examples.md b/examples/README-examples.md
index c8943656..ed104c39 100644
--- a/examples/README-examples.md
+++ b/examples/README-examples.md
@@ -63,6 +63,7 @@ See small code snippets that show various CEF features in the
     on a web page as soon as DOM is ready.
 - [onpagecomplete.py](snippets/onpagecomplete.py) - Execute custom
     Python code on a web page when page loading is complete.
+- [setcookie.py](snippets/setcookie.py) - Shows how to set a cookie
 - [window_size.py](snippets/window_size.py) - Set initial window size
     without use of any third party GUI framework.
 

From fa8737b3863f49a000656799559b66f69d4b2fae Mon Sep 17 00:00:00 2001
From: Czarek Tomczak <cztomczak@users.noreply.github.com>
Date: Thu, 23 Aug 2018 10:57:55 +0200
Subject: [PATCH 152/238] Update Knowledge-Base.md

---
 docs/Knowledge-Base.md | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/docs/Knowledge-Base.md b/docs/Knowledge-Base.md
index 91d5a516..fddb6a7d 100644
--- a/docs/Knowledge-Base.md
+++ b/docs/Knowledge-Base.md
@@ -34,15 +34,14 @@ To be notified on new commits subscribe to this [RSS/Atom feed](../../../commits
 
 CEF Python depends on CEF and API breaks are inevitable when updating
 to latest CEF. The [Migration Guide](Migration-guide.md) document
-lists most notable breaking changes for each release. Other changes
-that do not backwards compatibility can be seen on [GitHub Releases](../../../releases)
-pages.
+lists most notable breaking changes for each release. Full chanelogs
+can be found on [GitHub Releases](../../../releases) pages.
 
-Due to unavoidable changes in API it is recommended for your setup
-scripts that use for example PIP to install the cefpython3 package,
+Due to unavoidable changes in upstream API it is recommended for your setup
+scripts, that for example use PIP to install the cefpython3 package,
 to hardcode the cefpython version string. If for example using PIP's
-requirements.txt file then list the cefpython3 package in the
-following format if using cefpython v57.0: `cefpython3 == 57.0`.
+`requirements.txt` file then include the cefpython3 package in the
+following format if using e.g. cefpython v57.0: `cefpython3 == 57.0`.
 
 
 ## Differences between Python 2 and Python 3

From 1ebc485ec499f15423802980936af5ac832b53cd Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Mon, 27 Aug 2018 20:05:36 +0200
Subject: [PATCH 153/238] Update README and Migration Guide dos - v49.0 release
 (#460, #462)

---
 README.md               |  60 ++++++++-
 docs/Migration-guide.md | 291 ++++++++++++++++++++++++++--------------
 2 files changed, 241 insertions(+), 110 deletions(-)

diff --git a/README.md b/README.md
index 1e6697e8..2c4e38ab 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,7 @@ Table of contents:
 * [Introduction](#introduction)
 * [Sponsors](#sponsors)
   * [Thanks to Lampix for the v66 release](#thanks-to-lampix-for-the-v66-release)
+  * [Thanks to Fivestars for the v49 release (WinXP/Vista)](#thanks-to-fivestars-for-the-v49-release-winxpvista)
 * [Install](#install)
 * [Tutorial](#tutorial)
 * [Examples](#examples)
@@ -11,6 +12,10 @@ Table of contents:
 * [Support development](#support-development)
   * [Thanks](#thanks)
 * [Releases](#releases)
+  * [Next release](#next-release)
+  * [Latest release](#latest-release)
+  * [v49 release (WinXP/Vista)](#v49-release-winxpvista)
+  * [v31 release (old systems)](#v31-release-old-systems)
 * [Other READMEs](#other-readmes)
 * [Quick links](#quick-links)
 
@@ -43,6 +48,14 @@ or other kind of internet bots.
 
 <table>
  <tr>
+  <td>
+   <div align="center">
+    <a href="https://www.fivestars.com/">
+     <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/fivestars200.png">
+    </a><br>
+    <a href="https://www.fivestars.com/">www.fivestars.com</a>
+   </div>
+  </td>
   <td>
    <div align="center">
     <a href="https://lampix.com/">
@@ -59,6 +72,8 @@ or other kind of internet bots.
     <a href="http://www.blueplanet.com/">www.blueplanet.com</a>
    </div>
   </td>
+ </tr>
+ <tr>
   <td>
    <div align="center">
     <a href="https://clearchat.com/">
@@ -67,8 +82,6 @@ or other kind of internet bots.
     <a href="https://clearchat.com/">www.clearchat.com</a>
    <div align="center">
   </td>
- </tr>
- <tr>
   <td>
    <div align="center">
     <a href="http://www.rentouch.ch/">
@@ -94,7 +107,7 @@ all the individuals and companies supporting CEF Python.
 
 ### Thanks to Lampix for the v66 release
 
-Many Thanks to Lampix for sponsoring the [v66 release](../../releases) of CEF Python.
+Many Thanks to Lampix for sponsoring the [v66 release](../../releases/tag/v66.0) of CEF Python.
 Lampix is the first hardware and software solution that turns any surface
 into a smart, augmented reality or interactive surface. Please visit its
 website here: https://lampix.com/ .
@@ -102,6 +115,17 @@ website here: https://lampix.com/ .
 [![lampix360](https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/lampix360.png)](https://lampix.com/)
 
 
+### Thanks to Fivestars for the v49 release (WinXP/Vista)
+
+Thanks to Fivestars Loyalty, Inc. for sponsoring the
+[v49 release](../../releases/tag/v49.0) for legacy systems such
+as Windows XP and Vista. Please visit its website:
+https://www.fivestars.com/ .
+
+[![fivestars360](https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/fivestars360.png)](https://www.fivestars.com/)
+
+
+
 ## Install
 
 You can install [pypi/cefpython3](https://pypi.python.org/pypi/cefpython3)
@@ -201,7 +225,7 @@ Information on planned new and current releases, supported platforms,
 python versions, architectures and requirements. If you want to
 support old operating systems then choose the v31 release.
 
-**Next release**
+### Next release
 
 - To see planned new features or bugs to be fixed in the
   next release, see the
@@ -212,7 +236,7 @@ support old operating systems then choose the v31 release.
   [next release 2](../../issues?q=is%3Aissue+is%3Aopen+label%3A%22next+release+2%22)
   label in the tracker
 
-**Latest release**
+### Latest release
 
 OS | Py2 | Py3 | 32bit | 64bit | Requirements
 --- | --- | --- | --- | --- | ---
@@ -224,7 +248,31 @@ These platforms are not supported yet:
 - ARM - see [Issue #267](../../issues/267)
 - Android - see [Issue #307](../../issues/307)
 
-**v31 release**
+
+### v49 release (WinXP/Vista)
+
+OS | Py2 | Py3 | 32bit | 64bit | Requirements
+--- | --- | --- | --- | --- | ---
+Windows | 2.7 | 3.4 | Yes | Yes | Windows XP+
+
+- Install with command: `pip --no-cache-dir install cefpython3==49.0`.
+    - Please note that if you were previously installing cefpython3
+      package it is required to use the `--no-cache-dir` flag,
+      otherwise pip will end up with error message
+      `No matching distribution found for cefpython3==49.0`.
+      This happens because 49.0 release occured after 57.0 and 66.0
+      releases.
+- Downloads are available on GitHub Releases tagged
+    [v49.0](../../releases/tag/v49.0).
+- See [Migration guide](docs/Migration-guide.md) document for changes
+  in this release
+- Documentation is available in the [docs/](../../tree/cefpython49-winxp/docs)
+  directory in the `cefpython49-winxp` branch
+- API reference is available in the [api/](../../tree/cefpython49-winxp/api)
+  directory in the `cefpython49-winxp` branch
+
+
+### v31 release (old systems)
 
 OS | Py2 | Py3 | 32bit | 64bit | Requirements
 --- | --- | --- | --- | --- | ---
diff --git a/docs/Migration-guide.md b/docs/Migration-guide.md
index 3063ada1..7567f0a8 100644
--- a/docs/Migration-guide.md
+++ b/docs/Migration-guide.md
@@ -15,25 +15,29 @@ in your application.
 
 
 Table of contents:
-* [v50+ Distribution packages](#v50-distribution-packages)
+* [v49+ Distribution packages](#v49-distribution-packages)
+* [v49+ cefbuilds.com is deprected, use Spotify Automated CEF Builds](#v49-cefbuildscom-is-deprected-use-spotify-automated-cef-builds)
+* [v49+ Build instructions and build tools](#v49-build-instructions-and-build-tools)
+* [v49: GPU acceleration should be disabled on Windows XP](#v49-gpu-acceleration-should-be-disabled-on-windows-xp)
+* [v49 (Win) Handlers' callbacks and other interfaces](#v49-win-handlers-callbacks-and-other-interfaces)
+* [v49+ High DPI support on Windows](#v49-high-dpi-support-on-windows)
+* [v49 (Win) Do not call the 'WindowUtils.OnSize' function](#v49-win-do-not-call-the-windowutilsonsize-function)
+* [v49+ Notify CEF on move or resize events](#v49-notify-cef-on-move-or-resize-events)
+* [v49+ Flash support](#v49-flash-support)
+* [v49+ Off-screen-rendering: new option "windowless_rendering_enabled"](#v49-off-screen-rendering-new-option-windowless_rendering_enabled)
+* [v49+ BrowserSettings options removed](#v49-browsersettings-options-removed)
+* [v49+ cef.Request.Flags changed](#v49-cefrequestflags-changed)
+* [v49+ Request.GetHeaderMap and SetHeaderMap change](#v49-requestgetheadermap-and-setheadermap-change)
+* [v49+ (Win) HTTPS cache problems on pages with certificate errors](#v49-win-https-cache-problems-on-pages-with-certificate-errors)
 * [v50+ Importing the cefpython3 package on Linux](#v50-importing-the-cefpython3-package-on-linux)
 * [v50+ Install X11 error handlers on Linux](#v50-install-x11-error-handlers-on-linux)
 * [v50+ Set window bounds on Linux](#v50-set-window-bounds-on-linux)
-* [v50+ Notify CEF on move or resize events](#v50-notify-cef-on-move-or-resize-events)
 * [v50+ Keyboard focus issues on Linux](#v50-keyboard-focus-issues-on-linux)
 * [v50+ Windows XP and Vista are no more supported](#v50-windows-xp-and-vista-are-no-more-supported)
 * [v50+ Mac 32-bit is no more supported](#v50-mac-32-bit-is-no-more-supported)
-* [v50+ cefbuilds.com is deprected, use Spotify Automated CEF Builds](#v50-cefbuildscom-is-deprected-use-spotify-automated-cef-builds)
-* [v50+ Build instructions and build tools](#v50-build-instructions-and-build-tools)
-* [v51+ Off-screen-rendering: new option "windowless_rendering_enabled"](#v51-off-screen-rendering-new-option-windowless_rendering_enabled)
 * [v51+ Remove LifespanHandler.RunModal](#v51-remove-lifespanhandlerrunmodal)
-* [v51+ BrowserSettings options removed](#v51-browsersettings-options-removed)
-* [v51+ cef.Request.Flags changed](#v51-cefrequestflags-changed)
-* [v51+ Request.GetHeaderMap and SetHeaderMap change](#v51-requestgetheadermap-and-setheadermap-change)
-* [v54+ GTK 3 example doesn't work anymore on Linux](#v54-gtk-3-example-doesnt-work-anymore-on-linux)
 * [v54+ libcef.so library is stripped from symbols on Linux](#v54-libcefso-library-is-stripped-from-symbols-on-linux)
-* [v55+ HTTPS cache problems on pages with certificate errors](#v55-https-cache-problems-on-pages-with-certificate-errors)
-* [v55.3+ Handlers' callbacks and other interfaces are now called using keyword args](#v553-handlers-callbacks-and-other-interfaces-are-now-called-using-keyword-args)
+* [v55.3+ Handlers' callbacks and other interfaces](#v553-handlers-callbacks-and-other-interfaces)
 * [v56+ MacOS 10.9+ required to run](#v56-macos-109-required-to-run)
 * [v57.1+ High DPI support on Windows](#v571-high-dpi-support-on-windows)
 * [v66+ Linux patch that fixed HTTPS cache problems on pages with certificate errors was disabled](#v66-linux-patch-that-fixed-https-cache-problems-on-pages-with-certificate-errors-was-disabled)
@@ -46,10 +50,10 @@ Table of contents:
 * [v66+ cef.Request.Flags changed](#v66-cefrequestflags-changed)
 * [v66+ RequestHandler.GetCookieManager not getting called in some cases](#v66-requesthandlergetcookiemanager-not-getting-called-in-some-cases)
 * [v66+ Changes to Mac apps that integrate into existing message loop (Qt, wxPython)](#v66-changes-to-mac-apps-that-integrate-into-existing-message-loop-qt-wxpython)
+* [v67+ Do not call the 'WindowUtils.OnSize' function](#v67-do-not-call-the-windowutilsonsize-function)
 
 
-
-## v50+ Distribution packages
+## v49+ Distribution packages
 
 In latest CEF Python there is only one distribution package
 available: a wheel package. Wheel packages are distributed on
@@ -77,120 +81,133 @@ in an automated manner, it might be reconsidered in the future
 to provide debian packages again.
 
 
-## v50+ Importing the cefpython3 package on Linux
+## v49+ cefbuilds.com is deprected, use Spotify Automated CEF Builds
 
-In the past on Linux it was required for the cefpython3 package
-to be imported before any other packages due to tcmalloc global
-hook being loaded. This is not required anymore, tcmalloc is
-disabled by default.
+The cefbuilds.com site with CEF prebuilt binaries is now deprecated.
+From now on download prebuilt CEF binaries from the Spotify Automated
+CEF Builds:
 
+http://opensource.spotify.com/cefbuilds/index.html
 
-## v50+ Install X11 error handlers on Linux
 
-It is required to install X11 error handlers on Linux, otherwise
-you will see 'BadWindow' errors happening - sometimes randomly -
-which will cause application to terminate. Since v56+ x11 error
-handlers are installed automatically by default during the call
-to cef.Initialize(). However sometimes that is not enough like
-for example in the wxpython.py example which requires the x11
-error handlers to be installed manually after wx was initialized,
-and that is because wx initialization had reset x11 error handlers
-that were installed earlier during cef initialization (Issue [#334](../../../issues/334)).
+## v49+ Build instructions and build tools
 
-You can install X11 error handlers by calling:
-```
-WindowUtils = cef.WindowUtils()
-WindowUtils.InstallX11ErrorHandlers()
-```
+There were many changes in regards to building CEF and CEF Python.
+There are now new tools in the tools/ root directory that fully
+automate building CEF and CEF Python. CEF Python now provides
+upstream CEF prebuilt binaries and libraries on GitHub Releases
+tagged eg. "v49-upstream". With these binaries you can build
+CEF Python from sources in less than 10 minutes. See the new
+[Build instructions](Build-instructions.md) document.
 
-API ref: WindowUtils.[InstallX11ErrorHandlers()](../api/WindowUtils.md#installx11errorhandlers-linux)
 
+## v49: GPU acceleration should be disabled on Windows XP
 
-## v50+ Set window bounds on Linux
+On XP you should disable GPU acceleration by setting the `--disable-gpu`
+and `--disable-gpu-compositing` switches. These switches can
+be passed programmatically to `cef.Initialize`, see
+[api/Command Line Switches](../api/CommandLineSwitches.md).
 
-It is now required to set window bounds during window "resize",
-"move" and "configure" events on Linux. You can do so by calling:
 
-```
-browser.SetBounds(x, y, width, height)
-```
+## v49 (Win) Handlers' callbacks and other interfaces
 
-API ref: Browser.[SetBounds()](../api/Browser.md#setbounds)
+In v49.0 release for Windows all handlers'
+callbacks and other interfaces such as
+CookieVisitor, StringVisitor and WebRequestClient, are now called
+using keyword arguments (Issue [#291](../../../issues/291)).
+This will cause many of existing code to break. This is how you
+should declare callbacks using the new style:
+
+```
+def OnLoadStart(self, browser, **_):
+	pass
 
+def OnLoadStart(self, **kwargs):
+	browser = kwargs["browser"]
+```
 
-## v50+ Notify CEF on move or resize events
+In the first declaration you see that only one argument is
+declared, the browser, the others unused will be in the "_"
+variable (the name of the variable is so that PyCharm doesn't
+warn about unused variable).
 
-It is required to notify the browser on move or resize events
-so that popup widgets (e.g. \<select\>) are displayed in the correct
-location and dismissed when the window moves. Also so that
-drag & drop areas are updated accordingly.
+Even if you specify and use all arguments, always add the
+unused kwargs (`**_`) at the end:
 
 ```
-browser.NotifyMoveOrResizeStarted()
+def OnLoadStart(self, browser, frame, **_):
+	pass
 ```
 
-API ref: Browser.[NotifyMoveOrResizeStarted()](../api/Browser.md#notifymoveorresizestarted)
-
+This will be handy in the future, in a case when upstream CEF
+adds a new argument to the API, your code won't break. When
+an argument is removed in upstream CEF API, if it's possible
+CEF Python will try to keep backward compatibility by
+emulating behavior of the old argument.
 
-## v50+ Keyboard focus issues on Linux
+In case of OnLoadStart, when you've used "browser" and "frame"
+names for the arguments, your code won't break. However in
+many other callbacks, where you've used argument names that
+differed from how they were named in API docs, your code will
+break. Also argument names were changed from camelCase
+to underscores. For example the OnLoadEnd callback has renamed
+the `httpStatusCode` argument to `http_code`. So in this case
+your code will definitely break, unless you've also used
+"http_code" for argument name.
 
-There several keyboard focus issues on Linux since CEF library
-replaced GTK library with X11 library. Most of these issues are
-fixed in examples by calling SetFocus in LoadHandler.OnLoadStart
-during initial app loading and/or by calling SetFocus in
-FocusHandler.OnGotFocus. This keyboard focus issues need to be
-fixed in usptream CEF. For more details see Issue [#284](../../../issues/284).
 
+## v49+ High DPI support on Windows
 
-## v50+ Windows XP and Vista are no more supported
+It is recommended to embed a DPI awareness manifest in both the main
+process and the subprocesses (the subprocess.exe executable) instead
+of calling `DpiAware`.[SetProcessDpiAware](../api/DpiAware.md#setprocessdpiaware)
+which sets DPI awareness only for the main process.
 
-CEF Python v31.2 was the last version to support Windows XP.
-This is due to Chromium/CEF dropping XP support, last version
-that supported XP was CEF v49.
+The `ApplicationSettings`.[auto_zooming](../api/ApplicationSettings.md#auto_zooming)
+option has a default value of an empty string now. Previously the
+default was "system_dpi". When enabling High DPI support you should
+set it to "system_dpi" explicitilly.
 
+Note that `DpiAware`.[CalculateWindowSize](../api/DpiAware.md#calculatewindowsize)
+does not handle all DPI settings (e.g. 132% on Windows 10).
+In newer CEF Python there is available `DpiAware`[Scale](../api/DpiAware.md#scale)
+which is more reliable and can handle all DPI resolutions. You can copy see
+its implementation in `src/dpi_aware_win.pyx`.
 
-## v50+ Mac 32-bit is no more supported
 
-CEF Python v31.2 was the last version to support Mac 32-bit.
-This is due to CEF/Chromium dropping 32-bit support, last version
-that supported 32-bit was CEF v38.
+## v49 (Win) Do not call the 'WindowUtils.OnSize' function
 
+This function can sometimes cause app hanging during window resize.
+Call instead the new `WindowUtils`.[UpdateBrowserSize](../api/WindowUtils.md#updatebrowsersize)
+function. See [Issue #464](../../../issues/464) for more details.
 
-## v50+ cefbuilds.com is deprected, use Spotify Automated CEF Builds
 
-The cefbuilds.com site with CEF prebuilt binaries is now deprecated.
-From now on download prebuilt CEF binaries from the Spotify Automated
-CEF Builds:
+## v49+ Notify CEF on move or resize events
 
-http://opensource.spotify.com/cefbuilds/index.html
+It is required to notify the browser on move or resize events
+so that popup widgets (e.g. \<select\>) are displayed in the correct
+location and dismissed when the window moves. Also so that
+drag & drop areas are updated accordingly. Call
+Browser.[NotifyMoveOrResizeStarted()](../api/Browser.md#notifymoveorresizestarted)
+during a move or resize event in your app window.
 
 
-## v50+ Build instructions and build tools
+## v49+ Flash support
 
-There were many changes in regards to building CEF and CEF Python.
-There are now new tools in the tools/ root directory that fully
-automate building CEF and CEF Python. CEF Python now provides
-upstream CEF prebuilt binaries and libraries on GitHub Releases
-tagged eg. "v56-upstream". With these binaries you can build
-CEF Python from sources in less than 10 minutes. See the new
-[Build instructions](Build-instructions.md) document.
+See [Issue #235](../../../issues/235) ("Flash support in CEF v49+")
+for instructions on how to enable Flash.
 
 
-## v51+ Off-screen-rendering: new option "windowless_rendering_enabled"
+## v49+ Off-screen-rendering: new option "windowless_rendering_enabled"
 
 When using off-screen-rendering you must set the ApplicationSettings
 "windowless_rendering_enabled" option to True. This applies to
-examples such as: Kivy, Panda3D and screenshot example.
+examples such as: Kivy, Panda3D, PySDL2 and screenshot example.
 
 API ref: ApplicationSettings.[windowless_rendering_enabled](../api/ApplicationSettings.md#windowless_rendering_enabled)
 
 
-## v51+ Remove LifespanHandler.RunModal
-
-LifespanHandler.RunModal callback is no more available.
-
-
-## v51+ BrowserSettings options removed
+## v49+ BrowserSettings options removed
 
 The following options were removed from BrowserSettings:
 - user_style_sheet_location
@@ -199,7 +216,7 @@ The following options were removed from BrowserSettings:
 - author_and_user_styles_disabled
 
 
-## v51+ cef.Request.Flags changed
+## v49+ cef.Request.Flags changed
 
 The following flags were removed from cef.Request.Flags:
 - AllowCookies
@@ -209,7 +226,7 @@ The following flags were removed from cef.Request.Flags:
 API ref: Request.[GetFlags](../api/Request.md#getflags)
 
 
-## v51+ Request.GetHeaderMap and SetHeaderMap change
+## v49+ Request.GetHeaderMap and SetHeaderMap change
 
 GetHeaderMap() will not include the Referer value if any
 and SetHeaderMap() will ignore the Referer value.
@@ -217,35 +234,93 @@ and SetHeaderMap() will ignore the Referer value.
 API ref: Request.[GetHeaderMap](../api/Request.md#getheadermap)
 
 
-## v54+ GTK 3 example doesn't work anymore on Linux
+## v49+ (Win) HTTPS cache problems on pages with certificate errors
 
-Update: GTK 3 example is back working in v57+.
+The fix for HTTPS cache problems on pages with certificate errors
+(and that includes self-signed certificates) is no more applied
+on Windows.
 
-Currently GTK 3 example is broken on Linux. You can either
-downgrade to an old cefpython v53 (available on GitHub release
-page) or use GTK 2 example. For more details on the problem see
-Issue [#261](../../../issues/261).
+See Issue [#125](../../../issues/125) for more details.
 
 
-## v54+ libcef.so library is stripped from symbols on Linux
+## v50+ Importing the cefpython3 package on Linux
 
-Symbols useful for debugging are no more available in libcef.so
-shipped with distribution packages on Linux. This is explained
-in details in Issue [#262](../../../issues/262).
+In the past on Linux it was required for the cefpython3 package
+to be imported before any other packages due to tcmalloc global
+hook being loaded. This is not required anymore, tcmalloc is
+disabled by default.
 
 
-## v55+ HTTPS cache problems on pages with certificate errors
+## v50+ Install X11 error handlers on Linux
 
-The fix for HTTPS cache problems on pages with certificate errors
-is no more applied on Windows.
+It is required to install X11 error handlers on Linux, otherwise
+you will see 'BadWindow' errors happening - sometimes randomly -
+which will cause application to terminate. Since v56+ x11 error
+handlers are installed automatically by default during the call
+to cef.Initialize(). However sometimes that is not enough like
+for example in the wxpython.py example which requires the x11
+error handlers to be installed manually after wx was initialized,
+and that is because wx initialization had reset x11 error handlers
+that were installed earlier during cef initialization (Issue [#334](../../../issues/334)).
 
-Soon this will fix also won't be applied on Linux anymore when
-cefpython starts using CEF prebuilt binaries from Spotify.
+You can install X11 error handlers by calling:
+```
+WindowUtils = cef.WindowUtils()
+WindowUtils.InstallX11ErrorHandlers()
+```
 
-See Issue [#125](../../../issues/125) for more details.
+API ref: WindowUtils.[InstallX11ErrorHandlers()](../api/WindowUtils.md#installx11errorhandlers-linux)
+
+
+## v50+ Set window bounds on Linux
+
+It is now required to set window bounds during window "resize",
+"move" and "configure" events on Linux. You can do so by calling:
+
+```
+browser.SetBounds(x, y, width, height)
+```
+
+API ref: Browser.[SetBounds()](../api/Browser.md#setbounds)
+
+
+## v50+ Keyboard focus issues on Linux
+
+There several keyboard focus issues on Linux since CEF library
+replaced GTK library with X11 library. Most of these issues are
+fixed in examples by calling SetFocus in LoadHandler.OnLoadStart
+during initial app loading and/or by calling SetFocus in
+FocusHandler.OnGotFocus. This keyboard focus issues need to be
+fixed in usptream CEF. For more details see Issue [#284](../../../issues/284).
 
 
-## v55.3+ Handlers' callbacks and other interfaces are now called using keyword args
+## v50+ Windows XP and Vista are no more supported
+
+CEF Python v49.0 was the last version to support Windows XP.
+This is due to Chromium/CEF dropping XP support, last version
+that supported XP was CEF v49.
+
+
+## v50+ Mac 32-bit is no more supported
+
+CEF Python v31.2 was the last version to support Mac 32-bit.
+This is due to CEF/Chromium dropping 32-bit support, last version
+that supported 32-bit was CEF v38.
+
+
+## v51+ Remove LifespanHandler.RunModal
+
+LifespanHandler.RunModal callback is no more available.
+
+
+## v54+ libcef.so library is stripped from symbols on Linux
+
+Symbols useful for debugging are no more available in libcef.so
+shipped with distribution packages on Linux. This is explained
+in details in Issue [#262](../../../issues/262).
+
+
+## v55.3+ Handlers' callbacks and other interfaces
 
 Since v55.3 all handlers' callbacks and other interfaces such as
 CookieVisitor, StringVisitor and WebRequestClient, are now called
@@ -407,3 +482,11 @@ with message loop freezing. Only basic testing was performed. It was not
 tested of how this change affects performance.
 
 See Issue [#442](../../../issues/442) for more details on the issues.
+
+
+## v67+ Do not call the 'WindowUtils.OnSize' function
+
+This function can sometimes cause app hanging during window resize.
+Call instead the new `WindowUtils`.[UpdateBrowserSize](../api/WindowUtils.md#updatebrowsersize)
+function. See [Issue #464](../../../issues/464) for more details.
+

From 6cf7455179e7dd79f8a8e9c7fbbbe686c3682258 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Mon, 27 Aug 2018 20:07:56 +0200
Subject: [PATCH 154/238] Update README - style changes

---
 README.md | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 2c4e38ab..497d810f 100644
--- a/README.md
+++ b/README.md
@@ -3,8 +3,6 @@
 Table of contents:
 * [Introduction](#introduction)
 * [Sponsors](#sponsors)
-  * [Thanks to Lampix for the v66 release](#thanks-to-lampix-for-the-v66-release)
-  * [Thanks to Fivestars for the v49 release (WinXP/Vista)](#thanks-to-fivestars-for-the-v49-release-winxpvista)
 * [Install](#install)
 * [Tutorial](#tutorial)
 * [Examples](#examples)
@@ -105,7 +103,7 @@ See the [Support development](#support-development) section for a list of
 all the individuals and companies supporting CEF Python.
 
 
-### Thanks to Lampix for the v66 release
+**Thanks to Lampix for the v66 release**
 
 Many Thanks to Lampix for sponsoring the [v66 release](../../releases/tag/v66.0) of CEF Python.
 Lampix is the first hardware and software solution that turns any surface
@@ -115,7 +113,7 @@ website here: https://lampix.com/ .
 [![lampix360](https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/lampix360.png)](https://lampix.com/)
 
 
-### Thanks to Fivestars for the v49 release (WinXP/Vista)
+**Thanks to Fivestars for the v49 release (WinXP/Vista)**
 
 Thanks to Fivestars Loyalty, Inc. for sponsoring the
 [v49 release](../../releases/tag/v49.0) for legacy systems such

From 263024423e22dfdcf720259d5c47aa2f48e949b5 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Mon, 27 Aug 2018 20:10:59 +0200
Subject: [PATCH 155/238] Update README, style changes again

---
 README.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/README.md b/README.md
index 497d810f..b6cc9eb4 100644
--- a/README.md
+++ b/README.md
@@ -110,8 +110,6 @@ Lampix is the first hardware and software solution that turns any surface
 into a smart, augmented reality or interactive surface. Please visit its
 website here: https://lampix.com/ .
 
-[![lampix360](https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/lampix360.png)](https://lampix.com/)
-
 
 **Thanks to Fivestars for the v49 release (WinXP/Vista)**
 
@@ -120,9 +118,6 @@ Thanks to Fivestars Loyalty, Inc. for sponsoring the
 as Windows XP and Vista. Please visit its website:
 https://www.fivestars.com/ .
 
-[![fivestars360](https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/fivestars360.png)](https://www.fivestars.com/)
-
-
 
 ## Install
 

From 3e6f421a2bdba024522092c91e9e2031a8dded10 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Mon, 27 Aug 2018 20:17:30 +0200
Subject: [PATCH 156/238] Disable GPU acceleration and add perf. enhancing
 switches in OSR (#463)

---
 examples/screenshot.py | 28 +++++++++++++++++++++++-----
 unittests/osr_test.py  | 22 +++++++++++++++++++---
 2 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/examples/screenshot.py b/examples/screenshot.py
index 7392ed5b..d6dc661c 100644
--- a/examples/screenshot.py
+++ b/examples/screenshot.py
@@ -43,7 +43,7 @@
 
 try:
     from PIL import Image, PILLOW_VERSION
-except:
+except ImportError:
     print("[screenshot.py] Error: PIL module not available. To install"
           " type: pip install Pillow")
     sys.exit(1)
@@ -64,9 +64,26 @@ def main():
         os.remove(SCREENSHOT_PATH)
     command_line_arguments()
     # Off-screen-rendering requires setting "windowless_rendering_enabled"
-    # option, so that RenderHandler callbacks are called.
-    cef.Initialize(settings={"windowless_rendering_enabled": True})
-    create_browser()
+    # option.
+    settings = {
+        "windowless_rendering_enabled": True,
+    }
+    switches = {
+        # GPU acceleration is not supported in OSR mode, so must disable
+        # it using these Chromium switches (Issue #240 and #463)
+        "disable-gpu": "",
+        "disable-gpu-compositing": "",
+        # Tweaking OSR performance by setting the same Chromium flags
+        # as in upstream cefclient (Issue #240).
+        "enable-begin-frame-scheduling": "",
+        "disable-surfaces": "",  # This is required for PDF ext to work
+    }
+    browser_settings = {
+        # Tweaking OSR performance (Issue #240)
+        "windowless_frame_rate": 30,  # Default frame rate in CEF is 30
+    }
+    cef.Initialize(settings=settings, switches=switches)
+    create_browser(browser_settings)
     cef.MessageLoop()
     cef.Shutdown()
     print("[screenshot.py] Opening screenshot with default application")
@@ -108,7 +125,7 @@ def command_line_arguments():
         sys.exit(1)
 
 
-def create_browser():
+def create_browser(settings):
     # Create browser in off-screen-rendering mode (windowless mode)
     # by calling SetAsOffscreen method. In such mode parent window
     # handle can be NULL (0).
@@ -120,6 +137,7 @@ def create_browser():
     print("[screenshot.py] Loading url: {url}"
           .format(url=URL))
     browser = cef.CreateBrowserSync(window_info=window_info,
+                                    settings=settings,
                                     url=URL)
     browser.SetClientHandler(LoadHandler())
     browser.SetClientHandler(RenderHandler())
diff --git a/unittests/osr_test.py b/unittests/osr_test.py
index 0e4191be..672e98fe 100644
--- a/unittests/osr_test.py
+++ b/unittests/osr_test.py
@@ -23,7 +23,7 @@
         font-size: 11pt;
     }
     </style>
-    
+
     <script>
     function print(msg) {
         console.log(msg+" [JS]");
@@ -92,8 +92,23 @@ def test_osr(self):
             settings["debug"] = True
             settings["log_severity"] = cef.LOGSEVERITY_WARNING
 
+        switches = {
+            # GPU acceleration is not supported in OSR mode, so must disable
+            # it using these Chromium switches (Issue #240 and #463)
+            "disable-gpu": "",
+            "disable-gpu-compositing": "",
+            # Tweaking OSR performance by setting the same Chromium flags
+            # as in upstream cefclient (Issue #240).
+            "enable-begin-frame-scheduling": "",
+            "disable-surfaces": "",  # This is required for PDF ext to work
+        }
+        browser_settings = {
+            # Tweaking OSR performance (Issue #240)
+            "windowless_frame_rate": 30,  # Default frame rate in CEF is 30
+        }
+
         # Initialize
-        cef.Initialize(settings)
+        cef.Initialize(settings=settings, switches=switches)
         subtest_message("cef.Initialize() ok")
 
         # Accessibility handler
@@ -111,6 +126,7 @@ def test_osr(self):
         window_info = cef.WindowInfo()
         window_info.SetAsOffscreen(0)
         browser = cef.CreateBrowserSync(window_info=window_info,
+                                        settings=browser_settings,
                                         url=g_datauri)
 
         # Javascript bindings
@@ -231,7 +247,7 @@ def GetViewRect(self, rect_out, **_):
         rect_out.extend([0, 0, 800, 600])
         return True
 
-    def OnPaint(self, browser, element_type, paint_buffer, **_):
+    def OnPaint(self, element_type, paint_buffer, **_):
         """Called when an element should be painted."""
         if element_type == cef.PET_VIEW:
             self.test_case.assertEqual(paint_buffer.width, 800)

From 175a58a8f668267510a56812defc64738afd2cf0 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Mon, 27 Aug 2018 20:18:44 +0200
Subject: [PATCH 157/238] Update tools

---
 src/browser.pyx        |  4 ++++
 tools/build_distrib.py | 22 ++++++++++++++++++++++
 tools/common.py        |  1 +
 tools/requirements.py  |  5 +++--
 4 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/browser.pyx b/src/browser.pyx
index 34f5e4df..d378ca22 100644
--- a/src/browser.pyx
+++ b/src/browser.pyx
@@ -576,6 +576,10 @@ cdef class PyBrowser:
             # On Windows with empty window_info structure the devtools
             # window doesn't appear.
             window_info.SetAsPopup(
+                    # TODO:
+                    # According to docs this returns NULL for non-popup
+                    # windows, so looks like we shouldn't use that and
+                    # either pass NULL or GetWindowHandle().
                     <CefWindowHandle>self.GetOpenerWindowHandle(),
                     PyToCefStringValue("DevTools"))
         cdef CefBrowserSettings settings
diff --git a/tools/build_distrib.py b/tools/build_distrib.py
index fc8c9db3..8ff5a6b8 100644
--- a/tools/build_distrib.py
+++ b/tools/build_distrib.py
@@ -199,6 +199,28 @@ def clean_build_directories():
 
     # Delete cef binaries and libraries dirs
     if not NO_AUTOMATE:
+        # Delete cef binlib dir only if cef_binary dir exists,
+        # otherwise you will end up with cef binlib directory
+        # deleted and script failing further when calling
+        # automate.py --prebuilt-cef.
+        version = get_cefpython_version()
+        # 32-bit
+        if not MAC:
+            postfix2 = get_cef_postfix2_for_arch("32bit")
+            cef_binary_dir = "cef_binary_{cef_version}_{postfix2}"\
+                             .format(cef_version=version["CEF_VERSION"],
+                                     postfix2=postfix2)
+            if len(glob.glob(cef_binary_dir)) != 1:
+                raise Exception("Directory not found: "+cef_binary_dir)
+        # 64-bit
+        postfix2 = get_cef_postfix2_for_arch("64bit")
+        cef_binary_dir = "cef_binary_{cef_version}_windows64"\
+                         .format(cef_version=version["CEF_VERSION"],
+                                 postfix2=postfix2)
+        if len(glob.glob(cef_binary_dir)) != 1:
+            raise Exception("Directory not found: "+cef_binary_dir)
+
+        # Delete
         delete_cef_binaries_libraries_dir("32bit")
         delete_cef_binaries_libraries_dir("64bit")
 
diff --git a/tools/common.py b/tools/common.py
index 4bee285f..113bcd9e 100644
--- a/tools/common.py
+++ b/tools/common.py
@@ -289,6 +289,7 @@ def get_python_include_path():
                 return results[0]
     return ".\\" if WINDOWS else "./"
 
+
 g_deleted_sample_apps = []
 
 
diff --git a/tools/requirements.py b/tools/requirements.py
index e1637904..d52c5d4b 100644
--- a/tools/requirements.py
+++ b/tools/requirements.py
@@ -1,7 +1,7 @@
 """
 Installs Python dependencies using the pip tool.
 See the requirements.txt file.
-pip install --upgrade -r ../tools/requirements.txt
+python -m pip install --upgrade -r ../tools/requirements.txt
 """
 
 from common import *
@@ -13,7 +13,8 @@ def main():
     if sys.executable.startswith("/usr/"):
         args.append("sudo")
     requirements = os.path.join(TOOLS_DIR, "requirements.txt")
-    args.extend(["pip", "install", "--upgrade", "-r", requirements])
+    args.extend([sys.executable, "-m", "pip", "install", "--upgrade",
+                 "-r", requirements])
     retcode = subprocess.call(args)
     sys.exit(retcode)
 

From 7128a5fc1f94d1eb06289737f841c99e0730c352 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Mon, 27 Aug 2018 20:51:37 +0200
Subject: [PATCH 158/238] Update README. Thanks section.

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index b6cc9eb4..886296a5 100644
--- a/README.md
+++ b/README.md
@@ -191,6 +191,8 @@ on the Forum: [[ANN] Call for sponsors](https://groups.google.com/d/topic/cefpyt
 
 ### Thanks
 
+* [2018] Thanks to [Fivestars](https://www.fivestars.com/) for sponsoring
+  the v49 release for legacy systems (WinXP/Vista)
 * [2018] Many thanks to [Lampix](https://lampix.com/) for sponsoring the v66
   release for all platforms
 * [2017] Many thanks to [ClearChat Inc.](https://clearchat.com/) for sponsoring

From 8158a59cbc3346c0d6bb31da4308ab838f4783c2 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Mon, 27 Aug 2018 22:43:19 +0200
Subject: [PATCH 159/238] Update README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 886296a5..cd68f8a8 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ Table of contents:
 
 ## Introduction
 
-CEF Python is a BSD-licensed open source project founded by Czarek Tomczak (hire me! download my [resume](https://drive.google.com/file/d/17xmoT5Z_zTHkVclqPzrs2aAV64Uiu7fh/view)) in 2012 and is based on Google Chromium and the
+CEF Python is a BSD-licensed open source project founded by Czarek Tomczak (hire me! see my [resume](https://drive.google.com/file/d/17xmoT5Z_zTHkVclqPzrs2aAV64Uiu7fh/view)) in 2012 and is based on Google Chromium and the
 [CEF Framework](https://bitbucket.org/chromiumembedded/cef)
 projects. The Chromium project focuses mainly on Google Chrome application
 development, while CEF focuses on facilitating embedded browser use cases

From 4d4fd50c008659e4abae646cc755341bcd1ce16f Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Mon, 27 Aug 2018 22:44:32 +0200
Subject: [PATCH 160/238] Update README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index cd68f8a8..87b52241 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ Table of contents:
 CEF Python is a BSD-licensed open source project founded by Czarek Tomczak (hire me! see my [resume](https://drive.google.com/file/d/17xmoT5Z_zTHkVclqPzrs2aAV64Uiu7fh/view)) in 2012 and is based on Google Chromium and the
 [CEF Framework](https://bitbucket.org/chromiumembedded/cef)
 projects. The Chromium project focuses mainly on Google Chrome application
-development, while CEF focuses on facilitating embedded browser use cases
+development while CEF focuses on facilitating embedded browser use cases
 in third-party applications. Lots of applications use CEF control, there are
 more than [100 million CEF instances](http://en.wikipedia.org/wiki/Chromium_Embedded_Framework#Applications_using_CEF)
 installed around the world. [Examples of embedding](examples/README-examples.md)

From 32560b1c59e3389feac59fb463fbdf2c418e35e7 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Tue, 28 Aug 2018 10:02:34 +0200
Subject: [PATCH 161/238] Add cookies.py snippet and README-snippets.md

---
 README.md                            | 18 ++++----
 examples/README-examples.md          | 24 ++---------
 examples/snippets/README-snippets.md | 48 +++++++++++++++++++++
 examples/snippets/cookies.py         | 62 ++++++++++++++++++++++++++++
 tools/apidocs.py                     | 21 ++++------
 5 files changed, 133 insertions(+), 40 deletions(-)
 create mode 100644 examples/snippets/README-snippets.md
 create mode 100644 examples/snippets/cookies.py

diff --git a/README.md b/README.md
index 87b52241..86e6ccd7 100644
--- a/README.md
+++ b/README.md
@@ -133,12 +133,16 @@ pip install cefpython3==66.0
 
 ## Tutorial
 
-See the [Tutorial.md](docs/Tutorial.md) file.
+See the [Tutorial.md](docs/Tutorial.md) document.
 
 
 ## Examples
 
-See the [README-examples.md](examples/README-examples.md) file.
+See the [README-examples.md](examples/README-examples.md) document.
+
+For small and easy to understand code snippets that show various CEF
+features see the [README-snippets.md](examples/snippets/README-snippets.md)
+document.
 
 
 ## Support
@@ -299,8 +303,8 @@ Additional information for v31.2 release:
 - [Tutorial](docs/Tutorial.md)
 
 
-### API categories
-
+### API categories
+
 #### Modules
 
  * [cefpython](api/cefpython.md#cefpython) module
@@ -356,9 +360,9 @@ Additional information for v31.2 release:
  * [StringVisitor](api/StringVisitor.md#stringvisitor-interface) interface
  * [WebRequestClient](api/WebRequestClient.md#webrequestclient-interface) interface
 
-
-### API index
-
+
+### API index
+
 * [AccessibilityHandler (interface)](api/AccessibilityHandler.md#accessibilityhandler-interface)
   * [_OnAccessibilityTreeChange](api/AccessibilityHandler.md#_onaccessibilitytreechange)
   * [_OnAccessibilityLocationChange](api/AccessibilityHandler.md#_onaccessibilitylocationchange)
diff --git a/examples/README-examples.md b/examples/README-examples.md
index ed104c39..ea5871c8 100644
--- a/examples/README-examples.md
+++ b/examples/README-examples.md
@@ -45,27 +45,9 @@ workarounds.
 
 ### Snippets
 
-See small code snippets that show various CEF features in the
-[examples/snippets/](snippets/) directory:
-
-- [javascript_bindings.py](snippets/javascript_bindings.py) - Communicate
-    between Python and Javascript asynchronously using
-    inter-process messaging with the use of Javascript Bindings.
-- [javascript_errors.py](snippets/javascript_errors.py) - Two ways for
-    intercepting Javascript errors.
-- [mouse_clicks.py](snippets/mouse_clicks.py) - Perform mouse clicks
-    and mouse movements programmatically.
-- [network_cookies.py](snippets/network_cookies.py) - Implement
-    interfaces to block or allow cookies over network requests.
-- [onbeforeclose.py](snippets/onbeforeclose.py) - Implement interface
-    to execute custom code before browser window closes.
-- [ondomready.py](snippets/ondomready.py) - Execute custom Python code
-    on a web page as soon as DOM is ready.
-- [onpagecomplete.py](snippets/onpagecomplete.py) - Execute custom
-    Python code on a web page when page loading is complete.
-- [setcookie.py](snippets/setcookie.py) - Shows how to set a cookie
-- [window_size.py](snippets/window_size.py) - Set initial window size
-    without use of any third party GUI framework.
+For small code snippets that show various CEF features and are easy to
+understand see the [README-snippets.md](snippets/README-snippets.md)
+document.
 
 
 ### GUI frameworks
diff --git a/examples/snippets/README-snippets.md b/examples/snippets/README-snippets.md
new file mode 100644
index 00000000..91a28243
--- /dev/null
+++ b/examples/snippets/README-snippets.md
@@ -0,0 +1,48 @@
+# Snippets README
+
+Table of contents:
+* [Hello World!](#hello-world)
+* [Snippets](#snippets)
+
+
+## Hello World!
+
+Instructions to install the cefpython3 package, clone
+the repository and run the `javascript_bindings.py` snippet:
+
+```
+pip install cefpython3==66.0
+git clone https://github.com/cztomczak/cefpython.git
+cd cefpython/examples/snippets/
+python javascript_bindings.py
+```
+
+
+## Snippets
+
+Below are small code snippets that show various CEF features and
+are easy to understand. These are available in the [examples/snippets/](./)
+directory. If looking for non-trivial examples then see the
+[README-examples.md](../README-examples.md) document.
+
+
+- [cookies.py](snippets/cookies.py) - Shows how to fetch all cookies,
+    all cookies for a given url and how to delete a specific cookie.
+- [javascript_bindings.py](snippets/javascript_bindings.py) - Communicate
+    between Python and Javascript asynchronously using
+    inter-process messaging with the use of Javascript Bindings.
+- [javascript_errors.py](snippets/javascript_errors.py) - Two ways for
+    intercepting Javascript errors.
+- [mouse_clicks.py](snippets/mouse_clicks.py) - Perform mouse clicks
+    and mouse movements programmatically.
+- [network_cookies.py](snippets/network_cookies.py) - Implement
+    interfaces to block or allow cookies over network requests.
+- [onbeforeclose.py](snippets/onbeforeclose.py) - Implement interface
+    to execute custom code before browser window closes.
+- [ondomready.py](snippets/ondomready.py) - Execute custom Python code
+    on a web page as soon as DOM is ready.
+- [onpagecomplete.py](snippets/onpagecomplete.py) - Execute custom
+    Python code on a web page when page loading is complete.
+- [setcookie.py](snippets/setcookie.py) - Shows how to set a cookie
+- [window_size.py](snippets/window_size.py) - Set initial window size
+    without use of any third party GUI framework.
diff --git a/examples/snippets/cookies.py b/examples/snippets/cookies.py
new file mode 100644
index 00000000..bd732a78
--- /dev/null
+++ b/examples/snippets/cookies.py
@@ -0,0 +1,62 @@
+"""Shows how to fetch all cookies, all cookies for
+a given url and how to delete a specific cookie. For
+an example on how to set a cookie see the 'setcookie.py'
+snippet."""
+
+from cefpython3 import cefpython as cef
+
+
+def main():
+    cef.Initialize()
+    browser = cef.CreateBrowserSync(
+        url="http://www.html-kit.com/tools/cookietester/",
+        window_title="Cookies")
+    browser.SetClientHandler(LoadHandler())
+    cef.MessageLoop()
+    del browser
+    cef.Shutdown()
+
+
+class LoadHandler(object):
+    def OnLoadingStateChange(self, browser, is_loading, **_):
+        if is_loading:
+            print("Page loading complete - start visiting cookies")
+            manager = cef.CookieManager.GetGlobalManager()
+            # Must keep a strong reference to the CookieVisitor object
+            # while cookies are being visited.
+            self.cookie_visitor = CookieVisitor()
+            # Visit all cookies
+            result = manager.VisitAllCookies(self.cookie_visitor)
+            if not result:
+                print("Error: could not access cookies")
+            # To visit cookies only for a given url uncomment the
+            # code below.
+            """
+            url = "http://www.html-kit.com/tools/cookietester/"
+            http_only_cookies = False
+            result = manager.VisitUrlCookies(url, http_only_cookies,
+                                             self.cookie_visitor)
+            if not result:
+                print("Error: could not access cookies")
+            """
+
+
+class CookieVisitor(object):
+    def Visit(self, cookie, count, total, delete_cookie_out):
+        """This callback is called on the IO thread."""
+        print("Cookie {count}/{total}: '{name}', '{value}'"
+              .format(count=count+1, total=total, name=cookie.GetName(),
+                      value=cookie.GetValue()))
+        # Set a cookie named "delete_me" and it will be deleted.
+        # You have to refresh page to see whether it succeeded.
+        if cookie.GetName() == "delete_me":
+            # 'delete_cookie_out' arg is a list passed by reference.
+            # Set its '0' index to True to delete the cookie.
+            delete_cookie_out[0] = True
+            print("Deleted cookie: {name}".format(name=cookie.GetName()))
+        # Return True to continue visiting more cookies
+        return True
+
+
+if __name__ == '__main__':
+    main()
diff --git a/tools/apidocs.py b/tools/apidocs.py
index 27fc311f..230b28f1 100644
--- a/tools/apidocs.py
+++ b/tools/apidocs.py
@@ -22,18 +22,15 @@
 
 def main():
     """Main entry point."""
-    # Call toc.py for docs/ and api/ directories
-    print("Running toc.py in {}/ dir".format(os.path.basename(API_DIR)))
-    retcode = subprocess.call([sys.executable,
-                               os.path.join(TOOLS_DIR, "toc.py"),
-                               API_DIR])
-    assert retcode == 0, "Executing toc.py for API_DIR failed"
-
-    print("Running toc.py in {}/ dir".format(os.path.basename(DOCS_DIR)))
-    retcode = subprocess.call([sys.executable,
-                               os.path.join(TOOLS_DIR, "toc.py"),
-                               DOCS_DIR])
-    assert retcode == 0, "Executing toc.py for DOCS_DIR failed"
+    # Call toc.py for docs/, api/, examples/ and examples/snippets/
+    # directories.
+    toc_dirs = [API_DIR, DOCS_DIR, EXAMPLES_DIR, SNIPPETS_DIR]
+    for toc_dir in toc_dirs:
+        print("Running toc.py in {}/ dir".format(os.path.basename(toc_dir)))
+        retcode = subprocess.call([sys.executable,
+                                   os.path.join(TOOLS_DIR, "toc.py"),
+                                   toc_dir])
+        assert retcode == 0, "Executing toc.py failed"
 
     # Generate API reference in api/ dir and in root/README.md
     api_links = generate_api_links()

From aa66da472e5238380e1ad07b55776fa74f002094 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Tue, 28 Aug 2018 10:04:50 +0200
Subject: [PATCH 162/238] Fix links in README-snippets.md

---
 examples/snippets/README-snippets.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/examples/snippets/README-snippets.md b/examples/snippets/README-snippets.md
index 91a28243..0f41e4f3 100644
--- a/examples/snippets/README-snippets.md
+++ b/examples/snippets/README-snippets.md
@@ -26,23 +26,23 @@ directory. If looking for non-trivial examples then see the
 [README-examples.md](../README-examples.md) document.
 
 
-- [cookies.py](snippets/cookies.py) - Shows how to fetch all cookies,
+- [cookies.py](cookies.py) - Shows how to fetch all cookies,
     all cookies for a given url and how to delete a specific cookie.
-- [javascript_bindings.py](snippets/javascript_bindings.py) - Communicate
+- [javascript_bindings.py](javascript_bindings.py) - Communicate
     between Python and Javascript asynchronously using
     inter-process messaging with the use of Javascript Bindings.
-- [javascript_errors.py](snippets/javascript_errors.py) - Two ways for
+- [javascript_errors.py](javascript_errors.py) - Two ways for
     intercepting Javascript errors.
-- [mouse_clicks.py](snippets/mouse_clicks.py) - Perform mouse clicks
+- [mouse_clicks.py](mouse_clicks.py) - Perform mouse clicks
     and mouse movements programmatically.
-- [network_cookies.py](snippets/network_cookies.py) - Implement
+- [network_cookies.py](network_cookies.py) - Implement
     interfaces to block or allow cookies over network requests.
-- [onbeforeclose.py](snippets/onbeforeclose.py) - Implement interface
+- [onbeforeclose.py](onbeforeclose.py) - Implement interface
     to execute custom code before browser window closes.
-- [ondomready.py](snippets/ondomready.py) - Execute custom Python code
+- [ondomready.py](ondomready.py) - Execute custom Python code
     on a web page as soon as DOM is ready.
-- [onpagecomplete.py](snippets/onpagecomplete.py) - Execute custom
+- [onpagecomplete.py](onpagecomplete.py) - Execute custom
     Python code on a web page when page loading is complete.
-- [setcookie.py](snippets/setcookie.py) - Shows how to set a cookie
-- [window_size.py](snippets/window_size.py) - Set initial window size
+- [setcookie.py](setcookie.py) - Shows how to set a cookie
+- [window_size.py](window_size.py) - Set initial window size
     without use of any third party GUI framework.

From 307f0bfa1c655f2283aec0a186dd33eb8cbd7cd5 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Tue, 28 Aug 2018 10:25:07 +0200
Subject: [PATCH 163/238] Update Migration Guide doc

---
 docs/Migration-guide.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/Migration-guide.md b/docs/Migration-guide.md
index 7567f0a8..c7f61f6d 100644
--- a/docs/Migration-guide.md
+++ b/docs/Migration-guide.md
@@ -179,7 +179,9 @@ its implementation in `src/dpi_aware_win.pyx`.
 
 This function can sometimes cause app hanging during window resize.
 Call instead the new `WindowUtils`.[UpdateBrowserSize](../api/WindowUtils.md#updatebrowsersize)
-function. See [Issue #464](../../../issues/464) for more details.
+function. Unless you use the `pywin32.py` example, in such case
+`WindowUtils.OnSize` must be called.
+See [Issue #464](../../../issues/464) for more details.
 
 
 ## v49+ Notify CEF on move or resize events
@@ -488,5 +490,7 @@ See Issue [#442](../../../issues/442) for more details on the issues.
 
 This function can sometimes cause app hanging during window resize.
 Call instead the new `WindowUtils`.[UpdateBrowserSize](../api/WindowUtils.md#updatebrowsersize)
-function. See [Issue #464](../../../issues/464) for more details.
+function. Unless you use the `pywin32.py` example, in such case
+`WindowUtils.OnSize` must be called.
+See [Issue #464](../../../issues/464) for more details.
 

From 8c5842468f659cc51ba65d6823b896e223cd55e2 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Tue, 28 Aug 2018 10:31:17 +0200
Subject: [PATCH 164/238] Update Migration Guide doc again

---
 docs/Migration-guide.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Migration-guide.md b/docs/Migration-guide.md
index c7f61f6d..fb4501a1 100644
--- a/docs/Migration-guide.md
+++ b/docs/Migration-guide.md
@@ -179,7 +179,7 @@ its implementation in `src/dpi_aware_win.pyx`.
 
 This function can sometimes cause app hanging during window resize.
 Call instead the new `WindowUtils`.[UpdateBrowserSize](../api/WindowUtils.md#updatebrowsersize)
-function. Unless you use the `pywin32.py` example, in such case
+function. Except when you use the `pywin32.py` example, in such case
 `WindowUtils.OnSize` must be called.
 See [Issue #464](../../../issues/464) for more details.
 

From d335837d8703966c86f3daad6002f52738819f91 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Tue, 28 Aug 2018 10:32:55 +0200
Subject: [PATCH 165/238] Update Migration Guide doc yet again

---
 docs/Migration-guide.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Migration-guide.md b/docs/Migration-guide.md
index fb4501a1..993dc385 100644
--- a/docs/Migration-guide.md
+++ b/docs/Migration-guide.md
@@ -490,7 +490,7 @@ See Issue [#442](../../../issues/442) for more details on the issues.
 
 This function can sometimes cause app hanging during window resize.
 Call instead the new `WindowUtils`.[UpdateBrowserSize](../api/WindowUtils.md#updatebrowsersize)
-function. Unless you use the `pywin32.py` example, in such case
+function. Except when you use the `pywin32.py` example, in such case
 `WindowUtils.OnSize` must be called.
 See [Issue #464](../../../issues/464) for more details.
 

From 3f765a62f80bbe7a9a44547b30251e5f10bbb507 Mon Sep 17 00:00:00 2001
From: Czarek Tomczak <cztomczak@users.noreply.github.com>
Date: Tue, 28 Aug 2018 14:08:24 +0200
Subject: [PATCH 166/238] Update javascript_bindings.py

---
 examples/snippets/javascript_bindings.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/snippets/javascript_bindings.py b/examples/snippets/javascript_bindings.py
index 63135463..41ca1d76 100644
--- a/examples/snippets/javascript_bindings.py
+++ b/examples/snippets/javascript_bindings.py
@@ -41,7 +41,7 @@ def main():
     cef.Initialize()
     browser = cef.CreateBrowserSync(url=cef.GetDataUrl(g_htmlcode),
                                     window_title="Javascript Bindings")
-    browser.SetClientHandler(LifespanHandler())
+    browser.SetClientHandler(LoadHandler())
     bindings = cef.JavascriptBindings()
     bindings.SetFunction("py_function", py_function)
     bindings.SetFunction("py_callback", py_callback)
@@ -60,7 +60,7 @@ def py_callback(value):
     print("Value sent from Javascript: "+value)
 
 
-class LifespanHandler(object):
+class LoadHandler(object):
     def OnLoadEnd(self, browser, **_):
         browser.ExecuteFunction("js_function", "I am a Python string #1")
 

From 38bcf0cb74f57b25da2f8fd547ae35c7e167dbcb Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Wed, 29 Aug 2018 06:01:03 +0200
Subject: [PATCH 167/238] Fix maximize/restore events in tkinter_.py example
 (#464)

This is a temporary fix to use ctypes until thw new
WindowUtils.UpdateBrowserSize utility func is exposed.
---
 examples/tkinter_.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/examples/tkinter_.py b/examples/tkinter_.py
index e3d01c9e..58dc402e 100644
--- a/examples/tkinter_.py
+++ b/examples/tkinter_.py
@@ -15,6 +15,7 @@
 # and Issue #284).
 
 from cefpython3 import cefpython as cef
+import ctypes
 try:
     import tkinter as tk
 except ImportError:
@@ -201,7 +202,9 @@ def on_root_configure(self):
     def on_mainframe_configure(self, width, height):
         if self.browser:
             if WINDOWS:
-                WindowUtils.OnSize(self.get_window_handle(), 0, 0, 0)
+                ctypes.windll.user32.SetWindowPos(
+                    self.browser.GetWindowHandle(), 0,
+                    0, 0, width, height, 0x0002)
             elif LINUX:
                 self.browser.SetBounds(0, 0, width, height)
             self.browser.NotifyMoveOrResizeStarted()

From a5edec92b89f3951b9643659f1b1ea0f0327ebeb Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Thu, 30 Aug 2018 09:29:08 +0200
Subject: [PATCH 168/238] Add Fedora 24+ and openSUSE 13.3+ to supported OSes

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 86e6ccd7..3003b368 100644
--- a/README.md
+++ b/README.md
@@ -240,7 +240,7 @@ support old operating systems then choose the v31 release.
 OS | Py2 | Py3 | 32bit | 64bit | Requirements
 --- | --- | --- | --- | --- | ---
 Windows | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | Yes | Yes | Windows 7+
-Linux | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | Yes | Yes | Debian 8+ / Ubuntu 14.04+
+Linux | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | Yes | Yes | Debian 8+, Ubuntu 14.04+, Fedora 24+, openSUSE 13.3+
 Mac | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | No | Yes | MacOS 10.9+
 
 These platforms are not supported yet:
@@ -303,8 +303,8 @@ Additional information for v31.2 release:
 - [Tutorial](docs/Tutorial.md)
 
 
-### API categories
-
+### API categories
+
 #### Modules
 
  * [cefpython](api/cefpython.md#cefpython) module
@@ -360,9 +360,9 @@ Additional information for v31.2 release:
  * [StringVisitor](api/StringVisitor.md#stringvisitor-interface) interface
  * [WebRequestClient](api/WebRequestClient.md#webrequestclient-interface) interface
 
-
-### API index
-
+
+### API index
+
 * [AccessibilityHandler (interface)](api/AccessibilityHandler.md#accessibilityhandler-interface)
   * [_OnAccessibilityTreeChange](api/AccessibilityHandler.md#_onaccessibilitytreechange)
   * [_OnAccessibilityLocationChange](api/AccessibilityHandler.md#_onaccessibilitylocationchange)

From 0431dbd67de451325a715d6ce46646b1a932c90f Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Sun, 9 Sep 2018 08:13:20 +0200
Subject: [PATCH 169/238] Update automate.py

---
 tools/automate.py | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/tools/automate.py b/tools/automate.py
index 63aa55d7..95a24009 100644
--- a/tools/automate.py
+++ b/tools/automate.py
@@ -577,15 +577,15 @@ def fix_cmake_variables_for_MD_library(undo=False, try_undo=False):
     # This replacements must be unique for the undo operation
     # to be reliable.
 
-    mt_find = r'CEF_RUNTIME_LIBRARY_FLAG "/MT"'
-    mt_replace = r'CEF_RUNTIME_LIBRARY_FLAG "/MD"'
+    mt_find = u'CEF_RUNTIME_LIBRARY_FLAG "/MT"'
+    mt_replace = u'CEF_RUNTIME_LIBRARY_FLAG "/MD"'
 
-    wd4275_find = ('/wd4244       '
-                   '# Ignore "conversion possible loss of data" warning')
-    wd4275_replace = ('/wd4244       '
-                      '# Ignore "conversion possible loss of data" warning'
-                      '\r\n'
-                      '    /wd4275 # Ignore "non dll-interface class"')
+    wd4275_find = (u'/wd4244       '
+                   u'# Ignore "conversion possible loss of data" warning')
+    wd4275_replace = (u'/wd4244       '
+                      u'# Ignore "conversion possible loss of data" warning'
+                      u'\r\n'
+                      u'    /wd4275 # Ignore "non dll-interface class"')
 
     cmake_variables = os.path.join(Options.cef_binary, "cmake",
                                    "cef_variables.cmake")
@@ -996,13 +996,10 @@ def run_automate_git():
         # later in cef_binary/ with cmake/ninja do works fine.
         args.append("--build-target=cefsimple")
 
-    # On Windows automate-git.py must be run using Python 2.7
-    # from depot_tools. depot_tools should already be added to PATH.
-    python = "python"  # *do not* replace with sys.executable!
     args = " ".join(args)
     command = script + " " + args
     working_dir = Options.cef_build_dir
-    return run_command("%s %s" % (python, command), working_dir)
+    return run_command("%s %s" % (sys.executable, command), working_dir)
 
 
 def run_make_distrib():

From aec9f6239518b2f5322ae7eb1b3b2c9a5b81adc6 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Sun, 9 Sep 2018 08:47:16 +0200
Subject: [PATCH 170/238] Update automate.py - speed up builds by increasing
 ninja jobs

---
 tools/automate.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/tools/automate.py b/tools/automate.py
index 95a24009..69339c01 100644
--- a/tools/automate.py
+++ b/tools/automate.py
@@ -59,9 +59,11 @@
     --build-dir=<dir1>       Build directory.
     --cef-build-dir=<dir2>   CEF build directory. By default same
                              as --build-dir.
-    --ninja-jobs=<jobs>      How many CEF jobs to run in parallel. To speed up
-                             building set it to number of cores in your CPU.
-                             By default set to cpu_count / 2.
+    --ninja-jobs=<jobs>      How many CEF jobs to run in parallel. By default
+                             sets to CPU threads * 2. If you need to perform
+                             other tasks on computer and it is slowed down
+                             by the build then decrease the number of ninja
+                             jobs.
     --gyp-generators=<gen>   Set GYP_GENERATORS [default: ninja].
     --gyp-msvs-version=<v>   Set GYP_MSVS_VERSION.
     --use-system-freetype    Use system Freetype library on Linux (Issue #402)
@@ -213,12 +215,11 @@ def setup_options(docopt_args):
 
     # ninja_jobs
     # cpu_count() returns number of CPU threads, not CPU cores.
-    # On i5 with 2 cores and 4 cpu threads the default of 4 ninja
-    # jobs slows down computer significantly.
+    # On i5 with 2 cores there are 4 cpu threads and will enable
+    # 8 ninja jobs by default.
     if not Options.ninja_jobs:
-        Options.ninja_jobs = int(multiprocessing.cpu_count() / 2)
-        if Options.ninja_jobs < 1:
-            Options.ninja_jobs = 1
+        Options.ninja_jobs = int(multiprocessing.cpu_count() * 2)
+        assert Options.ninja_jobs > 0
     Options.ninja_jobs = str(Options.ninja_jobs)
 
 

From 6f5bf081fec19647e1860bb3e0f3638c02bb9d11 Mon Sep 17 00:00:00 2001
From: Czarek Tomczak <cztomczak@users.noreply.github.com>
Date: Mon, 10 Sep 2018 07:53:14 +0200
Subject: [PATCH 171/238] Update Build-instructions.md - Fedora dependencies

---
 docs/Build-instructions.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/Build-instructions.md b/docs/Build-instructions.md
index 5e698af4..5df63bec 100644
--- a/docs/Build-instructions.md
+++ b/docs/Build-instructions.md
@@ -193,7 +193,8 @@ requirements common for all platforms.
 
 * Install packages: `sudo apt-get install cmake g++ libgtk2.0-dev libgtkglext1-dev`
 * If building CEF from sources:
-    * Official binaries are built on Ubuntu 14.04 (cmake 2.8.12, g++ 4.8.4)
+    * Official binaries are built on Ubuntu 14.04 (cmake 2.8.12, g++ 4.8.4) and these instructions apply to that OS
+    * For Fedora build dependencies see [Issue #466](https://github.com/cztomczak/cefpython/issues/466#issuecomment-419794341)
     * Download [ninja](https://github.com/ninja-build/ninja/releases) 1.7.1 or later
       and copy it to /usr/bin and chmod 755.
     * Install/upgrade required packages using one of the four methods below

From 931780ce74270677fabe2fbe309c2fea1d546d71 Mon Sep 17 00:00:00 2001
From: Joseph Kogut <joseph.kogut@gmail.com>
Date: Wed, 3 Oct 2018 11:01:12 -0700
Subject: [PATCH 172/238] Add option --use-ccache for faster (re)builds

---
 tools/automate.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tools/automate.py b/tools/automate.py
index 69339c01..56777f41 100644
--- a/tools/automate.py
+++ b/tools/automate.py
@@ -35,6 +35,7 @@
                 [--gyp-msvs-version MSVS]
                 [--use-system-freetype USE_SYSTEM_FREETYPE]
                 [--use-gtk3 USE_GTK3]
+                [--use-ccache USE_CCACHE]
                 [--no-depot-tools-update NO_DEPOT_TOOLS_UPDATE]
     automate.py (-h | --help) [type -h to show full description for options]
 
@@ -68,6 +69,7 @@
     --gyp-msvs-version=<v>   Set GYP_MSVS_VERSION.
     --use-system-freetype    Use system Freetype library on Linux (Issue #402)
     --use-gtk3               Link CEF with GTK 3 libraries (Issue #446)
+    --use-ccache             Use ccache for faster (re)builds
     --no-depot-tools-update  Do not update depot_tools/ directory. When
                              building old unsupported versions of Chromium
                              you want to manually checkout an old version
@@ -116,6 +118,7 @@ class Options(object):
     gyp_msvs_version = ""     # env variables are being used.
     use_system_freetype = False
     use_gtk3 = False
+    use_ccache = False
     no_depot_tools_update = False
 
     # Internal options
@@ -906,6 +909,10 @@ def getenv():
     if Options.use_gtk3:
         env["GN_DEFINES"] += " use_gtk3=true"
 
+    # Use ccache for faster (re)builds
+    if Options.use_ccache:
+        env["GN_DEFINES"] += " cc_wrapper=ccache"
+
     # To perform an official build set GYP_DEFINES=buildtype=Official.
     # This will disable debugging code and enable additional link-time
     # optimizations in Release builds.

From e8979f2f415ce8c5e2a4052034b0394299de30a8 Mon Sep 17 00:00:00 2001
From: Joseph Kogut <joseph.kogut@gmail.com>
Date: Wed, 3 Oct 2018 12:10:07 -0700
Subject: [PATCH 173/238] Add option --proprietary-codecs to enable non-free
 codecs

---
 tools/automate.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tools/automate.py b/tools/automate.py
index 56777f41..9d2940ed 100644
--- a/tools/automate.py
+++ b/tools/automate.py
@@ -36,6 +36,7 @@
                 [--use-system-freetype USE_SYSTEM_FREETYPE]
                 [--use-gtk3 USE_GTK3]
                 [--use-ccache USE_CCACHE]
+                [--proprietary-codecs PROPRIETARY_CODECS]
                 [--no-depot-tools-update NO_DEPOT_TOOLS_UPDATE]
     automate.py (-h | --help) [type -h to show full description for options]
 
@@ -70,6 +71,8 @@
     --use-system-freetype    Use system Freetype library on Linux (Issue #402)
     --use-gtk3               Link CEF with GTK 3 libraries (Issue #446)
     --use-ccache             Use ccache for faster (re)builds
+    --proprietary-codecs     Enable proprietary codecs such as H264 and AAC,
+                             licensing restrictions may apply.
     --no-depot-tools-update  Do not update depot_tools/ directory. When
                              building old unsupported versions of Chromium
                              you want to manually checkout an old version
@@ -119,6 +122,7 @@ class Options(object):
     use_system_freetype = False
     use_gtk3 = False
     use_ccache = False
+    proprietary_codecs = False
     no_depot_tools_update = False
 
     # Internal options
@@ -913,6 +917,10 @@ def getenv():
     if Options.use_ccache:
         env["GN_DEFINES"] += " cc_wrapper=ccache"
 
+    # Enable proprietary codecs
+    if Options.proprietary_codecs:
+        env["GN_DEFINES"] += " proprietary_codecs=true ffmpeg_branding=Chrome"
+
     # To perform an official build set GYP_DEFINES=buildtype=Official.
     # This will disable debugging code and enable additional link-time
     # optimizations in Release builds.

From 634597e373b33583c50dcf433ac9ea7e35e9942f Mon Sep 17 00:00:00 2001
From: Roman Krivonogov <romansdidnotcrucify@gmail.com>
Date: Wed, 10 Oct 2018 20:31:16 +0300
Subject: [PATCH 174/238] Fixed a typo

Fixed a typo in the "Change user agent string" section.
---
 docs/Tutorial.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Tutorial.md b/docs/Tutorial.md
index b4533e34..11cf5db7 100644
--- a/docs/Tutorial.md
+++ b/docs/Tutorial.md
@@ -262,7 +262,7 @@ MyProduct/10.00 Safari/537.36
 ```
 
 To change the whole user agent string use the "user_agent"
-option. For example set it to "MyApp/40.00 MyProduct/10.00"
+option. For example set it to "MyAgent/20.00 MyProduct/10.00"
 and both User-Agent HTTP header and js navigator.userAgent will be:
 
 ```text

From ea1ad055f4118e89b6661a31dfb52a5c75175919 Mon Sep 17 00:00:00 2001
From: Joseph Kogut <joseph.kogut@gmail.com>
Date: Wed, 17 Oct 2018 10:25:17 -0700
Subject: [PATCH 175/238] Add option --cef-git-url to use a repo other than
 upstream

---
 tools/automate.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tools/automate.py b/tools/automate.py
index 9d2940ed..2ba88278 100644
--- a/tools/automate.py
+++ b/tools/automate.py
@@ -29,7 +29,7 @@
                 [--fast-build FAST_BUILD]
                 [--force-chromium-update FORCE_CHROMIUM_UPDATE]
                 [--no-cef-update NO_CEF_UPDATE]
-                [--cef-branch BRANCH] [--cef-commit COMMIT]
+                [--cef-git-url URL] [--cef-branch BRANCH] [--cef-commit COMMIT]
                 [--build-dir BUILD_DIR] [--cef-build-dir CEF_BUILD_DIR]
                 [--ninja-jobs JOBS] [--gyp-generators GENERATORS]
                 [--gyp-msvs-version MSVS]
@@ -54,6 +54,7 @@
     --force-chromium-update  Force Chromium update (gclient sync etc).
     --no-cef-update          Do not update CEF sources (by default both cef/
                              directories are deleted on every run).
+    --cef-git-url=<url>      Git URL to clone CEF from, defaults to upstream
     --cef-branch=<b>         CEF branch. Defaults to CHROME_VERSION_BUILD from
                              "src/version/cef_version_{platform}.h".
     --cef-commit=<c>         CEF revision. Defaults to CEF_COMMIT_HASH from
@@ -95,7 +96,7 @@
 from setuptools.msvc import msvc9_query_vcvarsall
 
 # Constants
-CEF_GIT_URL = "https://bitbucket.org/chromiumembedded/cef.git"
+CEF_UPSTREAM_GIT_URL = "https://bitbucket.org/chromiumembedded/cef.git"
 RUNTIME_MT = "MT"
 RUNTIME_MD = "MD"
 
@@ -111,6 +112,7 @@ class Options(object):
     fast_build = False
     force_chromium_update = False
     no_cef_update = False
+    cef_git_url = ""
     cef_branch = ""
     cef_commit = ""
     cef_version = ""
@@ -170,6 +172,9 @@ def setup_options(docopt_args):
     Options.tools_dir = os.path.dirname(os.path.realpath(__file__))
     Options.cefpython_dir = os.path.dirname(Options.tools_dir)
 
+    if not Options.cef_git_url:
+        Options.cef_git_url = CEF_UPSTREAM_GIT_URL
+
     # If --cef-branch is specified will use latest CEF commit from that
     # branch. Otherwise get cef branch/commit from src/version/.
     if not Options.cef_branch:
@@ -307,7 +312,7 @@ def create_cef_directories():
     # Clone cef repo and checkout branch
     if os.path.exists(cef_dir):
         rmdir(cef_dir)
-    run_git("clone -b %s %s cef" % (Options.cef_branch, CEF_GIT_URL),
+    run_git("clone -b %s %s cef" % (Options.cef_branch, Options.cef_git_url),
             Options.cef_build_dir)
     if Options.cef_commit:
         run_git("checkout %s" % Options.cef_commit, cef_dir)

From ce21ff975194ea1b17a9061ceb66648cbb3115c5 Mon Sep 17 00:00:00 2001
From: Czarek Tomczak <cztomczak@users.noreply.github.com>
Date: Fri, 9 Nov 2018 07:56:57 +0100
Subject: [PATCH 176/238] Update README.md - clarification for next release
 labels

---
 README.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 3003b368..e1b929ff 100644
--- a/README.md
+++ b/README.md
@@ -226,12 +226,11 @@ support old operating systems then choose the v31 release.
 
 ### Next release
 
-- To see planned new features or bugs to be fixed in the
-  next release, see the
+- To see planned new features or bugs to be fixed in the near future in one of
+  next releases, see the
   [next release](../../issues?q=is%3Aissue+is%3Aopen+label%3A%22next+release%22)
   label in the tracker
-- To see planned new features or bugs to be fixed in the
-  in one of next releases, see the
+- To see planned new features or bugs to be fixed in further future, see the
   [next release 2](../../issues?q=is%3Aissue+is%3Aopen+label%3A%22next+release+2%22)
   label in the tracker
 

From cdf6c23483447a7a6b99af2fc67b19e8c34c8c22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=B3nal=20McMullan?= <donal.mcmullan@gmail.com>
Date: Sun, 11 Nov 2018 20:04:06 +0000
Subject: [PATCH 177/238] basic PySide2 support in examples/qt.py #438

---
 examples/qt.py | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/examples/qt.py b/examples/qt.py
index d0ed3300..8d2e5fe2 100644
--- a/examples/qt.py
+++ b/examples/qt.py
@@ -22,6 +22,7 @@
 PYQT4 = False
 PYQT5 = False
 PYSIDE = False
+PYSIDE2 = False
 
 if "pyqt4" in sys.argv:
     PYQT4 = True
@@ -47,11 +48,24 @@
     from PySide.QtGui import *
     # noinspection PyUnresolvedReferences
     from PySide.QtCore import *
+elif "pyside2" in sys.argv:
+    PYSIDE2 = True
+    # noinspection PyUnresolvedReferences
+    import PySide2
+    # noinspection PyUnresolvedReferences
+    from PySide2 import QtCore
+    # noinspection PyUnresolvedReferences
+    from PySide2.QtGui import *
+    # noinspection PyUnresolvedReferences
+    from PySide2.QtCore import *
+    # noinspection PyUnresolvedReferences
+    from PySide2.QtWidgets import *
 else:
     print("USAGE:")
     print("  qt.py pyqt4")
     print("  qt.py pyqt5")
     print("  qt.py pyside")
+    print("  qt.py pyside2")
     sys.exit(1)
 
 # Fix for PyCharm hints warnings when using static methods
@@ -107,6 +121,9 @@ def check_versions():
     elif PYSIDE:
         print("[qt.py] PySide {v1} (qt {v2})".format(
               v1=PySide.__version__, v2=QtCore.__version__))
+    elif PYSIDE2:
+        print("[qt.py] PySide2 {v1} (qt {v2})".format(
+              v1=PySide2.__version__, v2=QtCore.__version__))
     # CEF Python version requirement
     assert cef.__version__ >= "55.4", "CEF Python v55.4+ required to run this"
 
@@ -126,6 +143,8 @@ def __init__(self):
             self.setWindowTitle("PyQt5 example")
         elif PYSIDE:
             self.setWindowTitle("PySide example")
+        elif PYSIDE2:
+            self.setWindowTitle("PySide2 example")
         self.setFocusPolicy(Qt.StrongFocus)
         self.setupLayout()
 
@@ -147,7 +166,7 @@ def setupLayout(self):
         frame.setLayout(layout)
         self.setCentralWidget(frame)
 
-        if PYQT5 and WINDOWS:
+        if (PYSIDE2 or PYQT5) and WINDOWS:
             # On Windows with PyQt5 main window must be shown first
             # before CEF browser is embedded, otherwise window is
             # not resized and application hangs during resize.
@@ -156,7 +175,7 @@ def setupLayout(self):
         # Browser can be embedded only after layout was set up
         self.cef_widget.embedBrowser()
 
-        if PYQT5 and LINUX:
+        if (PYSIDE2 or PYQT5) and LINUX:
             # On Linux with PyQt5 the QX11EmbedContainer widget is
             # no more available. An equivalent in Qt5 is to create
             # a hidden window, embed CEF browser in it and then
@@ -204,7 +223,7 @@ def focusOutEvent(self, event):
             self.browser.SetFocus(False)
 
     def embedBrowser(self):
-        if PYQT5 and LINUX:
+        if (PYSIDE2 or PYQT5) and LINUX:
             # noinspection PyUnresolvedReferences
             self.hidden_window = QWindow()
         window_info = cef.WindowInfo()

From f9f309dabf5ea60bf1b54fed1e0e0d0e38eefa97 Mon Sep 17 00:00:00 2001
From: Czarek Tomczak <cztomczak@users.noreply.github.com>
Date: Wed, 14 Nov 2018 06:12:03 +0100
Subject: [PATCH 178/238] Update qt.py - tested configurations (#438)

---
 examples/qt.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/examples/qt.py b/examples/qt.py
index 8d2e5fe2..a272b80d 100644
--- a/examples/qt.py
+++ b/examples/qt.py
@@ -6,6 +6,7 @@
 # - PyQt 5.8.2 (qt 5.8.0) on Windows/Linux/Mac
 # - PyQt 4.10.4 / 4.11.4 (qt 4.8.6 / 4.8.7) on Windows/Linux
 # - PySide 1.2.1 (qt 4.8.6) on Windows/Linux/Mac
+# - PySide2 5.6.0, 5.11.2 (qt 5.6.2, 5.11.2) on Windows/Linux/Mac
 # - CEF Python v55.4+
 #
 # Issues with PySide 1.2:

From 050e73c8801207c299602686092b7be001ddcded Mon Sep 17 00:00:00 2001
From: Czarek Tomczak <cztomczak@users.noreply.github.com>
Date: Tue, 20 Nov 2018 16:42:53 +0100
Subject: [PATCH 179/238] Update Migration-guide.md - fix typo

---
 docs/Migration-guide.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Migration-guide.md b/docs/Migration-guide.md
index 993dc385..d57001c7 100644
--- a/docs/Migration-guide.md
+++ b/docs/Migration-guide.md
@@ -475,7 +475,7 @@ so this should make Qt apps work smoothly.
 
 In wxPython apps you have to implement both approaches for
 integrating with existing message loop at the same time:
-1. Call `cef.DoMessageLoopWork` in a 10ms timer
+1. Call `cef.MessageLoopWork` in a 10ms timer
 2. Set `ApplicationSettings.external_message_pump` to True
 
 This is not a correct approach and is only a temporary fix for wxPython

From eec0d45cc78e3b050f89bf5b9c3acd3493ebeb78 Mon Sep 17 00:00:00 2001
From: Czarek Tomczak <cztomczak@users.noreply.github.com>
Date: Tue, 20 Nov 2018 16:44:55 +0100
Subject: [PATCH 180/238] Update Migration-guide.md

---
 docs/Migration-guide.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/Migration-guide.md b/docs/Migration-guide.md
index d57001c7..2359562c 100644
--- a/docs/Migration-guide.md
+++ b/docs/Migration-guide.md
@@ -465,6 +465,8 @@ This bug is to be fixed in Issue [#429](../../../issues/429).
 
 ## v66+ Changes to Mac apps that integrate into existing message loop (Qt, wxPython)
 
+These changes are required only on Mac platform.
+
 In Qt apps calling message loop work in a timer doesn't work anymore.
 You have to enable external message pump by setting
 ApplicationSettings.[external_message_pump](../api/ApplicationSettings.md#external_message_pump)

From 3ffa69521a212ad90a061004041e10a465723eee Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Thu, 22 Nov 2018 12:02:30 +0100
Subject: [PATCH 181/238] Update Knowledge-Base.md - remote debugging with
 Google Chrome instance

---
 README.md              |  2 +-
 docs/Knowledge-Base.md | 43 +++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index e1b929ff..5e50aed7 100644
--- a/README.md
+++ b/README.md
@@ -239,7 +239,7 @@ support old operating systems then choose the v31 release.
 OS | Py2 | Py3 | 32bit | 64bit | Requirements
 --- | --- | --- | --- | --- | ---
 Windows | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | Yes | Yes | Windows 7+
-Linux | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | Yes | Yes | Debian 8+, Ubuntu 14.04+, Fedora 24+, openSUSE 13.3+
+Linux | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | Yes | Yes | Debian 8+, Ubuntu 14.04+,<br> Fedora 24+, openSUSE 13.3+
 Mac | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | No | Yes | MacOS 10.9+
 
 These platforms are not supported yet:
diff --git a/docs/Knowledge-Base.md b/docs/Knowledge-Base.md
index fddb6a7d..c68f4cc0 100644
--- a/docs/Knowledge-Base.md
+++ b/docs/Knowledge-Base.md
@@ -5,6 +5,7 @@ Table of contents:
 * [Changes in API after CEF updates](#changes-in-api-after-cef-updates)
 * [Differences between Python 2 and Python 3](#differences-between-python-2-and-python-3)
 * [How to enable debug information in examples?](#how-to-enable-debug-information-in-examples)
+* [Remote debugging with Google Chrome instance](#remote-debugging-with-google-chrome-instance)
 * [Debugging using various chrome:// protocol uris](#debugging-using-various-chrome-protocol-uris)
 * [A blank window on Mac/Linux](#a-blank-window-on-maclinux)
 * [Location of CEF framework in Mac apps](#location-of-cef-framework-in-mac-apps)
@@ -76,6 +77,46 @@ Now you should see debug information displayed in console like this:
 ```
 
 
+## Remote debugging with Google Chrome instance
+
+Remote debugging is enabled by default and is configurable using
+the ApplicationSettings.[remote_debugging_port](../api/ApplicationSettings.md#remote_debugging_port) option.
+When launching app you can see in console log the random port that
+was generated:
+
+```
+DevTools listening on ws://127.0.0.1:63967/devtools/browser/c52ad9ad-bf40-47d1-b2d1-be392d536a2b
+```
+
+You can debug remotely in two ways:
+
+1. Debug with CEF devtools. Open the `http://127.0.0.1:port` url
+   (replace port with e.g. 63967 in our case) in a Google Chrome
+   browser. You will see a list of CEF browser instances running
+   which you can debug with DevTools.
+   This way of debugging has the same sets of features as opening DevTools
+   popup via `Browser.ShowDevTools` method or using the "Show DevTools"
+   option from mouse context menu in a CEF app. CEF DevTools has some
+   limits, not all features of Google Chrome DevTools do work. There
+   is another way to remotely debug that can workaround these limits,
+   see the point 2 below.
+
+2. If some features don't work when debugging with CEF devtools you can
+   use dedicated DevTools for Node in Google Chrome browser. For example
+   as of CEF v70 the devtools feature "Save as HAR file" doesn't work,
+   however it works with dedicated DevTools for Node. Follow these steps
+   to use dedicated DevTools for Node with CEF:
+
+   1. In Google Chrome browser open `chrome://inspect` url and click
+      "Open dedicated DevTools for Node"
+   2. Add `localhost:1234` connection and close the popup window
+   3. Set `ApplicationSettings.remote_debugging_port` to `1234` and
+      run your app
+   4. Refresh the `chrome://inspect` page in Google Chrome browser
+   5. You should see a new target on the Remote Target list. Click
+      "inspect" link for this target.
+
+
 ## Debugging using various chrome:// protocol uris
 
 The `chrome://` protocol uris give you access to various debugging
@@ -104,7 +145,7 @@ Here is a list of supported `chrome://` protocol uris as of v55.2:
 - chrome://view-http-cache
 - chrome://webrtc-internals
 - chrome://webui-hosts
-
+  
 
 ## A blank window on Mac/Linux
 

From 3ca46788d6032232fe85c8fcb1a1c78933a26f4d Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Fri, 8 Feb 2019 18:43:51 +0100
Subject: [PATCH 182/238] Update README.md

---
 README.md      | 301 +++++++++++++++++++++++++++----------------------
 api/Browser.md |   3 +
 2 files changed, 169 insertions(+), 135 deletions(-)

diff --git a/README.md b/README.md
index 5e50aed7..76feedd1 100644
--- a/README.md
+++ b/README.md
@@ -7,116 +7,74 @@ Table of contents:
 * [Tutorial](#tutorial)
 * [Examples](#examples)
 * [Support](#support)
-* [Support development](#support-development)
-  * [Thanks](#thanks)
 * [Releases](#releases)
   * [Next release](#next-release)
   * [Latest release](#latest-release)
   * [v49 release (WinXP/Vista)](#v49-release-winxpvista)
   * [v31 release (old systems)](#v31-release-old-systems)
+* [Support development](#support-development)
+  * [Thanks to sponsors](#thanks-to-sponsors)
+  * [Thanks to all](#thanks-to-all)
+* [Seeking new sponsors](#seeking-new-sponsors)
 * [Other READMEs](#other-readmes)
 * [Quick links](#quick-links)
 
 
 ## Introduction
 
-CEF Python is a BSD-licensed open source project founded by Czarek Tomczak (hire me! see my [resume](https://drive.google.com/file/d/17xmoT5Z_zTHkVclqPzrs2aAV64Uiu7fh/view)) in 2012 and is based on Google Chromium and the
-[CEF Framework](https://bitbucket.org/chromiumembedded/cef)
-projects. The Chromium project focuses mainly on Google Chrome application
+CEF Python is an open source project founded by [Czarek Tomczak](https://drive.google.com/file/d/17xmoT5Z_zTHkVclqPzrs2aAV64Uiu7fh/view)
+(available for contract work) in 2012 to provide Python bindings for the
+[Chromium Embedded Framework](https://bitbucket.org/chromiumembedded/cef) (CEF). The Chromium project focuses mainly on Google Chrome application
 development while CEF focuses on facilitating embedded browser use cases
 in third-party applications. Lots of applications use CEF control, there are
 more than [100 million CEF instances](http://en.wikipedia.org/wiki/Chromium_Embedded_Framework#Applications_using_CEF)
-installed around the world. [Examples of embedding](examples/README-examples.md)
-Chrome browser are available for many popular GUI toolkits including:
-wxPython, PyGTK, PyQt, PySide, Kivy, Panda3D and PyGame/PyOpenGL.
-
-There are many use cases for CEF. You can embed a web browser control
-based on Chromium with great HTML 5 support. You can use it to create
-a HTML 5 based GUI in an application, this can act as a replacement for
-standard GUI toolkits such as wxWidgets, Qt or GTK. In such case to
-communicate between Python<>Javascript use [javascript bindings](docs/Tutorial.md#javascript-integration)
-or embed an internal web server and talk using http requests. You
-can render web content off-screen in applications that use custom
-drawing frameworks. You can use it for automated testing of existing
-applications. You can use it for web scraping or as a web crawler,
-or other kind of internet bots.
+installed around the world. There are numerous use cases for CEF:
+1. Use it as a modern HTML5 based rendering engine that can act as a replacement
+   for classic desktop GUI frameworks. Think of it as Electron for Python.
+2. Embed a web browser widget in a classic Qt / GTK / wxPython desktop
+application
+3. Render web content off-screen in applications that use custom drawing frameworks
+4. Use it for automated testing of web applications with more advanced capabilities
+   than Selenium web browser automation due to
+   CEF low level programming APIs
+5. Use it for web scraping, as a web crawler or other kind of internet bots
+
+CEF Python also provides examples of embedding CEF for many Python GUI
+frameworks such as PyQt, wxPython, PyGTK, PyGObject, Tkinter, Kivy, Panda3D,
+PyGame, PyOpenGL, PyWin32, PySide and PySDL2.
 
 
 ## Sponsors
 
-<table>
- <tr>
-  <td>
-   <div align="center">
-    <a href="https://www.fivestars.com/">
-     <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/fivestars200.png">
-    </a><br>
-    <a href="https://www.fivestars.com/">www.fivestars.com</a>
-   </div>
-  </td>
-  <td>
-   <div align="center">
-    <a href="https://lampix.com/">
-     <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/lampix200.png">
-    </a><br>
-    <a href="https://lampix.com/">www.lampix.com</a>
-   </div>
-  </td>
-  <td>
-   <div align="center">
-    <a href="http://www.blueplanet.com/">
-     <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/cyan.png">
-    </a><br>
-    <a href="http://www.blueplanet.com/">www.blueplanet.com</a>
-   </div>
-  </td>
- </tr>
- <tr>
-  <td>
-   <div align="center">
-    <a href="https://clearchat.com/">
-     <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/clearchat.png">
-    </a><br>
-    <a href="https://clearchat.com/">www.clearchat.com</a>
-   <div align="center">
-  </td>
-  <td>
-   <div align="center">
-    <a href="http://www.rentouch.ch/">
-     <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/rentouch.png">
-    </a><br>
-    <a href="http://www.rentouch.ch/">www.rentouch.ch</a>
-   </div>
-  </td>
-  <td>
-   <div align="center">
-    <a href="https://www.jetbrains.com/pycharm/">
-     <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/pycharm.png">
-    </a><br>
-    <a href="https://www.jetbrains.com/pycharm/">www.jetbrains.com</a>
-   </div>
-  </td>
- <tr>
-</table>
-
-See the [Support development](#support-development) section for a list of
-all the individuals and companies supporting CEF Python.
+<table border="0"><tr>
+<td width="50%" valign="top">
 
+<p align="center">
+ <a href="https://lampix.com/">
+  <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/lampix360.png">
+ </a>
+</p>
 
-**Thanks to Lampix for the v66 release**
-
-Many Thanks to Lampix for sponsoring the [v66 release](../../releases/tag/v66.0) of CEF Python.
+Many Thanks to Lampix for sponsoring the [v66 release](../../releases/tag/v66.0).
 Lampix is the first hardware and software solution that turns any surface
-into a smart, augmented reality or interactive surface. Please visit its
-website here: https://lampix.com/ .
+into a smart, augmented reality or interactive surface. Please visit their website:
+<a href="https://lampix.com/">Lampix.com</a>
+
+</td><td width="50%" valign="top">
 
+<p align="center">
+ <a href="https://www.fivestars.com/">
+  <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/fivestars360.png">
+ </a>
+</p>
 
-**Thanks to Fivestars for the v49 release (WinXP/Vista)**
+Many thanks to Fivestars for sponsoring the
+[v49 legacy release](../../releases/tag/v49.0). Fivestars helps local
+communities thrive by empowering small
+businesses with cutting edge marketing technology. Please visit their website:
+<a href="https://www.fivestars.com/">Fivestars.com</a>
 
-Thanks to Fivestars Loyalty, Inc. for sponsoring the
-[v49 release](../../releases/tag/v49.0) for legacy systems such
-as Windows XP and Vista. Please visit its website:
-https://www.fivestars.com/ .
+</tr></table>
 
 
 ## Install
@@ -169,55 +127,6 @@ document.
 - Wiki pages are deprecated and for v31 only
 
 
-## Support development
-
-If you would like to support general CEF Python development efforts
-by making a donation please click the Paypal Donate button:
-
-<a href='https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=V7LU7PD4N4GGG'>
-<img src='https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/donate.gif' />
-</a><br><br>
-
-If you would like to see some feature implemented you can make
-a comment about that when making a donation. It will give it
-a higher priority.
-
-If you are interested in sponsorship opportunities please contact Czarek
-directly - contact details are available in his [Resume](https://drive.google.com/file/d/17xmoT5Z_zTHkVclqPzrs2aAV64Uiu7fh/view).
-
-If you would like to sponsor CEF Python development efforts and see your company
-logo with a link in README, please contact Czarek.
-This README page alone has 1,070 visitors and 2,402 views every two weeks,
-so your company logo and a website link will be visible to many Python developers.
-The statistics are from Mar 9, 2018. Complete statistics are available in this topic
-on the Forum: [[ANN] Call for sponsors](https://groups.google.com/d/topic/cefpython/CjkZF2P4rMk/discussion).
-
-
-### Thanks
-
-* [2018] Thanks to [Fivestars](https://www.fivestars.com/) for sponsoring
-  the v49 release for legacy systems (WinXP/Vista)
-* [2018] Many thanks to [Lampix](https://lampix.com/) for sponsoring the v66
-  release for all platforms
-* [2017] Many thanks to [ClearChat Inc.](https://clearchat.com/) for sponsoring
-  the v55/v56 releases for all platforms
-* [2016-2018] Thanks to JetBrains for providing an Open Source license for
-  [PyCharm](https://www.jetbrains.com/pycharm/)
-* [2014] Thanks to Adam Duston for donating a Macbook to aid the development
-  of Mac port
-* [2013-2015] Lots of thanks goes to [Cyan Inc.](http://www.blueplanet.com/)
-  for sponsoring this project for a long time, making CEF Python 3 mature
-* [2013] Thanks to [Rentouch GmbH](http://www.rentouch.ch/) for sponsoring the
-  development of the off-screen rendering support
-* [2013] Thanks to Thomas Wusatiuk for sponsoring the development of the web
-  response reading features
-* [2012-2018] Thanks to those who have made a Paypal donation:
-  [Rentouch GmbH](http://www.rentouch.ch/), Walter Purvis, Rokas Stupuras,
-  Alex Rattray, Greg Kacy, Paul Korzhyk, Tomasz Tomanek.
-* [2012-2017] Thanks to those who have donated their time through code contributions,
-  they are listed in the [Authors](Authors) file
-
-
 ## Releases
 
 Information on planned new and current releases, supported platforms,
@@ -286,6 +195,128 @@ Additional information for v31.2 release:
 - API reference is available in revision [169a1b2](../../tree/169a1b20d3cd09879070d41aab28cfa195d2a7d5/docs/api)
 
 
+## Support development
+
+If you would like to support general CEF Python development efforts
+by making a donation then please click the Paypal Donate button below.
+If you would like to see a specific feature implemented then you can make
+a comment about that when making a donation and that will give it a higher
+priority.
+
+<a href='https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=V7LU7PD4N4GGG'>
+<img src='https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/donate.gif' />
+</a><br><br>
+
+### Thanks to sponsors
+
+<table>
+ <tr>
+  <td>
+   <div align="center">
+    <a href="https://www.fivestars.com/">
+     <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/fivestars200.png">
+    </a><br>
+    <a href="https://www.fivestars.com/">www.fivestars.com</a>
+   </div>
+  </td>
+  <td>
+   <div align="center">
+    <a href="https://lampix.com/">
+     <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/lampix200.png">
+    </a><br>
+    <a href="https://lampix.com/">www.lampix.com</a>
+   </div>
+  </td>
+  <td>
+   <div align="center">
+    <a href="http://www.blueplanet.com/">
+     <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/cyan.png">
+    </a><br>
+    <a href="http://www.blueplanet.com/">www.blueplanet.com</a>
+   </div>
+  </td>
+ </tr>
+ <tr>
+  <td>
+   <div align="center">
+    <a href="https://clearchat.com/">
+     <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/clearchat.png">
+    </a><br>
+    <a href="https://clearchat.com/">www.clearchat.com</a>
+   <div align="center">
+  </td>
+  <td>
+   <div align="center">
+    <a href="http://www.rentouch.ch/">
+     <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/rentouch.png">
+    </a><br>
+    <a href="http://www.rentouch.ch/">www.rentouch.ch</a>
+   </div>
+  </td>
+  <td>
+   <div align="center">
+    <a href="https://www.jetbrains.com/pycharm/">
+     <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/pycharm.png">
+    </a><br>
+    <a href="https://www.jetbrains.com/pycharm/">www.jetbrains.com</a>
+   </div>
+  </td>
+ <tr>
+</table>
+
+
+### Thanks to all
+
+* [2018] Thanks to [Fivestars](https://www.fivestars.com/) for sponsoring
+  the v49 release for legacy systems (WinXP/Vista)
+* [2018] Many thanks to [Lampix](https://lampix.com/) for sponsoring the v66
+  release for all platforms
+* [2017] Many thanks to [ClearChat Inc.](https://clearchat.com/) for sponsoring
+  the v55/v56 releases for all platforms
+* [2016-2018] Thanks to JetBrains for providing an Open Source license for
+  [PyCharm](https://www.jetbrains.com/pycharm/)
+* [2014] Thanks to Adam Duston for donating a Macbook to aid the development
+  of Mac port
+* [2013-2015] Lots of thanks goes to [Cyan Inc.](http://www.blueplanet.com/)
+  for sponsoring this project for a long time, making CEF Python 3 mature
+* [2013] Thanks to [Rentouch GmbH](http://www.rentouch.ch/) for sponsoring the
+  development of the off-screen rendering support
+* [2013] Thanks to Thomas Wusatiuk for sponsoring the development of the web
+  response reading features
+* [2012-2018] Thanks to those who have made a Paypal donation:
+  [Rentouch GmbH](http://www.rentouch.ch/), Walter Purvis, Rokas Stupuras,
+  Alex Rattray, Greg Kacy, Paul Korzhyk, Tomasz Tomanek.
+* [2012-2017] Thanks to those who have donated their time through code
+  contributions, they are listed in the [Authors](Authors) file
+
+
+## Seeking new sponsors
+
+CEF Python is seeking companies to sponsor further development of the project.
+There are many proposals for new features submitted in the issue tracker. Most
+notable are:
+
+* Monthly releases with latest Chromium
+* An automated build system similar to upstream CEF Spotify Automated Builds
+* ARM and Android support
+* Multi-threaded support for increased performance
+* Proprietary codecs support in build tools: H264, H265,AC3, EAC3, MPEG-4
+* More CEF API exposed, only about 50% is exposed so far
+* Hundreds of new settings and Chromium preferences not yet exposed
+* Easier integration with popular GUI toolkits in just a few lines of code
+  and support for more third party GUI frameworks
+* More examples of implementing various advanced features and more snippets
+  as well
+
+If your company would like to sponsor CEF Python development efforts then
+please contact
+[Czarek](https://drive.google.com/file/d/17xmoT5Z_zTHkVclqPzrs2aAV64Uiu7fh/view).
+Long term sponsorships are welcome and Czarek is open to ideas about
+the project. He would love to spend more time on developing this project,
+but he can't afford doing so in his free time. Currently there is no company
+supporting this project actively on a daily basis.
+
+
 ## Other READMEs
 
 - [PyInstaller packager](examples/pyinstaller/README-pyinstaller.md)
diff --git a/api/Browser.md b/api/Browser.md
index 0d9c32e3..c3bd4def 100644
--- a/api/Browser.md
+++ b/api/Browser.md
@@ -3,6 +3,9 @@
 
 # Browser (object)
 
+The methods of this object may be called on any thread unless otherwise
+indicated in the comments.
+
 Remember to free all browser references when closing app
 for the browser to shut down cleanly.
 Otherwise data such as cookies or other storage might not be flushed to disk

From c66bc7be0f3872354ca9b25b185fd65794229ebb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Kierski?= <pkierski@gmail.com>
Date: Tue, 12 Feb 2019 15:50:52 +0100
Subject: [PATCH 183/238] Support for Darwin in pyinstaller (#502)

---
 examples/pyinstaller/hook-cefpython3.py | 100 +++++++++++++++---------
 examples/pyinstaller/pyinstaller.py     |   6 +-
 2 files changed, 68 insertions(+), 38 deletions(-)

diff --git a/examples/pyinstaller/hook-cefpython3.py b/examples/pyinstaller/hook-cefpython3.py
index d30a2308..a0da7156 100644
--- a/examples/pyinstaller/hook-cefpython3.py
+++ b/examples/pyinstaller/hook-cefpython3.py
@@ -1,6 +1,6 @@
 """
 This is PyInstaller hook file for CEF Python. This file
-helps pyinstaller find CEF Python dependencies that are
+helps PyInstaller find CEF Python dependencies that are
 required to run final executable.
 
 See PyInstaller docs for hooks:
@@ -13,7 +13,8 @@
 import re
 import sys
 import PyInstaller
-from PyInstaller.utils.hooks import is_module_satisfies
+from PyInstaller.utils.hooks import is_module_satisfies, get_package_paths
+from PyInstaller.compat import is_win, is_darwin, is_linux, is_py2
 from PyInstaller import log as logging
 
 # Constants
@@ -24,14 +25,10 @@
 # TODO: use this code to work cross-platform:
 # > from PyInstaller.utils.hooks import get_package_paths
 # > get_package_paths("cefpython3")
-CEFPYTHON3_DIR = os.path.join(
-    os.path.dirname(sys.executable),
-    'Lib', 'site-packages', 'cefpython3')
 
-if platform.system() == "Windows":
-    CYTHON_MODULE_EXT = ".pyd"
-else:
-    CYTHON_MODULE_EXT = ".so"
+CEFPYTHON3_DIR = get_package_paths("cefpython3")[1]
+
+CYTHON_MODULE_EXT = ".pyd" if is_win else ".so"
 
 # Globals
 logger = logging.getLogger(__name__)
@@ -39,9 +36,9 @@
 
 # Functions
 def check_platforms():
-    if platform.system() != "Windows":
-        raise SystemExit("Error: Currently only Windows platform is "
-                         " supported, see Issue #135.")
+    if not is_win and not is_darwin:
+        raise SystemExit("Error: Currently only Windows and Darwin "
+                         "platforms are  supported, see Issue #135.")
 
 
 def check_pyinstaller_version():
@@ -51,7 +48,7 @@ def check_pyinstaller_version():
     # Example version string for dev version of pyinstaller:
     # > 3.3.dev0+g5dc9557c
     version = PyInstaller.__version__
-    match = re.search(r"^\d+\.\d+", version)
+    match = re.search(r"^\d+\.\d+(\.\d+)?", version)
     if not (match.group(0) >= PYINSTALLER_MIN_VERSION):
         raise SystemExit("Error: pyinstaller %s or higher is required"
                          % PYINSTALLER_MIN_VERSION)
@@ -97,8 +94,8 @@ def get_excluded_cefpython_modules():
 
 
 def get_cefpython3_datas():
-    """Returning all cefpython binaries as DATAS, because
-    pyinstaller does strange things and fails if these are
+    """Returning almost all of cefpython binaries as DATAS (see exception
+    below), because pyinstaller does strange things and fails if these are
     returned as BINARIES. It first updates manifest in .dll files:
     >> Updating manifest in chrome_elf.dll
 
@@ -114,32 +111,61 @@ def get_cefpython3_datas():
     as pyinstaller would fail to find binary depdendencies on
     these files.
 
+    One exception is subprocess (subprocess.exe on Windows) executable
+    file, which is passed to pyinstaller as BINARIES in order to collect
+    its dependecies.
+
     DATAS are in format: tuple(full_path, dest_subdir).
     """
     ret = list()
 
+    if is_win:
+        cefdatadir = "."
+    elif is_darwin:
+        cefdatadir = "."
+    else:
+        assert False, "Unsupported system {}".format(platform.system())
+
     # Binaries, licenses and readmes in the cefpython3/ directory
     for filename in os.listdir(CEFPYTHON3_DIR):
         # Ignore Cython modules which are already handled by
         # pyinstaller automatically.
-        if filename[:-4] in get_cefpython_modules():
+        if filename[:-len(CYTHON_MODULE_EXT)] in get_cefpython_modules():
             continue
+
         # CEF binaries and datas
-        if filename[-4:] in [".exe", ".dll", ".so", ".pak", ".dat", ".bin",
-                             ".txt"]\
-                or filename in ["License", "subprocess"]:
-            logger.info("Include cefpython3 data: %s" % filename)
-            ret.append((os.path.join(CEFPYTHON3_DIR, filename),
-                        ""))
-
-    # The .pak files in cefpython3/locales/ directory
-    locales_dir = os.path.join(CEFPYTHON3_DIR, "locales")
-    assert os.path.exists(locales_dir), "locales/ dir not found in cefpython3"
-    for filename in os.listdir(locales_dir):
-        logger.info("Include cefpython3 data: %s/%s" % (
-            os.path.basename(locales_dir), filename))
-        ret.append((os.path.join(locales_dir, filename),
-                    "locales"))
+        extension = os.path.splitext(filename)[1]
+        if extension in \
+            [".exe", ".dll", ".pak", ".dat", ".bin", ".txt", ".so", ".plist"] \
+                or filename.lower().startswith("license"):
+            logger.info("Include cefpython3 data: {}".format(filename))
+            ret.append((os.path.join(CEFPYTHON3_DIR, filename), cefdatadir))
+
+    if is_darwin:
+        # "Chromium Embedded Framework.framework/Resources" with subdirectories
+        # is required. Contain .pak files and locales (each locale in separate
+        # subdirectory).
+        resources_subdir = \
+            os.path.join("Chromium Embedded Framework.framework", "Resources")
+        base_path = os.path.join(CEFPYTHON3_DIR, resources_subdir)
+        assert os.path.exists(base_path), \
+            "{} dir not found in cefpython3".format(resources_subdir)
+        for path, dirs, files in os.walk(base_path):
+            for file in files:
+                absolute_file_path = os.path.join(path, file)
+                dest_path = os.path.relpath(path, CEFPYTHON3_DIR)
+                ret.append((absolute_file_path, dest_path))
+                logger.info("Include cefpython3 data: {}".format(dest_path))
+    elif is_win:
+        # The .pak files in cefpython3/locales/ directory
+        locales_dir = os.path.join(CEFPYTHON3_DIR, "locales")
+        assert os.path.exists(locales_dir), \
+            "locales/ dir not found in cefpython3"
+        for filename in os.listdir(locales_dir):
+            logger.info("Include cefpython3 data: {}/{}".format(
+                os.path.basename(locales_dir), filename))
+            ret.append((os.path.join(locales_dir, filename),
+                        os.path.join(cefdatadir, "locales")))
     return ret
 
 
@@ -162,7 +188,6 @@ def get_cefpython3_datas():
 # TODO: Write a tool script that would find such imports in
 #       .pyx files automatically.
 hiddenimports = [
-    "base64",
     "codecs",
     "copy",
     "datetime",
@@ -179,7 +204,7 @@ def get_cefpython3_datas():
     "urllib",
     "weakref",
 ]
-if sys.version_info.major == 2:
+if is_py2:
     hiddenimports += [
         "urlparse",
     ]
@@ -187,8 +212,13 @@ def get_cefpython3_datas():
 # Excluded modules
 excludedimports = get_excluded_cefpython_modules()
 
-# Include binaries
-binaries = []
+# Include binaries requiring to collect its dependencies
+if is_darwin:
+    binaries = [(os.path.join(CEFPYTHON3_DIR, "subprocess"), ".")]
+elif is_win:
+    binaries = [(os.path.join(CEFPYTHON3_DIR, "subprocess.exe"), ".")]
+else:
+    binaries = []
 
 # Include datas
 datas = get_cefpython3_datas()
diff --git a/examples/pyinstaller/pyinstaller.py b/examples/pyinstaller/pyinstaller.py
index aedc3669..d9433aa1 100644
--- a/examples/pyinstaller/pyinstaller.py
+++ b/examples/pyinstaller/pyinstaller.py
@@ -29,9 +29,9 @@
 
 def main():
     # Platforms supported
-    if platform.system() != "Windows":
-        raise SystemExit("Error: Only Windows platform is currently "
-                         "supported. See Issue #135 for details.")
+    if platform.system() not in ["Windows", "Darwin"]:
+        raise SystemExit("Error: Only Windows and Darwin platforms are "
+                         "currently supported. See Issue #135 for details.")
 
     # Make sure nothing is cached from previous build.
     # Delete the build/ and dist/ directories.

From 15102ee8fbace01ecab329214a6ec215c256b603 Mon Sep 17 00:00:00 2001
From: nobodyguy <4577368+nobodyguy@users.noreply.github.com>
Date: Mon, 15 Apr 2019 13:37:32 +0200
Subject: [PATCH 184/238] Linux support in PyInstaller example (#522)

---
 examples/pyinstaller/README-pyinstaller.md |  6 ++----
 examples/pyinstaller/hook-cefpython3.py    | 19 ++++++++++++++-----
 examples/pyinstaller/pyinstaller.py        |  6 ++++--
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/examples/pyinstaller/README-pyinstaller.md b/examples/pyinstaller/README-pyinstaller.md
index caf3ff81..f148bbce 100644
--- a/examples/pyinstaller/README-pyinstaller.md
+++ b/examples/pyinstaller/README-pyinstaller.md
@@ -12,10 +12,8 @@ Table of contents:
 
 This is an example of using [PyInstaller](http://www.pyinstaller.org/)
 packager to build executable from one of CEF Python's examples
-(wxpython.py). Although this pyinstaller example supports only packaging
-on Windows, CEF can be packaged on all platforms without problems, but
-this specific packaging example just wasn't tested on other platforms.
-Pull requests are welcome.
+(wxpython.py). This pyinstaller example supports packaging
+on Windows, Linux and Darwin but was mainly tested on Windows platform.
 
 To install required packages type:
 ```
diff --git a/examples/pyinstaller/hook-cefpython3.py b/examples/pyinstaller/hook-cefpython3.py
index a0da7156..7522b7be 100644
--- a/examples/pyinstaller/hook-cefpython3.py
+++ b/examples/pyinstaller/hook-cefpython3.py
@@ -36,8 +36,8 @@
 
 # Functions
 def check_platforms():
-    if not is_win and not is_darwin:
-        raise SystemExit("Error: Currently only Windows and Darwin "
+    if not is_win and not is_darwin and not is_linux:
+        raise SystemExit("Error: Currently only Windows, Linux and Darwin "
                          "platforms are  supported, see Issue #135.")
 
 
@@ -121,7 +121,7 @@ def get_cefpython3_datas():
 
     if is_win:
         cefdatadir = "."
-    elif is_darwin:
+    elif is_darwin or is_linux:
         cefdatadir = "."
     else:
         assert False, "Unsupported system {}".format(platform.system())
@@ -156,7 +156,7 @@ def get_cefpython3_datas():
                 dest_path = os.path.relpath(path, CEFPYTHON3_DIR)
                 ret.append((absolute_file_path, dest_path))
                 logger.info("Include cefpython3 data: {}".format(dest_path))
-    elif is_win:
+    elif is_win or is_linux:
         # The .pak files in cefpython3/locales/ directory
         locales_dir = os.path.join(CEFPYTHON3_DIR, "locales")
         assert os.path.exists(locales_dir), \
@@ -166,6 +166,15 @@ def get_cefpython3_datas():
                 os.path.basename(locales_dir), filename))
             ret.append((os.path.join(locales_dir, filename),
                         os.path.join(cefdatadir, "locales")))
+
+        # Optional .so/.dll files in cefpython3/swiftshader/ directory
+        swiftshader_dir = os.path.join(CEFPYTHON3_DIR, "swiftshader")
+        if os.path.isdir(swiftshader_dir):
+            for filename in os.listdir(swiftshader_dir):
+                logger.info("Include cefpython3 data: {}/{}".format(
+                    os.path.basename(swiftshader_dir), filename))
+                ret.append((os.path.join(swiftshader_dir, filename),
+                            os.path.join(cefdatadir, "swiftshader")))
     return ret
 
 
@@ -213,7 +222,7 @@ def get_cefpython3_datas():
 excludedimports = get_excluded_cefpython_modules()
 
 # Include binaries requiring to collect its dependencies
-if is_darwin:
+if is_darwin or is_linux:
     binaries = [(os.path.join(CEFPYTHON3_DIR, "subprocess"), ".")]
 elif is_win:
     binaries = [(os.path.join(CEFPYTHON3_DIR, "subprocess.exe"), ".")]
diff --git a/examples/pyinstaller/pyinstaller.py b/examples/pyinstaller/pyinstaller.py
index d9433aa1..67bb8934 100644
--- a/examples/pyinstaller/pyinstaller.py
+++ b/examples/pyinstaller/pyinstaller.py
@@ -25,12 +25,14 @@
     EXE_EXT = ".exe"
 elif platform.system() == "Darwin":
     EXE_EXT = ".app"
+elif platform.system() == "Linux":
+    EXE_EXT = ""
 
 
 def main():
     # Platforms supported
-    if platform.system() not in ["Windows", "Darwin"]:
-        raise SystemExit("Error: Only Windows and Darwin platforms are "
+    if platform.system() not in ["Windows", "Darwin", "Linux"]:
+        raise SystemExit("Error: Only Windows, Linux and Darwin platforms are "
                          "currently supported. See Issue #135 for details.")
 
     # Make sure nothing is cached from previous build.

From df6c0caa778ee5f8075a4bbd50cdc0cf2bf0ae1b Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Wed, 8 May 2019 13:42:03 +0200
Subject: [PATCH 185/238] Update README, Authors and GitHub templates

---
 .github/CONTRIBUTING.md   |  9 ++-----
 .github/ISSUE_TEMPLATE.md | 10 ++------
 Authors                   | 31 +++++++++++++----------
 README.md                 | 53 ++++++++++++++++++++++-----------------
 4 files changed, 52 insertions(+), 51 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index dcb75da2..d2f0143f 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -1,7 +1,2 @@
-Please do not create Issues. Issues must first be discussed
-and confirmed on the Forum. Report issues on the Forum here:
-
-https://goo.gl/xz4cEF
-
-Please do not ask questions in existing issues. Ask questions
-on the Forum, link above.
+Questions should be asked on the forum:
+https://groups.google.com/group/cefpython
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 2bf4f13a..d2f0143f 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,8 +1,2 @@
-Please do not create Issues using this form. Issues must
-first be discussed and confirmed on the Forum. Report issues
-on the Forum here:
-
-https://goo.gl/xz4cEF
-
-Please do not ask questions in existing issues. Ask questions
-on the Forum, link above.
+Questions should be asked on the forum:
+https://groups.google.com/group/cefpython
diff --git a/Authors b/Authors
index 827d05cc..b4c55d20 100644
--- a/Authors
+++ b/Authors
@@ -1,16 +1,21 @@
 Core developers:
-Czarek Tomczak <czarek.tomczak2@@gmail.com>
+    Czarek Tomczak <czarek.tomczak2@@gmail.com>
 
 Contributors:
-老农 cjjer <cjjer@@59490.com>
-Richard Rodriguez <rich770@@gmail.com>
-Roman Plášil <me@@rplasil.name>
-Rokas Stupuras <roxaz911@@gmail.com>
-Greg Kacy <grkacy@@gmail.com>
-Thomas Dähling <thomas@@ccpgames.com>
-Dominique Burnand <dominique.burnand@@rentouch.ch>
-Greg Farrell <gregfarrell.org@@gmail.com>
-Finn Hughes <finn.hughes1@@gmail.com>
-Marcelo Fernandez <fernandezm@@gmail.com>
-Simon Hatt <9hatt2@@gmail.com>
-Neil Munday <www.mundayweb.com>
+    老农 cjjer <cjjer@@59490.com>
+    Richard Rodriguez <rich770@@gmail.com>
+    Roman Plášil <me@@rplasil.name>
+    Rokas Stupuras <roxaz911@@gmail.com>
+    Greg Kacy <grkacy@@gmail.com>
+    Thomas Dähling <thomas@@ccpgames.com>
+    Dominique Burnand <dominique.burnand@@rentouch.ch>
+    Greg Farrell <gregfarrell.org@@gmail.com>
+    Finn Hughes <finn.hughes1@@gmail.com>
+    Marcelo Fernandez <fernandezm@@gmail.com>
+    Simon Hatt <9hatt2@@gmail.com>
+    Neil Munday <www.mundayweb.com>
+    Joseph Kogut <https://github.com/jakogut>
+    Paweł Kierski <https://github.com/pkierski>
+    Dónal McMullan <https://github.com/donalm>
+    nobodyguy <https://github.com/nobodyguy>
+    Elliot Woods <https://github.com/elliotwoods>
diff --git a/README.md b/README.md
index 76feedd1..24370549 100644
--- a/README.md
+++ b/README.md
@@ -22,21 +22,26 @@ Table of contents:
 
 ## Introduction
 
-CEF Python is an open source project founded by [Czarek Tomczak](https://drive.google.com/file/d/17xmoT5Z_zTHkVclqPzrs2aAV64Uiu7fh/view)
-(available for contract work) in 2012 to provide Python bindings for the
-[Chromium Embedded Framework](https://bitbucket.org/chromiumembedded/cef) (CEF). The Chromium project focuses mainly on Google Chrome application
+CEF Python is an open source project founded by
+[Czarek Tomczak](https://drive.google.com/file/d/17xmoT5Z_zTHkVclqPzrs2aAV64Uiu7fh/view)
+in 2012 to provide Python bindings for the
+[Chromium Embedded Framework](https://bitbucket.org/chromiumembedded/cef) (CEF).
+The Chromium project focuses mainly on Google Chrome application
 development while CEF focuses on facilitating embedded browser use cases
 in third-party applications. Lots of applications use CEF control, there are
 more than [100 million CEF instances](http://en.wikipedia.org/wiki/Chromium_Embedded_Framework#Applications_using_CEF)
 installed around the world. There are numerous use cases for CEF:
-1. Use it as a modern HTML5 based rendering engine that can act as a replacement
-   for classic desktop GUI frameworks. Think of it as Electron for Python.
+
+1. Use it as a modern HTML5 based rendering engine that can act as
+   a replacement for classic desktop GUI frameworks. Think of it as Electron
+   for Python.
 2. Embed a web browser widget in a classic Qt / GTK / wxPython desktop
-application
-3. Render web content off-screen in applications that use custom drawing frameworks
-4. Use it for automated testing of web applications with more advanced capabilities
-   than Selenium web browser automation due to
-   CEF low level programming APIs
+   application
+3. Render web content off-screen in applications that use custom drawing
+   frameworks
+4. Use it for automated testing of web applications with more advanced
+   capabilities than Selenium web browser automation due to CEF low level
+   programming APIs
 5. Use it for web scraping, as a web crawler or other kind of internet bots
 
 CEF Python also provides examples of embedding CEF for many Python GUI
@@ -55,9 +60,10 @@ PyGame, PyOpenGL, PyWin32, PySide and PySDL2.
  </a>
 </p>
 
-Many Thanks to Lampix for sponsoring the [v66 release](../../releases/tag/v66.0).
-Lampix is the first hardware and software solution that turns any surface
-into a smart, augmented reality or interactive surface. Please visit their website:
+Many Thanks to Lampix for sponsoring the
+[v66 release](../../releases/tag/v66.0). Lampix is the first hardware
+and software solution that turns any surface into a smart, augmented reality
+or interactive surface. Please visit their website:
 <a href="https://lampix.com/">Lampix.com</a>
 
 </td><td width="50%" valign="top">
@@ -96,17 +102,16 @@ See the [Tutorial.md](docs/Tutorial.md) document.
 
 ## Examples
 
-See the [README-examples.md](examples/README-examples.md) document.
-
-For small and easy to understand code snippets that show various CEF
-features see the [README-snippets.md](examples/snippets/README-snippets.md)
-document.
+See the [README-examples.md](examples/README-examples.md) and
+[README-snippets.md](examples/snippets/README-snippets.md) documents.
 
 
 ## Support
 
-- Ask questions, report problems and issues on the [Forum](https://groups.google.com/group/cefpython)
-- Supported examples are listed in the [README-examples.md](examples/README-examples.md) file
+- Ask questions and report problems on the
+  [Forum](https://groups.google.com/group/cefpython)
+- Supported examples are listed in the
+  [README-examples.md](examples/README-examples.md) file
 - Documentation is in the [docs/](docs) directory:
   - [Build instructions](docs/Build-instructions.md)
   - [Contributing code](docs/Contributing-code.md)
@@ -116,12 +121,14 @@ document.
 - API reference is in the [api/](api) directory:
   - [API categories](api/API-categories.md#api-categories)
   - [API index](api/API-index.md#api-index)
-- Additional documentation is available in [Issues labelled Knowledge Base](../../issues?q=is%3Aissue+is%3Aopen+label%3A%22Knowledge+Base%22)
+- Additional documentation is available in
+  [Issues labelled Knowledge Base](../../issues?q=is%3Aissue+is%3Aopen+label%3A%22Knowledge+Base%22)
 - To search documentation use GitHub "This repository" search
   at the top. To narrow results to documentation only select
   "Markdown" in the right pane.
-- You can vote on issues in the tracker to let us know which issues are important to you.
-  To do that add a +1 thumb up reaction to the first post in the issue. See
+- You can vote on issues in the tracker to let us know which issues are
+  important to you. To do that add a +1 thumb up reaction to the first post
+  in the issue. See
   [Most popular issues](../../issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc)
   sorted by reactions.
 - Wiki pages are deprecated and for v31 only

From 322c6a87850aa1d632e484517782b602592b8457 Mon Sep 17 00:00:00 2001
From: Czarek Tomczak <cztomczak@users.noreply.github.com>
Date: Thu, 4 Jul 2019 20:56:24 +0200
Subject: [PATCH 186/238] Create FUNDING.yml

---
 .github/FUNDING.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 00000000..c5663b05
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: ['https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=V7LU7PD4N4GGG'] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

From 8cede99ae7aab145b75235c9f13722e3c6d7c46d Mon Sep 17 00:00:00 2001
From: Czarek Tomczak <cztomczak@users.noreply.github.com>
Date: Thu, 18 Jul 2019 07:27:57 +0200
Subject: [PATCH 187/238] Hire the author of CEF Python!

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 24370549..92a7f2e6 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ Table of contents:
 
 CEF Python is an open source project founded by
 [Czarek Tomczak](https://drive.google.com/file/d/17xmoT5Z_zTHkVclqPzrs2aAV64Uiu7fh/view)
-in 2012 to provide Python bindings for the
+(hire me!) in 2012 to provide Python bindings for the
 [Chromium Embedded Framework](https://bitbucket.org/chromiumembedded/cef) (CEF).
 The Chromium project focuses mainly on Google Chrome application
 development while CEF focuses on facilitating embedded browser use cases

From 6056f232c89a183e51ae5ac3d081f0d0acba1ba9 Mon Sep 17 00:00:00 2001
From: Christopher Pezley <github@pezley.net>
Date: Tue, 5 Nov 2019 22:47:30 +0100
Subject: [PATCH 188/238] Make pysdl2 example python 3 compatible. (#543)

---
 examples/pysdl2.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/pysdl2.py b/examples/pysdl2.py
index 74bc5423..7b086459 100644
--- a/examples/pysdl2.py
+++ b/examples/pysdl2.py
@@ -169,7 +169,7 @@ def main():
     logging.debug("SDL2 initialised")
     # Create the window
     window = sdl2.video.SDL_CreateWindow(
-        'cefpython3 SDL2 Demo',
+        b'cefpython3 SDL2 Demo',
         sdl2.video.SDL_WINDOWPOS_UNDEFINED,
         sdl2.video.SDL_WINDOWPOS_UNDEFINED,
         width,
@@ -382,7 +382,7 @@ def main():
         # regulate frame rate
         if sdl2.timer.SDL_GetTicks() - startTime < 1000.0 / frameRate:
             sdl2.timer.SDL_Delay(
-                (1000 / frameRate) - (sdl2.timer.SDL_GetTicks() - startTime)
+                (1000 // frameRate) - (sdl2.timer.SDL_GetTicks() - startTime)
             )
     # User exited
     exit_app()

From ed4e67cae15506f8477fd8764a97b557c08527d3 Mon Sep 17 00:00:00 2001
From: Christopher Pezley <github@pezley.net>
Date: Tue, 19 Nov 2019 08:30:52 +0100
Subject: [PATCH 189/238] Fix sdl2 example on mac (#544)

* Fix pysdl2 example window state on MacOS, where initializing cefpython in windowed mode causes the application to not show up in the command-tab menu, and to not properly process mouse and keypress events.

* Fix pysdl2 example not properly processing backspace and arrow keys on MacOS.
---
 examples/pysdl2.py | 62 +++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 59 insertions(+), 3 deletions(-)

diff --git a/examples/pysdl2.py b/examples/pysdl2.py
index 7b086459..97f9293d 100644
--- a/examples/pysdl2.py
+++ b/examples/pysdl2.py
@@ -38,7 +38,6 @@
 - Performance is still not perfect, see Issue #324 for further details
 - Keyboard modifiers that are not yet handled in this example:
   ctrl, marking text inputs with the shift key.
-- Backspace key doesn't work on Mac
 - Dragging with mouse not implemented
 - Window size is fixed, cannot be resized
 
@@ -96,7 +95,19 @@ def die(msg):
         "       To install type: pip install Pillow")
 
 
+if sys.platform == 'darwin':
+    try:
+        import AppKit
+    except ImportError:
+        die("ERROR: pyobjc package not found\n"
+            "       To install type: pip install pyobjc")
+
+
 def main():
+    """
+    Parses input, initializes everything and then runs the main loop of the
+    program, which handles input and draws the scene.
+    """
     parser = argparse.ArgumentParser(
         description='PySDL2 / cefpython example',
         add_help=True
@@ -159,6 +170,14 @@ def main():
     }
     cef.Initialize(settings={"windowless_rendering_enabled": True},
                    switches=switches)
+
+    if sys.platform == 'darwin':
+        # On MacOS, the NSApplication created in the cefpython initialization
+        # will be hidden if windowless is specified. In order for SDL to receive
+        # propper input events and for the application to show up in the
+        # command-tab list, the application must be made "regular".
+        AppKit.NSApplication.sharedApplication().setActivationPolicy_(
+            AppKit.NSApplicationActivationPolicyRegular)
     logging.debug("cef initialised")
     window_info = cef.WindowInfo()
     window_info.SetAsOffscreen(0)
@@ -207,6 +226,7 @@ def main():
     # viewport size is available and that OnPaint may be called.
     browser.SendFocusEvent(True)
     browser.WasResized()
+
     # Begin the main rendering loop
     running = True
     # FPS debug variables
@@ -324,8 +344,11 @@ def main():
                         key_event = {
                             "type": cef.KEYEVENT_RAWKEYDOWN,
                             "windows_key_code": keycode,
-                            "character": keycode,
-                            "unmodified_character": keycode,
+                            "native_key_code": get_native_key(keycode),
+                            # For raw key events, the character and unmodified
+                            # character codes should be 0.
+                            "character": 0,
+                            "unmodified_character": 0,
                             "modifiers": cef.EVENTFLAG_NONE
                         }
                         browser.SendKeyEvent(key_event)
@@ -348,6 +371,11 @@ def main():
                         key_event = {
                             "type": cef.KEYEVENT_KEYUP,
                             "windows_key_code": keycode,
+                            "native_key_code": get_native_key(keycode),
+                            # On raw key up events, the character and unmodified
+                            # character need to be defined, otherwise pressing
+                            # one of the above-listed keys will eat the next
+                            # normal keypress.
                             "character": keycode,
                             "unmodified_character": keycode,
                             "modifiers": cef.EVENTFLAG_NONE
@@ -413,6 +441,34 @@ def get_key_code(key):
     return None
 
 
+# The key events on MacOS have different native keycode than on other operating
+# systems. This table is a translation from Windows-keycodes to MacOS ones.
+MACOS_TRANSLATION_TABLE = {
+    # Backspace
+    0x08: 0x33,
+
+    # Left arrow
+    0x25: 0x7B,
+    # Up arrow
+    0x26: 0x7E,
+    # Right arrow
+    0x27: 0x7C,
+    # Down arrow
+    0x28: 0x7D,
+}
+
+
+def get_native_key(key):
+    """
+    Helper function for returning the correct native key map for the operating
+    system.
+    """
+    if sys.platform == 'darwin':
+        return MACOS_TRANSLATION_TABLE.get(key, key)
+
+    return key
+
+
 class LoadHandler(object):
     """Simple handler for loading URLs."""
 

From e95d8c04ec0c863a60cebd754fd92c64a2e57dcc Mon Sep 17 00:00:00 2001
From: Czarek Tomczak <cztomczak@users.noreply.github.com>
Date: Wed, 25 Dec 2019 10:27:58 +0100
Subject: [PATCH 190/238] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 92a7f2e6..24370549 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ Table of contents:
 
 CEF Python is an open source project founded by
 [Czarek Tomczak](https://drive.google.com/file/d/17xmoT5Z_zTHkVclqPzrs2aAV64Uiu7fh/view)
-(hire me!) in 2012 to provide Python bindings for the
+in 2012 to provide Python bindings for the
 [Chromium Embedded Framework](https://bitbucket.org/chromiumembedded/cef) (CEF).
 The Chromium project focuses mainly on Google Chrome application
 development while CEF focuses on facilitating embedded browser use cases

From e025351c666450797f91246caf1b0f05ee10c48a Mon Sep 17 00:00:00 2001
From: oren-icx <34027223+oren-icx@users.noreply.github.com>
Date: Wed, 1 Jan 2020 12:48:59 +0200
Subject: [PATCH 191/238] Fix typo scipt-script (#551)

---
 api/Browser.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/Browser.md b/api/Browser.md
index c3bd4def..66272c0a 100644
--- a/api/Browser.md
+++ b/api/Browser.md
@@ -311,7 +311,7 @@ Passing a python function here is not allowed, it is only possible through [Java
 | startLine=1 | int |
 | __Return__ | void |
 
-Execute a string of JavaScript code in this frame. The `sciptURL` parameter is the URL where the script in question can be found, if any. The renderer may request this URL to show the developer the source of the error.  The `startLine` parameter is the base line number to use for error reporting.
+Execute a string of JavaScript code in this frame. The `scriptURL` parameter is the URL where the script in question can be found, if any. The renderer may request this URL to show the developer the source of the error.  The `startLine` parameter is the base line number to use for error reporting.
 
 This function executes asynchronously so there is no way to get the returned value.
 

From 8f1484c1e774fc3941a6707fb73d8c9c6a16ec2a Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Sat, 11 Jan 2020 12:31:31 +0100
Subject: [PATCH 192/238] Fix: Request.GetPostData() throws UnicodeEncodeError
 (#517).

---
 src/cefpython.pyx      |  7 +++++--
 src/request.pyx        | 12 ++++++++++--
 unittests/issue517.py  | 43 ++++++++++++++++++++++++++++++++++++++++++
 unittests/main_test.py |  2 +-
 4 files changed, 59 insertions(+), 5 deletions(-)
 create mode 100644 unittests/issue517.py

diff --git a/src/cefpython.pyx b/src/cefpython.pyx
index 1631636f..aff190a0 100644
--- a/src/cefpython.pyx
+++ b/src/cefpython.pyx
@@ -147,9 +147,11 @@ IF PY_MAJOR_VERSION == 2:
     from urllib import pathname2url as urllib_pathname2url
     # noinspection PyUnresolvedReferences
     from urllib import urlencode as urllib_urlencode
+    from urllib import quote as urlparse_quote
 ELSE:
     # noinspection PyUnresolvedReferences
     from urllib import parse as urlparse
+    from urllib.parse import quote as urlparse_quote
     # noinspection PyUnresolvedReferences
     from urllib.request import pathname2url as urllib_pathname2url
     # noinspection PyUnresolvedReferences
@@ -1027,7 +1029,8 @@ cpdef LoadCrlSetsFile(py_string path):
     CefLoadCRLSetsFile(PyToCefStringValue(path))
 
 cpdef GetDataUrl(data, mediatype="html"):
-    html = data.encode("utf-8", "replace")
-    b64 = base64.b64encode(html).decode("utf-8", "replace")
+    if PY_MAJOR_VERSION >= 3:
+        data = data.encode("utf-8", "replace")
+    b64 = base64.b64encode(data).decode("utf-8", "replace")
     ret = "data:text/html;base64,{data}".format(data=b64)
     return ret
diff --git a/src/request.pyx b/src/request.pyx
index ed097638..c0d2793c 100644
--- a/src/request.pyx
+++ b/src/request.pyx
@@ -119,8 +119,16 @@ cdef class PyRequest:
                     retMultipart.append(pyData)
                 else:
                     # Content-Type: application/x-www-form-urlencoded
-                    retUrlEncoded.update(urlparse.parse_qsl(qs=pyData, 
+                    quoted = urlparse_quote(pyData, safe="=")
+                    retUrlEncoded.update(urlparse.parse_qsl(qs=quoted,
                             keep_blank_values=True))
+                    if PY_MAJOR_VERSION >= 3:
+                        retUrlEncoded_copy = copy.deepcopy(retUrlEncoded)
+                        retUrlEncoded = dict()
+                        for key in retUrlEncoded_copy:
+                            retUrlEncoded[key.encode("utf-8", "replace")] =\
+                                    retUrlEncoded_copy[key].encode(
+                                                    "utf-8", "replace")
             elif postDataElement.get().GetType() == cef_types.PDE_TYPE_FILE:
                 pyFile = CefToPyBytes(postDataElement.get().GetFile())
                 retMultipart.append(b"@"+pyFile)
@@ -156,7 +164,7 @@ cdef class PyRequest:
                 postData.get().AddElement(postDataElement)
             self.GetCefRequest().get().SetPostData(postData)
         elif type(pyPostData) == dict:
-            pyElement = urllib_urlencode(pyPostData).encode()
+            pyElement = urllib_urlencode(pyPostData).encode("utf-8", "replace")
             postDataElement = CefPostDataElement_Create()
             postDataElement.get().SetToBytes(len(pyElement), <char*>pyElement)
             postData.get().AddElement(postDataElement)
diff --git a/unittests/issue517.py b/unittests/issue517.py
new file mode 100644
index 00000000..60f9a04c
--- /dev/null
+++ b/unittests/issue517.py
@@ -0,0 +1,43 @@
+# coding=utf8
+from cefpython3 import cefpython as cef
+import sys
+
+html = """
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+<script>
+  window.onload = function() {
+   fetch('http://127.0.0.1:8000', {
+       method: 'POST',
+       headers: {'Content-Type': 'application/x-www-form-urlencoded'},
+       body: 'key=' + encodeURI('🍣 asd'),
+   }).then().catch();
+  }
+</script>
+</body>
+</html>
+"""
+
+
+class RequestHandler:
+    def GetResourceHandler(self, browser, frame, request):
+        print(request.GetPostData())
+        return None
+
+def main():
+    sys.excepthook = cef.ExceptHook
+    cef.Initialize()
+    browser = cef.CreateBrowserSync(url=cef.GetDataUrl(html))
+    browser.SetClientHandler(RequestHandler())
+    cef.MessageLoop()
+    del browser
+    cef.Shutdown()
+
+
+if __name__ == '__main__':
+    main()
diff --git a/unittests/main_test.py b/unittests/main_test.py
index b0c2200c..f3602c21 100644
--- a/unittests/main_test.py
+++ b/unittests/main_test.py
@@ -235,7 +235,7 @@ def test_main(self):
         req_file = os.path.dirname(os.path.abspath(__file__))
         req_file = os.path.join(req_file, "main_test.py")
         if sys.version_info.major > 2:
-            req_file = req_file.encode()
+            req_file = req_file.encode("utf-8")
         req_data = [b"--key=value", b"@"+req_file]
         req.SetMethod("POST")
         req.SetPostData(req_data)

From b7f25aa7eecf59569dbb0bd7513ff84cee669c00 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Sun, 12 Jan 2020 11:00:47 +0100
Subject: [PATCH 193/238] Fix tkinter focus issues on Windows (#535).

---
 examples/tkinter_.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/examples/tkinter_.py b/examples/tkinter_.py
index 58dc402e..f1e2c818 100644
--- a/examples/tkinter_.py
+++ b/examples/tkinter_.py
@@ -13,6 +13,8 @@
 # Known issue on Linux: When typing url, mouse must be over url
 # entry widget otherwise keyboard focus is lost (Issue #255
 # and Issue #284).
+# Other focus issues discussed in Issue #535.
+
 
 from cefpython3 import cefpython as cef
 import ctypes
@@ -153,6 +155,7 @@ def __init__(self, master, navigation_bar=None):
         self.bind("<FocusIn>", self.on_focus_in)
         self.bind("<FocusOut>", self.on_focus_out)
         self.bind("<Configure>", self.on_configure)
+        """For focus problems see Issue #255 and Issue #535. """
         self.focus_set()
 
     def embed_browser(self):
@@ -216,8 +219,6 @@ def on_focus_in(self, _):
 
     def on_focus_out(self, _):
         logger.debug("BrowserFrame.on_focus_out")
-        if self.browser:
-            self.browser.SetFocus(False)
 
     def on_root_close(self):
         if self.browser:
@@ -242,6 +243,7 @@ def OnLoadStart(self, browser, **_):
 
 
 class FocusHandler(object):
+    """For focus problems see Issue #255 and Issue #535. """
 
     def __init__(self, browser_frame):
         self.browser_frame = browser_frame
@@ -253,13 +255,10 @@ def OnTakeFocus(self, next_component, **_):
     def OnSetFocus(self, source, **_):
         logger.debug("FocusHandler.OnSetFocus, source={source}"
                      .format(source=source))
-        return False
+        return True
 
     def OnGotFocus(self, **_):
-        """Fix CEF focus issues (#255). Call browser frame's focus_set
-           to get rid of type cursor in url entry widget."""
         logger.debug("FocusHandler.OnGotFocus")
-        self.browser_frame.focus_set()
 
 
 class NavigationBar(tk.Frame):
@@ -340,7 +339,7 @@ def on_load_url(self, _):
             self.master.get_browser().LoadUrl(self.url_entry.get())
 
     def on_button1(self, _):
-        """Fix CEF focus issues (#255). See also FocusHandler.OnGotFocus."""
+        """For focus problems see Issue #255 and Issue #535. """
         logger.debug("NavigationBar.on_button1")
         self.master.master.focus_force()
 

From 076b6a661246c5855233730c766ab1dfa58264a9 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Sun, 12 Jan 2020 11:12:15 +0100
Subject: [PATCH 194/238] Fix tkinter focus problems on Linux (#535).

---
 examples/tkinter_.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/examples/tkinter_.py b/examples/tkinter_.py
index f1e2c818..c823f3dc 100644
--- a/examples/tkinter_.py
+++ b/examples/tkinter_.py
@@ -219,6 +219,9 @@ def on_focus_in(self, _):
 
     def on_focus_out(self, _):
         logger.debug("BrowserFrame.on_focus_out")
+        """For focus problems see Issue #255 and Issue #535. """
+        if LINUX and self.browser:
+            self.browser.SetFocus(False)
 
     def on_root_close(self):
         if self.browser:
@@ -255,10 +258,15 @@ def OnTakeFocus(self, next_component, **_):
     def OnSetFocus(self, source, **_):
         logger.debug("FocusHandler.OnSetFocus, source={source}"
                      .format(source=source))
-        return True
+        if LINUX:
+            return False
+        else:
+            return True
 
     def OnGotFocus(self, **_):
         logger.debug("FocusHandler.OnGotFocus")
+        if LINUX:
+            self.browser_frame.focus_set()
 
 
 class NavigationBar(tk.Frame):

From bddb859d52a6c4bc65d7a3400d1fed71d40e3d7c Mon Sep 17 00:00:00 2001
From: GiovanniL <13402461+GiovaLomba@users.noreply.github.com>
Date: Sun, 12 Jan 2020 17:08:27 +0100
Subject: [PATCH 195/238] Fixed typo (#556)

Original:   The actual key code genenerated by the platform
New:         The actual key code generated by the platform
---
 api/KeyboardHandler.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/KeyboardHandler.md b/api/KeyboardHandler.md
index f8082805..4735a88a 100644
--- a/api/KeyboardHandler.md
+++ b/api/KeyboardHandler.md
@@ -38,7 +38,7 @@ KeyEvent is a dictionary with the following keys:
 | type | KeyEventType | The type of keyboard event |
 | modifiers | KeyEventFlags | Bit flags describing any pressed modifier keys |
 | windows_key_code | int | The Windows key code for the key event. This value is used by the DOM specification. Sometimes it comes directly from the event (i.e. on Windows) and sometimes it's determined using a mapping function. See "chromium/KeyboardCodes.h" for a list of values. |
-| native_key_code | int | The actual key code genenerated by the platform |
+| native_key_code | int | The actual key code generated by the platform |
 | is_system_key | bool | Indicates whether the event is considered a "system key" event. For Windows see [WM_SYSKEYDOWN](http://msdn.microsoft.com/en-us/library/ms646286.aspx). This value will always be false on non-Windows platforms. |
 | character | wchar_t or unsigned short | The character generated by the keystroke |
 | unmodified_character | wchar_t or unsigned short | Same as 'character' but unmodified by any concurrently-held modifiers (except shift). This is useful for working out shortcut keys. |

From d9587bc6e8198de84aaedf9dbbbc42b569384730 Mon Sep 17 00:00:00 2001
From: Czarek Tomczak <cztomczak@users.noreply.github.com>
Date: Mon, 13 Jan 2020 11:36:30 +0100
Subject: [PATCH 196/238] Issue 554 (#557)

* Do not link against libpython on Linux (#554).

* Part 2. Do not link against libpython library on Linux (#554).
---
 tools/build.py        |  2 +-
 tools/cython_setup.py | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/tools/build.py b/tools/build.py
index 66d1244e..5e578b94 100644
--- a/tools/build.py
+++ b/tools/build.py
@@ -238,7 +238,7 @@ def check_directories():
         prebuilt_name = get_cef_binaries_libraries_basename(OS_POSTFIX2)
         print("[build.py] ERROR: Couldn't find CEF prebuilt binaries and"
               " libraries: 'build/{prebuilt_dir}/'. Download it"
-              " from GitHub released tagged eg. 'v50-upstream` or download"
+              " from GitHub released tagged eg. 'vXX-upstream` or download"
               " CEF binaries from Spotify Automated Builds and then run"
               "`automate.py --prebuilt-cef`."
               .format(prebuilt_dir=prebuilt_name))
diff --git a/tools/cython_setup.py b/tools/cython_setup.py
index e033cf84..4f0cafc6 100644
--- a/tools/cython_setup.py
+++ b/tools/cython_setup.py
@@ -25,6 +25,7 @@
 import sys
 import platform
 import Cython
+import copy
 import os
 
 # Must monkey patch Cython's ModuleNode to inject custom C++ code
@@ -65,6 +66,27 @@ def generate_extern_c_macro_definition(self, code):
             generate_extern_c_macro_definition)
 
 
+# Issue #554: Shared libraries in manylinux1 wheel should not
+#             be linked against libpythonX.Y.so.1.0.
+if LINUX:
+    get_libraries_old = (build_ext.get_libraries)
+    def get_libraries_new(self, ext):
+        libraries = get_libraries_old(self, ext)
+        libpython = ('python' + str(sys.version_info.major) + '.'
+                     + str(sys.version_info.minor))
+        for lib in copy.copy(libraries):
+            # Library name for Python versions before 3.8 may have
+            # an 'm' at the end.
+            if lib.startswith(libpython):
+                print("[cython_setup.py] Do not link against -l%s (Issue #554)"
+                    % lib)
+                libraries.remove(lib)
+        return libraries
+    build_ext.get_libraries = (
+            get_libraries_new
+    )
+
+
 # Command line args
 FAST_FLAG = False
 ENABLE_PROFILING = False

From fb2d94ca42c8ca54fe383a0ea55c9d3904fd5298 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Tue, 14 Jan 2020 16:02:46 +0100
Subject: [PATCH 197/238] Fix CefListValue "int index" params (#461).

---
 src/extern/cef/cef_values.pxd | 34 +++++++++++++++++-----------------
 src/process_message_utils.pyx |  8 ++++----
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/extern/cef/cef_values.pxd b/src/extern/cef/cef_values.pxd
index ee0bf506..3210432b 100644
--- a/src/extern/cef/cef_values.pxd
+++ b/src/extern/cef/cef_values.pxd
@@ -72,20 +72,20 @@ cdef extern from "include/cef_values.h":
         cpp_bool SetSize(size_t size)
         size_t GetSize()
         cpp_bool Clear()
-        cpp_bool Remove(int index)
-        cef_value_type_t GetType(int index)
-        cpp_bool GetBool(int index)
-        int GetInt(int index)
-        double GetDouble(int index)
-        CefString GetString(int index)
-        CefRefPtr[CefBinaryValue] GetBinary(int index)
-        CefRefPtr[CefDictionaryValue] GetDictionary(int index)
-        CefRefPtr[CefListValue] GetList(int index)
-        cpp_bool SetNull(int index)
-        cpp_bool SetBool(int index, cpp_bool value)
-        cpp_bool SetInt(int index, int value)
-        cpp_bool SetDouble(int index, double value)
-        cpp_bool SetString(int index, const CefString& value)
-        cpp_bool SetBinary(int index, CefRefPtr[CefBinaryValue] value)
-        cpp_bool SetDictionary(int index, CefRefPtr[CefDictionaryValue] value)
-        cpp_bool SetList(int index, CefRefPtr[CefListValue] value)
+        cpp_bool Remove(size_t index)
+        cef_value_type_t GetType(size_t index)
+        cpp_bool GetBool(size_t index)
+        int GetInt(size_t index)
+        double GetDouble(size_t index)
+        CefString GetString(size_t index)
+        CefRefPtr[CefBinaryValue] GetBinary(size_t index)
+        CefRefPtr[CefDictionaryValue] GetDictionary(size_t index)
+        CefRefPtr[CefListValue] GetList(size_t index)
+        cpp_bool SetNull(size_t index)
+        cpp_bool SetBool(size_t index, cpp_bool value)
+        cpp_bool SetInt(size_t index, int value)
+        cpp_bool SetDouble(size_t index, double value)
+        cpp_bool SetString(size_t index, const CefString& value)
+        cpp_bool SetBinary(size_t index, CefRefPtr[CefBinaryValue] value)
+        cpp_bool SetDictionary(size_t index, CefRefPtr[CefDictionaryValue] value)
+        cpp_bool SetList(size_t index, CefRefPtr[CefListValue] value)
diff --git a/src/process_message_utils.pyx b/src/process_message_utils.pyx
index 464c8f6b..8ced3f6c 100644
--- a/src/process_message_utils.pyx
+++ b/src/process_message_utils.pyx
@@ -92,8 +92,8 @@ cdef list CefListValueToPyList(
     if nestingLevel > 8:
         raise Exception("CefListValueToPyList(): max nesting level (8)"
                 " exceeded")
-    cdef int index
-    cdef int size = int(cefListValue.get().GetSize())
+    cdef size_t index
+    cdef size_t size = cefListValue.get().GetSize()
     cdef cef_types.cef_value_type_t valueType
     cdef list ret = []
     cdef CefRefPtr[CefBinaryValue] binaryValue
@@ -230,7 +230,7 @@ cdef CefRefPtr[CefListValue] PyListToCefListValue(
     cdef type valueType
     cdef CefRefPtr[CefListValue] ret = CefListValue_Create()
     cdef CefRefPtr[CefBinaryValue] binaryValue
-    cdef int index
+    cdef size_t index
     for index_size_t, value in enumerate(pyList):
         index = int(index_size_t)
         valueType = type(value)
@@ -289,7 +289,7 @@ cdef void PyListToExistingCefListValue(
                 " exceeded")
     cdef type valueType
     cdef CefRefPtr[CefListValue] newCefListValue
-    cdef int index
+    cdef size_t index
     for index_size_t, value in enumerate(pyList):
         index = int(index_size_t)
         valueType = type(value)

From 2c3681f633cd86024e0a4031a4efcea54570fb53 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Wed, 15 Jan 2020 14:32:49 +0100
Subject: [PATCH 198/238] Fix crash when setting a cookie with invalid domain
 (#459).

---
 src/cookie.pyx | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/cookie.pyx b/src/cookie.pyx
index ce078c10..6d90144b 100644
--- a/src/cookie.pyx
+++ b/src/cookie.pyx
@@ -119,6 +119,19 @@ cdef class Cookie:
         return CefToPyString(cefString)
 
     cpdef py_void SetDomain(self, py_string domain):
+        pattern = re.compile(r"^(?:[a-z0-9](?:[a-z0-9-_]{0,61}[a-z0-9])?\.)"
+                             r"+[a-z0-9][a-z0-9-_]{0,61}[a-z]$")
+        if PY_MAJOR_VERSION == 2:
+            assert isinstance(domain, bytes), "domain type is not bytes"
+            domain = domain.decode(g_applicationSettings["string_encoding"],
+                                   errors=BYTES_DECODE_ERRORS)
+        try:
+            if not pattern.match(domain.encode("idna").decode("ascii")):
+                raise Exception("Cookie.SetDomain() failed, invalid domain: {0}"
+                                .format(domain))
+        except UnicodeError:
+            raise Exception("Cookie.SetDomain() failed, invalid domain: {0}"
+                                .format(domain))
         cdef CefString cefString
         cefString.Attach(&self.cefCookie.domain, False)
         PyToCefString(domain, cefString)

From a5d97f03e1762f79ac0d69ab446ade33b597ff5d Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Thu, 16 Jan 2020 11:56:45 +0100
Subject: [PATCH 199/238] Add GIL section to Contributing-code.md document
 (#102).

---
 docs/Contributing-code.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/docs/Contributing-code.md b/docs/Contributing-code.md
index bbcefc26..fb56e115 100644
--- a/docs/Contributing-code.md
+++ b/docs/Contributing-code.md
@@ -12,6 +12,7 @@ Table of contents:
 * [API docs](#api-docs)
 * [Unit tests](#unit-tests)
 * [Platforms](#platforms)
+* [GIL](#gil)
 * [Authors](#authors)
 * [Updating CEF version](#updating-cef-version)
 
@@ -123,6 +124,24 @@ In most cases new code should run fine on all platforms, but in
 some cases it might be required to test on all platforms before
 PR is merged.
 
+## GIL
+
+In the pxd file, functions should be defined as "nogil" to avoid
+deadlocks when calling CEF functions. In the pyx file the call must
+use the "with nogil" statement.
+
+From [Cython's documentation](http://docs.cython.org/src/userguide/external_C_code.html#acquiring-and-releasing-the-gil):
+
+> Note that acquiring the GIL is a blocking thread-synchronising operation,
+> and therefore potentially costly. It might not be worth releasing the GIL
+> for minor calculations. Usually, I/O operations and substantial computations
+> in parallel code will benefit from it.
+
+Revision [ec1ce78](https://github.com/cztomczak/cefpython/commit/ec1ce788373bb9e0fd2cedd71e900c3877e9185a) removes the GIL lock from the
+following calls: Initialize(), Shutdown(), CreateBrowserSync(),
+SetOsModalLoop(), QuitMessageLoop(), CefExecuteProcess(). There still
+might be some more functions from which the GIL lock should be removed.
+
 ## Authors
 
 In your pull request modify also the [Authors](../Authors) file

From 11017dc68358b6adb4a3d822f53fa658ff4fa4f5 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Thu, 16 Jan 2020 12:31:08 +0100
Subject: [PATCH 200/238] Update LifespanHandler.md document. Info on
 OnBeforePopup and scripting between popup and parent window. (#171)

---
 api/LifespanHandler.md | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/api/LifespanHandler.md b/api/LifespanHandler.md
index 2b929512..1794d62d 100644
--- a/api/LifespanHandler.md
+++ b/api/LifespanHandler.md
@@ -107,10 +107,6 @@ Description from upstream CEF:
 > browser is destroyed before the popup browser creation completes (indicated
 > by a call to OnAfterCreated for the popup browser).
 
-Note that if you return True and create the popup window yourself, then
-the popup window and parent window will not be able to script each other.
-There will be no "window.opener" property available in the popup window.
-
 `WindowOpenDisposition` constants in the cefpython module:
 * WOD_UNKNOWN,
 * WOD_CURRENT_TAB,
@@ -122,3 +118,11 @@ There will be no "window.opener" property available in the popup window.
 * WOD_SAVE_TO_DISK,
 * WOD_OFF_THE_RECORD,
 * WOD_IGNORE_ACTION
+
+Note that if you return True and create the popup window yourself, then
+the popup window and parent window will not be able to script each other.
+There will be no "window.opener" property available in the popup window.
+To avoid this issue create a hidden window when your application starts.
+Parent the new popup browser to the hidden window in OnBeforePopup. After
+the browser exists (OnAfterCreated) create the desired target window
+and re-parent the browser to that target window.

From 42924f5ee00ea4a5b97a099b0afb2ed9b877a71a Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Thu, 16 Jan 2020 15:52:10 +0100
Subject: [PATCH 201/238] Update README links for the old v31.2 release.

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 24370549..0d0344ba 100644
--- a/README.md
+++ b/README.md
@@ -131,7 +131,6 @@ See the [README-examples.md](examples/README-examples.md) and
   in the issue. See
   [Most popular issues](../../issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc)
   sorted by reactions.
-- Wiki pages are deprecated and for v31 only
 
 
 ## Releases
@@ -196,10 +195,11 @@ Mac | 2.7 | No | Yes | Yes | MacOS 10.7+
 
 Additional information for v31.2 release:
 - On Windows/Mac you can install with command: `pip install cefpython3==31.2`
-- Downloads are available on [wiki pages](../../wiki#downloads)
-  and on GitHub Releases tagged [v31.2](../../releases/tag/v31.2).
-- Documentation is on [wiki pages](../../wiki)
+- Downloads are available on the GitHub Releases page tagged
+  [v31.2](../../releases/tag/v31.2).
 - API reference is available in revision [169a1b2](../../tree/169a1b20d3cd09879070d41aab28cfa195d2a7d5/docs/api)
+- Other documentation can be downloaded by cloning the
+  [cefpython.wiki.git](git@github.com:cztomczak/cefpython.wiki.git) repository.
 
 
 ## Support development

From e9116faa2094de85ccebd403aee09c61e2c8b8f9 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Thu, 16 Jan 2020 15:54:30 +0100
Subject: [PATCH 202/238] Update README with cefpython.wiki git clone command.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0d0344ba..9cef2431 100644
--- a/README.md
+++ b/README.md
@@ -199,7 +199,7 @@ Additional information for v31.2 release:
   [v31.2](../../releases/tag/v31.2).
 - API reference is available in revision [169a1b2](../../tree/169a1b20d3cd09879070d41aab28cfa195d2a7d5/docs/api)
 - Other documentation can be downloaded by cloning the
-  [cefpython.wiki.git](git@github.com:cztomczak/cefpython.wiki.git) repository.
+  cefpython.wiki repository: `git clone git@github.com:cztomczak/cefpython.wiki.git`
 
 
 ## Support development

From b03b78b64d0162eb186d05fb22452f934cd31152 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Fri, 17 Jan 2020 17:19:08 +0100
Subject: [PATCH 203/238] Fix V8ContextHandler.OnContextCreated and
 OnContextReleased (#484).

These callbacks were never called previously.

Rename --no-run-examples flag to --unittests in build scripts.
---
 api/V8ContextHandler.md |  4 +++-
 src/browser.pyx         |  3 +++
 tools/build.py          | 23 +++++++++++++----------
 tools/build_distrib.py  | 23 ++++++++++++-----------
 unittests/_common.py    |  5 +++--
 unittests/main_test.py  | 33 ++++++++++++++++++++++++++++++++-
 6 files changed, 66 insertions(+), 25 deletions(-)

diff --git a/api/V8ContextHandler.md b/api/V8ContextHandler.md
index 9c6f6fbc..b88a8641 100644
--- a/api/V8ContextHandler.md
+++ b/api/V8ContextHandler.md
@@ -3,7 +3,9 @@
 
 # V8ContextHandler (interface)
 
-Implement this interface to handle javascript exceptions globally.
+Implement this interface to handle render process callbacks.
+Through inter-process messaging you are notified about these events
+in the browser process.
 
 
 Table of contents:
diff --git a/src/browser.pyx b/src/browser.pyx
index d378ca22..8dfb7aed 100644
--- a/src/browser.pyx
+++ b/src/browser.pyx
@@ -267,6 +267,9 @@ cdef class PyBrowser:
                     "OnScrollOffsetChanged",
                     "StartDragging", "UpdateDragCursor",
                     "OnTextSelectionChanged"]
+            # V8ContextHandler
+            self.allowedClientCallbacks += ["OnContextCreated",
+                    "OnContextReleased"]
             # JavascriptDialogHandler
             self.allowedClientCallbacks += ["OnJavascriptDialog",
                     "OnBeforeUnloadJavascriptDialog",
diff --git a/tools/build.py b/tools/build.py
index 5e578b94..522a9b08 100644
--- a/tools/build.py
+++ b/tools/build.py
@@ -18,12 +18,15 @@
 from sources or use ready binaries from Spotify Automated Builds.
 
 Usage:
-    build.py VERSION [--rebuild-cpp] [--fast] [--clean] [--kivy]
-                     [--hello-world]
+    build.py VERSION [--rebuild-cpp] [--unittests] [--fast] [--clean] [--kivy]
+                     [--hello-world] [--enable-profiling]
+                     [--enable-line-tracing]
 
 Options:
     VERSION                Version number eg. 50.0
-    --no-run-examples      Do not run examples after build, only unit tests
+    --unittests            Run only unit tests. Do not run examples while
+                           building cefpython modules. Examples require
+                           interaction such as closing window before proceeding.
     --fast                 Fast mode
     --clean                Clean C++ projects build files on Linux/Mac
     --kivy                 Run only Kivy example
@@ -79,7 +82,7 @@
 # Command line args variables
 SYS_ARGV_ORIGINAL = None
 VERSION = ""
-NO_RUN_EXAMPLES = False
+UNITTESTS = False
 DEBUG_FLAG = False
 FAST_FLAG = False
 CLEAN_FLAG = False
@@ -125,7 +128,7 @@ def main():
 
 def command_line_args():
     global DEBUG_FLAG, FAST_FLAG, CLEAN_FLAG, KIVY_FLAG, HELLO_WORLD_FLAG, \
-           REBUILD_CPP, VERSION, NO_RUN_EXAMPLES
+           REBUILD_CPP, VERSION, UNITTESTS
 
     VERSION = get_version_from_command_line_args(__file__)
     # Other scripts called by this script expect that version number
@@ -140,10 +143,10 @@ def command_line_args():
     global SYS_ARGV_ORIGINAL
     SYS_ARGV_ORIGINAL = copy.copy(sys.argv)
 
-    if "--no-run-examples" in sys.argv:
-        NO_RUN_EXAMPLES = True
-        print("[build.py] Running examples disabled (--no-run-examples)")
-        sys.argv.remove("--no-run-examples")
+    if "--unittests" in sys.argv:
+        UNITTESTS = True
+        print("[build.py] Running examples disabled (--unittests)")
+        sys.argv.remove("--unittests")
 
     if "--debug" in sys.argv:
         DEBUG_FLAG = True
@@ -913,7 +916,7 @@ def install_and_run():
         sys.exit(1)
 
     # Run examples
-    if not NO_RUN_EXAMPLES:
+    if not UNITTESTS:
         print("[build.py] Run examples")
         os.chdir(EXAMPLES_DIR)
         flags = ""
diff --git a/tools/build_distrib.py b/tools/build_distrib.py
index 8ff5a6b8..e0a5bde1 100644
--- a/tools/build_distrib.py
+++ b/tools/build_distrib.py
@@ -7,13 +7,14 @@
 python versions.
 
 Usage:
-    build_distrib.py VERSION [--no-run-examples] [--no-rebuild]
+    build_distrib.py VERSION [--unittests] [--no-rebuild] [--no-automate]
+                             [--allow-partial]
 
 Options:
     VERSION            Version number eg. 50.0
-    --no-run-examples  Do not run examples while building cefpython modules.
-                       Examples require interaction, closing window before
-                       proceeding. Only unit tests will be run in such case.
+    --unittests        Run only unit tests. Do not run examples while building
+                       cefpython modules. Examples require interaction such as
+                       closing window before proceeding.
     --no-rebuild       Do not rebuild cefpython modules. For internal use
                        so that changes to packaging can be quickly tested.
     --no-automate      Do not run automate.py --prebuilt-cef. This flag
@@ -73,7 +74,7 @@
 
 # Command line args
 VERSION = ""
-NO_RUN_EXAMPLES = False
+UNITTESTS = False
 NO_REBUILD = False
 NO_AUTOMATE = False
 ALLOW_PARTIAL = False
@@ -152,15 +153,15 @@ def main():
 
 
 def command_line_args():
-    global VERSION, NO_RUN_EXAMPLES, NO_REBUILD, NO_AUTOMATE, ALLOW_PARTIAL
+    global VERSION, UNITTESTS, NO_REBUILD, NO_AUTOMATE, ALLOW_PARTIAL
     version = get_version_from_command_line_args(__file__)
     if not version or "--help" in sys.argv:
         print(__doc__)
         sys.exit(1)
     VERSION = version
-    if "--no-run-examples" in sys.argv:
-        NO_RUN_EXAMPLES = True
-        sys.argv.remove("--no-run-examples")
+    if "--unittests" in sys.argv:
+        UNITTESTS = True
+        sys.argv.remove("--unittests")
     if "--no-rebuild" in sys.argv:
         NO_REBUILD = True
         sys.argv.remove("--no-rebuild")
@@ -488,8 +489,8 @@ def build_cefpython_modules(pythons, arch):
         print("[build_distrib.py] Build cefpython module for {python_name}"
               .format(python_name=python["name"]))
         flags = ""
-        if NO_RUN_EXAMPLES:
-            flags += " --no-run-examples"
+        if UNITTESTS:
+            flags += " --unittests"
         # On Linux/Mac Makefiles are used and must pass --clean flag
         command = ("\"{python}\" {build_py} {version} --clean {flags}"
                    .format(python=python["executable"],
diff --git a/unittests/_common.py b/unittests/_common.py
index 684a27b1..fcd89917 100644
--- a/unittests/_common.py
+++ b/unittests/_common.py
@@ -82,7 +82,7 @@ def check_auto_asserts(test_case, objects):
         test_for_True = False  # Test whether asserts are working correctly
         for key, value in obj.__dict__.items():
             if key == "test_for_True":
-                test_for_True = True
+                test_for_True = value
                 continue
             if "_True" in key:
                 test_case.assertTrue(value, "Check assert: " +
@@ -96,7 +96,8 @@ def check_auto_asserts(test_case, objects):
                 subtest_message(obj.__class__.__name__ + "." +
                                 key.replace("_False", "") +
                                 " ok")
-        test_case.assertTrue(test_for_True)
+        if "test_for_True" in obj.__dict__.keys():
+            test_case.assertTrue(test_for_True)
 
 
 class DisplayHandler(object):
diff --git a/unittests/main_test.py b/unittests/main_test.py
index f3602c21..99397da8 100644
--- a/unittests/main_test.py
+++ b/unittests/main_test.py
@@ -197,9 +197,11 @@ def test_main(self):
 
         # Client handlers
         display_handler2 = DisplayHandler2(self)
+        v8context_handler = V8ContextHandler(self)
         client_handlers = [LoadHandler(self, g_datauri),
                            DisplayHandler(self),
-                           display_handler2]
+                           display_handler2,
+                           v8context_handler]
         for handler in client_handlers:
             browser.SetClientHandler(handler)
         subtest_message("browser.SetClientHandler() ok")
@@ -336,6 +338,35 @@ def OnLoadingProgressChange(self, progress, **_):
         self.OnLoadingProgressChange_Progress = progress
 
 
+class V8ContextHandler(object):
+    def __init__(self, test_case):
+        self.test_case = test_case
+        self.OnContextCreatedFirstCall_True = False
+        self.OnContextCreatedSecondCall_True = False
+        self.OnContextReleased_True = False
+
+    def OnContextCreated(self, browser, frame):
+        """CEF creates one context when creating browser and this one is
+           released immediately. Then when it loads url another context is
+           created."""
+        if not self.OnContextCreatedFirstCall_True:
+            self.OnContextCreatedFirstCall_True = True
+        else:
+            self.test_case.assertFalse(self.OnContextCreatedSecondCall_True)
+            self.OnContextCreatedSecondCall_True = True
+        self.test_case.assertEqual(browser.GetIdentifier(), MAIN_BROWSER_ID)
+        self.test_case.assertEqual(frame.GetIdentifier(), 2)
+
+    def OnContextReleased(self, browser, frame):
+        """This gets called only for the initial empty context, see comment
+           in OnContextCreated. This should never get called for the main frame
+           of the main browser, because it happens during app exit and there
+           isn't enough time for the IPC messages to go through."""
+        self.test_case.assertFalse(self.OnContextReleased_True)
+        self.OnContextReleased_True = True
+        self.test_case.assertEqual(browser.GetIdentifier(), MAIN_BROWSER_ID)
+        self.test_case.assertEqual(frame.GetIdentifier(), 2)
+
 class External(object):
     """Javascript 'window.external' object."""
 

From 6cc7f9c8058475ab9aadc04ff614b9904ce063b9 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Mon, 20 Jan 2020 14:35:29 +0100
Subject: [PATCH 204/238] Fix issues with urls containing special characters
 (#384). BC BREAK!

Updated Migration-Guide.md document and other documentation.
---
 api/Browser.md          |  9 +++++++-
 api/Frame.md            |  9 +++++++-
 api/cefpython.md        |  9 +++++++-
 docs/Migration-guide.md | 14 +++++++++++--
 src/cefpython.pyx       |  6 ------
 src/frame.pyx           |  1 -
 src/utils.pyx           | 46 -----------------------------------------
 7 files changed, 36 insertions(+), 58 deletions(-)

diff --git a/api/Browser.md b/api/Browser.md
index 66272c0a..b34b90e2 100644
--- a/api/Browser.md
+++ b/api/Browser.md
@@ -376,7 +376,7 @@ Returns the focused [Frame](Frame.md) for the browser window.
 | name | string |
 | __Return__ | Frame |
 
-Returns the [Frame](Frame.md) with the specified name, or NULL if not found. 
+Returns the [Frame](Frame.md) with the specified name, or NULL if not found.
 
 
 ### GetFrameByIdentifier
@@ -697,6 +697,13 @@ Returns true if window rendering is disabled.
 
 Load url in the main frame.
 
+If the url is a local path it needs to start with the `file://` prefix.
+If the url contains special characters it may need proper handling.
+Starting with v66.1+ it is required for the app code to encode the url
+properly. You can use the `pathlib.PurePath.as_uri` in Python 3
+or `urllib.pathname2url` in Python 2 (`urllib.request.pathname2url`
+in Python 3) depending on your case.
+
 
 ### Navigate
 
diff --git a/api/Frame.md b/api/Frame.md
index 87dbc89c..05712912 100644
--- a/api/Frame.md
+++ b/api/Frame.md
@@ -228,9 +228,16 @@ Take also a look at a [custom resource handler](ResourceHandler.md).
 
 Load the contents of |value| with the specified dummy |url|. |url|
 should have a standard scheme (for example, http scheme) or behaviors like
-link clicks and web security restrictions may not behave as expected. 
+link clicks and web security restrictions may not behave as expected.
 LoadString() can be called only after the Renderer process has been created.
 
+If the url is a local path it needs to start with the `file://` prefix.
+If the url contains special characters it may need proper handling.
+Starting with v66.1+ it is required for the app code to encode the url
+properly. You can use the `pathlib.PurePath.as_uri` in Python 3
+or `urllib.pathname2url` in Python 2 (`urllib.request.pathname2url`
+in Python 3) depending on your case.
+
 
 ### LoadUrl
 
diff --git a/api/cefpython.md b/api/cefpython.md
index 29720c48..ae7d255c 100644
--- a/api/cefpython.md
+++ b/api/cefpython.md
@@ -59,6 +59,13 @@ All parameters are optional.
 
 This function can only be called on the UI thread.
 
+If the url is a local path it needs to start with the `file://` prefix.
+If the url contains special characters it may need proper handling.
+Starting with v66.1+ it is required for the app code to encode the url
+properly. You can use the `pathlib.PurePath.as_uri` in Python 3
+or `urllib.pathname2url` in Python 2 (`urllib.request.pathname2url`
+in Python 3) depending on your case.
+
 The "window_title" parameter will be used only when parent
 window provided in window_info was set to 0. This is for use
 with hello_world.py and tutorial.py examples which don't use
@@ -240,7 +247,7 @@ Description from upstream CEF:
 | __Return__ | void |
 
 Run the CEF message loop. Use this function instead of an application-
-provided message loop to get the best balance between performance and 
+provided message loop to get the best balance between performance and
 CPU usage. This function should only be called on the main application
 thread (UI thread) and only if cefpython.Initialize() is called with a
 [ApplicationSettings](ApplicationSettings.md).multi_threaded_message_loop
diff --git a/docs/Migration-guide.md b/docs/Migration-guide.md
index 2359562c..5ad3d438 100644
--- a/docs/Migration-guide.md
+++ b/docs/Migration-guide.md
@@ -50,6 +50,7 @@ Table of contents:
 * [v66+ cef.Request.Flags changed](#v66-cefrequestflags-changed)
 * [v66+ RequestHandler.GetCookieManager not getting called in some cases](#v66-requesthandlergetcookiemanager-not-getting-called-in-some-cases)
 * [v66+ Changes to Mac apps that integrate into existing message loop (Qt, wxPython)](#v66-changes-to-mac-apps-that-integrate-into-existing-message-loop-qt-wxpython)
+* [v66.1+ Navigation urls passed to CreateBrowserSync or LoadUrl methods need to be encoded by app code](#v661-navigation-urls-passed-to-createbrowsersync-or-loadurl-methods-need-to-be-encoded-by-app-code)
 * [v67+ Do not call the 'WindowUtils.OnSize' function](#v67-do-not-call-the-windowutilsonsize-function)
 
 
@@ -487,6 +488,16 @@ tested of how this change affects performance.
 
 See Issue [#442](../../../issues/442) for more details on the issues.
 
+## v66.1+ Navigation urls passed to CreateBrowserSync or LoadUrl methods need to be encoded by app code
+
+[Issue #384](../../../issues/384) fixes problems with browser failing to load
+urls containing certain characters by not encoding the url anymore. From now
+on it is required for the app code to encode the url properly. You can use
+the `pathlib.PurePath.as_uri` in Python 3 or `urllib.pathname2url` in
+Python 2 (`urllib.request.pathname2url` in Python 3) depending on your case.
+
+The `cef.GetNavigateUrl` function was removed from the cefpython3 module.
+
 
 ## v67+ Do not call the 'WindowUtils.OnSize' function
 
@@ -494,5 +505,4 @@ This function can sometimes cause app hanging during window resize.
 Call instead the new `WindowUtils`.[UpdateBrowserSize](../api/WindowUtils.md#updatebrowsersize)
 function. Except when you use the `pywin32.py` example, in such case
 `WindowUtils.OnSize` must be called.
-See [Issue #464](../../../issues/464) for more details.
-
+See [Issue #464](../../../issues/464) for more details.
\ No newline at end of file
diff --git a/src/cefpython.pyx b/src/cefpython.pyx
index aff190a0..c3b1e1a1 100644
--- a/src/cefpython.pyx
+++ b/src/cefpython.pyx
@@ -144,8 +144,6 @@ IF PY_MAJOR_VERSION == 2:
     # noinspection PyUnresolvedReferences
     import urlparse
     # noinspection PyUnresolvedReferences
-    from urllib import pathname2url as urllib_pathname2url
-    # noinspection PyUnresolvedReferences
     from urllib import urlencode as urllib_urlencode
     from urllib import quote as urlparse_quote
 ELSE:
@@ -153,8 +151,6 @@ ELSE:
     from urllib import parse as urlparse
     from urllib.parse import quote as urlparse_quote
     # noinspection PyUnresolvedReferences
-    from urllib.request import pathname2url as urllib_pathname2url
-    # noinspection PyUnresolvedReferences
     from urllib.parse import urlencode as urllib_urlencode
 
 # noinspection PyUnresolvedReferences
@@ -739,8 +735,6 @@ def CreateBrowserSync(windowInfo=None,
     cdef CefWindowInfo cefWindowInfo
     SetCefWindowInfo(cefWindowInfo, windowInfo)
 
-    navigateUrl = GetNavigateUrl(navigateUrl)
-    Debug("navigateUrl: %s" % navigateUrl)
     cdef CefString cefNavigateUrl
     PyToCefString(navigateUrl, cefNavigateUrl)
 
diff --git a/src/frame.pyx b/src/frame.pyx
index ec3ef8bc..812e4b3c 100644
--- a/src/frame.pyx
+++ b/src/frame.pyx
@@ -211,7 +211,6 @@ cdef class PyFrame:
         self.GetCefFrame().get().LoadString(cefValue, cefUrl)
 
     cpdef py_void LoadUrl(self, py_string url):
-        url = GetNavigateUrl(url)
         cdef CefString cefUrl
         PyToCefString(url, cefUrl)
         self.GetCefFrame().get().LoadURL(cefUrl)
diff --git a/src/utils.pyx b/src/utils.pyx
index 0e499554..3d1acd89 100644
--- a/src/utils.pyx
+++ b/src/utils.pyx
@@ -72,52 +72,6 @@ cpdef str GetSystemError():
     ELSE:
         return ""
 
-cpdef str GetNavigateUrl(py_string url):
-    # Encode local file paths so that CEF can load them correctly:
-    # | some.html, some/some.html, D:\, /var, file://
-    if re.search(r"^file:", url, re.I) or \
-            re.search(r"^[a-zA-Z]:", url) or \
-            not re.search(r"^[\w-]+:", url):
-
-        # Function pathname2url will complain if url starts with "file://".
-        # CEF may also change local urls to "file:///C:/" - three slashes.
-        is_file_protocol = False
-        file_prefix = ""
-        file_prefixes = ["file:///", "file://"]
-        for file_prefix in file_prefixes:
-            if url.startswith(file_prefix):
-                is_file_protocol = True
-                # Remove the file:// prefix
-                url = url[len(file_prefix):]
-                break
-
-        # Need to encode chinese characters in local file paths,
-        # otherwise CEF will try to encode them by itself. But it
-        # will fail in doing so. CEF will return the following string:
-        # >> %EF%BF%97%EF%BF%80%EF%BF%83%EF%BF%A6
-        # But it should be:
-        # >> %E6%A1%8C%E9%9D%A2
-        url = urllib_pathname2url(url)
-
-        if is_file_protocol:
-            url = "%s%s" % (file_prefix, url)
-
-        # If it is C:\ then colon was encoded. Decode it back.
-        url = re.sub(r"^([a-zA-Z])%3A", r"\1:", url)
-
-        # Allow hash when loading urls. The pathname2url function
-        # replaced hashes with "%23" (Issue #114).
-        url = url.replace("%23", "#")
-
-        # Allow more special characters when loading urls. The pathname2url
-        # function encoded them and need to decode them back here
-        # Characters: ? & = (Issue #273).
-        url = url.replace("%3F", "?")
-        url = url.replace("%26", "&")
-        url = url.replace("%3D", "=")
-
-    return str(url)
-
 cpdef py_bool IsFunctionOrMethod(object valueType):
     if (valueType == types.FunctionType
             or valueType == types.MethodType

From d97ba3d19e36c754792f004c4d0a01b2baad9a09 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Tue, 21 Jan 2020 12:37:50 +0100
Subject: [PATCH 205/238] Update Sponsors in README.

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 9cef2431..b2c06aad 100644
--- a/README.md
+++ b/README.md
@@ -246,10 +246,10 @@ priority.
  <tr>
   <td>
    <div align="center">
-    <a href="https://clearchat.com/">
-     <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/clearchat.png">
+    <a href="https://highside.io/">
+     <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/highside-onlight-200x48.png">
     </a><br>
-    <a href="https://clearchat.com/">www.clearchat.com</a>
+    <a href="https://highside.io/">www.highside.io</a>
    <div align="center">
   </td>
   <td>
@@ -278,7 +278,7 @@ priority.
   the v49 release for legacy systems (WinXP/Vista)
 * [2018] Many thanks to [Lampix](https://lampix.com/) for sponsoring the v66
   release for all platforms
-* [2017] Many thanks to [ClearChat Inc.](https://clearchat.com/) for sponsoring
+* [2017] Many thanks to [HighSide Inc.](https://highside.io/) for sponsoring
   the v55/v56 releases for all platforms
 * [2016-2018] Thanks to JetBrains for providing an Open Source license for
   [PyCharm](https://www.jetbrains.com/pycharm/)

From 99fb58a6badf905afde66903d5c87e39a5f32b38 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Tue, 21 Jan 2020 12:57:22 +0100
Subject: [PATCH 206/238] Restructure Sponsors section in README.

---
 README.md | 120 +++++++++++++++++++++++++++---------------------------
 1 file changed, 60 insertions(+), 60 deletions(-)

diff --git a/README.md b/README.md
index b2c06aad..747381bf 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,8 @@
 
 Table of contents:
 * [Introduction](#introduction)
-* [Sponsors](#sponsors)
+* [Latest releases sponsored by](#latest-releases-sponsored-by)
+  * [Thanks to all sponsors](#thanks-to-all-sponsors)
 * [Install](#install)
 * [Tutorial](#tutorial)
 * [Examples](#examples)
@@ -13,7 +14,6 @@ Table of contents:
   * [v49 release (WinXP/Vista)](#v49-release-winxpvista)
   * [v31 release (old systems)](#v31-release-old-systems)
 * [Support development](#support-development)
-  * [Thanks to sponsors](#thanks-to-sponsors)
   * [Thanks to all](#thanks-to-all)
 * [Seeking new sponsors](#seeking-new-sponsors)
 * [Other READMEs](#other-readmes)
@@ -49,7 +49,7 @@ frameworks such as PyQt, wxPython, PyGTK, PyGObject, Tkinter, Kivy, Panda3D,
 PyGame, PyOpenGL, PyWin32, PySide and PySDL2.
 
 
-## Sponsors
+## Latest releases sponsored by
 
 <table border="0"><tr>
 <td width="50%" valign="top">
@@ -82,6 +82,63 @@ businesses with cutting edge marketing technology. Please visit their website:
 
 </tr></table>
 
+### Thanks to all sponsors
+
+<table>
+ <tr>
+  <td>
+   <div align="center">
+    <a href="https://www.fivestars.com/">
+     <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/fivestars200.png">
+    </a><br>
+    <a href="https://www.fivestars.com/">www.fivestars.com</a>
+   </div>
+  </td>
+  <td>
+   <div align="center">
+    <a href="https://lampix.com/">
+     <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/lampix200.png">
+    </a><br>
+    <a href="https://lampix.com/">www.lampix.com</a>
+   </div>
+  </td>
+  <td>
+   <div align="center">
+    <a href="http://www.blueplanet.com/">
+     <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/cyan_new_logo_200x48.png">
+    </a><br>
+    <a href="http://www.blueplanet.com/">www.blueplanet.com</a>
+   </div>
+  </td>
+ </tr>
+ <tr>
+  <td>
+   <div align="center">
+    <a href="https://highside.io/">
+     <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/highside-onlight-200x48.png">
+    </a><br>
+    <a href="https://highside.io/">www.highside.io</a>
+   <div align="center">
+  </td>
+  <td>
+   <div align="center">
+    <a href="http://www.rentouch.ch/">
+     <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/rentouch.png">
+    </a><br>
+    <a href="http://www.rentouch.ch/">www.rentouch.ch</a>
+   </div>
+  </td>
+  <td>
+   <div align="center">
+    <a href="https://www.jetbrains.com/pycharm/">
+     <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/pycharm.png">
+    </a><br>
+    <a href="https://www.jetbrains.com/pycharm/">www.jetbrains.com</a>
+   </div>
+  </td>
+ <tr>
+</table>
+
 
 ## Install
 
@@ -214,63 +271,6 @@ priority.
 <img src='https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/donate.gif' />
 </a><br><br>
 
-### Thanks to sponsors
-
-<table>
- <tr>
-  <td>
-   <div align="center">
-    <a href="https://www.fivestars.com/">
-     <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/fivestars200.png">
-    </a><br>
-    <a href="https://www.fivestars.com/">www.fivestars.com</a>
-   </div>
-  </td>
-  <td>
-   <div align="center">
-    <a href="https://lampix.com/">
-     <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/lampix200.png">
-    </a><br>
-    <a href="https://lampix.com/">www.lampix.com</a>
-   </div>
-  </td>
-  <td>
-   <div align="center">
-    <a href="http://www.blueplanet.com/">
-     <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/cyan.png">
-    </a><br>
-    <a href="http://www.blueplanet.com/">www.blueplanet.com</a>
-   </div>
-  </td>
- </tr>
- <tr>
-  <td>
-   <div align="center">
-    <a href="https://highside.io/">
-     <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/highside-onlight-200x48.png">
-    </a><br>
-    <a href="https://highside.io/">www.highside.io</a>
-   <div align="center">
-  </td>
-  <td>
-   <div align="center">
-    <a href="http://www.rentouch.ch/">
-     <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/rentouch.png">
-    </a><br>
-    <a href="http://www.rentouch.ch/">www.rentouch.ch</a>
-   </div>
-  </td>
-  <td>
-   <div align="center">
-    <a href="https://www.jetbrains.com/pycharm/">
-     <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/pycharm.png">
-    </a><br>
-    <a href="https://www.jetbrains.com/pycharm/">www.jetbrains.com</a>
-   </div>
-  </td>
- <tr>
-</table>
-
 
 ### Thanks to all
 

From a314559af3270f2a0e48d085e23dc8cc76af7966 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Wed, 22 Jan 2020 11:54:44 +0100
Subject: [PATCH 207/238] Fix focus issues in qt.py example (#404).

---
 examples/qt.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/examples/qt.py b/examples/qt.py
index a272b80d..9b3e96b9 100644
--- a/examples/qt.py
+++ b/examples/qt.py
@@ -337,7 +337,11 @@ def __init__(self, cef_widget):
         self.cef_widget = cef_widget
 
     def OnSetFocus(self, **_):
-        pass
+        print("[qt.py] FocusHandler.OnSetFocus")
+        if LINUX:
+            return False
+        else:
+            return True
 
     def OnGotFocus(self, browser, **_):
         # Temporary fix no. 1 for focus issues on Linux (Issue #284)

From 181588ce611ef4675b4948b71f9ed933a9519a98 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Wed, 22 Jan 2020 12:21:14 +0100
Subject: [PATCH 208/238] Fix QLineEdit focus issues in qt.py example on
 Windows (#404).

Revert previous commit.
---
 examples/qt.py | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/examples/qt.py b/examples/qt.py
index 9b3e96b9..efb1b381 100644
--- a/examples/qt.py
+++ b/examples/qt.py
@@ -212,6 +212,8 @@ def __init__(self, parent=None):
     def focusInEvent(self, event):
         # This event seems to never get called on Linux, as CEF is
         # stealing all focus due to Issue #284.
+        if cef.GetAppSetting("debug"):
+            print("[qt.py] CefWidget.focusInEvent")
         if self.browser:
             if WINDOWS:
                 WindowUtils.OnSetFocus(self.getHandle(), 0, 0, 0)
@@ -220,6 +222,8 @@ def focusInEvent(self, event):
     def focusOutEvent(self, event):
         # This event seems to never get called on Linux, as CEF is
         # stealing all focus due to Issue #284.
+        if cef.GetAppSetting("debug"):
+            print("[qt.py] CefWidget.focusOutEvent")
         if self.browser:
             self.browser.SetFocus(False)
 
@@ -336,18 +340,20 @@ class FocusHandler(object):
     def __init__(self, cef_widget):
         self.cef_widget = cef_widget
 
+    def OnTakeFocus(self, **_):
+        if cef.GetAppSetting("debug"):
+            print("[qt.py] FocusHandler.OnTakeFocus")
+
     def OnSetFocus(self, **_):
-        print("[qt.py] FocusHandler.OnSetFocus")
-        if LINUX:
-            return False
-        else:
-            return True
+        if cef.GetAppSetting("debug"):
+            print("[qt.py] FocusHandler.OnSetFocus")
 
     def OnGotFocus(self, browser, **_):
+        if cef.GetAppSetting("debug"):
+            print("[qt.py] FocusHandler.OnGotFocus")
+        self.cef_widget.setFocus()
         # Temporary fix no. 1 for focus issues on Linux (Issue #284)
         if LINUX:
-            print("[qt.py] FocusHandler.OnGotFocus:"
-                  " keyboard focus fix no. 1 (Issue #284)")
             browser.SetFocus(True)
 
 

From 30439b659bf1974420c3ec7954f76f2fc93902e2 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Thu, 23 Jan 2020 16:32:52 +0100
Subject: [PATCH 209/238] Update utils.pyx.

---
 src/utils.pyx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/utils.pyx b/src/utils.pyx
index 3d1acd89..7d855361 100644
--- a/src/utils.pyx
+++ b/src/utils.pyx
@@ -76,6 +76,7 @@ cpdef py_bool IsFunctionOrMethod(object valueType):
     if (valueType == types.FunctionType
             or valueType == types.MethodType
             or valueType == types.BuiltinFunctionType
-            or valueType == types.BuiltinMethodType):
+            or valueType == types.BuiltinMethodType
+            or valueType.__name__ == "cython_function_or_method"):
         return True
     return False

From 042579dc0d7e0010dca4d23f0ccbbbaf2e72700e Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Sat, 25 Jan 2020 14:32:29 +0100
Subject: [PATCH 210/238] Allow for automatic conversion of string like objects
 to CEF strings. For example a QString passed to LoadUrl() method was causing
 error and now it's handled fine.

---
 src/string_utils.pyx | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/string_utils.pyx b/src/string_utils.pyx
index c5980b94..7b1c9a06 100644
--- a/src/string_utils.pyx
+++ b/src/string_utils.pyx
@@ -103,11 +103,17 @@ cdef void PyToCefString(
         CefString& cefString
         ) except *:
     if PY_MAJOR_VERSION < 3:
+        # Handle objects that may be converted to string e.g. QString
+        if not isinstance(pyString, str) and not isinstance(pyString, unicode):
+            pyString = str(pyString)
         if type(pyString) == unicode:
             pyString = <bytes>(pyString.encode(
                     g_applicationSettings["string_encoding"],
                     errors=UNICODE_ENCODE_ERRORS))
     else:
+        # Handle objects that may be converted to string e.g. QString
+        if not isinstance(pyString, str) and not isinstance(pyString, bytes):
+            pyString = str(pyString)
         # The unicode type is not defined in Python 3.
         if type(pyString) == str:
             pyString = <bytes>(pyString.encode(

From 28afa80a2f23fa2e6160926d0352b861466bf5a8 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Sat, 25 Jan 2020 14:33:42 +0100
Subject: [PATCH 211/238] Pass proper parent window handle for DevTools window
 (#381). This still doesn't fix keyboard issues in wxpython.py example.

---
 src/browser.pyx | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/browser.pyx b/src/browser.pyx
index 8dfb7aed..c8cba03a 100644
--- a/src/browser.pyx
+++ b/src/browser.pyx
@@ -576,15 +576,8 @@ cdef class PyBrowser:
     cpdef py_void ShowDevTools(self):
         cdef CefWindowInfo window_info
         IF UNAME_SYSNAME == "Windows":
-            # On Windows with empty window_info structure the devtools
-            # window doesn't appear.
-            window_info.SetAsPopup(
-                    # TODO:
-                    # According to docs this returns NULL for non-popup
-                    # windows, so looks like we shouldn't use that and
-                    # either pass NULL or GetWindowHandle().
-                    <CefWindowHandle>self.GetOpenerWindowHandle(),
-                    PyToCefStringValue("DevTools"))
+            window_info.SetAsPopup(<CefWindowHandle>self.GetWindowHandle(),
+                                   PyToCefStringValue("DevTools"))
         cdef CefBrowserSettings settings
         cdef CefPoint inspect_element_at
         self.GetCefBrowserHost().get().ShowDevTools(

From 0da13937e50f389cba25533959c2b760403fb80f Mon Sep 17 00:00:00 2001
From: Czarek Tomczak <cztomczak@users.noreply.github.com>
Date: Mon, 20 Jul 2020 19:19:03 +0200
Subject: [PATCH 212/238] Fix Mac issues in Tkinter example (#309, #441)

Still some issues on startup, see: https://github.com/cztomczak/cefpython/issues/583
---
 examples/tkinter_.py | 73 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 55 insertions(+), 18 deletions(-)

diff --git a/examples/tkinter_.py b/examples/tkinter_.py
index c823f3dc..327f171f 100644
--- a/examples/tkinter_.py
+++ b/examples/tkinter_.py
@@ -44,7 +44,7 @@
 
 
 def main():
-    logger.setLevel(_logging.INFO)
+    logger.setLevel(_logging.DEBUG)
     stream_handler = _logging.StreamHandler()
     formatter = _logging.Formatter("[%(filename)s] %(message)s")
     stream_handler.setFormatter(formatter)
@@ -55,19 +55,23 @@ def main():
     logger.info("Tk {ver}".format(ver=tk.Tcl().eval('info patchlevel')))
     assert cef.__version__ >= "55.3", "CEF Python v55.3+ required to run this"
     sys.excepthook = cef.ExceptHook  # To shutdown all CEF processes on error
+    # Tk must be initialized before CEF otherwise fatal error (Issue #306)
     root = tk.Tk()
     app = MainFrame(root)
-    # Tk must be initialized before CEF otherwise fatal error (Issue #306)
-    cef.Initialize()
+    settings = {}
+    if MAC:
+        settings["external_message_pump"] = True
+    cef.Initialize(settings=settings)
     app.mainloop()
+    logger.debug("Main loop exited")
     cef.Shutdown()
 
-
 class MainFrame(tk.Frame):
 
     def __init__(self, root):
         self.browser_frame = None
         self.navigation_bar = None
+        self.root = root
 
         # Root
         root.geometry("900x640")
@@ -124,7 +128,9 @@ def on_focus_out(self, _):
     def on_close(self):
         if self.browser_frame:
             self.browser_frame.on_root_close()
-        self.master.destroy()
+            self.browser_frame = None
+        else:
+            self.master.destroy()
 
     def get_browser(self):
         if self.browser_frame:
@@ -147,11 +153,12 @@ def setup_icon(self):
 
 class BrowserFrame(tk.Frame):
 
-    def __init__(self, master, navigation_bar=None):
+    def __init__(self, mainframe, navigation_bar=None):
         self.navigation_bar = navigation_bar
         self.closing = False
         self.browser = None
-        tk.Frame.__init__(self, master)
+        tk.Frame.__init__(self, mainframe)
+        self.mainframe = mainframe
         self.bind("<FocusIn>", self.on_focus_in)
         self.bind("<FocusOut>", self.on_focus_out)
         self.bind("<Configure>", self.on_configure)
@@ -165,27 +172,42 @@ def embed_browser(self):
         self.browser = cef.CreateBrowserSync(window_info,
                                              url="https://www.google.com/")
         assert self.browser
+        self.browser.SetClientHandler(LifespanHandler(self))
         self.browser.SetClientHandler(LoadHandler(self))
         self.browser.SetClientHandler(FocusHandler(self))
         self.message_loop_work()
 
     def get_window_handle(self):
-        if self.winfo_id() > 0:
-            return self.winfo_id()
-        elif MAC:
-            # On Mac window id is an invalid negative value (Issue #308).
-            # This is kind of a dirty hack to get window handle using
-            # PyObjC package. If you change structure of windows then you
+        if MAC:
+            # Do not use self.winfo_id() on Mac, because of these issues:
+            # 1. Window id sometimes has an invalid negative value (Issue #308).
+            # 2. Even with valid window id it crashes during the call to NSView.setAutoresizingMask:
+            #    https://github.com/cztomczak/cefpython/issues/309#issuecomment-661094466
+            #
+            # To fix it using PyObjC package to obtain window handle. If you change structure of windows then you
             # need to do modifications here as well.
+            #
+            # There is still one issue with this solution. Sometimes there is more than one window, for example when application
+            # didn't close cleanly last time Python displays an NSAlert window asking whether to Reopen that window. In such
+            # case app will crash and you will see in console:
+            # > Fatal Python error: PyEval_RestoreThread: NULL tstate
+            # > zsh: abort      python tkinter_.py
+            # Error messages related to this: https://github.com/cztomczak/cefpython/issues/441
+            #
+            # There is yet another issue that might be related as well:
+            # https://github.com/cztomczak/cefpython/issues/583
+            
             # noinspection PyUnresolvedReferences
             from AppKit import NSApp
             # noinspection PyUnresolvedReferences
             import objc
-            # Sometimes there is more than one window, when application
-            # didn't close cleanly last time Python displays an NSAlert
-            # window asking whether to Reopen that window.
+            logger.info("winfo_id={}".format(self.winfo_id()))
             # noinspection PyUnresolvedReferences
-            return objc.pyobjc_id(NSApp.windows()[-1].contentView())
+            content_view = objc.pyobjc_id(NSApp.windows()[-1].contentView())
+            logger.info("content_view={}".format(content_view))
+            return content_view
+        elif self.winfo_id() > 0:
+            return self.winfo_id()
         else:
             raise Exception("Couldn't obtain window handle")
 
@@ -224,10 +246,15 @@ def on_focus_out(self, _):
             self.browser.SetFocus(False)
 
     def on_root_close(self):
+        logger.info("BrowserFrame.on_root_close")
         if self.browser:
+            logger.debug("CloseBrowser")
             self.browser.CloseBrowser(True)
             self.clear_browser_references()
-        self.destroy()
+        else:
+            logger.debug("tk.Frame.destroy")
+            self.destroy()
+            
 
     def clear_browser_references(self):
         # Clear browser references that you keep anywhere in your
@@ -235,6 +262,16 @@ def clear_browser_references(self):
         self.browser = None
 
 
+class LifespanHandler(object):
+
+    def __init__(self, tkFrame):
+        self.tkFrame = tkFrame
+
+    def OnBeforeClose(self, browser, **_):
+        logger.debug("LifespanHandler.OnBeforeClose")
+        self.tkFrame.quit()
+
+
 class LoadHandler(object):
 
     def __init__(self, browser_frame):

From 3cc7606101f2b1b8191b4db3648c264349ca4628 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Wed, 19 Aug 2020 11:14:04 +0200
Subject: [PATCH 213/238] Add keyboard handler snippet.

---
 examples/snippets/keyboard_handler.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 examples/snippets/keyboard_handler.py

diff --git a/examples/snippets/keyboard_handler.py b/examples/snippets/keyboard_handler.py
new file mode 100644
index 00000000..9b8e40c8
--- /dev/null
+++ b/examples/snippets/keyboard_handler.py
@@ -0,0 +1,19 @@
+from cefpython3 import cefpython as cef
+
+
+def main():
+    cef.Initialize()
+    browser = cef.CreateBrowserSync(url="https://www.google.com/",
+                                    window_title="Keyboard Handler")
+    browser.SetClientHandler(KeyboardHandler())
+    cef.MessageLoop()
+    del browser
+    cef.Shutdown()
+
+
+class KeyboardHandler(object):
+    def OnKeyEvent(self, browser, event, event_handle,  **_):
+        print("OnKeyEvent: "+str(event))
+
+if __name__ == '__main__':
+    main()

From 2fcf395f4e67e83e5c1dc06b3bfd6818d4e42602 Mon Sep 17 00:00:00 2001
From: Czarek Tomczak <cztomczak@users.noreply.github.com>
Date: Fri, 9 Oct 2020 13:53:46 +0200
Subject: [PATCH 214/238] Update README.md

Fix links.
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 747381bf..546cd001 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ Table of contents:
 ## Introduction
 
 CEF Python is an open source project founded by
-[Czarek Tomczak](https://drive.google.com/file/d/17xmoT5Z_zTHkVclqPzrs2aAV64Uiu7fh/view)
+[Czarek Tomczak](https://www.linkedin.com/in/czarektomczak/)
 in 2012 to provide Python bindings for the
 [Chromium Embedded Framework](https://bitbucket.org/chromiumembedded/cef) (CEF).
 The Chromium project focuses mainly on Google Chrome application
@@ -317,7 +317,7 @@ notable are:
 
 If your company would like to sponsor CEF Python development efforts then
 please contact
-[Czarek](https://drive.google.com/file/d/17xmoT5Z_zTHkVclqPzrs2aAV64Uiu7fh/view).
+[Czarek](https://www.linkedin.com/in/czarektomczak/).
 Long term sponsorships are welcome and Czarek is open to ideas about
 the project. He would love to spend more time on developing this project,
 but he can't afford doing so in his free time. Currently there is no company

From 019033d2919a4fab84cb832ec5b76aad12e39c40 Mon Sep 17 00:00:00 2001
From: Xianguang Zhou <xianguang.zhou@outlook.com>
Date: Sun, 14 Feb 2021 22:44:22 +0800
Subject: [PATCH 215/238] Fix the bug of loading shared libraries. (#561)

* Prepend the package directory path to the "LD_LIBRARY_PATH" environment variable.

* Fix the bug of getting "LD_LIBRARY_PATH" environment variable.

* Fix loading shared libraries on Linux.

Co-authored-by: Czarek Tomczak <cztomczak@users.noreply.github.com>
---
 tools/installer/cefpython3.__init__.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tools/installer/cefpython3.__init__.py b/tools/installer/cefpython3.__init__.py
index fc00000d..ef784f2c 100644
--- a/tools/installer/cefpython3.__init__.py
+++ b/tools/installer/cefpython3.__init__.py
@@ -26,9 +26,13 @@
 
 package_dir = os.path.dirname(os.path.abspath(__file__))
 
-# This loads the libcef.so library for the subprocess executable.
-# On Mac it works without setting library paths.
-os.environ["LD_LIBRARY_PATH"] = package_dir
+# This loads the libcef.so library for the subprocess executable on Linux.
+# TODO: Use -Wl,-rpath=\$$ORIGIN in Makefile.
+ld_library_path = os.environ.get("LD_LIBRARY_PATH")
+if ld_library_path and ld_library_path.strip():
+    os.environ["LD_LIBRARY_PATH"] = package_dir + os.pathsep + ld_library_path
+else:
+    os.environ["LD_LIBRARY_PATH"] = package_dir
 
 # This env variable will be returned by cefpython.GetModuleDirectory().
 os.environ["CEFPYTHON3_PATH"] = package_dir

From 96f3b5ec1ef951a1959d378a5d4d87bf247b2c36 Mon Sep 17 00:00:00 2001
From: Martin Cejp <cejp.mart@gmail.com>
Date: Sun, 14 Feb 2021 16:20:20 +0100
Subject: [PATCH 216/238] Fix pango library wrong include path (hb.h: No such
 file or directory) (#589)

* Fix Fedora 32 build error (hb.h: No such file or directory)

* Update client_handler/Makefile

* Update client_handler/Makefile

* Update cpp_utils/Makefile

* Update subprocess/Makefile

* Update subprocess/Makefile-libcefpythonapp

* Update tools/cython_setup.py

Co-authored-by: Czarek Tomczak <cztomczak@users.noreply.github.com>
---
 src/client_handler/Makefile             | 1 +
 src/cpp_utils/Makefile                  | 2 +-
 src/subprocess/Makefile                 | 1 +
 src/subprocess/Makefile-libcefpythonapp | 1 +
 tools/cython_setup.py                   | 2 ++
 5 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/client_handler/Makefile b/src/client_handler/Makefile
index d217660e..25e645ff 100644
--- a/src/client_handler/Makefile
+++ b/src/client_handler/Makefile
@@ -37,6 +37,7 @@ INC = -I./../ -I./../common/ -I$(PYTHON_INCLUDE) \
 	-I/usr/include/glib-2.0 \
 	-I/usr/include/cairo \
 	-I/usr/include/pango-1.0 \
+	-I/usr/include/harfbuzz \
 	-I/usr/include/gdk-pixbuf-2.0 \
 	-I/usr/include/atk-1.0 \
 	-I/usr/lib/x86_64-linux-gnu/gtk-2.0/include \
diff --git a/src/cpp_utils/Makefile b/src/cpp_utils/Makefile
index 338fd960..e6a6a2fe 100644
--- a/src/cpp_utils/Makefile
+++ b/src/cpp_utils/Makefile
@@ -7,7 +7,7 @@ OUT = libcpp_utils.a
 INC = -I./../ -I/usr/include/gtk-2.0 \
 	-I/usr/include/glib-2.0 -I/usr/lib/i386-linux-gnu/gtk-2.0/include \
 	-I/usr/lib/i386-linux-gnu/glib-2.0/include -I/usr/include/cairo \
-	-I/usr/include/pango-1.0 -I/usr/include/gdk-pixbuf-2.0 \
+	-I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/gdk-pixbuf-2.0 \
 	-I/usr/include/atk-1.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include \
 	-I/usr/lib/x86_64-linux-gnu/gtk-2.0/include \
 	-I/usr/lib64/glib-2.0/include -I/usr/lib64/gtk-2.0/include \
diff --git a/src/subprocess/Makefile b/src/subprocess/Makefile
index f52b72df..adc34fca 100644
--- a/src/subprocess/Makefile
+++ b/src/subprocess/Makefile
@@ -11,6 +11,7 @@ INC = -I./../ -I./../common/ -I$(PYTHON_INCLUDE) \
 	-I/usr/include/glib-2.0 \
 	-I/usr/include/cairo \
 	-I/usr/include/pango-1.0 \
+	-I/usr/include/harfbuzz \
 	-I/usr/include/gdk-pixbuf-2.0 \
 	-I/usr/include/atk-1.0 \
 	-I/usr/lib/x86_64-linux-gnu/gtk-2.0/include \
diff --git a/src/subprocess/Makefile-libcefpythonapp b/src/subprocess/Makefile-libcefpythonapp
index 23fbde39..e8a6b852 100644
--- a/src/subprocess/Makefile-libcefpythonapp
+++ b/src/subprocess/Makefile-libcefpythonapp
@@ -36,6 +36,7 @@ INC = -I./../ -I./../common/ -I$(PYTHON_INCLUDE) \
 	-I/usr/include/glib-2.0 \
 	-I/usr/include/cairo \
 	-I/usr/include/pango-1.0 \
+	-I/usr/include/harfbuzz \
 	-I/usr/include/gdk-pixbuf-2.0 \
 	-I/usr/include/atk-1.0 \
 	-I/usr/lib/x86_64-linux-gnu/gtk-2.0/include \
diff --git a/tools/cython_setup.py b/tools/cython_setup.py
index 4f0cafc6..52482cba 100644
--- a/tools/cython_setup.py
+++ b/tools/cython_setup.py
@@ -318,6 +318,7 @@ def get_include_dirs():
             '/usr/include/gtk-unix-print-2.0',
             '/usr/include/cairo',
             '/usr/include/pango-1.0',
+            '/usr/include/harfbuzz',
             '/usr/include/gdk-pixbuf-2.0',
             '/usr/include/atk-1.0',
             # Fedora
@@ -337,6 +338,7 @@ def get_include_dirs():
             '/usr/include/gtk-unix-print-2.0',
             '/usr/include/cairo',
             '/usr/include/pango-1.0',
+            '/usr/include/harfbuzz',
             '/usr/include/gdk-pixbuf-2.0',
             '/usr/include/atk-1.0',
             # Ubuntu

From 054ff3ca52106099d078f37b3f8986e5252c7733 Mon Sep 17 00:00:00 2001
From: Bryan Koroleski
 <44987192+bryan-koroleski-fivestars@users.noreply.github.com>
Date: Sun, 14 Feb 2021 10:09:52 -0600
Subject: [PATCH 217/238] Update int range detection for Python 3 (#603)

* Update int range detection for Python 3

Python 3 unified ints and longs into a single int type. The long type
is still available in Cython as an alias to int.

* Update javascript_bindings.pyx

* Update process_message_utils.pyx

Co-authored-by: Czarek Tomczak <cztomczak@users.noreply.github.com>
---
 Authors                       |  1 +
 src/javascript_bindings.pyx   |  2 ++
 src/process_message_utils.pyx | 33 +++++++++------------------------
 tools/cython_setup.py         |  3 +++
 4 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/Authors b/Authors
index b4c55d20..b44b24e6 100644
--- a/Authors
+++ b/Authors
@@ -19,3 +19,4 @@ Contributors:
     Dónal McMullan <https://github.com/donalm>
     nobodyguy <https://github.com/nobodyguy>
     Elliot Woods <https://github.com/elliotwoods>
+    Bryan Koroleski <https://github.com/bryan-koroleski-fivestars>
diff --git a/src/javascript_bindings.pyx b/src/javascript_bindings.pyx
index 9043639e..31620a6d 100644
--- a/src/javascript_bindings.pyx
+++ b/src/javascript_bindings.pyx
@@ -140,6 +140,8 @@ cdef class JavascriptBindings:
             return True
         elif valueType == int:
             return True
+        elif valueType == long:
+            return True
         elif valueType == type(None):
             return True
         elif IsFunctionOrMethod(valueType):
diff --git a/src/process_message_utils.pyx b/src/process_message_utils.pyx
index 8ced3f6c..e2d55dab 100644
--- a/src/process_message_utils.pyx
+++ b/src/process_message_utils.pyx
@@ -238,14 +238,9 @@ cdef CefRefPtr[CefListValue] PyListToCefListValue(
             ret.get().SetNull(index)
         elif valueType == bool:
             ret.get().SetBool(index, bool(value))
-        elif valueType == int:
-            ret.get().SetInt(index, int(value))
-        elif valueType == long:
-            # Int32 range is -2147483648..2147483647, we've increased the
-            # minimum size by one as Cython was throwing a warning:
-            # "unary minus operator applied to unsigned type, result still
-            # unsigned".
-            if -2147483647 <= value <= 2147483647:
+        elif valueType == int or valueType == long:  # In Py3 int and long types are the same type.
+            # Int32 range is -2147483648..2147483647
+            if INT_MIN <= value <= INT_MAX:
                 ret.get().SetInt(index, int(value))
             else:
                 # Long values become strings.
@@ -297,14 +292,9 @@ cdef void PyListToExistingCefListValue(
             cefListValue.get().SetNull(index)
         elif valueType == bool:
             cefListValue.get().SetBool(index, bool(value))
-        elif valueType == int:
-            cefListValue.get().SetInt(index, int(value))
-        elif valueType == long:
-            # Int32 range is -2147483648..2147483647, we've increased the
-            # minimum size by one as Cython was throwing a warning:
-            # "unary minus operator applied to unsigned type, result still
-            # unsigned".
-            if -2147483647 <= value <= 2147483647:
+        elif valueType == int or valueType == long:  # In Py3 int and long types are the same type.
+            # Int32 range is -2147483648..2147483647
+            if INT_MIN <= value <= INT_MAX:
                 cefListValue.get().SetInt(index, int(value))
             else:
                 # Long values become strings.
@@ -357,14 +347,9 @@ cdef CefRefPtr[CefDictionaryValue] PyDictToCefDictionaryValue(
             ret.get().SetNull(cefKey)
         elif valueType == bool:
             ret.get().SetBool(cefKey, bool(value))
-        elif valueType == int:
-            ret.get().SetInt(cefKey, int(value))
-        elif valueType == long:
-            # Int32 range is -2147483648..2147483647, we've increased the
-            # minimum size by one as Cython was throwing a warning:
-            # "unary minus operator applied to unsigned type, result still
-            # unsigned".
-            if -2147483647 <= value <= 2147483647:
+        elif valueType == int or valueType == long:  # In Py3 int and long types are the same type.
+            # Int32 range is -2147483648..2147483647
+            if INT_MIN <= value <= INT_MAX:
                 ret.get().SetInt(cefKey, int(value))
             else:
                 # Long values become strings.
diff --git a/tools/cython_setup.py b/tools/cython_setup.py
index 52482cba..5b3049db 100644
--- a/tools/cython_setup.py
+++ b/tools/cython_setup.py
@@ -470,6 +470,9 @@ def compile_time_constants():
         # A way around Python 3.2 bug: UNAME_SYSNAME is not set
         contents += 'DEF UNAME_SYSNAME = "%s"\n' % platform.uname()[0]
         contents += 'DEF PY_MAJOR_VERSION = %s\n' % sys.version_info.major
+        contents += 'cdef extern from "limits.h":\n'
+        contents += '    cdef int INT_MIN\n'
+        contents += '    cdef int INT_MAX\n'
         fo.write(contents.encode("utf-8"))
 
 

From 686d528b3eebbe5b84a770f5d266aea8dd185721 Mon Sep 17 00:00:00 2001
From: Czarek Tomczak <cztomczak@users.noreply.github.com>
Date: Sun, 14 Feb 2021 17:21:13 +0100
Subject: [PATCH 218/238] Fix pyinstaller hook for pyinstaller >= 4.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Thanks to Brénainn Woodsend (https://github.com/bwoodsend) for the fix.
See also https://github.com/cztomczak/cefpython/pull/600 .
---
 examples/pyinstaller/hook-cefpython3.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/examples/pyinstaller/hook-cefpython3.py b/examples/pyinstaller/hook-cefpython3.py
index 7522b7be..9160f67f 100644
--- a/examples/pyinstaller/hook-cefpython3.py
+++ b/examples/pyinstaller/hook-cefpython3.py
@@ -14,8 +14,13 @@
 import sys
 import PyInstaller
 from PyInstaller.utils.hooks import is_module_satisfies, get_package_paths
-from PyInstaller.compat import is_win, is_darwin, is_linux, is_py2
+from PyInstaller.compat import is_win, is_darwin, is_linux
 from PyInstaller import log as logging
+try:
+    # PyInstaller >= 4.0 doesn't support Python 2.7
+    from PyInstaller.compat import is_py2
+except ImportError:
+    is_py2 = None
 
 # Constants
 CEFPYTHON_MIN_VERSION = "57.0"

From 8e36e82a21a95574fbc2cc329be4f2d5e82f6d00 Mon Sep 17 00:00:00 2001
From: Holger Badorreck <6099617+hoba87@users.noreply.github.com>
Date: Sun, 14 Feb 2021 17:30:11 +0100
Subject: [PATCH 219/238] update kivy example (#573)

* update old print syntax

* remove pygtk, gtk dependencies

* restore kivy pygtk dependency for linux, add platform dependent conditional statements

* kivy example macos keyboard working

* external pump message only for macos

* Update kivy_.py

Co-authored-by: Czarek Tomczak <cztomczak@users.noreply.github.com>
---
 src/linux/binaries_64bit/kivy_.py | 46 ++++++++++++++++++++-----------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/src/linux/binaries_64bit/kivy_.py b/src/linux/binaries_64bit/kivy_.py
index bdfb6d2c..49543bf9 100644
--- a/src/linux/binaries_64bit/kivy_.py
+++ b/src/linux/binaries_64bit/kivy_.py
@@ -8,11 +8,20 @@
 
 from cefpython3 import cefpython as cef
 
-import pygtk
-import gtk
 import sys
 import os
 import time
+if sys.platform == 'linux':
+    import pygtk
+    import gtk
+    pygtk.require('2.0')
+elif sys.platform == 'darwin':
+    import gi
+    gi.require_version("Gtk", "3.0")
+    from gi.repository import Gtk
+elif sys.platform == 'win32':
+    # no gtk needed on Windows
+    pass
 
 from kivy.app import App
 from kivy.uix.button import Button
@@ -28,9 +37,6 @@
 # Global variables
 g_switches = None
 
-# PyGTK required
-pygtk.require('2.0')
-
 
 class BrowserLayout(BoxLayout):
 
@@ -150,9 +156,6 @@ def start_cef(self):
 
         # Configure CEF
         settings = {
-            # This directories must be set on Linux
-            "locales_dir_path": cef.GetModuleDirectory()+"/locales",
-            "resources_dir_path": cef.GetModuleDirectory(),
             "browser_subprocess_path": "%s/%s" % (
                 cef.GetModuleDirectory(), "subprocess"),
             "windowless_rendering_enabled": True,
@@ -161,7 +164,15 @@ def start_cef(self):
                 "enabled": False,
             },
             "external_message_pump": False,  # See Issue #246
+            "multi_threaded_message_loop": False,
         }
+        if sys.platform == 'linux':
+            # This directories must be set on Linux
+            settings["locales_dir_path"] = cef.GetModuleDirectory() + "/locales"
+            settings["resources_dir_path"] = cef.GetModuleDirectory()
+        if sys.platform == 'darwin':
+            settings["external_message_pump"] = True  # Temporary fix for Issue #246
+
         switches = {
             # Tweaking OSR performance by setting the same Chromium flags
             # as in upstream cefclient (# Issue #240).
@@ -190,18 +201,21 @@ def start_cef(self):
         # Start idle - CEF message loop work.
         Clock.schedule_once(self._message_loop_work, 0)
 
+        windowInfo = cef.WindowInfo()
+
         # TODO: For printing to work in off-screen-rendering mode
         #       it is enough to call gtk_init(). It is not required
         #       to provide window handle when calling SetAsOffscreen().
         #       However it still needs to be tested whether providing
         #       window handle is required for mouse context menu and
         #       popup widgets to work.
-        gtkwin = gtk.Window()
-        gtkwin.realize()
-
         # WindowInfo offscreen flag
-        windowInfo = cef.WindowInfo()
-        windowInfo.SetAsOffscreen(gtkwin.window.xid)
+        if sys.platform == 'linux':
+            gtkwin = gtk.Window()
+            gtkwin.realize()
+            windowInfo.SetAsOffscreen(gtkwin.window.xid)
+        elif sys.platform == 'darwin' or sys.platform == 'win32':
+            windowInfo.SetAsOffscreen(0)
 
         # Create Broswer and naviagte to empty page <= OnPaint won't get
         # called yet
@@ -519,12 +533,12 @@ def get_windows_key_code(self, kivycode):
 
     def go_forward(self, *_):
         """Going to forward in browser history."""
-        print "go forward"
+        print("go forward")
         self.browser.GoForward()
 
     def go_back(self, *_):
         """Going back in browser history."""
-        print "go back"
+        print("go back")
         self.browser.GoBack()
 
     def reload(self, *_):
@@ -864,7 +878,7 @@ def OnLoadingStateChange(self, is_loading, **_):
     def OnPaint(self, element_type, paint_buffer, **_):
         # print "OnPaint()"
         if element_type != cef.PET_VIEW:
-            print "Popups aren't implemented yet"
+            print("Popups aren't implemented yet")
             return
 
         # FPS meter ("fps" arg)

From 55e63607afdce5d122f3d78884200a5e3f84938d Mon Sep 17 00:00:00 2001
From: gary <gary@byoteki.com>
Date: Sun, 14 Feb 2021 12:03:24 -0800
Subject: [PATCH 220/238] Add support for Python 3.8 and Upgrade Cython (#594)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes: https://github.com/cztomczak/cefpython/issues/546

Had to include harfbuzz manually as newer Pango change this.
See:
    https://github.com/eiskaltdcpp/eiskaltdcpp/issues/413
    https://gitlab.gnome.org/GNOME/pango/-/issues/387

Also had to add `-Wno-deprecated-declarations` to get this to compile because
of the following errors that didn't seem to be coming from this code directly:

    warning: ‘GTimeVal’ is deprecated: Use 'GDateTime' instead
    warning: ‘GTypeDebugFlags’ is deprecated
---
 README.md                              | 6 +++---
 src/common/cefpython_public_api.h      | 2 ++
 tools/build.py                         | 2 +-
 tools/build_distrib.py                 | 2 +-
 tools/common.py                        | 2 ++
 tools/installer/cefpython3.__init__.py | 3 +++
 tools/installer/cefpython3.setup.py    | 1 +
 tools/requirements.txt                 | 2 +-
 8 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 546cd001..d4f4c493 100644
--- a/README.md
+++ b/README.md
@@ -210,9 +210,9 @@ support old operating systems then choose the v31 release.
 
 OS | Py2 | Py3 | 32bit | 64bit | Requirements
 --- | --- | --- | --- | --- | ---
-Windows | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | Yes | Yes | Windows 7+
-Linux | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | Yes | Yes | Debian 8+, Ubuntu 14.04+,<br> Fedora 24+, openSUSE 13.3+
-Mac | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | No | Yes | MacOS 10.9+
+Windows | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 / 3.8 | Yes | Yes | Windows 7+
+Linux | 2.7 | 3.4 / 3.5 / 3.6 / 3.7  3.8 | Yes | Yes | Debian 8+, Ubuntu 14.04+,<br> Fedora 24+, openSUSE 13.3+
+Mac | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 / 3.8 | No | Yes | MacOS 10.9+
 
 These platforms are not supported yet:
 - ARM - see [Issue #267](../../issues/267)
diff --git a/src/common/cefpython_public_api.h b/src/common/cefpython_public_api.h
index 53ad62c6..8e4ff60b 100644
--- a/src/common/cefpython_public_api.h
+++ b/src/common/cefpython_public_api.h
@@ -46,6 +46,8 @@
 #include "../../build/build_cefpython/cefpython_py36_fixed.h"
 #elif PY_MINOR_VERSION == 7
 #include "../../build/build_cefpython/cefpython_py37_fixed.h"
+#elif PY_MINOR_VERSION == 8
+#include "../../build/build_cefpython/cefpython_py38_fixed.h"
 #endif // PY_MINOR_VERSION
 #endif // PY_MAJOR_VERSION
 
diff --git a/tools/build.py b/tools/build.py
index 522a9b08..b3bc9920 100644
--- a/tools/build.py
+++ b/tools/build.py
@@ -293,7 +293,7 @@ def setup_environ():
         print("[build.py] PYTHON_INCLUDE: {python_include}"
               .format(python_include=os.environ["PYTHON_INCLUDE"]))
 
-        os.environ["CEF_CCFLAGS"] = "-std=gnu++11 -DNDEBUG -Wall -Werror"
+        os.environ["CEF_CCFLAGS"] = "-std=gnu++11 -DNDEBUG -Wall -Werror -Wno-deprecated-declarations"
         if FAST_FLAG:
             os.environ["CEF_CCFLAGS"] += " -O0"
         else:
diff --git a/tools/build_distrib.py b/tools/build_distrib.py
index e0a5bde1..f452bc0d 100644
--- a/tools/build_distrib.py
+++ b/tools/build_distrib.py
@@ -80,7 +80,7 @@
 ALLOW_PARTIAL = False
 
 # Python versions
-SUPPORTED_PYTHON_VERSIONS = [(2, 7), (3, 4), (3, 5), (3, 6), (3, 7)]
+SUPPORTED_PYTHON_VERSIONS = [(2, 7), (3, 4), (3, 5), (3, 6), (3, 7), (3, 8)]
 
 # Python search paths. It will use first Python found for specific version.
 # Supports replacement of one environment variable in path eg.: %ENV_KEY%.
diff --git a/tools/common.py b/tools/common.py
index 113bcd9e..226fd391 100644
--- a/tools/common.py
+++ b/tools/common.py
@@ -473,6 +473,8 @@ def get_msvs_for_python(vs_prefix=False):
         return "VS2015" if vs_prefix else "2015"
     elif sys.version_info[:2] == (3, 7):
         return "VS2015" if vs_prefix else "2015"
+    elif sys.version_info[:2] == (3, 8):
+        return "VS2015" if vs_prefix else "2015"
     else:
         print("ERROR: This version of Python is not supported")
         sys.exit(1)
diff --git a/tools/installer/cefpython3.__init__.py b/tools/installer/cefpython3.__init__.py
index ef784f2c..5f779a54 100644
--- a/tools/installer/cefpython3.__init__.py
+++ b/tools/installer/cefpython3.__init__.py
@@ -64,5 +64,8 @@
 elif sys.version_info[:2] == (3, 7):
     # noinspection PyUnresolvedReferences
     from . import cefpython_py37 as cefpython
+elif sys.version_info[:2] == (3, 8):
+    # noinspection PyUnresolvedReferences
+    from . import cefpython_py38 as cefpython
 else:
     raise Exception("Python version not supported: " + sys.version)
diff --git a/tools/installer/cefpython3.setup.py b/tools/installer/cefpython3.setup.py
index 6814cbb7..2a926913 100644
--- a/tools/installer/cefpython3.setup.py
+++ b/tools/installer/cefpython3.setup.py
@@ -148,6 +148,7 @@ def main():
             "Programming Language :: Python :: 3.5",
             "Programming Language :: Python :: 3.6",
             "Programming Language :: Python :: 3.7",
+            "Programming Language :: Python :: 3.8",
             "Topic :: Desktop Environment",
             "Topic :: Internet",
             "Topic :: Internet :: WWW/HTTP",
diff --git a/tools/requirements.txt b/tools/requirements.txt
index 81ebc0c5..4b083579 100644
--- a/tools/requirements.txt
+++ b/tools/requirements.txt
@@ -1,4 +1,4 @@
-Cython == 0.28.4
+Cython == 0.29.21
 docopt >= 0.6.2
 setuptools
 wheel

From d6deaf8e2b87266d7b5fc4052fc05b5622056b17 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Sun, 14 Feb 2021 23:44:38 +0100
Subject: [PATCH 221/238] Support Python 3.8 and Python 3.9 (Issues #546 and
 #593).

---
 README.md                                     | 6 +++---
 docs/Build-instructions.md                    | 8 +++++---
 examples/screenshot.py                        | 2 +-
 src/common/cefpython_public_api.h             | 2 ++
 src/compile_time_constants.pxi                | 3 +++
 src/subprocess/main_message_loop/util_win.cpp | 4 ++--
 src/subprocess/main_message_loop/util_win.h   | 2 +-
 tools/build.py                                | 2 +-
 tools/build_distrib.py                        | 5 +++--
 tools/common.py                               | 6 ++++++
 tools/cython_setup.py                         | 7 +++----
 tools/installer/cefpython3.__init__.py        | 3 +++
 tools/installer/cefpython3.setup.py           | 1 +
 tools/make_installer.py                       | 8 +++++---
 14 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index d4f4c493..48a9af4a 100644
--- a/README.md
+++ b/README.md
@@ -210,9 +210,9 @@ support old operating systems then choose the v31 release.
 
 OS | Py2 | Py3 | 32bit | 64bit | Requirements
 --- | --- | --- | --- | --- | ---
-Windows | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 / 3.8 | Yes | Yes | Windows 7+
-Linux | 2.7 | 3.4 / 3.5 / 3.6 / 3.7  3.8 | Yes | Yes | Debian 8+, Ubuntu 14.04+,<br> Fedora 24+, openSUSE 13.3+
-Mac | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 / 3.8 | No | Yes | MacOS 10.9+
+Windows | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 / 3.8 / 3.9 | Yes | Yes | Windows 7+ (Note that Python 3.9 supports Windows 8.1+)
+Linux | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | Yes | Yes | Debian 8+, Ubuntu 14.04+,<br> Fedora 24+, openSUSE 13.3+
+Mac | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | No | Yes | MacOS 10.9+
 
 These platforms are not supported yet:
 - ARM - see [Issue #267](../../issues/267)
diff --git a/docs/Build-instructions.md b/docs/Build-instructions.md
index 5df63bec..9ca4d6e9 100644
--- a/docs/Build-instructions.md
+++ b/docs/Build-instructions.md
@@ -66,8 +66,9 @@ are named "cefpythonXX" where XX is Chromium version number.
   from [here](https://www.microsoft.com/en-us/download/details.aspx?id=44266)
 
 5) For Python 2.7 and when using using "Visual C++ compiler for Python 2.7"
-   you have to install "Visual C++ 2008 Redistributable Package (x64)"
-   from [here](https://www.microsoft.com/en-us/download/details.aspx?id=15336)
+   you have to install "Visual C++ 2008 Redistributable Package"
+   from [here](https://www.microsoft.com/en-us/download/details.aspx?id=29)
+   and [here](https://www.microsoft.com/en-us/download/details.aspx?id=15336)
 
 6) Clone cefpython, checkout for example "cefpython57" branch
    that includes Chromium v57, then create a build/ directory and enter it:
@@ -164,7 +165,8 @@ requirements common for all platforms.
     * For Python 2.7 install "Microsoft Visual C++ Compiler for Python 2.7"
       from [here](https://www.microsoft.com/en-us/download/details.aspx?id=44266)
     * When using "Visual C++ compiler for Python 2.7" you have to install
-      "Microsoft Visual C++ 2008 Redistributable Package (x64)" from
+      "Microsoft Visual C++ 2008 Redistributable Package" from
+      [here](https://www.microsoft.com/en-us/download/details.aspx?id=29) and
       [here](https://www.microsoft.com/en-us/download/details.aspx?id=15336)
     * For Python 2.7 copy "cefpython/src/windows/py27/stdint.h" to
       "%LocalAppData%\Programs\Common\Microsoft\Visual C++ for Python\9.0\VC\include\"
diff --git a/examples/screenshot.py b/examples/screenshot.py
index d6dc661c..976ba538 100644
--- a/examples/screenshot.py
+++ b/examples/screenshot.py
@@ -42,7 +42,7 @@
 import sys
 
 try:
-    from PIL import Image, PILLOW_VERSION
+    from PIL import Image, __version__ as PILLOW_VERSION
 except ImportError:
     print("[screenshot.py] Error: PIL module not available. To install"
           " type: pip install Pillow")
diff --git a/src/common/cefpython_public_api.h b/src/common/cefpython_public_api.h
index 8e4ff60b..c796388e 100644
--- a/src/common/cefpython_public_api.h
+++ b/src/common/cefpython_public_api.h
@@ -48,6 +48,8 @@
 #include "../../build/build_cefpython/cefpython_py37_fixed.h"
 #elif PY_MINOR_VERSION == 8
 #include "../../build/build_cefpython/cefpython_py38_fixed.h"
+#elif PY_MINOR_VERSION == 9
+#include "../../build/build_cefpython/cefpython_py39_fixed.h"
 #endif // PY_MINOR_VERSION
 #endif // PY_MAJOR_VERSION
 
diff --git a/src/compile_time_constants.pxi b/src/compile_time_constants.pxi
index 609470c1..bf130d6e 100644
--- a/src/compile_time_constants.pxi
+++ b/src/compile_time_constants.pxi
@@ -5,3 +5,6 @@
 
 DEF UNAME_SYSNAME = "Windows"
 DEF PY_MAJOR_VERSION = 3
+cdef extern from "limits.h":
+    cdef int INT_MIN
+    cdef int INT_MAX
diff --git a/src/subprocess/main_message_loop/util_win.cpp b/src/subprocess/main_message_loop/util_win.cpp
index bc1f0965..834850e3 100644
--- a/src/subprocess/main_message_loop/util_win.cpp
+++ b/src/subprocess/main_message_loop/util_win.cpp
@@ -136,8 +136,8 @@ int GetCefKeyboardModifiers(WPARAM wparam, LPARAM lparam) {
   return modifiers;
 }
 
-bool IsKeyDown(WPARAM wparam) {
-  return (GetKeyState(wparam) & 0x8000) != 0;
+bool IsKeyDown(int keycode) {
+  return (GetKeyState(keycode) & 0x8000) != 0;
 }
 
 float GetDeviceScaleFactor() {
diff --git a/src/subprocess/main_message_loop/util_win.h b/src/subprocess/main_message_loop/util_win.h
index 39870204..a716d938 100644
--- a/src/subprocess/main_message_loop/util_win.h
+++ b/src/subprocess/main_message_loop/util_win.h
@@ -31,7 +31,7 @@ WNDPROC SetWndProcPtr(HWND hWnd, WNDPROC wndProc);
 
 int GetCefMouseModifiers(WPARAM wparam);
 int GetCefKeyboardModifiers(WPARAM wparam, LPARAM lparam);
-bool IsKeyDown(WPARAM wparam);
+bool IsKeyDown(int keycode);
 
 // Returns the device scale factor. For example, 200% display scaling will
 // return 2.0.
diff --git a/tools/build.py b/tools/build.py
index b3bc9920..f3960283 100644
--- a/tools/build.py
+++ b/tools/build.py
@@ -809,7 +809,7 @@ def build_cefpython_module():
             args = list()
             args.append("\"{python}\"".format(python=sys.executable))
             args.append(os.path.join(TOOLS_DIR, os.path.basename(__file__)))
-            assert __file__ in sys.argv[0]
+            assert os.path.basename(__file__) in sys.argv[0]
             args.extend(SYS_ARGV_ORIGINAL[1:])
             command = " ".join(args)
             print("[build.py] Running command: %s" % command)
diff --git a/tools/build_distrib.py b/tools/build_distrib.py
index f452bc0d..01ae66da 100644
--- a/tools/build_distrib.py
+++ b/tools/build_distrib.py
@@ -80,13 +80,14 @@
 ALLOW_PARTIAL = False
 
 # Python versions
-SUPPORTED_PYTHON_VERSIONS = [(2, 7), (3, 4), (3, 5), (3, 6), (3, 7), (3, 8)]
+SUPPORTED_PYTHON_VERSIONS = [(2, 7), (3, 4), (3, 5), (3, 6), (3, 7), (3, 8), (3, 9)]
 
 # Python search paths. It will use first Python found for specific version.
 # Supports replacement of one environment variable in path eg.: %ENV_KEY%.
 PYTHON_SEARCH_PATHS = dict(
     WINDOWS=[
         "C:\\Python*\\",
+        "C:\\Pythons\\Python*\\",
         "%LOCALAPPDATA%\\Programs\\Python\\Python*\\",
         "C:\\Program Files\\Python*\\",
         "C:\\Program Files (x86)\\Python*\\",
@@ -614,7 +615,7 @@ def check_cpp_extension_dependencies_issue359(setup_dir, all_pythons):
         return
     checked_any = False
     for python in all_pythons:
-        if python["version2"] in ((3, 5), (3, 6), (3, 7)):
+        if python["version2"] in ((3, 5), (3, 6), (3, 7), (3, 8), (3, 9)):
             checked_any = True
             if not os.path.exists(os.path.join(setup_dir, "cefpython3",
                                                "msvcp140.dll")):
diff --git a/tools/common.py b/tools/common.py
index 226fd391..303ccb85 100644
--- a/tools/common.py
+++ b/tools/common.py
@@ -219,15 +219,19 @@
 
 VS_PLATFORM_ARG = "x86" if ARCH32 else "amd64"
 
+# Python 3.5 / 3.6 / 3.7 / 3.8 / 3.9
 VS2015_VCVARS = ("C:\\Program Files (x86)\\Microsoft Visual Studio 14.0"
                  "\\VC\\vcvarsall.bat")
 
+# Required for building old CEF branches < 2704
 VS2013_VCVARS = ("C:\\Program Files (x86)\\Microsoft Visual Studio 12.0"
                  "\\VC\\vcvarsall.bat")
 
+# Python 3.4
 VS2010_VCVARS = ("C:\\Program Files (x86)\\Microsoft Visual Studio 10.0"
                  "\\VC\\vcvarsall.bat")
 
+# Python 2.7
 VS2008_VCVARS = ("C:\\Program Files (x86)\\Microsoft Visual Studio 9.0"
                  "\\VC\\vcvarsall.bat")
 
@@ -475,6 +479,8 @@ def get_msvs_for_python(vs_prefix=False):
         return "VS2015" if vs_prefix else "2015"
     elif sys.version_info[:2] == (3, 8):
         return "VS2015" if vs_prefix else "2015"
+    elif sys.version_info[:2] == (3, 9):
+        return "VS2015" if vs_prefix else "2015"
     else:
         print("ERROR: This version of Python is not supported")
         sys.exit(1)
diff --git a/tools/cython_setup.py b/tools/cython_setup.py
index 5b3049db..436bcb2c 100644
--- a/tools/cython_setup.py
+++ b/tools/cython_setup.py
@@ -147,17 +147,15 @@ def get_winsdk_lib():
     if WINDOWS:
         if ARCH32:
             winsdk_libs = [
+                # Windows 7 SDKs.
                 r"C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\\Lib",
                 r"C:\\Program Files\\Microsoft SDKs\\Windows\\v7.0\\Lib",
-                # Visual Studio 2008 installation
-                r"C:\\Program Files\\Microsoft SDKs\\Windows\\v6.0A\\Lib",
             ]
         elif ARCH64:
             winsdk_libs = [
+                # Windows 7 SDKs.
                 r"C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\\Lib\\x64",
                 r"C:\\Program Files\\Microsoft SDKs\\Windows\\v7.0\\Lib\\x64",
-                # Visual Studio 2008 installation
-                r"C:\\Program Files\\Microsoft SDKs\\Windows\\v6.0A\\Lib\\x64",
             ]
         else:
             raise Exception("Unknown architecture")
@@ -433,6 +431,7 @@ def get_ext_modules(options):
         # > Unknown Extension options: 'cython_directives' warnings.warn(msg)
         cython_directives={
             # Any conversion to unicode must be explicit using .decode().
+            "language_level": 2,  # Yes, Py2 for all python versions.
             "c_string_type": "bytes",
             "c_string_encoding": "utf-8",
             "profile": ENABLE_PROFILING,
diff --git a/tools/installer/cefpython3.__init__.py b/tools/installer/cefpython3.__init__.py
index 5f779a54..624a26e7 100644
--- a/tools/installer/cefpython3.__init__.py
+++ b/tools/installer/cefpython3.__init__.py
@@ -67,5 +67,8 @@
 elif sys.version_info[:2] == (3, 8):
     # noinspection PyUnresolvedReferences
     from . import cefpython_py38 as cefpython
+elif sys.version_info[:2] == (3, 9):
+    # noinspection PyUnresolvedReferences
+    from . import cefpython_py39 as cefpython
 else:
     raise Exception("Python version not supported: " + sys.version)
diff --git a/tools/installer/cefpython3.setup.py b/tools/installer/cefpython3.setup.py
index 2a926913..d14ee2ce 100644
--- a/tools/installer/cefpython3.setup.py
+++ b/tools/installer/cefpython3.setup.py
@@ -149,6 +149,7 @@ def main():
             "Programming Language :: Python :: 3.6",
             "Programming Language :: Python :: 3.7",
             "Programming Language :: Python :: 3.8",
+            "Programming Language :: Python :: 3.9",
             "Topic :: Desktop Environment",
             "Topic :: Internet",
             "Topic :: Internet :: WWW/HTTP",
diff --git a/tools/make_installer.py b/tools/make_installer.py
index bc3b5cef..012e6657 100644
--- a/tools/make_installer.py
+++ b/tools/make_installer.py
@@ -338,7 +338,7 @@ def create_empty_log_file(log_file):
 
 def copy_cpp_extension_dependencies_issue359(pkg_dir):
     """CEF Python module is written in Cython and is a Python C++
-    extension and depends on msvcpXX.dll. For Python 3.5 / 3.6 / 3.7
+    extension and depends on msvcpXX.dll. For Python 3.5 / 3.6 / 3.7 / 3.8 / 3.9
     msvcp140.dll is required. See Issue #359. For Python 2.7
     msvcp90.dll is required. Etc. These dependencies are not included
     with Python binaries from Python.org."""
@@ -365,10 +365,12 @@ def copy_cpp_extension_dependencies_issue359(pkg_dir):
     # in the package. Thus if included, msvcpxx.dll dependency is
     # required as well.
 
-    # Python 3.5 / 3.6 / 3.7
+    # Python 3.5 / 3.6 / 3.7 / 3.8 / 3.9
     if os.path.exists(os.path.join(pkg_dir, "cefpython_py35.pyd")) \
             or os.path.exists(os.path.join(pkg_dir, "cefpython_py36.pyd")) \
-            or os.path.exists(os.path.join(pkg_dir, "cefpython_py37.pyd")):
+            or os.path.exists(os.path.join(pkg_dir, "cefpython_py37.pyd")) \
+            or os.path.exists(os.path.join(pkg_dir, "cefpython_py38.pyd")) \
+            or os.path.exists(os.path.join(pkg_dir, "cefpython_py39.pyd")):
         search_paths = [
             # This is where Microsoft Visual C++ 2015 Update 3 installs
             # (14.00.24212).

From 92aa6236268620105be0b3d5ce60412a8b5dbf5b Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Mon, 15 Feb 2021 19:01:48 +0100
Subject: [PATCH 222/238] Fix Python 3 error in build_distrib.py script (#546).

---
 tools/build_distrib.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/build_distrib.py b/tools/build_distrib.py
index 01ae66da..61560743 100644
--- a/tools/build_distrib.py
+++ b/tools/build_distrib.py
@@ -379,7 +379,7 @@ def uninstall_cefpython3_packages(pythons):
                    .format(python=python["executable"]))
         try:
             output = subprocess.check_output(command, shell=True)
-        except subprocess.CalledProcessError, exc:
+        except subprocess.CalledProcessError as exc:
             # pip show returns error code when package is not installed
             output = exc.output
         if not len(output.strip()):

From 3beaaf5dc39c80eea54a9bba6c4c35965764d628 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Mon, 15 Feb 2021 19:31:02 +0100
Subject: [PATCH 223/238] Fix build_distrib.py on Python 3 (Issue #546).

---
 tools/build_distrib.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/build_distrib.py b/tools/build_distrib.py
index 61560743..7adb535b 100644
--- a/tools/build_distrib.py
+++ b/tools/build_distrib.py
@@ -86,7 +86,7 @@
 # Supports replacement of one environment variable in path eg.: %ENV_KEY%.
 PYTHON_SEARCH_PATHS = dict(
     WINDOWS=[
-        "C:\\Python*\\",
+        "C:\\Python??*\\",
         "C:\\Pythons\\Python*\\",
         "%LOCALAPPDATA%\\Programs\\Python\\Python*\\",
         "C:\\Program Files\\Python*\\",
@@ -277,6 +277,8 @@ def search_for_pythons(search_arch):
                 version_str = subprocess.check_output([python, "-c",
                                                        version_code])
                 version_str = version_str.strip()
+                if sys.version_info >= (3, 0):
+                    version_str = version_str.decode("utf-8")
                 match = re.search("^\((\d+), (\d+), (\d+)\)$", version_str)
                 assert match, version_str
                 major = match.group(1)
@@ -288,6 +290,8 @@ def search_for_pythons(search_arch):
                              "print(str(platform.architecture()[0]));")
                 arch = subprocess.check_output([python, "-c", arch_code])
                 arch = arch.strip()
+                if sys.version_info >= (3, 0):
+                    arch = arch.decode("utf-8")
                 if version_tuple2 in SUPPORTED_PYTHON_VERSIONS \
                         and arch == search_arch:
                     name = ("Python {major}.{minor}.{micro} {arch}"

From 06d3b8c8e8164ea1a51caf00591b7eaedcbfc5ac Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Mon, 15 Feb 2021 23:26:45 +0100
Subject: [PATCH 224/238] Fix build_distrib.py script for Python 2.7 and Python
 3.4 (latest pip versions are broken with these old Pythons).

Fix screenshot.py example sometimes failing.

When compiling for Python 3.4 you can encounter the the missing
"ammintrin.h" header file error. Just copy it from the VS 2019
include/ directory.

For Pythons 3.5 / 3.6 / 3.7 / 3.8 / 3.9 you can use the same VC++ 14.2
(VS 2019) compiler which is binary compatible with VC++ 14.1 (VS 2017)
and VC++ 14.0 (VS 2015).

Currently the subprocess.exe executable built by Python 3.4 (VC++ 10.0
compiler) gives the least amount of false-positives by AVs on
virustotal.com . For comparison: Py34 (1/69), Py27 (2/69),
Py39 (5/69). Results differ for 32bit and 64bit binaries.
---
 examples/screenshot.py |  9 ++++++---
 tools/build_distrib.py | 28 ++++++++++++++++------------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/examples/screenshot.py b/examples/screenshot.py
index 976ba538..5ca8d491 100644
--- a/examples/screenshot.py
+++ b/examples/screenshot.py
@@ -158,6 +158,8 @@ def save_screenshot(browser):
                             "raw", "RGBA", 0, 1)
     image.save(SCREENSHOT_PATH, "PNG")
     print("[screenshot.py] Saved image: {path}".format(path=SCREENSHOT_PATH))
+    # See comments in exit_app() why PostTask must be used
+    cef.PostTask(cef.TID_UI, exit_app, browser)
 
 
 def open_with_default_application(path):
@@ -188,9 +190,10 @@ def OnLoadingStateChange(self, browser, is_loading, **_):
             # Loading is complete
             sys.stdout.write(os.linesep)
             print("[screenshot.py] Web page loading is complete")
-            save_screenshot(browser)
-            # See comments in exit_app() why PostTask must be used
-            cef.PostTask(cef.TID_UI, exit_app, browser)
+            print("[screenshot.py] Will save screenshot in 2 seconds")
+            # Give up to 2 seconds for the OnPaint call. Most of the time
+            # it is already called, but sometimes it may be called later.
+            cef.PostDelayedTask(cef.TID_UI, 2000, save_screenshot, browser)
 
     def OnLoadError(self, browser, frame, error_code, failed_url, **_):
         """Called when the resource load for a navigation fails
diff --git a/tools/build_distrib.py b/tools/build_distrib.py
index 7adb535b..051914f5 100644
--- a/tools/build_distrib.py
+++ b/tools/build_distrib.py
@@ -353,8 +353,14 @@ def install_upgrade_requirements(pythons):
               " for: {name}".format(name=python["name"]))
 
         # Upgrade pip
-        command = ("\"{python}\" -m pip install --upgrade pip"
-                   .format(python=python["executable"]))
+        pip_version = "pip"
+        # Old Python versions require specific versions of pip, latest versions are broken with these.
+        if python["version2"] == (2, 7):
+            pip_version = "pip==20.3.4"
+        elif python["version2"] == (3, 4):
+            pip_version = "pip==19.1.1"
+        command = ("\"{python}\" -m pip install --upgrade {pip_version}"
+                   .format(python=python["executable"], pip_version=pip_version))
         command = sudo_command(command, python=python["executable"])
         pcode = subprocess.call(command, shell=True)
         if pcode != 0:
@@ -522,39 +528,37 @@ def build_cefpython_modules(pythons, arch):
 
 
 def backup_subprocess_executable_issue342(python):
-    """Use subprocess executable build by Python 2.7 to avoid
-    false-positives by AVs when building subprocess with Python 3.
-    Windows-only issue."""
+    """Use subprocess executable built by Python 3.4 to have the least amount of
+    false-positives by AVs. Windows-only issue."""
     if not WINDOWS:
         return
     if python["version2"] == (2, 7):
         print("[build_distrib.py] Backup subprocess executable built"
-              " with Python 2.7 (Issue #342)")
+              " with Python 3.4 (Issue #342)")
         cefpython_binary_basename = get_cefpython_binary_basename(
                 get_os_postfix2_for_arch(python["arch"]))
         cefpython_binary = os.path.join(BUILD_DIR, cefpython_binary_basename)
         assert os.path.isdir(cefpython_binary)
         src = os.path.join(cefpython_binary, "subprocess.exe")
         dst = os.path.join(BUILD_CEFPYTHON,
-                           "subprocess_py27_{arch}_issue342.exe"
+                           "subprocess_py34_{arch}_issue342.exe"
                            .format(arch=python["arch"]))
         shutil.copy(src, dst)
 
 
 def restore_subprocess_executable_issue342(arch):
-    """Use subprocess executable build by Python 2.7 to avoid
-    false-positives by AVs when building subprocess with Python 3.
-    Windows-only issue."""
+    """Use subprocess executable built by Python 3.4 to have the least amount of
+    false-positives by AVs. Windows-only issue."""
     if not WINDOWS:
         return
     print("[build_distrib.py] Restore subprocess executable built"
-          " with Python 2.7 (Issue #342)")
+          " with Python 3.4 (Issue #342)")
     cefpython_binary_basename = get_cefpython_binary_basename(
             get_os_postfix2_for_arch(arch))
     cefpython_binary = os.path.join(BUILD_DIR, cefpython_binary_basename)
     assert os.path.isdir(cefpython_binary)
     src = os.path.join(BUILD_CEFPYTHON,
-                       "subprocess_py27_{arch}_issue342.exe"
+                       "subprocess_py34_{arch}_issue342.exe"
                        .format(arch=arch))
     assert os.path.isfile(src)
     dst = os.path.join(cefpython_binary, "subprocess.exe")

From 0e2503c4675d683d2b853267ee0183e4e7fb5726 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Tue, 16 Feb 2021 19:18:02 +0100
Subject: [PATCH 225/238] Add JS bindings long integer test. Add comments on
 DPI awareness.

---
 examples/hello_world.py |  7 +++++++
 unittests/main_test.py  | 26 ++++++++++++++++++--------
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/examples/hello_world.py b/examples/hello_world.py
index 478c7060..789f4666 100644
--- a/examples/hello_world.py
+++ b/examples/hello_world.py
@@ -1,5 +1,12 @@
 # Hello world example. Doesn't depend on any third party GUI framework.
 # Tested with CEF Python v57.0+.
+#
+# ==== High DPI support on Windows ====
+# To enable DPI awareness on Windows you have to either embed DPI aware manifest
+# in your executable created with pyinstaller or change python.exe properties manually:
+# Compatibility > High DPI scaling override > Application.
+# Setting DPI awareness programmatically via a call to cef.DpiAware.EnableHighDpiSupport
+# is problematic in Python, may not work and can cause display glitches.
 
 from cefpython3 import cefpython as cef
 import platform
diff --git a/unittests/main_test.py b/unittests/main_test.py
index 99397da8..ce71af20 100644
--- a/unittests/main_test.py
+++ b/unittests/main_test.py
@@ -58,17 +58,18 @@
         print("test_function() ok");
 
         // Test binding property: test_property1
-        if (test_property1 == "Test binding property to the 'window' object") {
+        if (test_property1 === "Test binding property to the 'window' object") {
             print("test_property_1 ok");
         } else {
             throw new Error("test_property1 contains invalid string");
         }
 
         // Test binding property: test_property2
-        if (JSON.stringify(test_property2) == '{"key1":"Test binding property'+
-                ' to the \\'window\\' object","key2":["Inside list",1,2]}') {
+        if (JSON.stringify(test_property2) === '{"key1":"Test binding property'+
+                ' to the \\'window\\' object","key2":["Inside list",2147483647,"2147483648"]}') {
             print("test_property2 ok");
         } else {
+            print("test_property2 invalid value: " + JSON.stringify(test_property2));
             throw new Error("test_property2 contains invalid value");
         }
 
@@ -81,7 +82,7 @@
         print("[TIMER] Call Python function and then js callback that was"+
               " passed (Issue #277 test)");
         external.test_callbacks(function(msg_from_python, py_callback){
-            if (msg_from_python == "String sent from Python") {
+            if (msg_from_python === "String sent from Python") {
                 print("test_callbacks() ok");
                 var execution_time = new Date().getTime() - start_time;
                 print("[TIMER]: Elapsed = "+String(execution_time)+" ms");
@@ -163,15 +164,23 @@ def test_main(self):
             cef.LoadCrlSetsFile(crlset)
             subtest_message("cef.LoadCrlSetsFile ok")
 
-        # High DPI on Windows
+        # High DPI on Windows.
+        # Setting DPI awareness from Python is usually too late and should be done
+        # via manifest file. Alternatively change python.exe properties > Compatibility
+        # > High DPI scaling override > Application.
+        # Using cef.DpiAware.EnableHighDpiSupport is problematic, it can cause
+        # display glitches.
         if WINDOWS:
             self.assertIsInstance(cef.DpiAware.GetSystemDpi(), tuple)
             window_size = cef.DpiAware.CalculateWindowSize(800, 600)
             self.assertIsInstance(window_size, tuple)
             self.assertGreater(window_size[0], 0)
             self.assertGreater(cef.DpiAware.Scale((800, 600))[0], 0)
-            cef.DpiAware.EnableHighDpiSupport()
-            self.assertTrue(cef.DpiAware.IsProcessDpiAware())
+
+            # OFF - see comments above.
+            # cef.DpiAware.EnableHighDpiSupport()
+            # self.assertTrue(cef.DpiAware.IsProcessDpiAware())
+
             # Make some calls again after DPI Aware was set
             self.assertIsInstance(cef.DpiAware.GetSystemDpi(), tuple)
             self.assertGreater(cef.DpiAware.Scale([800, 600])[0], 0)
@@ -374,9 +383,10 @@ def __init__(self, test_case):
         self.test_case = test_case
 
         # Test binding properties to the 'window' object.
+        # 2147483648 is out of INT_MAX limit and will be sent to JS as string value.
         self.test_property1 = "Test binding property to the 'window' object"
         self.test_property2 = {"key1": self.test_property1,
-                               "key2": ["Inside list", 1, 2]}
+                               "key2": ["Inside list", 2147483647, 2147483648]}
 
         # Asserts for True/False will be checked just before shutdown
         self.test_for_True = True  # Test whether asserts are working correctly

From d2c72528addad8ef41a2a460946f32fe425ed183 Mon Sep 17 00:00:00 2001
From: cztomczak <cztomczak@users.noreply.github.com>
Date: Tue, 16 Feb 2021 19:31:32 +0100
Subject: [PATCH 226/238] Update the sponsors sections in README.

---
 README.md | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 48a9af4a..e9175971 100644
--- a/README.md
+++ b/README.md
@@ -55,30 +55,29 @@ PyGame, PyOpenGL, PyWin32, PySide and PySDL2.
 <td width="50%" valign="top">
 
 <p align="center">
- <a href="https://lampix.com/">
-  <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/lampix360.png">
+ <a href="https://www.fivestars.com/">
+  <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/fivestars360.png">
  </a>
 </p>
 
-Many Thanks to Lampix for sponsoring the
-[v66 release](../../releases/tag/v66.0). Lampix is the first hardware
-and software solution that turns any surface into a smart, augmented reality
-or interactive surface. Please visit their website:
-<a href="https://lampix.com/">Lampix.com</a>
+Thank you to Fivestars for sponsoring the [v66.1 release](../../releases/tag/v66.1)
+with Python 3.8 / 3.9 support. Fivestars helps local communities thrive by empowering
+small businesses with cutting edge marketing technology. Please visit their website:
+<a href="https://www.fivestars.com/">Fivestars.com</a>
 
 </td><td width="50%" valign="top">
 
 <p align="center">
- <a href="https://www.fivestars.com/">
-  <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/fivestars360.png">
+ <a href="https://lampix.com/">
+  <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/lampix360.png">
  </a>
 </p>
 
-Many thanks to Fivestars for sponsoring the
-[v49 legacy release](../../releases/tag/v49.0). Fivestars helps local
-communities thrive by empowering small
-businesses with cutting edge marketing technology. Please visit their website:
-<a href="https://www.fivestars.com/">Fivestars.com</a>
+Thank you to Lampix for sponsoring the
+[v66 release](../../releases/tag/v66.0). Lampix is the first hardware
+and software solution that turns any surface into a smart, augmented reality
+or interactive surface. Please visit their website:
+<a href="https://lampix.com/">Lampix.com</a>
 
 </tr></table>
 
@@ -274,6 +273,8 @@ priority.
 
 ### Thanks to all
 
+* [2021] Thank you to [Fivestars](https://www.fivestars.com/) for sponsoring
+  the v66.1 release with Python 3.8 / 3.9 support
 * [2018] Thanks to [Fivestars](https://www.fivestars.com/) for sponsoring
   the v49 release for legacy systems (WinXP/Vista)
 * [2018] Many thanks to [Lampix](https://lampix.com/) for sponsoring the v66

From 431b9956db660d5552c31fb4a3a891f619ed84a8 Mon Sep 17 00:00:00 2001
From: Czarek Tomczak <cztomczak@users.noreply.github.com>
Date: Tue, 13 Apr 2021 10:42:46 +0200
Subject: [PATCH 227/238] Fix Kivy example on Windows (#613).

---
 src/linux/binaries_64bit/kivy_.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/linux/binaries_64bit/kivy_.py b/src/linux/binaries_64bit/kivy_.py
index 49543bf9..a9a1590b 100644
--- a/src/linux/binaries_64bit/kivy_.py
+++ b/src/linux/binaries_64bit/kivy_.py
@@ -1,7 +1,5 @@
-# An example of embedding CEF browser in the Kivy framework.
-# The browser is embedded using off-screen rendering mode.
-
-# Tested using Kivy 1.7.2 stable, only on Linux.
+# An example of embedding CEF browser with the Kivy framework
+# by using off-screen rendering mode.
 
 # In this example kivy-lang is used to declare the layout which
 # contains two buttons (back, forward) and the browser view.
@@ -44,7 +42,7 @@ def __init__(self, **kwargs):
         super(BrowserLayout, self).__init__(**kwargs)
         self.orientation = "vertical"
 
-        self.browser_widget = CefBrowser(id="browser")
+        self.browser_widget = CefBrowser()
 
         layout = BoxLayout()
         layout.size_hint_y = None

From 80e6f3c9828fce40b103a4f51b8bc29d64c54b9c Mon Sep 17 00:00:00 2001
From: Czarek Tomczak <cztomczak@users.noreply.github.com>
Date: Wed, 21 Apr 2021 13:50:04 +0200
Subject: [PATCH 228/238] Fix link

---
 examples/README-examples.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/README-examples.md b/examples/README-examples.md
index ea5871c8..ec2f9bcd 100644
--- a/examples/README-examples.md
+++ b/examples/README-examples.md
@@ -107,7 +107,7 @@ yet ported to latest CEF. Some of them are externally maintained.
   for reading/modifying web requests: see the [wxpython-response.py](https://github.com/cztomczak/cefpython/blob/cefpython31/cefpython/cef3/linux/binaries_64bit/wxpython-response.py)
   example in the cefpython31 branch.
 - Example of using Python network library (urllib3/openssl) instead of Chromium's
-  network library - see [gist by Massimiliano Dal Cero](https://gist.github.com/yattamax/0252a3c5dc54a2f81650d5c0eafabf99)
+  network library - see [gist by Massimiliano Dal Cero](https://gist.github.com/cztomczak/83b77cbdda03ccef81e22e8bd36a51f6)
 - Example of passing exceptions from Python to Javascript and using await syntax to receive values from python return values - see [Managed python calls example by Elliot Woods](https://github.com/elliotwoods/cefpython-tests/tree/0180b22eac10a1bde08820ca192fdc30eb93f00d/6.%20Managed%20python%20calls)
 
 ## More examples to come

From 5679f28cec18a57a56e298da2927aac8d8f83ad6 Mon Sep 17 00:00:00 2001
From: relyx <12107287+Reskayoi@users.noreply.github.com>
Date: Fri, 14 May 2021 17:18:03 +0800
Subject: [PATCH 229/238] fix OnDownloadData decoding bug (#621)

---
 api/WebRequestClient.md | 2 +-
 src/web_request.pyx     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/WebRequestClient.md b/api/WebRequestClient.md
index d8431cec..0c75a668 100644
--- a/api/WebRequestClient.md
+++ b/api/WebRequestClient.md
@@ -65,7 +65,7 @@ response (or -1 if not determined).
 | Parameter | Type |
 | --- | --- |
 | web_request | [WebRequest](WebRequest.md) |
-| data | string |
+| data | bytes |
 | __Return__ | void |
 
 Called when some part of the response is read. |data| contains the current
diff --git a/src/web_request.pyx b/src/web_request.pyx
index 9891dade..8e51fca1 100644
--- a/src/web_request.pyx
+++ b/src/web_request.pyx
@@ -176,7 +176,7 @@ cdef public void WebRequestClient_OnDownloadData(
             if userCallback:
                 userCallback(
                         web_request=webRequest,
-                        data=VoidPtrToString(data, dataLength))
+                        data=VoidPtrToBytes(data, dataLength))
     except:
         (exc_type, exc_value, exc_trace) = sys.exc_info()
         sys.excepthook(exc_type, exc_value, exc_trace)

From b070673ba96572f49354b5507822528430525099 Mon Sep 17 00:00:00 2001
From: jonastieppo <jonastieppo@yahoo.com.br>
Date: Thu, 19 Dec 2024 14:41:39 -0300
Subject: [PATCH 230/238] Update README.md (#675)

Just updating to the latest version (really minor change).
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e9175971..f9a76a57 100644
--- a/README.md
+++ b/README.md
@@ -147,7 +147,7 @@ also download packages for offline installation available on the
 [GitHub Releases](../../releases) pages. Command to install with pip:
 
 ```
-pip install cefpython3==66.0
+pip install cefpython3==66.1
 ```
 
 

From 05586d5bd92b9b98f0d96f9d069f8c5b10223e9b Mon Sep 17 00:00:00 2001
From: Czarek Tomczak <cztomczak@users.noreply.github.com>
Date: Sat, 8 Feb 2025 01:06:33 +0100
Subject: [PATCH 231/238] Update README.md

---
 README.md | 311 +++++++++++++-----------------------------------------
 1 file changed, 71 insertions(+), 240 deletions(-)

diff --git a/README.md b/README.md
index f9a76a57..80bda463 100644
--- a/README.md
+++ b/README.md
@@ -2,22 +2,12 @@
 
 Table of contents:
 * [Introduction](#introduction)
-* [Latest releases sponsored by](#latest-releases-sponsored-by)
-  * [Thanks to all sponsors](#thanks-to-all-sponsors)
 * [Install](#install)
-* [Tutorial](#tutorial)
 * [Examples](#examples)
 * [Support](#support)
-* [Releases](#releases)
-  * [Next release](#next-release)
-  * [Latest release](#latest-release)
-  * [v49 release (WinXP/Vista)](#v49-release-winxpvista)
-  * [v31 release (old systems)](#v31-release-old-systems)
 * [Support development](#support-development)
-  * [Thanks to all](#thanks-to-all)
-* [Seeking new sponsors](#seeking-new-sponsors)
-* [Other READMEs](#other-readmes)
-* [Quick links](#quick-links)
+* [Seeking sponsors](#seeking-sponsors)
+* [API](#api)
 
 
 ## Introduction
@@ -49,39 +39,82 @@ frameworks such as PyQt, wxPython, PyGTK, PyGObject, Tkinter, Kivy, Panda3D,
 PyGame, PyOpenGL, PyWin32, PySide and PySDL2.
 
 
-## Latest releases sponsored by
+## Install
 
-<table border="0"><tr>
-<td width="50%" valign="top">
+You can install [pypi/cefpython3](https://pypi.python.org/pypi/cefpython3)
+package using pip tool. On Linux pip 8.1+ is required. You can
+also download packages for offline installation available on the
+[GitHub Releases](../../releases) pages. Command to install with pip:
 
-<p align="center">
- <a href="https://www.fivestars.com/">
-  <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/fivestars360.png">
- </a>
-</p>
+```
+pip install cefpython3==66.1
+```
 
-Thank you to Fivestars for sponsoring the [v66.1 release](../../releases/tag/v66.1)
-with Python 3.8 / 3.9 support. Fivestars helps local communities thrive by empowering
-small businesses with cutting edge marketing technology. Please visit their website:
-<a href="https://www.fivestars.com/">Fivestars.com</a>
+Below is a table with supported platforms, python versions and architectures.
 
-</td><td width="50%" valign="top">
+OS | Py2 | Py3 | 32bit | 64bit | Requirements
+--- | --- | --- | --- | --- | ---
+Windows | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 / 3.8 / 3.9 | Yes | Yes | Windows 7+ (Note that Python 3.9 supports Windows 8.1+)
+Linux | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | Yes | Yes | Debian 8+, Ubuntu 14.04+,<br> Fedora 24+, openSUSE 13.3+
+Mac | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | No | Yes | MacOS 10.9+
 
-<p align="center">
- <a href="https://lampix.com/">
-  <img src="https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/lampix360.png">
- </a>
-</p>
 
-Thank you to Lampix for sponsoring the
-[v66 release](../../releases/tag/v66.0). Lampix is the first hardware
-and software solution that turns any surface into a smart, augmented reality
-or interactive surface. Please visit their website:
-<a href="https://lampix.com/">Lampix.com</a>
+## Examples
+
+- [Tutorial](docs/Tutorial.md)
+- [All examples](examples/README-examples.md).
+- [Snippets](examples/snippets/README-snippets.md).
+- [PyInstaller packager](examples/pyinstaller/README-pyinstaller.md).
 
-</tr></table>
 
-### Thanks to all sponsors
+## Support
+
+- Ask questions and report problems on the
+  [Forum](https://groups.google.com/group/cefpython)
+- Supported examples are listed in the
+  [README-examples.md](examples/README-examples.md) file
+- Documentation is in the [docs/](docs) directory:
+  - [Build instructions](docs/Build-instructions.md)
+  - [Contributing code](docs/Contributing-code.md)
+  - [Knowledge Base](docs/Knowledge-Base.md)
+  - [Migration guide](docs/Migration-guide.md)
+  - [Tutorial](docs/Tutorial.md)
+- API reference is in the [api/](api) directory:
+  - [API categories](api/API-categories.md#api-categories)
+  - [API index](api/API-index.md#api-index)
+- Additional documentation is available in
+  [Issues labelled Knowledge Base](../../issues?q=is%3Aissue+is%3Aopen+label%3A%22Knowledge+Base%22)
+- To search documentation use GitHub "This repository" search
+  at the top. To narrow results to documentation only select
+  "Markdown" in the right pane.
+- You can vote on issues in the tracker to let us know which issues are
+  important to you. To do that add a +1 thumb up reaction to the first post
+  in the issue. See
+  [Most popular issues](../../issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc)
+  sorted by reactions.
+
+
+## Support development
+
+If you would like to support general CEF Python development efforts
+by making a donation then please click the Paypal Donate button below.
+
+<a href='https://www.paypal.com/donate/?hosted_button_id=V7LU7PD4N4GGG'>
+<img src='https://raw.githubusercontent.com/wiki/cztomczak/phpdesktop/donate.gif' />
+</a><br><br>
+
+
+## Seeking sponsors
+
+CEF Python is seeking companies to sponsor development of this project. Most important
+thing would be to have continuous monthly releases with updates to latest Chromium. There is
+also lots of cool features and new settings that would be nice to implement. We have not yet
+exposed all of upstream CEF APIs. If your company would like to sponsor CEF Python development efforts
+then please contact [Czarek](https://www.linkedin.com/in/czarektomczak/). There are no active sponsors
+at this moment.
+
+
+### Previous sponsors
 
 <table>
  <tr>
@@ -139,209 +172,7 @@ or interactive surface. Please visit their website:
 </table>
 
 
-## Install
-
-You can install [pypi/cefpython3](https://pypi.python.org/pypi/cefpython3)
-package using pip tool. On Linux pip 8.1+ is required. You can
-also download packages for offline installation available on the
-[GitHub Releases](../../releases) pages. Command to install with pip:
-
-```
-pip install cefpython3==66.1
-```
-
-
-## Tutorial
-
-See the [Tutorial.md](docs/Tutorial.md) document.
-
-
-## Examples
-
-See the [README-examples.md](examples/README-examples.md) and
-[README-snippets.md](examples/snippets/README-snippets.md) documents.
-
-
-## Support
-
-- Ask questions and report problems on the
-  [Forum](https://groups.google.com/group/cefpython)
-- Supported examples are listed in the
-  [README-examples.md](examples/README-examples.md) file
-- Documentation is in the [docs/](docs) directory:
-  - [Build instructions](docs/Build-instructions.md)
-  - [Contributing code](docs/Contributing-code.md)
-  - [Knowledge Base](docs/Knowledge-Base.md)
-  - [Migration guide](docs/Migration-guide.md)
-  - [Tutorial](docs/Tutorial.md)
-- API reference is in the [api/](api) directory:
-  - [API categories](api/API-categories.md#api-categories)
-  - [API index](api/API-index.md#api-index)
-- Additional documentation is available in
-  [Issues labelled Knowledge Base](../../issues?q=is%3Aissue+is%3Aopen+label%3A%22Knowledge+Base%22)
-- To search documentation use GitHub "This repository" search
-  at the top. To narrow results to documentation only select
-  "Markdown" in the right pane.
-- You can vote on issues in the tracker to let us know which issues are
-  important to you. To do that add a +1 thumb up reaction to the first post
-  in the issue. See
-  [Most popular issues](../../issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc)
-  sorted by reactions.
-
-
-## Releases
-
-Information on planned new and current releases, supported platforms,
-python versions, architectures and requirements. If you want to
-support old operating systems then choose the v31 release.
-
-### Next release
-
-- To see planned new features or bugs to be fixed in the near future in one of
-  next releases, see the
-  [next release](../../issues?q=is%3Aissue+is%3Aopen+label%3A%22next+release%22)
-  label in the tracker
-- To see planned new features or bugs to be fixed in further future, see the
-  [next release 2](../../issues?q=is%3Aissue+is%3Aopen+label%3A%22next+release+2%22)
-  label in the tracker
-
-### Latest release
-
-OS | Py2 | Py3 | 32bit | 64bit | Requirements
---- | --- | --- | --- | --- | ---
-Windows | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 / 3.8 / 3.9 | Yes | Yes | Windows 7+ (Note that Python 3.9 supports Windows 8.1+)
-Linux | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | Yes | Yes | Debian 8+, Ubuntu 14.04+,<br> Fedora 24+, openSUSE 13.3+
-Mac | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | No | Yes | MacOS 10.9+
-
-These platforms are not supported yet:
-- ARM - see [Issue #267](../../issues/267)
-- Android - see [Issue #307](../../issues/307)
-
-
-### v49 release (WinXP/Vista)
-
-OS | Py2 | Py3 | 32bit | 64bit | Requirements
---- | --- | --- | --- | --- | ---
-Windows | 2.7 | 3.4 | Yes | Yes | Windows XP+
-
-- Install with command: `pip --no-cache-dir install cefpython3==49.0`.
-    - Please note that if you were previously installing cefpython3
-      package it is required to use the `--no-cache-dir` flag,
-      otherwise pip will end up with error message
-      `No matching distribution found for cefpython3==49.0`.
-      This happens because 49.0 release occured after 57.0 and 66.0
-      releases.
-- Downloads are available on GitHub Releases tagged
-    [v49.0](../../releases/tag/v49.0).
-- See [Migration guide](docs/Migration-guide.md) document for changes
-  in this release
-- Documentation is available in the [docs/](../../tree/cefpython49-winxp/docs)
-  directory in the `cefpython49-winxp` branch
-- API reference is available in the [api/](../../tree/cefpython49-winxp/api)
-  directory in the `cefpython49-winxp` branch
-
-
-### v31 release (old systems)
-
-OS | Py2 | Py3 | 32bit | 64bit | Requirements
---- | --- | --- | --- | --- | ---
-Windows | 2.7 | No | Yes | Yes | Windows XP+
-Linux | 2.7 | No | Yes | Yes | Debian 7+ / Ubuntu 12.04+
-Mac | 2.7 | No | Yes | Yes | MacOS 10.7+
-
-Additional information for v31.2 release:
-- On Windows/Mac you can install with command: `pip install cefpython3==31.2`
-- Downloads are available on the GitHub Releases page tagged
-  [v31.2](../../releases/tag/v31.2).
-- API reference is available in revision [169a1b2](../../tree/169a1b20d3cd09879070d41aab28cfa195d2a7d5/docs/api)
-- Other documentation can be downloaded by cloning the
-  cefpython.wiki repository: `git clone git@github.com:cztomczak/cefpython.wiki.git`
-
-
-## Support development
-
-If you would like to support general CEF Python development efforts
-by making a donation then please click the Paypal Donate button below.
-If you would like to see a specific feature implemented then you can make
-a comment about that when making a donation and that will give it a higher
-priority.
-
-<a href='https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=V7LU7PD4N4GGG'>
-<img src='https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/donate.gif' />
-</a><br><br>
-
-
-### Thanks to all
-
-* [2021] Thank you to [Fivestars](https://www.fivestars.com/) for sponsoring
-  the v66.1 release with Python 3.8 / 3.9 support
-* [2018] Thanks to [Fivestars](https://www.fivestars.com/) for sponsoring
-  the v49 release for legacy systems (WinXP/Vista)
-* [2018] Many thanks to [Lampix](https://lampix.com/) for sponsoring the v66
-  release for all platforms
-* [2017] Many thanks to [HighSide Inc.](https://highside.io/) for sponsoring
-  the v55/v56 releases for all platforms
-* [2016-2018] Thanks to JetBrains for providing an Open Source license for
-  [PyCharm](https://www.jetbrains.com/pycharm/)
-* [2014] Thanks to Adam Duston for donating a Macbook to aid the development
-  of Mac port
-* [2013-2015] Lots of thanks goes to [Cyan Inc.](http://www.blueplanet.com/)
-  for sponsoring this project for a long time, making CEF Python 3 mature
-* [2013] Thanks to [Rentouch GmbH](http://www.rentouch.ch/) for sponsoring the
-  development of the off-screen rendering support
-* [2013] Thanks to Thomas Wusatiuk for sponsoring the development of the web
-  response reading features
-* [2012-2018] Thanks to those who have made a Paypal donation:
-  [Rentouch GmbH](http://www.rentouch.ch/), Walter Purvis, Rokas Stupuras,
-  Alex Rattray, Greg Kacy, Paul Korzhyk, Tomasz Tomanek.
-* [2012-2017] Thanks to those who have donated their time through code
-  contributions, they are listed in the [Authors](Authors) file
-
-
-## Seeking new sponsors
-
-CEF Python is seeking companies to sponsor further development of the project.
-There are many proposals for new features submitted in the issue tracker. Most
-notable are:
-
-* Monthly releases with latest Chromium
-* An automated build system similar to upstream CEF Spotify Automated Builds
-* ARM and Android support
-* Multi-threaded support for increased performance
-* Proprietary codecs support in build tools: H264, H265,AC3, EAC3, MPEG-4
-* More CEF API exposed, only about 50% is exposed so far
-* Hundreds of new settings and Chromium preferences not yet exposed
-* Easier integration with popular GUI toolkits in just a few lines of code
-  and support for more third party GUI frameworks
-* More examples of implementing various advanced features and more snippets
-  as well
-
-If your company would like to sponsor CEF Python development efforts then
-please contact
-[Czarek](https://www.linkedin.com/in/czarektomczak/).
-Long term sponsorships are welcome and Czarek is open to ideas about
-the project. He would love to spend more time on developing this project,
-but he can't afford doing so in his free time. Currently there is no company
-supporting this project actively on a daily basis.
-
-
-## Other READMEs
-
-- [PyInstaller packager](examples/pyinstaller/README-pyinstaller.md)
-
-
-
-## Quick links
-
-### Docs
-
-- [Build instructions](docs/Build-instructions.md)
-- [Knowledge Base](docs/Knowledge-Base.md)
-- [Migration guide](docs/Migration-guide.md)
-- [Tutorial](docs/Tutorial.md)
-
-
-### API categories
+## API
 
 #### Modules
 

From 811fa74c8ef413d5b82371d6d74166e7d5eab47b Mon Sep 17 00:00:00 2001
From: Czarek Tomczak <cztomczak@users.noreply.github.com>
Date: Sat, 8 Feb 2025 01:07:19 +0100
Subject: [PATCH 232/238] Update README.md

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 80bda463..35127ab7 100644
--- a/README.md
+++ b/README.md
@@ -62,9 +62,9 @@ Mac | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | No | Yes | MacOS 10.9+
 ## Examples
 
 - [Tutorial](docs/Tutorial.md)
-- [All examples](examples/README-examples.md).
-- [Snippets](examples/snippets/README-snippets.md).
-- [PyInstaller packager](examples/pyinstaller/README-pyinstaller.md).
+- [All examples](examples/README-examples.md)
+- [Snippets](examples/snippets/README-snippets.md)
+- [PyInstaller packager](examples/pyinstaller/README-pyinstaller.md)
 
 
 ## Support

From 6c72dc3d093d3eebbee3ff0b79dc58b762f10846 Mon Sep 17 00:00:00 2001
From: Czarek Tomczak <cztomczak@users.noreply.github.com>
Date: Sat, 8 Feb 2025 01:11:02 +0100
Subject: [PATCH 233/238] Update README.md

---
 README.md | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 35127ab7..2e127e63 100644
--- a/README.md
+++ b/README.md
@@ -86,13 +86,7 @@ Mac | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | No | Yes | MacOS 10.9+
   [Issues labelled Knowledge Base](../../issues?q=is%3Aissue+is%3Aopen+label%3A%22Knowledge+Base%22)
 - To search documentation use GitHub "This repository" search
   at the top. To narrow results to documentation only select
-  "Markdown" in the right pane.
-- You can vote on issues in the tracker to let us know which issues are
-  important to you. To do that add a +1 thumb up reaction to the first post
-  in the issue. See
-  [Most popular issues](../../issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc)
-  sorted by reactions.
-
+  "Markdown" in the side pane.
 
 ## Support development
 

From 0d3295e05212333f14155f416cc483bd2b2f3e3f Mon Sep 17 00:00:00 2001
From: Czarek Tomczak <cztomczak@users.noreply.github.com>
Date: Sat, 8 Feb 2025 01:12:07 +0100
Subject: [PATCH 234/238] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2e127e63..06d3a4e3 100644
--- a/README.md
+++ b/README.md
@@ -95,7 +95,7 @@ by making a donation then please click the Paypal Donate button below.
 
 <a href='https://www.paypal.com/donate/?hosted_button_id=V7LU7PD4N4GGG'>
 <img src='https://raw.githubusercontent.com/wiki/cztomczak/phpdesktop/donate.gif' />
-</a><br><br>
+</a><br>
 
 
 ## Seeking sponsors

From a6f5def34270b8d64a733597146b98633a7e7dd3 Mon Sep 17 00:00:00 2001
From: Czarek Tomczak <cztomczak@users.noreply.github.com>
Date: Sat, 8 Feb 2025 01:17:13 +0100
Subject: [PATCH 235/238] Update README.md

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 06d3a4e3..b6fe4539 100644
--- a/README.md
+++ b/README.md
@@ -90,8 +90,7 @@ Mac | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | No | Yes | MacOS 10.9+
 
 ## Support development
 
-If you would like to support general CEF Python development efforts
-by making a donation then please click the Paypal Donate button below.
+To support general CEF Python development efforts please make a donation using PayPal button below:
 
 <a href='https://www.paypal.com/donate/?hosted_button_id=V7LU7PD4N4GGG'>
 <img src='https://raw.githubusercontent.com/wiki/cztomczak/phpdesktop/donate.gif' />

From de22be237b20b504eb6bdc385eae436eb12d225b Mon Sep 17 00:00:00 2001
From: Czarek Tomczak <cztomczak@users.noreply.github.com>
Date: Sat, 8 Feb 2025 01:18:30 +0100
Subject: [PATCH 236/238] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b6fe4539..755d6299 100644
--- a/README.md
+++ b/README.md
@@ -90,7 +90,7 @@ Mac | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | No | Yes | MacOS 10.9+
 
 ## Support development
 
-To support general CEF Python development efforts please make a donation using PayPal button below:
+To support general CEF Python development efforts you can make a donation using PayPal button below:
 
 <a href='https://www.paypal.com/donate/?hosted_button_id=V7LU7PD4N4GGG'>
 <img src='https://raw.githubusercontent.com/wiki/cztomczak/phpdesktop/donate.gif' />

From 5217c04feaa6b8a4abbcb18bba34ad586e3cecd1 Mon Sep 17 00:00:00 2001
From: Czarek Tomczak <cztomczak@users.noreply.github.com>
Date: Sat, 8 Feb 2025 01:23:50 +0100
Subject: [PATCH 237/238] Update README.md

---
 README.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 755d6299..4ff688b0 100644
--- a/README.md
+++ b/README.md
@@ -41,15 +41,16 @@ PyGame, PyOpenGL, PyWin32, PySide and PySDL2.
 
 ## Install
 
-You can install [pypi/cefpython3](https://pypi.python.org/pypi/cefpython3)
-package using pip tool. On Linux pip 8.1+ is required. You can
-also download packages for offline installation available on the
-[GitHub Releases](../../releases) pages. Command to install with pip:
+Command to install with pip:
 
 ```
 pip install cefpython3==66.1
 ```
 
+Hosted at [pypi/cefpython3](https://pypi.python.org/pypi/cefpython3). On Linux pip 8.1+ is required.
+
+You can also download packages for offline installation available on the [GitHub Releases](../../releases) pages.
+
 Below is a table with supported platforms, python versions and architectures.
 
 OS | Py2 | Py3 | 32bit | 64bit | Requirements

From 3d6f6c19992cb112d6de8ff856bce443bdf3bbea Mon Sep 17 00:00:00 2001
From: Mandru-JashwanthKumar <mandrujashwanth439@gmail.com>
Date: Wed, 26 Nov 2025 10:17:23 +0530
Subject: [PATCH 238/238] Fix formatting of README.md documentation section

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4ff688b0..b85f34c6 100644
--- a/README.md
+++ b/README.md
@@ -87,7 +87,7 @@ Mac | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | No | Yes | MacOS 10.9+
   [Issues labelled Knowledge Base](../../issues?q=is%3Aissue+is%3Aopen+label%3A%22Knowledge+Base%22)
 - To search documentation use GitHub "This repository" search
   at the top. To narrow results to documentation only select
-  "Markdown" in the side pane.
+  "Markdown" in the side pane
 
 ## Support development