[IFC][Cleanup] Move min/max content size LayoutUnit rounding to Inlin…

…eFormattingContext level

https://bugs.webkit.org/show_bug.cgi?id=265525

Reviewed by Antti Koivisto.

Use InlineLayoutUnit inside IFC and covert to LayoutUnit only at API boundary.

* Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.cpp:
(WebCore::Layout::InlineFormattingContext::computedIntrinsicSizes):
(WebCore::Layout::InlineFormattingContext::maximumContentSize):
* Source/WebCore/layout/formattingContexts/inline/IntrinsicWidthHandler.cpp:
(WebCore::Layout::IntrinsicWidthHandler::minimumContentSize):
(WebCore::Layout::IntrinsicWidthHandler::maximumContentSize):
* Source/WebCore/layout/formattingContexts/inline/IntrinsicWidthHandler.h:

Canonical link: https://commits.webkit.org/271334@main

Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.cpp

@@ -157,7 +157,7 @@ IntrinsicWidthConstraints InlineFormattingContext::computedIntrinsicSizes(const
         inlineContentCache.resetMinimumMaximumContentSizes();
 
     if (inlineContentCache.minimumContentSize() && inlineContentCache.maximumContentSize())
-        return { LayoutUnit { *inlineContentCache.minimumContentSize() }, LayoutUnit { *inlineContentCache.maximumContentSize() } };
+        return { ceiledLayoutUnit(*inlineContentCache.minimumContentSize()), ceiledLayoutUnit(*inlineContentCache.maximumContentSize()) };
 
     rebuildInlineItemListIfNeeded(lineDamage);
     auto& inlineItemList = inlineContentCache.inlineItems().content();
@@ -178,17 +178,17 @@ IntrinsicWidthConstraints InlineFormattingContext::computedIntrinsicSizes(const
             inlineContentCache.setMaximumIntrinsicWidthLayoutResult(WTFMove(*intrinsicWidthHandler.maximumIntrinsicWidthResult()));
     }
 
-    return { LayoutUnit { *inlineContentCache.minimumContentSize() }, LayoutUnit { *inlineContentCache.maximumContentSize() } };
+    return { ceiledLayoutUnit(*inlineContentCache.minimumContentSize()), ceiledLayoutUnit(*inlineContentCache.maximumContentSize()) };
 }
 
 LayoutUnit InlineFormattingContext::maximumContentSize()
 {
     auto& inlineContentCache = this->inlineContentCache();
     if (auto maximumContentSize = inlineContentCache.maximumContentSize())
-        return LayoutUnit { *maximumContentSize };
+        return ceiledLayoutUnit(*maximumContentSize);
 
     auto mayUseSimplifiedTextOnlyInlineLayout = TextOnlySimpleLineBuilder::isEligibleForSimplifiedTextOnlyInlineLayout(root(), inlineContentCache);
-    return IntrinsicWidthHandler { *this, inlineContentCache.inlineItems().content(), mayUseSimplifiedTextOnlyInlineLayout }.maximumContentSize();
+    return ceiledLayoutUnit(IntrinsicWidthHandler { *this, inlineContentCache.inlineItems().content(), mayUseSimplifiedTextOnlyInlineLayout }.maximumContentSize());
 }
 
 static bool mayExitFromPartialLayout(const InlineDamage& lineDamage, size_t lineIndex, const InlineDisplay::Boxes& newContent)

Source/WebCore/layout/formattingContexts/inline/IntrinsicWidthHandler.cpp

@@ -74,7 +74,7 @@ IntrinsicWidthHandler::IntrinsicWidthHandler(InlineFormattingContext& inlineForm
 {
 }
 
-LayoutUnit IntrinsicWidthHandler::minimumContentSize()
+InlineLayoutUnit IntrinsicWidthHandler::minimumContentSize()
 {
     auto minimumContentSize = InlineLayoutUnit { };
 
@@ -88,10 +88,10 @@ LayoutUnit IntrinsicWidthHandler::minimumContentSize()
         minimumContentSize = computedIntrinsicWidthForConstraint(IntrinsicWidthMode::Minimum, lineBuilder, MayCacheLayoutResult::No);
     }
 
-    return ceiledLayoutUnit(minimumContentSize);
+    return minimumContentSize;
 }
 
-LayoutUnit IntrinsicWidthHandler::maximumContentSize()
+InlineLayoutUnit IntrinsicWidthHandler::maximumContentSize()
 {
     auto mayCacheLayoutResult = m_mayUseSimplifiedTextOnlyInlineLayout ? MayCacheLayoutResult::Yes : MayCacheLayoutResult::No;
     auto maximumContentSize = InlineLayoutUnit { };
@@ -106,7 +106,7 @@ LayoutUnit IntrinsicWidthHandler::maximumContentSize()
         maximumContentSize = computedIntrinsicWidthForConstraint(IntrinsicWidthMode::Maximum, lineBuilder, mayCacheLayoutResult);
     }
 
-    return ceiledLayoutUnit(maximumContentSize);
+    return maximumContentSize;
 }
 
 InlineLayoutUnit IntrinsicWidthHandler::computedIntrinsicWidthForConstraint(IntrinsicWidthMode intrinsicWidthMode, AbstractLineBuilder& lineBuilder, MayCacheLayoutResult mayCacheLayoutResult)

Source/WebCore/layout/formattingContexts/inline/IntrinsicWidthHandler.h

@@ -39,8 +39,8 @@ class IntrinsicWidthHandler {
 public:
     IntrinsicWidthHandler(InlineFormattingContext&, const InlineItemList&, bool mayUseSimplifiedTextOnlyInlineLayout);
 
-    LayoutUnit minimumContentSize();
-    LayoutUnit maximumContentSize();
+    InlineLayoutUnit minimumContentSize();
+    InlineLayoutUnit maximumContentSize();
 
     struct LineBreakingResult {
         InlineLayoutUnit constraint;