Changeset 208795 in webkit

Timestamp:

Nov 16, 2016 10:00:03 AM (7 years ago)

Author:

Ryan Haddad

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

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/harness/ui-side-script-with-callback-expected.txt (deleted)
• LayoutTests/fast/harness/ui-side-script-with-callback.html (deleted)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestRunnerShared/UIScriptContext/UIScriptContext.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-11-16  Ryan Haddad  <ryanhaddad@apple.com>
+
+        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  <simon.fraser@apple.com>
 

trunk/Tools/ChangeLog

@@ +1 @@
+2016-11-16  Ryan Haddad  <ryanhaddad@apple.com>
+
+        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  <pvollan@apple.com>
 

trunk/Tools/TestRunnerShared/UIScriptContext/UIScriptContext.cpp

@@ -173 +173 @@
 
     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)