Changeset 277427 in webkit

Timestamp:

May 13, 2021, 2:49:27 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, reverting r277258.
​https://bugs.webkit.org/show_bug.cgi?id=225740

Caused layout test failures

Reverted changeset:

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

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-13  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, reverting r277258.
+        https://bugs.webkit.org/show_bug.cgi?id=225740
+
+        Caused layout test failures
+
+        Reverted changeset:
+
+        "[GTK] Use always async scrolling in accelerated compositing
+        mode"
+        https://bugs.webkit.org/show_bug.cgi?id=225512
+        https://trac.webkit.org/changeset/277258
+
 2021-05-13  Carlos Garcia Campos  <cgarcia@igalia.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;
         }
@@ -3649 +3648 @@
         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.acceleratedCompositingEnabled);
+    setThreadedScrollingEnabled(compositingState.forceCompositingMode);
 }
 

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

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

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