Title: [241001] trunk/Source/WebKit
- Revision
- 241001
- Author
- [email protected]
- Date
- 2019-02-05 16:39:46 -0800 (Tue, 05 Feb 2019)
Log Message
Attempt to fix the build following r241000
(https://bugs.webkit.org/show_bug.cgi?id=194241)
Substitute WebEvent::Modifier::CapsLockKey for WebEvent::CapsLockKey.
* Shared/gtk/WebEventFactory.cpp:
(WebKit::modifiersForEvent):
* Shared/mac/WebEventFactory.mm:
(WebKit::modifiersForEvent):
* UIProcess/API/Cocoa/WKNavigationAction.mm:
(toNSEventModifierFlags):
* UIProcess/Automation/WebAutomationSession.cpp:
(WebKit::protocolModifierToWebEventModifier):
* UIProcess/Automation/gtk/WebAutomationSessionGtk.cpp:
(WebKit::modifiersToEventState):
* UIProcess/Automation/mac/WebAutomationSessionMac.mm:
(WebKit::WebAutomationSession::platformSimulateMouseInteraction):
* UIProcess/Cocoa/UIDelegate.mm:
(WebKit::toNSEventModifierFlags):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (241000 => 241001)
--- trunk/Source/WebKit/ChangeLog 2019-02-06 00:21:21 UTC (rev 241000)
+++ trunk/Source/WebKit/ChangeLog 2019-02-06 00:39:46 UTC (rev 241001)
@@ -1,5 +1,27 @@
2019-02-05 Daniel Bates <[email protected]>
+ Attempt to fix the build following r241000
+ (https://bugs.webkit.org/show_bug.cgi?id=194241)
+
+ Substitute WebEvent::Modifier::CapsLockKey for WebEvent::CapsLockKey.
+
+ * Shared/gtk/WebEventFactory.cpp:
+ (WebKit::modifiersForEvent):
+ * Shared/mac/WebEventFactory.mm:
+ (WebKit::modifiersForEvent):
+ * UIProcess/API/Cocoa/WKNavigationAction.mm:
+ (toNSEventModifierFlags):
+ * UIProcess/Automation/WebAutomationSession.cpp:
+ (WebKit::protocolModifierToWebEventModifier):
+ * UIProcess/Automation/gtk/WebAutomationSessionGtk.cpp:
+ (WebKit::modifiersToEventState):
+ * UIProcess/Automation/mac/WebAutomationSessionMac.mm:
+ (WebKit::WebAutomationSession::platformSimulateMouseInteraction):
+ * UIProcess/Cocoa/UIDelegate.mm:
+ (WebKit::toNSEventModifierFlags):
+
+2019-02-05 Daniel Bates <[email protected]>
+
Make WebEvent::Modifiers an OptionSet
https://bugs.webkit.org/show_bug.cgi?id=194241
Modified: trunk/Source/WebKit/Shared/gtk/WebEventFactory.cpp (241000 => 241001)
--- trunk/Source/WebKit/Shared/gtk/WebEventFactory.cpp 2019-02-06 00:21:21 UTC (rev 241000)
+++ trunk/Source/WebKit/Shared/gtk/WebEventFactory.cpp 2019-02-06 00:39:46 UTC (rev 241001)
@@ -63,7 +63,7 @@
if (state & GDK_META_MASK)
modifiers.add(WebEvent::Modifier::MetaKey);
if (PlatformKeyboardEvent::modifiersContainCapsLock(state))
- modifiers.add(WebEvent::CapsLockKey);
+ modifiers.add(WebEvent::Modifier::CapsLockKey);
return modifiers;
}
Modified: trunk/Source/WebKit/Shared/mac/WebEventFactory.mm (241000 => 241001)
--- trunk/Source/WebKit/Shared/mac/WebEventFactory.mm 2019-02-06 00:21:21 UTC (rev 241000)
+++ trunk/Source/WebKit/Shared/mac/WebEventFactory.mm 2019-02-06 00:39:46 UTC (rev 241001)
@@ -313,7 +313,7 @@
{
OptionSet<WebEvent::Modifier> modifiers;
if ([event modifierFlags] & NSEventModifierFlagCapsLock)
- modifiers.add(WebEvent::CapsLockKey);
+ modifiers.add(WebEvent::Modifier::CapsLockKey);
if ([event modifierFlags] & NSEventModifierFlagShift)
modifiers.add(WebEvent::Modifier::ShiftKey);
if ([event modifierFlags] & NSEventModifierFlagControl)
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKNavigationAction.mm (241000 => 241001)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKNavigationAction.mm 2019-02-06 00:21:21 UTC (rev 241000)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKNavigationAction.mm 2019-02-06 00:39:46 UTC (rev 241001)
@@ -80,7 +80,7 @@
static NSEventModifierFlags toNSEventModifierFlags(OptionSet<WebKit::WebEvent::Modifier> modifiers)
{
NSEventModifierFlags modifierFlags = 0;
- if (modifiers.contains(WebKit::WebEvent::CapsLockKey))
+ if (modifiers.contains(WebKit::WebEvent::Modifier::CapsLockKey))
modifierFlags |= NSEventModifierFlagCapsLock;
if (modifiers.contains(WebKit::WebEvent::Modifier::ShiftKey))
modifierFlags |= NSEventModifierFlagShift;
Modified: trunk/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp (241000 => 241001)
--- trunk/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp 2019-02-06 00:21:21 UTC (rev 241000)
+++ trunk/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp 2019-02-06 00:39:46 UTC (rev 241001)
@@ -1602,7 +1602,7 @@
case Inspector::Protocol::Automation::KeyModifier::Shift:
return WebEvent::Modifier::ShiftKey;
case Inspector::Protocol::Automation::KeyModifier::CapsLock:
- return WebEvent::CapsLockKey;
+ return WebEvent::Modifier::CapsLockKey;
}
RELEASE_ASSERT_NOT_REACHED();
Modified: trunk/Source/WebKit/UIProcess/Automation/gtk/WebAutomationSessionGtk.cpp (241000 => 241001)
--- trunk/Source/WebKit/UIProcess/Automation/gtk/WebAutomationSessionGtk.cpp 2019-02-06 00:21:21 UTC (rev 241000)
+++ trunk/Source/WebKit/UIProcess/Automation/gtk/WebAutomationSessionGtk.cpp 2019-02-06 00:39:46 UTC (rev 241001)
@@ -43,7 +43,7 @@
state |= GDK_SHIFT_MASK;
if (modifiers.contains(WebEvent::Modifier::AltKey))
state |= GDK_META_MASK;
- if (modifiers.contains(WebEvent::CapsLockKey))
+ if (modifiers.contains(WebEvent::Modifier::CapsLockKey))
state |= GDK_LOCK_MASK;
return state;
}
Modified: trunk/Source/WebKit/UIProcess/Automation/mac/WebAutomationSessionMac.mm (241000 => 241001)
--- trunk/Source/WebKit/UIProcess/Automation/mac/WebAutomationSessionMac.mm 2019-02-06 00:21:21 UTC (rev 241000)
+++ trunk/Source/WebKit/UIProcess/Automation/mac/WebAutomationSessionMac.mm 2019-02-06 00:39:46 UTC (rev 241001)
@@ -136,7 +136,7 @@
modifiers |= NSEventModifierFlagControl;
if (keyModifiers.contains(WebEvent::Modifier::ShiftKey))
modifiers |= NSEventModifierFlagShift;
- if (keyModifiers.contains(WebEvent::CapsLockKey))
+ if (keyModifiers.contains(WebEvent::Modifier::CapsLockKey))
modifiers |= NSEventModifierFlagCapsLock;
NSTimeInterval timestamp = [NSDate timeIntervalSinceReferenceDate];
Modified: trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm (241000 => 241001)
--- trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm 2019-02-06 00:21:21 UTC (rev 241000)
+++ trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm 2019-02-06 00:39:46 UTC (rev 241001)
@@ -698,7 +698,7 @@
flags |= NSEventModifierFlagOption;
if (modifiers.contains(WebEvent::Modifier::MetaKey))
flags |= NSEventModifierFlagCommand;
- if (modifiers.contains(WebEvent::CapsLockKey))
+ if (modifiers.contains(WebEvent::Modifier::CapsLockKey))
flags |= NSEventModifierFlagCapsLock;
return flags;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
