Skip to content

Commit 3648c99

Browse files
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 git-svn-id: http://svn.webkit.org/repository/webkit/trunk@208795 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 7cf2fa1 commit 3648c99

File tree

5 files changed

+26
-79
lines changed

5 files changed

+26
-79
lines changed

LayoutTests/ChangeLog

+13
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
2016-11-16 Ryan Haddad <[email protected]>
2+
3+
Unreviewed, rolling out r208770.
4+
5+
The test added with this change is timing out on mac-wk1.
6+
7+
Reverted changeset:
8+
9+
"UIScriptController: script with no async tasks fails if an
10+
earlier script registered a callback"
11+
https://bugs.webkit.org/show_bug.cgi?id=164762
12+
http://trac.webkit.org/changeset/208770
13+
114
2016-11-16 Simon Fraser <[email protected]>
215

316
Fix typo in bug url.

LayoutTests/fast/harness/ui-side-script-with-callback-expected.txt

-11
This file was deleted.

LayoutTests/fast/harness/ui-side-script-with-callback.html

-62
This file was deleted.

Tools/ChangeLog

+13
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
2016-11-16 Ryan Haddad <[email protected]>
2+
3+
Unreviewed, rolling out r208770.
4+
5+
The test added with this change is timing out on mac-wk1.
6+
7+
Reverted changeset:
8+
9+
"UIScriptController: script with no async tasks fails if an
10+
earlier script registered a callback"
11+
https://bugs.webkit.org/show_bug.cgi?id=164762
12+
http://trac.webkit.org/changeset/208770
13+
114
2016-11-16 Per Arne Vollan <[email protected]>
215

316
[Win] WebCore test is failing.

Tools/TestRunnerShared/UIScriptContext/UIScriptContext.cpp

-6
Original file line numberDiff line numberDiff line change
@@ -172,12 +172,6 @@ void UIScriptContext::tryToCompleteUIScriptForCurrentParentCallback()
172172
String scriptResult(JSStringGetCharactersPtr(result), JSStringGetLength(result));
173173

174174
m_delegate.uiScriptDidComplete(scriptResult, m_currentScriptCallbackID);
175-
176-
// Unregister tasks associated with this callback
177-
m_callbacks.removeIf([&](auto& keyAndValue) {
178-
return keyAndValue.value.parentScriptCallbackID == m_currentScriptCallbackID;
179-
});
180-
181175
m_currentScriptCallbackID = 0;
182176
if (result)
183177
JSStringRelease(result);

0 commit comments

Comments
 (0)