Attachment #351884 for bug #190402

View Details Raw Unified Return to Bug 190402

| Differences between



2018-10-09  Daniel Bates  <dabates@apple.com>

        [iOS] Cleanup -[WAKView _selfHandleEvent:] and -[WAKWindow sendEventSynchronously:]
        https://bugs.webkit.org/show_bug.cgi?id=190402

        Reviewed by NOBODY (OOPS!).

        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-08  Daniel Bates  <dabates@apple.com>

        Cleanup WebEvent.mm



    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;
    }
#if ENABLE(TOUCH_EVENTS)
    case WebEventTouchBegin:
    case WebEventTouchChange:
    case WebEventTouchEnd:
    case WebEventTouchCancel: {
        [self touch:event];
        break;
    }
#endif
        default:
            ASSERT_NOT_REACHED();
            break;
    }
    return YES;
}



    currentEvent = [anEvent retain];

    switch (anEvent.type) {
    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 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;
    }

    [currentEvent release];

Return to Bug 190402

Lines 133-174 - (BOOL)_selfHandleEvent:(WebEvent *)event a/Source/WebCore/platform/ios/wak/WAKView.mm_sec1
- a/Source/WebCore/platform/ios/wak/WAKView.mm -34 / +31 lines
133	WebEventType type = event.type;	133	WebEventType type = event.type;
134		134
135	switch (type) {	135	switch (type) {
136	case WebEventMouseDown: {	136	case WebEventMouseDown: {
137	[self mouseDown:event];	137	[self mouseDown:event];
138	break;	138	break;
139	}	139	}
140	case WebEventMouseUp: {	140	case WebEventMouseUp: {
141	[self mouseUp:event];	141	[self mouseUp:event];
142	break;	142	break;
143	}	143	}
144	case WebEventMouseMoved: {	144	case WebEventMouseMoved: {
145	[self mouseMoved:event];	145	[self mouseMoved:event];
146	break;	146	break;
147	}	147	}
148	case WebEventKeyDown: {	148	case WebEventKeyDown: {
149	[self keyDown:event];	149	[self keyDown:event];
150	break;	150	break;
151	}	151	}
152	case WebEventKeyUp: {	152	case WebEventKeyUp: {
153	[self keyUp:event];	153	[self keyUp:event];
154	break;	154	break;
155	}	155	}
156	case WebEventScrollWheel: {	156	case WebEventScrollWheel: {
157	[self scrollWheel:event];	157	[self scrollWheel:event];
158	break;	158	break;
159	}	159	}
160	#if ENABLE(TOUCH_EVENTS)	160	#if ENABLE(TOUCH_EVENTS)
161	case WebEventTouchBegin:	161	case WebEventTouchBegin:
162	case WebEventTouchChange:	162	case WebEventTouchChange:
163	case WebEventTouchEnd:	163	case WebEventTouchEnd:
164	case WebEventTouchCancel: {	164	case WebEventTouchCancel: {
165	[self touch:event];	165	[self touch:event];
166	break;	166	break;
167	}	167	}
168	#endif	168	#endif
169	default:
170	ASSERT_NOT_REACHED();
171	break;
172	}	169	}
173	return YES;	170	return YES;
174	}	171	}

Lines 328-359 - (void)sendEventSynchronously:(WebEvent *)anEvent a/Source/WebCore/platform/ios/wak/WAKWindow.mm_sec1
- a/Source/WebCore/platform/ios/wak/WAKWindow.mm -26 / +22 lines
328	currentEvent = [anEvent retain];	328	currentEvent = [anEvent retain];
329		329
330	switch (anEvent.type) {	330	switch (anEvent.type) {
331	case WebEventMouseMoved:	331	case WebEventMouseMoved:
332	case WebEventScrollWheel:	332	case WebEventScrollWheel:
333	if (WAKView *hitView = [_contentView hitTest:(anEvent.locationInWindow)])	333	if (WAKView *hitView = [_contentView hitTest:(anEvent.locationInWindow)])
334	[hitView handleEvent:anEvent];	334	[hitView handleEvent:anEvent];
335	break;	335	break;
336		336
337	case WebEventMouseUp:	337	case WebEventMouseUp:
338	case WebEventKeyDown:	338	case WebEventKeyDown:
339	case WebEventKeyUp:	339	case WebEventKeyUp:
340	case WebEventTouchChange:	340	case WebEventTouchChange:
341	[_responderView handleEvent:anEvent];	341	[_responderView handleEvent:anEvent];
342	break;	342	break;
343		343
344	case WebEventMouseDown:	344	case WebEventMouseDown:
345	case WebEventTouchBegin:	345	case WebEventTouchBegin:
346	case WebEventTouchEnd:	346	case WebEventTouchEnd:
347	case WebEventTouchCancel:	347	case WebEventTouchCancel:
348	if (WAKView *hitView = [_contentView hitTest:(anEvent.locationInWindow)]) {	348	if (WAKView *hitView = [_contentView hitTest:(anEvent.locationInWindow)]) {
349	[self makeFirstResponder:hitView];	349	[self makeFirstResponder:hitView];
350	[hitView handleEvent:anEvent];	350	[hitView handleEvent:anEvent];
351	}	351	}
352	break;	352	break;
353
354	default:
355	ASSERT_NOT_REACHED();
356	break;
357	}	353	}
358		354
359	[currentEvent release];	355	[currentEvent release];

Lines 1-3 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +16 lines
		1	2018-10-09 Daniel Bates <dabates@apple.com>
		2
		3	[iOS] Cleanup -[WAKView _selfHandleEvent:] and -[WAKWindow sendEventSynchronously:]
		4	https://bugs.webkit.org/show_bug.cgi?id=190402
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Unindent case statements. Remove use of default case statements with body ASSERT_NOT_REACHED()
		9	to catch the cases of a missing enumerator. By omitting the default case statement we turn
		10	such a scenario into a compile-time error instead of handling it as a runtime error.
		11
		12	* platform/ios/wak/WAKView.mm:
		13	(-[WAKView _selfHandleEvent:]):
		14	* platform/ios/wak/WAKWindow.mm:
		15	(-[WAKWindow sendEventSynchronously:]):
		16
1	2018-10-08 Daniel Bates <dabates@apple.com>	17	2018-10-08 Daniel Bates <dabates@apple.com>
2		18
3	Cleanup WebEvent.mm	19	Cleanup WebEvent.mm