Merge r241295 - [LFC] Remove redundant InlineFormattingContext::compu…

…teBorderAndPadding https://bugs.webkit.org/show_bug.cgi?id=194540 Reviewed by Antti Koivisto. Use FormattingContext::computeBorderAndPadding instead. * layout/FormattingContext.cpp: (WebCore::Layout::FormattingContext::computeBorderAndPadding const): * layout/FormattingContext.h: * layout/inlineformatting/InlineFormattingContext.cpp: (WebCore::Layout::InlineFormattingContext::computeBorderAndPadding const): Deleted. * layout/inlineformatting/InlineFormattingContext.h:
WebKit · Feb 13, 2019 · ffe2203 · ffe2203
1 parent 6b07eda
commit ffe2203
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 12 deletions.
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2019-02-12  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC] Remove redundant InlineFormattingContext::computeBorderAndPadding
+        https://bugs.webkit.org/show_bug.cgi?id=194540
+
+        Reviewed by Antti Koivisto.
+
+        Use FormattingContext::computeBorderAndPadding instead.
+
+        * layout/FormattingContext.cpp:
+        (WebCore::Layout::FormattingContext::computeBorderAndPadding const):
+        * layout/FormattingContext.h:
+        * layout/inlineformatting/InlineFormattingContext.cpp:
+        (WebCore::Layout::InlineFormattingContext::computeBorderAndPadding const): Deleted.
+        * layout/inlineformatting/InlineFormattingContext.h:
+
 2019-02-12  Zalan Bujtas  <zalan@apple.com>
 
         [LFC][IFC] Add intrinsic width support for float boxes.

diff --git a/Source/WebCore/layout/FormattingContext.cpp b/Source/WebCore/layout/FormattingContext.cpp
@@ -123,13 +123,14 @@ void FormattingContext::computeOutOfFlowVerticalGeometry(const Box& layoutBox) c
     displayBox.setVerticalMargin({ nonCollapsedVerticalMargin, { } });
 }
 
-void FormattingContext::computeBorderAndPadding(const Box& layoutBox) const
+void FormattingContext::computeBorderAndPadding(const Box& layoutBox, Optional<UsedHorizontalValues> usedValues) const
 {
     auto& layoutState = this->layoutState();
+    if (!usedValues)
+        usedValues = UsedHorizontalValues { layoutState.displayBoxForLayoutBox(*layoutBox.containingBlock()).contentBoxWidth() };
     auto& displayBox = layoutState.displayBoxForLayoutBox(layoutBox);
-    auto containingBlockWidth = layoutState.displayBoxForLayoutBox(*layoutBox.containingBlock()).contentBoxWidth();
     displayBox.setBorder(Geometry::computedBorder(layoutBox));
-    displayBox.setPadding(Geometry::computedPadding(layoutBox, UsedHorizontalValues { containingBlockWidth }));
+    displayBox.setPadding(Geometry::computedPadding(layoutBox, *usedValues));
 }
 
 void FormattingContext::layoutOutOfFlowDescendants(const Box& layoutBox) const

diff --git a/Source/WebCore/layout/FormattingContext.h b/Source/WebCore/layout/FormattingContext.h
@@ -69,7 +69,7 @@ class FormattingContext {
     FormattingState& formattingState() const { return m_formattingState; }
     const Box& root() const { return *m_root; }
 
-    void computeBorderAndPadding(const Box&) const;
+    void computeBorderAndPadding(const Box&, Optional<UsedHorizontalValues> = WTF::nullopt) const;
 
 #ifndef NDEBUG
     virtual void validateGeometryConstraintsAfterLayout() const;

diff --git a/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp b/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp
@@ -190,13 +190,6 @@ void InlineFormattingContext::computeMargin(const Box& layoutBox, UsedHorizontal
     displayBox.setHorizontalMargin({ computedHorizontalMargin.start.valueOr(0), computedHorizontalMargin.end.valueOr(0) });
 }
 
-void InlineFormattingContext::computeBorderAndPadding(const Box& layoutBox, UsedHorizontalValues usedValues) const
-{
-    auto& displayBox = layoutState().displayBoxForLayoutBox(layoutBox);
-    displayBox.setBorder(Geometry::computedBorder(layoutBox));
-    displayBox.setPadding(Geometry::computedPadding(layoutBox, usedValues));
-}
-
 void InlineFormattingContext::computeWidthAndMargin(const Box& layoutBox, UsedHorizontalValues usedValues) const
 {
     auto& layoutState = this->layoutState();

diff --git a/Source/WebCore/layout/inlineformatting/InlineFormattingContext.h b/Source/WebCore/layout/inlineformatting/InlineFormattingContext.h
@@ -92,7 +92,6 @@ class InlineFormattingContext : public FormattingContext {
     void computeIntrinsicWidthForInlineBlock(const Box&) const;
     void computeWidthAndHeightForReplacedInlineBox(const Box&, UsedHorizontalValues) const;
     void computeMargin(const Box&, UsedHorizontalValues) const;
-    void computeBorderAndPadding(const Box&, UsedHorizontalValues) const;
     void computeHeightAndMargin(const Box&) const;
     void computeWidthAndMargin(const Box&, UsedHorizontalValues) const;