Title: [236983] trunk/Source/WebCore
- Revision
- 236983
- Author
- dba...@webkit.org
- Date
- 2018-10-09 14:31:35 -0700 (Tue, 09 Oct 2018)
Log Message
[iOS] Cleanup EventHandler::passSubframeEventToSubframe()
https://bugs.webkit.org/show_bug.cgi?id=190390
Reviewed by Wenson Hsieh.
Unindent case statements in switch block and use more auto.
* page/ios/EventHandlerIOS.mm:
(WebCore::EventHandler::passSubframeEventToSubframe):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (236982 => 236983)
--- trunk/Source/WebCore/ChangeLog 2018-10-09 21:30:53 UTC (rev 236982)
+++ trunk/Source/WebCore/ChangeLog 2018-10-09 21:31:35 UTC (rev 236983)
@@ -1,5 +1,17 @@
2018-10-09 Daniel Bates <daba...@apple.com>
+ [iOS] Cleanup EventHandler::passSubframeEventToSubframe()
+ https://bugs.webkit.org/show_bug.cgi?id=190390
+
+ Reviewed by Wenson Hsieh.
+
+ Unindent case statements in switch block and use more auto.
+
+ * page/ios/EventHandlerIOS.mm:
+ (WebCore::EventHandler::passSubframeEventToSubframe):
+
+2018-10-09 Daniel Bates <daba...@apple.com>
+
Cleanup WebEvent.mm
https://bugs.webkit.org/show_bug.cgi?id=190391
Modified: trunk/Source/WebCore/page/ios/EventHandlerIOS.mm (236982 => 236983)
--- trunk/Source/WebCore/page/ios/EventHandlerIOS.mm 2018-10-09 21:30:53 UTC (rev 236982)
+++ trunk/Source/WebCore/page/ios/EventHandlerIOS.mm 2018-10-09 21:31:35 UTC (rev 236983)
@@ -366,49 +366,49 @@
WebEventType currentEventType = currentEvent().type;
switch (currentEventType) {
- case WebEventMouseMoved: {
- // Since we're passing in currentNSEvent() here, we can call
- // handleMouseMoveEvent() directly, since the save/restore of
- // currentNSEvent() that mouseMoved() does would have no effect.
- ASSERT(!m_sendingEventToSubview);
- m_sendingEventToSubview = true;
- subframe->eventHandler().handleMouseMoveEvent(currentPlatformMouseEvent(), hoveredNode);
- m_sendingEventToSubview = false;
- return true;
- }
- case WebEventMouseDown: {
- Node* node = event.targetNode();
- if (!node)
- return false;
- auto* renderer = node->renderer();
- if (!is<RenderWidget>(renderer))
- return false;
- Widget* widget = downcast<RenderWidget>(*renderer).widget();
- if (!widget || !widget->isFrameView())
- return false;
- if (!passWidgetMouseDownEventToWidget(downcast<RenderWidget>(renderer)))
- return false;
- m_mouseDownWasInSubframe = true;
- return true;
- }
- case WebEventMouseUp: {
- if (!m_mouseDownWasInSubframe)
- return false;
- ASSERT(!m_sendingEventToSubview);
- m_sendingEventToSubview = true;
- subframe->eventHandler().handleMouseReleaseEvent(currentPlatformMouseEvent());
- m_sendingEventToSubview = false;
- return true;
- }
- case WebEventKeyDown:
- case WebEventKeyUp:
- case WebEventScrollWheel:
- case WebEventTouchBegin:
- case WebEventTouchCancel:
- case WebEventTouchChange:
- case WebEventTouchEnd:
+ case WebEventMouseMoved: {
+ // Since we're passing in currentNSEvent() here, we can call
+ // handleMouseMoveEvent() directly, since the save/restore of
+ // currentNSEvent() that mouseMoved() does would have no effect.
+ ASSERT(!m_sendingEventToSubview);
+ m_sendingEventToSubview = true;
+ subframe->eventHandler().handleMouseMoveEvent(currentPlatformMouseEvent(), hoveredNode);
+ m_sendingEventToSubview = false;
+ return true;
+ }
+ case WebEventMouseDown: {
+ auto* node = event.targetNode();
+ if (!node)
return false;
+ auto* renderer = node->renderer();
+ if (!is<RenderWidget>(renderer))
+ return false;
+ auto* widget = downcast<RenderWidget>(*renderer).widget();
+ if (!widget || !widget->isFrameView())
+ return false;
+ if (!passWidgetMouseDownEventToWidget(downcast<RenderWidget>(renderer)))
+ return false;
+ m_mouseDownWasInSubframe = true;
+ return true;
}
+ case WebEventMouseUp: {
+ if (!m_mouseDownWasInSubframe)
+ return false;
+ ASSERT(!m_sendingEventToSubview);
+ m_sendingEventToSubview = true;
+ subframe->eventHandler().handleMouseReleaseEvent(currentPlatformMouseEvent());
+ m_sendingEventToSubview = false;
+ return true;
+ }
+ case WebEventKeyDown:
+ case WebEventKeyUp:
+ case WebEventScrollWheel:
+ case WebEventTouchBegin:
+ case WebEventTouchCancel:
+ case WebEventTouchChange:
+ case WebEventTouchEnd:
+ return false;
+ }
END_BLOCK_OBJC_EXCEPTIONS;
return false;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
