Changeset 277258 in webkit

Timestamp:

May 10, 2021, 2:13:54 AM (5 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] Use always async scrolling in accelerated compositing mode
​https://bugs.webkit.org/show_bug.cgi?id=225512

Reviewed by Fujii Hironori.

We currently use async scrolling only when the hardware acceleration policy is set for always, but not when
entering accelerating compositing mode in ondemand policy. Since the GTK port still supports the non accelerated
compositing mode we need to add and remove the scrolling tree when entering and leaving the accelerated
compositing mode.

• UIProcess/API/glib/WebKitSettings.cpp:

(webkit_settings_set_hardware_acceleration_policy): Always enable async scrolling when accelerated compositing
is enabled.

• UIProcess/gtk/WebPreferencesGtk.cpp:

(WebKit::WebPreferences::platformInitializeStore): Ditto.

• WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp:

(WebKit::DrawingAreaCoordinatedGraphics::~DrawingAreaCoordinatedGraphics): Remove the scrolling tree if the
drawing area is destroyed in accelerated compositing mode.
(WebKit::DrawingAreaCoordinatedGraphics::enterAcceleratedCompositingMode): Add the scrolling tree.
(WebKit::DrawingAreaCoordinatedGraphics::exitAcceleratedCompositingMode): Remove the scrolling tree.

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage): Do not add the scrolling tree from here for the GTK port.
(WebKit::WebPage::close): Do not remove the scrolling tree from here for the GTK port.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/glib/WebKitSettings.cpp (modified) (3 diffs)
• UIProcess/gtk/WebPreferencesGtk.cpp (modified) (1 diff)
• WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp (modified) (4 diffs)
• WebProcess/WebPage/WebPage.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-05-10  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Use always async scrolling in accelerated compositing mode
+        https://bugs.webkit.org/show_bug.cgi?id=225512
+
+        Reviewed by Fujii Hironori.
+
+        We currently use async scrolling only when the hardware acceleration policy is set for always, but not when
+        entering accelerating compositing mode in ondemand policy. Since the GTK port still supports the non accelerated
+        compositing mode we need to add and remove the scrolling tree when entering and leaving the accelerated
+        compositing mode.
+
+        * UIProcess/API/glib/WebKitSettings.cpp:
+        (webkit_settings_set_hardware_acceleration_policy): Always enable async scrolling when accelerated compositing
+        is enabled.
+        * UIProcess/gtk/WebPreferencesGtk.cpp:
+        (WebKit::WebPreferences::platformInitializeStore): Ditto.
+        * WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp:
+        (WebKit::DrawingAreaCoordinatedGraphics::~DrawingAreaCoordinatedGraphics): Remove the scrolling tree if the
+        drawing area is destroyed in accelerated compositing mode.
+        (WebKit::DrawingAreaCoordinatedGraphics::enterAcceleratedCompositingMode): Add the scrolling tree.
+        (WebKit::DrawingAreaCoordinatedGraphics::exitAcceleratedCompositingMode): Remove the scrolling tree.
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage): Do not add the scrolling tree from here for the GTK port.
+        (WebKit::WebPage::close): Do not remove the scrolling tree from here for the GTK port.
+
 2021-05-10  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp

@@ -3618 +3618 @@
         if (!priv->preferences->acceleratedCompositingEnabled()) {
             priv->preferences->setAcceleratedCompositingEnabled(true);
+            priv->preferences->setThreadedScrollingEnabled(true);
             changed = true;
         }
         if (!priv->preferences->forceCompositingMode()) {
             priv->preferences->setForceCompositingMode(true);
-            priv->preferences->setThreadedScrollingEnabled(true);
             changed = true;
         }
@@ -3631 +3631 @@
         if (priv->preferences->acceleratedCompositingEnabled()) {
             priv->preferences->setAcceleratedCompositingEnabled(false);
-            changed = true;
-        }
-
-        if (priv->preferences->forceCompositingMode()) {
-            priv->preferences->setForceCompositingMode(false);
             priv->preferences->setThreadedScrollingEnabled(false);
             changed = true;
         }
+
+        if (priv->preferences->forceCompositingMode()) {
+            priv->preferences->setForceCompositingMode(false);
+            changed = true;
+        }
         break;
     case WEBKIT_HARDWARE_ACCELERATION_POLICY_ON_DEMAND:
         if (!priv->preferences->acceleratedCompositingEnabled() && HardwareAccelerationManager::singleton().canUseHardwareAcceleration()) {
             priv->preferences->setAcceleratedCompositingEnabled(true);
+            priv->preferences->setThreadedScrollingEnabled(true);
             changed = true;
         }
@@ -3648 +3649 @@
         if (priv->preferences->forceCompositingMode() && !HardwareAccelerationManager::singleton().forceHardwareAcceleration()) {
             priv->preferences->setForceCompositingMode(false);
-            priv->preferences->setThreadedScrollingEnabled(false);
             changed = true;
         }

trunk/Source/WebKit/UIProcess/gtk/WebPreferencesGtk.cpp

@@ -47 +47 @@
     setAcceleratedCompositingEnabled(compositingState.acceleratedCompositingEnabled);
     setForceCompositingMode(compositingState.forceCompositingMode);
-    setThreadedScrollingEnabled(compositingState.forceCompositingMode);
+    setThreadedScrollingEnabled(compositingState.acceleratedCompositingEnabled);
 }
 

trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp

@@ -30 +30 @@
 
 #include "DrawingAreaProxyMessages.h"
+#include "EventDispatcher.h"
 #include "LayerTreeHost.h"
 #include "ShareableBitmap.h"
@@ -81 +82 @@
 }
 
-DrawingAreaCoordinatedGraphics::~DrawingAreaCoordinatedGraphics() = default;
+DrawingAreaCoordinatedGraphics::~DrawingAreaCoordinatedGraphics()
+{
+#if PLATFORM(GTK)
+    if (m_supportsAsyncScrolling && m_layerTreeHost)
+        WebProcess::singleton().eventDispatcher().removeScrollingTreeForPage(&m_webPage);
+#endif
+}
 
 void DrawingAreaCoordinatedGraphics::setNeedsDisplay()
@@ -580 +587 @@
 {
 #if PLATFORM(GTK)
+    if (m_supportsAsyncScrolling)
+        WebProcess::singleton().eventDispatcher().addScrollingTreeForPage(&m_webPage);
+
     if (!m_alwaysUseCompositing) {
         m_webPage.corePage()->settings().setForceCompositingMode(true);
@@ -641 +651 @@
     m_wantsToExitAcceleratedCompositingMode = false;
 
+#if PLATFORM(GTK)
+    if (m_supportsAsyncScrolling)
+        WebProcess::singleton().eventDispatcher().removeScrollingTreeForPage(&m_webPage);
+#endif
+
     ASSERT(m_layerTreeHost);
     m_previousLayerTreeHost = WTFMove(m_layerTreeHost);

trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp

@@ -782 +782 @@
 #endif
 
-#if ENABLE(SCROLLING_THREAD)
+#if ENABLE(SCROLLING_THREAD) && !PLATFORM(GTK)
     if (m_useAsyncScrolling)
         webProcess.eventDispatcher().addScrollingTreeForPage(this);
@@ -1563 +1563 @@
     ASSERT(!m_remoteObjectRegistry);
 #endif
-#if ENABLE(SCROLLING_THREAD)
+
+#if ENABLE(SCROLLING_THREAD) && !PLATFORM(GTK)
     if (m_useAsyncScrolling)
         webProcess.eventDispatcher().removeScrollingTreeForPage(this);