Changeset 192969 in webkit

Timestamp:

Dec 2, 2015 2:41:21 PM (8 years ago)

Author:

yoav@yoav.ws

Message:

Fix preloader issue with srcdoc documents.
​https://bugs.webkit.org/show_bug.cgi?id=151744

Reviewed by Ryosuke Niwa.

Source/WebCore:

Make sure that PreloadRequest is resolving URLs based on the document's
baseURL() rather than using url() as the base URL, which is not how URLs
are resolved by the parser, and fails when document->url() diverges from
the document's base URL (e.g. in the case of srcdoc based documents).

Test: fast/preloader/iframe-srcdoc.html

• html/parser/HTMLResourcePreloader.cpp:

(WebCore::PreloadRequest::completeURL):

LayoutTests:

Added a test that makes sure that srcdoc based subresources are properly preloaded.

• fast/preloader/iframe-srcdoc-expected.txt: Added.
• fast/preloader/iframe-srcdoc.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/preloader/iframe-srcdoc-expected.txt (added)
• LayoutTests/fast/preloader/iframe-srcdoc.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/parser/HTMLResourcePreloader.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-12-02  Yoav Weiss  <yoav@yoav.ws>
+
+        Fix preloader issue with srcdoc documents.
+        https://bugs.webkit.org/show_bug.cgi?id=151744
+
+        Reviewed by Ryosuke Niwa.
+
+        Added a test that makes sure that srcdoc based subresources are properly preloaded.
+
+        * fast/preloader/iframe-srcdoc-expected.txt: Added.
+        * fast/preloader/iframe-srcdoc.html: Added.
+
 2015-12-02  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-12-02  Yoav Weiss  <yoav@yoav.ws>
+
+        Fix preloader issue with srcdoc documents.
+        https://bugs.webkit.org/show_bug.cgi?id=151744
+
+        Reviewed by Ryosuke Niwa.
+
+        Make sure that PreloadRequest is resolving URLs based on the document's
+        baseURL() rather than using url() as the base URL, which is not how URLs
+        are resolved by the parser, and fails when document->url() diverges from
+        the document's base URL (e.g. in the case of srcdoc based documents).
+
+        Test: fast/preloader/iframe-srcdoc.html
+
+        * html/parser/HTMLResourcePreloader.cpp:
+        (WebCore::PreloadRequest::completeURL):
+
 2015-12-02  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/html/parser/HTMLResourcePreloader.cpp

@@ -38 +38 @@
 URL PreloadRequest::completeURL(Document& document)
 {
-    return document.completeURL(m_resourceURL, m_baseURL.isEmpty() ? document.url() : m_baseURL);
+    return document.completeURL(m_resourceURL, m_baseURL.isEmpty() ? document.baseURL() : m_baseURL);
 }