<!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>[199408] releases/WebKitGTK/webkit-2.12</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/199408">199408</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-04-12 23:37:10 -0700 (Tue, 12 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/198309">r198309</a> - Subpixel rendering: Directly composited image layers need pixelsnapping.
https://bugs.webkit.org/show_bug.cgi?id=155558
Reviewed by Simon Fraser.
In order to match non-composited image size/position, we need to pixelsnap both the contents and the clipping
layer bounds for directly composited images.
Source/WebCore:
Test: fast/images/hidpi-directly-composited-image-on-subpixel-position.html
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::resetContentsRect):
(WebCore::RenderLayerBacking::updateChildClippingStrategy):
(WebCore::RenderLayerBacking::updateImageContents):
LayoutTests:
* fast/images/hidpi-directly-composited-image-on-subpixel-position-expected.html: Added.
* fast/images/hidpi-directly-composited-image-on-subpixel-position.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCorerenderingRenderLayerBackingcpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsfastimageshidpidirectlycompositedimageonsubpixelpositionexpectedhtml">releases/WebKitGTK/webkit-2.12/LayoutTests/fast/images/hidpi-directly-composited-image-on-subpixel-position-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsfastimageshidpidirectlycompositedimageonsubpixelpositionhtml">releases/WebKitGTK/webkit-2.12/LayoutTests/fast/images/hidpi-directly-composited-image-on-subpixel-position.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit212LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog (199407 => 199408)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog        2016-04-13 06:35:49 UTC (rev 199407)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog        2016-04-13 06:37:10 UTC (rev 199408)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-03-16 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel rendering: Directly composited image layers need pixelsnapping.
+ https://bugs.webkit.org/show_bug.cgi?id=155558
+
+ Reviewed by Simon Fraser.
+
+ In order to match non-composited image size/position, we need to pixelsnap both the contents and the clipping
+ layer bounds for directly composited images.
+
+ * fast/images/hidpi-directly-composited-image-on-subpixel-position-expected.html: Added.
+ * fast/images/hidpi-directly-composited-image-on-subpixel-position.html: Added.
+
</ins><span class="cx"> 2016-03-16 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> URL Parsing should signal failure for illegal IDN
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestsfastimageshidpidirectlycompositedimageonsubpixelpositionexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/images/hidpi-directly-composited-image-on-subpixel-position-expected.html (0 => 199408)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/images/hidpi-directly-composited-image-on-subpixel-position-expected.html         (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/images/hidpi-directly-composited-image-on-subpixel-position-expected.html        2016-04-13 06:37:10 UTC (rev 199408)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that we position directly composited images properly.</title>
+<style>
+img {
+ position: absolute;
+ width: 10px;
+ height: 10px;
+ }
+</style>
+</head>
+<body>
+<div id=container></div>
+</body>
+<script>
+var container = document.getElementById("container");
+var offset = 0;
+for (i = 0; i < 20; ++i) {
+ for (j = 0; j < 20; ++j) {
+ var element = document.createElement("img");
+ element.src = "./resources/green-24x24.jpg";
+ element.style.top = 15 * i + offset;
+ element.style.left = 15 * j + offset;
+ container.appendChild(element);
+ }
+ offset += 0.2;
+}
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestsfastimageshidpidirectlycompositedimageonsubpixelpositionhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/images/hidpi-directly-composited-image-on-subpixel-position.html (0 => 199408)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/images/hidpi-directly-composited-image-on-subpixel-position.html         (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/images/hidpi-directly-composited-image-on-subpixel-position.html        2016-04-13 06:37:10 UTC (rev 199408)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that we position directly composited images properly.</title>
+<style>
+img {
+ position: absolute;
+ width: 10px;
+ height: 10px;
+ -webkit-transform: translateZ(0);
+ }
+</style>
+</head>
+<body>
+<div id=container></div>
+</body>
+<script>
+var container = document.getElementById("container");
+var offset = 0;
+for (i = 0; i < 20; ++i) {
+ for (j = 0; j < 20; ++j) {
+ var element = document.createElement("img");
+ element.src = "./resources/green-24x24.jpg";
+ element.style.top = 15 * i + offset;
+ element.style.left = 15 * j + offset;
+ container.appendChild(element);
+ }
+ offset += 0.2;
+}
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (199407 => 199408)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog        2016-04-13 06:35:49 UTC (rev 199407)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog        2016-04-13 06:37:10 UTC (rev 199408)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-03-16 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel rendering: Directly composited image layers need pixelsnapping.
+ https://bugs.webkit.org/show_bug.cgi?id=155558
+
+ Reviewed by Simon Fraser.
+
+ In order to match non-composited image size/position, we need to pixelsnap both the contents and the clipping
+ layer bounds for directly composited images.
+
+ Test: fast/images/hidpi-directly-composited-image-on-subpixel-position.html
+
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::resetContentsRect):
+ (WebCore::RenderLayerBacking::updateChildClippingStrategy):
+ (WebCore::RenderLayerBacking::updateImageContents):
+
</ins><span class="cx"> 2016-03-16 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix assertion failure on drive.google.com after r196052
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderLayerBacking.cpp (199407 => 199408)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderLayerBacking.cpp        2016-04-13 06:35:49 UTC (rev 199407)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderLayerBacking.cpp        2016-04-13 06:37:10 UTC (rev 199408)
</span><span class="lines">@@ -1205,12 +1205,12 @@
</span><span class="cx">
</span><span class="cx"> void RenderLayerBacking::resetContentsRect()
</span><span class="cx"> {
</span><del>- m_graphicsLayer->setContentsRect(snappedIntRect(contentsBox()));
</del><ins>+ m_graphicsLayer->setContentsRect(snapRectToDevicePixels(contentsBox(), deviceScaleFactor()));
</ins><span class="cx">
</span><span class="cx"> if (is<RenderBox>(renderer())) {
</span><span class="cx"> LayoutRect boxRect(LayoutPoint(), downcast<RenderBox>(renderer()).size());
</span><ins>+ boxRect.move(contentOffsetInCompostingLayer());
</ins><span class="cx"> FloatRoundedRect contentsClippingRect = renderer().style().getRoundedInnerBorderFor(boxRect).pixelSnappedRoundedRectForPainting(deviceScaleFactor());
</span><del>- contentsClippingRect.move(contentOffsetInCompostingLayer());
</del><span class="cx"> m_graphicsLayer->setContentsClippingRect(contentsClippingRect);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1549,8 +1549,8 @@
</span><span class="cx"> if (is<RenderBox>(renderer()) && (renderer().style().clipPath() || renderer().style().hasBorderRadius())) {
</span><span class="cx"> // FIXME: we shouldn't get geometry here as layout may not have been udpated.
</span><span class="cx"> LayoutRect boxRect(LayoutPoint(), downcast<RenderBox>(renderer()).size());
</span><ins>+ boxRect.move(contentOffsetInCompostingLayer());
</ins><span class="cx"> FloatRoundedRect contentsClippingRect = renderer().style().getRoundedInnerBorderFor(boxRect).pixelSnappedRoundedRectForPainting(deviceScaleFactor());
</span><del>- contentsClippingRect.move(contentOffsetInCompostingLayer());
</del><span class="cx"> if (clippingLayer()->setMasksToBoundsRect(contentsClippingRect)) {
</span><span class="cx"> if (m_childClippingMaskLayer)
</span><span class="cx"> m_childClippingMaskLayer = nullptr;
</span><span class="lines">@@ -2062,11 +2062,11 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // This is a no-op if the layer doesn't have an inner layer for the image.
</span><del>- m_graphicsLayer->setContentsRect(snappedIntRect(contentsBox()));
</del><ins>+ m_graphicsLayer->setContentsRect(snapRectToDevicePixels(contentsBox(), deviceScaleFactor()));
</ins><span class="cx">
</span><span class="cx"> LayoutRect boxRect(LayoutPoint(), imageRenderer.size());
</span><ins>+ boxRect.move(contentOffsetInCompostingLayer());
</ins><span class="cx"> FloatRoundedRect contentsClippingRect = renderer().style().getRoundedInnerBorderFor(boxRect).pixelSnappedRoundedRectForPainting(deviceScaleFactor());
</span><del>- contentsClippingRect.move(contentOffsetInCompostingLayer());
</del><span class="cx"> m_graphicsLayer->setContentsClippingRect(contentsClippingRect);
</span><span class="cx">
</span><span class="cx"> m_graphicsLayer->setContentsToImage(image);
</span></span></pre>
</div>
</div>
</body>
</html>