<!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>[278238] 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/278238">278238</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2021-05-29 05:12:10 -0700 (Sat, 29 May 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[LFC] Transition containing block for loops to range loops
https://bugs.webkit.org/show_bug.cgi?id=226315

Reviewed by Antti Koivisto.

Add support for stayWithin.

* layout/floats/FloatingContext.cpp:
(WebCore::Layout::FloatingContext::mapTopLeftToFloatingStateRoot const):
* layout/formattingContexts/FormattingGeometry.cpp:
(WebCore::Layout::FormattingGeometry::computedHeightValue const):
* layout/formattingContexts/block/BlockFormattingContext.cpp:
(WebCore::Layout::BlockFormattingContext::usedAvailableWidthForFloatAvoider):
* layout/layouttree/LayoutBox.cpp:
(WebCore::Layout::Box::isDescendantOf const):
* layout/layouttree/LayoutBox.h:
* layout/layouttree/LayoutContainingBlockChainIterator.h:
(WebCore::Layout::LayoutContainingBlockChainIteratorAdapter::begin):
(WebCore::Layout::LayoutContainingBlockChainIteratorAdapter::end):
(WebCore::Layout::LayoutContainingBlockChainIterator::LayoutContainingBlockChainIterator):
(WebCore::Layout::LayoutContainingBlockChainIteratorAdapter::LayoutContainingBlockChainIteratorAdapter):
(WebCore::Layout::containingBlockChain):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorelayoutfloatsFloatingContextcpp">trunk/Source/WebCore/layout/floats/FloatingContext.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutformattingContextsFormattingGeometrycpp">trunk/Source/WebCore/layout/formattingContexts/FormattingGeometry.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutformattingContextsblockBlockFormattingContextcpp">trunk/Source/WebCore/layout/formattingContexts/block/BlockFormattingContext.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutformattingContextstableTableFormattingQuirkscpp">trunk/Source/WebCore/layout/formattingContexts/table/TableFormattingQuirks.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutlayouttreeLayoutBoxcpp">trunk/Source/WebCore/layout/layouttree/LayoutBox.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutlayouttreeLayoutBoxh">trunk/Source/WebCore/layout/layouttree/LayoutBox.h</a></li>
<li><a href="#trunkSourceWebCorelayoutlayouttreeLayoutContainingBlockChainIteratorh">trunk/Source/WebCore/layout/layouttree/LayoutContainingBlockChainIterator.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (278237 => 278238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-05-29 10:09:19 UTC (rev 278237)
+++ trunk/Source/WebCore/ChangeLog      2021-05-29 12:12:10 UTC (rev 278238)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2021-05-29  Alan Bujtas  <zalan@apple.com>
+
+        [LFC] Transition containing block for loops to range loops
+        https://bugs.webkit.org/show_bug.cgi?id=226315
+
+        Reviewed by Antti Koivisto.
+
+        Add support for stayWithin.
+
+        * layout/floats/FloatingContext.cpp:
+        (WebCore::Layout::FloatingContext::mapTopLeftToFloatingStateRoot const):
+        * layout/formattingContexts/FormattingGeometry.cpp:
+        (WebCore::Layout::FormattingGeometry::computedHeightValue const):
+        * layout/formattingContexts/block/BlockFormattingContext.cpp:
+        (WebCore::Layout::BlockFormattingContext::usedAvailableWidthForFloatAvoider):
+        * layout/layouttree/LayoutBox.cpp:
+        (WebCore::Layout::Box::isDescendantOf const):
+        * layout/layouttree/LayoutBox.h:
+        * layout/layouttree/LayoutContainingBlockChainIterator.h:
+        (WebCore::Layout::LayoutContainingBlockChainIteratorAdapter::begin):
+        (WebCore::Layout::LayoutContainingBlockChainIteratorAdapter::end):
+        (WebCore::Layout::LayoutContainingBlockChainIterator::LayoutContainingBlockChainIterator):
+        (WebCore::Layout::LayoutContainingBlockChainIteratorAdapter::LayoutContainingBlockChainIteratorAdapter):
+        (WebCore::Layout::containingBlockChain):
+
</ins><span class="cx"> 2021-05-28  Wenson Hsieh  <wenson_hsieh@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Web process terminates when attempting to log in on bankid.no
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutfloatsFloatingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/floats/FloatingContext.cpp (278237 => 278238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/floats/FloatingContext.cpp   2021-05-29 10:09:19 UTC (rev 278237)
+++ trunk/Source/WebCore/layout/floats/FloatingContext.cpp      2021-05-29 12:12:10 UTC (rev 278238)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include "LayoutBox.h"
</span><span class="cx"> #include "LayoutBoxGeometry.h"
</span><span class="cx"> #include "LayoutContainerBox.h"
</span><ins>+#include "LayoutContainingBlockChainIterator.h"
</ins><span class="cx"> #include <wtf/IsoMallocInlines.h>
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -512,8 +513,8 @@
</span><span class="cx"> {
</span><span class="cx">     auto& floatingStateRoot = floatingState().root();
</span><span class="cx">     auto topLeft = BoxGeometry::borderBoxTopLeft(formattingContext().geometryForBox(floatBox, FormattingContext::EscapeReason::FloatBoxIsAlwaysRelativeToFloatStateRoot));
</span><del>-    for (auto* containingBlock = &floatBox.containingBlock(); containingBlock != &floatingStateRoot; containingBlock = &containingBlock->containingBlock())
-        topLeft.moveBy(BoxGeometry::borderBoxTopLeft(formattingContext().geometryForBox(*containingBlock, FormattingContext::EscapeReason::FloatBoxIsAlwaysRelativeToFloatStateRoot)));
</del><ins>+    for (auto& containingBlock : containingBlockChain(floatBox, floatingStateRoot))
+        topLeft.moveBy(BoxGeometry::borderBoxTopLeft(formattingContext().geometryForBox(containingBlock, FormattingContext::EscapeReason::FloatBoxIsAlwaysRelativeToFloatStateRoot)));
</ins><span class="cx">     return topLeft;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextsFormattingGeometrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/formattingContexts/FormattingGeometry.cpp (278237 => 278238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/FormattingGeometry.cpp    2021-05-29 10:09:19 UTC (rev 278237)
+++ trunk/Source/WebCore/layout/formattingContexts/FormattingGeometry.cpp       2021-05-29 12:12:10 UTC (rev 278238)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #include "FloatingState.h"
</span><span class="cx"> #include "FormattingQuirks.h"
</span><span class="cx"> #include "InlineFormattingState.h"
</span><ins>+#include "LayoutContainingBlockChainIterator.h"
</ins><span class="cx"> #include "LayoutContext.h"
</span><span class="cx"> #include "LayoutInitialContainingBlock.h"
</span><span class="cx"> #include "LayoutReplacedBox.h"
</span><span class="lines">@@ -84,16 +85,16 @@
</span><span class="cx">         if (layoutState().inQuirksMode())
</span><span class="cx">             containingBlockHeight = formattingContext().formattingQuirks().heightValueOfNearestContainingBlockWithFixedHeight(layoutBox);
</span><span class="cx">         else {
</span><del>-            auto nonAnonymousContainingBlockLogicalHeight = [&] {
</del><ins>+            auto nonAnonymousContainingBlockLogicalHeight = [&]() -> Length {
</ins><span class="cx">                 // When the block level box is a direct child of an inline level box (<span><div></div></span>) and we wrap it into a continuation,
</span><span class="cx">                 // the containing block (anonymous wrapper) is not the box we need to check for fixed height.
</span><del>-                auto& initialContainingBlock = layoutBox.initialContainingBlock();
-                for (auto* containingBlock = &layoutBox.containingBlock(); containingBlock != &initialContainingBlock; containingBlock = &containingBlock->containingBlock()) {
-                    if (containingBlock->isAnonymous())
</del><ins>+                for (auto& containingBlock : containingBlockChain(layoutBox)) {
+                    if (containingBlock.isAnonymous())
</ins><span class="cx">                         continue;
</span><del>-                    return containingBlock->style().logicalHeight();
</del><ins>+                    return containingBlock.style().logicalHeight();
</ins><span class="cx">                 }
</span><del>-                return initialContainingBlock.style().logicalHeight();
</del><ins>+                ASSERT_NOT_REACHED();
+                return { };
</ins><span class="cx">             };
</span><span class="cx">             containingBlockHeight = fixedValue(nonAnonymousContainingBlockLogicalHeight());
</span><span class="cx">         }
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextsblockBlockFormattingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/formattingContexts/block/BlockFormattingContext.cpp (278237 => 278238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/block/BlockFormattingContext.cpp  2021-05-29 10:09:19 UTC (rev 278237)
+++ trunk/Source/WebCore/layout/formattingContexts/block/BlockFormattingContext.cpp     2021-05-29 12:12:10 UTC (rev 278238)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #include "LayoutBox.h"
</span><span class="cx"> #include "LayoutChildIterator.h"
</span><span class="cx"> #include "LayoutContainerBox.h"
</span><ins>+#include "LayoutContainingBlockChainIterator.h"
</ins><span class="cx"> #include "LayoutContext.h"
</span><span class="cx"> #include "LayoutInitialContainingBlock.h"
</span><span class="cx"> #include "LayoutState.h"
</span><span class="lines">@@ -222,8 +223,8 @@
</span><span class="cx"> 
</span><span class="cx">     auto logicalTopInFormattingContextRootCoordinate = [&] (auto& floatAvoider) {
</span><span class="cx">         auto top = BoxGeometry::borderBoxTop(geometryForBox(floatAvoider));
</span><del>-        for (auto* ancestor = &floatAvoider.containingBlock(); ancestor != &root(); ancestor = &ancestor->containingBlock())
-            top += BoxGeometry::borderBoxTop(geometryForBox(*ancestor));
</del><ins>+        for (auto& ancestor : containingBlockChainWithinFormattingContext(floatAvoider))
+            top += BoxGeometry::borderBoxTop(geometryForBox(ancestor));
</ins><span class="cx">         return top;
</span><span class="cx">     };
</span><span class="cx"> 
</span><span class="lines">@@ -231,8 +232,8 @@
</span><span class="cx">         if (!floatConstraints.left && !floatConstraints.right)
</span><span class="cx">             return FloatingContext::Constraints { };
</span><span class="cx">         auto offset = LayoutSize { };
</span><del>-        for (auto* ancestor = &layoutBox.containingBlock(); ancestor != &root(); ancestor = &ancestor->containingBlock())
-            offset += toLayoutSize(BoxGeometry::borderBoxTopLeft(geometryForBox(*ancestor)));
</del><ins>+        for (auto& ancestor : containingBlockChainWithinFormattingContext(layoutBox))
+            offset += toLayoutSize(BoxGeometry::borderBoxTopLeft(geometryForBox(ancestor)));
</ins><span class="cx">         if (floatConstraints.left)
</span><span class="cx">             floatConstraints.left = PointInContextRoot { *floatConstraints.left - offset };
</span><span class="cx">         if (floatConstraints.right)
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextstableTableFormattingQuirkscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/formattingContexts/table/TableFormattingQuirks.cpp (278237 => 278238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/table/TableFormattingQuirks.cpp   2021-05-29 10:09:19 UTC (rev 278237)
+++ trunk/Source/WebCore/layout/formattingContexts/table/TableFormattingQuirks.cpp      2021-05-29 12:12:10 UTC (rev 278238)
</span><span class="lines">@@ -66,14 +66,10 @@
</span><span class="cx">         return height.isFixed() ? std::make_optional(LayoutUnit { height.value() }) : std::nullopt;
</span><span class="cx">     };
</span><span class="cx"> 
</span><del>-    auto& tableBox = formattingContext().root();
-    for (auto& ancestor : containingBlockChain(layoutBox)) {
</del><ins>+    for (auto& ancestor : containingBlockChain(layoutBox, formattingContext().root().containingBlock())) {
</ins><span class="cx">         if (auto fixedHeight = fixedLogicalHeight(ancestor))
</span><span class="cx">             return *fixedHeight;
</span><del>-        if (&ancestor == &tableBox)
-            return { };
</del><span class="cx">     }
</span><del>-    ASSERT_NOT_REACHED();
</del><span class="cx">     return { };
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutlayouttreeLayoutBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/layouttree/LayoutBox.cpp (278237 => 278238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/layouttree/LayoutBox.cpp     2021-05-29 10:09:19 UTC (rev 278237)
+++ trunk/Source/WebCore/layout/layouttree/LayoutBox.cpp        2021-05-29 12:12:10 UTC (rev 278238)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> 
</span><span class="cx"> #include "LayoutBoxGeometry.h"
</span><span class="cx"> #include "LayoutContainerBox.h"
</span><ins>+#include "LayoutContainingBlockChainIterator.h"
</ins><span class="cx"> #include "LayoutInitialContainingBlock.h"
</span><span class="cx"> #include "LayoutPhase.h"
</span><span class="cx"> #include "LayoutState.h"
</span><span class="lines">@@ -424,6 +425,17 @@
</span><span class="cx">     return previousSibling;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+bool Box::isDescendantOf(const ContainerBox& ancestor) const
+{
+    if (ancestor.isInitialContainingBlock())
+        return true;
+    for (auto& containingBlock : containingBlockChain(*this)) {
+        if (&containingBlock == &ancestor)
+            return true;
+    }
+    return false;
+}
+
</ins><span class="cx"> bool Box::isOverflowVisible() const
</span><span class="cx"> {
</span><span class="cx">     auto isOverflowVisible = m_style.overflowX() == Overflow::Visible || m_style.overflowY() == Overflow::Visible;
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutlayouttreeLayoutBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/layouttree/LayoutBox.h (278237 => 278238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/layouttree/LayoutBox.h       2021-05-29 10:09:19 UTC (rev 278237)
+++ trunk/Source/WebCore/layout/layouttree/LayoutBox.h  2021-05-29 12:12:10 UTC (rev 278238)
</span><span class="lines">@@ -146,6 +146,7 @@
</span><span class="cx">     const Box* previousSibling() const { return m_previousSibling; }
</span><span class="cx">     const Box* previousInFlowSibling() const;
</span><span class="cx">     const Box* previousInFlowOrFloatingSibling() const;
</span><ins>+    bool isDescendantOf(const ContainerBox&) const;
</ins><span class="cx"> 
</span><span class="cx">     // FIXME: This is currently needed for style updates.
</span><span class="cx">     Box* nextSibling() { return m_nextSibling; }
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutlayouttreeLayoutContainingBlockChainIteratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/layouttree/LayoutContainingBlockChainIterator.h (278237 => 278238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/layouttree/LayoutContainingBlockChainIterator.h      2021-05-29 10:09:19 UTC (rev 278237)
+++ trunk/Source/WebCore/layout/layouttree/LayoutContainingBlockChainIterator.h 2021-05-29 12:12:10 UTC (rev 278238)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> class LayoutContainingBlockChainIterator {
</span><span class="cx"> public:
</span><span class="cx">     LayoutContainingBlockChainIterator() = default;
</span><del>-    LayoutContainingBlockChainIterator(const ContainerBox&);
</del><ins>+    LayoutContainingBlockChainIterator(const ContainerBox*);
</ins><span class="cx">     const ContainerBox& operator*() const { return *m_current; }
</span><span class="cx">     const ContainerBox* operator->() const { return m_current; }
</span><span class="cx"> 
</span><span class="lines">@@ -49,18 +49,21 @@
</span><span class="cx"> 
</span><span class="cx"> class LayoutContainingBlockChainIteratorAdapter {
</span><span class="cx"> public:
</span><del>-    LayoutContainingBlockChainIteratorAdapter(const ContainerBox&);
-    auto begin() { return LayoutContainingBlockChainIterator(m_containingBlock); }
-    auto end() { return LayoutContainingBlockChainIterator(); }
</del><ins>+    LayoutContainingBlockChainIteratorAdapter(const ContainerBox&, const ContainerBox* stayWithin = nullptr);
+    auto begin() { return LayoutContainingBlockChainIterator(&m_containingBlock); }
+    auto end() { return LayoutContainingBlockChainIterator(m_stayWithin); }
</ins><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     const ContainerBox& m_containingBlock;
</span><ins>+    const ContainerBox* m_stayWithin { nullptr };
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> LayoutContainingBlockChainIteratorAdapter containingBlockChain(const Box&);
</span><ins>+LayoutContainingBlockChainIteratorAdapter containingBlockChain(const Box&, const ContainerBox& stayWithin);
+LayoutContainingBlockChainIteratorAdapter containingBlockChainWithinFormattingContext(const Box&);
</ins><span class="cx"> 
</span><del>-inline LayoutContainingBlockChainIterator::LayoutContainingBlockChainIterator(const ContainerBox& current)
-    : m_current(&current)
</del><ins>+inline LayoutContainingBlockChainIterator::LayoutContainingBlockChainIterator(const ContainerBox* current)
+    : m_current(current)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -71,8 +74,9 @@
</span><span class="cx">     return *this;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-inline LayoutContainingBlockChainIteratorAdapter::LayoutContainingBlockChainIteratorAdapter(const ContainerBox& containingBlock)
</del><ins>+inline LayoutContainingBlockChainIteratorAdapter::LayoutContainingBlockChainIteratorAdapter(const ContainerBox& containingBlock, const ContainerBox* stayWithin)
</ins><span class="cx">     : m_containingBlock(containingBlock)
</span><ins>+    , m_stayWithin(stayWithin)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -81,6 +85,17 @@
</span><span class="cx">     return LayoutContainingBlockChainIteratorAdapter(layoutBox.containingBlock());
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+inline LayoutContainingBlockChainIteratorAdapter containingBlockChain(const Box& layoutBox, const ContainerBox& stayWithin)
+{
+    ASSERT(layoutBox.isDescendantOf(stayWithin));
+    return LayoutContainingBlockChainIteratorAdapter(layoutBox.containingBlock(), &stayWithin);
</ins><span class="cx"> }
</span><ins>+
+inline LayoutContainingBlockChainIteratorAdapter containingBlockChainWithinFormattingContext(const Box& layoutBox)
+{
+    return containingBlockChain(layoutBox, layoutBox.formattingContextRoot());
</ins><span class="cx"> }
</span><ins>+
+}
+}
</ins><span class="cx"> #endif
</span></span></pre>
</div>
</div>

</body>
</html>