Rename widgetDidHandleWheelEvent back to passWheelEventToWidget and make some functions private
https://bugs.webkit.org/show_bug.cgi?id=209951
Reviewed by Zalan Bujtas.
Revert the rename from r199331, and make private wheel-event related functions that
are internal to EventHandler.
* page/EventHandler.cpp:
(WebCore::EventHandler::handleWheelEvent):
(WebCore::EventHandler::passWheelEventToWidget):
(WebCore::EventHandler::widgetDidHandleWheelEvent): Deleted.
* page/EventHandler.h:
* page/ios/EventHandlerIOS.mm:
(WebCore::EventHandler::passWheelEventToWidget):
(WebCore::EventHandler::widgetDidHandleWheelEvent): Deleted.
* page/mac/EventHandlerMac.mm:
(WebCore::EventHandler::passWheelEventToWidget):
(WebCore::EventHandler::widgetDidHandleWheelEvent): Deleted.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@259443 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index b15a53e..77a0fa6 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,25 @@
+2020-04-02 Simon Fraser <simon.fraser@apple.com>
+
+ Rename widgetDidHandleWheelEvent back to passWheelEventToWidget and make some functions private
+ https://bugs.webkit.org/show_bug.cgi?id=209951
+
+ Reviewed by Zalan Bujtas.
+
+ Revert the rename from r199331, and make private wheel-event related functions that
+ are internal to EventHandler.
+
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::handleWheelEvent):
+ (WebCore::EventHandler::passWheelEventToWidget):
+ (WebCore::EventHandler::widgetDidHandleWheelEvent): Deleted.
+ * page/EventHandler.h:
+ * page/ios/EventHandlerIOS.mm:
+ (WebCore::EventHandler::passWheelEventToWidget):
+ (WebCore::EventHandler::widgetDidHandleWheelEvent): Deleted.
+ * page/mac/EventHandlerMac.mm:
+ (WebCore::EventHandler::passWheelEventToWidget):
+ (WebCore::EventHandler::widgetDidHandleWheelEvent): Deleted.
+
2020-04-02 Andres Gonzalez <andresg_22@apple.com>
Crash in RenderMenuList::didUpdateActiveOption.
diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp
index e742d6e..5c24edc 100644
--- a/Source/WebCore/page/EventHandler.cpp
+++ b/Source/WebCore/page/EventHandler.cpp
@@ -2869,7 +2869,7 @@
if (element) {
if (isOverWidget) {
if (WeakPtr<Widget> widget = widgetForElement(*element)) {
- if (widgetDidHandleWheelEvent(event, *widget.get()))
+ if (passWheelEventToWidget(event, *widget.get()))
return completeWidgetWheelEvent(adjustedEvent, widget, scrollableArea, scrollableContainer.get());
}
}
@@ -4370,7 +4370,7 @@
return true;
}
-bool EventHandler::widgetDidHandleWheelEvent(const PlatformWheelEvent& event, Widget& widget)
+bool EventHandler::passWheelEventToWidget(const PlatformWheelEvent& event, Widget& widget)
{
if (!is<FrameView>(widget))
return false;
diff --git a/Source/WebCore/page/EventHandler.h b/Source/WebCore/page/EventHandler.h
index 58fc9c5..adb15db 100644
--- a/Source/WebCore/page/EventHandler.h
+++ b/Source/WebCore/page/EventHandler.h
@@ -209,13 +209,6 @@
void defaultWheelEventHandler(Node*, WheelEvent&);
bool handlePasteGlobalSelection(const PlatformMouseEvent&);
- void determineWheelEventTarget(const PlatformWheelEvent&, const HitTestResult&, RefPtr<Element>& eventTarget, RefPtr<ContainerNode>& scrollableContainer, WeakPtr<ScrollableArea>&, bool& isOverWidget);
- void recordWheelEventForDeltaFilter(const PlatformWheelEvent&);
- bool processWheelEventForScrolling(const PlatformWheelEvent&, ContainerNode* scrollableContainer, const WeakPtr<ScrollableArea>&);
- void processWheelEventForScrollSnap(const PlatformWheelEvent&, const WeakPtr<ScrollableArea>&);
-
- bool platformCompletePlatformWidgetWheelEvent(const PlatformWheelEvent&, const Widget&, ContainerNode* scrollableContainer);
-
#if ENABLE(IOS_TOUCH_EVENTS) || ENABLE(IOS_GESTURE_EVENTS)
using TouchArray = Vector<RefPtr<Touch>>;
using EventTargetTouchMap = HashMap<EventTarget*, TouchArray*>;
@@ -448,9 +441,16 @@
bool passWidgetMouseDownEventToWidget(RenderWidget*);
bool passMouseDownEventToWidget(Widget*);
- bool widgetDidHandleWheelEvent(const PlatformWheelEvent&, Widget&);
+
+ bool passWheelEventToWidget(const PlatformWheelEvent&, Widget&);
+ void determineWheelEventTarget(const PlatformWheelEvent&, const HitTestResult&, RefPtr<Element>& eventTarget, RefPtr<ContainerNode>& scrollableContainer, WeakPtr<ScrollableArea>&, bool& isOverWidget);
+ void recordWheelEventForDeltaFilter(const PlatformWheelEvent&);
+ bool processWheelEventForScrolling(const PlatformWheelEvent&, ContainerNode* scrollableContainer, const WeakPtr<ScrollableArea>&);
+ void processWheelEventForScrollSnap(const PlatformWheelEvent&, const WeakPtr<ScrollableArea>&);
bool completeWidgetWheelEvent(const PlatformWheelEvent&, const WeakPtr<Widget>&, const WeakPtr<ScrollableArea>&, ContainerNode*);
+ bool platformCompletePlatformWidgetWheelEvent(const PlatformWheelEvent&, const Widget&, ContainerNode* scrollableContainer);
+
void defaultSpaceEventHandler(KeyboardEvent&);
void defaultBackspaceEventHandler(KeyboardEvent&);
void defaultTabEventHandler(KeyboardEvent&);
diff --git a/Source/WebCore/page/ios/EventHandlerIOS.mm b/Source/WebCore/page/ios/EventHandlerIOS.mm
index fb8b36d..29bdfcc 100644
--- a/Source/WebCore/page/ios/EventHandlerIOS.mm
+++ b/Source/WebCore/page/ios/EventHandlerIOS.mm
@@ -418,7 +418,7 @@
return false;
}
-bool EventHandler::widgetDidHandleWheelEvent(const PlatformWheelEvent&, Widget& widget)
+bool EventHandler::passWheelEventToWidget(const PlatformWheelEvent&, Widget& widget)
{
BEGIN_BLOCK_OBJC_EXCEPTIONS;
diff --git a/Source/WebCore/page/mac/EventHandlerMac.mm b/Source/WebCore/page/mac/EventHandlerMac.mm
index 4ff375b..91cb247 100644
--- a/Source/WebCore/page/mac/EventHandlerMac.mm
+++ b/Source/WebCore/page/mac/EventHandlerMac.mm
@@ -467,7 +467,7 @@
CFRelease((__bridge CFTypeRef)self);
}
-bool EventHandler::widgetDidHandleWheelEvent(const PlatformWheelEvent& wheelEvent, Widget& widget)
+bool EventHandler::passWheelEventToWidget(const PlatformWheelEvent& wheelEvent, Widget& widget)
{
BEGIN_BLOCK_OBJC_EXCEPTIONS;
