Update to Chromium v57 on Win (cztomczak#341) and fix PyQt5 example on Win (cztomczak#325).

cztomczak · cztomczak · commit 79a8ebcc51ab · 2017-04-21T14:50:17.000+01:00
Fix PyQt5 support on Windows in qt.py example (cztomczak#325). Update automate.py to use --ninja-jobs also when building CEF projects. Default jobs ninja uses is very CPU intensive and can cause much lag in OS.
diff --git a/examples/qt.py b/examples/qt.py
@@ -3,7 +3,7 @@
 # bar and a browser.
 #
 # Tested configurations:
-# - PyQt 5.8.2 on Linux
+# - PyQt 5.8.2 on Windows/Linux/Mac
 # - PyQt 4.11 (qt 4.8) on Windows/Linux
 # - PySide 1.2 (qt 4.8) on Windows/Linux/Mac
 # - CEF Python v55.4+
@@ -124,9 +124,22 @@ def setupLayout(self):
         frame = QFrame()
         frame.setLayout(layout)
         self.setCentralWidget(frame)
+
+        if 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.
+            self.show()
+
         # Browser can be embedded only after layout was set up
         self.cef_widget.embedBrowser()
-        if LINUX and PYQT5:
+
+        if 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
+            # create a container for that hidden window and replace
+            # cef widget in the layout with the container.
             self.container = QWidget.createWindowContainer(
                     self.cef_widget.hidden_window, parent=self)
             layout.addWidget(self.container, 1, 0)
@@ -166,7 +179,7 @@ def focusOutEvent(self, event):
             self.browser.SetFocus(False)
 
     def embedBrowser(self):
-        if LINUX and PYQT5:
+        if PYQT5 and LINUX:
             self.hidden_window = QWindow()
         window_info = cef.WindowInfo()
         rect = [0, 0, self.width(), self.height()]
@@ -177,8 +190,8 @@ def embedBrowser(self):
         self.browser.SetClientHandler(FocusHandler(self))
 
     def getHandle(self):
-        # PyQt5 on Linux
         if self.hidden_window:
+            # PyQt5 on Linux
             return int(self.hidden_window.winId())
         try:
             # PyQt4 and PyQt5
diff --git a/src/compile_time_constants.pxi b/src/compile_time_constants.pxi
@@ -1,3 +1,3 @@
 # This file was generated by setup.py
-DEF UNAME_SYSNAME = "Darwin"
-DEF PY_MAJOR_VERSION = 3
+DEF UNAME_SYSNAME = "Windows"
+DEF PY_MAJOR_VERSION = 2
diff --git a/src/version/cef_version_win.h b/src/version/cef_version_win.h
@@ -35,16 +35,16 @@
 #ifndef CEF_INCLUDE_CEF_VERSION_H_
 #define CEF_INCLUDE_CEF_VERSION_H_
 
-#define CEF_VERSION "3.2924.1575.g97389a9"
+#define CEF_VERSION "3.2987.1601.gf035232"
 #define CEF_VERSION_MAJOR 3
-#define CEF_COMMIT_NUMBER 1575
-#define CEF_COMMIT_HASH "97389a92ee2309ded830338d6afd61ba109d31d8"
+#define CEF_COMMIT_NUMBER 1601
+#define CEF_COMMIT_HASH "f035232c082f837d2b85bd7821a93a54fc742775"
 #define COPYRIGHT_YEAR 2017
 
-#define CHROME_VERSION_MAJOR 56
+#define CHROME_VERSION_MAJOR 57
 #define CHROME_VERSION_MINOR 0
-#define CHROME_VERSION_BUILD 2924
-#define CHROME_VERSION_PATCH 76
+#define CHROME_VERSION_BUILD 2987
+#define CHROME_VERSION_PATCH 133
 
 #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 "66de193ba22e1d92a99bb29d60f3107709aeefda"
+#define CEF_API_HASH_UNIVERSAL "b0a24e3e202f3d8b72f2fbc1ebc5864f96ec16ae"
 #if defined(OS_WIN)
-#define CEF_API_HASH_PLATFORM "8055740cd08db66cefe838a826dc90806fadfb33"
+#define CEF_API_HASH_PLATFORM "1c6a27f840ac87c8c971350c907edbe2c5fa0387"
 #elif defined(OS_MACOSX)
-#define CEF_API_HASH_PLATFORM "12d8ab423df369b68d37c3667123a1812bc0d345"
+#define CEF_API_HASH_PLATFORM "1567db600ee83cc2a59bb8c17ca416d11a7c9b8a"
 #elif defined(OS_LINUX)
-#define CEF_API_HASH_PLATFORM "86ab23c0d7dafbdff7f66764cf8dac5ec1712af4"
+#define CEF_API_HASH_PLATFORM "1f9f9e15bf7cf13de2557ddd411dfc9f694503b0"
 #endif
 
 // Returns CEF version information for the libcef library. The |entry|
diff --git a/tools/automate.py b/tools/automate.py
@@ -201,6 +201,7 @@ def setup_options(docopt_args):
         Options.ninja_jobs = int(multiprocessing.cpu_count() / 2)
         if Options.ninja_jobs < 1:
             Options.ninja_jobs = 1
+    Options.ninja_jobs = str(Options.ninja_jobs)
 
 
 def build_cef():
@@ -410,9 +411,11 @@ def build_cef_projects():
         # > cefclient_mac.mm:22:29: error: property 'mainMenu' not found
         if MAC:
             # Build only cefsimple
-            command.extend(["ninja", "cefsimple"])
+            command.extend(["ninja", "-j", Options.ninja_jobs,
+                            "cefsimple"])
         else:
-            command.extend(["ninja", "cefclient", "cefsimple", "ceftests"])
+            command.extend(["ninja", "-j", Options.ninja_jobs,
+                            "cefclient", "cefsimple", "ceftests"])
         run_command(command, build_cefclient_dir)
         print("[automate.py] OK")
         assert os.path.exists(cefclient_exe)
@@ -507,7 +510,8 @@ def build_wrapper_library_windows(runtime_library, msvs, vcvars):
 
         # Run ninja
         ninja_wrapper = prepare_build_command(build_lib=True, vcvars=vcvars)
-        ninja_wrapper.extend(["ninja", "libcef_dll_wrapper"])
+        ninja_wrapper.extend(["ninja", "-j", Options.ninja_jobs,
+                              "libcef_dll_wrapper"])
         run_command(ninja_wrapper, working_dir=build_wrapper_dir)
         print("[automate.py] ninja OK")
         assert os.path.exists(wrapper_lib)
@@ -630,7 +634,8 @@ def build_wrapper_library_mac():
         print("[automate.py] cmake OK")
         # Ninja
         ninja_wrapper = prepare_build_command(build_lib=True)
-        ninja_wrapper.extend(["ninja", "libcef_dll_wrapper"])
+        ninja_wrapper.extend(["ninja", "-j", Options.ninja_jobs,
+                              "libcef_dll_wrapper"])
         run_command(ninja_wrapper, build_wrapper_dir)
         print("[automate.py] ninja OK")
         assert os.path.exists(wrapper_lib)
