<!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>[207721] 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/207721">207721</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-10-22 19:43:42 -0700 (Sat, 22 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix repainting of slow repaint objects in WK1 when page scale is applied
https://bugs.webkit.org/show_bug.cgi?id=163854
Reviewed by Zalan Bujtas.
Source/WebCore:
RenderObject::repaintSlowRepaintObject() always set the repaint container to the RenderView
if it was null. This is before the call to clippedOverflowRectForRepaint(). If that function
is called with a null repaintContainer, it maps the rect up through the RenderView's transform
(which represents page scale), which is what we want here. Passing the RenderView itself
stops the transform from being applied, which led to the bug.
WebKit2 doesn't suffer from this bug because containerForRepaint() always returns the
composited RenderView.
Test: fast/repaint/zoomed-fixed-background.html
* rendering/RenderObject.cpp:
(WebCore::RenderObject::repaintSlowRepaintObject):
LayoutTests:
Test that logs the repaint rect after scrolling a page with an element
with a fixed background. The WebKit1 result is the interesting one.
* fast/repaint/zoomed-fixed-background-expected.txt: Added.
* fast/repaint/zoomed-fixed-background.html: Added.
* platform/mac-wk1/fast/repaint/zoomed-fixed-background-expected.txt: 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="#trunkSourceWebCorerenderingRenderObjectcpp">trunk/Source/WebCore/rendering/RenderObject.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastrepaintzoomedfixedbackgroundexpectedtxt">trunk/LayoutTests/fast/repaint/zoomed-fixed-background-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastrepaintzoomedfixedbackgroundhtml">trunk/LayoutTests/fast/repaint/zoomed-fixed-background.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk1fastrepaintzoomedfixedbackgroundexpectedtxt">trunk/LayoutTests/platform/mac-wk1/fast/repaint/zoomed-fixed-background-expected.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (207720 => 207721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-10-23 01:05:07 UTC (rev 207720)
+++ trunk/LayoutTests/ChangeLog 2016-10-23 02:43:42 UTC (rev 207721)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-10-22 Simon Fraser <simon.fraser@apple.com>
+
+ Fix repainting of slow repaint objects in WK1 when page scale is applied
+ https://bugs.webkit.org/show_bug.cgi?id=163854
+
+ Reviewed by Zalan Bujtas.
+
+ Test that logs the repaint rect after scrolling a page with an element
+ with a fixed background. The WebKit1 result is the interesting one.
+
+ * fast/repaint/zoomed-fixed-background-expected.txt: Added.
+ * fast/repaint/zoomed-fixed-background.html: Added.
+ * platform/mac-wk1/fast/repaint/zoomed-fixed-background-expected.txt: Added.
+
</ins><span class="cx"> 2016-10-22 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Move HTML canvas and tracks from ExceptionCode to Exception
</span></span></pre></div>
<a id="trunkLayoutTestsfastrepaintzoomedfixedbackgroundexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/repaint/zoomed-fixed-background-expected.txt (0 => 207721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/repaint/zoomed-fixed-background-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/repaint/zoomed-fixed-background-expected.txt 2016-10-23 02:43:42 UTC (rev 207721)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+(repaint rects (rect 10 -200 100 100) )
</ins></span></pre></div>
<a id="trunkLayoutTestsfastrepaintzoomedfixedbackgroundhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/repaint/zoomed-fixed-background.html (0 => 207721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/repaint/zoomed-fixed-background.html (rev 0)
+++ trunk/LayoutTests/fast/repaint/zoomed-fixed-background.html 2016-10-23 02:43:42 UTC (rev 207721)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ body {
+ height: 1000px;
+ }
+ .box {
+ position: absolute;
+ top: 200px;
+ left: 10px;
+ width: 100px;
+ height: 100px;
+ background-image: linear-gradient(green, green 200px, red 200px, red 1000px);
+ background-attachment: fixed;
+ }
+ </style>
+ <script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+
+ function logRepaints() {
+ if (!window.internals)
+ return;
+
+ document.getElementById('repaints').textContent = window.internals.repaintRectsAsText();
+ window.internals.stopTrackingRepaints();
+ }
+
+ function doTest()
+ {
+ if (window.eventSender)
+ eventSender.scalePageBy(2, 0, 0);
+
+ window.internals.startTrackingRepaints();
+ window.scrollTo(0, 200);
+ logRepaints();
+ }
+
+ window.addEventListener('load', doTest, false);
+ </script>
+</head>
+<body>
+<div class="box"></div>
+<div id="repaints"></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1fastrepaintzoomedfixedbackgroundexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-wk1/fast/repaint/zoomed-fixed-background-expected.txt (0 => 207721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/fast/repaint/zoomed-fixed-background-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-wk1/fast/repaint/zoomed-fixed-background-expected.txt 2016-10-23 02:43:42 UTC (rev 207721)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+(repaint rects (rect 20 0 200 200) )
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207720 => 207721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-23 01:05:07 UTC (rev 207720)
+++ trunk/Source/WebCore/ChangeLog 2016-10-23 02:43:42 UTC (rev 207721)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-10-22 Simon Fraser <simon.fraser@apple.com>
+
+ Fix repainting of slow repaint objects in WK1 when page scale is applied
+ https://bugs.webkit.org/show_bug.cgi?id=163854
+
+ Reviewed by Zalan Bujtas.
+
+ RenderObject::repaintSlowRepaintObject() always set the repaint container to the RenderView
+ if it was null. This is before the call to clippedOverflowRectForRepaint(). If that function
+ is called with a null repaintContainer, it maps the rect up through the RenderView's transform
+ (which represents page scale), which is what we want here. Passing the RenderView itself
+ stops the transform from being applied, which led to the bug.
+
+ WebKit2 doesn't suffer from this bug because containerForRepaint() always returns the
+ composited RenderView.
+
+ Test: fast/repaint/zoomed-fixed-background.html
+
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::repaintSlowRepaintObject):
+
</ins><span class="cx"> 2016-10-22 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Move HTML canvas and tracks from ExceptionCode to Exception
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (207720 => 207721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2016-10-23 01:05:07 UTC (rev 207720)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2016-10-23 02:43:42 UTC (rev 207721)
</span><span class="lines">@@ -885,8 +885,6 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> const RenderLayerModelObject* repaintContainer = containerForRepaint();
</span><del>- if (!repaintContainer)
- repaintContainer = &view;
</del><span class="cx">
</span><span class="cx"> bool shouldClipToLayer = true;
</span><span class="cx"> IntRect repaintRect;
</span></span></pre>
</div>
</div>
</body>
</html>