Changeset 237027 in webkit
- Timestamp:
- Oct 10, 2018 8:08:34 PM (5 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r237025 r237027 1 2018-10-10 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 Anders Carlsson. 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 17 2018-10-05 Ryosuke Niwa <rniwa@webkit.org> 2 18 -
trunk/Source/WebCore/platform/ios/wak/WAKView.mm
r232452 r237027 131 131 - (BOOL)_selfHandleEvent:(WebEvent *)event 132 132 { 133 WebEventType type = event.type; 134 135 switch (type) { 136 case WebEventMouseDown: { 137 [self mouseDown:event]; 138 break; 139 } 140 case WebEventMouseUp: { 141 [self mouseUp:event]; 142 break; 143 } 144 case WebEventMouseMoved: { 145 [self mouseMoved:event]; 146 break; 147 } 148 case WebEventKeyDown: { 149 [self keyDown:event]; 150 break; 151 } 152 case WebEventKeyUp: { 153 [self keyUp:event]; 154 break; 155 } 156 case WebEventScrollWheel: { 157 [self scrollWheel:event]; 158 break; 159 } 133 switch (event.type) { 134 case WebEventMouseDown: 135 [self mouseDown:event]; 136 return YES; 137 case WebEventMouseUp: 138 [self mouseUp:event]; 139 return YES; 140 case WebEventMouseMoved: 141 [self mouseMoved:event]; 142 return YES; 143 case WebEventKeyDown: 144 [self keyDown:event]; 145 return YES; 146 case WebEventKeyUp: 147 [self keyUp:event]; 148 return YES; 149 case WebEventScrollWheel: 150 [self scrollWheel:event]; 151 return YES; 152 case WebEventTouchBegin: 153 case WebEventTouchChange: 154 case WebEventTouchEnd: 155 case WebEventTouchCancel: 160 156 #if ENABLE(TOUCH_EVENTS) 161 case WebEventTouchBegin: 162 case WebEventTouchChange: 163 case WebEventTouchEnd: 164 case WebEventTouchCancel: { 165 [self touch:event]; 166 break; 167 } 157 [self touch:event]; 168 158 #endif 169 default: 170 ASSERT_NOT_REACHED(); 171 break; 172 } 173 return YES; 159 return YES; 160 } 174 161 } 175 162 -
trunk/Source/WebCore/platform/ios/wak/WAKWindow.mm
r232178 r237027 329 329 330 330 switch (anEvent.type) { 331 case WebEventMouseMoved: 332 case WebEventScrollWheel: 333 if (WAKView *hitView = [_contentView hitTest:(anEvent.locationInWindow)]) 334 [hitView handleEvent:anEvent]; 335 break; 336 337 case WebEventMouseUp: 338 case WebEventKeyDown: 339 case WebEventKeyUp: 340 case WebEventTouchChange: 341 [_responderView handleEvent:anEvent]; 342 break; 343 344 case WebEventMouseDown: 345 case WebEventTouchBegin: 346 case WebEventTouchEnd: 347 case WebEventTouchCancel: 348 if (WAKView *hitView = [_contentView hitTest:(anEvent.locationInWindow)]) { 349 [self makeFirstResponder:hitView]; 350 [hitView handleEvent:anEvent]; 351 } 352 break; 353 354 default: 355 ASSERT_NOT_REACHED(); 356 break; 331 case WebEventMouseMoved: 332 case WebEventScrollWheel: 333 if (WAKView *hitView = [_contentView hitTest:(anEvent.locationInWindow)]) 334 [hitView handleEvent:anEvent]; 335 break; 336 337 case WebEventMouseUp: 338 case WebEventKeyDown: 339 case WebEventKeyUp: 340 case WebEventTouchChange: 341 [_responderView handleEvent:anEvent]; 342 break; 343 344 case WebEventMouseDown: 345 case WebEventTouchBegin: 346 case WebEventTouchEnd: 347 case WebEventTouchCancel: 348 if (WAKView *hitView = [_contentView hitTest:(anEvent.locationInWindow)]) { 349 [self makeFirstResponder:hitView]; 350 [hitView handleEvent:anEvent]; 351 } 352 break; 357 353 } 358 354
Note: See TracChangeset
for help on using the changeset viewer.