Disable GPU acceleration and add perf. enhancing switches in OSR (cztomczak#463)

cztomczak · cztomczak · commit 3e6f421a2bdb · 2018-08-27T20:17:30.000+02:00
diff --git 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
@@ -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)
