Title: [241006] trunk/Source/WebKit
- Revision
- 241006
- Author
- [email protected]
- Date
- 2019-02-05 17:42:42 -0800 (Tue, 05 Feb 2019)
Log Message
Attempt to fix the build following r241000
(https://bugs.webkit.org/show_bug.cgi?id=194241)
Substitute OptionSet<WebEvent::Modifier> for Modifiers.
* Shared/mac/NativeWebGestureEventMac.mm:
(WebKit::NativeWebGestureEvent::NativeWebGestureEvent):
* Shared/mac/WebGestureEvent.h:
(WebKit::WebGestureEvent::WebGestureEvent):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (241005 => 241006)
--- trunk/Source/WebKit/ChangeLog 2019-02-06 01:02:44 UTC (rev 241005)
+++ trunk/Source/WebKit/ChangeLog 2019-02-06 01:42:42 UTC (rev 241006)
@@ -1,3 +1,15 @@
+2019-02-05 Daniel Bates <[email protected]>
+
+ Attempt to fix the build following r241000
+ (https://bugs.webkit.org/show_bug.cgi?id=194241)
+
+ Substitute OptionSet<WebEvent::Modifier> for Modifiers.
+
+ * Shared/mac/NativeWebGestureEventMac.mm:
+ (WebKit::NativeWebGestureEvent::NativeWebGestureEvent):
+ * Shared/mac/WebGestureEvent.h:
+ (WebKit::WebGestureEvent::WebGestureEvent):
+
2019-02-05 Truitt Savell <[email protected]>
Unreviewed, rolling out r240984.
Modified: trunk/Source/WebKit/Shared/mac/NativeWebGestureEventMac.mm (241005 => 241006)
--- trunk/Source/WebKit/Shared/mac/NativeWebGestureEventMac.mm 2019-02-06 01:02:44 UTC (rev 241005)
+++ trunk/Source/WebKit/Shared/mac/NativeWebGestureEventMac.mm 2019-02-06 01:42:42 UTC (rev 241006)
@@ -62,7 +62,7 @@
NativeWebGestureEvent::NativeWebGestureEvent(NSEvent *event, NSView *view)
: WebGestureEvent(
webEventTypeForNSEvent(event),
- static_cast<Modifiers>(0),
+ OptionSet<WebEvent::Modifiers> { },
WebCore::eventTimeStampSince1970(event),
WebCore::IntPoint(pointForEvent(event, view)),
event.type == NSEventTypeMagnify ? event.magnification : 0,
Modified: trunk/Source/WebKit/Shared/mac/WebGestureEvent.h (241005 => 241006)
--- trunk/Source/WebKit/Shared/mac/WebGestureEvent.h 2019-02-06 01:02:44 UTC (rev 241005)
+++ trunk/Source/WebKit/Shared/mac/WebGestureEvent.h 2019-02-06 01:42:42 UTC (rev 241006)
@@ -45,7 +45,7 @@
class WebGestureEvent : public WebEvent {
public:
WebGestureEvent() { }
- WebGestureEvent(WebEvent::Type type, Modifiers modifiers, WallTime timestamp, WebCore::IntPoint position, float gestureScale, float gestureRotation)
+ WebGestureEvent(WebEvent::Type type, OptionSet<WebEvent::Modifier> modifiers, WallTime timestamp, WebCore::IntPoint position, float gestureScale, float gestureRotation)
: WebEvent(type, modifiers, timestamp)
, m_position(position)
, m_gestureScale(gestureScale)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
