<!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>[188164] 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/188164">188164</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-08-07 14:30:35 -0700 (Fri, 07 Aug 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Replace RenderObject::isRooted() logic with isDescendantOf().
https://bugs.webkit.org/show_bug.cgi?id=147788

Reviewed by Simon Fraser.

And some related cleanups.

No change in functionality.

* page/FrameView.cpp:
(WebCore::FrameView::scheduleRelayoutOfSubtree):
(WebCore::FrameView::extendedBackgroundRectForPainting):
* rendering/RenderBox.cpp:
(WebCore::RenderBox::paintRootBoxFillLayers):
* rendering/RenderElement.cpp:
(WebCore::shouldRepaintForImageAnimation):
* rendering/RenderObject.cpp:
(WebCore::RenderObject::isDescendantOf):
(WebCore::scheduleRelayoutForSubtree):
(WebCore::RenderObject::repaint):
(WebCore::RenderObject::repaintRectangle):
(WebCore::RenderObject::repaintSlowRepaintObject):
(WebCore::RenderObject::isRooted):
* rendering/RenderObject.h:
* 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="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjectcpp">trunk/Source/WebCore/rendering/RenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjecth">trunk/Source/WebCore/rendering/RenderObject.h</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 (188163 => 188164)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-08-07 21:25:34 UTC (rev 188163)
+++ trunk/Source/WebCore/ChangeLog        2015-08-07 21:30:35 UTC (rev 188164)
</span><span class="lines">@@ -1,5 +1,36 @@
</span><span class="cx"> 2015-08-07  Zalan Bujtas  &lt;zalan@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Replace RenderObject::isRooted() logic with isDescendantOf().
+        https://bugs.webkit.org/show_bug.cgi?id=147788
+
+        Reviewed by Simon Fraser.
+
+        And some related cleanups.
+
+        No change in functionality.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::scheduleRelayoutOfSubtree):
+        (WebCore::FrameView::extendedBackgroundRectForPainting):
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::paintRootBoxFillLayers):
+        * rendering/RenderElement.cpp:
+        (WebCore::shouldRepaintForImageAnimation):
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::isDescendantOf):
+        (WebCore::scheduleRelayoutForSubtree):
+        (WebCore::RenderObject::repaint):
+        (WebCore::RenderObject::repaintRectangle):
+        (WebCore::RenderObject::repaintSlowRepaintObject):
+        (WebCore::RenderObject::isRooted):
+        * rendering/RenderObject.h:
+        * rendering/RenderView.cpp:
+        (WebCore::RenderView::unextendedBackgroundRect):
+        (WebCore::RenderView::backgroundRect):
+        * rendering/RenderView.h:
+
+2015-08-07  Zalan Bujtas  &lt;zalan@apple.com&gt;
+
</ins><span class="cx">         Subtree layout code should use RenderElement.
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=147694
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (188163 => 188164)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp        2015-08-07 21:25:34 UTC (rev 188163)
+++ trunk/Source/WebCore/page/FrameView.cpp        2015-08-07 21:30:35 UTC (rev 188164)
</span><span class="lines">@@ -2581,7 +2581,7 @@
</span><span class="cx"> void FrameView::scheduleRelayoutOfSubtree(RenderElement&amp; newRelayoutRoot)
</span><span class="cx"> {
</span><span class="cx">     ASSERT(renderView());
</span><del>-    RenderView&amp; renderView = *this-&gt;renderView();
</del><ins>+    const RenderView&amp; renderView = *this-&gt;renderView();
</ins><span class="cx"> 
</span><span class="cx">     // Try to catch unnecessary work during render tree teardown.
</span><span class="cx">     ASSERT(!renderView.documentBeingDestroyed());
</span><span class="lines">@@ -2879,7 +2879,7 @@
</span><span class="cx">     if (!renderView)
</span><span class="cx">         return IntRect();
</span><span class="cx">     
</span><del>-    LayoutRect extendedRect = renderView-&gt;unextendedBackgroundRect(renderView);
</del><ins>+    LayoutRect extendedRect = renderView-&gt;unextendedBackgroundRect();
</ins><span class="cx">     if (!tiledBacking-&gt;hasMargins())
</span><span class="cx">         return snappedIntRect(extendedRect);
</span><span class="cx">     
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (188163 => 188164)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp        2015-08-07 21:25:34 UTC (rev 188163)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp        2015-08-07 21:30:35 UTC (rev 188164)
</span><span class="lines">@@ -1249,7 +1249,7 @@
</span><span class="cx">     const FillLayer* bgLayer = rootBackgroundRenderer.style().backgroundLayers();
</span><span class="cx">     Color bgColor = rootBackgroundRenderer.style().visitedDependentColor(CSSPropertyBackgroundColor);
</span><span class="cx"> 
</span><del>-    paintFillLayers(paintInfo, bgColor, bgLayer, view().backgroundRect(this), BackgroundBleedNone, CompositeSourceOver, &amp;rootBackgroundRenderer);
</del><ins>+    paintFillLayers(paintInfo, bgColor, bgLayer, view().backgroundRect(), BackgroundBleedNone, CompositeSourceOver, &amp;rootBackgroundRenderer);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> BackgroundBleedAvoidance RenderBox::determineBackgroundBleedAvoidance(GraphicsContext* context) const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (188163 => 188164)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp        2015-08-07 21:25:34 UTC (rev 188163)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp        2015-08-07 21:30:35 UTC (rev 188164)
</span><span class="lines">@@ -1446,7 +1446,7 @@
</span><span class="cx">         backgroundIsPaintedByRoot = !rootRenderer.hasBackground();
</span><span class="cx"> 
</span><span class="cx">     }
</span><del>-    LayoutRect backgroundPaintingRect = backgroundIsPaintedByRoot ? renderer.view().backgroundRect(&amp;renderer.view()) : renderer.absoluteClippedOverflowRect();
</del><ins>+    LayoutRect backgroundPaintingRect = backgroundIsPaintedByRoot ? renderer.view().backgroundRect() : renderer.absoluteClippedOverflowRect();
</ins><span class="cx">     if (!visibleRect.intersects(enclosingIntRect(backgroundPaintingRect)))
</span><span class="cx">         return false;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (188163 => 188164)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp        2015-08-07 21:25:34 UTC (rev 188163)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp        2015-08-07 21:30:35 UTC (rev 188164)
</span><span class="lines">@@ -141,10 +141,10 @@
</span><span class="cx">     return document().page()-&gt;theme();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool RenderObject::isDescendantOf(const RenderObject* obj) const
</del><ins>+bool RenderObject::isDescendantOf(const RenderObject* ancestor) const
</ins><span class="cx"> {
</span><del>-    for (const RenderObject* r = this; r; r = r-&gt;m_parent) {
-        if (r == obj)
</del><ins>+    for (const RenderObject* renderer = this; renderer; renderer = renderer-&gt;m_parent) {
+        if (renderer == ancestor)
</ins><span class="cx">             return true;
</span><span class="cx">     }
</span><span class="cx">     return false;
</span><span class="lines">@@ -571,13 +571,13 @@
</span><span class="cx"> 
</span><span class="cx"> static void scheduleRelayoutForSubtree(RenderElement&amp; renderer)
</span><span class="cx"> {
</span><del>-    if (!is&lt;RenderView&gt;(renderer)) {
-        if (!renderer.isRooted())
-            return;
-        renderer.view().frameView().scheduleRelayoutOfSubtree(renderer);
</del><ins>+    if (is&lt;RenderView&gt;(renderer)) {
+        downcast&lt;RenderView&gt;(renderer).frameView().scheduleRelayout();
</ins><span class="cx">         return;
</span><span class="cx">     }
</span><del>-    downcast&lt;RenderView&gt;(renderer).frameView().scheduleRelayout();
</del><ins>+
+    if (renderer.isRooted())
+        renderer.view().frameView().scheduleRelayoutOfSubtree(renderer);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void RenderObject::markContainingBlocksForLayout(ScheduleRelayout scheduleRelayout, RenderElement* newRoot)
</span><span class="lines">@@ -1249,61 +1249,58 @@
</span><span class="cx"> void RenderObject::repaint() const
</span><span class="cx"> {
</span><span class="cx">     // Don't repaint if we're unrooted (note that view() still returns the view when unrooted)
</span><del>-    RenderView* view;
-    if (!isRooted(&amp;view))
</del><ins>+    if (!isRooted())
</ins><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    if (view-&gt;printing())
-        return; // Don't repaint if we're printing.
</del><ins>+    const RenderView&amp; view = this-&gt;view();
+    if (view.printing())
+        return;
</ins><span class="cx"> 
</span><span class="cx">     RenderLayerModelObject* repaintContainer = containerForRepaint();
</span><del>-    repaintUsingContainer(repaintContainer ? repaintContainer : view, clippedOverflowRectForRepaint(repaintContainer));
</del><ins>+    repaintUsingContainer(repaintContainer ? repaintContainer : &amp;view, clippedOverflowRectForRepaint(repaintContainer));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void RenderObject::repaintRectangle(const LayoutRect&amp; r, bool shouldClipToLayer) const
</span><span class="cx"> {
</span><span class="cx">     // Don't repaint if we're unrooted (note that view() still returns the view when unrooted)
</span><del>-    RenderView* view;
-    if (!isRooted(&amp;view))
</del><ins>+    if (!isRooted())
</ins><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    if (view-&gt;printing())
-        return; // Don't repaint if we're printing.
</del><ins>+    const RenderView&amp; view = this-&gt;view();
+    if (view.printing())
+        return;
</ins><span class="cx"> 
</span><span class="cx">     LayoutRect dirtyRect(r);
</span><del>-
</del><span class="cx">     // FIXME: layoutDelta needs to be applied in parts before/after transforms and
</span><span class="cx">     // repaint containers. https://bugs.webkit.org/show_bug.cgi?id=23308
</span><del>-    dirtyRect.move(view-&gt;layoutDelta());
</del><ins>+    dirtyRect.move(view.layoutDelta());
</ins><span class="cx"> 
</span><span class="cx">     RenderLayerModelObject* repaintContainer = containerForRepaint();
</span><span class="cx">     computeRectForRepaint(repaintContainer, dirtyRect);
</span><del>-    repaintUsingContainer(repaintContainer ? repaintContainer : view, dirtyRect, shouldClipToLayer);
</del><ins>+    repaintUsingContainer(repaintContainer ? repaintContainer : &amp;view, dirtyRect, shouldClipToLayer);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void RenderObject::repaintSlowRepaintObject() const
</span><span class="cx"> {
</span><span class="cx">     // Don't repaint if we're unrooted (note that view() still returns the view when unrooted)
</span><del>-    RenderView* view;
-    if (!isRooted(&amp;view))
</del><ins>+    if (!isRooted())
</ins><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    // Don't repaint if we're printing.
-    if (view-&gt;printing())
</del><ins>+    const RenderView&amp; view = this-&gt;view();
+    if (view.printing())
</ins><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    RenderLayerModelObject* repaintContainer = containerForRepaint();
</del><ins>+    const RenderLayerModelObject* repaintContainer = containerForRepaint();
</ins><span class="cx">     if (!repaintContainer)
</span><del>-        repaintContainer = view;
</del><ins>+        repaintContainer = &amp;view;
</ins><span class="cx"> 
</span><span class="cx">     bool shouldClipToLayer = true;
</span><span class="cx">     IntRect repaintRect;
</span><del>-
</del><span class="cx">     // If this is the root background, we need to check if there is an extended background rect. If
</span><span class="cx">     // there is, then we should not allow painting to clip to the layer size.
</span><span class="cx">     if (isRoot() || isBody()) {
</span><del>-        shouldClipToLayer = !view-&gt;frameView().hasExtendedBackgroundRectForPainting();
-        repaintRect = snappedIntRect(view-&gt;backgroundRect(view));
</del><ins>+        shouldClipToLayer = !view.frameView().hasExtendedBackgroundRectForPainting();
+        repaintRect = snappedIntRect(view.backgroundRect());
</ins><span class="cx">     } else
</span><span class="cx">         repaintRect = snappedIntRect(clippedOverflowRectForRepaint(repaintContainer));
</span><span class="cx"> 
</span><span class="lines">@@ -1764,19 +1761,9 @@
</span><span class="cx">     return LayoutRect();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool RenderObject::isRooted(RenderView** view) const
</del><ins>+bool RenderObject::isRooted() const
</ins><span class="cx"> {
</span><del>-    const RenderObject* renderer = this;
-    while (renderer-&gt;parent())
-        renderer = renderer-&gt;parent();
-
-    if (!is&lt;RenderView&gt;(*renderer))
-        return false;
-
-    if (view)
-        *view = const_cast&lt;RenderView*&gt;(downcast&lt;RenderView&gt;(renderer));
-
-    return true;
</del><ins>+    return isDescendantOf(&amp;view());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> RespectImageOrientationEnum RenderObject::shouldRespectImageOrientation() const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.h (188163 => 188164)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.h        2015-08-07 21:25:34 UTC (rev 188163)
+++ trunk/Source/WebCore/rendering/RenderObject.h        2015-08-07 21:30:35 UTC (rev 188164)
</span><span class="lines">@@ -568,8 +568,8 @@
</span><span class="cx"> 
</span><span class="cx">     RenderView&amp; view() const { return *document().renderView(); };
</span><span class="cx"> 
</span><del>-    // Returns true if this renderer is rooted, and optionally returns the hosting view (the root of the hierarchy).
-    bool isRooted(RenderView** = nullptr) const;
</del><ins>+    // Returns true if this renderer is rooted.
+    bool isRooted() const;
</ins><span class="cx"> 
</span><span class="cx">     Node* node() const { return isAnonymous() ? nullptr : &amp;m_node; }
</span><span class="cx">     Node* nonPseudoNode() const { return isPseudoElement() ? nullptr : node(); }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.cpp (188163 => 188164)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.cpp        2015-08-07 21:25:34 UTC (rev 188163)
+++ trunk/Source/WebCore/rendering/RenderView.cpp        2015-08-07 21:30:35 UTC (rev 188164)
</span><span class="lines">@@ -1162,19 +1162,19 @@
</span><span class="cx">     return rootObject-&gt;rendererForRootBackground().hasEntirelyFixedBackground();
</span><span class="cx"> }
</span><span class="cx">     
</span><del>-LayoutRect RenderView::unextendedBackgroundRect(RenderBox*) const
</del><ins>+LayoutRect RenderView::unextendedBackgroundRect() const
</ins><span class="cx"> {
</span><span class="cx">     // FIXME: What is this? Need to patch for new columns?
</span><span class="cx">     return unscaledDocumentRect();
</span><span class="cx"> }
</span><span class="cx">     
</span><del>-LayoutRect RenderView::backgroundRect(RenderBox* backgroundRenderer) const
</del><ins>+LayoutRect RenderView::backgroundRect() const
</ins><span class="cx"> {
</span><span class="cx">     // FIXME: New columns care about this?
</span><span class="cx">     if (frameView().hasExtendedBackgroundRectForPainting())
</span><span class="cx">         return frameView().extendedBackgroundRectForPainting();
</span><span class="cx"> 
</span><del>-    return unextendedBackgroundRect(backgroundRenderer);
</del><ins>+    return unextendedBackgroundRect();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> IntRect RenderView::documentRect() const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.h (188163 => 188164)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.h        2015-08-07 21:25:34 UTC (rev 188163)
+++ trunk/Source/WebCore/rendering/RenderView.h        2015-08-07 21:30:35 UTC (rev 188164)
</span><span class="lines">@@ -188,8 +188,8 @@
</span><span class="cx">     WEBCORE_EXPORT bool usesCompositing() const;
</span><span class="cx"> 
</span><span class="cx">     WEBCORE_EXPORT IntRect unscaledDocumentRect() const;
</span><del>-    LayoutRect unextendedBackgroundRect(RenderBox* backgroundRenderer) const;
-    LayoutRect backgroundRect(RenderBox* backgroundRenderer) const;
</del><ins>+    LayoutRect unextendedBackgroundRect() const;
+    LayoutRect backgroundRect() const;
</ins><span class="cx"> 
</span><span class="cx">     WEBCORE_EXPORT IntRect documentRect() const;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>