Title: [195095] releases/WebKitGTK/webkit-2.10
- Revision
- 195095
- Author
- carlo...@webkit.org
- Date
- 2016-01-15 00:26:42 -0800 (Fri, 15 Jan 2016)
Log Message
Merge r192969 - 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.
Modified Paths
Added Paths
Diff
Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog (195094 => 195095)
--- releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2016-01-15 08:22:38 UTC (rev 195094)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2016-01-15 08:26:42 UTC (rev 195095)
@@ -1,3 +1,15 @@
+2015-12-02 Yoav Weiss <y...@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 Jiewen Tan <jiewen_...@apple.com>
Null dereference loading Blink layout test fast/loader/unload-mutation-crash.html
Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/preloader/iframe-srcdoc-expected.txt (0 => 195095)
--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/preloader/iframe-srcdoc-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/preloader/iframe-srcdoc-expected.txt 2016-01-15 08:26:42 UTC (rev 195095)
@@ -0,0 +1,7 @@
+CONSOLE MESSAGE: line 1: PASS
+This test has to be run as a layout test in order to see if resources were loaded and the test passed.
+
+--------
+Frame: '<!--framePath //<!--frame0-->-->'
+--------
+ <script src=""
Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/preloader/iframe-srcdoc.html (0 => 195095)
--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/preloader/iframe-srcdoc.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/preloader/iframe-srcdoc.html 2016-01-15 08:26:42 UTC (rev 195095)
@@ -0,0 +1,10 @@
+<body>
+<script>
+ if (window.testRunner) {
+ testRunner.dumpChildFramesAsText();
+ testRunner.dumpAsText();
+ }
+
+</script>
+This test has to be run as a layout test in order to see if resources were loaded and the test passed.
+<iframe srcdoc="<script> window.addEventListener('DOMContentLoaded', function() { if (window.internals) console.log(internals.isPreloaded('resources/script1.js') ? 'PASS' : 'FAIL'); }, false); </script><script src="" <script src="" />
Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (195094 => 195095)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2016-01-15 08:22:38 UTC (rev 195094)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2016-01-15 08:26:42 UTC (rev 195095)
@@ -1,3 +1,20 @@
+2015-12-02 Yoav Weiss <y...@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 Jiewen Tan <jiewen_...@apple.com>
Null dereference loading Blink layout test fast/loader/unload-mutation-crash.html
Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/html/parser/HTMLResourcePreloader.cpp (195094 => 195095)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/html/parser/HTMLResourcePreloader.cpp 2016-01-15 08:22:38 UTC (rev 195094)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/html/parser/HTMLResourcePreloader.cpp 2016-01-15 08:26:42 UTC (rev 195095)
@@ -37,7 +37,7 @@
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);
}
CachedResourceRequest PreloadRequest::resourceRequest(Document& document)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
