<!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>[231094] 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/231094">231094</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2018-04-27 07:40:24 -0700 (Fri, 27 Apr 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>[LFC] Formatting contexts should take const Box&
https://bugs.webkit.org/show_bug.cgi?id=185031

Reviewed by Sam Weinig.

The formatting root boxes are supposed to be all const. The only reason why
they are not is because WeakPtr<> does not support const objects yet.
Use const_cast instead (remove it when WeakPtr<> gains const support).

* layout/FormattingContext.cpp:
(WebCore::Layout::FormattingContext::FormattingContext):
* layout/FormattingContext.h:
* layout/LayoutContext.cpp:
(WebCore::Layout::LayoutContext::LayoutContext):
(WebCore::Layout::LayoutContext::formattingContext):
* layout/LayoutContext.h:
* layout/blockformatting/BlockFormattingContext.cpp:
(WebCore::Layout::BlockFormattingContext::BlockFormattingContext):
* layout/blockformatting/BlockFormattingContext.h:
* layout/inlineformatting/InlineFormattingContext.cpp:
(WebCore::Layout::InlineFormattingContext::InlineFormattingContext):
* layout/inlineformatting/InlineFormattingContext.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="#trunkSourceWebCorelayoutLayoutContextcpp">trunk/Source/WebCore/layout/LayoutContext.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutLayoutContexth">trunk/Source/WebCore/layout/LayoutContext.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="#trunkSourceWebCorelayoutinlineformattingInlineFormattingContextcpp">trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutinlineformattingInlineFormattingContexth">trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (231093 => 231094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2018-04-27 14:34:47 UTC (rev 231093)
+++ trunk/Source/WebCore/ChangeLog      2018-04-27 14:40:24 UTC (rev 231094)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2018-04-27  Zalan Bujtas  <zalan@apple.com>
</span><span class="cx"> 
</span><ins>+        [LFC] Formatting contexts should take const Box&
+        https://bugs.webkit.org/show_bug.cgi?id=185031
+
+        Reviewed by Sam Weinig.
+
+        The formatting root boxes are supposed to be all const. The only reason why
+        they are not is because WeakPtr<> does not support const objects yet.
+        Use const_cast instead (remove it when WeakPtr<> gains const support).
+
+        * layout/FormattingContext.cpp:
+        (WebCore::Layout::FormattingContext::FormattingContext):
+        * layout/FormattingContext.h:
+        * layout/LayoutContext.cpp:
+        (WebCore::Layout::LayoutContext::LayoutContext):
+        (WebCore::Layout::LayoutContext::formattingContext):
+        * layout/LayoutContext.h:
+        * layout/blockformatting/BlockFormattingContext.cpp:
+        (WebCore::Layout::BlockFormattingContext::BlockFormattingContext):
+        * layout/blockformatting/BlockFormattingContext.h:
+        * layout/inlineformatting/InlineFormattingContext.cpp:
+        (WebCore::Layout::InlineFormattingContext::InlineFormattingContext):
+        * layout/inlineformatting/InlineFormattingContext.h:
+
+2018-04-27  Zalan Bujtas  <zalan@apple.com>
+
</ins><span class="cx">         [LFC] Add layout tree iterators.
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=185058
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutFormattingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/FormattingContext.cpp (231093 => 231094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/FormattingContext.cpp        2018-04-27 14:34:47 UTC (rev 231093)
+++ trunk/Source/WebCore/layout/FormattingContext.cpp   2018-04-27 14:40:24 UTC (rev 231094)
</span><span class="lines">@@ -35,8 +35,8 @@
</span><span class="cx"> 
</span><span class="cx"> WTF_MAKE_ISO_ALLOCATED_IMPL(FormattingContext);
</span><span class="cx"> 
</span><del>-FormattingContext::FormattingContext(Box& formattingContextRoot)
-    : m_root(makeWeakPtr(formattingContextRoot))
</del><ins>+FormattingContext::FormattingContext(const Box& formattingContextRoot)
+    : m_root(makeWeakPtr(const_cast<Box&>(formattingContextRoot)))
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutFormattingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/FormattingContext.h (231093 => 231094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/FormattingContext.h  2018-04-27 14:34:47 UTC (rev 231093)
+++ trunk/Source/WebCore/layout/FormattingContext.h     2018-04-27 14:40:24 UTC (rev 231094)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> class FormattingContext {
</span><span class="cx">     WTF_MAKE_ISO_ALLOCATED(FormattingContext);
</span><span class="cx"> public:
</span><del>-    FormattingContext(Box& formattingContextRoot);
</del><ins>+    FormattingContext(const Box& formattingContextRoot);
</ins><span class="cx">     virtual ~FormattingContext();
</span><span class="cx"> 
</span><span class="cx">     virtual void layout(FormattingState&) = 0;
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutLayoutContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/LayoutContext.cpp (231093 => 231094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/LayoutContext.cpp    2018-04-27 14:34:47 UTC (rev 231093)
+++ trunk/Source/WebCore/layout/LayoutContext.cpp       2018-04-27 14:40:24 UTC (rev 231094)
</span><span class="lines">@@ -40,8 +40,8 @@
</span><span class="cx"> 
</span><span class="cx"> WTF_MAKE_ISO_ALLOCATED_IMPL(LayoutContext);
</span><span class="cx"> 
</span><del>-LayoutContext::LayoutContext(Box& root)
-    : m_root(makeWeakPtr(root))
</del><ins>+LayoutContext::LayoutContext(const Box& root)
+    : m_root(makeWeakPtr(const_cast<Box&>(root)))
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx">     }).iterator->value;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-std::unique_ptr<FormattingContext> LayoutContext::formattingContext(Box& formattingContextRoot)
</del><ins>+std::unique_ptr<FormattingContext> LayoutContext::formattingContext(const Box& formattingContextRoot)
</ins><span class="cx"> {
</span><span class="cx">     if (formattingContextRoot.establishesBlockFormattingContext())
</span><span class="cx">         return std::make_unique<BlockFormattingContext>(formattingContextRoot);
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutLayoutContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/LayoutContext.h (231093 => 231094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/LayoutContext.h      2018-04-27 14:34:47 UTC (rev 231093)
+++ trunk/Source/WebCore/layout/LayoutContext.h 2018-04-27 14:40:24 UTC (rev 231094)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> class LayoutContext {
</span><span class="cx">     WTF_MAKE_ISO_ALLOCATED(LayoutContext);
</span><span class="cx"> public:
</span><del>-    LayoutContext(Box& root);
</del><ins>+    LayoutContext(const Box& root);
</ins><span class="cx"> 
</span><span class="cx">     void updateLayout();
</span><span class="cx"> 
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     FormattingState& formattingState(const FormattingContext&);
</span><del>-    std::unique_ptr<FormattingContext> formattingContext(Box& formattingContextRoot);
</del><ins>+    std::unique_ptr<FormattingContext> formattingContext(const Box& formattingContextRoot);
</ins><span class="cx"> 
</span><span class="cx">     WeakPtr<Box> m_root;
</span><span class="cx">     HashMap<const Box*, std::unique_ptr<FormattingState>> m_formattingStates;
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutblockformattingBlockFormattingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp (231093 => 231094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp   2018-04-27 14:34:47 UTC (rev 231093)
+++ trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp      2018-04-27 14:40:24 UTC (rev 231094)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> 
</span><span class="cx"> WTF_MAKE_ISO_ALLOCATED_IMPL(BlockFormattingContext);
</span><span class="cx"> 
</span><del>-BlockFormattingContext::BlockFormattingContext(Box& formattingContextRoot)
</del><ins>+BlockFormattingContext::BlockFormattingContext(const Box& formattingContextRoot)
</ins><span class="cx">     : FormattingContext(formattingContextRoot)
</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 (231093 => 231094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.h     2018-04-27 14:34:47 UTC (rev 231093)
+++ trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.h        2018-04-27 14:40:24 UTC (rev 231094)
</span><span class="lines">@@ -43,7 +43,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(Box& formattingContextRoot);
</del><ins>+    BlockFormattingContext(const Box& formattingContextRoot);
</ins><span class="cx"> 
</span><span class="cx">     void layout(FormattingState&) override;
</span><span class="cx">     std::unique_ptr<FormattingState> formattingState() const override;
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutinlineformattingInlineFormattingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp (231093 => 231094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp 2018-04-27 14:34:47 UTC (rev 231093)
+++ trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp    2018-04-27 14:40:24 UTC (rev 231094)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> 
</span><span class="cx"> WTF_MAKE_ISO_ALLOCATED_IMPL(InlineFormattingContext);
</span><span class="cx"> 
</span><del>-InlineFormattingContext::InlineFormattingContext(Box& formattingContextRoot)
</del><ins>+InlineFormattingContext::InlineFormattingContext(const Box& formattingContextRoot)
</ins><span class="cx">     : FormattingContext(formattingContextRoot)
</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 (231093 => 231094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.h   2018-04-27 14:34:47 UTC (rev 231093)
+++ trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.h      2018-04-27 14:40:24 UTC (rev 231094)
</span><span class="lines">@@ -41,7 +41,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(Box& formattingContextRoot);
</del><ins>+    InlineFormattingContext(const Box& formattingContextRoot);
</ins><span class="cx"> 
</span><span class="cx">     void layout(FormattingState&) override;
</span><span class="cx">     std::unique_ptr<FormattingState> formattingState() const override;
</span></span></pre>
</div>
</div>

</body>
</html>