<!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>[281280] 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/281280">281280</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2021-08-19 16:21:48 -0700 (Thu, 19 Aug 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[LFC][IFC] Remove redundant LineBox functions
https://bugs.webkit.org/show_bug.cgi?id=228046

Reviewed by Sam Weinig.

The line box's contentLogicalWidth always matches the root inlinebox's logical width.

* layout/formattingContexts/inline/InlineFormattingContext.cpp:
(WebCore::Layout::InlineFormattingContext::computeGeometryForLineContent):
* layout/formattingContexts/inline/InlineFormattingGeometry.cpp:
(WebCore::Layout::LineBoxBuilder::constructAndAlignInlineLevelBoxes):
(WebCore::Layout::LineBoxBuilder::computeLineBoxHeightAndAlignInlineLevelBoxesVertically):
* layout/formattingContexts/inline/InlineLineBox.cpp:
(WebCore::Layout::LineBox::LineBox):
* layout/formattingContexts/inline/InlineLineBox.h:
(WebCore::Layout::LineBox::logicalRect const):
(WebCore::Layout::LineBox::logicalWidth const): Deleted.
(WebCore::Layout::LineBox::logicalHeight const): Deleted.
(WebCore::Layout::LineBox::logicalTopLeft const): Deleted.
(WebCore::Layout::LineBox::logicalSize const): Deleted.
(WebCore::Layout::LineBox::contentLogicalWidth const): Deleted.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorelayoutformattingContextsinlineInlineFormattingContextcpp">trunk/Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutformattingContextsinlineInlineFormattingGeometrycpp">trunk/Source/WebCore/layout/formattingContexts/inline/InlineFormattingGeometry.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutformattingContextsinlineInlineLineBoxcpp">trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBox.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutformattingContextsinlineInlineLineBoxh">trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBox.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (281279 => 281280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-08-19 23:17:35 UTC (rev 281279)
+++ trunk/Source/WebCore/ChangeLog      2021-08-19 23:21:48 UTC (rev 281280)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2021-08-19  Alan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Remove redundant LineBox functions
+        https://bugs.webkit.org/show_bug.cgi?id=228046
+
+        Reviewed by Sam Weinig.
+
+        The line box's contentLogicalWidth always matches the root inlinebox's logical width. 
+
+        * layout/formattingContexts/inline/InlineFormattingContext.cpp:
+        (WebCore::Layout::InlineFormattingContext::computeGeometryForLineContent):
+        * layout/formattingContexts/inline/InlineFormattingGeometry.cpp:
+        (WebCore::Layout::LineBoxBuilder::constructAndAlignInlineLevelBoxes):
+        (WebCore::Layout::LineBoxBuilder::computeLineBoxHeightAndAlignInlineLevelBoxesVertically):
+        * layout/formattingContexts/inline/InlineLineBox.cpp:
+        (WebCore::Layout::LineBox::LineBox):
+        * layout/formattingContexts/inline/InlineLineBox.h:
+        (WebCore::Layout::LineBox::logicalRect const):
+        (WebCore::Layout::LineBox::logicalWidth const): Deleted.
+        (WebCore::Layout::LineBox::logicalHeight const): Deleted.
+        (WebCore::Layout::LineBox::logicalTopLeft const): Deleted.
+        (WebCore::Layout::LineBox::logicalSize const): Deleted.
+        (WebCore::Layout::LineBox::contentLogicalWidth const): Deleted.
+
</ins><span class="cx"> 2021-08-19  Wenson Hsieh  <wenson_hsieh@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [iOS] Remove support for the meaningful tap heuristic
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextsinlineInlineFormattingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.cpp (281279 => 281280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.cpp        2021-08-19 23:17:35 UTC (rev 281279)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.cpp   2021-08-19 23:21:48 UTC (rev 281280)
</span><span class="lines">@@ -474,7 +474,7 @@
</span><span class="cx">     auto& lineBoxLogicalRect = lineBox.logicalRect();
</span><span class="cx">     if (!lineBox.hasContent()) {
</span><span class="cx">         // Fast path for lines with no content e.g. <div><span></span><span></span></div> or <span><div></div></span> where we construct empty pre and post blocks.
</span><del>-        ASSERT(!lineBox.contentLogicalWidth() && !lineBoxLogicalRect.height());
</del><ins>+        ASSERT(!lineBox.rootInlineBox().hasContent() && !lineBoxLogicalRect.height());
</ins><span class="cx">         auto updateInlineBoxesGeometryIfApplicable = [&] {
</span><span class="cx">             if (!lineBox.hasInlineBox())
</span><span class="cx">                 return;
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextsinlineInlineFormattingGeometrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/formattingContexts/inline/InlineFormattingGeometry.cpp (281279 => 281280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/inline/InlineFormattingGeometry.cpp       2021-08-19 23:17:35 UTC (rev 281279)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/InlineFormattingGeometry.cpp  2021-08-19 23:21:48 UTC (rev 281280)
</span><span class="lines">@@ -249,7 +249,7 @@
</span><span class="cx">         }
</span><span class="cx">         // Construct the missing LineBox::InlineBoxes starting with the topmost layout box.
</span><span class="cx">         for (auto* layoutBox : WTF::makeReversedRange(layoutBoxesWithoutInlineBoxes)) {
</span><del>-            auto inlineBox = InlineLevelBox::createInlineBox(*layoutBox, rootInlineBox.logicalLeft(), lineBox.contentLogicalWidth());
</del><ins>+            auto inlineBox = InlineLevelBox::createInlineBox(*layoutBox, rootInlineBox.logicalLeft(), rootInlineBox.logicalWidth());
</ins><span class="cx">             setVerticalGeometryForInlineBox(inlineBox);
</span><span class="cx">             simplifiedAlignVerticallyIfApplicable(inlineBox, { });
</span><span class="cx">             lineBox.addInlineLevelBox(WTFMove(inlineBox));
</span><span class="lines">@@ -314,7 +314,7 @@
</span><span class="cx">             // and adjust it later if we come across an inlineBoxEnd run (see below).
</span><span class="cx">             // Inline box run is based on margin box. Let's convert it to border box.
</span><span class="cx">             auto marginStart = formattingContext().geometryForBox(layoutBox).marginStart();
</span><del>-            auto initialLogicalWidth = lineBox.contentLogicalWidth() - (run.logicalLeft() + marginStart);
</del><ins>+            auto initialLogicalWidth = rootInlineBox.logicalWidth() - (run.logicalLeft() + marginStart);
</ins><span class="cx">             ASSERT(initialLogicalWidth >= 0);
</span><span class="cx">             auto inlineBox = InlineLevelBox::createInlineBox(layoutBox, logicalLeft + marginStart, initialLogicalWidth);
</span><span class="cx">             setVerticalGeometryForInlineBox(inlineBox);
</span><span class="lines">@@ -589,7 +589,7 @@
</span><span class="cx">                 break;
</span><span class="cx">             case VerticalAlign::Bottom:
</span><span class="cx">                 // Note that this logical top is not relative to the parent inline box.
</span><del>-                logicalTop = lineBox.logicalHeight() - inlineLevelBox.layoutBounds().descent - inlineLevelBox.baseline();
</del><ins>+                logicalTop = lineBox.logicalRect().height() - inlineLevelBox.layoutBounds().descent - inlineLevelBox.baseline();
</ins><span class="cx">                 break;
</span><span class="cx">             default:
</span><span class="cx">                 ASSERT_NOT_IMPLEMENTED_YET();
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextsinlineInlineLineBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBox.cpp (281279 => 281280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBox.cpp  2021-08-19 23:17:35 UTC (rev 281279)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBox.cpp     2021-08-19 23:21:48 UTC (rev 281280)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx"> 
</span><span class="cx"> LineBox::LineBox(const Box& rootLayoutBox, const InlineLayoutPoint& logicalTopleft, InlineLayoutUnit lineLogicalWidth, InlineLayoutUnit contentLogicalLeft, InlineLayoutUnit contentLogicalWidth, size_t nonSpanningInlineLevelBoxCount)
</span><span class="cx">     : m_logicalRect(logicalTopleft, InlineLayoutSize { lineLogicalWidth, { } })
</span><del>-    , m_contentLogicalWidth(contentLogicalWidth)
</del><span class="cx">     , m_rootInlineBox(rootLayoutBox, contentLogicalLeft, InlineLayoutSize { contentLogicalWidth, { } }, InlineLevelBox::Type::RootInlineBox)
</span><span class="cx"> {
</span><span class="cx">     m_nonRootInlineLevelBoxList.reserveInitialCapacity(nonSpanningInlineLevelBoxCount);
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextsinlineInlineLineBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBox.h (281279 => 281280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBox.h    2021-08-19 23:17:35 UTC (rev 281279)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBox.h       2021-08-19 23:21:48 UTC (rev 281280)
</span><span class="lines">@@ -63,12 +63,6 @@
</span><span class="cx">     LineBox(const Box& rootLayoutBox, const InlineLayoutPoint& logicalTopLeft, InlineLayoutUnit contentLogicalLeft, InlineLayoutUnit lineLogicalWidth, InlineLayoutUnit contentLogicalWidth, size_t nonSpanningInlineLevelBoxCount);
</span><span class="cx"> 
</span><span class="cx">     const InlineRect& logicalRect() const { return m_logicalRect; }
</span><del>-    InlineLayoutUnit logicalWidth() const { return logicalSize().width(); }
-    InlineLayoutUnit logicalHeight() const { return logicalSize().height(); }
-    InlineLayoutPoint logicalTopLeft() const { return logicalRect().topLeft(); }
-    InlineLayoutSize logicalSize() const { return logicalRect().size(); }
-    InlineLayoutUnit contentLogicalWidth() const { return m_contentLogicalWidth; }
-
</del><span class="cx">     // Note that the line can have many inline boxes and be "empty" the same time e.g. <div><span></span><span></span></div>
</span><span class="cx">     bool hasContent() const { return m_hasContent; }
</span><span class="cx">     bool hasInlineBox() const { return m_boxTypes.contains(InlineLevelBox::Type::InlineBox); }
</span><span class="lines">@@ -106,7 +100,6 @@
</span><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     InlineRect m_logicalRect;
</span><del>-    InlineLayoutUnit m_contentLogicalWidth { 0 };
</del><span class="cx">     bool m_hasContent { false };
</span><span class="cx">     OptionSet<InlineLevelBox::Type> m_boxTypes;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>