Changeset 244820 in webkit

Timestamp:

Apr 30, 2019, 11:30:51 PM (7 years ago)

Author:

timothy_horton@apple.com

Message:

Fix the WebKitTestRunner build
​https://bugs.webkit.org/show_bug.cgi?id=197449
<rdar://problem/50334169>

Reviewed by Alexey Proskuryakov.

• WebKitTestRunner/mac/EventSenderProxy.mm:

(-[EventSenderSyntheticEvent initPressureEventAtLocation:globalLocation:stage:pressure:stageTransition:phase:time:eventNumber:window:]):
(WTR::EventSenderProxy::mouseForceChanged):
Use some SPI instead of IPI.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestRunnerShared/spi/CoreGraphicsTestSPI.h (modified) (1 diff)
• WebKitTestRunner/mac/EventSenderProxy.mm (modified) (6 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-04-30  Tim Horton  <timothy_horton@apple.com>
+
+        Fix the WebKitTestRunner build
+        https://bugs.webkit.org/show_bug.cgi?id=197449
+        <rdar://problem/50334169>
+
+        Reviewed by Alexey Proskuryakov.
+
+        * WebKitTestRunner/mac/EventSenderProxy.mm:
+        (-[EventSenderSyntheticEvent initPressureEventAtLocation:globalLocation:stage:pressure:stageTransition:phase:time:eventNumber:window:]):
+        (WTR::EventSenderProxy::mouseForceChanged):
+        Use some SPI instead of IPI.
+
 2019-04-30  Chris Dumez  <cdumez@apple.com>
 

trunk/Tools/TestRunnerShared/spi/CoreGraphicsTestSPI.h

@@ -85 +85 @@
 typedef uint32_t CGSHIDEventType;
 
+typedef CF_ENUM(uint8_t, CGSGesturePhase)
+{
+    kCGSGesturePhaseNone = 0,
+    kCGSGesturePhaseBegan = 1,
+    kCGSGesturePhaseChanged = 2,
+    kCGSGesturePhaseEnded = 4,
+    kCGSGesturePhaseCancelled = 8,
+    kCGSGesturePhaseMayBegin = 128
+};
+
+typedef CF_ENUM(uint8_t, CGSGestureBehavior)
+{
+    kCGSGestureBehaviorDeepPress = 5,
+};
+
 CGPoint CGEventGetWindowLocation(CGEventRef);
 void CGEventSetWindowLocation(CGEventRef, CGPoint);

trunk/Tools/WebKitTestRunner/mac/EventSenderProxy.mm

@@ -28 +28 @@
 #import "EventSenderProxy.h"
 
+#import "CoreGraphicsTestSPI.h"
 #import "PlatformWebView.h"
 #import "StringFunctions.h"
@@ -46 +47 @@
 @interface NSEvent (ForTestRunner)
 - (void)_postDelayed;
+- (instancetype)_initWithCGEvent:(CGEventRef)event eventRef:(void *)eventRef;
 @end
 
@@ -70 +72 @@
 @implementation EventSenderSyntheticEvent
 
-- (id)initPressureEventAtLocation:(NSPoint)location globalLocation:(NSPoint)globalLocation stage:(NSInteger)stage pressure:(float)pressure stageTransition:(float)stageTransition phase:(NSEventPhase)phase time:(NSTimeInterval)time eventNumber:(NSInteger)eventNumber window:(NSWindow *)window
-{
-    self = [super init];
+- (instancetype)initPressureEventAtLocation:(NSPoint)location globalLocation:(NSPoint)globalLocation stage:(NSInteger)stage pressure:(float)pressure stageTransition:(float)stageTransition phase:(NSEventPhase)phase time:(NSTimeInterval)time eventNumber:(NSInteger)eventNumber window:(NSWindow *)window
+{
+    CGSGesturePhase gesturePhase;
+    switch (phase) {
+    case NSEventPhaseMayBegin:
+        gesturePhase = kCGSGesturePhaseMayBegin;
+        break;
+    case NSEventPhaseBegan:
+        gesturePhase = kCGSGesturePhaseBegan;
+        break;
+    case NSEventPhaseChanged:
+        gesturePhase = kCGSGesturePhaseChanged;
+        break;
+    case NSEventPhaseCancelled:
+        gesturePhase = kCGSGesturePhaseCancelled;
+        break;
+    case NSEventPhaseEnded:
+        gesturePhase = kCGSGesturePhaseEnded;
+        break;
+    case NSEventPhaseNone:
+    default:
+        gesturePhase = kCGSGesturePhaseNone;
+        break;
+    }
+
+    CGEventRef cgEvent = CGEventCreate(nullptr);
+    CGEventSetType(cgEvent, (CGEventType)kCGSEventGesture);
+    CGEventSetIntegerValueField(cgEvent, kCGEventGestureHIDType, 32);
+    CGEventSetIntegerValueField(cgEvent, kCGEventGesturePhase, gesturePhase);
+    CGEventSetDoubleValueField(cgEvent, kCGEventStagePressure, pressure);
+    CGEventSetDoubleValueField(cgEvent, kCGEventTransitionProgress, pressure);
+    CGEventSetIntegerValueField(cgEvent, kCGEventGestureStage, stageTransition);
+    CGEventSetIntegerValueField(cgEvent, kCGEventGestureBehavior, kCGSGestureBehaviorDeepPress);
+
+    self = [super _initWithCGEvent:cgEvent eventRef:nullptr];
 
     if (!self)
@@ -86 +120 @@
     _eventSender_eventNumber = eventNumber;
     _eventSender_window = window;
-#if defined(__LP64__)
-    self->_type = NSEventTypePressure;
     _eventSender_type = NSEventTypePressure;
-#endif
 
     return self;
@@ -326 +357 @@
 }
 
-#if defined(__LP64__)
 void EventSenderProxy::sendMouseDownToStartPressureEvents()
 {
@@ -526 +556 @@
     IGNORE_NULL_CHECK_WARNINGS_END
 }
-#else
-
-#if PLATFORM(COCOA)
-RetainPtr<NSEvent> EventSenderProxy::beginPressureEvent(int)
-{
-    return nil;
-}
-
-RetainPtr<NSEvent> EventSenderProxy::pressureChangeEvent(int, PressureChangeDirection)
-{
-    return nil;
-}
-
-RetainPtr<NSEvent> EventSenderProxy::pressureChangeEvent(int, float, PressureChangeDirection)
-{
-    return nil;
-}
-#endif // PLATFORM(COCOA)
-
-void EventSenderProxy::sendMouseDownToStartPressureEvents()
-{
-}
-
-void EventSenderProxy::mouseForceDown()
-{
-}
-
-void EventSenderProxy::mouseForceUp()
-{
-}
-
-void EventSenderProxy::mouseForceChanged(float)
-{
-}
-
-void EventSenderProxy::mouseForceClick()
-{
-}
-
-void EventSenderProxy::startAndCancelMouseForceClick()
-{
-}
-#endif // defined(__LP64__)
 
 void EventSenderProxy::mouseMoveTo(double x, double y)