<!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>[235643] 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/235643">235643</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2018-09-04 15:16:44 -0700 (Tue, 04 Sep 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>[LFC] Rename LayoutPair to BoxPair
https://bugs.webkit.org/show_bug.cgi?id=189276

Reviewed by Antti Koivisto.

* layout/FormattingContext.h:
* layout/blockformatting/BlockFormattingContext.cpp:
(WebCore::Layout::BlockFormattingContext::layout const):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorelayoutFormattingContexth">trunk/Source/WebCore/layout/FormattingContext.h</a></li>
<li><a href="#trunkSourceWebCorelayoutblockformattingBlockFormattingContextcpp">trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (235642 => 235643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2018-09-04 21:41:54 UTC (rev 235642)
+++ trunk/Source/WebCore/ChangeLog      2018-09-04 22:16:44 UTC (rev 235643)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2018-09-04  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC] Rename LayoutPair to BoxPair
+        https://bugs.webkit.org/show_bug.cgi?id=189276
+
+        Reviewed by Antti Koivisto.
+
+        * layout/FormattingContext.h:
+        * layout/blockformatting/BlockFormattingContext.cpp:
+        (WebCore::Layout::BlockFormattingContext::layout const):
+
</ins><span class="cx"> 2018-09-04  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Disable WebRTC unified plan runtime flag by default
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutFormattingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/FormattingContext.h (235642 => 235643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/FormattingContext.h  2018-09-04 21:41:54 UTC (rev 235642)
+++ trunk/Source/WebCore/layout/FormattingContext.h     2018-09-04 22:16:44 UTC (rev 235643)
</span><span class="lines">@@ -64,11 +64,11 @@
</span><span class="cx">     static Position mapCoordinateToAncestor(const LayoutContext&, Position, const Container& containingBlock, const Container& ancestor);
</span><span class="cx"> 
</span><span class="cx"> protected:
</span><del>-    struct LayoutPair {
-        const Box& layoutBox;
-        Display::Box& displayBox;
</del><ins>+    struct BoxPair {
+        const Box& layout;
+        Display::Box& display;
</ins><span class="cx">     };
</span><del>-    using LayoutQueue = Vector<std::unique_ptr<LayoutPair>>;
</del><ins>+    using LayoutQueue = Vector<std::unique_ptr<BoxPair>>;
</ins><span class="cx"> 
</span><span class="cx">     const Box& root() const { return *m_root; }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutblockformattingBlockFormattingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp (235642 => 235643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp   2018-09-04 21:41:54 UTC (rev 235642)
+++ trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp      2018-09-04 22:16:44 UTC (rev 235643)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx">     // This is a post-order tree traversal layout.
</span><span class="cx">     // The root container layout is done in the formatting context it lives in, not that one it creates, so let's start with the first child.
</span><span class="cx">     if (auto* firstChild = formattingRoot.firstInFlowOrFloatingChild())
</span><del>-        layoutQueue.append(std::make_unique<LayoutPair>(LayoutPair {*firstChild, layoutContext.createDisplayBox(*firstChild)}));
</del><ins>+        layoutQueue.append(std::make_unique<BoxPair>(BoxPair {*firstChild, layoutContext.createDisplayBox(*firstChild)}));
</ins><span class="cx">     // 1. Go all the way down to the leaf node
</span><span class="cx">     // 2. Compute static position and width as we traverse down
</span><span class="cx">     // 3. As we climb back on the tree, compute height and finialize position
</span><span class="lines">@@ -74,9 +74,9 @@
</span><span class="cx">     while (!layoutQueue.isEmpty()) {
</span><span class="cx">         // Traverse down on the descendants and compute width/static position until we find a leaf node.
</span><span class="cx">         while (true) {
</span><del>-            auto& layoutPair = *layoutQueue.last();
-            auto& layoutBox = layoutPair.layoutBox;
-            auto& displayBox = layoutPair.displayBox;
</del><ins>+            auto& boxPair = *layoutQueue.last();
+            auto& layoutBox = boxPair.layout;
+            auto& displayBox = boxPair.display;
</ins><span class="cx"> 
</span><span class="cx">             if (layoutBox.establishesFormattingContext()) {
</span><span class="cx">                 layoutFormattingContextRoot(layoutContext, floatingContext, formattingState, layoutBox, displayBox);
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx">                 if (!layoutBox.nextInFlowOrFloatingSibling())
</span><span class="cx">                     break;
</span><span class="cx">                 auto* nextSibling = layoutBox.nextInFlowOrFloatingSibling();
</span><del>-                layoutQueue.append(std::make_unique<LayoutPair>(LayoutPair {*nextSibling, layoutContext.createDisplayBox(*nextSibling)}));
</del><ins>+                layoutQueue.append(std::make_unique<BoxPair>(BoxPair {*nextSibling, layoutContext.createDisplayBox(*nextSibling)}));
</ins><span class="cx">                 continue;
</span><span class="cx">             }
</span><span class="cx"> 
</span><span class="lines">@@ -97,15 +97,15 @@
</span><span class="cx">             if (!is<Container>(layoutBox) || !downcast<Container>(layoutBox).hasInFlowOrFloatingChild())
</span><span class="cx">                 break;
</span><span class="cx">             auto& firstChild = *downcast<Container>(layoutBox).firstInFlowOrFloatingChild();
</span><del>-            layoutQueue.append(std::make_unique<LayoutPair>(LayoutPair {firstChild, layoutContext.createDisplayBox(firstChild)}));
</del><ins>+            layoutQueue.append(std::make_unique<BoxPair>(BoxPair {firstChild, layoutContext.createDisplayBox(firstChild)}));
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         // Climb back on the ancestors and compute height/final position.
</span><span class="cx">         while (!layoutQueue.isEmpty()) {
</span><span class="cx">             // All inflow descendants (if there are any) are laid out by now. Let's compute the box's height.
</span><del>-            auto layoutPair = layoutQueue.takeLast();
-            auto& layoutBox = layoutPair->layoutBox;
-            auto& displayBox = layoutPair->displayBox;
</del><ins>+            auto boxPair = layoutQueue.takeLast();
+            auto& layoutBox = boxPair->layout;
+            auto& displayBox = boxPair->display;
</ins><span class="cx"> 
</span><span class="cx">             LOG_WITH_STREAM(FormattingContextLayout, stream << "[Compute] -> [Height][Margin] -> for layoutBox(" << &layoutBox << ")");
</span><span class="cx">             // Formatting root boxes are special-cased and they don't come here.
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx">             // Move in-flow positioned children to their final position.
</span><span class="cx">             placeInFlowPositionedChildren(layoutContext, container);
</span><span class="cx">             if (auto* nextSibling = container.nextInFlowOrFloatingSibling()) {
</span><del>-                layoutQueue.append(std::make_unique<LayoutPair>(LayoutPair {*nextSibling, layoutContext.createDisplayBox(*nextSibling)}));
</del><ins>+                layoutQueue.append(std::make_unique<BoxPair>(BoxPair {*nextSibling, layoutContext.createDisplayBox(*nextSibling)}));
</ins><span class="cx">                 break;
</span><span class="cx">             }
</span><span class="cx">         }
</span></span></pre>
</div>
</div>

</body>
</html>