<!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>[181654] 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/181654">181654</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-03-17 11:58:59 -0700 (Tue, 17 Mar 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Move some code from LogicalSelectionOffsetCaches into RenderElement
https://bugs.webkit.org/show_bug.cgi?id=142758

Reviewed by Myles C. Maxfield.

LogicalSelectionOffsetCaches had some useful code regarding containing blocks etc
that should be used in more places, so move it into RenderElement.

No behavior change.

* rendering/LogicalSelectionOffsetCaches.h:
(WebCore::LogicalSelectionOffsetCaches::LogicalSelectionOffsetCaches):
(WebCore::isContainingBlockCandidateForAbsolutelyPositionedObject): Deleted.
(WebCore::isNonRenderBlockInline): Deleted.
(WebCore::containingBlockForFixedPosition): Deleted.
(WebCore::containingBlockForAbsolutePosition): Deleted.
(WebCore::containingBlockForObjectInFlow): Deleted.
* rendering/RenderBlock.cpp: No need to initialize static data.
(WebCore::RenderBlock::positionedObjects): nullptr
* rendering/RenderElement.cpp:
(WebCore::RenderElement::containingBlockForFixedPosition):
(WebCore::RenderElement::containingBlockForAbsolutePosition):
(WebCore::isNonRenderBlockInline):
(WebCore::RenderElement::containingBlockForObjectInFlow):
* rendering/RenderElement.h:
(WebCore::RenderElement::canContainAbsolutelyPositionedObjects):
* rendering/RenderLayer.cpp:
(WebCore::isContainerForPositioned):
* rendering/RenderObject.cpp:
(WebCore::RenderObject::containingBlock):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingLogicalSelectionOffsetCachesh">trunk/Source/WebCore/rendering/LogicalSelectionOffsetCaches.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.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="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjectcpp">trunk/Source/WebCore/rendering/RenderObject.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (181653 => 181654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-03-17 18:02:56 UTC (rev 181653)
+++ trunk/Source/WebCore/ChangeLog        2015-03-17 18:58:59 UTC (rev 181654)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2015-03-17  Simon Fraser  &lt;simon.fraser@apple.com&gt;
+
+        Move some code from LogicalSelectionOffsetCaches into RenderElement
+        https://bugs.webkit.org/show_bug.cgi?id=142758
+
+        Reviewed by Myles C. Maxfield.
+
+        LogicalSelectionOffsetCaches had some useful code regarding containing blocks etc
+        that should be used in more places, so move it into RenderElement.
+        
+        No behavior change.
+
+        * rendering/LogicalSelectionOffsetCaches.h:
+        (WebCore::LogicalSelectionOffsetCaches::LogicalSelectionOffsetCaches):
+        (WebCore::isContainingBlockCandidateForAbsolutelyPositionedObject): Deleted.
+        (WebCore::isNonRenderBlockInline): Deleted.
+        (WebCore::containingBlockForFixedPosition): Deleted.
+        (WebCore::containingBlockForAbsolutePosition): Deleted.
+        (WebCore::containingBlockForObjectInFlow): Deleted.
+        * rendering/RenderBlock.cpp: No need to initialize static data.
+        (WebCore::RenderBlock::positionedObjects): nullptr
+        * rendering/RenderElement.cpp:
+        (WebCore::RenderElement::containingBlockForFixedPosition):
+        (WebCore::RenderElement::containingBlockForAbsolutePosition):
+        (WebCore::isNonRenderBlockInline):
+        (WebCore::RenderElement::containingBlockForObjectInFlow):
+        * rendering/RenderElement.h:
+        (WebCore::RenderElement::canContainAbsolutelyPositionedObjects):
+        * rendering/RenderLayer.cpp:
+        (WebCore::isContainerForPositioned):
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::containingBlock):
+
</ins><span class="cx"> 2015-03-17  Alex Christensen  &lt;achristensen@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         [WinCairo] Unreviewed build fix after r181640.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingLogicalSelectionOffsetCachesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/LogicalSelectionOffsetCaches.h (181653 => 181654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/LogicalSelectionOffsetCaches.h        2015-03-17 18:02:56 UTC (rev 181653)
+++ trunk/Source/WebCore/rendering/LogicalSelectionOffsetCaches.h        2015-03-17 18:58:59 UTC (rev 181654)
</span><span class="lines">@@ -25,58 +25,6 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-// FIXME: share code with RenderObject::container().
-static inline bool isContainingBlockCandidateForAbsolutelyPositionedObject(RenderElement&amp; object)
-{
-    // FIXME: hasTransformRelatedProperty() includes preserves3D() check, but this may need to change: https://www.w3.org/Bugs/Public/show_bug.cgi?id=27566
-    return object.style().position() != StaticPosition
-        || (object.isRenderBlock() &amp;&amp; object.hasTransformRelatedProperty())
-        || object.isSVGForeignObject()
-        || object.isRenderView();
-}
-
-static inline bool isNonRenderBlockInline(RenderElement&amp; object)
-{
-    return (object.isInline() &amp;&amp; !object.isReplaced()) || !object.isRenderBlock();
-}
-
-// FIXME: share code with RenderObject::container().
-static inline RenderBlock* containingBlockForFixedPosition(RenderElement* parent)
-{
-    RenderElement* object = parent;
-    while (object &amp;&amp; !object-&gt;canContainFixedPositionObjects())
-        object = object-&gt;parent();
-    ASSERT(!object || !object-&gt;isAnonymousBlock());
-    return downcast&lt;RenderBlock&gt;(object);
-}
-
-static inline RenderBlock* containingBlockForAbsolutePosition(RenderElement* parent)
-{
-    RenderElement* object = parent;
-    while (object &amp;&amp; !isContainingBlockCandidateForAbsolutelyPositionedObject(*object))
-        object = object-&gt;parent();
-
-    // For a relatively positioned inline, return its nearest non-anonymous containing block,
-    // not the inline itself, to avoid having a positioned objects list in all RenderInlines
-    // and use RenderBlock* as RenderElement::containingBlock's return type.
-    // Use RenderBlock::container() to obtain the inline.
-    if (object &amp;&amp; !is&lt;RenderBlock&gt;(*object))
-        object = object-&gt;containingBlock();
-
-    while (object &amp;&amp; object-&gt;isAnonymousBlock())
-        object = object-&gt;containingBlock();
-
-    return downcast&lt;RenderBlock&gt;(object);
-}
-
-static inline RenderBlock* containingBlockForObjectInFlow(RenderElement* parent)
-{
-    RenderElement* object = parent;
-    while (object &amp;&amp; isNonRenderBlockInline(*object))
-        object = object-&gt;parent();
-    return downcast&lt;RenderBlock&gt;(object);
-}
-
</del><span class="cx"> class LogicalSelectionOffsetCaches {
</span><span class="cx"> public:
</span><span class="cx">     class ContainingBlockInfo {
</span><span class="lines">@@ -144,9 +92,9 @@
</span><span class="cx">         auto parent = rootBlock.parent();
</span><span class="cx"> 
</span><span class="cx">         // LogicalSelectionOffsetCaches should not be used on an orphaned tree.
</span><del>-        m_containingBlockForFixedPosition.setBlock(containingBlockForFixedPosition(parent), 0);
-        m_containingBlockForAbsolutePosition.setBlock(containingBlockForAbsolutePosition(parent), 0);
-        m_containingBlockForInflowPosition.setBlock(containingBlockForObjectInFlow(parent), 0);
</del><ins>+        m_containingBlockForFixedPosition.setBlock(parent-&gt;containingBlockForFixedPosition(), nullptr);
+        m_containingBlockForAbsolutePosition.setBlock(parent-&gt;containingBlockForAbsolutePosition(), nullptr);
+        m_containingBlockForInflowPosition.setBlock(parent-&gt;containingBlockForObjectInFlow(), nullptr);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     LogicalSelectionOffsetCaches(RenderBlock&amp; block, const LogicalSelectionOffsetCaches&amp; cache)
</span><span class="lines">@@ -156,7 +104,7 @@
</span><span class="cx">         if (block.canContainFixedPositionObjects())
</span><span class="cx">             m_containingBlockForFixedPosition.setBlock(&amp;block, &amp;cache);
</span><span class="cx"> 
</span><del>-        if (isContainingBlockCandidateForAbsolutelyPositionedObject(block) &amp;&amp; !block.isRenderInline() &amp;&amp; !block.isAnonymousBlock())
</del><ins>+        if (block.canContainAbsolutelyPositionedObjects() &amp;&amp; !block.isRenderInline() &amp;&amp; !block.isAnonymousBlock())
</ins><span class="cx">             m_containingBlockForFixedPosition.setBlock(&amp;block, &amp;cache);
</span><span class="cx"> 
</span><span class="cx">         m_containingBlockForInflowPosition.setBlock(&amp;block, &amp;cache);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (181653 => 181654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp        2015-03-17 18:02:56 UTC (rev 181653)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp        2015-03-17 18:58:59 UTC (rev 181654)
</span><span class="lines">@@ -90,11 +90,11 @@
</span><span class="cx"> 
</span><span class="cx"> COMPILE_ASSERT(sizeof(RenderBlock) == sizeof(SameSizeAsRenderBlock), RenderBlock_should_stay_small);
</span><span class="cx"> 
</span><del>-static TrackedDescendantsMap* gPositionedDescendantsMap = 0;
-static TrackedDescendantsMap* gPercentHeightDescendantsMap = 0;
</del><ins>+static TrackedDescendantsMap* gPositionedDescendantsMap;
+static TrackedDescendantsMap* gPercentHeightDescendantsMap;
</ins><span class="cx"> 
</span><del>-static TrackedContainerMap* gPositionedContainerMap = 0;
-static TrackedContainerMap* gPercentHeightContainerMap = 0;
</del><ins>+static TrackedContainerMap* gPositionedContainerMap;
+static TrackedContainerMap* gPercentHeightContainerMap;
</ins><span class="cx"> 
</span><span class="cx"> typedef HashMap&lt;RenderBlock*, std::unique_ptr&lt;ListHashSet&lt;RenderInline*&gt;&gt;&gt; ContinuationOutlineTableMap;
</span><span class="cx"> 
</span><span class="lines">@@ -2144,7 +2144,7 @@
</span><span class="cx"> {
</span><span class="cx">     if (gPositionedDescendantsMap)
</span><span class="cx">         return gPositionedDescendantsMap-&gt;get(this);
</span><del>-    return 0;
</del><ins>+    return nullptr;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void RenderBlock::insertPositionedObject(RenderBox&amp; o)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (181653 => 181654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp        2015-03-17 18:02:56 UTC (rev 181653)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp        2015-03-17 18:58:59 UTC (rev 181654)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #include &quot;HTMLHtmlElement.h&quot;
</span><span class="cx"> #include &quot;HTMLNames.h&quot;
</span><span class="cx"> #include &quot;FlowThreadController.h&quot;
</span><ins>+#include &quot;RenderBlock.h&quot;
</ins><span class="cx"> #include &quot;RenderCounter.h&quot;
</span><span class="cx"> #include &quot;RenderDeprecatedFlexibleBox.h&quot;
</span><span class="cx"> #include &quot;RenderFlexibleBox.h&quot;
</span><span class="lines">@@ -1496,6 +1497,48 @@
</span><span class="cx">     return document().ensureStyleResolver().pseudoStyleForElement(element(), pseudoStyleRequest, parentStyle);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+RenderBlock* RenderElement::containingBlockForFixedPosition() const
+{
+    const RenderElement* object = this;
+    while (object &amp;&amp; !object-&gt;canContainFixedPositionObjects())
+        object = object-&gt;parent();
+
+    ASSERT(!object || !object-&gt;isAnonymousBlock());
+    return const_cast&lt;RenderBlock*&gt;(downcast&lt;RenderBlock&gt;(object));
+}
+
+RenderBlock* RenderElement::containingBlockForAbsolutePosition() const
+{
+    const RenderElement* object = this;
+    while (object &amp;&amp; !object-&gt;canContainAbsolutelyPositionedObjects())
+        object = object-&gt;parent();
+
+    // For a relatively positioned inline, return its nearest non-anonymous containing block,
+    // not the inline itself, to avoid having a positioned objects list in all RenderInlines
+    // and use RenderBlock* as RenderElement::containingBlock's return type.
+    // Use RenderBlock::container() to obtain the inline.
+    if (object &amp;&amp; !is&lt;RenderBlock&gt;(*object))
+        object = object-&gt;containingBlock();
+
+    while (object &amp;&amp; object-&gt;isAnonymousBlock())
+        object = object-&gt;containingBlock();
+
+    return const_cast&lt;RenderBlock*&gt;(downcast&lt;RenderBlock&gt;(object));
+}
+
+static inline bool isNonRenderBlockInline(const RenderElement&amp; object)
+{
+    return (object.isInline() &amp;&amp; !object.isReplaced()) || !object.isRenderBlock();
+}
+
+RenderBlock* RenderElement::containingBlockForObjectInFlow() const
+{
+    const RenderElement* object = this;
+    while (object &amp;&amp; isNonRenderBlockInline(*object))
+        object = object-&gt;parent();
+    return const_cast&lt;RenderBlock*&gt;(downcast&lt;RenderBlock&gt;(object));
+}
+
</ins><span class="cx"> Color RenderElement::selectionColor(int colorProperty) const
</span><span class="cx"> {
</span><span class="cx">     // If the element is unselectable, or we are only painting the selection,
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.h (181653 => 181654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.h        2015-03-17 18:02:56 UTC (rev 181653)
+++ trunk/Source/WebCore/rendering/RenderElement.h        2015-03-17 18:58:59 UTC (rev 181654)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="cx"> class ControlStates;
</span><ins>+class RenderBlock;
</ins><span class="cx"> 
</span><span class="cx"> class RenderElement : public RenderObject {
</span><span class="cx"> public:
</span><span class="lines">@@ -63,7 +64,12 @@
</span><span class="cx">     virtual bool isEmpty() const override { return !firstChild(); }
</span><span class="cx"> 
</span><span class="cx">     bool canContainFixedPositionObjects() const;
</span><ins>+    bool canContainAbsolutelyPositionedObjects() const;
</ins><span class="cx"> 
</span><ins>+    RenderBlock* containingBlockForFixedPosition() const;
+    RenderBlock* containingBlockForAbsolutePosition() const;
+    RenderBlock* containingBlockForObjectInFlow() const;
+
</ins><span class="cx">     Color selectionColor(int colorProperty) const;
</span><span class="cx">     PassRefPtr&lt;RenderStyle&gt; selectionPseudoStyle() const;
</span><span class="cx"> 
</span><span class="lines">@@ -393,6 +399,14 @@
</span><span class="cx">         || isOutOfFlowRenderFlowThread();
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+inline bool RenderElement::canContainAbsolutelyPositionedObjects() const
+{
+    return style().position() != StaticPosition
+        || (isRenderBlock() &amp;&amp; hasTransformRelatedProperty())
+        || isSVGForeignObject()
+        || isRenderView();
+}
+
</ins><span class="cx"> inline bool RenderObject::isRenderLayerModelObject() const
</span><span class="cx"> {
</span><span class="cx">     return is&lt;RenderElement&gt;(*this) &amp;&amp; downcast&lt;RenderElement&gt;(*this).isRenderLayerModelObject();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (181653 => 181654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp        2015-03-17 18:02:56 UTC (rev 181653)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp        2015-03-17 18:58:59 UTC (rev 181654)
</span><span class="lines">@@ -77,7 +77,6 @@
</span><span class="cx"> #include &quot;HitTestRequest.h&quot;
</span><span class="cx"> #include &quot;HitTestResult.h&quot;
</span><span class="cx"> #include &quot;InspectorInstrumentation.h&quot;
</span><del>-#include &quot;LogicalSelectionOffsetCaches.h&quot;
</del><span class="cx"> #include &quot;OverflowEvent.h&quot;
</span><span class="cx"> #include &quot;OverlapTestRequestClient.h&quot;
</span><span class="cx"> #include &quot;Page.h&quot;
</span><span class="lines">@@ -1434,7 +1433,7 @@
</span><span class="cx">         return layer.renderer().canContainFixedPositionObjects();
</span><span class="cx"> 
</span><span class="cx">     case AbsolutePosition:
</span><del>-        return isContainingBlockCandidateForAbsolutelyPositionedObject(layer.renderer());
</del><ins>+        return layer.renderer().canContainAbsolutelyPositionedObjects();
</ins><span class="cx">     
</span><span class="cx">     default:
</span><span class="cx">         ASSERT_NOT_REACHED();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (181653 => 181654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp        2015-03-17 18:02:56 UTC (rev 181653)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp        2015-03-17 18:58:59 UTC (rev 181654)
</span><span class="lines">@@ -693,11 +693,11 @@
</span><span class="cx"> 
</span><span class="cx">     const RenderStyle&amp; style = this-&gt;style();
</span><span class="cx">     if (!is&lt;RenderText&gt;(*this) &amp;&amp; style.position() == FixedPosition)
</span><del>-        parent = containingBlockForFixedPosition(parent);
</del><ins>+        parent = parent-&gt;containingBlockForFixedPosition();
</ins><span class="cx">     else if (!is&lt;RenderText&gt;(*this) &amp;&amp; style.position() == AbsolutePosition)
</span><del>-        parent = containingBlockForAbsolutePosition(parent);
</del><ins>+        parent = parent-&gt;containingBlockForAbsolutePosition();
</ins><span class="cx">     else
</span><del>-        parent = containingBlockForObjectInFlow(parent);
</del><ins>+        parent = parent-&gt;containingBlockForObjectInFlow();
</ins><span class="cx"> 
</span><span class="cx">     if (!is&lt;RenderBlock&gt;(parent))
</span><span class="cx">         return nullptr; // This can still happen in case of an orphaned tree
</span></span></pre>
</div>
</div>

</body>
</html>