Changeset 239275 in webkit

Timestamp:

Dec 17, 2018 10:58:52 AM (5 years ago)

Author:

dbates@webkit.org

Message:

[iOS] Remove -[WebEvent initWithKeyEventType:...:characterSet:]
​https://bugs.webkit.org/show_bug.cgi?id=192633

Reviewed by Wenson Hsieh.

Source/WebCore:

UIKit has long adopted the newer -[WebEvent initWithKeyEventType:] initializer that takes an
input manager hint. We no longer need to keep the variant -[WebEvent initWithKeyEventType:...:characterSet:]
for binary compatibility.

• platform/ios/WebEvent.h:
• platform/ios/WebEvent.mm:

(-[WebEvent initWithKeyEventType:timeStamp:characters:charactersIgnoringModifiers:modifiers:isRepeating:withFlags:keyCode:isTabKey:characterSet:]): Deleted.

Source/WebKit:

Update code to use the modern initializer.

• UIProcess/ios/WKWebEvent.mm:

(-[WKWebEvent initWithEvent:]):

Tools:

Update code to use the modern initializer.

• DumpRenderTree/mac/EventSendingController.mm:

(-[EventSendingController keyDown:withModifiers:withLocation:]):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/ios/WebEvent.h (modified) (1 diff)
• Source/WebCore/platform/ios/WebEvent.mm (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/ios/WKWebEvent.mm (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/mac/EventSendingController.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-12-17  Daniel Bates  <dabates@apple.com>
+
+        [iOS] Remove -[WebEvent initWithKeyEventType:...:characterSet:]
+        https://bugs.webkit.org/show_bug.cgi?id=192633
+
+        Reviewed by Wenson Hsieh.
+
+        UIKit has long adopted the newer -[WebEvent initWithKeyEventType:] initializer that takes an
+        input manager hint. We no longer need to keep the variant -[WebEvent initWithKeyEventType:...:characterSet:]
+        for binary compatibility.
+
+        * platform/ios/WebEvent.h:
+        * platform/ios/WebEvent.mm:
+        (-[WebEvent initWithKeyEventType:timeStamp:characters:charactersIgnoringModifiers:modifiers:isRepeating:withFlags:keyCode:isTabKey:characterSet:]): Deleted.
+
 2018-12-17  Matt Lewis  <jlewis3@apple.com>
 

trunk/Source/WebCore/platform/ios/WebEvent.h

@@ -160 +160 @@
                      gestureRotation:(float)gestureRotation;
 
-// FIXME: this needs to be removed when UIKit adopts the other initializer.
-- (WebEvent *)initWithKeyEventType:(WebEventType)type
-                         timeStamp:(CFTimeInterval)timeStamp
-                        characters:(NSString *)characters
-       charactersIgnoringModifiers:(NSString *)charactersIgnoringModifiers
-                         modifiers:(WebEventFlags)modifiers
-                       isRepeating:(BOOL)repeating
-                         withFlags:(WebKeyboardInputFlags)flags
-                           keyCode:(uint16_t)keyCode
-                          isTabKey:(BOOL)tabKey
-                      characterSet:(WebEventCharacterSet)characterSet;
-
 - (WebEvent *)initWithKeyEventType:(WebEventType)type
                          timeStamp:(CFTimeInterval)timeStamp

trunk/Source/WebCore/platform/ios/WebEvent.mm

@@ -158 +158 @@
 }
 
-// FIXME: to be removed when the adoption of the new initializer is complete.
-- (WebEvent *)initWithKeyEventType:(WebEventType)type
-                         timeStamp:(CFTimeInterval)timeStamp
-                        characters:(NSString *)characters
-       charactersIgnoringModifiers:(NSString *)charactersIgnoringModifiers
-                         modifiers:(WebEventFlags)modifiers
-                       isRepeating:(BOOL)repeating
-                         withFlags:(NSUInteger)flags
-                           keyCode:(uint16_t)keyCode
-                          isTabKey:(BOOL)tabKey
-                      characterSet:(WebEventCharacterSet)characterSet
-{
-    UNUSED_PARAM(characterSet);
-    self = [super init];
-    if (!self)
-        return nil;
-    
-    _type = type;
-    _timestamp = timeStamp;
-    _keyboardFlags = flags;
-    _modifierFlags = modifiers;
-    if (keyCode)
-        _keyCode = windowsKeyCodeForKeyCode(keyCode);
-    else if ([charactersIgnoringModifiers length] == 1) {
-        // This event is likely for a software keyboard-generated event.
-        _keyCode = windowsKeyCodeForCharCodeIOS([charactersIgnoringModifiers characterAtIndex:0]);
-    }
-
-    if (!(_keyboardFlags & WebEventKeyboardInputModifierFlagsChanged)) {
-        _characters = [normalizedStringWithAppKitCompatibilityMapping(characters, keyCode) retain];
-        _charactersIgnoringModifiers = [normalizedStringWithAppKitCompatibilityMapping(charactersIgnoringModifiers, keyCode) retain];
-        _tabKey = tabKey;
-        _keyRepeating = repeating;
-    }
-
-    return self;
-}
-
 - (WebEvent *)initWithKeyEventType:(WebEventType)type
                          timeStamp:(CFTimeInterval)timeStamp

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-12-17  Daniel Bates  <dabates@apple.com>
+
+        [iOS] Remove -[WebEvent initWithKeyEventType:...:characterSet:]
+        https://bugs.webkit.org/show_bug.cgi?id=192633
+
+        Reviewed by Wenson Hsieh.
+
+        Update code to use the modern initializer.
+
+        * UIProcess/ios/WKWebEvent.mm:
+        (-[WKWebEvent initWithEvent:]):
+
 2018-12-17  Matt Lewis  <jlewis3@apple.com>
 

trunk/Source/WebKit/UIProcess/ios/WKWebEvent.mm

@@ -54 +54 @@
     }
 
-    self = [super initWithKeyEventType:(event._isKeyDown ? WebEventKeyDown : WebEventKeyUp) timeStamp:event.timestamp characters:event._modifiedInput charactersIgnoringModifiers:event._unmodifiedInput modifiers:modifierFlags isRepeating:(inputFlags & kUIKeyboardInputRepeat) withFlags:inputFlags keyCode:keyCode isTabKey:[event._modifiedInput isEqualToString:@"\t"] characterSet:WebEventCharacterSetUnicode];
+    self = [super initWithKeyEventType:(event._isKeyDown ? WebEventKeyDown : WebEventKeyUp) timeStamp:event.timestamp characters:event._modifiedInput charactersIgnoringModifiers:event._unmodifiedInput modifiers:modifierFlags isRepeating:(inputFlags & kUIKeyboardInputRepeat) withFlags:inputFlags withInputManagerHint:nil keyCode:keyCode isTabKey:[event._modifiedInput isEqualToString:@"\t"]];
     if (!self)
         return nil;

trunk/Tools/ChangeLog

@@ +1 @@
+2018-12-17  Daniel Bates  <dabates@apple.com>
+
+        [iOS] Remove -[WebEvent initWithKeyEventType:...:characterSet:]
+        https://bugs.webkit.org/show_bug.cgi?id=192633
+
+        Reviewed by Wenson Hsieh.
+
+        Update code to use the modern initializer.
+
+        * DumpRenderTree/mac/EventSendingController.mm:
+        (-[EventSendingController keyDown:withModifiers:withLocation:]):
+
 2018-12-17  Matt Lewis  <jlewis3@apple.com>
 

trunk/Tools/DumpRenderTree/mac/EventSendingController.mm

@@ -1135 +1135 @@
                         keyCode:keyCode];
 #else
-    WebEvent *event = [[WebEvent alloc] initWithKeyEventType:WebEventKeyDown
-                        timeStamp:[self currentEventTime]
-                        characters:eventCharacter
-                        charactersIgnoringModifiers:charactersIgnoringModifiers
-                        modifiers:(WebEventFlags)modifierFlags
-                        isRepeating:NO
-                        withFlags:0
-                        keyCode:[character characterAtIndex:0]
-                        isTabKey:([character characterAtIndex:0] == '\t')
-                        characterSet:WebEventCharacterSetASCII];
+    WebEvent *event = [[WebEvent alloc] initWithKeyEventType:WebEventKeyDown timeStamp:[self currentEventTime] characters:eventCharacter charactersIgnoringModifiers:charactersIgnoringModifiers modifiers:(WebEventFlags)modifierFlags isRepeating:NO withFlags:0 withInputManagerHint:nil keyCode:[character characterAtIndex:0] isTabKey:([character characterAtIndex:0] == '\t')];
 #endif
 
@@ -1168 +1159 @@
 #else
     [event release];
-    event = [[WebEvent alloc] initWithKeyEventType:WebEventKeyUp
-                        timeStamp:[self currentEventTime]
-                        characters:eventCharacter
-                        charactersIgnoringModifiers:charactersIgnoringModifiers
-                        modifiers:(WebEventFlags)modifierFlags
-                        isRepeating:NO
-                        withFlags:0
-                        keyCode:[character characterAtIndex:0]
-                        isTabKey:([character characterAtIndex:0] == '\t')
-                        characterSet:WebEventCharacterSetASCII];
+    event = [[WebEvent alloc] initWithKeyEventType:WebEventKeyUp timeStamp:[self currentEventTime] characters:eventCharacter charactersIgnoringModifiers:charactersIgnoringModifiers modifiers:(WebEventFlags)modifierFlags isRepeating:NO withFlags:0 withInputManagerHint:nil keyCode:[character characterAtIndex:0] isTabKey:([character characterAtIndex:0] == '\t')];
 #endif