<!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>[188935] trunk</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/188935">188935</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-08-25 15:44:45 -0700 (Tue, 25 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Using the filter functional notation for background images results in wrong background-size rendering
https://bugs.webkit.org/show_bug.cgi?id=148221
rdar://problem/22379518
Reviewed by Daniel Bates.
Do not ignore the size argument, when the filter image is being drawn onto the context.
When the size is ignored, we end up painting the image with its native size while the filter
is applied on the size of the generated image.
Source/WebCore:
Test: fast/filter-image/background-filter-image.html
* css/CSSFilterImageValue.cpp:
(WebCore::CSSFilterImageValue::image):
LayoutTests:
* fast/filter-image/background-filter-image-expected.html: Added.
* fast/filter-image/background-filter-image.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSFilterImageValuecpp">trunk/Source/WebCore/css/CSSFilterImageValue.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastfilterimagebackgroundfilterimageexpectedhtml">trunk/LayoutTests/fast/filter-image/background-filter-image-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastfilterimagebackgroundfilterimagehtml">trunk/LayoutTests/fast/filter-image/background-filter-image.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (188934 => 188935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-08-25 22:09:26 UTC (rev 188934)
+++ trunk/LayoutTests/ChangeLog 2015-08-25 22:44:45 UTC (rev 188935)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-08-25 Zalan Bujtas <zalan@apple.com>
+
+ Using the filter functional notation for background images results in wrong background-size rendering
+ https://bugs.webkit.org/show_bug.cgi?id=148221
+ rdar://problem/22379518
+
+ Reviewed by Daniel Bates.
+
+ Do not ignore the size argument, when the filter image is being drawn onto the context.
+ When the size is ignored, we end up painting the image with its native size while the filter
+ is applied on the size of the generated image.
+
+ * fast/filter-image/background-filter-image-expected.html: Added.
+ * fast/filter-image/background-filter-image.html: Added.
+
</ins><span class="cx"> 2015-08-25 Nan Wang <n_wang@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] accessibility/document-attributes.html fails
</span></span></pre></div>
<a id="trunkLayoutTestsfastfilterimagebackgroundfilterimageexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/filter-image/background-filter-image-expected.html (0 => 188935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/filter-image/background-filter-image-expected.html (rev 0)
+++ trunk/LayoutTests/fast/filter-image/background-filter-image-expected.html 2015-08-25 22:44:45 UTC (rev 188935)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that background images with filters scale properly.</title>
+<style>
+ img {
+ width: 100px;
+ height: 100px;
+ filter: sepia(1);
+ }
+</style>
+</head>
+<body>
+ <img src="../replaced/resources/compass.jpg">
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastfilterimagebackgroundfilterimagehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/filter-image/background-filter-image.html (0 => 188935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/filter-image/background-filter-image.html (rev 0)
+++ trunk/LayoutTests/fast/filter-image/background-filter-image.html 2015-08-25 22:44:45 UTC (rev 188935)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that background images with filters scale properly.</title>
+<style>
+ div {
+ background-image: filter(url(../replaced/resources/compass.jpg), sepia(1));
+ background-size: 100px 100px;
+ width: 100px;
+ height: 100px;
+ }
+</style>
+</head>
+<body>
+ <div></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (188934 => 188935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-25 22:09:26 UTC (rev 188934)
+++ trunk/Source/WebCore/ChangeLog 2015-08-25 22:44:45 UTC (rev 188935)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-08-25 Zalan Bujtas <zalan@apple.com>
+
+ Using the filter functional notation for background images results in wrong background-size rendering
+ https://bugs.webkit.org/show_bug.cgi?id=148221
+ rdar://problem/22379518
+
+ Reviewed by Daniel Bates.
+
+ Do not ignore the size argument, when the filter image is being drawn onto the context.
+ When the size is ignored, we end up painting the image with its native size while the filter
+ is applied on the size of the generated image.
+
+ Test: fast/filter-image/background-filter-image.html
+
+ * css/CSSFilterImageValue.cpp:
+ (WebCore::CSSFilterImageValue::image):
+
</ins><span class="cx"> 2015-08-25 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> IconDatabase: syncThreadMainLoop() is unlocking m_syncLock twice when thread termination is requested
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFilterImageValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFilterImageValue.cpp (188934 => 188935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFilterImageValue.cpp 2015-08-25 22:09:26 UTC (rev 188934)
+++ trunk/Source/WebCore/css/CSSFilterImageValue.cpp 2015-08-25 22:44:45 UTC (rev 188935)
</span><span class="lines">@@ -123,12 +123,13 @@
</span><span class="cx"> std::unique_ptr<ImageBuffer> texture = ImageBuffer::create(size);
</span><span class="cx"> if (!texture)
</span><span class="cx"> return Image::nullImage();
</span><del>- texture->context()->drawImage(image, ColorSpaceDeviceRGB, IntPoint());
</del><ins>+ FloatRect imageRect = FloatRect(FloatPoint(), size);
+ texture->context()->drawImage(image, ColorSpaceDeviceRGB, imageRect);
</ins><span class="cx">
</span><span class="cx"> RefPtr<FilterEffectRenderer> filterRenderer = FilterEffectRenderer::create();
</span><span class="cx"> filterRenderer->setSourceImage(WTF::move(texture));
</span><del>- filterRenderer->setSourceImageRect(FloatRect(FloatPoint(), size));
- filterRenderer->setFilterRegion(FloatRect(FloatPoint(), size));
</del><ins>+ filterRenderer->setSourceImageRect(imageRect);
+ filterRenderer->setFilterRegion(imageRect);
</ins><span class="cx"> if (!filterRenderer->build(renderer, m_filterOperations, FilterFunction))
</span><span class="cx"> return Image::nullImage();
</span><span class="cx"> filterRenderer->apply();
</span></span></pre>
</div>
</div>
</body>
</html>