Title: [208795] trunk
Revision
208795
Author
[email protected]
Date
2016-11-16 10:00:03 -0800 (Wed, 16 Nov 2016)

Log Message

Unreviewed, rolling out r208770.

The test added with this change is timing out on mac-wk1.

Reverted changeset:

"UIScriptController: script with no async tasks fails if an
earlier script registered a callback"
https://bugs.webkit.org/show_bug.cgi?id=164762
http://trac.webkit.org/changeset/208770

Modified Paths

Removed Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (208794 => 208795)


--- trunk/LayoutTests/ChangeLog	2016-11-16 17:29:42 UTC (rev 208794)
+++ trunk/LayoutTests/ChangeLog	2016-11-16 18:00:03 UTC (rev 208795)
@@ -1,3 +1,16 @@
+2016-11-16  Ryan Haddad  <[email protected]>
+
+        Unreviewed, rolling out r208770.
+
+        The test added with this change is timing out on mac-wk1.
+
+        Reverted changeset:
+
+        "UIScriptController: script with no async tasks fails if an
+        earlier script registered a callback"
+        https://bugs.webkit.org/show_bug.cgi?id=164762
+        http://trac.webkit.org/changeset/208770
+
 2016-11-16  Simon Fraser  <[email protected]>
 
         Fix typo in bug url.

Deleted: trunk/LayoutTests/fast/harness/ui-side-script-with-callback-expected.txt (208794 => 208795)


--- trunk/LayoutTests/fast/harness/ui-side-script-with-callback-expected.txt	2016-11-16 17:29:42 UTC (rev 208794)
+++ trunk/LayoutTests/fast/harness/ui-side-script-with-callback-expected.txt	2016-11-16 18:00:03 UTC (rev 208795)
@@ -1,11 +0,0 @@
-Test that a second immediate UI script returns if an earlier script registered a callback
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS scriptResult is "async task complete"
-PASS scriptResult is "immediate script complete"
-PASS successfullyParsed is true
-
-TEST COMPLETE
-

Deleted: trunk/LayoutTests/fast/harness/ui-side-script-with-callback.html (208794 => 208795)


--- trunk/LayoutTests/fast/harness/ui-side-script-with-callback.html	2016-11-16 17:29:42 UTC (rev 208794)
+++ trunk/LayoutTests/fast/harness/ui-side-script-with-callback.html	2016-11-16 18:00:03 UTC (rev 208795)
@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
-    <script src=""
-    <script>
-        
-        var jsTestIsAsync = true;
-        
-        function getAsyncTaskScript()
-        {
-            return `(function() {
-                uiController.willBeginZoomingCallback = function() {};
-
-                uiController.doAsyncTask(function() {
-                    uiController.uiScriptComplete('async task complete');
-                });
-            })();`;
-        }
-
-        function getImmediateScript()
-        {
-            return `(function() {
-                return 'immediate script complete';
-            })();`;
-        }
-    
-        var scriptResult;
-        function runTest()
-        {
-            description('Test that a second immediate UI script returns if an earlier script registered a callback');
-
-            if (!window.testRunner) {
-                debug('This test requires testRunner');
-                return;
-            }
-
-            if (!testRunner.runUIScript) {
-                debug('This test requires runUIScript');
-                return;
-            }
-
-            testRunner.runUIScript(getAsyncTaskScript(), function(result) {
-                scriptResult = result;
-                shouldBeEqualToString('scriptResult', 'async task complete');
-
-                testRunner.runUIScript(getImmediateScript(), function(result) {
-                    scriptResult = result;
-                    shouldBeEqualToString('scriptResult', 'immediate script complete');
-                    finishJSTest();
-                });
-            });
-        }
-        window.addEventListener('load', runTest, false);
-    </script>
-</head>
-<body>
-
-<pre id="results"></pre>
-<script src=""
-</body>
-</html>

Modified: trunk/Tools/ChangeLog (208794 => 208795)


--- trunk/Tools/ChangeLog	2016-11-16 17:29:42 UTC (rev 208794)
+++ trunk/Tools/ChangeLog	2016-11-16 18:00:03 UTC (rev 208795)
@@ -1,3 +1,16 @@
+2016-11-16  Ryan Haddad  <[email protected]>
+
+        Unreviewed, rolling out r208770.
+
+        The test added with this change is timing out on mac-wk1.
+
+        Reverted changeset:
+
+        "UIScriptController: script with no async tasks fails if an
+        earlier script registered a callback"
+        https://bugs.webkit.org/show_bug.cgi?id=164762
+        http://trac.webkit.org/changeset/208770
+
 2016-11-16  Per Arne Vollan  <[email protected]>
 
         [Win] WebCore test is failing.

Modified: trunk/Tools/TestRunnerShared/UIScriptContext/UIScriptContext.cpp (208794 => 208795)


--- trunk/Tools/TestRunnerShared/UIScriptContext/UIScriptContext.cpp	2016-11-16 17:29:42 UTC (rev 208794)
+++ trunk/Tools/TestRunnerShared/UIScriptContext/UIScriptContext.cpp	2016-11-16 18:00:03 UTC (rev 208795)
@@ -172,12 +172,6 @@
     String scriptResult(JSStringGetCharactersPtr(result), JSStringGetLength(result));
 
     m_delegate.uiScriptDidComplete(scriptResult, m_currentScriptCallbackID);
-    
-    // Unregister tasks associated with this callback
-    m_callbacks.removeIf([&](auto& keyAndValue) {
-        return keyAndValue.value.parentScriptCallbackID == m_currentScriptCallbackID;
-    });
-    
     m_currentScriptCallbackID = 0;
     if (result)
         JSStringRelease(result);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to