Changeset 271235 in webkit

Timestamp:

Jan 7, 2021, 7:58:37 AM (6 years ago)

Author:

Lauro Moura

Message:

REGRESSION(r270425) [GTK] wheel scrolling stopped working
​https://bugs.webkit.org/show_bug.cgi?id=219547

Reviewed by Carlos Garcia Campos.

Source/WebCore:

Return early if the frame was already deleted.

Needed for fast/events/wheel-event-destroys-frame.html

• page/EventHandler.cpp:

(WebCore::EventHandler::wheelEventWasProcessedByMainThread):

Source/WebKit:

In GTK we may have the case where the async scrolling is disabled at
runtime despite being compiled with ASYNC_SCROLLING/SCROLLING_THREAD.
In these cases, the wheel events still need to be dispatched through
the main thread.

• WebProcess/WebPage/EventDispatcher.cpp:

(WebKit::EventDispatcher::wheelEvent):

LayoutTests:

• platform/gtk/fast/scrolling/overflow-scrollable-after-back-expected.txt:

Rebaseline with the extra scroll events arriving

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/fast/scrolling/overflow-scrollable-after-back-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/EventHandler.cpp (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/WebProcess/WebPage/EventDispatcher.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-01-07  Lauro Moura  <lmoura@igalia.com>
+
+        REGRESSION(r270425) [GTK] wheel scrolling stopped working
+        https://bugs.webkit.org/show_bug.cgi?id=219547
+
+        Reviewed by Carlos Garcia Campos.
+
+        * platform/gtk/fast/scrolling/overflow-scrollable-after-back-expected.txt:
+        Rebaseline with the extra scroll events arriving
+
 2021-01-06  Rob Buis  <rbuis@igalia.com>
 

trunk/LayoutTests/platform/gtk/fast/scrolling/overflow-scrollable-after-back-expected.txt

@@ -2 +2 @@
 PASS: mouseWheel caused scrolling
 PASS: mouseWheel caused scrolling
+PASS: mouseWheel caused scrolling
+
+Navigating forward then back
+
 
 Navigating forward then back

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-01-07  Lauro Moura  <lmoura@igalia.com>
+
+        REGRESSION(r270425) [GTK] wheel scrolling stopped working
+        https://bugs.webkit.org/show_bug.cgi?id=219547
+
+        Reviewed by Carlos Garcia Campos.
+
+        Return early if the frame was already deleted.
+
+        Needed for fast/events/wheel-event-destroys-frame.html
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::wheelEventWasProcessedByMainThread):
+
 2021-01-07  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/page/EventHandler.cpp

@@ -2737 +2737 @@
 
 #if ENABLE(ASYNC_SCROLLING)
+
+    if (!m_frame.page())
+        return;
+
     FrameView* view = m_frame.view();
     if (auto scrollingCoordinator = m_frame.page()->scrollingCoordinator()) {

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-01-07  Lauro Moura  <lmoura@igalia.com>
+
+        REGRESSION(r270425) [GTK] wheel scrolling stopped working
+        https://bugs.webkit.org/show_bug.cgi?id=219547
+
+        Reviewed by Carlos Garcia Campos.
+
+        In GTK we may have the case where the async scrolling is disabled at
+        runtime despite being compiled with ASYNC_SCROLLING/SCROLLING_THREAD.
+        In these cases, the wheel events still need to be dispatched through
+        the main thread.
+
+        * WebProcess/WebPage/EventDispatcher.cpp:
+        (WebKit::EventDispatcher::wheelEvent):
+
 2021-01-07  Carlos Garcia Campos  <cgarcia@igalia.com>
 

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

@@ -163 +163 @@
         return processingSteps;
     }();
+
+    auto scrollingTree = m_scrollingTrees.get(pageID);
+    if (!scrollingTree)
+        dispatchWheelEventViaMainThread(pageID, wheelEvent, processingSteps);
 #else
     UNUSED_PARAM(canRubberBandAtLeft);