Title: [241044] trunk/Source
Revision
241044
Author
[email protected]
Date
2019-02-06 13:26:50 -0800 (Wed, 06 Feb 2019)

Log Message

Standardize on ControlKey instead of CtrlKey
https://bugs.webkit.org/show_bug.cgi?id=194317

Reviewed by Tim Horton.

Source/WebCore:

* dom/UIEventWithKeyState.cpp:
(WebCore::UIEventWithKeyState::modifiersFromInitializer):
(WebCore::UIEventWithKeyState::setModifierKeys):
* dom/UIEventWithKeyState.h:
(WebCore::UIEventWithKeyState::ctrlKey const):
* page/ios/EventHandlerIOS.mm:
(WebCore::EventHandler::accessKeyModifiers):
* page/mac/EventHandlerMac.mm:
(WebCore::EventHandler::accessKeyModifiers):
* platform/PlatformEvent.h:
(WebCore::PlatformEvent::controlKey const):
(WebCore::PlatformEvent::PlatformEvent):
(WebCore::PlatformEvent::ctrlKey const): Deleted.
* platform/cocoa/KeyEventCocoa.mm:
(WebCore::PlatformKeyboardEvent::getCurrentModifierState):
* platform/gtk/PlatformKeyboardEventGtk.cpp:
(WebCore::modifiersForGdkKeyEvent):
* platform/gtk/PlatformMouseEventGtk.cpp:
(WebCore::PlatformMouseEvent::PlatformMouseEvent):
* platform/gtk/PlatformWheelEventGtk.cpp:
(WebCore::PlatformWheelEvent::PlatformWheelEvent):
* platform/ios/KeyEventIOS.mm:
(WebCore::PlatformKeyboardEvent::currentStateOfModifierKeys):
* platform/ios/PlatformEventFactoryIOS.mm:
(WebCore::modifiersForEvent):
* platform/mac/KeyEventMac.mm:
(WebCore::PlatformKeyboardEvent::currentStateOfModifierKeys):
* platform/mac/PlatformEventFactoryMac.mm:
(WebCore::modifiersForEvent):
* testing/Internals.cpp:
(WebCore::Internals::accessKeyModifiers const):

Source/WebKit:

* Shared/WebEventConversion.cpp:
(WebKit::WebKit2PlatformMouseEvent::WebKit2PlatformMouseEvent):
(WebKit::WebKit2PlatformWheelEvent::WebKit2PlatformWheelEvent):
(WebKit::WebKit2PlatformKeyboardEvent::WebKit2PlatformKeyboardEvent):
(WebKit::WebKit2PlatformTouchEvent::WebKit2PlatformTouchEvent):
(WebKit::WebKit2PlatformGestureEvent::WebKit2PlatformGestureEvent):
* WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp:
(WebKit::WebEditorClient::handleKeyboardEvent):
* WebProcess/WebCoreSupport/wpe/WebEditorClientWPE.cpp:
(WebKit::handleKeyPress):

Source/WebKitLegacy/win:

* AccessibleBase.cpp:
(AccessibleBase::get_accKeyboardShortcut):
* WebView.cpp:
(WebView::keyDown):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (241043 => 241044)


--- trunk/Source/WebCore/ChangeLog	2019-02-06 21:03:59 UTC (rev 241043)
+++ trunk/Source/WebCore/ChangeLog	2019-02-06 21:26:50 UTC (rev 241044)
@@ -1,3 +1,42 @@
+2019-02-06  Daniel Bates  <[email protected]>
+
+        Standardize on ControlKey instead of CtrlKey
+        https://bugs.webkit.org/show_bug.cgi?id=194317
+
+        Reviewed by Tim Horton.
+
+        * dom/UIEventWithKeyState.cpp:
+        (WebCore::UIEventWithKeyState::modifiersFromInitializer):
+        (WebCore::UIEventWithKeyState::setModifierKeys):
+        * dom/UIEventWithKeyState.h:
+        (WebCore::UIEventWithKeyState::ctrlKey const):
+        * page/ios/EventHandlerIOS.mm:
+        (WebCore::EventHandler::accessKeyModifiers):
+        * page/mac/EventHandlerMac.mm:
+        (WebCore::EventHandler::accessKeyModifiers):
+        * platform/PlatformEvent.h:
+        (WebCore::PlatformEvent::controlKey const):
+        (WebCore::PlatformEvent::PlatformEvent):
+        (WebCore::PlatformEvent::ctrlKey const): Deleted.
+        * platform/cocoa/KeyEventCocoa.mm:
+        (WebCore::PlatformKeyboardEvent::getCurrentModifierState):
+        * platform/gtk/PlatformKeyboardEventGtk.cpp:
+        (WebCore::modifiersForGdkKeyEvent):
+        * platform/gtk/PlatformMouseEventGtk.cpp:
+        (WebCore::PlatformMouseEvent::PlatformMouseEvent):
+        * platform/gtk/PlatformWheelEventGtk.cpp:
+        (WebCore::PlatformWheelEvent::PlatformWheelEvent):
+        * platform/ios/KeyEventIOS.mm:
+        (WebCore::PlatformKeyboardEvent::currentStateOfModifierKeys):
+        * platform/ios/PlatformEventFactoryIOS.mm:
+        (WebCore::modifiersForEvent):
+        * platform/mac/KeyEventMac.mm:
+        (WebCore::PlatformKeyboardEvent::currentStateOfModifierKeys):
+        * platform/mac/PlatformEventFactoryMac.mm:
+        (WebCore::modifiersForEvent):
+        * testing/Internals.cpp:
+        (WebCore::Internals::accessKeyModifiers const):
+
 2019-02-06  Alex Christensen  <[email protected]>
 
         Fix WatchOS build

Modified: trunk/Source/WebCore/dom/UIEventWithKeyState.cpp (241043 => 241044)


--- trunk/Source/WebCore/dom/UIEventWithKeyState.cpp	2019-02-06 21:03:59 UTC (rev 241043)
+++ trunk/Source/WebCore/dom/UIEventWithKeyState.cpp	2019-02-06 21:26:50 UTC (rev 241044)
@@ -27,7 +27,7 @@
 {
     OptionSet<Modifier> result;
     if (initializer.ctrlKey)
-        result.add(Modifier::CtrlKey);
+        result.add(Modifier::ControlKey);
     if (initializer.altKey)
         result.add(Modifier::AltKey);
     if (initializer.shiftKey)
@@ -63,7 +63,7 @@
 {
     OptionSet<Modifier> result;
     if (ctrlKey)
-        result.add(Modifier::CtrlKey);
+        result.add(Modifier::ControlKey);
     if (altKey)
         result.add(Modifier::AltKey);
     if (shiftKey)

Modified: trunk/Source/WebCore/dom/UIEventWithKeyState.h (241043 => 241044)


--- trunk/Source/WebCore/dom/UIEventWithKeyState.h	2019-02-06 21:03:59 UTC (rev 241043)
+++ trunk/Source/WebCore/dom/UIEventWithKeyState.h	2019-02-06 21:26:50 UTC (rev 241044)
@@ -33,7 +33,7 @@
 public:
     using Modifier = PlatformEvent::Modifier;
 
-    bool ctrlKey() const { return m_modifiers.contains(Modifier::CtrlKey); }
+    bool ctrlKey() const { return m_modifiers.contains(Modifier::ControlKey); }
     bool shiftKey() const { return m_modifiers.contains(Modifier::ShiftKey); }
     bool altKey() const { return m_modifiers.contains(Modifier::AltKey); }
     bool metaKey() const { return m_modifiers.contains(Modifier::MetaKey); }

Modified: trunk/Source/WebCore/page/ios/EventHandlerIOS.mm (241043 => 241044)


--- trunk/Source/WebCore/page/ios/EventHandlerIOS.mm	2019-02-06 21:03:59 UTC (rev 241043)
+++ trunk/Source/WebCore/page/ios/EventHandlerIOS.mm	2019-02-06 21:26:50 UTC (rev 241044)
@@ -554,9 +554,9 @@
     // So, we use Control in this case, even though it conflicts with Emacs-style key bindings.
     // See <https://bugs.webkit.org/show_bug.cgi?id=21107> for more detail.
     if (AXObjectCache::accessibilityEnhancedUserInterfaceEnabled())
-        return PlatformEvent::Modifier::CtrlKey;
+        return PlatformEvent::Modifier::ControlKey;
 
-    return { PlatformEvent::Modifier::CtrlKey, PlatformEvent::Modifier::AltKey };
+    return { PlatformEvent::Modifier::ControlKey, PlatformEvent::Modifier::AltKey };
 }
 
 PlatformMouseEvent EventHandler::currentPlatformMouseEvent() const

Modified: trunk/Source/WebCore/page/mac/EventHandlerMac.mm (241043 => 241044)


--- trunk/Source/WebCore/page/mac/EventHandlerMac.mm	2019-02-06 21:03:59 UTC (rev 241043)
+++ trunk/Source/WebCore/page/mac/EventHandlerMac.mm	2019-02-06 21:26:50 UTC (rev 241044)
@@ -769,9 +769,9 @@
     // So, we use Control in this case, even though it conflicts with Emacs-style key bindings.
     // See <https://bugs.webkit.org/show_bug.cgi?id=21107> for more detail.
     if (AXObjectCache::accessibilityEnhancedUserInterfaceEnabled())
-        return PlatformEvent::Modifier::CtrlKey;
+        return PlatformEvent::Modifier::ControlKey;
 
-    return { PlatformEvent::Modifier::CtrlKey, PlatformEvent::Modifier::AltKey };
+    return { PlatformEvent::Modifier::ControlKey, PlatformEvent::Modifier::AltKey };
 }
 
 static ScrollableArea* scrollableAreaForBox(RenderBox& box)

Modified: trunk/Source/WebCore/platform/PlatformEvent.h (241043 => 241044)


--- trunk/Source/WebCore/platform/PlatformEvent.h	2019-02-06 21:03:59 UTC (rev 241043)
+++ trunk/Source/WebCore/platform/PlatformEvent.h	2019-02-06 21:26:50 UTC (rev 241044)
@@ -72,7 +72,7 @@
 
     enum class Modifier : uint8_t {
         AltKey      = 1 << 0,
-        CtrlKey     = 1 << 1,
+        ControlKey  = 1 << 1,
         MetaKey     = 1 << 2,
         ShiftKey    = 1 << 3,
         CapsLockKey = 1 << 4,
@@ -84,7 +84,7 @@
     Type type() const { return static_cast<Type>(m_type); }
 
     bool shiftKey() const { return m_modifiers.contains(Modifier::ShiftKey); }
-    bool ctrlKey() const { return m_modifiers.contains(Modifier::CtrlKey); }
+    bool controlKey() const { return m_modifiers.contains(Modifier::ControlKey); }
     bool altKey() const { return m_modifiers.contains(Modifier::AltKey); }
     bool metaKey() const { return m_modifiers.contains(Modifier::MetaKey); }
 
@@ -117,7 +117,7 @@
         if (shiftKey)
             m_modifiers.add(Modifier::ShiftKey);
         if (ctrlKey)
-            m_modifiers.add(Modifier::CtrlKey);
+            m_modifiers.add(Modifier::ControlKey);
         if (altKey)
             m_modifiers.add(Modifier::AltKey);
         if (metaKey)

Modified: trunk/Source/WebCore/platform/cocoa/KeyEventCocoa.mm (241043 => 241044)


--- trunk/Source/WebCore/platform/cocoa/KeyEventCocoa.mm	2019-02-06 21:03:59 UTC (rev 241043)
+++ trunk/Source/WebCore/platform/cocoa/KeyEventCocoa.mm	2019-02-06 21:26:50 UTC (rev 241044)
@@ -48,7 +48,7 @@
 {
     auto currentModifiers = currentStateOfModifierKeys();
     shiftKey = currentModifiers.contains(PlatformEvent::Modifier::ShiftKey);
-    ctrlKey = currentModifiers.contains(PlatformEvent::Modifier::CtrlKey);
+    ctrlKey = currentModifiers.contains(PlatformEvent::Modifier::ControlKey);
     altKey = currentModifiers.contains(PlatformEvent::Modifier::AltKey);
     metaKey = currentModifiers.contains(PlatformEvent::Modifier::MetaKey);
 }

Modified: trunk/Source/WebCore/platform/gtk/PlatformKeyboardEventGtk.cpp (241043 => 241044)


--- trunk/Source/WebCore/platform/gtk/PlatformKeyboardEventGtk.cpp	2019-02-06 21:03:59 UTC (rev 241043)
+++ trunk/Source/WebCore/platform/gtk/PlatformKeyboardEventGtk.cpp	2019-02-06 21:26:50 UTC (rev 241044)
@@ -1332,7 +1332,7 @@
     if (event->state & GDK_SHIFT_MASK || event->keyval == GDK_3270_BackTab)
         modifiers.add(PlatformEvent::Modifier::ShiftKey);
     if (event->state & GDK_CONTROL_MASK)
-        modifiers.add(PlatformEvent::Modifier::CtrlKey);
+        modifiers.add(PlatformEvent::Modifier::ControlKey);
     if (event->state & GDK_MOD1_MASK)
         modifiers.add(PlatformEvent::Modifier::AltKey);
     if (event->state & GDK_META_MASK)

Modified: trunk/Source/WebCore/platform/gtk/PlatformMouseEventGtk.cpp (241043 => 241044)


--- trunk/Source/WebCore/platform/gtk/PlatformMouseEventGtk.cpp	2019-02-06 21:03:59 UTC (rev 241043)
+++ trunk/Source/WebCore/platform/gtk/PlatformMouseEventGtk.cpp	2019-02-06 21:26:50 UTC (rev 241044)
@@ -49,7 +49,7 @@
     if (event->state & GDK_SHIFT_MASK)
         m_modifiers.add(PlatformEvent::Modifier::ShiftKey);
     if (event->state & GDK_CONTROL_MASK)
-        m_modifiers.add(PlatformEvent::Modifier::CtrlKey);
+        m_modifiers.add(PlatformEvent::Modifier::ControlKey);
     if (event->state & GDK_MOD1_MASK)
         m_modifiers.add(PlatformEvent::Modifier::AltKey);
     if (event->state & GDK_META_MASK)
@@ -98,7 +98,7 @@
     if (motion->state & GDK_SHIFT_MASK)
         m_modifiers.add(PlatformEvent::Modifier::ShiftKey);
     if (motion->state & GDK_CONTROL_MASK)
-        m_modifiers.add(PlatformEvent::Modifier::CtrlKey);
+        m_modifiers.add(PlatformEvent::Modifier::ControlKey);
     if (motion->state & GDK_MOD1_MASK)
         m_modifiers.add(PlatformEvent::Modifier::AltKey);
     if (motion->state & GDK_META_MASK)

Modified: trunk/Source/WebCore/platform/gtk/PlatformWheelEventGtk.cpp (241043 => 241044)


--- trunk/Source/WebCore/platform/gtk/PlatformWheelEventGtk.cpp	2019-02-06 21:03:59 UTC (rev 241043)
+++ trunk/Source/WebCore/platform/gtk/PlatformWheelEventGtk.cpp	2019-02-06 21:26:50 UTC (rev 241044)
@@ -49,7 +49,7 @@
     if (event->state & GDK_SHIFT_MASK)
         m_modifiers.add(Modifier::ShiftKey);
     if (event->state & GDK_CONTROL_MASK)
-        m_modifiers.add(Modifier::CtrlKey);
+        m_modifiers.add(Modifier::ControlKey);
     if (event->state & GDK_MOD1_MASK)
         m_modifiers.add(Modifier::AltKey);
     if (event->state & GDK_META_MASK)

Modified: trunk/Source/WebCore/platform/ios/KeyEventIOS.mm (241043 => 241044)


--- trunk/Source/WebCore/platform/ios/KeyEventIOS.mm	2019-02-06 21:03:59 UTC (rev 241043)
+++ trunk/Source/WebCore/platform/ios/KeyEventIOS.mm	2019-02-06 21:26:50 UTC (rev 241044)
@@ -326,7 +326,7 @@
     if (currentModifiers & ::WebEventFlagMaskShiftKey)
         modifiers.add(PlatformEvent::Modifier::ShiftKey);
     if (currentModifiers & ::WebEventFlagMaskControlKey)
-        modifiers.add(PlatformEvent::Modifier::CtrlKey);
+        modifiers.add(PlatformEvent::Modifier::ControlKey);
     if (currentModifiers & ::WebEventFlagMaskOptionKey)
         modifiers.add(PlatformEvent::Modifier::AltKey);
     if (currentModifiers & ::WebEventFlagMaskCommandKey)

Modified: trunk/Source/WebCore/platform/ios/PlatformEventFactoryIOS.mm (241043 => 241044)


--- trunk/Source/WebCore/platform/ios/PlatformEventFactoryIOS.mm	2019-02-06 21:03:59 UTC (rev 241043)
+++ trunk/Source/WebCore/platform/ios/PlatformEventFactoryIOS.mm	2019-02-06 21:26:50 UTC (rev 241044)
@@ -47,7 +47,7 @@
     if (event.modifierFlags & WebEventFlagMaskShiftKey)
         modifiers.add(PlatformEvent::Modifier::ShiftKey);
     if (event.modifierFlags & WebEventFlagMaskControlKey)
-        modifiers.add(PlatformEvent::Modifier::CtrlKey);
+        modifiers.add(PlatformEvent::Modifier::ControlKey);
     if (event.modifierFlags & WebEventFlagMaskOptionKey)
         modifiers.add(PlatformEvent::Modifier::AltKey);
     if (event.modifierFlags & WebEventFlagMaskCommandKey)

Modified: trunk/Source/WebCore/platform/mac/KeyEventMac.mm (241043 => 241044)


--- trunk/Source/WebCore/platform/mac/KeyEventMac.mm	2019-02-06 21:03:59 UTC (rev 241043)
+++ trunk/Source/WebCore/platform/mac/KeyEventMac.mm	2019-02-06 21:26:50 UTC (rev 241044)
@@ -272,7 +272,7 @@
     if (currentModifiers & ::shiftKey)
         modifiers.add(PlatformEvent::Modifier::ShiftKey);
     if (currentModifiers & ::controlKey)
-        modifiers.add(PlatformEvent::Modifier::CtrlKey);
+        modifiers.add(PlatformEvent::Modifier::ControlKey);
     if (currentModifiers & ::optionKey)
         modifiers.add(PlatformEvent::Modifier::AltKey);
     if (currentModifiers & ::cmdKey)

Modified: trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm (241043 => 241044)


--- trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm	2019-02-06 21:03:59 UTC (rev 241043)
+++ trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm	2019-02-06 21:26:50 UTC (rev 241044)
@@ -666,7 +666,7 @@
     if (event.modifierFlags & NSEventModifierFlagShift)
         modifiers.add(PlatformEvent::Modifier::ShiftKey);
     if (event.modifierFlags & NSEventModifierFlagControl)
-        modifiers.add(PlatformEvent::Modifier::CtrlKey);
+        modifiers.add(PlatformEvent::Modifier::ControlKey);
     if (event.modifierFlags & NSEventModifierFlagOption)
         modifiers.add(PlatformEvent::Modifier::AltKey);
     if (event.modifierFlags & NSEventModifierFlagCommand)

Modified: trunk/Source/WebCore/testing/Internals.cpp (241043 => 241044)


--- trunk/Source/WebCore/testing/Internals.cpp	2019-02-06 21:03:59 UTC (rev 241043)
+++ trunk/Source/WebCore/testing/Internals.cpp	2019-02-06 21:26:50 UTC (rev 241044)
@@ -4438,7 +4438,7 @@
         case PlatformEvent::Modifier::AltKey:
             accessKeyModifierStrings.append("altKey"_s);
             break;
-        case PlatformEvent::Modifier::CtrlKey:
+        case PlatformEvent::Modifier::ControlKey:
             accessKeyModifierStrings.append("ctrlKey"_s);
             break;
         case PlatformEvent::Modifier::MetaKey:

Modified: trunk/Source/WebKit/ChangeLog (241043 => 241044)


--- trunk/Source/WebKit/ChangeLog	2019-02-06 21:03:59 UTC (rev 241043)
+++ trunk/Source/WebKit/ChangeLog	2019-02-06 21:26:50 UTC (rev 241044)
@@ -1,3 +1,21 @@
+2019-02-06  Daniel Bates  <[email protected]>
+
+        Standardize on ControlKey instead of CtrlKey
+        https://bugs.webkit.org/show_bug.cgi?id=194317
+
+        Reviewed by Tim Horton.
+
+        * Shared/WebEventConversion.cpp:
+        (WebKit::WebKit2PlatformMouseEvent::WebKit2PlatformMouseEvent):
+        (WebKit::WebKit2PlatformWheelEvent::WebKit2PlatformWheelEvent):
+        (WebKit::WebKit2PlatformKeyboardEvent::WebKit2PlatformKeyboardEvent):
+        (WebKit::WebKit2PlatformTouchEvent::WebKit2PlatformTouchEvent):
+        (WebKit::WebKit2PlatformGestureEvent::WebKit2PlatformGestureEvent):
+        * WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp:
+        (WebKit::WebEditorClient::handleKeyboardEvent):
+        * WebProcess/WebCoreSupport/wpe/WebEditorClientWPE.cpp:
+        (WebKit::handleKeyPress):
+
 2019-02-06  Per Arne Vollan  <[email protected]>
 
         Roll out parts of r238819 since it is a PLT performance regression.

Modified: trunk/Source/WebKit/Shared/WebEventConversion.cpp (241043 => 241044)


--- trunk/Source/WebKit/Shared/WebEventConversion.cpp	2019-02-06 21:03:59 UTC (rev 241043)
+++ trunk/Source/WebKit/Shared/WebEventConversion.cpp	2019-02-06 21:26:50 UTC (rev 241044)
@@ -71,7 +71,7 @@
         if (webEvent.shiftKey())
             m_modifiers.add(Modifier::ShiftKey);
         if (webEvent.controlKey())
-            m_modifiers.add(Modifier::CtrlKey);
+            m_modifiers.add(Modifier::ControlKey);
         if (webEvent.altKey())
             m_modifiers.add(Modifier::AltKey);
         if (webEvent.metaKey())
@@ -138,7 +138,7 @@
         if (webEvent.shiftKey())
             m_modifiers.add(Modifier::ShiftKey);
         if (webEvent.controlKey())
-            m_modifiers.add(Modifier::CtrlKey);
+            m_modifiers.add(Modifier::ControlKey);
         if (webEvent.altKey())
             m_modifiers.add(Modifier::AltKey);
         if (webEvent.metaKey())
@@ -200,7 +200,7 @@
         if (webEvent.shiftKey())
             m_modifiers.add(Modifier::ShiftKey);
         if (webEvent.controlKey())
-            m_modifiers.add(Modifier::CtrlKey);
+            m_modifiers.add(Modifier::ControlKey);
         if (webEvent.altKey())
             m_modifiers.add(Modifier::AltKey);
         if (webEvent.metaKey())
@@ -341,7 +341,7 @@
         if (webEvent.shiftKey())
             m_modifiers.add(Modifier::ShiftKey);
         if (webEvent.controlKey())
-            m_modifiers.add(Modifier::CtrlKey);
+            m_modifiers.add(Modifier::ControlKey);
         if (webEvent.altKey())
             m_modifiers.add(Modifier::AltKey);
         if (webEvent.metaKey())
@@ -400,7 +400,7 @@
         if (webEvent.shiftKey())
             m_modifiers.add(Modifier::ShiftKey);
         if (webEvent.controlKey())
-            m_modifiers.add(Modifier::CtrlKey);
+            m_modifiers.add(Modifier::ControlKey);
         if (webEvent.altKey())
             m_modifiers.add(Modifier::AltKey);
         if (webEvent.metaKey())

Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp (241043 => 241044)


--- trunk/Source/WebKit/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp	2019-02-06 21:03:59 UTC (rev 241043)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp	2019-02-06 21:26:50 UTC (rev 241044)
@@ -101,7 +101,7 @@
         return;
 
     // Don't insert anything if a modifier is pressed
-    if (platformEvent->ctrlKey() || platformEvent->altKey())
+    if (platformEvent->controlKey() || platformEvent->altKey())
         return;
 
     if (frame->editor().insertText(platformEvent->text(), event))

Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/wpe/WebEditorClientWPE.cpp (241043 => 241044)


--- trunk/Source/WebKit/WebProcess/WebCoreSupport/wpe/WebEditorClientWPE.cpp	2019-02-06 21:03:59 UTC (rev 241043)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/wpe/WebEditorClientWPE.cpp	2019-02-06 21:26:50 UTC (rev 241044)
@@ -181,7 +181,7 @@
         return;
 
     // Don't insert anything if a modifier is pressed and it has not been handled yet
-    if (platformEvent.ctrlKey() || platformEvent.altKey())
+    if (platformEvent.controlKey() || platformEvent.altKey())
         return;
 
     if (frame.editor().insertText(platformEvent.text(), &event))

Modified: trunk/Source/WebKitLegacy/win/AccessibleBase.cpp (241043 => 241044)


--- trunk/Source/WebKitLegacy/win/AccessibleBase.cpp	2019-02-06 21:03:59 UTC (rev 241043)
+++ trunk/Source/WebKitLegacy/win/AccessibleBase.cpp	2019-02-06 21:26:50 UTC (rev 241044)
@@ -601,7 +601,7 @@
         // Follow the same order as Mozilla MSAA implementation:
         // Ctrl+Alt+Shift+Meta+key. MSDN states that keyboard shortcut strings
         // should not be localized and defines the separator as "+".
-        if (modifiers.contains(PlatformEvent::Modifier::CtrlKey))
+        if (modifiers.contains(PlatformEvent::Modifier::ControlKey))
             accessKeyModifiersBuilder.appendLiteral("Ctrl+");
         if (modifiers.contains(PlatformEvent::Modifier::AltKey))
             accessKeyModifiersBuilder.appendLiteral("Alt+");

Modified: trunk/Source/WebKitLegacy/win/ChangeLog (241043 => 241044)


--- trunk/Source/WebKitLegacy/win/ChangeLog	2019-02-06 21:03:59 UTC (rev 241043)
+++ trunk/Source/WebKitLegacy/win/ChangeLog	2019-02-06 21:26:50 UTC (rev 241044)
@@ -1,3 +1,15 @@
+2019-02-06  Daniel Bates  <[email protected]>
+
+        Standardize on ControlKey instead of CtrlKey
+        https://bugs.webkit.org/show_bug.cgi?id=194317
+
+        Reviewed by Tim Horton.
+
+        * AccessibleBase.cpp:
+        (AccessibleBase::get_accKeyboardShortcut):
+        * WebView.cpp:
+        (WebView::keyDown):
+
 2019-02-04  Simon Fraser  <[email protected]>
 
         PageOverlayController's layers should be created lazily

Modified: trunk/Source/WebKitLegacy/win/WebView.cpp (241043 => 241044)


--- trunk/Source/WebKitLegacy/win/WebView.cpp	2019-02-06 21:03:59 UTC (rev 241043)
+++ trunk/Source/WebKitLegacy/win/WebView.cpp	2019-02-06 21:26:50 UTC (rev 241044)
@@ -2418,9 +2418,9 @@
     // We need to handle back/forward using either Ctrl+Left/Right Arrow keys.
     // FIXME: This logic should probably be in EventHandler::defaultArrowEventHandler().
     // FIXME: Should check that other modifiers aren't pressed.
-    if (virtualKeyCode == VK_RIGHT && keyEvent.ctrlKey())
+    if (virtualKeyCode == VK_RIGHT && keyEvent.controlKey())
         return m_page->backForward().goForward();
-    if (virtualKeyCode == VK_LEFT && keyEvent.ctrlKey())
+    if (virtualKeyCode == VK_LEFT && keyEvent.controlKey())
         return m_page->backForward().goBack();
 
     // Need to scroll the page if the arrow keys, pgup/dn, or home/end are hit.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to