<!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>[285956] 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/285956">285956</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2021-11-17 14:55:08 -0800 (Wed, 17 Nov 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[LFC][IFC] Introduce enum class IntrinsicWidthMode
https://bugs.webkit.org/show_bug.cgi?id=233277

Reviewed by Antti Koivisto.

This is in preparation for being able to apply different glyph hanging behavior for min and max intrinsic width computation.

* layout/formattingContexts/FormattingConstraints.h:
* layout/formattingContexts/inline/InlineContentBreaker.cpp:
(WebCore::Layout::InlineContentBreaker::InlineContentBreaker):
* layout/formattingContexts/inline/InlineContentBreaker.h:
(WebCore::Layout::InlineContentBreaker::isInIntrinsicWidthMode const):
* layout/formattingContexts/inline/InlineFormattingContext.cpp:
(WebCore::Layout::InlineFormattingContext::computedIntrinsicWidthConstraints):
(WebCore::Layout::InlineFormattingContext::computedIntrinsicWidthForConstraint const):
* layout/formattingContexts/inline/InlineFormattingContext.h:
* layout/formattingContexts/inline/InlineLineBuilder.cpp:
(WebCore::Layout::LineBuilder::LineBuilder):
(WebCore::Layout::LineBuilder::computedIntrinsicWidth):
(WebCore::Layout::LineBuilder::placeInlineContent):
* layout/formattingContexts/inline/InlineLineBuilder.h:
(WebCore::Layout::LineBuilder::intrinsicWidthMode const):
(WebCore::Layout::LineBuilder::isInIntrinsicWidthMode const):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorelayoutformattingContextsFormattingConstraintsh">trunk/Source/WebCore/layout/formattingContexts/FormattingConstraints.h</a></li>
<li><a href="#trunkSourceWebCorelayoutformattingContextsinlineInlineContentBreakercpp">trunk/Source/WebCore/layout/formattingContexts/inline/InlineContentBreaker.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutformattingContextsinlineInlineContentBreakerh">trunk/Source/WebCore/layout/formattingContexts/inline/InlineContentBreaker.h</a></li>
<li><a href="#trunkSourceWebCorelayoutformattingContextsinlineInlineFormattingContextcpp">trunk/Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutformattingContextsinlineInlineFormattingContexth">trunk/Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.h</a></li>
<li><a href="#trunkSourceWebCorelayoutformattingContextsinlineInlineLineBuildercpp">trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutformattingContextsinlineInlineLineBuilderh">trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (285955 => 285956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-11-17 22:51:04 UTC (rev 285955)
+++ trunk/Source/WebCore/ChangeLog      2021-11-17 22:55:08 UTC (rev 285956)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2021-11-17  Alan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Introduce enum class IntrinsicWidthMode
+        https://bugs.webkit.org/show_bug.cgi?id=233277
+
+        Reviewed by Antti Koivisto.
+
+        This is in preparation for being able to apply different glyph hanging behavior for min and max intrinsic width computation.
+
+        * layout/formattingContexts/FormattingConstraints.h:
+        * layout/formattingContexts/inline/InlineContentBreaker.cpp:
+        (WebCore::Layout::InlineContentBreaker::InlineContentBreaker):
+        * layout/formattingContexts/inline/InlineContentBreaker.h:
+        (WebCore::Layout::InlineContentBreaker::isInIntrinsicWidthMode const):
+        * layout/formattingContexts/inline/InlineFormattingContext.cpp:
+        (WebCore::Layout::InlineFormattingContext::computedIntrinsicWidthConstraints):
+        (WebCore::Layout::InlineFormattingContext::computedIntrinsicWidthForConstraint const):
+        * layout/formattingContexts/inline/InlineFormattingContext.h:
+        * layout/formattingContexts/inline/InlineLineBuilder.cpp:
+        (WebCore::Layout::LineBuilder::LineBuilder):
+        (WebCore::Layout::LineBuilder::computedIntrinsicWidth):
+        (WebCore::Layout::LineBuilder::placeInlineContent):
+        * layout/formattingContexts/inline/InlineLineBuilder.h:
+        (WebCore::Layout::LineBuilder::intrinsicWidthMode const):
+        (WebCore::Layout::LineBuilder::isInIntrinsicWidthMode const):
+
</ins><span class="cx"> 2021-11-17  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Web Locks API does get enabled in Service Workers when running layout tests
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextsFormattingConstraintsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/formattingContexts/FormattingConstraints.h (285955 => 285956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/FormattingConstraints.h   2021-11-17 22:51:04 UTC (rev 285955)
+++ trunk/Source/WebCore/layout/formattingContexts/FormattingConstraints.h      2021-11-17 22:55:08 UTC (rev 285956)
</span><span class="lines">@@ -87,6 +87,11 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+enum class IntrinsicWidthMode {
+    Minimum,
+    Maximum
+};
+
</ins><span class="cx"> struct IntrinsicWidthConstraints {
</span><span class="cx">     void expand(LayoutUnit horizontalValue);
</span><span class="cx">     IntrinsicWidthConstraints& operator+=(const IntrinsicWidthConstraints&);
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextsinlineInlineContentBreakercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/formattingContexts/inline/InlineContentBreaker.cpp (285955 => 285956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/inline/InlineContentBreaker.cpp   2021-11-17 22:51:04 UTC (rev 285955)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/InlineContentBreaker.cpp      2021-11-17 22:55:08 UTC (rev 285956)
</span><span class="lines">@@ -125,8 +125,8 @@
</span><span class="cx">     return { };
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-InlineContentBreaker::InlineContentBreaker(bool isInIntrinsicWidthMode)
-    : m_isInIntrinsicWidthMode(isInIntrinsicWidthMode)
</del><ins>+InlineContentBreaker::InlineContentBreaker(std::optional<IntrinsicWidthMode> intrinsicWidthMode)
+    : m_intrinsicWidthMode(intrinsicWidthMode)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextsinlineInlineContentBreakerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/formattingContexts/inline/InlineContentBreaker.h (285955 => 285956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/inline/InlineContentBreaker.h     2021-11-17 22:51:04 UTC (rev 285955)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/InlineContentBreaker.h        2021-11-17 22:55:08 UTC (rev 285956)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
</span><span class="cx"> 
</span><ins>+#include "FormattingConstraints.h"
</ins><span class="cx"> #include "LayoutUnits.h"
</span><span class="cx"> #include "RenderStyle.h"
</span><span class="cx"> 
</span><span class="lines">@@ -38,7 +39,7 @@
</span><span class="cx"> 
</span><span class="cx"> class InlineContentBreaker {
</span><span class="cx"> public:
</span><del>-    InlineContentBreaker(bool isInIntrinsicWidthMode);
</del><ins>+    InlineContentBreaker(std::optional<IntrinsicWidthMode>);
</ins><span class="cx"> 
</span><span class="cx">     struct PartialRun {
</span><span class="cx">         size_t length { 0 };
</span><span class="lines">@@ -150,9 +151,9 @@
</span><span class="cx">     };
</span><span class="cx">     OptionSet<WordBreakRule> wordBreakBehavior(const RenderStyle&, bool hasWrapOpportunityAtPreviousPosition) const;
</span><span class="cx">     bool shouldKeepEndOfLineWhitespace(const ContinuousContent&) const;
</span><del>-    bool isInIntrinsicWidthMode() const { return m_isInIntrinsicWidthMode; }
</del><ins>+    bool isInIntrinsicWidthMode() const { return !!m_intrinsicWidthMode; }
</ins><span class="cx"> 
</span><del>-    bool m_isInIntrinsicWidthMode { false };
</del><ins>+    std::optional<IntrinsicWidthMode> m_intrinsicWidthMode;
</ins><span class="cx">     bool n_hyphenationIsDisabled { false };
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextsinlineInlineFormattingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.cpp (285955 => 285956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.cpp        2021-11-17 22:51:04 UTC (rev 285955)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.cpp   2021-11-17 22:55:08 UTC (rev 285956)
</span><span class="lines">@@ -397,34 +397,34 @@
</span><span class="cx"> 
</span><span class="cx">     collectContentIfNeeded();
</span><span class="cx"> 
</span><del>-    auto maximumLineWidth = [&](auto availableWidth) {
</del><ins>+    auto maximumLineWidth = [&](auto intrinsicWidthMode) {
</ins><span class="cx">         // Switch to the min/max formatting root width values before formatting the lines.
</span><span class="cx">         for (auto* formattingRoot : formattingContextRootList) {
</span><span class="cx">             auto intrinsicWidths = layoutState.formattingStateForBox(*formattingRoot).intrinsicWidthConstraintsForBox(*formattingRoot);
</span><span class="cx">             auto& boxGeometry = formattingState().boxGeometry(*formattingRoot);
</span><del>-            auto contentWidth = (availableWidth ? intrinsicWidths->maximum : intrinsicWidths->minimum) - boxGeometry.horizontalMarginBorderAndPadding();
</del><ins>+            auto contentWidth = (intrinsicWidthMode == IntrinsicWidthMode::Maximum ? intrinsicWidths->maximum : intrinsicWidths->minimum) - boxGeometry.horizontalMarginBorderAndPadding();
</ins><span class="cx">             boxGeometry.setContentBoxWidth(contentWidth);
</span><span class="cx">         }
</span><del>-        return computedIntrinsicWidthForConstraint(availableWidth);
</del><ins>+        return computedIntrinsicWidthForConstraint(intrinsicWidthMode);
</ins><span class="cx">     };
</span><span class="cx"> 
</span><del>-    auto minimumContentWidth = ceiledLayoutUnit(maximumLineWidth(0));
-    auto maximumContentWidth = ceiledLayoutUnit(maximumLineWidth(maxInlineLayoutUnit()));
</del><ins>+    auto minimumContentWidth = ceiledLayoutUnit(maximumLineWidth(IntrinsicWidthMode::Minimum));
+    auto maximumContentWidth = ceiledLayoutUnit(maximumLineWidth(IntrinsicWidthMode::Maximum));
</ins><span class="cx">     auto constraints = formattingGeometry().constrainByMinMaxWidth(root(), { minimumContentWidth, maximumContentWidth });
</span><span class="cx">     formattingState().setIntrinsicWidthConstraints(constraints);
</span><span class="cx">     return constraints;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-InlineLayoutUnit InlineFormattingContext::computedIntrinsicWidthForConstraint(InlineLayoutUnit availableWidth) const
</del><ins>+InlineLayoutUnit InlineFormattingContext::computedIntrinsicWidthForConstraint(IntrinsicWidthMode intrinsicWidthMode) const
</ins><span class="cx"> {
</span><span class="cx">     auto& inlineItems = formattingState().inlineItems();
</span><del>-    auto lineBuilder = LineBuilder { *this, inlineItems };
</del><ins>+    auto lineBuilder = LineBuilder { *this, inlineItems, intrinsicWidthMode };
</ins><span class="cx">     auto layoutRange = LineBuilder::InlineItemRange { 0 , inlineItems.size() };
</span><span class="cx">     auto maximumLineWidth = InlineLayoutUnit { };
</span><span class="cx">     auto maximumFloatWidth = LayoutUnit { };
</span><span class="cx">     auto isFirstLine = true;
</span><span class="cx">     while (!layoutRange.isEmpty()) {
</span><del>-        auto intrinsicContent = lineBuilder.computedIntrinsicWidth(layoutRange, availableWidth, isFirstLine);
</del><ins>+        auto intrinsicContent = lineBuilder.computedIntrinsicWidth(layoutRange, isFirstLine);
</ins><span class="cx">         layoutRange.start = intrinsicContent.inlineItemRange.end;
</span><span class="cx">         maximumLineWidth = std::max(maximumLineWidth, intrinsicContent.logicalWidth);
</span><span class="cx">         isFirstLine = false;
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextsinlineInlineFormattingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.h (285955 => 285956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.h  2021-11-17 22:51:04 UTC (rev 285955)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.h     2021-11-17 22:55:08 UTC (rev 285956)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx">     void computeStaticPositionForOutOfFlowContent(const FormattingState::OutOfFlowBoxList&);
</span><span class="cx"> 
</span><span class="cx">     void computeIntrinsicWidthForFormattingRoot(const Box&);
</span><del>-    InlineLayoutUnit computedIntrinsicWidthForConstraint(InlineLayoutUnit availableWidth) const;
</del><ins>+    InlineLayoutUnit computedIntrinsicWidthForConstraint(IntrinsicWidthMode) const;
</ins><span class="cx"> 
</span><span class="cx">     void computeHorizontalMargin(const Box&, const HorizontalConstraints&);
</span><span class="cx">     void computeHeightAndMargin(const Box&, const HorizontalConstraints&);
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextsinlineInlineLineBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.cpp (285955 => 285956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.cpp      2021-11-17 22:51:04 UTC (rev 285955)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.cpp 2021-11-17 22:55:08 UTC (rev 285956)
</span><span class="lines">@@ -269,8 +269,8 @@
</span><span class="cx">     return boxGeometry.marginBoxWidth();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-LineBuilder::LineBuilder(InlineFormattingContext& inlineFormattingContext, FloatingState& floatingState, HorizontalConstraints rootHorizontalConstraints, const InlineItems& inlineItems, IsInIntrinsicWidthMode isInIntrinsicWidthMode)
-    : m_isInIntrinsicWidthMode(isInIntrinsicWidthMode == IsInIntrinsicWidthMode::Yes)
</del><ins>+LineBuilder::LineBuilder(InlineFormattingContext& inlineFormattingContext, FloatingState& floatingState, HorizontalConstraints rootHorizontalConstraints, const InlineItems& inlineItems, std::optional<IntrinsicWidthMode> intrinsicWidthMode)
+    : m_intrinsicWidthMode(intrinsicWidthMode)
</ins><span class="cx">     , m_inlineFormattingContext(inlineFormattingContext)
</span><span class="cx">     , m_inlineFormattingState(&inlineFormattingContext.formattingState())
</span><span class="cx">     , m_floatingState(&floatingState)
</span><span class="lines">@@ -280,8 +280,8 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-LineBuilder::LineBuilder(const InlineFormattingContext& inlineFormattingContext, const InlineItems& inlineItems, IsInIntrinsicWidthMode isInIntrinsicWidthMode)
-    : m_isInIntrinsicWidthMode(isInIntrinsicWidthMode == IsInIntrinsicWidthMode::Yes)
</del><ins>+LineBuilder::LineBuilder(const InlineFormattingContext& inlineFormattingContext, const InlineItems& inlineItems, std::optional<IntrinsicWidthMode> intrinsicWidthMode)
+    : m_intrinsicWidthMode(intrinsicWidthMode)
</ins><span class="cx">     , m_inlineFormattingContext(inlineFormattingContext)
</span><span class="cx">     , m_line(inlineFormattingContext)
</span><span class="cx">     , m_inlineItems(inlineItems)
</span><span class="lines">@@ -326,9 +326,11 @@
</span><span class="cx">         , lineRuns };
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-LineBuilder::IntrinsicContent LineBuilder::computedIntrinsicWidth(const InlineItemRange& needsLayoutRange, InlineLayoutUnit availableWidth, bool isFirstLine)
</del><ins>+LineBuilder::IntrinsicContent LineBuilder::computedIntrinsicWidth(const InlineItemRange& needsLayoutRange, bool isFirstLine)
</ins><span class="cx"> {
</span><del>-    auto lineConstraints = initialConstraintsForLine({ 0, 0, availableWidth, 0 }, isFirstLine);
</del><ins>+    ASSERT(isInIntrinsicWidthMode());
+    auto lineLogicalWidth = *intrinsicWidthMode() == IntrinsicWidthMode::Maximum ? maxInlineLayoutUnit() : 0.f;
+    auto lineConstraints = initialConstraintsForLine({ 0, 0, lineLogicalWidth, 0 }, isFirstLine);
</ins><span class="cx">     initialize(lineConstraints, isFirstLine, needsLayoutRange.start, { }, { });
</span><span class="cx"> 
</span><span class="cx">     auto committedContent = placeInlineContent(needsLayoutRange);
</span><span class="lines">@@ -393,7 +395,7 @@
</span><span class="cx"> LineBuilder::CommittedContent LineBuilder::placeInlineContent(const InlineItemRange& needsLayoutRange)
</span><span class="cx"> {
</span><span class="cx">     auto lineCandidate = LineCandidate { layoutState().shouldIgnoreTrailingLetterSpacing() };
</span><del>-    auto inlineContentBreaker = InlineContentBreaker { isInIntrinsicWidthMode() };
</del><ins>+    auto inlineContentBreaker = InlineContentBreaker { intrinsicWidthMode() };
</ins><span class="cx"> 
</span><span class="cx">     auto currentItemIndex = needsLayoutRange.start;
</span><span class="cx">     size_t committedInlineItemCount = 0;
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextsinlineInlineLineBuilderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.h (285955 => 285956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.h        2021-11-17 22:51:04 UTC (rev 285955)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.h   2021-11-17 22:55:08 UTC (rev 285956)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
</span><span class="cx"> 
</span><ins>+#include "FormattingConstraints.h"
</ins><span class="cx"> #include "InlineContentBreaker.h"
</span><span class="cx"> #include "InlineFormattingState.h"
</span><span class="cx"> #include "InlineLine.h"
</span><span class="lines">@@ -39,9 +40,8 @@
</span><span class="cx"> 
</span><span class="cx"> class LineBuilder {
</span><span class="cx"> public:
</span><del>-    enum class IsInIntrinsicWidthMode { No, Yes };
-    LineBuilder(InlineFormattingContext&, FloatingState&, HorizontalConstraints rootHorizontalConstraints, const InlineItems&, IsInIntrinsicWidthMode = IsInIntrinsicWidthMode::No);
-    LineBuilder(const InlineFormattingContext&, const InlineItems&, IsInIntrinsicWidthMode = IsInIntrinsicWidthMode::Yes);
</del><ins>+    LineBuilder(InlineFormattingContext&, FloatingState&, HorizontalConstraints rootHorizontalConstraints, const InlineItems&, std::optional<IntrinsicWidthMode> = std::nullopt);
+    LineBuilder(const InlineFormattingContext&, const InlineItems&, std::optional<IntrinsicWidthMode>);
</ins><span class="cx"> 
</span><span class="cx">     struct InlineItemRange {
</span><span class="cx">         bool isEmpty() const { return start == end; }
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx">         InlineLayoutUnit logicalWidth { 0 };
</span><span class="cx">         const FloatList& floats;
</span><span class="cx">     };
</span><del>-    IntrinsicContent computedIntrinsicWidth(const InlineItemRange&, InlineLayoutUnit availableWidth, bool isFirstLine);
</del><ins>+    IntrinsicContent computedIntrinsicWidth(const InlineItemRange&, bool isFirstLine);
</ins><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     void candidateContentForLine(LineCandidate&, size_t inlineItemIndex, const InlineItemRange& needsLayoutRange, InlineLayoutUnit currentLogicalRight);
</span><span class="lines">@@ -112,7 +112,8 @@
</span><span class="cx">     InlineLayoutUnit inlineItemWidth(const InlineItem&, InlineLayoutUnit contentLogicalLeft) const;
</span><span class="cx">     bool isLastLineWithInlineContent(const InlineItemRange& lineRange, size_t lastInlineItemIndex, bool hasPartialTrailingContent) const;
</span><span class="cx"> 
</span><del>-    bool isInIntrinsicWidthMode() const { return m_isInIntrinsicWidthMode; }
</del><ins>+    std::optional<IntrinsicWidthMode> intrinsicWidthMode() const { return m_intrinsicWidthMode; }
+    bool isInIntrinsicWidthMode() const { return !!intrinsicWidthMode(); }
</ins><span class="cx"> 
</span><span class="cx">     const InlineFormattingContext& formattingContext() const { return m_inlineFormattingContext; }
</span><span class="cx">     InlineFormattingState* formattingState() { return m_inlineFormattingState; }
</span><span class="lines">@@ -123,7 +124,7 @@
</span><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     bool m_isFirstLine { false };
</span><del>-    bool m_isInIntrinsicWidthMode { false };
</del><ins>+    std::optional<IntrinsicWidthMode> m_intrinsicWidthMode;
</ins><span class="cx">     const InlineFormattingContext& m_inlineFormattingContext;
</span><span class="cx">     InlineFormattingState* m_inlineFormattingState { nullptr };
</span><span class="cx">     FloatingState* m_floatingState { nullptr };
</span></span></pre>
</div>
</div>

</body>
</html>