Attachment 361310 Details for Bug 194317 – Patch

[patch] Patch

bug-194317-20190206120331.patch (text/plain), 22.23 KB, created by Daniel Bates on 2019-02-06 12:03:32 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Bates

Created: 2019-02-06 12:03:32 PST

Size: 22.23 KB

patch

obsolete

>Subversion Revision: 241028
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 626d4f4dcc2480665b7ea7fe807f336d3ece1c97..3a2d0355d110760d7a4621f1a8499152698cd79e 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,42 @@
>+2019-02-06  Daniel Bates  <dabates@apple.com>
>+
>+        Standardize on ControlKey instead of CtrlKey
>+        https://bugs.webkit.org/show_bug.cgi?id=194317
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * 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  Olivier Blin  <olivier.blin@softathome.com>
> 
>         [SVG] fix SVGURIReference build by including SVGElement
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 1aefc43110c4cb3e43b0535197b08a287243a527..ee66167b6ac3ed842b802cd9632ff93d0429427e 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,21 @@
>+2019-02-06  Daniel Bates  <dabates@apple.com>
>+
>+        Standardize on ControlKey instead of CtrlKey
>+        https://bugs.webkit.org/show_bug.cgi?id=194317
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * 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-05  Daniel Bates  <dabates@apple.com>
> 
>         Move toNSEventModifierFlags() and toNSButtonNumber() to WebEventFactory.mm
>diff --git a/Source/WebKitLegacy/win/ChangeLog b/Source/WebKitLegacy/win/ChangeLog
>index d1f7fe4a4f439adf7e20307ee3a9f2e5d74d2179..2b7ab7fb19fd19679177dbf410ade1176e89f178 100644
>--- a/Source/WebKitLegacy/win/ChangeLog
>+++ b/Source/WebKitLegacy/win/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-02-06  Daniel Bates  <dabates@apple.com>
>+
>+        Standardize on ControlKey instead of CtrlKey
>+        https://bugs.webkit.org/show_bug.cgi?id=194317
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * AccessibleBase.cpp:
>+        (AccessibleBase::get_accKeyboardShortcut):
>+        * WebView.cpp:
>+        (WebView::keyDown):
>+
> 2019-02-04  Simon Fraser  <simon.fraser@apple.com>
> 
>         PageOverlayController's layers should be created lazily
>diff --git a/Source/WebCore/dom/UIEventWithKeyState.cpp b/Source/WebCore/dom/UIEventWithKeyState.cpp
>index c7c2404f91e20f51a01c065c87f6632413236a50..8d1ea45a37cf89df2771aea7815453be1170c9eb 100644
>--- a/Source/WebCore/dom/UIEventWithKeyState.cpp
>+++ b/Source/WebCore/dom/UIEventWithKeyState.cpp
>@@ -27,7 +27,7 @@ auto UIEventWithKeyState::modifiersFromInitializer(const EventModifierInit& init
> {
>     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 @@ void UIEventWithKeyState::setModifierKeys(bool ctrlKey, bool altKey, bool shiftK
> {
>     OptionSet<Modifier> result;
>     if (ctrlKey)
>-        result.add(Modifier::CtrlKey);
>+        result.add(Modifier::ControlKey);
>     if (altKey)
>         result.add(Modifier::AltKey);
>     if (shiftKey)
>diff --git a/Source/WebCore/dom/UIEventWithKeyState.h b/Source/WebCore/dom/UIEventWithKeyState.h
>index 5d1e7f8dd421da2500a929bf16290660b9fe0b4e..1b5abd5b06b66bf764ec6fb69a02b24e9876415f 100644
>--- a/Source/WebCore/dom/UIEventWithKeyState.h
>+++ b/Source/WebCore/dom/UIEventWithKeyState.h
>@@ -33,7 +33,7 @@ class UIEventWithKeyState : public UIEvent {
> 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); }
>diff --git a/Source/WebCore/page/ios/EventHandlerIOS.mm b/Source/WebCore/page/ios/EventHandlerIOS.mm
>index c92aded1ace3f316afa42aeed52ca5da5761a074..eccfa63d9f1a170d2093071a26a6c8c2fe4c4558 100644
>--- a/Source/WebCore/page/ios/EventHandlerIOS.mm
>+++ b/Source/WebCore/page/ios/EventHandlerIOS.mm
>@@ -554,9 +554,9 @@ OptionSet<PlatformEvent::Modifier> EventHandler::accessKeyModifiers()
>     // 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
>diff --git a/Source/WebCore/page/mac/EventHandlerMac.mm b/Source/WebCore/page/mac/EventHandlerMac.mm
>index ba9f76528d81007252c814aaf9ba8c06a2885b25..8b335af51908984854e1285ab244670959e586a8 100644
>--- a/Source/WebCore/page/mac/EventHandlerMac.mm
>+++ b/Source/WebCore/page/mac/EventHandlerMac.mm
>@@ -769,9 +769,9 @@ OptionSet<PlatformEvent::Modifier> EventHandler::accessKeyModifiers()
>     // 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)
>diff --git a/Source/WebCore/platform/PlatformEvent.h b/Source/WebCore/platform/PlatformEvent.h
>index b176c036b3f3da0cbc13ace292f462f0a5cb8b96..6d7d586f51f7fe112e64c258004980f28832cba1 100644
>--- a/Source/WebCore/platform/PlatformEvent.h
>+++ b/Source/WebCore/platform/PlatformEvent.h
>@@ -72,7 +72,7 @@ public:
> 
>     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 @@ public:
>     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 @@ protected:
>         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)
>diff --git a/Source/WebCore/platform/cocoa/KeyEventCocoa.mm b/Source/WebCore/platform/cocoa/KeyEventCocoa.mm
>index ee45a5dec8b7f43ca65de989a3e48f09b91fd5df..13af35e8fb69305db7f1c9a785a40c72dbdc07b9 100644
>--- a/Source/WebCore/platform/cocoa/KeyEventCocoa.mm
>+++ b/Source/WebCore/platform/cocoa/KeyEventCocoa.mm
>@@ -48,7 +48,7 @@ void PlatformKeyboardEvent::getCurrentModifierState(bool& shiftKey, bool& ctrlKe
> {
>     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);
> }
>diff --git a/Source/WebCore/platform/gtk/PlatformKeyboardEventGtk.cpp b/Source/WebCore/platform/gtk/PlatformKeyboardEventGtk.cpp
>index e14a9c82f306ac9c6d1128e71b180b6e75dddd26..31784f620be9e076974f8fdfc87b616698ab4ba1 100644
>--- a/Source/WebCore/platform/gtk/PlatformKeyboardEventGtk.cpp
>+++ b/Source/WebCore/platform/gtk/PlatformKeyboardEventGtk.cpp
>@@ -1332,7 +1332,7 @@ static OptionSet<PlatformEvent::Modifier> modifiersForGdkKeyEvent(GdkEventKey* e
>     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)
>diff --git a/Source/WebCore/platform/gtk/PlatformMouseEventGtk.cpp b/Source/WebCore/platform/gtk/PlatformMouseEventGtk.cpp
>index 9337f81a35c4c4e26dd1728bc9951a92fe4ccc5a..4fba3bd53d4ec483f69f71d51ac46ba564915f7f 100644
>--- a/Source/WebCore/platform/gtk/PlatformMouseEventGtk.cpp
>+++ b/Source/WebCore/platform/gtk/PlatformMouseEventGtk.cpp
>@@ -49,7 +49,7 @@ PlatformMouseEvent::PlatformMouseEvent(GdkEventButton* event)
>     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 @@ PlatformMouseEvent::PlatformMouseEvent(GdkEventMotion* motion)
>     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)
>diff --git a/Source/WebCore/platform/gtk/PlatformWheelEventGtk.cpp b/Source/WebCore/platform/gtk/PlatformWheelEventGtk.cpp
>index b96ee0706554d70098b606aa1059f259fb015eb3..f48f75a5171ea9fb714e8440d3f0450b853c6ce3 100644
>--- a/Source/WebCore/platform/gtk/PlatformWheelEventGtk.cpp
>+++ b/Source/WebCore/platform/gtk/PlatformWheelEventGtk.cpp
>@@ -49,7 +49,7 @@ PlatformWheelEvent::PlatformWheelEvent(GdkEventScroll* event)
>     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)
>diff --git a/Source/WebCore/platform/ios/KeyEventIOS.mm b/Source/WebCore/platform/ios/KeyEventIOS.mm
>index 33c95f3bd131f5838f0c00dd2d1122b1d049f645..12e9f2a3cff321c88553afec0a9eae27140c4395 100644
>--- a/Source/WebCore/platform/ios/KeyEventIOS.mm
>+++ b/Source/WebCore/platform/ios/KeyEventIOS.mm
>@@ -326,7 +326,7 @@ OptionSet<PlatformEvent::Modifier> PlatformKeyboardEvent::currentStateOfModifier
>     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)
>diff --git a/Source/WebCore/platform/ios/PlatformEventFactoryIOS.mm b/Source/WebCore/platform/ios/PlatformEventFactoryIOS.mm
>index 99e65298dc715e7a4702c7afbfd6377f6426210b..be23f54c059324603a139d96b53db3d7448b285a 100644
>--- a/Source/WebCore/platform/ios/PlatformEventFactoryIOS.mm
>+++ b/Source/WebCore/platform/ios/PlatformEventFactoryIOS.mm
>@@ -47,7 +47,7 @@ static OptionSet<PlatformEvent::Modifier> modifiersForEvent(WebEvent *event)
>     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)
>diff --git a/Source/WebCore/platform/mac/KeyEventMac.mm b/Source/WebCore/platform/mac/KeyEventMac.mm
>index c73f4ab13d7ed153985073d743ea14b7a05a78e4..c19c97433066c0d6261f5d2adde290c393652588 100644
>--- a/Source/WebCore/platform/mac/KeyEventMac.mm
>+++ b/Source/WebCore/platform/mac/KeyEventMac.mm
>@@ -272,7 +272,7 @@ OptionSet<PlatformEvent::Modifier> PlatformKeyboardEvent::currentStateOfModifier
>     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)
>diff --git a/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm b/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm
>index 09d1d678d9e697c62432426673c4893b77be425d..39dc54eb853e88a016d0f354608b2b218477635b 100644
>--- a/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm
>+++ b/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm
>@@ -666,7 +666,7 @@ OptionSet<PlatformEvent::Modifier> modifiersForEvent(NSEvent *event)
>     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)
>diff --git a/Source/WebCore/testing/Internals.cpp b/Source/WebCore/testing/Internals.cpp
>index 6df869b2353d898727d029cd966cacffed8ca128..63d9af0536eef5e112959a5ea3540e6ab37e0db6 100644
>--- a/Source/WebCore/testing/Internals.cpp
>+++ b/Source/WebCore/testing/Internals.cpp
>@@ -4438,7 +4438,7 @@ Vector<String> Internals::accessKeyModifiers() const
>         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:
>diff --git a/Source/WebKit/Shared/WebEventConversion.cpp b/Source/WebKit/Shared/WebEventConversion.cpp
>index 38599851b08379133dc01b66e696b7e894304214..153de819f33ddf903504db724faa84ebf04a8169 100644
>--- a/Source/WebKit/Shared/WebEventConversion.cpp
>+++ b/Source/WebKit/Shared/WebEventConversion.cpp
>@@ -71,7 +71,7 @@ public:
>         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 @@ public:
>         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 @@ public:
>         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 @@ public:
>         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 @@ public:
>         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())
>diff --git a/Source/WebKit/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp b/Source/WebKit/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp
>index 0d8d0186611d3979f7a3a92aa6fa5613f2e542ad..1a63733cf678a6634c32f32b59d923bd9b295318 100644
>--- a/Source/WebKit/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp
>+++ b/Source/WebKit/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp
>@@ -101,7 +101,7 @@ void WebEditorClient::handleKeyboardEvent(KeyboardEvent* event)
>         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))
>diff --git a/Source/WebKit/WebProcess/WebCoreSupport/wpe/WebEditorClientWPE.cpp b/Source/WebKit/WebProcess/WebCoreSupport/wpe/WebEditorClientWPE.cpp
>index 0f19a7434808da025773e35dc15f57e8a21aca9a..b6f65df6fd21c771ab3bc088117ed73f0434d35c 100644
>--- a/Source/WebKit/WebProcess/WebCoreSupport/wpe/WebEditorClientWPE.cpp
>+++ b/Source/WebKit/WebProcess/WebCoreSupport/wpe/WebEditorClientWPE.cpp
>@@ -181,7 +181,7 @@ static void handleKeyPress(Frame& frame, KeyboardEvent& event, const PlatformKey
>         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))
>diff --git a/Source/WebKitLegacy/win/AccessibleBase.cpp b/Source/WebKitLegacy/win/AccessibleBase.cpp
>index 7e3b18319fb11e088d64e5daece997bdbcb28d3b..bbf53e942eb2d9caf1d6ba83b5af9d8e717cadba 100644
>--- a/Source/WebKitLegacy/win/AccessibleBase.cpp
>+++ b/Source/WebKitLegacy/win/AccessibleBase.cpp
>@@ -601,7 +601,7 @@ HRESULT AccessibleBase::get_accKeyboardShortcut(VARIANT vChild, __deref_opt_out
>         // 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+");
>diff --git a/Source/WebKitLegacy/win/WebView.cpp b/Source/WebKitLegacy/win/WebView.cpp
>index e331063a0bf0ebd82009150407626de9a140e52f..de39139a1fdf0adf4029466957ee1c6f5198c74a 100644
>--- a/Source/WebKitLegacy/win/WebView.cpp
>+++ b/Source/WebKitLegacy/win/WebView.cpp
>@@ -2418,9 +2418,9 @@ bool WebView::keyDown(WPARAM virtualKeyCode, LPARAM keyData, bool systemKeyDown)
>     // 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.

Actions: View | Formatted Diff | Diff

Attachments on bug 194317: 361245 | 361310