Changeset 237045 in webkit

Timestamp:

Oct 11, 2018 1:29:57 PM (6 years ago)

Author:

dbates@webkit.org

Message:

[iOS] Add typedef for WebEvent keyboard flags
​https://bugs.webkit.org/show_bug.cgi?id=190435

Reviewed by Wenson Hsieh.

Currently WebEvent and UIKit SPI are intertwined when it comes to keyboard flags. It seems sufficient
to have WebEvent defined its own keyboard flags so that callers do not need to be aware of UIKit SPI.

No functionality changed. So, no new tests.

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

(-[WebEvent keyboardFlags]):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/ios/WebEvent.h (modified) (5 diffs)
• platform/ios/WebEvent.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-10-11  Daniel Bates  <dabates@apple.com>
+
+        [iOS] Add typedef for WebEvent keyboard flags
+        https://bugs.webkit.org/show_bug.cgi?id=190435
+
+        Reviewed by Wenson Hsieh.
+
+        Currently WebEvent and UIKit SPI are intertwined when it comes to keyboard flags. It seems sufficient
+        to have WebEvent defined its own keyboard flags so that callers do not need to be aware of UIKit SPI.
+
+        No functionality changed. So, no new tests.
+
+        * platform/ios/WebEvent.h:
+        * platform/ios/WebEvent.mm:
+        (-[WebEvent keyboardFlags]):
+
 2018-10-11  Antti Koivisto  <antti@apple.com>
 

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

@@ -76 +76 @@
 } WebEventCharacterSet;
 
+// These enum values are copied directly from UIKit for compatibility.
+typedef enum {
+    WebEventKeyboardInputRepeat = 1 << 0,
+} WebKeyboardInputFlagValues;
+typedef NSUInteger WebKeyboardInputFlags;
+
 WEBCORE_EXPORT @interface WebEvent : NSObject {
 @private
@@ -87 +93 @@
     WebEventFlags _modifierFlags;
     BOOL _keyRepeating;
-    NSUInteger _keyboardFlags;
+    WebKeyboardInputFlags _keyboardFlags;
     NSString *_inputManagerHint;
     uint16_t _keyCode;
@@ -134 +140 @@
                          modifiers:(WebEventFlags)modifiers
                        isRepeating:(BOOL)repeating
-                         withFlags:(NSUInteger)flags
+                         withFlags:(WebKeyboardInputFlags)flags
                            keyCode:(uint16_t)keyCode
                           isTabKey:(BOOL)tabKey
@@ -145 +151 @@
                          modifiers:(WebEventFlags)modifiers
                        isRepeating:(BOOL)repeating
-                         withFlags:(NSUInteger)flags
+                         withFlags:(WebKeyboardInputFlags)flags
               withInputManagerHint:(NSString *)hint
                            keyCode:(uint16_t)keyCode
@@ -163 +169 @@
 @property(nonatomic, readonly, retain) NSString *inputManagerHint;
 
-@property(nonatomic, readonly) NSUInteger keyboardFlags;
+@property(nonatomic, readonly) WebKeyboardInputFlags keyboardFlags;
 @property(nonatomic, readonly) uint16_t keyCode;
 @property(nonatomic, readonly, getter = isTabKey) BOOL tabKey;

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

@@ -428 +428 @@
 }
 
-- (NSUInteger)keyboardFlags
+- (WebKeyboardInputFlags)keyboardFlags
 {
     ASSERT(_type == WebEventKeyDown || _type == WebEventKeyUp);