Title: [124590] trunk
Revision
124590
Author
[email protected]
Date
2012-08-03 03:25:20 -0700 (Fri, 03 Aug 2012)

Log Message

Web Inspector: Incorrect blob url href when inspecting
https://bugs.webkit.org/show_bug.cgi?id=93076

Reviewed by Vsevolod Vlasov.

Source/WebCore:

Special-cased the "blob" scheme to return the original URL intact on completion.

* inspector/front-end/ResourceUtils.js:
(WebInspector.completeURL):

LayoutTests:

* inspector/styles/styles-url-linkify-expected.txt:
* inspector/styles/styles-url-linkify.html:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (124589 => 124590)


--- trunk/LayoutTests/ChangeLog	2012-08-03 10:18:31 UTC (rev 124589)
+++ trunk/LayoutTests/ChangeLog	2012-08-03 10:25:20 UTC (rev 124590)
@@ -1,3 +1,13 @@
+2012-08-03  Alexander Pavlov  <[email protected]>
+
+        Web Inspector: Incorrect blob url href when inspecting
+        https://bugs.webkit.org/show_bug.cgi?id=93076
+
+        Reviewed by Vsevolod Vlasov.
+
+        * inspector/styles/styles-url-linkify-expected.txt:
+        * inspector/styles/styles-url-linkify.html:
+
 2012-08-03  Sergio Carlos Morales Angeles  <[email protected]>
 
         Delete text from password does nothing.

Modified: trunk/LayoutTests/inspector/styles/styles-url-linkify-expected.txt (124589 => 124590)


--- trunk/LayoutTests/inspector/styles/styles-url-linkify-expected.txt	2012-08-03 10:18:31 UTC (rev 124589)
+++ trunk/LayoutTests/inspector/styles/styles-url-linkify-expected.txt	2012-08-03 10:25:20 UTC (rev 124590)
@@ -21,6 +21,8 @@
 data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEIAAABCAgMAAACeOuh7AAAABGdBTUEAAK/INwWK6QAAAAlQTFRF////AAAA////fu+PTwAAAAF0Uk5TAEDm2GYAAACHSURBVDjLxdLbDYAgDAVQGELn0R3oEHYf2KGdUqtE46OFRCP3oyTng1xCnWsaD5JRRtCkQ2YmkBkHRXqWJBn0j0TICbrsWVoWhRShCdcGyZCtHxMaUnVPRZ9KSbmBJdsX2vJVnwqRD0Rb4rpzgIbE/AI5NTnWAMvy5l0dXrfuLh5OCe5BmmYGXhTUxlQ5xJ8AAAAASUVORK5CYII=
 _javascript_:alert('foo');
 null
+blob:http%3A//example.com/f91b7b00-00-0000-0000-3b7c87055d7a
+blob:http%3A//example.com/f91b7b00-00-0000-0000-3b7c87055d7a
 Link for a URI from CSS document:
 webkit-html-resource-link inspector/styles/resources/fromcss.png
 Link for a URI from iframe inline stylesheet:

Modified: trunk/LayoutTests/inspector/styles/styles-url-linkify.html (124589 => 124590)


--- trunk/LayoutTests/inspector/styles/styles-url-linkify.html	2012-08-03 10:18:31 UTC (rev 124589)
+++ trunk/LayoutTests/inspector/styles/styles-url-linkify.html	2012-08-03 10:25:20 UTC (rev 124590)
@@ -32,9 +32,12 @@
     completeURL("http://example.com/foo#anchor", "cat.jpeg");
 
     const dataURL = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEIAAABCAgMAAACeOuh7AAAABGdBTUEAAK/INwWK6QAAAAlQTFRF////AAAA////fu+PTwAAAAF0Uk5TAEDm2GYAAACHSURBVDjLxdLbDYAgDAVQGELn0R3oEHYf2KGdUqtE46OFRCP3oyTng1xCnWsaD5JRRtCkQ2YmkBkHRXqWJBn0j0TICbrsWVoWhRShCdcGyZCtHxMaUnVPRZ9KSbmBJdsX2vJVnwqRD0Rb4rpzgIbE/AI5NTnWAMvy5l0dXrfuLh5OCe5BmmYGXhTUxlQ5xJ8AAAAASUVORK5CYII=";
+    const blobURL = "blob:http%3A//example.com/f91b7b00-00-0000-0000-3b7c87055d7a";
     completeURL("https://example.com/foo", dataURL);
     completeURL("http://example.com/foo", "_javascript_:alert('foo');");
     InspectorTest.addResult(WebInspector.resourceURLForRelatedNode(null, " _javascript_:alert('foo'); "));
+    completeURL("http://example.com/foo", blobURL);
+    InspectorTest.addResult(WebInspector.resourceURLForRelatedNode(null, blobURL));
 
     function dumpHref(dumpLinkClass)
     {

Modified: trunk/Source/WebCore/ChangeLog (124589 => 124590)


--- trunk/Source/WebCore/ChangeLog	2012-08-03 10:18:31 UTC (rev 124589)
+++ trunk/Source/WebCore/ChangeLog	2012-08-03 10:25:20 UTC (rev 124590)
@@ -1,3 +1,15 @@
+2012-08-03  Alexander Pavlov  <[email protected]>
+
+        Web Inspector: Incorrect blob url href when inspecting
+        https://bugs.webkit.org/show_bug.cgi?id=93076
+
+        Reviewed by Vsevolod Vlasov.
+
+        Special-cased the "blob" scheme to return the original URL intact on completion.
+
+        * inspector/front-end/ResourceUtils.js:
+        (WebInspector.completeURL):
+
 2012-08-03  Yury Semikhatsky  <[email protected]>
 
         Web Inspector: add CSSRule memory instrumentation

Modified: trunk/Source/WebCore/inspector/front-end/ResourceUtils.js (124589 => 124590)


--- trunk/Source/WebCore/inspector/front-end/ResourceUtils.js	2012-08-03 10:18:31 UTC (rev 124589)
+++ trunk/Source/WebCore/inspector/front-end/ResourceUtils.js	2012-08-03 10:25:20 UTC (rev 124590)
@@ -378,7 +378,7 @@
 
         // Return special URLs as-is.
         var trimmedHref = href.trim();
-        if (trimmedHref.startsWith("data:") || trimmedHref.startsWith("_javascript_:"))
+        if (trimmedHref.startsWith("data:") || trimmedHref.startsWith("_javascript_:") || trimmedHref.startsWith("blob:"))
             return href;
     }
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to