[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
pfeldman at chromium.org
pfeldman at chromium.org
Sun Feb 20 23:15:48 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 27332287658dc55379028976ca7dd44b74846459
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jan 19 13:55:35 2011 +0000
2011-01-19 Pavel Feldman <pfeldman at chromium.org>
Not reviewed: fixed flaky inspector test.
* http/tests/inspector/extensions-resources-redirect.html:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76118 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f8a4d7a..91df52a 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-19 Pavel Feldman <pfeldman at chromium.org>
+
+ Not reviewed: fixed flaky inspector test.
+
+ * http/tests/inspector/extensions-resources-redirect.html:
+
2011-01-19 Mikhail Naganov <mnaganov at chromium.org>
Revert r76114 -- added test fails on Chromium canaries.
diff --git a/LayoutTests/http/tests/inspector/extensions-resources-redirect.html b/LayoutTests/http/tests/inspector/extensions-resources-redirect.html
index 8e831f1..399d7fc 100755
--- a/LayoutTests/http/tests/inspector/extensions-resources-redirect.html
+++ b/LayoutTests/http/tests/inspector/extensions-resources-redirect.html
@@ -7,10 +7,14 @@
function extension_doRequest(callback)
{
+ var userCallbackCalled = false;
function callbackWrapper()
{
- webInspector.resources.onFinished.removeListener(callbackWrapper);
- callback();
+ if (!userCallbackCalled) {
+ userCallbackCalled = true;
+ webInspector.resources.onFinished.removeListener(callbackWrapper);
+ callback();
+ }
}
webInspector.resources.onFinished.addListener(callbackWrapper);
webInspector.inspectedWindow.eval("doRequest()", function(result) {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list