Title: [231807] trunk
- Revision
- 231807
- Author
- [email protected]
- Date
- 2018-05-15 10:20:40 -0700 (Tue, 15 May 2018)
Log Message
Unreviewed, rolling out r231763.
The test added with this change is failing an assertion.
Reverted changeset:
"NSEvent event trackers don't work from WebKitTestRunner"
https://bugs.webkit.org/show_bug.cgi?id=185383
https://trac.webkit.org/changeset/231763
Modified Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (231806 => 231807)
--- trunk/LayoutTests/ChangeLog 2018-05-15 16:44:58 UTC (rev 231806)
+++ trunk/LayoutTests/ChangeLog 2018-05-15 17:20:40 UTC (rev 231807)
@@ -1,3 +1,15 @@
+2018-05-15 Ryan Haddad <[email protected]>
+
+ Unreviewed, rolling out r231763.
+
+ The test added with this change is failing an assertion.
+
+ Reverted changeset:
+
+ "NSEvent event trackers don't work from WebKitTestRunner"
+ https://bugs.webkit.org/show_bug.cgi?id=185383
+ https://trac.webkit.org/changeset/231763
+
2018-05-15 Aditya Keerthi <[email protected]>
Add test to verify behavior of -webkit-text-fill-color when inherited.
Deleted: trunk/LayoutTests/swipe/wheel-event-initiated-back-navigation-expected.txt (231806 => 231807)
--- trunk/LayoutTests/swipe/wheel-event-initiated-back-navigation-expected.txt 2018-05-15 16:44:58 UTC (rev 231806)
+++ trunk/LayoutTests/swipe/wheel-event-initiated-back-navigation-expected.txt 2018-05-15 17:20:40 UTC (rev 231807)
@@ -1,5 +0,0 @@
-This is a swipe navigation test.
-
-PASS: mouseWheel caused navigation
-PASS: navigated back to page1
-
Deleted: trunk/LayoutTests/swipe/wheel-event-initiated-back-navigation.html (231806 => 231807)
--- trunk/LayoutTests/swipe/wheel-event-initiated-back-navigation.html 2018-05-15 16:44:58 UTC (rev 231806)
+++ trunk/LayoutTests/swipe/wheel-event-initiated-back-navigation.html 2018-05-15 17:20:40 UTC (rev 231807)
@@ -1,68 +0,0 @@
-<html>
-<head>
-<script>
-
-function logResult(s) {
- document.getElementById('result').textContent += s + "\n";
-}
-
-function backSwipe()
-{
- var divTarget = document.getElementById('content');
- var documentBounds = divTarget.getBoundingClientRect();
-
- eventSender.mouseMoveTo(documentBounds.left + 10, documentBounds.top + 10);
- eventSender.mouseScrollByWithWheelAndMomentumPhases(100, 0, 'began', 'none');
- eventSender.mouseScrollByWithWheelAndMomentumPhases(100, 0, 'changed', 'none');
- eventSender.mouseScrollByWithWheelAndMomentumPhases(100, 0, 'changed', 'none');
- eventSender.mouseScrollByWithWheelAndMomentumPhases(100, 0, 'ended', 'none');
-}
-
-function startTest()
-{
- if (!window.eventSender) {
- logResult('This test must be run in DumpRenderTree/WebKitTestRunner (no eventSender)');
- return;
- }
-
- if (!window.testRunner) {
- logResult('This test must be run in DumpRenderTree/WebKitTestRunner (no testRunner)');
- return;
- }
-
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
- testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
- testRunner.setNavigationGesturesEnabled(true);
-
- window._onpopstate_ = function(event) {
- logResult('PASS: mouseWheel caused navigation');
- if (event.state.name == "page1") {
- logResult('PASS: navigated back to ' + event.state.name);
- } else {
- logResult('FAILED: navigated back to ' + event.state.name);
- }
- testRunner.notifyDone();
- };
-
- var stateObj = { name: "page1" };
- history.replaceState(stateObj, "page1", "");
-
- var stateObj = { name: "page2" };
- history.pushState(stateObj, "page2", "");
-
- backSwipe();
-}
-
-window.addEventListener('load', startTest, false);
-
-</script>
-</head>
-<body id="content">
-
-<h1>This is a swipe navigation test.</h1>
-
-<pre id="result"></pre>
-
-</body>
-</html>
\ No newline at end of file
Modified: trunk/Tools/ChangeLog (231806 => 231807)
--- trunk/Tools/ChangeLog 2018-05-15 16:44:58 UTC (rev 231806)
+++ trunk/Tools/ChangeLog 2018-05-15 17:20:40 UTC (rev 231807)
@@ -1,3 +1,15 @@
+2018-05-15 Ryan Haddad <[email protected]>
+
+ Unreviewed, rolling out r231763.
+
+ The test added with this change is failing an assertion.
+
+ Reverted changeset:
+
+ "NSEvent event trackers don't work from WebKitTestRunner"
+ https://bugs.webkit.org/show_bug.cgi?id=185383
+ https://trac.webkit.org/changeset/231763
+
2018-05-15 David Kilzer <[email protected]>
TestWebKitAPI: Fix warnings found by new clang compiler
Modified: trunk/Tools/WebKitTestRunner/mac/EventSenderProxy.mm (231806 => 231807)
--- trunk/Tools/WebKitTestRunner/mac/EventSenderProxy.mm 2018-05-15 16:44:58 UTC (rev 231806)
+++ trunk/Tools/WebKitTestRunner/mac/EventSenderProxy.mm 2018-05-15 17:20:40 UTC (rev 231807)
@@ -43,7 +43,6 @@
@end
@interface NSEvent (ForTestRunner)
-+ (NSEvent *)_sendEventToObservers:(NSEvent *)event;
- (void)_postDelayed;
@end
@@ -877,7 +876,6 @@
// Our event should have the correct settings:
if (NSView *targetView = [m_testController->mainWebView()->platformView() hitTest:[event locationInWindow]]) {
[NSApp _setCurrentEvent:event];
- event = [NSEvent _sendEventToObservers:event];
[targetView scrollWheel:event];
[NSApp _setCurrentEvent:nil];
} else {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
