<!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>[170024] 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/170024">170024</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-06-16 12:52:21 -0700 (Mon, 16 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use references instead of pointers to RenderBlock in RenderObject::enclosingBox().
https://bugs.webkit.org/show_bug.cgi?id=133902
Patch by Jeongeun Kim <je_julie.kim@samsung.com> on 2014-06-16
Reviewed by Andreas Kling.
Just a straightforward conversion from pointers to references.
No new tests, no behavior change.
* bindings/objc/DOMUIKitExtensions.mm:
(-[DOMHTMLElement structuralComplexityContribution]):
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::parseAttribute):
* inspector/InspectorOverlay.cpp:
(WebCore::buildObjectForRendererFragments):
* page/EventHandler.cpp:
(WebCore::scrollNode):
(WebCore::EventHandler::scrollOverflow):
(WebCore::EventHandler::logicalScrollOverflow):
* page/FrameView.cpp:
(WebCore::FrameView::layout):
* rendering/RenderBox.cpp:
(WebCore::computeInlineStaticDistance):
* rendering/RenderFlowThread.cpp:
(WebCore::RenderFlowThread::computedRegionRangeForBox):
(WebCore::RenderFlowThread::objectShouldFragmentInFlowRegion):
(WebCore::RenderFlowThread::objectInFlowRegion):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::calculateClipRects):
* rendering/RenderObject.cpp:
(WebCore::RenderObject::enclosingBox): Removed FIXME comment
* rendering/RenderObject.h:
* rendering/RenderScrollbar.cpp:
(WebCore::RenderScrollbar::owningRenderer):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsobjcDOMUIKitExtensionsmm">trunk/Source/WebCore/bindings/objc/DOMUIKitExtensions.mm</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorOverlaycpp">trunk/Source/WebCore/inspector/InspectorOverlay.cpp</a></li>
<li><a href="#trunkSourceWebCorepageEventHandlercpp">trunk/Source/WebCore/page/EventHandler.cpp</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="#trunkSourceWebCorerenderingRenderFlowThreadcpp">trunk/Source/WebCore/rendering/RenderFlowThread.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.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="#trunkSourceWebCorerenderingRenderScrollbarcpp">trunk/Source/WebCore/rendering/RenderScrollbar.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170023 => 170024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-16 19:46:36 UTC (rev 170023)
+++ trunk/Source/WebCore/ChangeLog 2014-06-16 19:52:21 UTC (rev 170024)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2014-06-16 Jeongeun Kim <je_julie.kim@samsung.com>
+
+ Use references instead of pointers to RenderBlock in RenderObject::enclosingBox().
+ https://bugs.webkit.org/show_bug.cgi?id=133902
+
+ Reviewed by Andreas Kling.
+
+ Just a straightforward conversion from pointers to references.
+
+ No new tests, no behavior change.
+
+ * bindings/objc/DOMUIKitExtensions.mm:
+ (-[DOMHTMLElement structuralComplexityContribution]):
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::parseAttribute):
+ * inspector/InspectorOverlay.cpp:
+ (WebCore::buildObjectForRendererFragments):
+ * page/EventHandler.cpp:
+ (WebCore::scrollNode):
+ (WebCore::EventHandler::scrollOverflow):
+ (WebCore::EventHandler::logicalScrollOverflow):
+ * page/FrameView.cpp:
+ (WebCore::FrameView::layout):
+ * rendering/RenderBox.cpp:
+ (WebCore::computeInlineStaticDistance):
+ * rendering/RenderFlowThread.cpp:
+ (WebCore::RenderFlowThread::computedRegionRangeForBox):
+ (WebCore::RenderFlowThread::objectShouldFragmentInFlowRegion):
+ (WebCore::RenderFlowThread::objectInFlowRegion):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::calculateClipRects):
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::enclosingBox): Removed FIXME comment
+ * rendering/RenderObject.h:
+ * rendering/RenderScrollbar.cpp:
+ (WebCore::RenderScrollbar::owningRenderer):
+
</ins><span class="cx"> 2014-06-16 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Use HTTPHeaderName in more places
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsobjcDOMUIKitExtensionsmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/objc/DOMUIKitExtensions.mm (170023 => 170024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/objc/DOMUIKitExtensions.mm 2014-06-16 19:46:36 UTC (rev 170023)
+++ trunk/Source/WebCore/bindings/objc/DOMUIKitExtensions.mm 2014-06-16 19:52:21 UTC (rev 170024)
</span><span class="lines">@@ -349,10 +349,10 @@
</span><span class="cx"> } else if (renderer->isRenderBlockFlow() || (renderer->isRenderBlock() && toRenderBlock(renderer)->inlineElementContinuation() != 0)) {
</span><span class="cx"> BOOL noCost = NO;
</span><span class="cx"> if (renderer->isBox()) {
</span><del>- RenderBox *asBox = renderer->enclosingBox();
- RenderObject *parent = asBox->parent();
</del><ins>+ RenderBox &asBox = renderer->enclosingBox();
+ RenderObject *parent = asBox.parent();
</ins><span class="cx"> RenderBox *parentRenderBox = (parent && parent->isBox()) ? toRenderBox(parent) : 0;
</span><del>- if (parentRenderBox && asBox && asBox->width() == parentRenderBox->width()) {
</del><ins>+ if (parentRenderBox && asBox.width() == parentRenderBox->width()) {
</ins><span class="cx"> noCost = YES;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (170023 => 170024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-06-16 19:46:36 UTC (rev 170023)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-06-16 19:52:21 UTC (rev 170024)
</span><span class="lines">@@ -5611,7 +5611,7 @@
</span><span class="cx"> LayoutRect HTMLMediaElement::mediaPlayerContentBoxRect() const
</span><span class="cx"> {
</span><span class="cx"> if (renderer())
</span><del>- return renderer()->enclosingBox()->contentBoxRect();
</del><ins>+ return renderer()->enclosingBox().contentBoxRect();
</ins><span class="cx"> return LayoutRect();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorOverlaycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorOverlay.cpp (170023 => 170024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2014-06-16 19:46:36 UTC (rev 170023)
+++ trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2014-06-16 19:52:21 UTC (rev 170024)
</span><span class="lines">@@ -511,10 +511,9 @@
</span><span class="cx"> buildRendererHighlight(renderer, nullptr, config, &highlight);
</span><span class="cx"> fragmentsArray->pushObject(buildObjectForHighlight(highlight));
</span><span class="cx"> } else {
</span><del>- RenderBox* enclosingBox = renderer->enclosingBox();
</del><span class="cx"> RenderRegion* startRegion = nullptr;
</span><span class="cx"> RenderRegion* endRegion = nullptr;
</span><del>- if (!containingFlowThread->getRegionRangeForBox(enclosingBox, startRegion, endRegion)) {
</del><ins>+ if (!containingFlowThread->getRegionRangeForBox(&renderer->enclosingBox(), startRegion, endRegion)) {
</ins><span class="cx"> // The flow has no visible regions. The renderer is not visible on screen.
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.cpp (170023 => 170024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.cpp 2014-06-16 19:46:36 UTC (rev 170023)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2014-06-16 19:52:21 UTC (rev 170024)
</span><span class="lines">@@ -289,10 +289,10 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!node->renderer())
</span><span class="cx"> return false;
</span><del>- RenderBox* enclosingBox = node->renderer()->enclosingBox();
</del><ins>+ RenderBox& enclosingBox = node->renderer()->enclosingBox();
</ins><span class="cx"> float absDelta = delta > 0 ? delta : -delta;
</span><span class="cx">
</span><del>- return enclosingBox->scroll(delta < 0 ? negativeDirection : positiveDirection, granularity, absDelta, stopElement, enclosingBox, wheelEventAbsolutePoint);
</del><ins>+ return enclosingBox.scroll(delta < 0 ? negativeDirection : positiveDirection, granularity, absDelta, stopElement, &enclosingBox, wheelEventAbsolutePoint);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if (ENABLE(TOUCH_EVENTS) && !PLATFORM(IOS))
</span><span class="lines">@@ -1106,7 +1106,7 @@
</span><span class="cx">
</span><span class="cx"> if (node) {
</span><span class="cx"> auto r = node->renderer();
</span><del>- if (r && !r->isListBox() && r->enclosingBox()->scroll(direction, granularity)) {
</del><ins>+ if (r && !r->isListBox() && r->enclosingBox().scroll(direction, granularity)) {
</ins><span class="cx"> setFrameWasScrolledByUser();
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -1127,7 +1127,7 @@
</span><span class="cx">
</span><span class="cx"> if (node) {
</span><span class="cx"> auto r = node->renderer();
</span><del>- if (r && !r->isListBox() && r->enclosingBox()->logicalScroll(direction, granularity)) {
</del><ins>+ if (r && !r->isListBox() && r->enclosingBox().logicalScroll(direction, granularity)) {
</ins><span class="cx"> setFrameWasScrolledByUser();
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (170023 => 170024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2014-06-16 19:46:36 UTC (rev 170023)
+++ trunk/Source/WebCore/page/FrameView.cpp 2014-06-16 19:52:21 UTC (rev 170024)
</span><span class="lines">@@ -1189,7 +1189,7 @@
</span><span class="cx"> if (body->hasTagName(framesetTag) && !frameFlatteningEnabled()) {
</span><span class="cx"> body->renderer()->setChildNeedsLayout();
</span><span class="cx"> } else if (body->hasTagName(bodyTag)) {
</span><del>- if (!m_firstLayout && m_size.height() != layoutHeight() && body->renderer()->enclosingBox()->stretchesToViewport())
</del><ins>+ if (!m_firstLayout && m_size.height() != layoutHeight() && body->renderer()->enclosingBox().stretchesToViewport())
</ins><span class="cx"> body->renderer()->setChildNeedsLayout();
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (170023 => 170024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2014-06-16 19:46:36 UTC (rev 170023)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2014-06-16 19:52:21 UTC (rev 170024)
</span><span class="lines">@@ -3163,14 +3163,14 @@
</span><span class="cx"> }
</span><span class="cx"> logicalLeft.setValue(Fixed, staticPosition);
</span><span class="cx"> } else {
</span><del>- RenderBox* enclosingBox = child->parent()->enclosingBox();
</del><ins>+ RenderBox& enclosingBox = child->parent()->enclosingBox();
</ins><span class="cx"> LayoutUnit staticPosition = child->layer()->staticInlinePosition() + containerLogicalWidth + containerBlock->borderLogicalLeft();
</span><del>- for (RenderElement* curr = enclosingBox; curr; curr = curr->container()) {
</del><ins>+ for (RenderElement* curr = &enclosingBox; curr; curr = curr->container()) {
</ins><span class="cx"> if (curr->isBox()) {
</span><span class="cx"> if (curr != containerBlock)
</span><span class="cx"> staticPosition -= toRenderBox(curr)->logicalLeft();
</span><del>- if (curr == enclosingBox)
- staticPosition -= enclosingBox->logicalWidth();
</del><ins>+ if (curr == &enclosingBox)
+ staticPosition -= enclosingBox.logicalWidth();
</ins><span class="cx"> if (region && curr->isRenderBlock()) {
</span><span class="cx"> const RenderBlock* cb = toRenderBlock(curr);
</span><span class="cx"> region = cb->clampToStartAndEndRegions(region);
</span><span class="lines">@@ -3178,8 +3178,8 @@
</span><span class="cx"> if (boxInfo) {
</span><span class="cx"> if (curr != containerBlock)
</span><span class="cx"> staticPosition -= cb->logicalWidth() - (boxInfo->logicalLeft() + boxInfo->logicalWidth());
</span><del>- if (curr == enclosingBox)
- staticPosition += enclosingBox->logicalWidth() - boxInfo->logicalWidth();
</del><ins>+ if (curr == &enclosingBox)
+ staticPosition += enclosingBox.logicalWidth() - boxInfo->logicalWidth();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlowThread.cpp (170023 => 170024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2014-06-16 19:46:36 UTC (rev 170023)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2014-06-16 19:52:21 UTC (rev 170024)
</span><span class="lines">@@ -823,7 +823,7 @@
</span><span class="cx"> // (e.g. if we use containingBlock() the shadow controls of a video element won't get the range from the
</span><span class="cx"> // video box because it's not a block; they need to be patched separately).
</span><span class="cx"> ASSERT(cb->parent());
</span><del>- cb = cb->parent()->enclosingBox();
</del><ins>+ cb = &cb->parent()->enclosingBox();
</ins><span class="cx"> ASSERT(cb);
</span><span class="cx">
</span><span class="cx"> // If a box doesn't have a cached region range it usually means the box belongs to a line so startRegion should be equal with endRegion.
</span><span class="lines">@@ -865,12 +865,11 @@
</span><span class="cx"> if (!m_regionList.contains(const_cast<RenderRegion*>(region)))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- RenderBox* enclosingBox = object->enclosingBox();
</del><span class="cx"> RenderRegion* enclosingBoxStartRegion = nullptr;
</span><span class="cx"> RenderRegion* enclosingBoxEndRegion = nullptr;
</span><span class="cx"> // If the box has no range, do not check regionInRange. Boxes inside inlines do not get ranges.
</span><span class="cx"> // Instead, the containing RootInlineBox will abort when trying to paint inside the wrong region.
</span><del>- if (computedRegionRangeForBox(enclosingBox, enclosingBoxStartRegion, enclosingBoxEndRegion)
</del><ins>+ if (computedRegionRangeForBox(&object->enclosingBox(), enclosingBoxStartRegion, enclosingBoxEndRegion)
</ins><span class="cx"> && !regionInRange(region, enclosingBoxStartRegion, enclosingBoxEndRegion))
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -889,10 +888,9 @@
</span><span class="cx"> if (!m_regionList.contains(const_cast<RenderRegion*>(region)))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- RenderBox* enclosingBox = object->enclosingBox();
</del><span class="cx"> RenderRegion* enclosingBoxStartRegion = nullptr;
</span><span class="cx"> RenderRegion* enclosingBoxEndRegion = nullptr;
</span><del>- if (!getRegionRangeForBox(enclosingBox, enclosingBoxStartRegion, enclosingBoxEndRegion))
</del><ins>+ if (!getRegionRangeForBox(&object->enclosingBox(), enclosingBoxStartRegion, enclosingBoxEndRegion))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (!regionInRange(region, enclosingBoxStartRegion, enclosingBoxEndRegion))
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (170023 => 170024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-06-16 19:46:36 UTC (rev 170023)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-06-16 19:52:21 UTC (rev 170024)
</span><span class="lines">@@ -5334,7 +5334,7 @@
</span><span class="cx"> else
</span><span class="cx"> layerBoundsWithVisualOverflow.moveBy(LayoutPoint(flowThread->width(), 0));
</span><span class="cx"> } else {
</span><del>- RenderBlock* rendererContainingBlock = boxModelObject.enclosingBox()->isRenderBlock() ? toRenderBlock(boxModelObject.enclosingBox()) : 0;
</del><ins>+ RenderBlock* rendererContainingBlock = boxModelObject.enclosingBox().isRenderBlock() ? toRenderBlock(&boxModelObject.enclosingBox()) : 0;
</ins><span class="cx"> if (rendererContainingBlock)
</span><span class="cx"> rendererContainingBlock->flipForWritingMode(layerBoundsWithVisualOverflow);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (170023 => 170024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2014-06-16 19:46:36 UTC (rev 170023)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2014-06-16 19:52:21 UTC (rev 170024)
</span><span class="lines">@@ -490,10 +490,9 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderBox* RenderObject::enclosingBox() const
</del><ins>+RenderBox& RenderObject::enclosingBox() const
</ins><span class="cx"> {
</span><del>- // FIXME: This should return a reference; it can always find the root RenderView.
- return lineageOfType<RenderBox>(const_cast<RenderObject&>(*this)).first();
</del><ins>+ return *lineageOfType<RenderBox>(const_cast<RenderObject&>(*this)).first();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderBoxModelObject* RenderObject::enclosingBoxModelObject() const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.h (170023 => 170024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.h 2014-06-16 19:46:36 UTC (rev 170023)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2014-06-16 19:52:21 UTC (rev 170024)
</span><span class="lines">@@ -206,7 +206,7 @@
</span><span class="cx"> bool scrollRectToVisible(const LayoutRect&, const ScrollAlignment& alignX = ScrollAlignment::alignCenterIfNeeded, const ScrollAlignment& alignY = ScrollAlignment::alignCenterIfNeeded);
</span><span class="cx">
</span><span class="cx"> // Convenience function for getting to the nearest enclosing box of a RenderObject.
</span><del>- RenderBox* enclosingBox() const;
</del><ins>+ RenderBox& enclosingBox() const;
</ins><span class="cx"> RenderBoxModelObject* enclosingBoxModelObject() const;
</span><span class="cx">
</span><span class="cx"> bool fixedPositionedWithNamedFlowContainingBlock() const;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderScrollbarcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderScrollbar.cpp (170023 => 170024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderScrollbar.cpp 2014-06-16 19:46:36 UTC (rev 170023)
+++ trunk/Source/WebCore/rendering/RenderScrollbar.cpp 2014-06-16 19:52:21 UTC (rev 170024)
</span><span class="lines">@@ -77,7 +77,9 @@
</span><span class="cx"> return currentRenderer;
</span><span class="cx"> }
</span><span class="cx"> ASSERT(m_ownerElement);
</span><del>- return m_ownerElement->renderer() ? m_ownerElement->renderer()->enclosingBox() : nullptr;
</del><ins>+ if (m_ownerElement->renderer())
+ return &m_ownerElement->renderer()->enclosingBox();
+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderScrollbar::setParent(ScrollView* parent)
</span></span></pre>
</div>
</div>
</body>
</html>