Title: [237027] trunk/Source/WebCore
- Revision
- 237027
- Author
- [email protected]
- Date
- 2018-10-10 20:08:34 -0700 (Wed, 10 Oct 2018)
Log Message
[iOS] Cleanup -[WAKView _selfHandleEvent:] and -[WAKWindow sendEventSynchronously:]
https://bugs.webkit.org/show_bug.cgi?id=190402
Reviewed by Anders Carlsson.
Unindent case statements. Remove use of default case statements with body ASSERT_NOT_REACHED()
to catch the cases of a missing enumerator. By omitting the default case statement we turn
such a scenario into a compile-time error instead of handling it as a runtime error.
* platform/ios/wak/WAKView.mm:
(-[WAKView _selfHandleEvent:]):
* platform/ios/wak/WAKWindow.mm:
(-[WAKWindow sendEventSynchronously:]):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (237026 => 237027)
--- trunk/Source/WebCore/ChangeLog 2018-10-11 03:03:58 UTC (rev 237026)
+++ trunk/Source/WebCore/ChangeLog 2018-10-11 03:08:34 UTC (rev 237027)
@@ -1,3 +1,19 @@
+2018-10-10 Daniel Bates <[email protected]>
+
+ [iOS] Cleanup -[WAKView _selfHandleEvent:] and -[WAKWindow sendEventSynchronously:]
+ https://bugs.webkit.org/show_bug.cgi?id=190402
+
+ Reviewed by Anders Carlsson.
+
+ Unindent case statements. Remove use of default case statements with body ASSERT_NOT_REACHED()
+ to catch the cases of a missing enumerator. By omitting the default case statement we turn
+ such a scenario into a compile-time error instead of handling it as a runtime error.
+
+ * platform/ios/wak/WAKView.mm:
+ (-[WAKView _selfHandleEvent:]):
+ * platform/ios/wak/WAKWindow.mm:
+ (-[WAKWindow sendEventSynchronously:]):
+
2018-10-05 Ryosuke Niwa <[email protected]>
Rename MarkupAccumulator::appendStartTag, appendElement, etc... for clarity
Modified: trunk/Source/WebCore/platform/ios/wak/WAKView.mm (237026 => 237027)
--- trunk/Source/WebCore/platform/ios/wak/WAKView.mm 2018-10-11 03:03:58 UTC (rev 237026)
+++ trunk/Source/WebCore/platform/ios/wak/WAKView.mm 2018-10-11 03:08:34 UTC (rev 237027)
@@ -130,47 +130,34 @@
- (BOOL)_selfHandleEvent:(WebEvent *)event
{
- WebEventType type = event.type;
-
- switch (type) {
- case WebEventMouseDown: {
- [self mouseDown:event];
- break;
- }
- case WebEventMouseUp: {
- [self mouseUp:event];
- break;
- }
- case WebEventMouseMoved: {
- [self mouseMoved:event];
- break;
- }
- case WebEventKeyDown: {
- [self keyDown:event];
- break;
- }
- case WebEventKeyUp: {
- [self keyUp:event];
- break;
- }
- case WebEventScrollWheel: {
- [self scrollWheel:event];
- break;
- }
+ switch (event.type) {
+ case WebEventMouseDown:
+ [self mouseDown:event];
+ return YES;
+ case WebEventMouseUp:
+ [self mouseUp:event];
+ return YES;
+ case WebEventMouseMoved:
+ [self mouseMoved:event];
+ return YES;
+ case WebEventKeyDown:
+ [self keyDown:event];
+ return YES;
+ case WebEventKeyUp:
+ [self keyUp:event];
+ return YES;
+ case WebEventScrollWheel:
+ [self scrollWheel:event];
+ return YES;
+ case WebEventTouchBegin:
+ case WebEventTouchChange:
+ case WebEventTouchEnd:
+ case WebEventTouchCancel:
#if ENABLE(TOUCH_EVENTS)
- case WebEventTouchBegin:
- case WebEventTouchChange:
- case WebEventTouchEnd:
- case WebEventTouchCancel: {
- [self touch:event];
- break;
- }
+ [self touch:event];
#endif
- default:
- ASSERT_NOT_REACHED();
- break;
+ return YES;
}
- return YES;
}
- (NSResponder *)nextResponder
Modified: trunk/Source/WebCore/platform/ios/wak/WAKWindow.mm (237026 => 237027)
--- trunk/Source/WebCore/platform/ios/wak/WAKWindow.mm 2018-10-11 03:03:58 UTC (rev 237026)
+++ trunk/Source/WebCore/platform/ios/wak/WAKWindow.mm 2018-10-11 03:08:34 UTC (rev 237027)
@@ -328,32 +328,28 @@
currentEvent = [anEvent retain];
switch (anEvent.type) {
- case WebEventMouseMoved:
- case WebEventScrollWheel:
- if (WAKView *hitView = [_contentView hitTest:(anEvent.locationInWindow)])
- [hitView handleEvent:anEvent];
- break;
+ case WebEventMouseMoved:
+ case WebEventScrollWheel:
+ if (WAKView *hitView = [_contentView hitTest:(anEvent.locationInWindow)])
+ [hitView handleEvent:anEvent];
+ break;
- case WebEventMouseUp:
- case WebEventKeyDown:
- case WebEventKeyUp:
- case WebEventTouchChange:
- [_responderView handleEvent:anEvent];
- break;
+ case WebEventMouseUp:
+ case WebEventKeyDown:
+ case WebEventKeyUp:
+ case WebEventTouchChange:
+ [_responderView handleEvent:anEvent];
+ break;
- case WebEventMouseDown:
- case WebEventTouchBegin:
- case WebEventTouchEnd:
- case WebEventTouchCancel:
- if (WAKView *hitView = [_contentView hitTest:(anEvent.locationInWindow)]) {
- [self makeFirstResponder:hitView];
- [hitView handleEvent:anEvent];
- }
- break;
-
- default:
- ASSERT_NOT_REACHED();
- break;
+ case WebEventMouseDown:
+ case WebEventTouchBegin:
+ case WebEventTouchEnd:
+ case WebEventTouchCancel:
+ if (WAKView *hitView = [_contentView hitTest:(anEvent.locationInWindow)]) {
+ [self makeFirstResponder:hitView];
+ [hitView handleEvent:anEvent];
+ }
+ break;
}
[currentEvent release];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
