Title: [277427] trunk/Source/WebKit
- Revision
- 277427
- Author
- [email protected]
- Date
- 2021-05-13 02:49:27 -0700 (Thu, 13 May 2021)
Log 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
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (277426 => 277427)
--- trunk/Source/WebKit/ChangeLog 2021-05-13 08:00:14 UTC (rev 277426)
+++ trunk/Source/WebKit/ChangeLog 2021-05-13 09:49:27 UTC (rev 277427)
@@ -1,3 +1,17 @@
+2021-05-13 Commit Queue <[email protected]>
+
+ 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 <[email protected]>
[GTK][WPE] Add ArgumentCoder for GTlsCertificate
Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp (277426 => 277427)
--- trunk/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp 2021-05-13 08:00:14 UTC (rev 277426)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp 2021-05-13 09:49:27 UTC (rev 277427)
@@ -3617,11 +3617,11 @@
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,12 +3630,12 @@
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;
@@ -3642,12 +3642,12 @@
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;
Modified: trunk/Source/WebKit/UIProcess/gtk/WebPreferencesGtk.cpp (277426 => 277427)
--- trunk/Source/WebKit/UIProcess/gtk/WebPreferencesGtk.cpp 2021-05-13 08:00:14 UTC (rev 277426)
+++ trunk/Source/WebKit/UIProcess/gtk/WebPreferencesGtk.cpp 2021-05-13 09:49:27 UTC (rev 277427)
@@ -46,7 +46,7 @@
setAcceleratedCompositingEnabled(compositingState.acceleratedCompositingEnabled);
setForceCompositingMode(compositingState.forceCompositingMode);
- setThreadedScrollingEnabled(compositingState.acceleratedCompositingEnabled);
+ setThreadedScrollingEnabled(compositingState.forceCompositingMode);
}
} // namespace WebKit
Modified: trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp (277426 => 277427)
--- trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp 2021-05-13 08:00:14 UTC (rev 277426)
+++ trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp 2021-05-13 09:49:27 UTC (rev 277427)
@@ -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 @@
#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::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 @@
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);
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (277426 => 277427)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2021-05-13 08:00:14 UTC (rev 277426)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2021-05-13 09:49:27 UTC (rev 277427)
@@ -782,7 +782,7 @@
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 @@
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
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
