Diff
Modified: trunk/LayoutTests/ChangeLog (189364 => 189365)
--- trunk/LayoutTests/ChangeLog 2015-09-04 18:44:29 UTC (rev 189364)
+++ trunk/LayoutTests/ChangeLog 2015-09-04 18:45:48 UTC (rev 189365)
@@ -1,3 +1,23 @@
+2015-09-04 Beth Dakin <[email protected]>
+
+ Need to be able to test default behaviors on force click
+ https://bugs.webkit.org/show_bug.cgi?id=148758
+
+ Reviewed by Tim Horton.
+
+ One new test that tests a regression found during the work for
+ http://trac.webkit.org/changeset/181660
+
+ * fast/events/force-click-on-link-navigation-expected.txt: Added.
+ * fast/events/force-click-on-link-navigation.html: Added.
+ * fast/events/resources/do-not-navigate-here.html: Added.
+ * platform/efl/TestExpectations:
+ * platform/gtk/TestExpectations:
+ * platform/ios-simulator/TestExpectations:
+ * platform/mac-mavericks/TestExpectations:
+ * platform/mac-wk1/TestExpectations:
+ * platform/win/TestExpectations:
+
2015-09-04 Ryosuke Niwa <[email protected]>
Import new multicolumn layout tests from CSS WG testss
Added: trunk/LayoutTests/fast/events/force-click-on-link-navigation-expected.txt (0 => 189365)
--- trunk/LayoutTests/fast/events/force-click-on-link-navigation-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/events/force-click-on-link-navigation-expected.txt 2015-09-04 18:45:48 UTC (rev 189365)
@@ -0,0 +1,2 @@
+Link
+SUCCESS! We did not navigate to the link after force clicking it.
Added: trunk/LayoutTests/fast/events/force-click-on-link-navigation.html (0 => 189365)
--- trunk/LayoutTests/fast/events/force-click-on-link-navigation.html (rev 0)
+++ trunk/LayoutTests/fast/events/force-click-on-link-navigation.html 2015-09-04 18:45:48 UTC (rev 189365)
@@ -0,0 +1,49 @@
+<html>
+<head>
+<script>
+
+var didNavigate = false;
+
+window._onbeforeunload_ = function () {
+ didNavigate = true;
+};
+
+function checkForDone()
+{
+ if (!didNavigate) {
+ var console = document.getElementById("console");
+ console.innerHTML = "SUCCESS! We did not navigate to the link after force clicking it.";
+ }
+
+ if (window.testRunner)
+ testRunner.notifyDone();
+}
+
+function spinRunLoop()
+{
+ window.setTimeout(checkForDone, 0);
+}
+
+function startTest()
+{
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+
+ if (window.eventSender) {
+ eventSender.mouseMoveTo(16, 16);
+ eventSender.mouseForceClick();
+ window.setTimeout(spinRunLoop, 0);
+ }
+}
+</script>
+</head>
+
+<body _onload_="startTest()">
+
+<a href=""
+<pre id="console">Failed. This test must be run in the test harness. To run the test manually, force click on the link and make sure that the original document does not navigate anywhere.</pre>
+
+</body>
+</html>
Added: trunk/LayoutTests/fast/events/resources/do-not-navigate-here.html (0 => 189365)
--- trunk/LayoutTests/fast/events/resources/do-not-navigate-here.html (rev 0)
+++ trunk/LayoutTests/fast/events/resources/do-not-navigate-here.html 2015-09-04 18:45:48 UTC (rev 189365)
@@ -0,0 +1,15 @@
+<html>
+<head>
+<script>
+
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.notifyDone();
+}
+
+</script>
+</head>
+<body>
+Force click tests should not navigate to this page after a successful force click or a started-then-cancelled force click. If navigation occurs, then this test FAILS.
+</body>
+</html>
Modified: trunk/LayoutTests/platform/efl/TestExpectations (189364 => 189365)
--- trunk/LayoutTests/platform/efl/TestExpectations 2015-09-04 18:44:29 UTC (rev 189364)
+++ trunk/LayoutTests/platform/efl/TestExpectations 2015-09-04 18:45:48 UTC (rev 189365)
@@ -69,6 +69,7 @@
animations/trigger-container-scroll-boundaries.html [ Skip ]
# No support for force events
+fast/events/force-click-on-link-navigation.html [ Skip ]
fast/events/mouse-force-changed.html [ Skip ]
fast/events/mouse-force-down.html [ Skip ]
fast/events/mouse-force-up.html [ Skip ]
Modified: trunk/LayoutTests/platform/gtk/TestExpectations (189364 => 189365)
--- trunk/LayoutTests/platform/gtk/TestExpectations 2015-09-04 18:44:29 UTC (rev 189364)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2015-09-04 18:45:48 UTC (rev 189365)
@@ -570,6 +570,7 @@
webkit.org/b/143703 fast/forms/listbox-visible-size.html [ Failure ]
# No support for force events
+fast/events/force-click-on-link-navigation.html [ Skip ]
fast/events/mouse-force-changed.html [ Skip ]
fast/events/mouse-force-down.html [ Skip ]
fast/events/mouse-force-up.html [ Skip ]
Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (189364 => 189365)
--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2015-09-04 18:44:29 UTC (rev 189364)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2015-09-04 18:45:48 UTC (rev 189365)
@@ -178,6 +178,7 @@
http/tests/security/drag-over-remote-content-iframe.html
# No support for force events
+fast/events/force-click-on-link-navigation.html [ Skip ]
fast/events/mouse-force-changed.html [ Skip ]
fast/events/mouse-force-down.html [ Skip ]
fast/events/mouse-force-up.html [ Skip ]
Modified: trunk/LayoutTests/platform/mac-mavericks/TestExpectations (189364 => 189365)
--- trunk/LayoutTests/platform/mac-mavericks/TestExpectations 2015-09-04 18:44:29 UTC (rev 189364)
+++ trunk/LayoutTests/platform/mac-mavericks/TestExpectations 2015-09-04 18:45:48 UTC (rev 189365)
@@ -2,6 +2,7 @@
http/tests/cache/disk-cache/disk-cache-validation-back-navigation-policy.html
# No support for force events
+fast/events/force-click-on-link-navigation.html [ Skip ]
fast/events/mouse-force-changed.html [ Skip ]
fast/events/mouse-force-down.html [ Skip ]
fast/events/mouse-force-up.html [ Skip ]
Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (189364 => 189365)
--- trunk/LayoutTests/platform/mac-wk1/TestExpectations 2015-09-04 18:44:29 UTC (rev 189364)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations 2015-09-04 18:45:48 UTC (rev 189365)
@@ -124,6 +124,7 @@
http/tests/cache/disk-cache
# There is not yet support for force events in WK1.
+fast/events/force-click-on-link-navigation.html [ Skip ]
fast/events/mouse-force-changed.html [ Skip ]
fast/events/mouse-force-down.html [ Skip ]
fast/events/mouse-force-up.html [ Skip ]
Modified: trunk/LayoutTests/platform/win/TestExpectations (189364 => 189365)
--- trunk/LayoutTests/platform/win/TestExpectations 2015-09-04 18:44:29 UTC (rev 189364)
+++ trunk/LayoutTests/platform/win/TestExpectations 2015-09-04 18:45:48 UTC (rev 189365)
@@ -619,6 +619,7 @@
animations/trigger-container-scroll-boundaries.html [ Skip ]
# No support for force events
+fast/events/force-click-on-link-navigation.html [ Skip ]
fast/events/mouse-force-changed.html [ Skip ]
fast/events/mouse-force-down.html [ Skip ]
fast/events/mouse-force-up.html [ Skip ]
Modified: trunk/Source/WebCore/ChangeLog (189364 => 189365)
--- trunk/Source/WebCore/ChangeLog 2015-09-04 18:44:29 UTC (rev 189364)
+++ trunk/Source/WebCore/ChangeLog 2015-09-04 18:45:48 UTC (rev 189365)
@@ -1,3 +1,13 @@
+2015-09-04 Beth Dakin <[email protected]>
+
+ Need to be able to test default behaviors on force click
+ https://bugs.webkit.org/show_bug.cgi?id=148758
+
+ Reviewed by Tim Horton.
+
+ WKTR needs access to this.
+ * platform/spi/mac/NSEventSPI.h:
+
2015-09-04 Dean Jackson <[email protected]>
[mediacontrols] Test the ordering of elements in the controls panel
Modified: trunk/Source/WebCore/platform/spi/mac/NSEventSPI.h (189364 => 189365)
--- trunk/Source/WebCore/platform/spi/mac/NSEventSPI.h 2015-09-04 18:44:29 UTC (rev 189364)
+++ trunk/Source/WebCore/platform/spi/mac/NSEventSPI.h 2015-09-04 18:45:48 UTC (rev 189365)
@@ -39,4 +39,8 @@
#endif
+@interface NSEvent (ForTestRunner)
+- (void)_postDelayed;
+@end
+
#endif
Modified: trunk/Source/WebKit2/ChangeLog (189364 => 189365)
--- trunk/Source/WebKit2/ChangeLog 2015-09-04 18:44:29 UTC (rev 189364)
+++ trunk/Source/WebKit2/ChangeLog 2015-09-04 18:45:48 UTC (rev 189365)
@@ -1,3 +1,17 @@
+2015-09-04 Beth Dakin <[email protected]>
+
+ Need to be able to test default behaviors on force click
+ https://bugs.webkit.org/show_bug.cgi?id=148758
+
+ Reviewed by Tim Horton.
+
+ The hit test seems to return synchronously in WKTR, so we need to do the hit
+ test last before we clear state otherwise we will trample the hit test
+ result.
+ * UIProcess/mac/WKImmediateActionController.mm:
+ (-[WKImmediateActionController immediateActionRecognizerWillPrepare:]):
+ (-[WKImmediateActionController immediateActionRecognizerWillBeginAnimation:]):
+
2015-09-03 Commit Queue <[email protected]>
Unreviewed, rolling out r189338.
Modified: trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm (189364 => 189365)
--- trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2015-09-04 18:44:29 UTC (rev 189364)
+++ trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2015-09-04 18:45:48 UTC (rev 189365)
@@ -173,10 +173,10 @@
_page->setMaintainsInactiveSelection(true);
- _page->performImmediateActionHitTestAtLocation([immediateActionRecognizer locationInView:immediateActionRecognizer.view]);
-
_state = ImmediateActionState::Pending;
immediateActionRecognizer.animationController = nil;
+
+ _page->performImmediateActionHitTestAtLocation([immediateActionRecognizer locationInView:immediateActionRecognizer.view]);
}
- (void)immediateActionRecognizerWillBeginAnimation:(NSImmediateActionGestureRecognizer *)immediateActionRecognizer
Modified: trunk/Tools/ChangeLog (189364 => 189365)
--- trunk/Tools/ChangeLog 2015-09-04 18:44:29 UTC (rev 189364)
+++ trunk/Tools/ChangeLog 2015-09-04 18:45:48 UTC (rev 189365)
@@ -1,3 +1,65 @@
+2015-09-04 Beth Dakin <[email protected]>
+
+ Need to be able to test default behaviors on force click
+ https://bugs.webkit.org/show_bug.cgi?id=148758
+
+ Reviewed by Tim Horton.
+
+ This patch adds a new eventSender method to do a full, completed force click,
+ and it re-works all of the existing force methods to dispatch their events in
+ such a way that they will trigger the NSImmediateAction gesture recognizer.
+ To do this, first we need to send the events to the app rather than straight
+ to the view, and also needed to tweak some state and send the events in a
+ delayed fashion.
+
+ New public function mouseForceClick() and private helper functions to make
+ NSEvents.
+ * WebKitTestRunner/EventSenderProxy.h:
+
+ New public function mouseForceClick().
+ * WebKitTestRunner/InjectedBundle/Bindings/EventSendingController.idl:
+ * WebKitTestRunner/InjectedBundle/EventSendingController.cpp:
+ (WTR::EventSendingController::mouseMoveTo):
+ (WTR::EventSendingController::mouseForceClick):
+ (WTR::EventSendingController::mouseForceDown):
+ * WebKitTestRunner/InjectedBundle/EventSendingController.h:
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::didReceiveSynchronousMessageFromInjectedBundle):
+
+ initPressureEventAtLocation needs to take a stageTransition and a window.
+ * WebKitTestRunner/mac/EventSenderProxy.mm:
+ (-[EventSenderSyntheticEvent initPressureEventAtLocation:globalLocation:stage:pressure:stageTransition:phase:time:eventNumber:window:]):
+ (-[EventSenderSyntheticEvent stageTransition]):
+ (-[EventSenderSyntheticEvent timestamp]):
+ (-[EventSenderSyntheticEvent _cgsEventRecord]):
+ (-[EventSenderSyntheticEvent window]):
+
+ In order to enter the gesture recognizer, we need to start with a mouse down
+ that has a NSEventMaskPressure modifier.
+ (WTR::EventSenderProxy::sendMouseDownToStartPressureEvents):
+
+ This ensures that the events queue properly for the force monitor in AppKit.
+ (WTR::spinRunLoopForForce):
+
+ We need to start the pressure change events with a began.
+ (WTR::EventSenderProxy::beginPressureEvent):
+
+ These functions can be used to create the NSEvent for a pressure change every
+ time we need one.
+ (WTR::EventSenderProxy::pressureChangeEvent):
+
+ Send the right series of events to emulate a full, completed force click.
+ (WTR::EventSenderProxy::mouseForceClick):
+
+ Use all of the new things for these existing functions.
+ (WTR::EventSenderProxy::mouseForceDown):
+ (WTR::EventSenderProxy::mouseForceUp):
+ (WTR::EventSenderProxy::mouseForceChanged):
+
+ Set NSFakeForceTouchDevice to YES.
+ * WebKitTestRunner/mac/main.mm:
+ (setDefaultsToConsistentValuesForTesting):
+
2015-09-04 Jason Marcell <[email protected]>
prepare-ChangeLog needs to know how to parse Swift files.
Modified: trunk/Tools/WebKitTestRunner/EventSenderProxy.h (189364 => 189365)
--- trunk/Tools/WebKitTestRunner/EventSenderProxy.h 2015-09-04 18:44:29 UTC (rev 189364)
+++ trunk/Tools/WebKitTestRunner/EventSenderProxy.h 2015-09-04 18:45:48 UTC (rev 189365)
@@ -29,6 +29,7 @@
#include <wtf/Deque.h>
#include <wtf/HashMap.h>
+#include <wtf/RetainPtr.h>
#include <wtf/Vector.h>
#if PLATFORM(GTK)
@@ -39,6 +40,10 @@
#include "EWebKit2.h"
#endif
+#if PLATFORM(COCOA)
+OBJC_CLASS NSEvent;
+#endif
+
namespace WTR {
class TestController;
@@ -61,6 +66,7 @@
void mouseForceDown();
void mouseForceUp();
void mouseForceChanged(float);
+ void mouseForceClick();
void mouseMoveTo(double x, double y);
void mouseScrollBy(int x, int y);
void mouseScrollByWithWheelAndMomentumPhases(int x, int y, int phase, int momentum);
@@ -96,6 +102,14 @@
void replaySavedEvents();
#endif
+ void sendMouseDownToStartPressureEvents();
+#if PLATFORM(COCOA)
+ enum class PressureChangeDirection { Increasing, Decreasing };
+ RetainPtr<NSEvent> beginPressureEvent(int stage);
+ RetainPtr<NSEvent> pressureChangeEvent(int stage, PressureChangeDirection);
+ RetainPtr<NSEvent> pressureChangeEvent(int stage, float pressure, PressureChangeDirection);
+#endif
+
#if PLATFORM(GTK)
void sendOrQueueEvent(GdkEvent*);
void dispatchEvent(GdkEvent*);
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/EventSendingController.idl (189364 => 189365)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/EventSendingController.idl 2015-09-04 18:44:29 UTC (rev 189364)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/EventSendingController.idl 2015-09-04 18:45:48 UTC (rev 189365)
@@ -27,6 +27,7 @@
void mouseDown(long buttonNumber, object modifierArray);
void mouseUp(long buttonNumber, object modifierArray);
void mouseMoveTo(long x, long y);
+ void mouseForceClick();
void mouseForceDown();
void mouseForceUp();
void mouseForceChanged(double force);
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp (189364 => 189365)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp 2015-09-04 18:44:29 UTC (rev 189364)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp 2015-09-04 18:45:48 UTC (rev 189365)
@@ -255,6 +255,18 @@
WKBundlePagePostSynchronousMessageForTesting(InjectedBundle::singleton().page()->page(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
}
+void EventSendingController::mouseForceClick()
+{
+ WKRetainPtr<WKStringRef> EventSenderMessageName(AdoptWK, WKStringCreateWithUTF8CString("EventSender"));
+ WKRetainPtr<WKMutableDictionaryRef> EventSenderMessageBody(AdoptWK, WKMutableDictionaryCreate());
+
+ WKRetainPtr<WKStringRef> subMessageKey(AdoptWK, WKStringCreateWithUTF8CString("SubMessage"));
+ WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString("MouseForceClick"));
+ WKDictionarySetItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
+
+ WKBundlePagePostSynchronousMessageForTesting(InjectedBundle::singleton().page()->page(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
+}
+
void EventSendingController::mouseForceDown()
{
WKRetainPtr<WKStringRef> EventSenderMessageName(AdoptWK, WKStringCreateWithUTF8CString("EventSender"));
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.h (189364 => 189365)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.h 2015-09-04 18:44:29 UTC (rev 189364)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.h 2015-09-04 18:45:48 UTC (rev 189365)
@@ -46,6 +46,7 @@
void mouseDown(int button, JSValueRef modifierArray);
void mouseUp(int button, JSValueRef modifierArray);
void mouseMoveTo(int x, int y);
+ void mouseForceClick();
void mouseForceDown();
void mouseForceUp();
void mouseForceChanged(double force);
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (189364 => 189365)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2015-09-04 18:44:29 UTC (rev 189364)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2015-09-04 18:45:48 UTC (rev 189365)
@@ -1211,6 +1211,11 @@
}
#if PLATFORM(MAC)
+ if (WKStringIsEqualToUTF8CString(subMessageName, "MouseForceClick")) {
+ m_eventSenderProxy->mouseForceClick();
+ return 0;
+ }
+
if (WKStringIsEqualToUTF8CString(subMessageName, "MouseForceDown")) {
m_eventSenderProxy->mouseForceDown();
return 0;
Modified: trunk/Tools/WebKitTestRunner/mac/EventSenderProxy.mm (189364 => 189365)
--- trunk/Tools/WebKitTestRunner/mac/EventSenderProxy.mm 2015-09-04 18:44:29 UTC (rev 189364)
+++ trunk/Tools/WebKitTestRunner/mac/EventSenderProxy.mm 2015-09-04 18:45:48 UTC (rev 189365)
@@ -31,6 +31,7 @@
#import "StringFunctions.h"
#import "TestController.h"
#import <Carbon/Carbon.h>
+#import <WebCore/NSEventSPI.h>
#import <WebKit/WKString.h>
#import <WebKit/WKPagePrivate.h>
#import <WebKit/WKWebView.h>
@@ -68,25 +69,28 @@
NSPoint _eventSender_location;
NSInteger _eventSender_stage;
float _eventSender_pressure;
+ CGFloat _eventSender_stageTransition;
NSEventPhase _eventSender_phase;
NSEventPhase _eventSender_momentumPhase;
NSTimeInterval _eventSender_timestamp;
NSInteger _eventSender_eventNumber;
short _eventSender_subtype;
NSEventType _eventSender_type;
+ NSWindow *_eventSender_window;
+
#if defined(__LP64__)
WKTRCGSEventRecord _eventSender_cgsEventRecord;
#endif
}
-- (id)initPressureEventAtLocation:(NSPoint)location globalLocation:(NSPoint)globalLocation stage:(NSInteger)stage pressure:(float)pressure phase:(NSEventPhase)phase time:(NSTimeInterval)time eventNumber:(NSInteger)eventNumber;
+- (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;
- (NSTimeInterval)timestamp;
@end
@implementation EventSenderSyntheticEvent
-- (id)initPressureEventAtLocation:(NSPoint)location globalLocation:(NSPoint)globalLocation stage:(NSInteger)stage pressure:(float)pressure phase:(NSEventPhase)phase time:(NSTimeInterval)time eventNumber:(NSInteger)eventNumber
+- (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];
@@ -97,9 +101,11 @@
_eventSender_locationInWindow = globalLocation;
_eventSender_stage = stage;
_eventSender_pressure = pressure;
+ _eventSender_stageTransition = stageTransition;
_eventSender_phase = phase;
_eventSender_timestamp = time;
_eventSender_eventNumber = eventNumber;
+ _eventSender_window = window;
#if defined(__LP64__) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101003
_eventSender_type = NSEventTypePressure;
#endif
@@ -107,6 +113,11 @@
return self;
}
+- (CGFloat)stageTransition
+{
+ return _eventSender_stageTransition;
+}
+
- (NSTimeInterval)timestamp
{
return _eventSender_timestamp;
@@ -176,6 +187,11 @@
}
#endif
+- (NSWindow *)window
+{
+ return _eventSender_window;
+}
+
@end
namespace WTR {
@@ -350,33 +366,95 @@
}
#if defined(__LP64__) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101003
-void EventSenderProxy::mouseForceDown()
+void EventSenderProxy::sendMouseDownToStartPressureEvents()
{
- EventSenderSyntheticEvent *firstEvent = [[EventSenderSyntheticEvent alloc] initPressureEventAtLocation:NSMakePoint(m_position.x, m_position.y)
+ updateClickCountForButton(0);
+
+ NSEvent *event = [NSEvent mouseEventWithType:NSLeftMouseDown
+ location:NSMakePoint(m_position.x, m_position.y)
+ modifierFlags:NSEventMaskPressure
+ timestamp:absoluteTimeForEventTime(currentEventTime())
+ windowNumber:[m_testController->mainWebView()->platformWindow() windowNumber]
+ context:[NSGraphicsContext currentContext]
+ eventNumber:++eventNumber
+ clickCount:m_clickCount
+ pressure:0.0];
+
+ [NSApp sendEvent:event];
+}
+
+static void handleForceEventSynchronously(NSEvent *event)
+{
+ // Force events have to be pushed onto the queue, then popped off right away and handled synchronously in order
+ // to get the NSImmediateActionGestureRecognizer to do the right thing.
+ [event _postDelayed];
+ [NSApp sendEvent:[NSApp nextEventMatchingMask:NSEventMaskPressure untilDate:[NSDate dateWithTimeIntervalSinceNow:0.05] inMode:NSDefaultRunLoopMode dequeue:YES]];
+}
+
+RetainPtr<NSEvent> EventSenderProxy::beginPressureEvent(int stage)
+{
+ RetainPtr<EventSenderSyntheticEvent> event = adoptNS([[EventSenderSyntheticEvent alloc] initPressureEventAtLocation:NSMakePoint(m_position.x, m_position.y)
globalLocation:([m_testController->mainWebView()->platformWindow() convertRectToScreen:NSMakeRect(m_position.x, m_position.y, 1, 1)].origin)
- stage:1
- pressure:0.9
- phase:NSEventPhaseChanged
+ stage:stage
+ pressure:0.5
+ stageTransition:0
+ phase:NSEventPhaseBegan
time:absoluteTimeForEventTime(currentEventTime())
- eventNumber:++eventNumber];
- EventSenderSyntheticEvent *secondEvent = [[EventSenderSyntheticEvent alloc] initPressureEventAtLocation:NSMakePoint(m_position.x, m_position.y)
+ eventNumber:++eventNumber
+ window:[m_testController->mainWebView()->platformView() window]]);
+
+ return event;
+}
+
+RetainPtr<NSEvent> EventSenderProxy::pressureChangeEvent(int stage, float pressure, EventSenderProxy::PressureChangeDirection direction)
+{
+ RetainPtr<EventSenderSyntheticEvent> event = adoptNS([[EventSenderSyntheticEvent alloc] initPressureEventAtLocation:NSMakePoint(m_position.x, m_position.y)
globalLocation:([m_testController->mainWebView()->platformWindow() convertRectToScreen:NSMakeRect(m_position.x, m_position.y, 1, 1)].origin)
- stage:2
- pressure:0.1
+ stage:stage
+ pressure:pressure
+ stageTransition:direction == PressureChangeDirection::Increasing ? 0.5 : -0.5
phase:NSEventPhaseChanged
time:absoluteTimeForEventTime(currentEventTime())
- eventNumber:++eventNumber];
+ eventNumber:++eventNumber
+ window:[m_testController->mainWebView()->platformView() window]]);
- NSView *targetView = [m_testController->mainWebView()->platformView() hitTest:[firstEvent locationInWindow]];
+ return event;
+}
+
+RetainPtr<NSEvent> EventSenderProxy::pressureChangeEvent(int stage, EventSenderProxy::PressureChangeDirection direction)
+{
+ return pressureChangeEvent(stage, 0.5, direction);
+}
+
+void EventSenderProxy::mouseForceClick()
+{
+ sendMouseDownToStartPressureEvents();
+
+ RetainPtr<NSEvent> beginPressure = beginPressureEvent(1);
+ RetainPtr<NSEvent> preForceClick = pressureChangeEvent(1, PressureChangeDirection::Increasing);
+ RetainPtr<NSEvent> forceClick = pressureChangeEvent(2, PressureChangeDirection::Increasing);
+ RetainPtr<NSEvent> releasingPressure = pressureChangeEvent(1, PressureChangeDirection::Decreasing);
+ NSEvent *mouseUp = [NSEvent mouseEventWithType:NSLeftMouseUp
+ location:NSMakePoint(m_position.x, m_position.y)
+ modifierFlags:0
+ timestamp:absoluteTimeForEventTime(currentEventTime())
+ windowNumber:[m_testController->mainWebView()->platformWindow() windowNumber]
+ context:[NSGraphicsContext currentContext]
+ eventNumber:++eventNumber
+ clickCount:m_clickCount
+ pressure:0.0];
+
+ NSView *targetView = [m_testController->mainWebView()->platformView() hitTest:[preForceClick.get() locationInWindow]];
targetView = targetView ? targetView : m_testController->mainWebView()->platformView();
ASSERT(targetView);
// Since AppKit does not implement forceup/down as mouse events, we need to send two pressure events to detect
// the change in stage that marks those moments.
- [NSApp _setCurrentEvent:firstEvent];
- [targetView pressureChangeWithEvent:firstEvent];
- [NSApp _setCurrentEvent:secondEvent];
- [targetView pressureChangeWithEvent:secondEvent];
+ handleForceEventSynchronously(beginPressure.get());
+ handleForceEventSynchronously(preForceClick.get());
+ handleForceEventSynchronously(forceClick.get());
+ handleForceEventSynchronously(releasingPressure.get());
+ [NSApp sendEvent:mouseUp];
[NSApp _setCurrentEvent:nil];
#pragma clang diagnostic push
@@ -384,77 +462,102 @@
// WKView caches the most recent pressure event, so send it a nil event to clear the cache.
[targetView pressureChangeWithEvent:nil];
#pragma clang diagnostic pop
-
- [firstEvent release];
- [secondEvent release];
}
-void EventSenderProxy::mouseForceUp()
+void EventSenderProxy::mouseForceDown()
{
- EventSenderSyntheticEvent *firstEvent = [[EventSenderSyntheticEvent alloc] initPressureEventAtLocation:NSMakePoint(m_position.x, m_position.y)
- globalLocation:([m_testController->mainWebView()->platformWindow() convertRectToScreen:NSMakeRect(m_position.x, m_position.y, 1, 1)].origin)
- stage:2
- pressure:0.1
- phase:NSEventPhaseChanged
- time:absoluteTimeForEventTime(currentEventTime())
- eventNumber:++eventNumber];
- EventSenderSyntheticEvent *secondEvent = [[EventSenderSyntheticEvent alloc] initPressureEventAtLocation:NSMakePoint(m_position.x, m_position.y)
- globalLocation:([m_testController->mainWebView()->platformWindow() convertRectToScreen:NSMakeRect(m_position.x, m_position.y, 1, 1)].origin)
- stage:1
- pressure:0.9
- phase:NSEventPhaseChanged
- time:absoluteTimeForEventTime(currentEventTime())
- eventNumber:++eventNumber];
+ sendMouseDownToStartPressureEvents();
- NSView *targetView = [m_testController->mainWebView()->platformView() hitTest:[firstEvent locationInWindow]];
+ RetainPtr<NSEvent> beginPressure = beginPressureEvent(1);
+ RetainPtr<NSEvent> preForceClick = pressureChangeEvent(1, PressureChangeDirection::Increasing);
+ RetainPtr<NSEvent> forceMouseDown = pressureChangeEvent(2, PressureChangeDirection::Increasing);
+
+ NSView *targetView = [m_testController->mainWebView()->platformView() hitTest:[beginPressure locationInWindow]];
targetView = targetView ? targetView : m_testController->mainWebView()->platformView();
ASSERT(targetView);
// Since AppKit does not implement forceup/down as mouse events, we need to send two pressure events to detect
// the change in stage that marks those moments.
- [NSApp _setCurrentEvent:firstEvent];
- [targetView pressureChangeWithEvent:firstEvent];
- [NSApp _setCurrentEvent:secondEvent];
- [targetView pressureChangeWithEvent:secondEvent];
+ handleForceEventSynchronously(beginPressure.get());
+ handleForceEventSynchronously(preForceClick.get());
+ [forceMouseDown _postDelayed];
[NSApp _setCurrentEvent:nil];
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnonnull"
+ // WKView caches the most recent pressure event, so send it a nil event to clear the cache.
+ [targetView pressureChangeWithEvent:nil];
+#pragma clang diagnostic pop
+}
+void EventSenderProxy::mouseForceUp()
+{
+ RetainPtr<NSEvent> beginPressure = beginPressureEvent(2);
+ RetainPtr<NSEvent> stageTwoEvent = pressureChangeEvent(2, PressureChangeDirection::Decreasing);
+ RetainPtr<NSEvent> stageOneEvent = pressureChangeEvent(1, PressureChangeDirection::Decreasing);
+
+ // Since AppKit does not implement forceup/down as mouse events, we need to send two pressure events to detect
+ // the change in stage that marks those moments.
+ [NSApp sendEvent:beginPressure.get()];
+ [NSApp sendEvent:stageTwoEvent.get()];
+ [NSApp sendEvent:stageOneEvent.get()];
+
+ NSView *targetView = [m_testController->mainWebView()->platformView() hitTest:[beginPressure locationInWindow]];
+ targetView = targetView ? targetView : m_testController->mainWebView()->platformView();
+ ASSERT(targetView);
+
+ [NSApp _setCurrentEvent:nil];
+
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wnonnull"
// WKView caches the most recent pressure event, so send it a nil event to clear the cache.
[targetView pressureChangeWithEvent:nil];
#pragma clang diagnostic pop
-
- [firstEvent release];
- [secondEvent release];
}
void EventSenderProxy::mouseForceChanged(float force)
{
- EventSenderSyntheticEvent *event = [[EventSenderSyntheticEvent alloc] initPressureEventAtLocation:NSMakePoint(m_position.x, m_position.y)
- globalLocation:([m_testController->mainWebView()->platformWindow() convertRectToScreen:NSMakeRect(m_position.x, m_position.y, 1, 1)].origin)
- stage:force < 1 ? 1 : 2
- pressure:force
- phase:NSEventPhaseChanged
- time:absoluteTimeForEventTime(currentEventTime())
- eventNumber:++eventNumber];
+ int stage = force < 1 ? 1 : 2;
+ float pressure = force < 1 ? force : force - 1;
+ RetainPtr<NSEvent> beginPressure = beginPressureEvent(stage);
+ RetainPtr<NSEvent> pressureChangedEvent = pressureChangeEvent(stage, pressure, PressureChangeDirection::Increasing);
- NSView *targetView = [m_testController->mainWebView()->platformView() hitTest:[event locationInWindow]];
+ NSView *targetView = [m_testController->mainWebView()->platformView() hitTest:[beginPressure locationInWindow]];
targetView = targetView ? targetView : m_testController->mainWebView()->platformView();
ASSERT(targetView);
- [NSApp _setCurrentEvent:event];
- [targetView pressureChangeWithEvent:event];
- [NSApp _setCurrentEvent:nil];
+ [NSApp sendEvent:beginPressure.get()];
+ [NSApp sendEvent:pressureChangedEvent.get()];
+
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wnonnull"
// WKView caches the most recent pressure event, so send it a nil event to clear the cache.
[targetView pressureChangeWithEvent:nil];
#pragma clang diagnostic pop
+}
+#else
- [event release];
+#if PLATFORM(COCOA)
+RetainPtr<NSEvent> EventSenderProxy::beginPressureEvent(int)
+{
+ return nil;
}
-#else
+
+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()
{
}
@@ -466,6 +569,10 @@
void EventSenderProxy::mouseForceChanged(float)
{
}
+
+void EventSenderProxy::mouseForceClick()
+{
+}
#endif // defined(__LP64__) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101003
void EventSenderProxy::mouseMoveTo(double x, double y)
Modified: trunk/Tools/WebKitTestRunner/mac/main.mm (189364 => 189365)
--- trunk/Tools/WebKitTestRunner/mac/main.mm 2015-09-04 18:44:29 UTC (rev 189364)
+++ trunk/Tools/WebKitTestRunner/mac/main.mm 2015-09-04 18:45:48 UTC (rev 189365)
@@ -33,7 +33,8 @@
@"AppleKeyboardUIMode": @1,
// FIXME: This is likely insufficient, as tests change (and don't reset) these settings via Internals.
@"WebAutomaticQuoteSubstitutionEnabled": @NO,
- @"WebAutomaticDashSubstitutionEnabled": @NO
+ @"WebAutomaticDashSubstitutionEnabled": @NO,
+ @"NSFakeForceTouchDevice" : @YES
};
[[NSUserDefaults standardUserDefaults] setValuesForKeysWithDictionary:dict];
