Changeset 239275 in webkit
- Timestamp:
- Dec 17, 2018 10:58:52 AM (5 years ago)
- Location:
- trunk
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r239273 r239275 1 2018-12-17 Daniel Bates <dabates@apple.com> 2 3 [iOS] Remove -[WebEvent initWithKeyEventType:...:characterSet:] 4 https://bugs.webkit.org/show_bug.cgi?id=192633 5 6 Reviewed by Wenson Hsieh. 7 8 UIKit has long adopted the newer -[WebEvent initWithKeyEventType:] initializer that takes an 9 input manager hint. We no longer need to keep the variant -[WebEvent initWithKeyEventType:...:characterSet:] 10 for binary compatibility. 11 12 * platform/ios/WebEvent.h: 13 * platform/ios/WebEvent.mm: 14 (-[WebEvent initWithKeyEventType:timeStamp:characters:charactersIgnoringModifiers:modifiers:isRepeating:withFlags:keyCode:isTabKey:characterSet:]): Deleted. 15 1 16 2018-12-17 Matt Lewis <jlewis3@apple.com> 2 17 -
trunk/Source/WebCore/platform/ios/WebEvent.h
r238078 r239275 160 160 gestureRotation:(float)gestureRotation; 161 161 162 // FIXME: this needs to be removed when UIKit adopts the other initializer.163 - (WebEvent *)initWithKeyEventType:(WebEventType)type164 timeStamp:(CFTimeInterval)timeStamp165 characters:(NSString *)characters166 charactersIgnoringModifiers:(NSString *)charactersIgnoringModifiers167 modifiers:(WebEventFlags)modifiers168 isRepeating:(BOOL)repeating169 withFlags:(WebKeyboardInputFlags)flags170 keyCode:(uint16_t)keyCode171 isTabKey:(BOOL)tabKey172 characterSet:(WebEventCharacterSet)characterSet;173 174 162 - (WebEvent *)initWithKeyEventType:(WebEventType)type 175 163 timeStamp:(CFTimeInterval)timeStamp -
trunk/Source/WebCore/platform/ios/WebEvent.mm
r238078 r239275 158 158 } 159 159 160 // FIXME: to be removed when the adoption of the new initializer is complete.161 - (WebEvent *)initWithKeyEventType:(WebEventType)type162 timeStamp:(CFTimeInterval)timeStamp163 characters:(NSString *)characters164 charactersIgnoringModifiers:(NSString *)charactersIgnoringModifiers165 modifiers:(WebEventFlags)modifiers166 isRepeating:(BOOL)repeating167 withFlags:(NSUInteger)flags168 keyCode:(uint16_t)keyCode169 isTabKey:(BOOL)tabKey170 characterSet:(WebEventCharacterSet)characterSet171 {172 UNUSED_PARAM(characterSet);173 self = [super init];174 if (!self)175 return nil;176 177 _type = type;178 _timestamp = timeStamp;179 _keyboardFlags = flags;180 _modifierFlags = modifiers;181 if (keyCode)182 _keyCode = windowsKeyCodeForKeyCode(keyCode);183 else if ([charactersIgnoringModifiers length] == 1) {184 // This event is likely for a software keyboard-generated event.185 _keyCode = windowsKeyCodeForCharCodeIOS([charactersIgnoringModifiers characterAtIndex:0]);186 }187 188 if (!(_keyboardFlags & WebEventKeyboardInputModifierFlagsChanged)) {189 _characters = [normalizedStringWithAppKitCompatibilityMapping(characters, keyCode) retain];190 _charactersIgnoringModifiers = [normalizedStringWithAppKitCompatibilityMapping(charactersIgnoringModifiers, keyCode) retain];191 _tabKey = tabKey;192 _keyRepeating = repeating;193 }194 195 return self;196 }197 198 160 - (WebEvent *)initWithKeyEventType:(WebEventType)type 199 161 timeStamp:(CFTimeInterval)timeStamp -
trunk/Source/WebKit/ChangeLog
r239273 r239275 1 2018-12-17 Daniel Bates <dabates@apple.com> 2 3 [iOS] Remove -[WebEvent initWithKeyEventType:...:characterSet:] 4 https://bugs.webkit.org/show_bug.cgi?id=192633 5 6 Reviewed by Wenson Hsieh. 7 8 Update code to use the modern initializer. 9 10 * UIProcess/ios/WKWebEvent.mm: 11 (-[WKWebEvent initWithEvent:]): 12 1 13 2018-12-17 Matt Lewis <jlewis3@apple.com> 2 14 -
trunk/Source/WebKit/UIProcess/ios/WKWebEvent.mm
r238526 r239275 54 54 } 55 55 56 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];56 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"]]; 57 57 if (!self) 58 58 return nil; -
trunk/Tools/ChangeLog
r239273 r239275 1 2018-12-17 Daniel Bates <dabates@apple.com> 2 3 [iOS] Remove -[WebEvent initWithKeyEventType:...:characterSet:] 4 https://bugs.webkit.org/show_bug.cgi?id=192633 5 6 Reviewed by Wenson Hsieh. 7 8 Update code to use the modern initializer. 9 10 * DumpRenderTree/mac/EventSendingController.mm: 11 (-[EventSendingController keyDown:withModifiers:withLocation:]): 12 1 13 2018-12-17 Matt Lewis <jlewis3@apple.com> 2 14 -
trunk/Tools/DumpRenderTree/mac/EventSendingController.mm
r237738 r239275 1135 1135 keyCode:keyCode]; 1136 1136 #else 1137 WebEvent *event = [[WebEvent alloc] initWithKeyEventType:WebEventKeyDown 1138 timeStamp:[self currentEventTime] 1139 characters:eventCharacter 1140 charactersIgnoringModifiers:charactersIgnoringModifiers 1141 modifiers:(WebEventFlags)modifierFlags 1142 isRepeating:NO 1143 withFlags:0 1144 keyCode:[character characterAtIndex:0] 1145 isTabKey:([character characterAtIndex:0] == '\t') 1146 characterSet:WebEventCharacterSetASCII]; 1137 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')]; 1147 1138 #endif 1148 1139 … … 1168 1159 #else 1169 1160 [event release]; 1170 event = [[WebEvent alloc] initWithKeyEventType:WebEventKeyUp 1171 timeStamp:[self currentEventTime] 1172 characters:eventCharacter 1173 charactersIgnoringModifiers:charactersIgnoringModifiers 1174 modifiers:(WebEventFlags)modifierFlags 1175 isRepeating:NO 1176 withFlags:0 1177 keyCode:[character characterAtIndex:0] 1178 isTabKey:([character characterAtIndex:0] == '\t') 1179 characterSet:WebEventCharacterSetASCII]; 1161 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')]; 1180 1162 #endif 1181 1163
Note: See TracChangeset
for help on using the changeset viewer.