<!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>[189716] releases/WebKitGTK/webkit-2.10</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/189716">189716</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-14 05:35:44 -0700 (Mon, 14 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/189026">r189026</a> - Subpixel positioned iframe's repaint area calculation problem.
https://bugs.webkit.org/show_bug.cgi?id=148422
When the repaint rect position is floored for iframes, we need
to expand the size so that it still covers the content.
Reviewed by Simon Fraser.
Source/WebCore:
Test: fast/repaint/content-inside-subpixel-positioned-iframe.html
* rendering/RenderBox.cpp:
(WebCore::RenderBox::computeRectForRepaint):
LayoutTests:
* fast/repaint/content-inside-subpixel-positioned-iframe-expected.txt: Added.
* fast/repaint/content-inside-subpixel-positioned-iframe.html: Copied from LayoutTests/fast/repaint/hidpi-content-inside-iframe-leaves-trails.html.
* fast/repaint/hidpi-content-inside-iframe-leaves-trails.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastrepainthidpicontentinsideiframeleavestrailsexpectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/repaint/hidpi-content-inside-iframe-leaves-trails-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastrepainthidpicontentinsideiframeleavestrailshtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/repaint/hidpi-content-inside-iframe-leaves-trails.html</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorerenderingRenderBoxcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderBox.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastrepaintcontentinsidesubpixelpositionediframeexpectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/repaint/content-inside-subpixel-positioned-iframe-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastrepaintcontentinsidesubpixelpositionediframehtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/repaint/content-inside-subpixel-positioned-iframe.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog (189715 => 189716)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2015-09-14 12:33:44 UTC (rev 189715)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2015-09-14 12:35:44 UTC (rev 189716)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-08-27 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel positioned iframe's repaint area calculation problem.
+ https://bugs.webkit.org/show_bug.cgi?id=148422
+
+ When the repaint rect position is floored for iframes, we need
+ to expand the size so that it still covers the content.
+
+ Reviewed by Simon Fraser.
+
+ * fast/repaint/content-inside-subpixel-positioned-iframe-expected.txt: Added.
+ * fast/repaint/content-inside-subpixel-positioned-iframe.html: Copied from LayoutTests/fast/repaint/hidpi-content-inside-iframe-leaves-trails.html.
+ * fast/repaint/hidpi-content-inside-iframe-leaves-trails.html:
+
</ins><span class="cx"> 2015-08-26 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> watchdog m_didFire state erroneously retained.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastrepaintcontentinsidesubpixelpositionediframeexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/repaint/content-inside-subpixel-positioned-iframe-expected.txt (0 => 189716)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/repaint/content-inside-subpixel-positioned-iframe-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/repaint/content-inside-subpixel-positioned-iframe-expected.txt 2015-09-14 12:35:44 UTC (rev 189716)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+PASS repaintRects.indexOf('rect 0 0 11 11') is not -1
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastrepaintcontentinsidesubpixelpositionediframehtmlfromrev189715releasesWebKitGTKwebkit210LayoutTestsfastrepainthidpicontentinsideiframeleavestrailshtml"></a>
<div class="copfile"><h4>Copied: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/repaint/content-inside-subpixel-positioned-iframe.html (from rev 189715, releases/WebKitGTK/webkit-2.10/LayoutTests/fast/repaint/hidpi-content-inside-iframe-leaves-trails.html) (0 => 189716)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/repaint/content-inside-subpixel-positioned-iframe.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/repaint/content-inside-subpixel-positioned-iframe.html 2015-09-14 12:35:44 UTC (rev 189716)
</span><span class="lines">@@ -0,0 +1,55 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that subpixel positioned iframe content's repaint rect is properly calculated.</title>
+<script>jsTestIsAsync = true;</script>
+<script src="../../resources/js-test-pre.js"></script>
+<script>
+ if (window.testRunner && window.internals) {
+ testRunner.dumpAsText(false);
+ internals.startTrackingRepaints();
+ }
+
+var repaintRects;
+function test() {
+ setTimeout(function() {
+ var iframeDocument = window.frames["embeddedFrame"].document;
+ var divInsideIframe = iframeDocument.getElementById("foo");
+ divInsideIframe.style.left = "20px";
+ divInsideIframe.style.top = "20px";
+ iframeDocument.body.offsetWidth;
+ if (window.testRunner && window.internals) {
+ repaintRects = internals.repaintRectsAsText();
+ shouldNotBe("repaintRects.indexOf('rect 0 0 11 11')", "-1");
+ internals.stopTrackingRepaints();
+ finishJSTest();
+ }
+ }, 10);
+ }
+</script>
+</head>
+<body>
+ <iframe onload="test()" name="embeddedFrame" style="position:absolute; top: 0.5px; left: 0.5px; width: 200px; height: 200px" frameBorder=0; srcdoc='
+ <!DOCTYPE html>
+ <html>
+ <head>
+ <style>
+ div {
+ position: absolute;
+ background: red;
+ height: 10px;
+ width: 10px;
+ top: 0px;
+ left: 0px;
+ }
+ </style>
+ </head>
+ <body>
+ <div id=foo></div>
+ </body>
+ </html>'>
+ </iframe>
+</body>
+<script src="../../resources/js-test-post.js"></script>
+</html>
+
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastrepainthidpicontentinsideiframeleavestrailsexpectedtxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/repaint/hidpi-content-inside-iframe-leaves-trails-expected.txt (189715 => 189716)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/repaint/hidpi-content-inside-iframe-leaves-trails-expected.txt 2015-09-14 12:33:44 UTC (rev 189715)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/repaint/hidpi-content-inside-iframe-leaves-trails-expected.txt 2015-09-14 12:35:44 UTC (rev 189716)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-PASS repaintRects.indexOf('rect 0 0 101 100') is not -1
</del><ins>+PASS repaintRects.indexOf('rect 0 0 101.50 100') is not -1
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastrepainthidpicontentinsideiframeleavestrailshtml"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/repaint/hidpi-content-inside-iframe-leaves-trails.html (189715 => 189716)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/repaint/hidpi-content-inside-iframe-leaves-trails.html 2015-09-14 12:33:44 UTC (rev 189715)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/repaint/hidpi-content-inside-iframe-leaves-trails.html 2015-09-14 12:35:44 UTC (rev 189716)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> iframeDocument.body.offsetWidth;
</span><span class="cx"> if (window.testRunner && window.internals) {
</span><span class="cx"> repaintRects = internals.repaintRectsAsText();
</span><del>- shouldNotBe("repaintRects.indexOf('rect 0 0 101 100')", "-1");
</del><ins>+ shouldNotBe("repaintRects.indexOf('rect 0 0 101.50 100')", "-1");
</ins><span class="cx"> internals.stopTrackingRepaints();
</span><span class="cx"> finishJSTest();
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (189715 => 189716)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-09-14 12:33:44 UTC (rev 189715)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-09-14 12:35:44 UTC (rev 189716)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-08-27 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel positioned iframe's repaint area calculation problem.
+ https://bugs.webkit.org/show_bug.cgi?id=148422
+
+ When the repaint rect position is floored for iframes, we need
+ to expand the size so that it still covers the content.
+
+ Reviewed by Simon Fraser.
+
+ Test: fast/repaint/content-inside-subpixel-positioned-iframe.html
+
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::computeRectForRepaint):
+
</ins><span class="cx"> 2015-08-26 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> watchdog m_didFire state erroneously retained.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderBox.cpp (189715 => 189716)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderBox.cpp 2015-09-14 12:33:44 UTC (rev 189715)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderBox.cpp 2015-09-14 12:35:44 UTC (rev 189716)
</span><span class="lines">@@ -2263,12 +2263,15 @@
</span><span class="cx">
</span><span class="cx"> LayoutSize locationOffset = this->locationOffset();
</span><span class="cx"> // FIXME: This is needed as long as RenderWidget snaps to integral size/position.
</span><del>- if (isRenderReplaced() && isWidget())
- locationOffset = toIntSize(flooredIntPoint(locationOffset));
</del><ins>+ if (isRenderReplaced() && isWidget()) {
+ LayoutSize flooredLocationOffset = toIntSize(flooredIntPoint(locationOffset));
+ rect.expand(locationOffset - flooredLocationOffset);
+ locationOffset = flooredLocationOffset;
+ }
</ins><span class="cx"> LayoutPoint topLeft = rect.location();
</span><span class="cx"> topLeft.move(locationOffset);
</span><span class="cx">
</span><del>- // We are now in our parent container's coordinate space. Apply our transform to obtain a bounding box
</del><ins>+ // We are now in our parent container's coordinate space. Apply our transform to obtain a bounding box
</ins><span class="cx"> // in the parent's coordinate space that encloses us.
</span><span class="cx"> if (hasLayer() && layer()->transform()) {
</span><span class="cx"> fixed = position == FixedPosition;
</span></span></pre>
</div>
</div>
</body>
</html>