Changeset 147291 in webkit

Timestamp:

Mar 31, 2013 4:27:34 PM (11 years ago)

Author:

rafaelw@chromium.org

Message:

HTMLLinkElement should resolve resource URLs when resources will be fetched
​https://bugs.webkit.org/show_bug.cgi?id=113630

Source/WebCore:

HTMLLinkElement was resolving its URL when the href attribute was processed and caching it without ever
invalidating the cached URL. This patch removes the cached URL and adds getURL() which resolve the
URL dynamically.

Reviewed by Eric Seidel.

Test: fast/dom/HTMLLinkElement/resolve-url-on-insertion.html

• html/HTMLLinkElement.cpp:

(WebCore::HTMLLinkElement::getURL):
(WebCore):
(WebCore::HTMLLinkElement::parseAttribute):
(WebCore::HTMLLinkElement::shouldLoadLink):
(WebCore::HTMLLinkElement::process):

• html/HTMLLinkElement.h:

(HTMLLinkElement):

LayoutTests:

Reviewed by Eric Seidel.

• fast/dom/HTMLLinkElement/resolve-url-on-insertion-expected.txt: Added.
• fast/dom/HTMLLinkElement/resolve-url-on-insertion.html: Added.
• fast/dom/HTMLLinkElement/resources/stylesheet2.css: Added.

(#test2):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/HTMLLinkElement/resolve-url-on-insertion-expected.txt (added)
• LayoutTests/fast/dom/HTMLLinkElement/resolve-url-on-insertion.html (added)
• LayoutTests/fast/dom/HTMLLinkElement/resources/stylesheet2.css (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLLinkElement.cpp (modified) (5 diffs)
• Source/WebCore/html/HTMLLinkElement.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-03-31  Rafael Weinstein  <rafaelw@chromium.org>
+
+        HTMLLinkElement should resolve resource URLs when resources will be fetched
+        https://bugs.webkit.org/show_bug.cgi?id=113630
+
+        Reviewed by Eric Seidel.
+
+        * fast/dom/HTMLLinkElement/resolve-url-on-insertion-expected.txt: Added.
+        * fast/dom/HTMLLinkElement/resolve-url-on-insertion.html: Added.
+        * fast/dom/HTMLLinkElement/resources/stylesheet2.css: Added.
+        (#test2):
+
 2013-03-30  Tom Sepez  <tsepez@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-31  Rafael Weinstein  <rafaelw@chromium.org>
+
+        HTMLLinkElement should resolve resource URLs when resources will be fetched
+        https://bugs.webkit.org/show_bug.cgi?id=113630
+
+        HTMLLinkElement was resolving its URL when the href attribute was processed and caching it without ever
+        invalidating the cached URL. This patch removes the cached URL and adds getURL() which resolve the
+        URL dynamically.
+
+        Reviewed by Eric Seidel.
+
+        Test: fast/dom/HTMLLinkElement/resolve-url-on-insertion.html
+
+        * html/HTMLLinkElement.cpp:
+        (WebCore::HTMLLinkElement::getURL):
+        (WebCore):
+        (WebCore::HTMLLinkElement::parseAttribute):
+        (WebCore::HTMLLinkElement::shouldLoadLink):
+        (WebCore::HTMLLinkElement::process):
+        * html/HTMLLinkElement.h:
+        (HTMLLinkElement):
+
 2013-03-31  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/html/HTMLLinkElement.cpp

@@ -138 +138 @@
         process();
     } else if (name == hrefAttr) {
-        String url = stripLeadingAndTrailingHTMLSpaces(value);
-        m_url = url.isEmpty() ? KURL() : document()->completeURL(url);
         process();
     } else if (name == typeAttr) {
@@ -164 +162 @@
 {
     RefPtr<Document> originalDocument = document();
-    if (!dispatchBeforeLoadEvent(m_url))
+    if (!dispatchBeforeLoadEvent(getNonEmptyURLAttribute(hrefAttr)))
         return false;
     // A beforeload handler might have removed us from the document or changed the document.
@@ -180 +178 @@
 
     String type = m_type.lower();
-
-    if (!m_linkLoader.loadLink(m_relAttribute, type, m_sizes->toString(), m_url, document()))
+    KURL url = getNonEmptyURLAttribute(hrefAttr);
+
+    if (!m_linkLoader.loadLink(m_relAttribute, type, m_sizes->toString(), url, document()))
         return;
 
@@ -187 +186 @@
 
     if (m_disabledState != Disabled && (m_relAttribute.m_isStyleSheet || (acceptIfTypeContainsTextCSS && type.contains("text/css")))
-        && document()->frame() && m_url.isValid()) {
+        && document()->frame() && url.isValid()) {
         
         String charset = getAttribute(charsetAttr);
@@ -219 +218 @@
         // Load stylesheets that are not needed for the rendering immediately with low priority.
         ResourceLoadPriority priority = blocking ? ResourceLoadPriorityUnresolved : ResourceLoadPriorityVeryLow;
-        CachedResourceRequest request(ResourceRequest(document()->completeURL(m_url)), charset, priority);
+        CachedResourceRequest request(ResourceRequest(document()->completeURL(url)), charset, priority);
         request.setInitiator(this);
         m_cachedSheet = document()->cachedResourceLoader()->requestCSSStyleSheet(request);

trunk/Source/WebCore/html/HTMLLinkElement.h

@@ -137 +137 @@
     };
 
-    KURL m_url;
     String m_type;
     String m_media;