Attachment 357151 Details for Bug 192633 – Patch

[patch] Patch

bug-192633-20181212112006.patch (text/plain), 9.84 KB, created by Daniel Bates on 2018-12-12 11:20:07 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Bates

Created: 2018-12-12 11:20:07 PST

Size: 9.84 KB

patch

obsolete

>Subversion Revision: 239114
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index c0ae4ec3cd36a93400445791c559a829babf673d..19a48196b850208acd1879b923b3ccc132729a50 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-12-12  Daniel Bates  <dabates@apple.com>
>+
>+        [iOS] Remove -[WebEvent initWithKeyEventType:...:characterSet:]
>+        https://bugs.webkit.org/show_bug.cgi?id=192633
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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-12  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         [iOS] A few API tests are failing after r239086
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index ab13d256af7bfeed4e8f1aa98135e4d37d3d205e..5493cf66fcd96129195ca5e166b8771ffbfe336c 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-12-12  Daniel Bates  <dabates@apple.com>
>+
>+        [iOS] Remove -[WebEvent initWithKeyEventType:...:characterSet:]
>+        https://bugs.webkit.org/show_bug.cgi?id=192633
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Update code to use the modern initializer.
>+
>+        * UIProcess/ios/WKWebEvent.mm:
>+        (-[WKWebEvent initWithEvent:]):
>+
> 2018-12-12  Chris Dumez  <cdumez@apple.com>
> 
>         Unreviewed attempt to fix GTK build after r239104.
>diff --git a/Source/WebCore/platform/ios/WebEvent.h b/Source/WebCore/platform/ios/WebEvent.h
>index 224a07e2278663bd2ac60d98d212dc8f5276bb50..97518dffd985106a899cd728c51a5858780af166 100644
>--- a/Source/WebCore/platform/ios/WebEvent.h
>+++ b/Source/WebCore/platform/ios/WebEvent.h
>@@ -159,18 +159,6 @@ WEBCORE_EXPORT @interface WebEvent : NSObject {
>                         gestureScale:(float)gestureScale
>                      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
>                         characters:(NSString *)characters
>diff --git a/Source/WebCore/platform/ios/WebEvent.mm b/Source/WebCore/platform/ios/WebEvent.mm
>index a6bd7333453c157f15c8a85c09665b45aafd43aa..8d88f2bf9ab1591474256e7c06a3e9c162718e5d 100644
>--- a/Source/WebCore/platform/ios/WebEvent.mm
>+++ b/Source/WebCore/platform/ios/WebEvent.mm
>@@ -157,44 +157,6 @@ static NSString *normalizedStringWithAppKitCompatibilityMapping(NSString *charac
>     return characters;
> }
> 
>-// 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
>                         characters:(NSString *)characters
>diff --git a/Source/WebKit/UIProcess/ios/WKWebEvent.mm b/Source/WebKit/UIProcess/ios/WKWebEvent.mm
>index 7d81e338f640695623b02a07d7d08ba9419900c5..ab596879a0a83ac49ad4d5d87a9d5373e144a056 100644
>--- a/Source/WebKit/UIProcess/ios/WKWebEvent.mm
>+++ b/Source/WebKit/UIProcess/ios/WKWebEvent.mm
>@@ -53,7 +53,7 @@ - (instancetype)initWithEvent:(UIEvent *)event
>         event = [[keyEvent _cloneEvent] autorelease]; // UIKit uses a singleton for hardware keyboard events.
>     }
> 
>-    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;
> 
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index b2bfc801513e77db963f766ce53f05929f1ec56a..08b0512f9ff37a77fa48eb064963a4fa5e244f76 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-12-12  Daniel Bates  <dabates@apple.com>
>+
>+        [iOS] Remove -[WebEvent initWithKeyEventType:...:characterSet:]
>+        https://bugs.webkit.org/show_bug.cgi?id=192633
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Update code to use the modern initializer.
>+
>+        * DumpRenderTree/mac/EventSendingController.mm:
>+        (-[EventSendingController keyDown:withModifiers:withLocation:]):
>+
> 2018-12-12  Commit Queue  <commit-queue@webkit.org>
> 
>         Unreviewed, rolling out r239103.
>diff --git a/Tools/DumpRenderTree/mac/EventSendingController.mm b/Tools/DumpRenderTree/mac/EventSendingController.mm
>index b5a93e77b24583979bca438f314cb0191b2cde3a..19fefadfabdb2547da3e4e68601dfb79660aa166 100644
>--- a/Tools/DumpRenderTree/mac/EventSendingController.mm
>+++ b/Tools/DumpRenderTree/mac/EventSendingController.mm
>@@ -1134,16 +1134,7 @@ - (void)keyDown:(NSString *)character withModifiers:(WebScriptObject *)modifiers
>                         isARepeat:NO
>                         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
> 
> #if !PLATFORM(IOS_FAMILY)
>@@ -1167,16 +1158,7 @@ - (void)keyDown:(NSString *)character withModifiers:(WebScriptObject *)modifiers
>                         keyCode:keyCode];
> #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
> 
> #if !PLATFORM(IOS_FAMILY)

Actions: View | Formatted Diff | Diff

Attachments on bug 192633: 357151