Title: [90567] trunk
Revision
90567
Author
vse...@chromium.org
Date
2011-07-07 09:53:51 -0700 (Thu, 07 Jul 2011)

Log Message

2011-07-07  Vsevolod Vlasov  <vse...@chromium.org>

        Web Inspector: URL links in styles open new tab instead of showing resources panel.
        https://bugs.webkit.org/show_bug.cgi?id=64090

        Reviewed by Pavel Feldman.

        * inspector/styles/styles-url-linkify-expected.txt:
        * inspector/styles/styles-url-linkify.html:
2011-07-07  Vsevolod Vlasov  <vse...@chromium.org>

        Web Inspector: URL links in styles open new tab instead of showing resources panel.
        https://bugs.webkit.org/show_bug.cgi?id=64090

        Reviewed by Pavel Feldman.

        * inspector/front-end/StylesSidebarPane.js:
        (WebInspector.StylePropertyTreeElement.prototype.updateTitle.linkifyURL):

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (90566 => 90567)


--- trunk/LayoutTests/ChangeLog	2011-07-07 16:52:27 UTC (rev 90566)
+++ trunk/LayoutTests/ChangeLog	2011-07-07 16:53:51 UTC (rev 90567)
@@ -1,3 +1,13 @@
+2011-07-07  Vsevolod Vlasov  <vse...@chromium.org>
+
+        Web Inspector: URL links in styles open new tab instead of showing resources panel.
+        https://bugs.webkit.org/show_bug.cgi?id=64090
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/styles/styles-url-linkify-expected.txt:
+        * inspector/styles/styles-url-linkify.html:
+
 2011-07-07  Andras Becsi  <abe...@webkit.org>
 
         REGRESSION(90557) http/tests/inspector/network/network-embed.html fails

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


--- trunk/LayoutTests/inspector/styles/styles-url-linkify-expected.txt	2011-07-07 16:52:27 UTC (rev 90566)
+++ trunk/LayoutTests/inspector/styles/styles-url-linkify-expected.txt	2011-07-07 16:53:51 UTC (rev 90567)
@@ -14,7 +14,7 @@
 http://example.com/foo?a=b
 data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEIAAABCAgMAAACeOuh7AAAABGdBTUEAAK/INwWK6QAAAAlQTFRF////AAAA////fu+PTwAAAAF0Uk5TAEDm2GYAAACHSURBVDjLxdLbDYAgDAVQGELn0R3oEHYf2KGdUqtE46OFRCP3oyTng1xCnWsaD5JRRtCkQ2YmkBkHRXqWJBn0j0TICbrsWVoWhRShCdcGyZCtHxMaUnVPRZ9KSbmBJdsX2vJVnwqRD0Rb4rpzgIbE/AI5NTnWAMvy5l0dXrfuLh5OCe5BmmYGXhTUxlQ5xJ8AAAAASUVORK5CYII=
 Link for a URI from CSS document:
-inspector/styles/resources/fromcss.png
+webkit-html-resource-link inspector/styles/resources/fromcss.png
 Link for a URI from iframe inline stylesheet:
 inspector/styles/resources/iframed.png
 

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


--- trunk/LayoutTests/inspector/styles/styles-url-linkify.html	2011-07-07 16:52:27 UTC (rev 90566)
+++ trunk/LayoutTests/inspector/styles/styles-url-linkify.html	2011-07-07 16:53:51 UTC (rev 90567)
@@ -28,25 +28,36 @@
     const dataURL = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEIAAABCAgMAAACeOuh7AAAABGdBTUEAAK/INwWK6QAAAAlQTFRF////AAAA////fu+PTwAAAAF0Uk5TAEDm2GYAAACHSURBVDjLxdLbDYAgDAVQGELn0R3oEHYf2KGdUqtE46OFRCP3oyTng1xCnWsaD5JRRtCkQ2YmkBkHRXqWJBn0j0TICbrsWVoWhRShCdcGyZCtHxMaUnVPRZ9KSbmBJdsX2vJVnwqRD0Rb4rpzgIbE/AI5NTnWAMvy5l0dXrfuLh5OCe5BmmYGXhTUxlQ5xJ8AAAAASUVORK5CYII=";
     completeURL("https://example.com/foo", dataURL);
 
-    function dumpHref()
+    function dumpHref(dumpLinkClass)
     {
-        var href;
+        var hrefNode;
         var valueChildNodes = WebInspector.panels.elements.sidebarPanes.styles.sections[0][2].propertiesTreeOutline.children[0].valueElement.childNodes;
         for (var i = 0; i < valueChildNodes.length; ++i) {
             if (valueChildNodes[i].href) {
-                href = ""
+                hrefNode = valueChildNodes[i];
                 break;
             }
         }
-        if (!href) {
+        if (!hrefNode) {
             InspectorTest.addResult("href property not found");
             return;
         }
+
+        var styleClass = "";
+        if (dumpLinkClass) {
+            if (hrefNode.hasStyleClass("webkit-html-resource-link"))
+                styleClass += "webkit-html-resource-link ";
+            if (hrefNode.hasStyleClass("webkit-html-external-link"))
+                styleClass += "webkit-html-external-link ";
+        }
+
+        var href = ""
         var segments = href.split("/");
         var output = [];
         for (var i = segments.length - 1, minSegment = i - 3; i >= 0 && i >= minSegment; --i)
             output.unshift(segments[i]);
-        InspectorTest.addResult(output.join("/"));
+
+        InspectorTest.addResult(styleClass + output.join("/"));
     }
 
     InspectorTest.selectNodeAndWaitForStyles("local", step1);
@@ -54,7 +65,7 @@
     function step1()
     {
         InspectorTest.addResult("Link for a URI from CSS document:");
-        dumpHref();
+        dumpHref(true);
         InspectorTest.selectNodeAndWaitForStyles("iframed", step2);
     }
 

Modified: trunk/Source/WebCore/ChangeLog (90566 => 90567)


--- trunk/Source/WebCore/ChangeLog	2011-07-07 16:52:27 UTC (rev 90566)
+++ trunk/Source/WebCore/ChangeLog	2011-07-07 16:53:51 UTC (rev 90567)
@@ -1,3 +1,13 @@
+2011-07-07  Vsevolod Vlasov  <vse...@chromium.org>
+
+        Web Inspector: URL links in styles open new tab instead of showing resources panel.
+        https://bugs.webkit.org/show_bug.cgi?id=64090
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/front-end/StylesSidebarPane.js:
+        (WebInspector.StylePropertyTreeElement.prototype.updateTitle.linkifyURL):
+
 2011-07-07  Andrey Kosyakov  <ca...@chromium.org>
 
         Web Inspector: active panel does not receive resize event when drawer is resized

Modified: trunk/Source/WebCore/inspector/front-end/StylesSidebarPane.js (90566 => 90567)


--- trunk/Source/WebCore/inspector/front-end/StylesSidebarPane.js	2011-07-07 16:52:27 UTC (rev 90566)
+++ trunk/Source/WebCore/inspector/front-end/StylesSidebarPane.js	2011-07-07 16:53:51 UTC (rev 90567)
@@ -1448,7 +1448,7 @@
                     hrefUrl = WebInspector.resourceURLForRelatedNode(WebInspector.panels.elements.focusedDOMNode, hrefUrl);
                 var hasResource = !!WebInspector.resourceForURL(hrefUrl);
                 // FIXME: WebInspector.linkifyURLAsNode() should really use baseURI.
-                container.appendChild(WebInspector.linkifyURLAsNode(hrefUrl, url, null, hasResource));
+                container.appendChild(WebInspector.linkifyURLAsNode(hrefUrl, url, null, !hasResource));
                 container.appendChild(document.createTextNode(")"));
                 return container;
             }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to