Diff
Modified: trunk/LayoutTests/ChangeLog (285780 => 285781)
--- trunk/LayoutTests/ChangeLog 2021-11-13 21:59:47 UTC (rev 285780)
+++ trunk/LayoutTests/ChangeLog 2021-11-13 23:04:06 UTC (rev 285781)
@@ -1,3 +1,15 @@
+2021-11-13 Simon Fraser <simon.fra...@apple.com>
+
+ Implement UIScriptController.sendEventStream() for DumpRenderTree
+ https://bugs.webkit.org/show_bug.cgi?id=233090
+
+ Reviewed by Wenson Hsieh.
+
+ Convert one test that runs in WK1 to use sendEventStream().
+
+ * fast/scrolling/overflow-scroll-past-max.html:
+ * resources/ui-helper.js:
+
2021-11-13 Tyler Wilcock <tyle...@apple.com>
AX: Make 7 more layout tests async so that they pass in --release --accessibility-isolated-tree mode
Modified: trunk/LayoutTests/fast/scrolling/overflow-scroll-past-max.html (285780 => 285781)
--- trunk/LayoutTests/fast/scrolling/overflow-scroll-past-max.html 2021-11-13 21:59:47 UTC (rev 285780)
+++ trunk/LayoutTests/fast/scrolling/overflow-scroll-past-max.html 2021-11-13 23:04:06 UTC (rev 285781)
@@ -16,6 +16,7 @@
background-image: linear-gradient(silver, gray);
}
</style>
+ <script src=""
<script>
function checkForScroll()
{
@@ -30,22 +31,73 @@
testRunner.notifyDone();
}
- function scrollTest()
+ async function scrollTest()
{
- eventSender.mouseMoveTo(20, 20);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, "began", "none");
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -100, "changed", "none");
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -100, "changed", "none");
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, "changed", "none");
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, "ended", "none");
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -100, "none", "begin");
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -100, "none", "continue");
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -100, "none", "continue");
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -100, "none", "continue");
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -100, "none", "continue");
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -100, "none", "continue");
- eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, "none", "end");
- eventSender.callAfterScrollingCompletes(checkForScroll);
+ const events = [
+ {
+ type : "wheel",
+ viewX : 20,
+ viewY : 20,
+ deltaY : -10,
+ phase : "began"
+ },
+ {
+ type : "wheel",
+ deltaY : -1000,
+ phase : "changed"
+ },
+ {
+ type : "wheel",
+ deltaY : -1000,
+ phase : "changed"
+ },
+ {
+ type : "wheel",
+ deltaY : -10,
+ phase : "changed"
+ },
+ {
+ type : "wheel",
+ phase : "ended"
+ },
+ {
+ type : "wheel",
+ deltaY : -1000,
+ momentumPhase : "began"
+ },
+ {
+ type : "wheel",
+ deltaY : -1000,
+ momentumPhase : "began"
+ },
+ {
+ type : "wheel",
+ deltaY : -1000,
+ momentumPhase : "began"
+ },
+ {
+ type : "wheel",
+ deltaY : -1000,
+ momentumPhase : "began"
+ },
+ {
+ type : "wheel",
+ deltaY : -1000,
+ momentumPhase : "began"
+ },
+ {
+ type : "wheel",
+ deltaY : -1000,
+ momentumPhase : "began"
+ },
+ {
+ type : "wheel",
+ momentumPhase : "ended"
+ }
+ ];
+
+ await UIHelper.mouseWheelSequence({ events: events });
+ checkForScroll();
}
function startTest()
Modified: trunk/LayoutTests/resources/ui-helper.js (285780 => 285781)
--- trunk/LayoutTests/resources/ui-helper.js 2021-11-13 21:59:47 UTC (rev 285780)
+++ trunk/LayoutTests/resources/ui-helper.js 2021-11-13 23:04:06 UTC (rev 285781)
@@ -110,11 +110,6 @@
static async mouseWheelSequence(eventStream, { waitForCompletion = true } = {})
{
- if (!this.isWebKit2()) {
- console.log('UIHelper.mouseWheelSequence() does not work in DumpRenderTree')
- return Promise.resolve();
- }
-
if (waitForCompletion)
eventSender.monitorWheelEvents();
const eventStreamAsString = JSON.stringify(eventStream);
Modified: trunk/Tools/ChangeLog (285780 => 285781)
--- trunk/Tools/ChangeLog 2021-11-13 21:59:47 UTC (rev 285780)
+++ trunk/Tools/ChangeLog 2021-11-13 23:04:06 UTC (rev 285781)
@@ -1,3 +1,24 @@
+2021-11-13 Simon Fraser <simon.fra...@apple.com>
+
+ Implement UIScriptController.sendEventStream() for DumpRenderTree
+ https://bugs.webkit.org/show_bug.cgi?id=233090
+
+ Reviewed by Wenson Hsieh.
+
+ Implement UIScriptControllerMac::sendEventStream(), sharing some event dispatching code from
+ EventSendingController.
+
+ * DumpRenderTree/mac/EventSendingController.h:
+ * DumpRenderTree/mac/EventSendingController.mm:
+ (-[EventSendingController mouseScrollByX:andY:withWheel:andMomentumPhases:]):
+ (-[EventSendingController sendScrollEventAt:deltaX:deltaY:units:wheelPhase:momentumPhase:timestamp:]):
+ * DumpRenderTree/mac/UIScriptControllerMac.h:
+ * DumpRenderTree/mac/UIScriptControllerMac.mm:
+ (WTR::gesturePhaseFromString):
+ (WTR::momentumPhaseFromString):
+ (WTR::eventSenderFromView):
+ (WTR::UIScriptControllerMac::sendEventStream):
+
2021-11-13 Jonathan Bedard <jbed...@apple.com>
Unreviewed, reverting r285772.
Modified: trunk/Tools/DumpRenderTree/mac/EventSendingController.h (285780 => 285781)
--- trunk/Tools/DumpRenderTree/mac/EventSendingController.h 2021-11-13 21:59:47 UTC (rev 285780)
+++ trunk/Tools/DumpRenderTree/mac/EventSendingController.h 2021-11-13 23:04:06 UTC (rev 285781)
@@ -58,6 +58,11 @@
- (void)handleEvent:(DOMEvent *)event;
+#if PLATFORM(MAC)
+// Timestamp is mach_absolute_time() units.
+- (void)sendScrollEventAt:(NSPoint)mouseLocation deltaX:(double)deltaX deltaY:(double)deltaY units:(CGScrollEventUnit)units wheelPhase:(CGGesturePhase)wheelPhase momentumPhase:(CGMomentumScrollPhase)momentumPhase timestamp:(uint64_t)timestamp;
+#endif
+
@end
extern NSPoint lastMousePosition;
Modified: trunk/Tools/DumpRenderTree/mac/EventSendingController.mm (285780 => 285781)
--- trunk/Tools/DumpRenderTree/mac/EventSendingController.mm 2021-11-13 21:59:47 UTC (rev 285780)
+++ trunk/Tools/DumpRenderTree/mac/EventSendingController.mm 2021-11-13 23:04:06 UTC (rev 285781)
@@ -841,51 +841,62 @@
[self mouseScrollByX:x andY:y continuously:NO];
}
-- (void)mouseScrollByX:(int)x andY:(int)y withWheel:(NSString*)phaseName andMomentumPhases:(NSString*)momentumName
+- (void)mouseScrollByX:(int)x andY:(int)y withWheel:(NSString*)wheelPhase andMomentumPhases:(NSString*)momentumPhase
{
#if PLATFORM(MAC)
[[[mainFrame frameView] documentView] layout];
- uint32_t phase = 0;
- if ([phaseName isEqualToString: @"none"])
- phase = 0;
- else if ([phaseName isEqualToString: @"began"])
- phase = kCGScrollPhaseBegan;
- else if ([phaseName isEqualToString: @"changed"])
- phase = kCGScrollPhaseChanged;
- else if ([phaseName isEqualToString: @"ended"])
- phase = kCGScrollPhaseEnded;
- else if ([phaseName isEqualToString: @"cancelled"])
- phase = kCGScrollPhaseCancelled;
- else if ([phaseName isEqualToString: @"maybegin"])
- phase = kCGScrollPhaseMayBegin;
+ CGGesturePhase phase = kCGGesturePhaseNone;
+ if ([wheelPhase isEqualToString: @"none"])
+ phase = kCGGesturePhaseNone;
+ else if ([wheelPhase isEqualToString: @"began"])
+ phase = kCGGesturePhaseBegan;
+ else if ([wheelPhase isEqualToString: @"changed"])
+ phase = kCGGesturePhaseChanged;
+ else if ([wheelPhase isEqualToString: @"ended"])
+ phase = kCGGesturePhaseEnded;
+ else if ([wheelPhase isEqualToString: @"cancelled"])
+ phase = kCGGesturePhaseCancelled;
+ else if ([wheelPhase isEqualToString: @"maybegin"])
+ phase = kCGGesturePhaseMayBegin;
- uint32_t momentum = 0;
- if ([momentumName isEqualToString: @"none"])
+ CGMomentumScrollPhase momentum = kCGMomentumScrollPhaseNone;
+ if ([momentumPhase isEqualToString: @"none"])
momentum = kCGMomentumScrollPhaseNone;
- else if ([momentumName isEqualToString:@"begin"])
+ else if ([momentumPhase isEqualToString:@"begin"])
momentum = kCGMomentumScrollPhaseBegin;
- else if ([momentumName isEqualToString:@"continue"])
+ else if ([momentumPhase isEqualToString:@"continue"])
momentum = kCGMomentumScrollPhaseContinue;
- else if ([momentumName isEqualToString:@"end"])
+ else if ([momentumPhase isEqualToString:@"end"])
momentum = kCGMomentumScrollPhaseEnd;
- if (phase == kCGScrollPhaseEnded || phase == kCGScrollPhaseCancelled)
+ // FIXME: Maybe use a valid timestamp: webkit.org/b/232791.
+ [self sendScrollEventAt:lastMousePosition deltaX:x deltaY:y units:kCGScrollEventUnitLine wheelPhase:phase momentumPhase:momentum timestamp:0];
+#endif
+}
+
+#if PLATFORM(MAC)
+- (void)sendScrollEventAt:(NSPoint)mouseLocation deltaX:(double)deltaX deltaY:(double)deltaY units:(CGScrollEventUnit)units wheelPhase:(CGGesturePhase)wheelPhase momentumPhase:(CGMomentumScrollPhase)momentumPhase timestamp:(uint64_t)timestamp
+{
+ if (wheelPhase == kCGGesturePhaseEnded || wheelPhase == kCGGesturePhaseCancelled)
_sentWheelPhaseEndOrCancel = YES;
- if (momentum == kCGMomentumScrollPhaseEnd)
+ if (momentumPhase == kCGMomentumScrollPhaseEnd)
_sentMomentumPhaseEnd = YES;
- auto cgScrollEvent = adoptCF(CGEventCreateScrollWheelEvent2(NULL, kCGScrollEventUnitLine, 2, y, x, 0));
+ constexpr uint32_t wheelCount = 2;
+ // Note that the delta get converted to integral values here. NSEvent has float deltas, CGEvent has integral deltas.
+ auto cgScrollEvent = adoptCF(CGEventCreateScrollWheelEvent2(NULL, units, wheelCount, deltaY, deltaX, 0));
+ CGEventSetTimestamp(cgScrollEvent.get(), timestamp);
// Set the CGEvent location in flipped coords relative to the first screen, which
// compensates for the behavior of +[NSEvent eventWithCGEvent:] when the event has
// no associated window. See <rdar://problem/17180591>.
- CGPoint lastGlobalMousePosition = CGPointMake(lastMousePosition.x, [[[NSScreen screens] objectAtIndex:0] frame].size.height - lastMousePosition.y);
- CGEventSetLocation(cgScrollEvent.get(), lastGlobalMousePosition);
+ CGPoint globalMousePosition = CGPointMake(mouseLocation.x, [[[NSScreen screens] objectAtIndex:0] frame].size.height - mouseLocation.y);
+ CGEventSetLocation(cgScrollEvent.get(), globalMousePosition);
CGEventSetIntegerValueField(cgScrollEvent.get(), kCGScrollWheelEventIsContinuous, 1);
- CGEventSetIntegerValueField(cgScrollEvent.get(), kCGScrollWheelEventScrollPhase, phase);
- CGEventSetIntegerValueField(cgScrollEvent.get(), kCGScrollWheelEventMomentumPhase, momentum);
+ CGEventSetIntegerValueField(cgScrollEvent.get(), kCGScrollWheelEventScrollPhase, wheelPhase);
+ CGEventSetIntegerValueField(cgScrollEvent.get(), kCGScrollWheelEventMomentumPhase, momentumPhase);
NSEvent* scrollEvent = [NSEvent eventWithCGEvent:cgScrollEvent.get()];
@@ -895,8 +906,8 @@
[NSApp _setCurrentEvent:nil];
} else
printf("mouseScrollByX...andMomentumPhases: Unable to locate target view for current mouse location.");
+}
#endif
-}
- (NSArray *)contextClick
{
Modified: trunk/Tools/DumpRenderTree/mac/UIScriptControllerMac.h (285780 => 285781)
--- trunk/Tools/DumpRenderTree/mac/UIScriptControllerMac.h 2021-11-13 21:59:47 UTC (rev 285780)
+++ trunk/Tools/DumpRenderTree/mac/UIScriptControllerMac.h 2021-11-13 23:04:06 UTC (rev 285781)
@@ -52,6 +52,7 @@
void copyText(JSStringRef) override;
void activateDataListSuggestion(unsigned, JSValueRef) override;
void setSpellCheckerResults(JSValueRef) override;
+ void sendEventStream(JSStringRef, JSValueRef) override;
};
}
Modified: trunk/Tools/DumpRenderTree/mac/UIScriptControllerMac.mm (285780 => 285781)
--- trunk/Tools/DumpRenderTree/mac/UIScriptControllerMac.mm 2021-11-13 21:59:47 UTC (rev 285780)
+++ trunk/Tools/DumpRenderTree/mac/UIScriptControllerMac.mm 2021-11-13 23:04:06 UTC (rev 285781)
@@ -29,6 +29,7 @@
#if PLATFORM(MAC)
#import "DumpRenderTree.h"
+#import "EventSendingController.h"
#import "LayoutTestSpellChecker.h"
#import "UIScriptContext.h"
#import <_javascript_Core/JSContext.h>
@@ -37,6 +38,7 @@
#import <_javascript_Core/OpaqueJSString.h>
#import <WebKit/WebPreferences.h>
#import <WebKit/WebViewPrivate.h>
+#import <mach/mach_time.h>
#import <pal/spi/mac/NSTextInputContextSPI.h>
#import <wtf/WorkQueue.h>
@@ -173,6 +175,139 @@
[[LayoutTestSpellChecker checker] setResultsFromJSValue:results inContext:m_context->jsContext()];
}
+static NSString *const TopLevelEventInfoKey = @"events";
+static NSString *const EventTypeKey = @"type";
+static NSString *const ViewRelativeXPositionKey = @"viewX";
+static NSString *const ViewRelativeYPositionKey = @"viewY";
+static NSString *const DeltaXKey = @"deltaX";
+static NSString *const DeltaYKey = @"deltaY";
+static NSString *const PhaseKey = @"phase";
+static NSString *const MomentumPhaseKey = @"momentumPhase";
+
+static CGGesturePhase gesturePhaseFromString(NSString *phaseStr)
+{
+ if ([phaseStr isEqualToString:@"began"])
+ return kCGGesturePhaseBegan;
+
+ if ([phaseStr isEqualToString:@"changed"])
+ return kCGGesturePhaseChanged;
+
+ if ([phaseStr isEqualToString:@"ended"])
+ return kCGGesturePhaseEnded;
+
+ if ([phaseStr isEqualToString:@"cancelled"])
+ return kCGGesturePhaseCancelled;
+
+ if ([phaseStr isEqualToString:@"maybegin"])
+ return kCGGesturePhaseMayBegin;
+
+ return kCGGesturePhaseNone;
}
+static CGMomentumScrollPhase momentumPhaseFromString(NSString *phaseStr)
+{
+ if ([phaseStr isEqualToString:@"began"])
+ return kCGMomentumScrollPhaseBegin;
+
+ if ([phaseStr isEqualToString:@"changed"] || [phaseStr isEqualToString:@"continue"]) // Allow "continue" for ease of conversion from mouseScrollByWithWheelAndMomentumPhases values.
+ return kCGMomentumScrollPhaseContinue;
+
+ if ([phaseStr isEqualToString:@"ended"])
+ return kCGMomentumScrollPhaseEnd;
+
+ return kCGMomentumScrollPhaseNone;
+}
+
+static EventSendingController *eventSenderFromView(WebView *webView)
+{
+ auto frame = [webView mainFrame];
+ auto windowObject = [frame windowObject];
+ return [windowObject valueForKey:@"eventSender"];
+}
+
+void UIScriptControllerMac::sendEventStream(JSStringRef eventsJSON, JSValueRef callback)
+{
+ WebView *webView = [mainFrame webView];
+
+ // didClearWindowObjectInStandardWorldForFrame stashed EventSendingController on this window property.
+ EventSendingController* eventSender = eventSenderFromView(webView);
+ if (!eventSender) {
+ ASSERT_NOT_REACHED();
+ return;
+ }
+
+ unsigned callbackID = m_context->prepareForAsyncTask(callback, CallbackTypeNonPersistent);
+
+ auto jsonString = eventsJSON->string();
+ auto eventInfo = dynamic_objc_cast<NSDictionary>([NSJSONSerialization JSONObjectWithData:[(NSString *)jsonString dataUsingEncoding:NSUTF8StringEncoding] options:NSJSONReadingMutableContainers | NSJSONReadingMutableLeaves error:nil]);
+ if (!eventInfo || ![eventInfo isKindOfClass:[NSDictionary class]]) {
+ WTFLogAlways("JSON is not convertible to a dictionary");
+ return;
+ }
+
+ double currentViewRelativeX = 0;
+ double currentViewRelativeY = 0;
+
+ constexpr uint64_t nanosecondsPerSecond = 1e9;
+ constexpr uint64_t nanosecondsEventInterval = nanosecondsPerSecond / 60;
+
+ auto currentTime = mach_absolute_time();
+
+ for (NSMutableDictionary *event in eventInfo[TopLevelEventInfoKey]) {
+
+ id eventType = event[EventTypeKey];
+ if (!event[EventTypeKey]) {
+ WTFLogAlways("Missing event type");
+ break;
+ }
+
+ if ([eventType isEqualToString:@"wheel"]) {
+ auto phase = kCGGesturePhaseNone;
+ auto momentumPhase = kCGMomentumScrollPhaseNone;
+
+ if (!event[PhaseKey] && !event[MomentumPhaseKey]) {
+ WTFLogAlways("Event must specify phase or momentumPhase");
+ break;
+ }
+
+ if (id phaseString = event[PhaseKey])
+ phase = gesturePhaseFromString(phaseString);
+
+ if (id phaseString = event[MomentumPhaseKey])
+ momentumPhase = momentumPhaseFromString(phaseString);
+
+ ASSERT_IMPLIES(phase == kCGGesturePhaseNone, momentumPhase != kCGMomentumScrollPhaseNone);
+ ASSERT_IMPLIES(momentumPhase == kCGMomentumScrollPhaseNone, phase != kCGGesturePhaseNone);
+
+ if (event[ViewRelativeXPositionKey])
+ currentViewRelativeX = [event[ViewRelativeXPositionKey] floatValue];
+
+ if (event[ViewRelativeYPositionKey])
+ currentViewRelativeY = [event[ViewRelativeYPositionKey] floatValue];
+
+ double deltaX = 0;
+ double deltaY = 0;
+
+ if (event[DeltaXKey])
+ deltaX = [event[DeltaXKey] floatValue];
+
+ if (event[DeltaYKey])
+ deltaY = [event[DeltaYKey] floatValue];
+
+ auto windowPoint = [webView convertPoint:CGPointMake(currentViewRelativeX, [webView frame].size.height - currentViewRelativeY) toView:nil];
+ [eventSender sendScrollEventAt:windowPoint deltaX:deltaX deltaY:deltaY units:kCGScrollEventUnitPixel wheelPhase:phase momentumPhase:momentumPhase timestamp:currentTime];
+ }
+
+ currentTime += nanosecondsEventInterval;
+ }
+
+ WorkQueue::main().dispatch([this, strongThis = Ref { *this }, callbackID] {
+ if (!m_context)
+ return;
+ m_context->asyncTaskComplete(callbackID);
+ });
+}
+
+} // namespace WTR
+
#endif // PLATFORM(MAC)
Modified: trunk/Tools/WebKitTestRunner/mac/UIScriptControllerMac.mm (285780 => 285781)
--- trunk/Tools/WebKitTestRunner/mac/UIScriptControllerMac.mm 2021-11-13 21:59:47 UTC (rev 285780)
+++ trunk/Tools/WebKitTestRunner/mac/UIScriptControllerMac.mm 2021-11-13 23:04:06 UTC (rev 285781)
@@ -308,14 +308,14 @@
[[LayoutTestSpellChecker checker] setResultsFromJSValue:results inContext:m_context->jsContext()];
}
-static NSString* const TopLevelEventInfoKey = @"events";
-static NSString* const EventTypeKey = @"type";
-static NSString* const ViewRelativeXPositionKey = @"viewX";
-static NSString* const ViewRelativeYPositionKey = @"viewY";
-static NSString* const DeltaXKey = @"deltaX";
-static NSString* const DeltaYKey = @"deltaY";
-static NSString* const PhaseKey = @"phase";
-static NSString* const MomentumPhaseKey = @"momentumPhase";
+static NSString *const TopLevelEventInfoKey = @"events";
+static NSString *const EventTypeKey = @"type";
+static NSString *const ViewRelativeXPositionKey = @"viewX";
+static NSString *const ViewRelativeYPositionKey = @"viewY";
+static NSString *const DeltaXKey = @"deltaX";
+static NSString *const DeltaYKey = @"deltaY";
+static NSString *const PhaseKey = @"phase";
+static NSString *const MomentumPhaseKey = @"momentumPhase";
static EventSenderProxy::WheelEventPhase eventPhaseFromString(NSString *phaseStr)
{
