<!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>[214870] releases/WebKitGTK/webkit-2.16</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/214870">214870</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-04-04 00:28:59 -0700 (Tue, 04 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/214842">r214842</a> - REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/206744">r206744</a>): CSS background-image in style attribute ignored when using createHTMLDocument method of DOM parsing
https://bugs.webkit.org/show_bug.cgi?id=170285
<rdar://problem/31378543>
Reviewed by Andy Estes.
Source/WebCore:
<a href="http://trac.webkit.org/projects/webkit/changeset/206744">r206744</a> caused up to stop trying to resolve relative URLs when trying to load an image
referred to by CSS. We already try to resolve the relative URL when parsing the CSS
property so this will usually work fine. However, in the case when the CSS property
is parsed in detached document and then moved to another document, we will not have
the complete URL.
Test: fast/images/background-image-relative-url-changes-document.html
* css/CSSImageValue.cpp:
(WebCore::CSSImageValue::loadImage):
LayoutTests:
Add layout test coverage.
* fast/images/background-image-relative-url-changes-document-expected.html: Added.
* fast/images/background-image-relative-url-changes-document.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCorecssCSSImageValuecpp">releases/WebKitGTK/webkit-2.16/Source/WebCore/css/CSSImageValue.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestsfastimagesbackgroundimagerelativeurlchangesdocumentexpectedhtml">releases/WebKitGTK/webkit-2.16/LayoutTests/fast/images/background-image-relative-url-changes-document-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestsfastimagesbackgroundimagerelativeurlchangesdocumenthtml">releases/WebKitGTK/webkit-2.16/LayoutTests/fast/images/background-image-relative-url-changes-document.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit216LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog (214869 => 214870)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog 2017-04-04 07:27:21 UTC (rev 214869)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog 2017-04-04 07:28:59 UTC (rev 214870)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2017-04-03 Chris Dumez <cdumez@apple.com>
+
+ REGRESSION (r206744): CSS background-image in style attribute ignored when using createHTMLDocument method of DOM parsing
+ https://bugs.webkit.org/show_bug.cgi?id=170285
+ <rdar://problem/31378543>
+
+ Reviewed by Andy Estes.
+
+ Add layout test coverage.
+
+ * fast/images/background-image-relative-url-changes-document-expected.html: Added.
+ * fast/images/background-image-relative-url-changes-document.html: Added.
+
</ins><span class="cx"> 2017-04-03 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r207669): FileMaker Pro Help pages do not render correctly
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216LayoutTestsfastimagesbackgroundimagerelativeurlchangesdocumentexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.16/LayoutTests/fast/images/background-image-relative-url-changes-document-expected.html (0 => 214870)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/fast/images/background-image-relative-url-changes-document-expected.html (rev 0)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/fast/images/background-image-relative-url-changes-document-expected.html 2017-04-04 07:28:59 UTC (rev 214870)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<p>Makes sure background-images with relative URLs are properly loaded when moved to a new document.</p>
+<div style="background-image: url(resources/green-256x256.jpg); width: 256px; height: 256px;"></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit216LayoutTestsfastimagesbackgroundimagerelativeurlchangesdocumenthtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.16/LayoutTests/fast/images/background-image-relative-url-changes-document.html (0 => 214870)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/fast/images/background-image-relative-url-changes-document.html (rev 0)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/fast/images/background-image-relative-url-changes-document.html 2017-04-04 07:28:59 UTC (rev 214870)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<p>Makes sure background-images with relative URLs are properly loaded when moved to a new document.</p>
+<script>
+const htmlDocument = document.implementation.createHTMLDocument('template');
+htmlDocument.documentElement.innerHTML = '<div style="background-image: url(resources/green-256x256.jpg); width: 256px; height: 256px;"></div>';
+const data = htmlDocument.body.children;
+for (var i = 0; i < data.length; i++)
+ document.body.appendChild(data[i]);
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog (214869 => 214870)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-04-04 07:27:21 UTC (rev 214869)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-04-04 07:28:59 UTC (rev 214870)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2017-04-03 Chris Dumez <cdumez@apple.com>
+
+ REGRESSION (r206744): CSS background-image in style attribute ignored when using createHTMLDocument method of DOM parsing
+ https://bugs.webkit.org/show_bug.cgi?id=170285
+ <rdar://problem/31378543>
+
+ Reviewed by Andy Estes.
+
+ r206744 caused up to stop trying to resolve relative URLs when trying to load an image
+ referred to by CSS. We already try to resolve the relative URL when parsing the CSS
+ property so this will usually work fine. However, in the case when the CSS property
+ is parsed in detached document and then moved to another document, we will not have
+ the complete URL.
+
+ Test: fast/images/background-image-relative-url-changes-document.html
+
+ * css/CSSImageValue.cpp:
+ (WebCore::CSSImageValue::loadImage):
+
</ins><span class="cx"> 2017-04-03 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r207669): FileMaker Pro Help pages do not render correctly
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCorecssCSSImageValuecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/css/CSSImageValue.cpp (214869 => 214870)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/css/CSSImageValue.cpp 2017-04-04 07:27:21 UTC (rev 214869)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/css/CSSImageValue.cpp 2017-04-04 07:28:59 UTC (rev 214870)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> if (!m_accessedImage) {
</span><span class="cx"> m_accessedImage = true;
</span><span class="cx">
</span><del>- CachedResourceRequest request(ResourceRequest(m_url), options);
</del><ins>+ CachedResourceRequest request(ResourceRequest(loader.document()->completeURL(m_url.string())), options);
</ins><span class="cx"> if (m_initiatorName.isEmpty())
</span><span class="cx"> request.setInitiator(cachedResourceRequestInitiators().css);
</span><span class="cx"> else
</span></span></pre>
</div>
</div>
</body>
</html>