Title: [190963] releases/WebKitGTK/webkit-2.10
- Revision
- 190963
- Author
- [email protected]
- Date
- 2015-10-13 03:57:32 -0700 (Tue, 13 Oct 2015)
Log Message
Merge r190605 - data: URLs should not be preloaded
https://bugs.webkit.org/show_bug.cgi?id=149829
Reviewed by Ryosuke Niwa.
Source/WebCore:
Update the HTMLPreloadScanner so that data: URLs do not get preloaded.
There is no need as the data is already available.
Test: fast/preloader/image-data-url.html
* html/parser/HTMLPreloadScanner.cpp:
(WebCore::TokenPreloadScanner::StartTagScanner::shouldPreload):
LayoutTests:
Add layout test to make sure that images with a data: URL do not
get preloaded.
* fast/preloader/image-data-url-expected.txt: Added.
* fast/preloader/image-data-url.html: Added.
Modified Paths
Added Paths
Diff
Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog (190962 => 190963)
--- releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2015-10-13 10:56:30 UTC (rev 190962)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2015-10-13 10:57:32 UTC (rev 190963)
@@ -1,3 +1,16 @@
+2015-10-05 Chris Dumez <[email protected]>
+
+ data: URLs should not be preloaded
+ https://bugs.webkit.org/show_bug.cgi?id=149829
+
+ Reviewed by Ryosuke Niwa.
+
+ Add layout test to make sure that images with a data: URL do not
+ get preloaded.
+
+ * fast/preloader/image-data-url-expected.txt: Added.
+ * fast/preloader/image-data-url.html: Added.
+
2015-10-05 Jiewen Tan <[email protected]>
CSSGradientValue should check whether gradientLength is zero or not.
Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/preloader/image-data-url-expected.txt (0 => 190963)
--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/preloader/image-data-url-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/preloader/image-data-url-expected.txt 2015-10-13 10:57:32 UTC (rev 190963)
@@ -0,0 +1,4 @@
+PASS internals.isPreloaded("data:image/gif;base64,R0lGODlhEAAOALMAAOazToeHh0tLS/7LZv/0jvb29t/f3//Ub//ge8WSLf/rhf/3kdbW1mxsbP//mf///yH5BAAAAAAALAAAAAAQAA4AAARe8L1Ekyky67QZ1hLnjM5UUde0ECwLJoExKcppV0aCcGCmTIHEIUEqjgaORCMxIC6e0CcguWw6aFjsVMkkIr7g77ZKPJjPZqIyd7sJAgVGoEGv2xsBxqNgYPj/gAwXEQA7"); is false
+Tests that data URLs are not preloaded.
+
+
Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/preloader/image-data-url.html (0 => 190963)
--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/preloader/image-data-url.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/preloader/image-data-url.html 2015-10-13 10:57:32 UTC (rev 190963)
@@ -0,0 +1,14 @@
+<html>
+<head>
+<script src=""
+<script src=""
+<script>
+ shouldBeFalse('internals.isPreloaded("data:image/gif;base64,R0lGODlhEAAOALMAAOazToeHh0tLS/7LZv/0jvb29t/f3//Ub//ge8WSLf/rhf/3kdbW1mxsbP//mf///yH5BAAAAAAALAAAAAAQAA4AAARe8L1Ekyky67QZ1hLnjM5UUde0ECwLJoExKcppV0aCcGCmTIHEIUEqjgaORCMxIC6e0CcguWw6aFjsVMkkIr7g77ZKPJjPZqIyd7sJAgVGoEGv2xsBxqNgYPj/gAwXEQA7");');
+</script>
+</head>
+<body>
+<p>Tests that data URLs are not preloaded.</p>
+<img src=""
+</body>
+</html>
+
Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (190962 => 190963)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-10-13 10:56:30 UTC (rev 190962)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-10-13 10:57:32 UTC (rev 190963)
@@ -1,3 +1,18 @@
+2015-10-05 Chris Dumez <[email protected]>
+
+ data: URLs should not be preloaded
+ https://bugs.webkit.org/show_bug.cgi?id=149829
+
+ Reviewed by Ryosuke Niwa.
+
+ Update the HTMLPreloadScanner so that data: URLs do not get preloaded.
+ There is no need as the data is already available.
+
+ Test: fast/preloader/image-data-url.html
+
+ * html/parser/HTMLPreloadScanner.cpp:
+ (WebCore::TokenPreloadScanner::StartTagScanner::shouldPreload):
+
2015-10-05 Jiewen Tan <[email protected]>
CSSGradientValue should check whether gradientLength is zero or not.
Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/html/parser/HTMLPreloadScanner.cpp (190962 => 190963)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/html/parser/HTMLPreloadScanner.cpp 2015-10-13 10:56:30 UTC (rev 190962)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/html/parser/HTMLPreloadScanner.cpp 2015-10-13 10:57:32 UTC (rev 190963)
@@ -218,6 +218,9 @@
if (m_urlToLoad.isEmpty())
return false;
+ if (m_urlToLoad.startsWith("data:", false))
+ return false;
+
if (m_tagId == TagId::Link && !m_linkIsStyleSheet)
return false;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
