<!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>[191048] 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/191048">191048</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-10-14 10:29:18 -0700 (Wed, 14 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/53318">r53318</a>): background-repeat: space with gradients doesn't render correctly
https://bugs.webkit.org/show_bug.cgi?id=150068
Patch by Said Abou-Hallawa <sabouhallawa@apple.com> on 2015-10-14
Reviewed by Simon Fraser.
Source/WebCore:
This is a regression of <a href="http://trac.webkit.org/projects/webkit/changeset/53318">r53318</a> in which we were trying to make the pattern
of the gradient image as small as possible: 1-pixel wide or tall. But this
broke the rendering of the background image when container element has the
style background-repeat: space. The reason for this is tiling the gradient
image is done completely by CG. To do the tiling, we start by creating a
CGPattern by calling CGPatternCreate() which takes the rect of the pattern
and the step. If the width or the height of the pattern image is adjusted
to be 1-pixel wide or tall, that will force CG to leave a space after every
it draws the pattern image which is 1-pixel wide or tall which is wrong.
The fix is to disable this optimization altogether if the container element
has the style background-repeat: space.
Test: fast/gradients/background-image-repeat-space.html
* platform/graphics/Gradient.cpp:
(WebCore::Gradient::adjustParametersForTiledDrawing):
* platform/graphics/Gradient.h:
* platform/graphics/GradientImage.cpp:
(WebCore::GradientImage::drawPattern):
LayoutTests:
Ensure the gradient background-image is drawn correctly when it is repeated
with spaces.
* fast/gradients/background-image-repeat-space-expected.html: Added.
* fast/gradients/background-image-repeat-space.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="#trunkSourceWebCoreplatformgraphicsGradientcpp">trunk/Source/WebCore/platform/graphics/Gradient.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGradienth">trunk/Source/WebCore/platform/graphics/Gradient.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGradientImagecpp">trunk/Source/WebCore/platform/graphics/GradientImage.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastgradientsbackgroundimagerepeatspaceexpectedhtml">trunk/LayoutTests/fast/gradients/background-image-repeat-space-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastgradientsbackgroundimagerepeatspacehtml">trunk/LayoutTests/fast/gradients/background-image-repeat-space.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (191047 => 191048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-10-14 17:23:12 UTC (rev 191047)
+++ trunk/LayoutTests/ChangeLog 2015-10-14 17:29:18 UTC (rev 191048)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-10-14 Said Abou-Hallawa <sabouhallawa@apple.com>
+
+ REGRESSION(r53318): background-repeat: space with gradients doesn't render correctly
+ https://bugs.webkit.org/show_bug.cgi?id=150068
+
+ Reviewed by Simon Fraser.
+
+ Ensure the gradient background-image is drawn correctly when it is repeated
+ with spaces.
+
+ * fast/gradients/background-image-repeat-space-expected.html: Added.
+ * fast/gradients/background-image-repeat-space.html: Added.
+
</ins><span class="cx"> 2015-10-14 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> http/tests/xmlhttprequest/xmlhttprequest-overridemimetype-invalidstaterror.html flakily times out during Mac-WK2 tests
</span></span></pre></div>
<a id="trunkLayoutTestsfastgradientsbackgroundimagerepeatspaceexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/gradients/background-image-repeat-space-expected.html (0 => 191048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/gradients/background-image-repeat-space-expected.html (rev 0)
+++ trunk/LayoutTests/fast/gradients/background-image-repeat-space-expected.html 2015-10-14 17:29:18 UTC (rev 191048)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <style>
+ .container {
+ width: 200px;
+ height: 200px;
+ display: inline-block;
+ background-image: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg'><rect fill='lime' width='100%' height='100%'/></svg>");
+ }
+ .fixed-tile {
+ background-size: 30px 30px;
+ }
+ .percentage-tile {
+ background-size: 15% 15%;
+ }
+ .space {
+ background-repeat: space;
+ }
+ .space-repeat {
+ background-repeat: space repeat;
+ }
+ </style>
+</head>
+<body>
+ <div>
+ <div class="container fixed-tile space"></div>
+ <div class="container fixed-tile space-repeat"></div>
+ </div>
+ <div>
+ <div class="container percentage-tile space"></div>
+ <div class="container percentage-tile space-repeat"></div>
+ </div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastgradientsbackgroundimagerepeatspacehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/gradients/background-image-repeat-space.html (0 => 191048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/gradients/background-image-repeat-space.html (rev 0)
+++ trunk/LayoutTests/fast/gradients/background-image-repeat-space.html 2015-10-14 17:29:18 UTC (rev 191048)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <style>
+ .container {
+ width: 200px;
+ height: 200px;
+ display: inline-block;
+ background-image: linear-gradient(lime, lime);
+ }
+ .fixed-tile {
+ background-size: 30px 30px;
+ }
+ .percentage-tile {
+ background-size: 15% 15%;
+ }
+ .space {
+ background-repeat: space;
+ }
+ .space-repeat {
+ background-repeat: space repeat;
+ }
+ </style>
+</head>
+<body>
+ <div>
+ <div class="container fixed-tile space"></div>
+ <div class="container fixed-tile space-repeat"></div>
+ </div>
+ <div>
+ <div class="container percentage-tile space"></div>
+ <div class="container percentage-tile space-repeat"></div>
+ </div>
+</body>
+</html>
+
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191047 => 191048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-14 17:23:12 UTC (rev 191047)
+++ trunk/Source/WebCore/ChangeLog 2015-10-14 17:29:18 UTC (rev 191048)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2015-10-14 Said Abou-Hallawa <sabouhallawa@apple.com>
+
+ REGRESSION(r53318): background-repeat: space with gradients doesn't render correctly
+ https://bugs.webkit.org/show_bug.cgi?id=150068
+
+ Reviewed by Simon Fraser.
+
+ This is a regression of r53318 in which we were trying to make the pattern
+ of the gradient image as small as possible: 1-pixel wide or tall. But this
+ broke the rendering of the background image when container element has the
+ style background-repeat: space. The reason for this is tiling the gradient
+ image is done completely by CG. To do the tiling, we start by creating a
+ CGPattern by calling CGPatternCreate() which takes the rect of the pattern
+ and the step. If the width or the height of the pattern image is adjusted
+ to be 1-pixel wide or tall, that will force CG to leave a space after every
+ it draws the pattern image which is 1-pixel wide or tall which is wrong.
+
+ The fix is to disable this optimization altogether if the container element
+ has the style background-repeat: space.
+
+ Test: fast/gradients/background-image-repeat-space.html
+
+ * platform/graphics/Gradient.cpp:
+ (WebCore::Gradient::adjustParametersForTiledDrawing):
+ * platform/graphics/Gradient.h:
+ * platform/graphics/GradientImage.cpp:
+ (WebCore::GradientImage::drawPattern):
+
</ins><span class="cx"> 2015-10-13 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Add helper funtion for checking pointer equivalency and use it
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGradientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Gradient.cpp (191047 => 191048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Gradient.cpp 2015-10-14 17:23:12 UTC (rev 191047)
+++ trunk/Source/WebCore/platform/graphics/Gradient.cpp 2015-10-14 17:29:18 UTC (rev 191048)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> platformDestroy();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Gradient::adjustParametersForTiledDrawing(FloatSize& size, FloatRect& srcRect)
</del><ins>+void Gradient::adjustParametersForTiledDrawing(FloatSize& size, FloatRect& srcRect, const FloatSize& spacing)
</ins><span class="cx"> {
</span><span class="cx"> if (m_radial)
</span><span class="cx"> return;
</span><span class="lines">@@ -77,6 +77,9 @@
</span><span class="cx"> if (srcRect.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ if (!spacing.isZero())
+ return;
+
</ins><span class="cx"> if (m_p0.x() == m_p1.x()) {
</span><span class="cx"> size.setWidth(1);
</span><span class="cx"> srcRect.setWidth(1);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGradienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Gradient.h (191047 => 191048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Gradient.h 2015-10-14 17:23:12 UTC (rev 191047)
+++ trunk/Source/WebCore/platform/graphics/Gradient.h 2015-10-14 17:29:18 UTC (rev 191048)
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> AffineTransform gradientSpaceTransform() { return m_gradientSpaceTransformation; }
</span><span class="cx">
</span><span class="cx"> void fill(GraphicsContext*, const FloatRect&);
</span><del>- void adjustParametersForTiledDrawing(FloatSize&, FloatRect&);
</del><ins>+ void adjustParametersForTiledDrawing(FloatSize&, FloatRect&, const FloatSize& spacing);
</ins><span class="cx">
</span><span class="cx"> void setPlatformGradientSpaceTransform(const AffineTransform& gradientSpaceTransformation);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGradientImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GradientImage.cpp (191047 => 191048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GradientImage.cpp 2015-10-14 17:23:12 UTC (rev 191047)
+++ trunk/Source/WebCore/platform/graphics/GradientImage.cpp 2015-10-14 17:29:18 UTC (rev 191048)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> // Allow the generator to provide visually-equivalent tiling parameters for better performance.
</span><span class="cx"> FloatSize adjustedSize = size();
</span><span class="cx"> FloatRect adjustedSrcRect = srcRect;
</span><del>- m_gradient->adjustParametersForTiledDrawing(adjustedSize, adjustedSrcRect);
</del><ins>+ m_gradient->adjustParametersForTiledDrawing(adjustedSize, adjustedSrcRect, spacing);
</ins><span class="cx">
</span><span class="cx"> // Factor in the destination context's scale to generate at the best resolution
</span><span class="cx"> AffineTransform destContextCTM = destContext.getCTM(GraphicsContext::DefinitelyIncludeDeviceScale);
</span></span></pre>
</div>
</div>
</body>
</html>