<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[184091] releases/WebKitGTK/webkit-2.8</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/184091">184091</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-11 06:31:21 -0700 (Mon, 11 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/183053">r183053</a> - REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/177494">r177494</a>): -webkit-mask-image: with data URI fails on non-local files
https://bugs.webkit.org/show_bug.cgi?id=141857
Reviewed by Dirk Schulze.
Source/WebCore:
<a href="http://trac.webkit.org/projects/webkit/changeset/177494">r177494</a> regressed loading of data URIs in masks with remote content, triggering
a cross-domain error which occurs because the mask loading happened via a separate
SVGDocument.
Fix by checking for data URIs at parsing time, which is what we used to do.
Test: http/tests/css/data-uri-mask.html
* css/CSSParser.cpp:
(WebCore::CSSParser::parseMaskImage):
* svg/SVGURIReference.h:
(WebCore::SVGURIReference::isExternalURIReference):
LayoutTests:
Ref test with a masked green square. Has to be an http test to trigger the
origin checking.
* http/tests/css/data-uri-mask-expected.html: Added.
* http/tests/css/data-uri-mask.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCorecssCSSParsercpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoresvgSVGURIReferenceh">releases/WebKitGTK/webkit-2.8/Source/WebCore/svg/SVGURIReference.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestshttptestscssdataurimaskexpectedhtml">releases/WebKitGTK/webkit-2.8/LayoutTests/http/tests/css/data-uri-mask-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestshttptestscssdataurimaskhtml">releases/WebKitGTK/webkit-2.8/LayoutTests/http/tests/css/data-uri-mask.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit28LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog (184090 => 184091)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog 2015-05-11 13:12:20 UTC (rev 184090)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog 2015-05-11 13:31:21 UTC (rev 184091)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-04-20 Simon Fraser <simon.fraser@apple.com>
+
+ REGRESSION (r177494): -webkit-mask-image: with data URI fails on non-local files
+ https://bugs.webkit.org/show_bug.cgi?id=141857
+
+ Reviewed by Dirk Schulze.
+
+ Ref test with a masked green square. Has to be an http test to trigger the
+ origin checking.
+
+ * http/tests/css/data-uri-mask-expected.html: Added.
+ * http/tests/css/data-uri-mask.html: Added.
+
</ins><span class="cx"> 2015-04-17 Bem Jones-Bey <bjonesbe@adobe.com>
</span><span class="cx">
</span><span class="cx"> Large values for line-height cause integer overflow in RenderStyle::computedLineHeight
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28LayoutTestshttptestscssdataurimaskexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.8/LayoutTests/http/tests/css/data-uri-mask-expected.html (0 => 184091)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/http/tests/css/data-uri-mask-expected.html (rev 0)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/http/tests/css/data-uri-mask-expected.html 2015-05-11 13:31:21 UTC (rev 184091)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ .masked {
+ height: 100px;
+ width: 100px;
+ background-color: green;
+ }
+ </style>
+</head>
+<body>
+ <div class="masked"></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit28LayoutTestshttptestscssdataurimaskhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.8/LayoutTests/http/tests/css/data-uri-mask.html (0 => 184091)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/http/tests/css/data-uri-mask.html (rev 0)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/http/tests/css/data-uri-mask.html 2015-05-11 13:31:21 UTC (rev 184091)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ .masked {
+ height: 100px;
+ width: 100px;
+ background-color: green;
+ -webkit-mask-image: url(data:image/png;base64,R0lGODlhAQABAIAAAP///////yH5BAEKAAEALAAAAAABAAEAAAICRAEAOw==);
+ }
+ </style>
+</head>
+<body>
+ <div class="masked"></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (184090 => 184091)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-05-11 13:12:20 UTC (rev 184090)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-05-11 13:31:21 UTC (rev 184091)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-04-20 Simon Fraser <simon.fraser@apple.com>
+
+ REGRESSION (r177494): -webkit-mask-image: with data URI fails on non-local files
+ https://bugs.webkit.org/show_bug.cgi?id=141857
+
+ Reviewed by Dirk Schulze.
+
+ r177494 regressed loading of data URIs in masks with remote content, triggering
+ a cross-domain error which occurs because the mask loading happened via a separate
+ SVGDocument.
+
+ Fix by checking for data URIs at parsing time, which is what we used to do.
+
+ Test: http/tests/css/data-uri-mask.html
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseMaskImage):
+ * svg/SVGURIReference.h:
+ (WebCore::SVGURIReference::isExternalURIReference):
+
</ins><span class="cx"> 2015-04-17 Bem Jones-Bey <bjonesbe@adobe.com>
</span><span class="cx">
</span><span class="cx"> Large values for line-height cause integer overflow in RenderStyle::computedLineHeight
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/css/CSSParser.cpp (184090 => 184091)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/css/CSSParser.cpp 2015-05-11 13:12:20 UTC (rev 184090)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/css/CSSParser.cpp 2015-05-11 13:31:21 UTC (rev 184091)
</span><span class="lines">@@ -9574,16 +9574,23 @@
</span><span class="cx"> {
</span><span class="cx"> outValue = nullptr;
</span><span class="cx"> CSSParserValue* value = valueList.current();
</span><del>- if (value->id == CSSValueNone)
</del><ins>+ if (value->id == CSSValueNone) {
</ins><span class="cx"> outValue = WebKitCSSResourceValue::create(cssValuePool().createIdentifierValue(CSSValueNone));
</span><del>- else if (value->unit == CSSPrimitiveValue::CSS_URI)
- outValue = WebKitCSSResourceValue::create(CSSPrimitiveValue::create(completeURL(value->string), CSSPrimitiveValue::CSS_URI));
- else {
- RefPtr<CSSValue> fillImageValue;
- if (parseFillImage(valueList, fillImageValue))
- outValue = WebKitCSSResourceValue::create(fillImageValue);
</del><ins>+ return outValue.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ RefPtr<CSSValue> resourceValue;
+ if (value->unit == CSSPrimitiveValue::CSS_URI) {
+ if (protocolIs(value->string, "data"))
+ parseFillImage(valueList, resourceValue);
+ else
+ resourceValue = CSSPrimitiveValue::create(completeURL(value->string), CSSPrimitiveValue::CSS_URI);
+ } else
+ parseFillImage(valueList, resourceValue);
+
+ if (resourceValue)
+ outValue = WebKitCSSResourceValue::create(resourceValue);
+
</ins><span class="cx"> return outValue.get();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoresvgSVGURIReferenceh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/svg/SVGURIReference.h (184090 => 184091)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/svg/SVGURIReference.h 2015-05-11 13:12:20 UTC (rev 184090)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/svg/SVGURIReference.h 2015-05-11 13:31:21 UTC (rev 184091)
</span><span class="lines">@@ -48,6 +48,7 @@
</span><span class="cx">
</span><span class="cx"> // If the URI matches our documents URL, we're dealing with a local reference.
</span><span class="cx"> URL url = document.completeURL(uri);
</span><ins>+ ASSERT(!url.protocolIsData());
</ins><span class="cx"> return !equalIgnoringFragmentIdentifier(url, document.url());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>