Modified: trunk/Source/WebCore/platform/ios/WebEvent.mm (236981 => 236982)
--- trunk/Source/WebCore/platform/ios/WebEvent.mm 2018-10-09 21:29:31 UTC (rev 236981)
+++ trunk/Source/WebCore/platform/ios/WebEvent.mm 2018-10-09 21:30:53 UTC (rev 236982)
@@ -254,28 +254,28 @@
- (NSString *)_typeDescription
{
switch (_type) {
- case WebEventMouseDown:
- return @"WebEventMouseDown";
- case WebEventMouseUp:
- return @"WebEventMouseUp";
- case WebEventMouseMoved:
- return @"WebEventMouseMoved";
- case WebEventScrollWheel:
- return @"WebEventScrollWheel";
- case WebEventKeyDown:
- return @"WebEventKeyDown";
- case WebEventKeyUp:
- return @"WebEventKeyUp";
- case WebEventTouchBegin:
- return @"WebEventTouchBegin";
- case WebEventTouchChange:
- return @"WebEventTouchChange";
- case WebEventTouchEnd:
- return @"WebEventTouchEnd";
- case WebEventTouchCancel:
- return @"WebEventTouchCancel";
- default:
- ASSERT_NOT_REACHED();
+ case WebEventMouseDown:
+ return @"WebEventMouseDown";
+ case WebEventMouseUp:
+ return @"WebEventMouseUp";
+ case WebEventMouseMoved:
+ return @"WebEventMouseMoved";
+ case WebEventScrollWheel:
+ return @"WebEventScrollWheel";
+ case WebEventKeyDown:
+ return @"WebEventKeyDown";
+ case WebEventKeyUp:
+ return @"WebEventKeyUp";
+ case WebEventTouchBegin:
+ return @"WebEventTouchBegin";
+ case WebEventTouchChange:
+ return @"WebEventTouchChange";
+ case WebEventTouchEnd:
+ return @"WebEventTouchEnd";
+ case WebEventTouchCancel:
+ return @"WebEventTouchCancel";
+ default:
+ ASSERT_NOT_REACHED();
}
return @"Unknown";
}
@@ -283,28 +283,28 @@
- (NSString *)_modiferFlagsDescription
{
switch (_modifierFlags) {
- case WebEventMouseDown:
- return @"WebEventMouseDown";
- case WebEventMouseUp:
- return @"WebEventMouseUp";
- case WebEventMouseMoved:
- return @"WebEventMouseMoved";
- case WebEventScrollWheel:
- return @"WebEventScrollWheel";
- case WebEventKeyDown:
- return @"WebEventKeyDown";
- case WebEventKeyUp:
- return @"WebEventKeyUp";
- case WebEventTouchBegin:
- return @"WebEventTouchBegin";
- case WebEventTouchChange:
- return @"WebEventTouchChange";
- case WebEventTouchEnd:
- return @"WebEventTouchEnd";
- case WebEventTouchCancel:
- return @"WebEventTouchCancel";
- default:
- ASSERT_NOT_REACHED();
+ case WebEventMouseDown:
+ return @"WebEventMouseDown";
+ case WebEventMouseUp:
+ return @"WebEventMouseUp";
+ case WebEventMouseMoved:
+ return @"WebEventMouseMoved";
+ case WebEventScrollWheel:
+ return @"WebEventScrollWheel";
+ case WebEventKeyDown:
+ return @"WebEventKeyDown";
+ case WebEventKeyUp:
+ return @"WebEventKeyUp";
+ case WebEventTouchBegin:
+ return @"WebEventTouchBegin";
+ case WebEventTouchChange:
+ return @"WebEventTouchChange";
+ case WebEventTouchEnd:
+ return @"WebEventTouchEnd";
+ case WebEventTouchCancel:
+ return @"WebEventTouchCancel";
+ default:
+ ASSERT_NOT_REACHED();
}
return @"Unknown";
}
@@ -335,18 +335,18 @@
- (NSString *)_touchPhaseDescription:(WebEventTouchPhaseType)phase
{
switch (phase) {
- case WebEventTouchPhaseBegan:
- return @"WebEventTouchPhaseBegan";
- case WebEventTouchPhaseMoved:
- return @"WebEventTouchPhaseMoved";
- case WebEventTouchPhaseStationary:
- return @"WebEventTouchPhaseStationary";
- case WebEventTouchPhaseEnded:
- return @"WebEventTouchPhaseEnded";
- case WebEventTouchPhaseCancelled:
- return @"WebEventTouchPhaseCancelled";
- default:
- ASSERT_NOT_REACHED();
+ case WebEventTouchPhaseBegan:
+ return @"WebEventTouchPhaseBegan";
+ case WebEventTouchPhaseMoved:
+ return @"WebEventTouchPhaseMoved";
+ case WebEventTouchPhaseStationary:
+ return @"WebEventTouchPhaseStationary";
+ case WebEventTouchPhaseEnded:
+ return @"WebEventTouchPhaseEnded";
+ case WebEventTouchPhaseCancelled:
+ return @"WebEventTouchPhaseCancelled";
+ default:
+ ASSERT_NOT_REACHED();
}
return @"Unknown";
}
@@ -365,22 +365,22 @@
- (NSString *)_eventDescription
{
switch (_type) {
- case WebEventMouseDown:
- case WebEventMouseUp:
- case WebEventMouseMoved:
- return [NSString stringWithFormat:@"location: (%f, %f)", _locationInWindow.x, _locationInWindow.y];
- case WebEventScrollWheel:
- return [NSString stringWithFormat:@"location: (%f, %f) deltaX: %f deltaY: %f", _locationInWindow.x, _locationInWindow.y, _deltaX, _deltaY];
- case WebEventKeyDown:
- case WebEventKeyUp:
- return [NSString stringWithFormat:@"chars: %@ charsNoModifiers: %@ flags: %d repeating: %d keyboardFlags: %lu keyCode %d, isTab: %d", _characters, _charactersIgnoringModifiers, _modifierFlags, _keyRepeating, static_cast<unsigned long>(_keyboardFlags), _keyCode, _tabKey];
- case WebEventTouchBegin:
- case WebEventTouchChange:
- case WebEventTouchEnd:
- case WebEventTouchCancel:
- return [NSString stringWithFormat:@"location: (%f, %f) count: %d locations: %@ identifiers: %@ phases: %@ isGesture: %d scale: %f rotation: %f", _locationInWindow.x, _locationInWindow.y, _touchCount, [self _touchLocationsDescription:_touchLocations], [self _touchIdentifiersDescription], [self _touchPhasesDescription], (_isGesture ? 1 : 0), _gestureScale, _gestureRotation];
- default:
- ASSERT_NOT_REACHED();
+ case WebEventMouseDown:
+ case WebEventMouseUp:
+ case WebEventMouseMoved:
+ return [NSString stringWithFormat:@"location: (%f, %f)", _locationInWindow.x, _locationInWindow.y];
+ case WebEventScrollWheel:
+ return [NSString stringWithFormat:@"location: (%f, %f) deltaX: %f deltaY: %f", _locationInWindow.x, _locationInWindow.y, _deltaX, _deltaY];
+ case WebEventKeyDown:
+ case WebEventKeyUp:
+ return [NSString stringWithFormat:@"chars: %@ charsNoModifiers: %@ flags: %d repeating: %d keyboardFlags: %lu keyCode %d, isTab: %d", _characters, _charactersIgnoringModifiers, _modifierFlags, _keyRepeating, static_cast<unsigned long>(_keyboardFlags), _keyCode, _tabKey];
+ case WebEventTouchBegin:
+ case WebEventTouchChange:
+ case WebEventTouchEnd:
+ case WebEventTouchCancel:
+ return [NSString stringWithFormat:@"location: (%f, %f) count: %d locations: %@ identifiers: %@ phases: %@ isGesture: %d scale: %f rotation: %f", _locationInWindow.x, _locationInWindow.y, _touchCount, [self _touchLocationsDescription:_touchLocations], [self _touchIdentifiersDescription], [self _touchPhasesDescription], (_isGesture ? 1 : 0), _gestureScale, _gestureRotation];
+ default:
+ ASSERT_NOT_REACHED();
}
return @"Unknown";
}