Changeset 89931 in webkit

Timestamp:

Jun 28, 2011 8:24:19 AM (13 years ago)

Author:

caseq@chromium.org

Message:

2011-06-24 Vsevolod Vlasov <​vsevik@chromium.org>

Reviewed by Pavel Feldman.

REGRESSION (r89449): http/tests/inspector/extensions-resources-redirect.html failing on SnowLeopard Intel Release (Tests), Windows 7 Release (Tests), Qt
​https://bugs.webkit.org/show_bug.cgi?id=63178

• http/tests/inspector/extensions-resources-redirect-expected.txt:
• platform/mac/http/tests/inspector/extensions-resources-redirect-expected.txt: Removed.
• platform/qt/Skipped:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/inspector/extensions-resources-redirect-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/http/tests/inspector/extensions-resources-redirect-expected.txt (deleted)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• Source/WebCore/inspector/front-end/NetworkManager.js (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-06-28  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        REGRESSION (r89449): http/tests/inspector/extensions-resources-redirect.html failing on SnowLeopard Intel Release (Tests), Windows 7 Release (Tests), Qt
+        https://bugs.webkit.org/show_bug.cgi?id=63178
+
+        * http/tests/inspector/extensions-resources-redirect-expected.txt:
+        * platform/mac/http/tests/inspector/extensions-resources-redirect-expected.txt: Removed.
+        * platform/qt/Skipped:
+
 2011-06-28  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/LayoutTests/http/tests/inspector/extensions-resources-redirect-expected.txt

@@ -5 +5 @@
 Running tests...
 RUNNING TEST: extension_testGetRedirectResourceContent
-content: null, encoding: base64
+content: null, encoding: 
 RUNNING TEST: extension_testRedirectResourceFinished
 Finished resource: http://127.0.0.1:8000/loading/resources/redirect-methods-result.php?status=302

trunk/LayoutTests/platform/qt/Skipped

@@ -2570 +2570 @@
 fast/parser/xhtml-innerhtml-null-byte.xhtml
 
-# REGRESSION (r89449): http/tests/inspector/extensions-resources-redirect.html failing on SnowLeopard Intel Release (Tests), Windows 7 Release (Tests), Qt
-# https://bugs.webkit.org/show_bug.cgi?id=63178
-http/tests/inspector/extensions-resources-redirect.html
-
 # new failing inspector tests
 inspector/console/console-trace-in-eval.html

trunk/Source/WebCore/inspector/front-end/NetworkManager.js

@@ -47 +47 @@
         function callbackWrapper(error, content, contentEncoded)
         {
-            callback(!error ? content : null, contentEncoded);
+            if (error)
+                callback(null, false);
+            else
+                callback(content, content && contentEncoded);
         }
         // FIXME: https://bugs.webkit.org/show_bug.cgi?id=61363 We should separate NetworkResource (NetworkPanel resource)