Changeset 263888 in webkit

Timestamp:

Jul 3, 2020, 2:06:00 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK4] Enable threaded rendering by default
​https://bugs.webkit.org/show_bug.cgi?id=213883

Patch by Carlos Garcia Campos <​cgarcia@igalia.com> on 2020-07-03
Reviewed by Adrian Perez de Castro.

When building with GTK4 we no longer use the cairo context to render directly, so we can always enable the
threaded rendering. In WPE port threaded rendering is only enabled when env var WEBKIT_NICOSIA_PAINTING_THREADS
is present. This patch changes a bit the meaning of the env var, so that when 0 is passed the feature is
disabled too, instead of setting the number of threads to 4.

• platform/graphics/nicosia/NicosiaPaintingEngine.cpp:

(Nicosia::PaintingEngine::create):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/nicosia/NicosiaPaintingEngine.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-07-03  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK4] Enable threaded rendering by default
+        https://bugs.webkit.org/show_bug.cgi?id=213883
+
+        Reviewed by Adrian Perez de Castro.
+
+        When building with GTK4 we no longer use the cairo context to render directly, so we can always enable the
+        threaded rendering. In WPE port threaded rendering is only enabled when env var WEBKIT_NICOSIA_PAINTING_THREADS
+        is present. This patch changes a bit the meaning of the env var, so that when 0 is passed the feature is
+        disabled too, instead of setting the number of threads to 4.
+
+        * platform/graphics/nicosia/NicosiaPaintingEngine.cpp:
+        (Nicosia::PaintingEngine::create):
+
 2020-07-02  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/WebCore/platform/graphics/nicosia/NicosiaPaintingEngine.cpp

@@ -37 +37 @@
 std::unique_ptr<PaintingEngine> PaintingEngine::create()
 {
-#if ENABLE(DEVELOPER_MODE) && PLATFORM(WPE)
+#if (ENABLE(DEVELOPER_MODE) && PLATFORM(WPE)) || USE(GTK4)
+#if USE(GTK4)
+    unsigned numThreads = 4;
+#else
+    unsigned numThreads = 0;
+#endif
     if (const char* numThreadsEnv = getenv("WEBKIT_NICOSIA_PAINTING_THREADS")) {
-        unsigned numThreads = 0;
         if (sscanf(numThreadsEnv, "%u", &numThreads) == 1) {
-            if (numThreads < 1 || numThreads > 8) {
+            if (numThreads > 8) {
                 WTFLogAlways("The number of Nicosia painting threads is not between 1 and 8. Using the default value 4\n");
                 numThreads = 4;
             }
-
-            return std::unique_ptr<PaintingEngine>(new PaintingEngineThreaded(numThreads));
         }
     }
+
+    if (numThreads)
+        return std::unique_ptr<PaintingEngine>(new PaintingEngineThreaded(numThreads));
 #endif