<!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>[160595] 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/160595">160595</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2013-12-14 04:39:40 -0800 (Sat, 14 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>RenderElement::rendererForRootBackground() should return a reference.
<https://webkit.org/b/125735>
This function always finds a renderer to return.
Reviewed by Antti Koivisto.</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementh">trunk/Source/WebCore/rendering/RenderElement.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewcpp">trunk/Source/WebCore/rendering/RenderView.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160594 => 160595)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-14 10:13:51 UTC (rev 160594)
+++ trunk/Source/WebCore/ChangeLog 2013-12-14 12:39:40 UTC (rev 160595)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2013-12-14 Andreas Kling <akling@apple.com>
+
+ RenderElement::rendererForRootBackground() should return a reference.
+ <https://webkit.org/b/125735>
+
+ This function always finds a renderer to return.
+
+ Reviewed by Antti Koivisto.
+
</ins><span class="cx"> 2013-12-14 Mark Rowe <mrowe@apple.com>
</span><span class="cx">
</span><span class="cx"> Build fix after r160557.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (160594 => 160595)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2013-12-14 10:13:51 UTC (rev 160594)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2013-12-14 12:39:40 UTC (rev 160595)
</span><span class="lines">@@ -1124,12 +1124,12 @@
</span><span class="cx"> if (paintInfo.skipRootBackground())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- auto rootBackgroundRenderer = rendererForRootBackground();
</del><ins>+ auto& rootBackgroundRenderer = rendererForRootBackground();
</ins><span class="cx">
</span><del>- const FillLayer* bgLayer = rootBackgroundRenderer->style().backgroundLayers();
- Color bgColor = rootBackgroundRenderer->style().visitedDependentColor(CSSPropertyBackgroundColor);
</del><ins>+ const FillLayer* bgLayer = rootBackgroundRenderer.style().backgroundLayers();
+ Color bgColor = rootBackgroundRenderer.style().visitedDependentColor(CSSPropertyBackgroundColor);
</ins><span class="cx">
</span><del>- paintFillLayers(paintInfo, bgColor, bgLayer, view().backgroundRect(this), BackgroundBleedNone, CompositeSourceOver, rootBackgroundRenderer);
</del><ins>+ paintFillLayers(paintInfo, bgColor, bgLayer, view().backgroundRect(this), BackgroundBleedNone, CompositeSourceOver, &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 (160594 => 160595)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2013-12-14 10:13:51 UTC (rev 160594)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2013-12-14 12:39:40 UTC (rev 160595)
</span><span class="lines">@@ -1075,7 +1075,7 @@
</span><span class="cx"> setLayerNeedsFullRepaint();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderElement* RenderElement::rendererForRootBackground()
</del><ins>+RenderElement& RenderElement::rendererForRootBackground()
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isRoot());
</span><span class="cx"> if (!hasBackground() && element() && element()->hasTagName(HTMLNames::htmlTag)) {
</span><span class="lines">@@ -1086,11 +1086,11 @@
</span><span class="cx"> if (auto body = document().body()) {
</span><span class="cx"> if (body->hasLocalName(HTMLNames::bodyTag)) {
</span><span class="cx"> if (auto renderer = body->renderer())
</span><del>- return renderer;
</del><ins>+ return *renderer;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- return this;
</del><ins>+ return *this;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderElement* RenderElement::hoverAncestor() const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.h (160594 => 160595)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.h 2013-12-14 10:13:51 UTC (rev 160594)
+++ trunk/Source/WebCore/rendering/RenderElement.h 2013-12-14 12:39:40 UTC (rev 160595)
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> void layoutIfNeeded() { if (needsLayout()) layout(); }
</span><span class="cx">
</span><span class="cx"> // Return the renderer whose background style is used to paint the root background. Should only be called on the renderer for which isRoot() is true.
</span><del>- RenderElement* rendererForRootBackground();
</del><ins>+ RenderElement& rendererForRootBackground();
</ins><span class="cx">
</span><span class="cx"> // Used only by Element::pseudoStyleCacheIsInvalid to get a first line style based off of a
</span><span class="cx"> // given new style, without accessing the cache.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (160594 => 160595)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2013-12-14 10:13:51 UTC (rev 160594)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2013-12-14 12:39:40 UTC (rev 160595)
</span><span class="lines">@@ -1549,11 +1549,8 @@
</span><span class="cx">
</span><span class="cx"> Color RenderLayerBacking::rendererBackgroundColor() const
</span><span class="cx"> {
</span><del>- RenderElement* backgroundRenderer = &renderer();
- if (backgroundRenderer->isRoot())
- backgroundRenderer = backgroundRenderer->rendererForRootBackground();
-
- return backgroundRenderer->style().visitedDependentColor(CSSPropertyBackgroundColor);
</del><ins>+ const auto& backgroundRenderer = renderer().isRoot() ? renderer().rendererForRootBackground() : renderer();
+ return backgroundRenderer.style().visitedDependentColor(CSSPropertyBackgroundColor);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderLayerBacking::updateDirectlyCompositedBackgroundColor(bool isSimpleContainer, bool& didUpdateContentsRect)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.cpp (160594 => 160595)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.cpp 2013-12-14 10:13:51 UTC (rev 160594)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2013-12-14 12:39:40 UTC (rev 160595)
</span><span class="lines">@@ -487,8 +487,7 @@
</span><span class="cx"> if (isComposited(rootObject))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- const RenderElement* rootRenderer = rootObject->rendererForRootBackground();
- if (rootRenderer->style().backgroundClip() == TextFillBox)
</del><ins>+ if (rootObject->rendererForRootBackground().style().backgroundClip() == TextFillBox)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="lines">@@ -1006,8 +1005,7 @@
</span><span class="cx"> if (!rootObject)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- RenderElement* rootRenderer = rootObject->rendererForRootBackground();
- return rootRenderer->hasEntirelyFixedBackground();
</del><ins>+ return rootObject->rendererForRootBackground().hasEntirelyFixedBackground();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutRect RenderView::backgroundRect(RenderBox* backgroundRenderer) const
</span></span></pre>
</div>
</div>
</body>
</html>