Changeset 272891 in webkit

Timestamp:

Feb 15, 2021 4:27:11 PM (3 years ago)

Author:

Truitt Savell

Message:

Unreviewed, reverting r272867.

Broke 50+ fast/layoutformattingcontext/ tests on Mac Debug WK2

Reverted changeset:

"Page scrolling by wheel events doesn't work in non-AC mode
pages if Hardware Acceleration Policy is changed dynamically
from "always" to "never""
​https://bugs.webkit.org/show_bug.cgi?id=221067
​https://commits.webkit.org/r272867

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/EventDispatcher.cpp (modified) (2 diffs)
• WebProcess/WebPage/WebPage.cpp (modified) (4 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-02-15  Truitt Savell  <tsavell@apple.com>
+
+        Unreviewed, reverting r272867.
+
+        Broke 50+ fast/layoutformattingcontext/ tests on Mac Debug WK2
+
+        Reverted changeset:
+
+        "Page scrolling by wheel events doesn't work in non-AC mode
+        pages if Hardware Acceleration Policy is changed dynamically
+        from "always" to "never""
+        https://bugs.webkit.org/show_bug.cgi?id=221067
+        https://commits.webkit.org/r272867
+
 2021-02-15  Eric Carlson  <eric.carlson@apple.com>
 

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

@@ -122 +122 @@
     auto processingSteps = OptionSet<WebCore::WheelEventProcessingSteps> { WheelEventProcessingSteps::MainThreadForScrolling, WheelEventProcessingSteps::MainThreadForBlockingDOMEventDispatch };
 #if ENABLE(SCROLLING_THREAD)
-    do {
+    processingSteps = [&]() -> OptionSet<WheelEventProcessingSteps> {
         LockHolder locker(m_scrollingTreesMutex);
 
         auto scrollingTree = m_scrollingTrees.get(pageID);
-        if (!scrollingTree) {
-            dispatchWheelEventViaMainThread(pageID, wheelEvent, processingSteps);
-            break;
-        }
+        if (!scrollingTree)
+            return { WheelEventProcessingSteps::MainThreadForScrolling, WheelEventProcessingSteps::MainThreadForBlockingDOMEventDispatch };
         
         // FIXME: It's pretty horrible that we're updating the back/forward state here.
@@ -162 +160 @@
             protectedThis->sendDidReceiveEvent(pageID, wheelEvent.type(), result.wasHandled);
         });
-    } while (false);
+
+        return processingSteps;
+    }();
+
+    auto scrollingTree = m_scrollingTrees.get(pageID);
+    if (!scrollingTree)
+        dispatchWheelEventViaMainThread(pageID, wheelEvent, processingSteps);
 #else
     UNUSED_PARAM(canRubberBandAtLeft);

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

@@ -761 +761 @@
 #endif
 
+#if ENABLE(SCROLLING_THREAD)
+    if (m_useAsyncScrolling)
+        webProcess.eventDispatcher().addScrollingTreeForPage(this);
+#endif
+
     for (auto& mimeType : parameters.mimeTypesWithCustomContentProviders)
         m_mimeTypesWithCustomContentProviders.add(mimeType);
@@ -1421 +1426 @@
 void WebPage::enterAcceleratedCompositingMode(GraphicsLayer* layer)
 {
-#if ENABLE(SCROLLING_THREAD)
-    if (m_useAsyncScrolling)
-        WebProcess::singleton().eventDispatcher().addScrollingTreeForPage(this);
-#endif
-
     m_drawingArea->setRootCompositingLayer(layer);
 }
@@ -1431 +1431 @@
 void WebPage::exitAcceleratedCompositingMode()
 {
-#if ENABLE(SCROLLING_THREAD)
-    if (m_useAsyncScrolling)
-        WebProcess::singleton().eventDispatcher().removeScrollingTreeForPage(this);
-#endif
-
     m_drawingArea->setRootCompositingLayer(nullptr);
 }
@@ -1532 +1527 @@
         m_remoteObjectRegistry->close();
     ASSERT(!m_remoteObjectRegistry);
+#endif
+#if ENABLE(SCROLLING_THREAD)
+    if (m_useAsyncScrolling)
+        webProcess.eventDispatcher().removeScrollingTreeForPage(this);
 #endif
     webProcess.removeMessageReceiver(Messages::WebPage::messageReceiverName(), m_identifier);