[webkit-changes] [89931] trunk

Tue, 28 Jun 2011 08:24:32 -0700

Title: [89931] trunk
Revision
89931
Author
[email protected]
Date
2011-06-28 08:24:19 -0700 (Tue, 28 Jun 2011)

Log Message

2011-06-24  Vsevolod Vlasov  <[email protected]>

        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:

Modified Paths

Removed Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (89930 => 89931)


--- trunk/LayoutTests/ChangeLog	2011-06-28 15:15:01 UTC (rev 89930)
+++ trunk/LayoutTests/ChangeLog	2011-06-28 15:24:19 UTC (rev 89931)
@@ -1,3 +1,14 @@
+2011-06-28  Vsevolod Vlasov  <[email protected]>
+
+        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  <[email protected]>
 
         Fix the test added by the previous commit. Also add it to the WebKit2's skipped list

Modified: trunk/LayoutTests/http/tests/inspector/extensions-resources-redirect-expected.txt (89930 => 89931)


--- trunk/LayoutTests/http/tests/inspector/extensions-resources-redirect-expected.txt	2011-06-28 15:15:01 UTC (rev 89930)
+++ trunk/LayoutTests/http/tests/inspector/extensions-resources-redirect-expected.txt	2011-06-28 15:24:19 UTC (rev 89931)
@@ -4,7 +4,7 @@
 Started extension.
 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
 Finished resource: http://127.0.0.1:8000/loading/resources/redirect-methods-result.php?redirected=true

Deleted: trunk/LayoutTests/platform/mac/http/tests/inspector/extensions-resources-redirect-expected.txt (89930 => 89931)


--- trunk/LayoutTests/platform/mac/http/tests/inspector/extensions-resources-redirect-expected.txt	2011-06-28 15:15:01 UTC (rev 89930)
+++ trunk/LayoutTests/platform/mac/http/tests/inspector/extensions-resources-redirect-expected.txt	2011-06-28 15:24:19 UTC (rev 89931)
@@ -1,22 +0,0 @@
-Tests WebInspector extension API
-
-Page reloaded.
-Started extension.
-Running tests...
-RUNNING TEST: extension_testGetRedirectResourceContent
-content: null, encoding: 
-RUNNING TEST: extension_testRedirectResourceFinished
-Finished resource: http://127.0.0.1:8000/loading/resources/redirect-methods-result.php?status=302
-Finished resource: http://127.0.0.1:8000/loading/resources/redirect-methods-result.php?redirected=true
-RUNNING TEST: extension_testRedirectResourcesInHAR
-Resources in HAR:
-http://127.0.0.1:8000/inspector/extensions-resources-redirect.html
-http://127.0.0.1:8000/inspector/extensions-resources-test.js
-http://127.0.0.1:8000/inspector/extensions-test.js
-http://127.0.0.1:8000/inspector/inspector-test.js
-http://127.0.0.1:8000/loading/resources/redirect-methods-result.php?redirected=true
-http://127.0.0.1:8000/loading/resources/redirect-methods-result.php?redirected=true
-http://127.0.0.1:8000/loading/resources/redirect-methods-result.php?status=302
-http://127.0.0.1:8000/loading/resources/redirect-methods-result.php?status=302
-All tests done.
-

Modified: trunk/LayoutTests/platform/qt/Skipped (89930 => 89931)


--- trunk/LayoutTests/platform/qt/Skipped	2011-06-28 15:15:01 UTC (rev 89930)
+++ trunk/LayoutTests/platform/qt/Skipped	2011-06-28 15:24:19 UTC (rev 89931)
@@ -2569,10 +2569,6 @@
 # https://bugs.webkit.org/show_bug.cgi?id=62847
 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
 inspector/debugger/source-frame.html

Modified: trunk/Source/WebCore/inspector/front-end/NetworkManager.js (89930 => 89931)


--- trunk/Source/WebCore/inspector/front-end/NetworkManager.js	2011-06-28 15:15:01 UTC (rev 89930)
+++ trunk/Source/WebCore/inspector/front-end/NetworkManager.js	2011-06-28 15:24:19 UTC (rev 89931)
@@ -46,7 +46,10 @@
     {
         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) 
         // from ResourceRevision (ResourcesPanel/ScriptsPanel resource) and request content accordingly.

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to