<!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>[237633] 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/237633">237633</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2018-10-31 06:50:05 -0700 (Wed, 31 Oct 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>[LFC] FormattingContext class should take FormattingState&
https://bugs.webkit.org/show_bug.cgi?id=191099

Reviewed by Antti Koivisto.

This is in preparation for not passing LayoutState& into every layout functions.
FormattingContext has FormattingState now and LayoutState can be acquired through FormattingState.
LayoutState <- FormattingState <- FormattingContext

* layout/FormattingContext.cpp:
(WebCore::Layout::FormattingContext::FormattingContext):
(WebCore::Layout::FormattingContext::formattingState const):
(WebCore::Layout::FormattingContext::layoutState const):
* layout/FormattingContext.h:
* layout/FormattingState.cpp:
(WebCore::Layout::FormattingState::FormattingState):
* layout/FormattingState.h:
(WebCore::Layout::FormattingState::layoutState const):
* layout/LayoutFormattingState.h:
* layout/blockformatting/BlockFormattingContext.cpp:
(WebCore::Layout::BlockFormattingContext::BlockFormattingContext):
* layout/blockformatting/BlockFormattingContext.h:
* layout/blockformatting/BlockFormattingState.cpp:
(WebCore::Layout::BlockFormattingState::BlockFormattingState):
(WebCore::Layout::BlockFormattingState::formattingContext):
(WebCore::Layout::BlockFormattingState::formattingContext const): Deleted.
* layout/blockformatting/BlockFormattingState.h:
* layout/inlineformatting/InlineFormattingContext.cpp:
(WebCore::Layout::InlineFormattingContext::InlineFormattingContext):
* layout/inlineformatting/InlineFormattingContext.h:
* layout/inlineformatting/InlineFormattingState.cpp:
(WebCore::Layout::InlineFormattingState::InlineFormattingState):
(WebCore::Layout::InlineFormattingState::formattingContext):
(WebCore::Layout::InlineFormattingState::formattingContext const): Deleted.
* layout/inlineformatting/InlineFormattingState.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorelayoutFormattingContextcpp">trunk/Source/WebCore/layout/FormattingContext.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutFormattingContexth">trunk/Source/WebCore/layout/FormattingContext.h</a></li>
<li><a href="#trunkSourceWebCorelayoutFormattingStatecpp">trunk/Source/WebCore/layout/FormattingState.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutFormattingStateh">trunk/Source/WebCore/layout/FormattingState.h</a></li>
<li><a href="#trunkSourceWebCorelayoutLayoutFormattingStateh">trunk/Source/WebCore/layout/LayoutFormattingState.h</a></li>
<li><a href="#trunkSourceWebCorelayoutblockformattingBlockFormattingContextcpp">trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutblockformattingBlockFormattingContexth">trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.h</a></li>
<li><a href="#trunkSourceWebCorelayoutblockformattingBlockFormattingStatecpp">trunk/Source/WebCore/layout/blockformatting/BlockFormattingState.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutblockformattingBlockFormattingStateh">trunk/Source/WebCore/layout/blockformatting/BlockFormattingState.h</a></li>
<li><a href="#trunkSourceWebCorelayoutinlineformattingInlineFormattingContextcpp">trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutinlineformattingInlineFormattingContexth">trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.h</a></li>
<li><a href="#trunkSourceWebCorelayoutinlineformattingInlineFormattingStatecpp">trunk/Source/WebCore/layout/inlineformatting/InlineFormattingState.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutinlineformattingInlineFormattingStateh">trunk/Source/WebCore/layout/inlineformatting/InlineFormattingState.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (237632 => 237633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2018-10-31 13:43:03 UTC (rev 237632)
+++ trunk/Source/WebCore/ChangeLog      2018-10-31 13:50:05 UTC (rev 237633)
</span><span class="lines">@@ -1,5 +1,43 @@
</span><span class="cx"> 2018-10-31  Zalan Bujtas  <zalan@apple.com>
</span><span class="cx"> 
</span><ins>+        [LFC] FormattingContext class should take FormattingState&
+        https://bugs.webkit.org/show_bug.cgi?id=191099
+
+        Reviewed by Antti Koivisto.
+
+        This is in preparation for not passing LayoutState& into every layout functions.
+        FormattingContext has FormattingState now and LayoutState can be acquired through FormattingState.
+        LayoutState <- FormattingState <- FormattingContext
+
+        * layout/FormattingContext.cpp:
+        (WebCore::Layout::FormattingContext::FormattingContext):
+        (WebCore::Layout::FormattingContext::formattingState const):
+        (WebCore::Layout::FormattingContext::layoutState const):
+        * layout/FormattingContext.h:
+        * layout/FormattingState.cpp:
+        (WebCore::Layout::FormattingState::FormattingState):
+        * layout/FormattingState.h:
+        (WebCore::Layout::FormattingState::layoutState const):
+        * layout/LayoutFormattingState.h:
+        * layout/blockformatting/BlockFormattingContext.cpp:
+        (WebCore::Layout::BlockFormattingContext::BlockFormattingContext):
+        * layout/blockformatting/BlockFormattingContext.h:
+        * layout/blockformatting/BlockFormattingState.cpp:
+        (WebCore::Layout::BlockFormattingState::BlockFormattingState):
+        (WebCore::Layout::BlockFormattingState::formattingContext):
+        (WebCore::Layout::BlockFormattingState::formattingContext const): Deleted.
+        * layout/blockformatting/BlockFormattingState.h:
+        * layout/inlineformatting/InlineFormattingContext.cpp:
+        (WebCore::Layout::InlineFormattingContext::InlineFormattingContext):
+        * layout/inlineformatting/InlineFormattingContext.h:
+        * layout/inlineformatting/InlineFormattingState.cpp:
+        (WebCore::Layout::InlineFormattingState::InlineFormattingState):
+        (WebCore::Layout::InlineFormattingState::formattingContext):
+        (WebCore::Layout::InlineFormattingState::formattingContext const): Deleted.
+        * layout/inlineformatting/InlineFormattingState.h:
+
+2018-10-31  Zalan Bujtas  <zalan@apple.com>
+
</ins><span class="cx">         [LFC] The *FormattingState class should provide the *FormattingContext.
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=191089
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutFormattingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/FormattingContext.cpp (237632 => 237633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/FormattingContext.cpp        2018-10-31 13:43:03 UTC (rev 237632)
+++ trunk/Source/WebCore/layout/FormattingContext.cpp   2018-10-31 13:50:05 UTC (rev 237633)
</span><span class="lines">@@ -43,8 +43,9 @@
</span><span class="cx"> 
</span><span class="cx"> WTF_MAKE_ISO_ALLOCATED_IMPL(FormattingContext);
</span><span class="cx"> 
</span><del>-FormattingContext::FormattingContext(const Box& formattingContextRoot)
</del><ins>+FormattingContext::FormattingContext(const Box& formattingContextRoot, FormattingState& formattingState)
</ins><span class="cx">     : m_root(makeWeakPtr(formattingContextRoot))
</span><ins>+    , m_formattingState(formattingState)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -52,6 +53,16 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+FormattingState& FormattingContext::formattingState() const
+{
+    return m_formattingState;
+}
+
+LayoutState& FormattingContext::layoutState() const
+{
+    return m_formattingState.layoutState();
+}
+
</ins><span class="cx"> void FormattingContext::computeOutOfFlowHorizontalGeometry(LayoutState& layoutState, const Box& layoutBox) const
</span><span class="cx"> {
</span><span class="cx">     auto compute = [&](std::optional<LayoutUnit> usedWidth) {
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutFormattingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/FormattingContext.h (237632 => 237633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/FormattingContext.h  2018-10-31 13:43:03 UTC (rev 237632)
+++ trunk/Source/WebCore/layout/FormattingContext.h     2018-10-31 13:50:05 UTC (rev 237633)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
</span><span class="cx"> 
</span><span class="cx"> #include "DisplayBox.h"
</span><del>-#include "FloatingState.h"
</del><span class="cx"> #include <wtf/IsoMalloc.h>
</span><span class="cx"> #include <wtf/WeakPtr.h>
</span><span class="cx"> 
</span><span class="lines">@@ -47,7 +46,7 @@
</span><span class="cx"> class FormattingContext {
</span><span class="cx">     WTF_MAKE_ISO_ALLOCATED(FormattingContext);
</span><span class="cx"> public:
</span><del>-    FormattingContext(const Box& formattingContextRoot);
</del><ins>+    FormattingContext(const Box& formattingContextRoot, FormattingState&);
</ins><span class="cx">     virtual ~FormattingContext();
</span><span class="cx"> 
</span><span class="cx">     virtual void layout(LayoutState&, FormattingState&) const = 0;
</span><span class="lines">@@ -66,6 +65,8 @@
</span><span class="cx"> protected:
</span><span class="cx">     using LayoutQueue = Vector<const Box*>;
</span><span class="cx"> 
</span><ins>+    FormattingState& formattingState() const;
+    LayoutState& layoutState() const;
</ins><span class="cx">     const Box& root() const { return *m_root; }
</span><span class="cx"> 
</span><span class="cx">     virtual void computeStaticPosition(const LayoutState&, const Box&) const = 0;
</span><span class="lines">@@ -126,6 +127,7 @@
</span><span class="cx">     void computeOutOfFlowHorizontalGeometry(LayoutState&, const Box&) const;
</span><span class="cx"> 
</span><span class="cx">     WeakPtr<const Box> m_root;
</span><ins>+    FormattingState& m_formattingState;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutFormattingStatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/FormattingState.cpp (237632 => 237633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/FormattingState.cpp  2018-10-31 13:43:03 UTC (rev 237632)
+++ trunk/Source/WebCore/layout/FormattingState.cpp     2018-10-31 13:50:05 UTC (rev 237633)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> 
</span><span class="cx"> WTF_MAKE_ISO_ALLOCATED_IMPL(FormattingState);
</span><span class="cx"> 
</span><del>-FormattingState::FormattingState(Ref<FloatingState>&& floatingState, Type type, const LayoutState& layoutState)
</del><ins>+FormattingState::FormattingState(Ref<FloatingState>&& floatingState, Type type, LayoutState& layoutState)
</ins><span class="cx">     : m_layoutState(layoutState)
</span><span class="cx">     , m_floatingState(WTFMove(floatingState))
</span><span class="cx">     , m_type(type)
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutFormattingStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/FormattingState.h (237632 => 237633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/FormattingState.h    2018-10-31 13:43:03 UTC (rev 237632)
+++ trunk/Source/WebCore/layout/FormattingState.h       2018-10-31 13:50:05 UTC (rev 237633)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> public:
</span><span class="cx">     virtual ~FormattingState();
</span><span class="cx"> 
</span><del>-    virtual std::unique_ptr<FormattingContext>formattingContext(const Box& formattingContextRoot) const = 0;
</del><ins>+    virtual std::unique_ptr<FormattingContext>formattingContext(const Box& formattingContextRoot) = 0;
</ins><span class="cx"> 
</span><span class="cx">     FloatingState& floatingState() const { return m_floatingState; }
</span><span class="cx"> 
</span><span class="lines">@@ -60,13 +60,14 @@
</span><span class="cx">     bool isBlockFormattingState() const { return m_type == Type::Block; }
</span><span class="cx">     bool isInlineFormattingState() const { return m_type == Type::Inline; }
</span><span class="cx"> 
</span><ins>+    LayoutState& layoutState() const { return m_layoutState; }
+
</ins><span class="cx"> protected:
</span><span class="cx">     enum class Type { Block, Inline };
</span><del>-    FormattingState(Ref<FloatingState>&&, Type, const LayoutState&);
</del><ins>+    FormattingState(Ref<FloatingState>&&, Type, LayoutState&);
</ins><span class="cx"> 
</span><del>-    const LayoutState& m_layoutState;
-
</del><span class="cx"> private:
</span><ins>+    LayoutState& m_layoutState;
</ins><span class="cx">     Ref<FloatingState> m_floatingState;
</span><span class="cx">     HashMap<const Box*, FormattingContext::InstrinsicWidthConstraints> m_instrinsicWidthConstraints;
</span><span class="cx">     Type m_type;
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutLayoutFormattingStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/LayoutFormattingState.h (237632 => 237633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/LayoutFormattingState.h      2018-10-31 13:43:03 UTC (rev 237632)
+++ trunk/Source/WebCore/layout/LayoutFormattingState.h 2018-10-31 13:50:05 UTC (rev 237633)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
</span><span class="cx"> 
</span><del>-#include "FormattingContext.h"
</del><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/IsoMalloc.h>
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutblockformattingBlockFormattingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp (237632 => 237633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp   2018-10-31 13:43:03 UTC (rev 237632)
+++ trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp      2018-10-31 13:50:05 UTC (rev 237633)
</span><span class="lines">@@ -44,8 +44,8 @@
</span><span class="cx"> 
</span><span class="cx"> WTF_MAKE_ISO_ALLOCATED_IMPL(BlockFormattingContext);
</span><span class="cx"> 
</span><del>-BlockFormattingContext::BlockFormattingContext(const Box& formattingContextRoot)
-    : FormattingContext(formattingContextRoot)
</del><ins>+BlockFormattingContext::BlockFormattingContext(const Box& formattingContextRoot, FormattingState& formattingState)
+    : FormattingContext(formattingContextRoot, formattingState)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutblockformattingBlockFormattingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.h (237632 => 237633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.h     2018-10-31 13:43:03 UTC (rev 237632)
+++ trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.h        2018-10-31 13:50:05 UTC (rev 237633)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> class BlockFormattingContext : public FormattingContext {
</span><span class="cx">     WTF_MAKE_ISO_ALLOCATED(BlockFormattingContext);
</span><span class="cx"> public:
</span><del>-    BlockFormattingContext(const Box& formattingContextRoot);
</del><ins>+    BlockFormattingContext(const Box& formattingContextRoot, FormattingState& formattingState);
</ins><span class="cx"> 
</span><span class="cx">     void layout(LayoutState&, FormattingState&) const override;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutblockformattingBlockFormattingStatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/blockformatting/BlockFormattingState.cpp (237632 => 237633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/blockformatting/BlockFormattingState.cpp     2018-10-31 13:43:03 UTC (rev 237632)
+++ trunk/Source/WebCore/layout/blockformatting/BlockFormattingState.cpp        2018-10-31 13:50:05 UTC (rev 237633)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> 
</span><span class="cx"> WTF_MAKE_ISO_ALLOCATED_IMPL(BlockFormattingState);
</span><span class="cx"> 
</span><del>-BlockFormattingState::BlockFormattingState(Ref<FloatingState>&& floatingState, const LayoutState& layoutState)
</del><ins>+BlockFormattingState::BlockFormattingState(Ref<FloatingState>&& floatingState, LayoutState& layoutState)
</ins><span class="cx">     : FormattingState(WTFMove(floatingState), Type::Block, layoutState)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -46,10 +46,10 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-std::unique_ptr<FormattingContext> BlockFormattingState::formattingContext(const Box& formattingContextRoot) const
</del><ins>+std::unique_ptr<FormattingContext> BlockFormattingState::formattingContext(const Box& formattingContextRoot)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(formattingContextRoot.establishesBlockFormattingContext());
</span><del>-    return std::make_unique<BlockFormattingContext>(formattingContextRoot);
</del><ins>+    return std::make_unique<BlockFormattingContext>(formattingContextRoot, *this);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutblockformattingBlockFormattingStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/blockformatting/BlockFormattingState.h (237632 => 237633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/blockformatting/BlockFormattingState.h       2018-10-31 13:43:03 UTC (rev 237632)
+++ trunk/Source/WebCore/layout/blockformatting/BlockFormattingState.h  2018-10-31 13:50:05 UTC (rev 237633)
</span><span class="lines">@@ -38,10 +38,10 @@
</span><span class="cx"> class BlockFormattingState : public FormattingState {
</span><span class="cx">     WTF_MAKE_ISO_ALLOCATED(BlockFormattingState);
</span><span class="cx"> public:
</span><del>-    BlockFormattingState(Ref<FloatingState>&&, const LayoutState&);
</del><ins>+    BlockFormattingState(Ref<FloatingState>&&, LayoutState&);
</ins><span class="cx">     virtual ~BlockFormattingState();
</span><span class="cx"> 
</span><del>-    std::unique_ptr<FormattingContext> formattingContext(const Box& formattingContextRoot) const override;
</del><ins>+    std::unique_ptr<FormattingContext> formattingContext(const Box& formattingContextRoot) override;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutinlineformattingInlineFormattingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp (237632 => 237633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp 2018-10-31 13:43:03 UTC (rev 237632)
+++ trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp    2018-10-31 13:50:05 UTC (rev 237633)
</span><span class="lines">@@ -46,8 +46,8 @@
</span><span class="cx"> 
</span><span class="cx"> WTF_MAKE_ISO_ALLOCATED_IMPL(InlineFormattingContext);
</span><span class="cx"> 
</span><del>-InlineFormattingContext::InlineFormattingContext(const Box& formattingContextRoot)
-    : FormattingContext(formattingContextRoot)
</del><ins>+InlineFormattingContext::InlineFormattingContext(const Box& formattingContextRoot, FormattingState& formattingState)
+    : FormattingContext(formattingContextRoot, formattingState)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutinlineformattingInlineFormattingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.h (237632 => 237633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.h   2018-10-31 13:43:03 UTC (rev 237632)
+++ trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.h      2018-10-31 13:50:05 UTC (rev 237633)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> class InlineFormattingContext : public FormattingContext {
</span><span class="cx">     WTF_MAKE_ISO_ALLOCATED(InlineFormattingContext);
</span><span class="cx"> public:
</span><del>-    InlineFormattingContext(const Box& formattingContextRoot);
</del><ins>+    InlineFormattingContext(const Box& formattingContextRoot, FormattingState&);
</ins><span class="cx"> 
</span><span class="cx">     void layout(LayoutState&, FormattingState&) const override;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutinlineformattingInlineFormattingStatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/inlineformatting/InlineFormattingState.cpp (237632 => 237633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/inlineformatting/InlineFormattingState.cpp   2018-10-31 13:43:03 UTC (rev 237632)
+++ trunk/Source/WebCore/layout/inlineformatting/InlineFormattingState.cpp      2018-10-31 13:50:05 UTC (rev 237633)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> 
</span><span class="cx"> WTF_MAKE_ISO_ALLOCATED_IMPL(InlineFormattingState);
</span><span class="cx"> 
</span><del>-InlineFormattingState::InlineFormattingState(Ref<FloatingState>&& floatingState, const LayoutState& layoutState)
</del><ins>+InlineFormattingState::InlineFormattingState(Ref<FloatingState>&& floatingState, LayoutState& layoutState)
</ins><span class="cx">     : FormattingState(WTFMove(floatingState), Type::Inline, layoutState)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -44,10 +44,10 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-std::unique_ptr<FormattingContext> InlineFormattingState::formattingContext(const Box& formattingContextRoot) const
</del><ins>+std::unique_ptr<FormattingContext> InlineFormattingState::formattingContext(const Box& formattingContextRoot)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(formattingContextRoot.establishesInlineFormattingContext());
</span><del>-    return std::make_unique<InlineFormattingContext>(formattingContextRoot);
</del><ins>+    return std::make_unique<InlineFormattingContext>(formattingContextRoot, this);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutinlineformattingInlineFormattingStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/inlineformatting/InlineFormattingState.h (237632 => 237633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/inlineformatting/InlineFormattingState.h     2018-10-31 13:43:03 UTC (rev 237632)
+++ trunk/Source/WebCore/layout/inlineformatting/InlineFormattingState.h        2018-10-31 13:50:05 UTC (rev 237633)
</span><span class="lines">@@ -39,10 +39,10 @@
</span><span class="cx"> class InlineFormattingState : public FormattingState {
</span><span class="cx">     WTF_MAKE_ISO_ALLOCATED(InlineFormattingState);
</span><span class="cx"> public:
</span><del>-    InlineFormattingState(Ref<FloatingState>&&, const LayoutState&);
</del><ins>+    InlineFormattingState(Ref<FloatingState>&&, LayoutState&);
</ins><span class="cx">     virtual ~InlineFormattingState();
</span><span class="cx"> 
</span><del>-    std::unique_ptr<FormattingContext> formattingContext(const Box& formattingContextRoot) const override;
</del><ins>+    std::unique_ptr<FormattingContext> formattingContext(const Box& formattingContextRoot) override;
</ins><span class="cx"> 
</span><span class="cx">     InlineContent& inlineContent() { return m_inlineContent; }
</span><span class="cx">     // Temp
</span></span></pre>
</div>
</div>

</body>
</html>