<!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>[202536] 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/202536">202536</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-06-27 19:58:16 -0700 (Mon, 27 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] -webkit-overflow-scrolling: touch prevents repaint with RTL
https://bugs.webkit.org/show_bug.cgi?id=159186
rdar://problem/26659341
Reviewed by Zalan Bujtas.
Source/WebCore:
There were two issues with repaints in -webkit-overflow-scrolling:touch scrolling
layers.
First, if the scrolled contents were inline (e.g. a <span>), then repaints were
broken because RenderInline didn't call shouldApplyClipAndScrollPositionForRepaint().
Fix by making shouldApplyClipAndScrollPositionForRepaint() a member function of RenderBox
and calling it from RenderBox::computeRectForRepaint() and RenderInline::clippedOverflowRectForRepaint().
Second, repaints were broken in RTL because RenderLayerBacking::setContentsNeedDisplayInRect()
confused scroll offset and scroll position; it needs to subtract scrollPosition.
Finally renamed to applyCachedClipAndScrollOffsetForRepaint() to applyCachedClipAndScrollPositionForRepaint()
to make it clear that it uses scrollPosition, not scrollOffset.
Tests: compositing/scrolling/touch-scrolling-repaint-spans.html
compositing/scrolling/touch-scrolling-repaint.html
* rendering/RenderBox.cpp:
(WebCore::RenderBox::applyCachedClipAndScrollPositionForRepaint):
(WebCore::RenderBox::shouldApplyClipAndScrollPositionForRepaint):
(WebCore::RenderBox::computeRectForRepaint):
(WebCore::RenderBox::applyCachedClipAndScrollOffsetForRepaint): Deleted.
(WebCore::shouldApplyContainersClipAndOffset): Deleted.
* rendering/RenderBox.h:
* rendering/RenderInline.cpp:
(WebCore::RenderInline::clippedOverflowRectForRepaint):
(WebCore::RenderInline::computeRectForRepaint):
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::setContentsNeedDisplayInRect):
* rendering/RenderObject.cpp:
(WebCore::RenderObject::computeRectForRepaint):
LayoutTests:
* compositing/scrolling/touch-scrolling-repaint-expected.html: Added.
* compositing/scrolling/touch-scrolling-repaint-spans-expected.html: Added.
* compositing/scrolling/touch-scrolling-repaint-spans.html: Added.
* compositing/scrolling/touch-scrolling-repaint.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="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxh">trunk/Source/WebCore/rendering/RenderBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderInlinecpp">trunk/Source/WebCore/rendering/RenderInline.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjectcpp">trunk/Source/WebCore/rendering/RenderObject.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscompositingscrollingtouchscrollingrepaintexpectedhtml">trunk/LayoutTests/compositing/scrolling/touch-scrolling-repaint-expected.html</a></li>
<li><a href="#trunkLayoutTestscompositingscrollingtouchscrollingrepaintspansexpectedhtml">trunk/LayoutTests/compositing/scrolling/touch-scrolling-repaint-spans-expected.html</a></li>
<li><a href="#trunkLayoutTestscompositingscrollingtouchscrollingrepaintspanshtml">trunk/LayoutTests/compositing/scrolling/touch-scrolling-repaint-spans.html</a></li>
<li><a href="#trunkLayoutTestscompositingscrollingtouchscrollingrepainthtml">trunk/LayoutTests/compositing/scrolling/touch-scrolling-repaint.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202535 => 202536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-06-28 02:47:23 UTC (rev 202535)
+++ trunk/LayoutTests/ChangeLog 2016-06-28 02:58:16 UTC (rev 202536)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2016-06-27 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ [iOS] -webkit-overflow-scrolling: touch prevents repaint with RTL
+ https://bugs.webkit.org/show_bug.cgi?id=159186
+ rdar://problem/26659341
+
+ Reviewed by Zalan Bujtas.
+
+ * compositing/scrolling/touch-scrolling-repaint-expected.html: Added.
+ * compositing/scrolling/touch-scrolling-repaint-spans-expected.html: Added.
+ * compositing/scrolling/touch-scrolling-repaint-spans.html: Added.
+ * compositing/scrolling/touch-scrolling-repaint.html: Added.
+
+2016-06-27 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> [iOS] Make DumpRenderTree and WebKitTestRunner in the simulator use render server snapshotting
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=159077
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestscompositingscrollingtouchscrollingrepaintexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/scrolling/touch-scrolling-repaint-expected.html (0 => 202536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/scrolling/touch-scrolling-repaint-expected.html (rev 0)
+++ trunk/LayoutTests/compositing/scrolling/touch-scrolling-repaint-expected.html 2016-06-28 02:58:16 UTC (rev 202536)
</span><span class="lines">@@ -0,0 +1,51 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <style>
+ .scroller {
+ margin: 10px;
+ width: 300px;
+ padding: 10px;
+ overflow-y: hidden;
+ overflow-x: scroll;
+ border: 8px solid black;
+ -webkit-overflow-scrolling: touch;
+ }
+
+ .contents {
+ height: 100px;
+ width: 480px;
+ background-color: green;
+ letter-spacing: 12px;
+ color: white;
+ font-size: 28pt;
+ }
+ </style>
+ <script>
+ function doTest()
+ {
+ document.getElementById('scroller2').scrollLeft = 120;
+ document.getElementById('scroller4').scrollLeft = -120;
+ }
+ window.addEventListener('load', doTest, false);
+ </script>
+ </head>
+ <body>
+ <div class="scroller" id="scroller1">
+ <div class='contents'>ABCDEFGHIJKLM</div>
+ </div>
+
+ <div class="scroller" id="scroller2">
+ <div class='contents'>ABCDEFGHIJKLM</div>
+ </div>
+
+ <div class="scroller" id="scroller3" dir="rtl">
+ <div class='contents'>ABCDEFGHIJKLM</div>
+ </div>
+
+ <div class="scroller" id="scroller4" dir="rtl">
+ <div class='contents'>ABCDEFGHIJKLM</div>
+ </div>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscompositingscrollingtouchscrollingrepaintspansexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/scrolling/touch-scrolling-repaint-spans-expected.html (0 => 202536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/scrolling/touch-scrolling-repaint-spans-expected.html (rev 0)
+++ trunk/LayoutTests/compositing/scrolling/touch-scrolling-repaint-spans-expected.html 2016-06-28 02:58:16 UTC (rev 202536)
</span><span class="lines">@@ -0,0 +1,51 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <style>
+ .scroller {
+ margin: 10px;
+ width: 300px;
+ padding: 10px;
+ overflow-y: hidden;
+ overflow-x: scroll;
+ border: 8px solid black;
+ -webkit-overflow-scrolling: touch;
+ }
+
+ .contents {
+ height: 100px;
+ width: 480px;
+ background-color: green;
+ letter-spacing: 12px;
+ color: white;
+ font-size: 28pt;
+ }
+ </style>
+ <script>
+ function doTest()
+ {
+ document.getElementById('scroller2').scrollLeft = 120;
+ document.getElementById('scroller4').scrollLeft = -120;
+ }
+ window.addEventListener('load', doTest, false);
+ </script>
+ </head>
+ <body>
+ <div class="scroller" id="scroller1">
+ <span class='contents'>ABCDEFGHIJKLM</span>
+ </div>
+
+ <div class="scroller" id="scroller2">
+ <span class='contents'>ABCDEFGHIJKLM</span>
+ </div>
+
+ <div class="scroller" id="scroller3" dir="rtl">
+ <span class='contents'>ABCDEFGHIJKLM</span>
+ </div>
+
+ <div class="scroller" id="scroller4" dir="rtl">
+ <span class='contents'>ABCDEFGHIJKLM</span>
+ </div>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscompositingscrollingtouchscrollingrepaintspanshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/scrolling/touch-scrolling-repaint-spans.html (0 => 202536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/scrolling/touch-scrolling-repaint-spans.html (rev 0)
+++ trunk/LayoutTests/compositing/scrolling/touch-scrolling-repaint-spans.html 2016-06-28 02:58:16 UTC (rev 202536)
</span><span class="lines">@@ -0,0 +1,64 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <style>
+ .scroller {
+ margin: 10px;
+ width: 300px;
+ padding: 10px;
+ overflow-y: hidden;
+ overflow-x: scroll;
+ border: 8px solid black;
+ -webkit-overflow-scrolling: touch;
+ }
+
+ .contents {
+ height: 100px;
+ width: 480px;
+ background-color: red;
+ letter-spacing: 12px;
+ color: white;
+ font-size: 28pt;
+ }
+
+ body.changed .contents {
+ background-color: green;
+ }
+ </style>
+ <script>
+ if (window.testRunner)
+ testRunner.waitUntilDone();
+
+ function doTest()
+ {
+ document.getElementById('scroller2').scrollLeft = 120;
+ document.getElementById('scroller4').scrollLeft = -120;
+
+ window.setTimeout(function() {
+ document.body.classList.add('changed');
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }, 0);
+ }
+ window.addEventListener('load', doTest, false);
+ </script>
+ </head>
+ <body>
+ <div class="scroller" id="scroller1">
+ <span class='contents'>ABCDEFGHIJKLM</span>
+ </div>
+
+ <div class="scroller" id="scroller2">
+ <span class='contents'>ABCDEFGHIJKLM</span>
+ </div>
+
+ <div class="scroller" id="scroller3" dir="rtl">
+ <span class='contents'>ABCDEFGHIJKLM</span>
+ </div>
+
+ <div class="scroller" id="scroller4" dir="rtl">
+ <span class='contents'>ABCDEFGHIJKLM</span>
+ </div>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscompositingscrollingtouchscrollingrepainthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/scrolling/touch-scrolling-repaint.html (0 => 202536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/scrolling/touch-scrolling-repaint.html (rev 0)
+++ trunk/LayoutTests/compositing/scrolling/touch-scrolling-repaint.html 2016-06-28 02:58:16 UTC (rev 202536)
</span><span class="lines">@@ -0,0 +1,64 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <style>
+ .scroller {
+ margin: 10px;
+ width: 300px;
+ padding: 10px;
+ overflow-y: hidden;
+ overflow-x: scroll;
+ border: 8px solid black;
+ -webkit-overflow-scrolling: touch;
+ }
+
+ .contents {
+ height: 100px;
+ width: 480px;
+ background-color: red;
+ letter-spacing: 12px;
+ color: white;
+ font-size: 28pt;
+ }
+
+ body.changed .contents {
+ background-color: green;
+ }
+ </style>
+ <script>
+ if (window.testRunner)
+ testRunner.waitUntilDone();
+
+ function doTest()
+ {
+ document.getElementById('scroller2').scrollLeft = 120;
+ document.getElementById('scroller4').scrollLeft = -120;
+
+ window.setTimeout(function() {
+ document.body.classList.add('changed');
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }, 0);
+ }
+ window.addEventListener('load', doTest, false);
+ </script>
+ </head>
+ <body>
+ <div class="scroller" id="scroller1">
+ <div class='contents'>ABCDEFGHIJKLM</div>
+ </div>
+
+ <div class="scroller" id="scroller2">
+ <div class='contents'>ABCDEFGHIJKLM</div>
+ </div>
+
+ <div class="scroller" id="scroller3" dir="rtl">
+ <div class='contents'>ABCDEFGHIJKLM</div>
+ </div>
+
+ <div class="scroller" id="scroller4" dir="rtl">
+ <div class='contents'>ABCDEFGHIJKLM</div>
+ </div>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202535 => 202536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-28 02:47:23 UTC (rev 202535)
+++ trunk/Source/WebCore/ChangeLog 2016-06-28 02:58:16 UTC (rev 202536)
</span><span class="lines">@@ -1,3 +1,43 @@
</span><ins>+2016-06-27 Simon Fraser <simon.fraser@apple.com>
+
+ [iOS] -webkit-overflow-scrolling: touch prevents repaint with RTL
+ https://bugs.webkit.org/show_bug.cgi?id=159186
+ rdar://problem/26659341
+
+ Reviewed by Zalan Bujtas.
+
+ There were two issues with repaints in -webkit-overflow-scrolling:touch scrolling
+ layers.
+
+ First, if the scrolled contents were inline (e.g. a <span>), then repaints were
+ broken because RenderInline didn't call shouldApplyClipAndScrollPositionForRepaint().
+ Fix by making shouldApplyClipAndScrollPositionForRepaint() a member function of RenderBox
+ and calling it from RenderBox::computeRectForRepaint() and RenderInline::clippedOverflowRectForRepaint().
+
+ Second, repaints were broken in RTL because RenderLayerBacking::setContentsNeedDisplayInRect()
+ confused scroll offset and scroll position; it needs to subtract scrollPosition.
+
+ Finally renamed to applyCachedClipAndScrollOffsetForRepaint() to applyCachedClipAndScrollPositionForRepaint()
+ to make it clear that it uses scrollPosition, not scrollOffset.
+
+ Tests: compositing/scrolling/touch-scrolling-repaint-spans.html
+ compositing/scrolling/touch-scrolling-repaint.html
+
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::applyCachedClipAndScrollPositionForRepaint):
+ (WebCore::RenderBox::shouldApplyClipAndScrollPositionForRepaint):
+ (WebCore::RenderBox::computeRectForRepaint):
+ (WebCore::RenderBox::applyCachedClipAndScrollOffsetForRepaint): Deleted.
+ (WebCore::shouldApplyContainersClipAndOffset): Deleted.
+ * rendering/RenderBox.h:
+ * rendering/RenderInline.cpp:
+ (WebCore::RenderInline::clippedOverflowRectForRepaint):
+ (WebCore::RenderInline::computeRectForRepaint):
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::setContentsNeedDisplayInRect):
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::computeRectForRepaint):
+
</ins><span class="cx"> 2016-06-27 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r202436.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (202535 => 202536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2016-06-28 02:47:23 UTC (rev 202535)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2016-06-28 02:58:16 UTC (rev 202536)
</span><span class="lines">@@ -1012,7 +1012,7 @@
</span><span class="cx"> return layer()->size();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderBox::applyCachedClipAndScrollOffsetForRepaint(LayoutRect& paintRect) const
</del><ins>+void RenderBox::applyCachedClipAndScrollPositionForRepaint(LayoutRect& paintRect) const
</ins><span class="cx"> {
</span><span class="cx"> flipForWritingMode(paintRect);
</span><span class="cx"> paintRect.moveBy(-scrollPosition()); // For overflow:auto/scroll/hidden.
</span><span class="lines">@@ -2194,16 +2194,15 @@
</span><span class="cx"> return computeRectForRepaint(r, repaintContainer);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline bool shouldApplyContainersClipAndOffset(const RenderLayerModelObject* repaintContainer, RenderBox* containerBox)
</del><ins>+bool RenderBox::shouldApplyClipAndScrollPositionForRepaint(const RenderLayerModelObject* repaintContainer) const
</ins><span class="cx"> {
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- if (!repaintContainer || repaintContainer != containerBox)
</del><ins>+ if (!repaintContainer || repaintContainer != this)
</ins><span class="cx"> return true;
</span><span class="cx">
</span><del>- return !containerBox->hasLayer() || !containerBox->layer()->usesCompositedScrolling();
</del><ins>+ return !hasLayer() || !layer()->usesCompositedScrolling();
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(repaintContainer);
</span><del>- UNUSED_PARAM(containerBox);
</del><span class="cx"> return true;
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -2309,8 +2308,8 @@
</span><span class="cx"> adjustedRect.setLocation(topLeft);
</span><span class="cx"> if (container->hasOverflowClip()) {
</span><span class="cx"> RenderBox& containerBox = downcast<RenderBox>(*container);
</span><del>- if (shouldApplyContainersClipAndOffset(repaintContainer, &containerBox)) {
- containerBox.applyCachedClipAndScrollOffsetForRepaint(adjustedRect);
</del><ins>+ if (containerBox.shouldApplyClipAndScrollPositionForRepaint(repaintContainer)) {
+ containerBox.applyCachedClipAndScrollPositionForRepaint(adjustedRect);
</ins><span class="cx"> if (adjustedRect.isEmpty())
</span><span class="cx"> return adjustedRect;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.h (202535 => 202536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.h 2016-06-28 02:47:23 UTC (rev 202535)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2016-06-28 02:58:16 UTC (rev 202536)
</span><span class="lines">@@ -577,8 +577,10 @@
</span><span class="cx">
</span><span class="cx"> ScrollPosition scrollPosition() const;
</span><span class="cx"> LayoutSize cachedSizeForOverflowClip() const;
</span><del>- void applyCachedClipAndScrollOffsetForRepaint(LayoutRect& paintRect) const;
</del><span class="cx">
</span><ins>+ bool shouldApplyClipAndScrollPositionForRepaint(const RenderLayerModelObject* repaintContainer) const;
+ void applyCachedClipAndScrollPositionForRepaint(LayoutRect& paintRect) const;
+
</ins><span class="cx"> virtual bool hasRelativeDimensions() const;
</span><span class="cx"> virtual bool hasRelativeLogicalHeight() const;
</span><span class="cx"> virtual bool hasRelativeLogicalWidth() const;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderInlinecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderInline.cpp (202535 => 202536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderInline.cpp 2016-06-28 02:47:23 UTC (rev 202535)
+++ trunk/Source/WebCore/rendering/RenderInline.cpp 2016-06-28 02:58:16 UTC (rev 202536)
</span><span class="lines">@@ -1234,8 +1234,8 @@
</span><span class="cx"> if (hitRepaintContainer || !containingBlock)
</span><span class="cx"> return repaintRect;
</span><span class="cx">
</span><del>- if (containingBlock->hasOverflowClip())
- containingBlock->applyCachedClipAndScrollOffsetForRepaint(repaintRect);
</del><ins>+ if (containingBlock->hasOverflowClip() && containingBlock->shouldApplyClipAndScrollPositionForRepaint(repaintContainer))
+ containingBlock->applyCachedClipAndScrollPositionForRepaint(repaintRect);
</ins><span class="cx">
</span><span class="cx"> repaintRect = containingBlock->computeRectForRepaint(repaintRect, repaintContainer);
</span><span class="cx">
</span><span class="lines">@@ -1296,7 +1296,7 @@
</span><span class="cx"> // its controlClipRect will be wrong. For overflow clip we use the values cached by the layer.
</span><span class="cx"> adjustedRect.setLocation(topLeft);
</span><span class="cx"> if (container->hasOverflowClip()) {
</span><del>- downcast<RenderBox>(*container).applyCachedClipAndScrollOffsetForRepaint(adjustedRect);
</del><ins>+ downcast<RenderBox>(*container).applyCachedClipAndScrollPositionForRepaint(adjustedRect);
</ins><span class="cx"> if (adjustedRect.isEmpty())
</span><span class="cx"> return adjustedRect;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (202535 => 202536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2016-06-28 02:47:23 UTC (rev 202535)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2016-06-28 02:58:16 UTC (rev 202536)
</span><span class="lines">@@ -2284,8 +2284,9 @@
</span><span class="cx"> FloatRect layerDirtyRect = pixelSnappedRectForPainting;
</span><span class="cx"> layerDirtyRect.move(-m_scrollingContentsLayer->offsetFromRenderer() + m_devicePixelFractionFromRenderer);
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- // Account for the fact that RenderLayerBacking::updateGeometry() bakes scrollOffset into offsetFromRenderer on iOS.
- layerDirtyRect.moveBy(-m_owningLayer.scrollOffset() + m_devicePixelFractionFromRenderer);
</del><ins>+ // Account for the fact that RenderLayerBacking::updateGeometry() bakes scrollOffset into offsetFromRenderer on iOS,
+ // but the repaint rect is computed without taking the scroll position into account (see shouldApplyClipAndScrollPositionForRepaint()).
+ layerDirtyRect.moveBy(-m_owningLayer.scrollPosition());
</ins><span class="cx"> #endif
</span><span class="cx"> m_scrollingContentsLayer->setNeedsDisplayInRect(layerDirtyRect, shouldClip);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (202535 => 202536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2016-06-28 02:47:23 UTC (rev 202535)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2016-06-28 02:58:16 UTC (rev 202536)
</span><span class="lines">@@ -978,7 +978,7 @@
</span><span class="cx">
</span><span class="cx"> LayoutRect adjustedRect = rect;
</span><span class="cx"> if (parent->hasOverflowClip()) {
</span><del>- downcast<RenderBox>(*parent).applyCachedClipAndScrollOffsetForRepaint(adjustedRect);
</del><ins>+ downcast<RenderBox>(*parent).applyCachedClipAndScrollPositionForRepaint(adjustedRect);
</ins><span class="cx"> if (adjustedRect.isEmpty())
</span><span class="cx"> return adjustedRect;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>