Title: [242915] trunk/Source/WebCore
- Revision
- 242915
- Author
- [email protected]
- Date
- 2019-03-13 15:26:08 -0700 (Wed, 13 Mar 2019)
Log Message
Remove some unnecessary !USE(UIKIT_KEYBOARD_ADDITIONS) guards
https://bugs.webkit.org/show_bug.cgi?id=195703
Reviewed by Tim Horton.
Remove out-of-date comment and unncessary !USE(UIKIT_KEYBOARD_ADDITIONS) guards. Following
r240604 we now make use of WebCore::windowsKeyCodeForCharCode() even for hardware key events
when USE(UIKIT_KEYBOARD_ADDITIONS) is enabled.
No functionality changed. So, no new tests.
* platform/ios/KeyEventIOS.mm:
(WebCore::windowsKeyCodeForCharCode):
* platform/ios/WebEvent.mm:
(normalizedStringWithAppKitCompatibilityMapping):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (242914 => 242915)
--- trunk/Source/WebCore/ChangeLog 2019-03-13 22:09:27 UTC (rev 242914)
+++ trunk/Source/WebCore/ChangeLog 2019-03-13 22:26:08 UTC (rev 242915)
@@ -1,3 +1,21 @@
+2019-03-13 Daniel Bates <[email protected]>
+
+ Remove some unnecessary !USE(UIKIT_KEYBOARD_ADDITIONS) guards
+ https://bugs.webkit.org/show_bug.cgi?id=195703
+
+ Reviewed by Tim Horton.
+
+ Remove out-of-date comment and unncessary !USE(UIKIT_KEYBOARD_ADDITIONS) guards. Following
+ r240604 we now make use of WebCore::windowsKeyCodeForCharCode() even for hardware key events
+ when USE(UIKIT_KEYBOARD_ADDITIONS) is enabled.
+
+ No functionality changed. So, no new tests.
+
+ * platform/ios/KeyEventIOS.mm:
+ (WebCore::windowsKeyCodeForCharCode):
+ * platform/ios/WebEvent.mm:
+ (normalizedStringWithAppKitCompatibilityMapping):
+
2019-03-13 Simon Fraser <[email protected]>
Scrolling tree should reposition non-stacking order descendents of overflow:scroll
Modified: trunk/Source/WebCore/platform/ios/KeyEventIOS.mm (242914 => 242915)
--- trunk/Source/WebCore/platform/ios/KeyEventIOS.mm 2019-03-13 22:09:27 UTC (rev 242914)
+++ trunk/Source/WebCore/platform/ios/KeyEventIOS.mm 2019-03-13 22:26:08 UTC (rev 242915)
@@ -197,9 +197,6 @@
return 0; // Unknown key
}
-// This function is only used to map software keyboard events because they lack a key code.
-// When !USE(UIKIT_KEYBOARD_ADDITIONS), this function is also used to map hardware keyboard
-// keyup events because they lack a key code.
int windowsKeyCodeForCharCode(unichar charCode)
{
switch (charCode) {
@@ -245,7 +242,6 @@
case 'y': case 'Y': return VK_Y;
case 'z': case 'Z': return VK_Z;
-#if !USE(UIKIT_KEYBOARD_ADDITIONS)
case 0x1B: return VK_ESCAPE; // WebKit generated code for Escape.
// WebKit uses Unicode PUA codes in the OpenStep reserve range for some special keys.
@@ -255,7 +251,6 @@
case NSRightArrowFunctionKey: return VK_RIGHT;
case NSPageUpFunctionKey: return VK_PRIOR;
case NSPageDownFunctionKey: return VK_NEXT;
-#endif
// This is for U.S. keyboard mapping, and doesn't necessarily make sense for different keyboard layouts.
// For example, '"' on Windows Russian layout is VK_2, not VK_OEM_7.
Modified: trunk/Source/WebCore/platform/ios/WebEvent.mm (242914 => 242915)
--- trunk/Source/WebCore/platform/ios/WebEvent.mm 2019-03-13 22:09:27 UTC (rev 242914)
+++ trunk/Source/WebCore/platform/ios/WebEvent.mm 2019-03-13 22:26:08 UTC (rev 242915)
@@ -149,7 +149,6 @@
return @"\x1B";
case kHIDUsage_KeypadNumLock: // Num Lock / Clear
return makeNSStringWithCharacter(NSClearLineFunctionKey);
-#if USE(UIKIT_KEYBOARD_ADDITIONS)
case kHIDUsage_KeyboardDeleteForward:
return makeNSStringWithCharacter(NSDeleteFunctionKey);
case kHIDUsage_KeyboardEnd:
@@ -158,14 +157,11 @@
return makeNSStringWithCharacter(NSInsertFunctionKey);
case kHIDUsage_KeyboardHome:
return makeNSStringWithCharacter(NSHomeFunctionKey);
-#endif
}
-#if USE(UIKIT_KEYBOARD_ADDITIONS)
if (keyCode >= kHIDUsage_KeyboardF1 && keyCode <= kHIDUsage_KeyboardF12)
return makeNSStringWithCharacter(NSF1FunctionKey + (keyCode - kHIDUsage_KeyboardF1));
if (keyCode >= kHIDUsage_KeyboardF13 && keyCode <= kHIDUsage_KeyboardF24)
return makeNSStringWithCharacter(NSF13FunctionKey + (keyCode - kHIDUsage_KeyboardF13));
-#endif
return characters;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
