Attachment 428475 Details for Bug 225740 – REVERT of r277258

[patch] REVERT of r277258

bug-225740-20210513094725.patch (text/plain), 6.72 KB, created by WebKit Commit Bot on 2021-05-13 02:47:25 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: WebKit Commit Bot

Created: 2021-05-13 02:47:25 PDT

Size: 6.72 KB

patch

obsolete

>Subversion Revision: 277426
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index be34f8e6d11a62232daabf6952daa48d5985590f..3b3e04048d8d3f5c0b71d4e7f180ecc2d16de4a6 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,17 @@
>+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>
> 
>         [GTK][WPE] Add ArgumentCoder for GTlsCertificate
>diff --git a/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp b/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp
>index 72c6e6b3a82cdd0d223bb7918907bb062fa48d60..9fa24bbc70e010ee6733d792f86cb65c72a56c0e 100644
>--- a/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp
>+++ b/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp
>@@ -3617,11 +3617,11 @@ void webkit_settings_set_hardware_acceleration_policy(WebKitSettings* settings,
>             return;
>         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;
>         }
>         break;
>@@ -3630,24 +3630,24 @@ void webkit_settings_set_hardware_acceleration_policy(WebKitSettings* settings,
>             return;
>         if (priv->preferences->acceleratedCompositingEnabled()) {
>             priv->preferences->setAcceleratedCompositingEnabled(false);
>-            priv->preferences->setThreadedScrollingEnabled(false);
>             changed = true;
>         }
> 
>         if (priv->preferences->forceCompositingMode()) {
>             priv->preferences->setForceCompositingMode(false);
>+            priv->preferences->setThreadedScrollingEnabled(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;
>         }
> 
>         if (priv->preferences->forceCompositingMode() && !HardwareAccelerationManager::singleton().forceHardwareAcceleration()) {
>             priv->preferences->setForceCompositingMode(false);
>+            priv->preferences->setThreadedScrollingEnabled(false);
>             changed = true;
>         }
>         break;
>diff --git a/Source/WebKit/UIProcess/gtk/WebPreferencesGtk.cpp b/Source/WebKit/UIProcess/gtk/WebPreferencesGtk.cpp
>index 061f03f72b408bcb434b16055705d59145757be8..cf233a03f6f0fbad10d78f7eb65e8db38eba58b0 100644
>--- a/Source/WebKit/UIProcess/gtk/WebPreferencesGtk.cpp
>+++ b/Source/WebKit/UIProcess/gtk/WebPreferencesGtk.cpp
>@@ -46,7 +46,7 @@ void WebPreferences::platformInitializeStore()
> 
>     setAcceleratedCompositingEnabled(compositingState.acceleratedCompositingEnabled);
>     setForceCompositingMode(compositingState.forceCompositingMode);
>-    setThreadedScrollingEnabled(compositingState.acceleratedCompositingEnabled);
>+    setThreadedScrollingEnabled(compositingState.forceCompositingMode);
> }
> 
> } // namespace WebKit
>diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp
>index 54457ef7d5dc89b174b1fc93a851c04f77ad0ed7..8716df49bd192d0105116b6bdb0ab69631877bb8 100644
>--- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp
>+++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp
>@@ -29,7 +29,6 @@
> #include "DrawingAreaCoordinatedGraphics.h"
> 
> #include "DrawingAreaProxyMessages.h"
>-#include "EventDispatcher.h"
> #include "LayerTreeHost.h"
> #include "ShareableBitmap.h"
> #include "UpdateInfo.h"
>@@ -81,13 +80,7 @@ DrawingAreaCoordinatedGraphics::DrawingAreaCoordinatedGraphics(WebPage& webPage,
> #endif
> }
> 
>-DrawingAreaCoordinatedGraphics::~DrawingAreaCoordinatedGraphics()
>-{
>-#if PLATFORM(GTK)
>-    if (m_supportsAsyncScrolling && m_layerTreeHost)
>-        WebProcess::singleton().eventDispatcher().removeScrollingTreeForPage(&m_webPage);
>-#endif
>-}
>+DrawingAreaCoordinatedGraphics::~DrawingAreaCoordinatedGraphics() = default;
> 
> void DrawingAreaCoordinatedGraphics::setNeedsDisplay()
> {
>@@ -586,9 +579,6 @@ void DrawingAreaCoordinatedGraphics::resumePainting()
> void DrawingAreaCoordinatedGraphics::enterAcceleratedCompositingMode(GraphicsLayer* graphicsLayer)
> {
> #if PLATFORM(GTK)
>-    if (m_supportsAsyncScrolling)
>-        WebProcess::singleton().eventDispatcher().addScrollingTreeForPage(&m_webPage);
>-
>     if (!m_alwaysUseCompositing) {
>         m_webPage.corePage()->settings().setForceCompositingMode(true);
>         m_alwaysUseCompositing = true;
>@@ -650,11 +640,6 @@ void DrawingAreaCoordinatedGraphics::exitAcceleratedCompositingMode()
>     m_exitCompositingTimer.stop();
>     m_wantsToExitAcceleratedCompositingMode = false;
> 
>-#if PLATFORM(GTK)
>-    if (m_supportsAsyncScrolling)
>-        WebProcess::singleton().eventDispatcher().removeScrollingTreeForPage(&m_webPage);
>-#endif
>-
>     ASSERT(m_layerTreeHost);
>     m_previousLayerTreeHost = WTFMove(m_layerTreeHost);
>     m_previousLayerTreeHost->setIsDiscardable(true);
>diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.cpp b/Source/WebKit/WebProcess/WebPage/WebPage.cpp
>index 3401452cf5e645b8f71f69aee4f1e179ef1f2178..8751657724926e7a81314e61c78791bac6bfd717 100644
>--- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp
>+++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp
>@@ -782,7 +782,7 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters)
>     webPageCounter.increment();
> #endif
> 
>-#if ENABLE(SCROLLING_THREAD) && !PLATFORM(GTK)
>+#if ENABLE(SCROLLING_THREAD)
>     if (m_useAsyncScrolling)
>         webProcess.eventDispatcher().addScrollingTreeForPage(this);
> #endif
>@@ -1563,8 +1563,7 @@ void WebPage::close()
>         m_remoteObjectRegistry->close();
>     ASSERT(!m_remoteObjectRegistry);
> #endif
>-
>-#if ENABLE(SCROLLING_THREAD) && !PLATFORM(GTK)
>+#if ENABLE(SCROLLING_THREAD)
>     if (m_useAsyncScrolling)
>         webProcess.eventDispatcher().removeScrollingTreeForPage(this);
> #endif

Actions: View | Formatted Diff | Diff

Attachments on bug 225740: 428475