Merge 74710 - 2010-12-28 Alexander Pavlov <apavlov@chromium.org>...

WebCore/inspector/front-end/StylesSidebarPane.js

 /*
  * Copyright (C) 2007 Apple Inc.  All rights reserved.
  * Copyright (C) 2009 Joseph Pecoraro
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 1184 matching lines @@
         var nameElement = document.createElement("span");
         nameElement.className = "webkit-css-property";
         nameElement.textContent = this.name;
         this.nameElement = nameElement;
 
         var valueElement = document.createElement("span");
         valueElement.className = "value";
         this.valueElement = valueElement;
 
         if (value) {
+            var self = this;
+
             function processValue(regex, processor, nextProcessor, valueText)
             {
                 var container = document.createDocumentFragment();
 
                 var items = valueText.replace(regex, "\0$1\0").split("\0");
                 for (var i = 0; i < items.length; ++i) {
                     if ((i % 2) === 0) {
                         if (nextProcessor)
                             container.appendChild(nextProcessor(items[i]));
                         else
                             container.appendChild(document.createTextNode(items[i]));
                     } else {
                         var processedNode = processor(items[i]);
                         if (processedNode)
                             container.appendChild(processedNode);
                     }
                 }
 
                 return container;
             }
 
             function linkifyURL(url)
             {
+                var hrefUrl = url;
+                var match = hrefUrl.match(/['"]?([^'"]+)/);
+                if (match)
+                    hrefUrl = match[1];
                 var container = document.createDocumentFragment();
                 container.appendChild(document.createTextNode("url("));
-                var hasResource = !!WebInspector.resourceForURL(url);
-                container.appendChild(WebInspector.linkifyURLAsNode(url, url, null, hasResource));
+                if (self._styleRule.sourceURL)
+                    hrefUrl = WebInspector.completeURL(self._styleRule.sourceURL, hrefUrl);
+                else if (WebInspector.panels.elements.focusedDOMNode)
+                    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(document.createTextNode(")"));
                 return container;
             }
 
             function processColor(text)
             {
                 try {
                     var color = new WebInspector.Color(text);
                 } catch (e) {
                     return document.createTextNode(text);
@@ skipping 81 matching lines @@
 
                 var container = document.createDocumentFragment();
                 container.appendChild(swatchElement);
                 container.appendChild(colorValueElement);
                 return container;
             }
 
             var colorRegex = /((?:rgb|hsl)a?\([^)]+\)|#[0-9a-fA-F]{6}|#[0-9a-fA-F]{3}|\b\w+\b(?!-))/g;
             var colorProcessor = processValue.bind(window, colorRegex, processColor, null);
 
-            valueElement.appendChild(processValue(/url\(([^)]+)\)/g, linkifyURL, colorProcessor, value));
+            valueElement.appendChild(processValue(/url\(\s*([^)\s]+)\s*\)/g, linkifyURL, colorProcessor, value));
         }
 
         this.listItemElement.removeChildren();
 
         if (!this.treeOutline)
             return;
 
         // Append the checkbox for root elements of an editable section.
         if (enabledCheckboxElement && this.treeOutline.section && this.treeOutline.section.editable && this.parent.root)
             this.listItemElement.appendChild(enabledCheckboxElement);
@@ skipping 421 matching lines @@
 
         // Append a ";" if the new text does not end in ";".
         // FIXME: this does not handle trailing comments.
         if (styleText.length && !/;\s*$/.test(styleText))
             styleText += ";";
         this.property.setText(styleText, updateInterface, callback.bind(this));
     }
 }
 
 WebInspector.StylePropertyTreeElement.prototype.__proto__ = TreeElement.prototype;