<!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>[166895] trunk/Source/WebCore</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/166895">166895</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2014-04-07 17:04:20 -0700 (Mon, 07 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/163194">r163194</a>-<a href="http://trac.webkit.org/projects/webkit/changeset/163227">r163227</a>): Garbage tiles in overflow of RTL page with
background image
https://bugs.webkit.org/show_bug.cgi?id=131323
-and corresponding-
<rdar://problem/16402013>
Reviewed by Tim Horton.
Returning the TiledBacking::bounds() for the
FrameView::extendedBackgroundRectForPainting() in convenient for ltr pages, but it
is simply incorrect in rtl. There is no easy way to map the rect into the right
coordinate space, so this patch re-works the code to use computations in
RenderView to get the right rect.
Call RenderView::unextendedBackgroundRect() and expand and move it based on the
TiledBacking’s margins.
* page/FrameView.cpp:
(WebCore::FrameView::extendedBackgroundRectForPainting):
The logic that used to be in backgroundRect() has been moved to
unextendedBackgroundRect().
* rendering/RenderView.cpp:
(WebCore::RenderView::unextendedBackgroundRect):
(WebCore::RenderView::backgroundRect):
* rendering/RenderView.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewcpp">trunk/Source/WebCore/rendering/RenderView.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewh">trunk/Source/WebCore/rendering/RenderView.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166894 => 166895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-08 00:01:56 UTC (rev 166894)
+++ trunk/Source/WebCore/ChangeLog 2014-04-08 00:04:20 UTC (rev 166895)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-04-07 Beth Dakin <bdakin@apple.com>
+
+ REGRESSION (r163194-r163227): Garbage tiles in overflow of RTL page with
+ background image
+ https://bugs.webkit.org/show_bug.cgi?id=131323
+ -and corresponding-
+ <rdar://problem/16402013>
+
+ Reviewed by Tim Horton.
+
+ Returning the TiledBacking::bounds() for the
+ FrameView::extendedBackgroundRectForPainting() in convenient for ltr pages, but it
+ is simply incorrect in rtl. There is no easy way to map the rect into the right
+ coordinate space, so this patch re-works the code to use computations in
+ RenderView to get the right rect.
+
+ Call RenderView::unextendedBackgroundRect() and expand and move it based on the
+ TiledBacking’s margins.
+ * page/FrameView.cpp:
+ (WebCore::FrameView::extendedBackgroundRectForPainting):
+
+ The logic that used to be in backgroundRect() has been moved to
+ unextendedBackgroundRect().
+ * rendering/RenderView.cpp:
+ (WebCore::RenderView::unextendedBackgroundRect):
+ (WebCore::RenderView::backgroundRect):
+ * rendering/RenderView.h:
+
</ins><span class="cx"> 2014-04-07 Zoltan Horvath <zoltan@webkit.org>
</span><span class="cx">
</span><span class="cx"> [CSS Shapes] inset complex calc() args vanish in serialized computed style
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (166894 => 166895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2014-04-08 00:01:56 UTC (rev 166894)
+++ trunk/Source/WebCore/page/FrameView.cpp 2014-04-08 00:04:20 UTC (rev 166895)
</span><span class="lines">@@ -2575,8 +2575,18 @@
</span><span class="cx"> TiledBacking* tiledBacking = this->tiledBacking();
</span><span class="cx"> if (!tiledBacking)
</span><span class="cx"> return IntRect();
</span><del>-
- return tiledBacking->bounds();
</del><ins>+
+ RenderView* renderView = this->renderView();
+ if (!renderView)
+ return IntRect();
+
+ LayoutRect extendedRect = renderView->unextendedBackgroundRect(renderView);
+ if (!tiledBacking->hasMargins())
+ return pixelSnappedIntRect(extendedRect);
+
+ extendedRect.moveBy(LayoutPoint(-tiledBacking->leftMarginWidth(), -tiledBacking->topMarginHeight()));
+ extendedRect.expand(LayoutSize(tiledBacking->leftMarginWidth() + tiledBacking->rightMarginWidth(), tiledBacking->topMarginHeight() + tiledBacking->bottomMarginHeight()));
+ return pixelSnappedIntRect(extendedRect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool FrameView::shouldUpdateWhileOffscreen() const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.cpp (166894 => 166895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.cpp 2014-04-08 00:01:56 UTC (rev 166894)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2014-04-08 00:04:20 UTC (rev 166895)
</span><span class="lines">@@ -960,11 +960,11 @@
</span><span class="cx">
</span><span class="cx"> return rootObject->rendererForRootBackground().hasEntirelyFixedBackground();
</span><span class="cx"> }
</span><del>-
-LayoutRect RenderView::backgroundRect(RenderBox* backgroundRenderer) const
</del><ins>+
+LayoutRect RenderView::unextendedBackgroundRect(RenderBox* backgroundRenderer) const
</ins><span class="cx"> {
</span><span class="cx"> if (!hasColumns())
</span><del>- return frameView().hasExtendedBackgroundRectForPainting() ? frameView().extendedBackgroundRectForPainting() : unscaledDocumentRect();
</del><ins>+ return unscaledDocumentRect();
</ins><span class="cx">
</span><span class="cx"> ColumnInfo* columnInfo = this->columnInfo();
</span><span class="cx"> LayoutRect backgroundRect(0, 0, columnInfo->desiredColumnWidth(), columnInfo->columnHeight() * columnInfo->columnCount());
</span><span class="lines">@@ -974,7 +974,15 @@
</span><span class="cx">
</span><span class="cx"> return backgroundRect;
</span><span class="cx"> }
</span><ins>+
+LayoutRect RenderView::backgroundRect(RenderBox* backgroundRenderer) const
+{
+ if (!hasColumns() && frameView().hasExtendedBackgroundRectForPainting())
+ return frameView().extendedBackgroundRectForPainting();
</ins><span class="cx">
</span><ins>+ return unextendedBackgroundRect(backgroundRenderer);
+}
+
</ins><span class="cx"> IntRect RenderView::documentRect() const
</span><span class="cx"> {
</span><span class="cx"> FloatRect overflowRect(unscaledDocumentRect());
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.h (166894 => 166895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.h 2014-04-08 00:01:56 UTC (rev 166894)
+++ trunk/Source/WebCore/rendering/RenderView.h 2014-04-08 00:04:20 UTC (rev 166895)
</span><span class="lines">@@ -176,6 +176,7 @@
</span><span class="cx"> bool usesCompositing() const;
</span><span class="cx">
</span><span class="cx"> IntRect unscaledDocumentRect() const;
</span><ins>+ LayoutRect unextendedBackgroundRect(RenderBox* backgroundRenderer) const;
</ins><span class="cx"> LayoutRect backgroundRect(RenderBox* backgroundRenderer) const;
</span><span class="cx">
</span><span class="cx"> IntRect documentRect() const;
</span></span></pre>
</div>
</div>
</body>
</html>