Changeset 275494 in webkit

Timestamp:

Apr 6, 2021 1:37:33 AM (3 years ago)

Author:

commit-queue@webkit.org

Message:

Move synthesizedBaselineFromBorderBox to RenderBox
​https://bugs.webkit.org/show_bug.cgi?id=224186

Patch by Rob Buis <​rbuis@igalia.com> on 2021-04-06
Reviewed by Javier Fernandez.

Move synthesizedBaselineFromBorderBox to RenderBox since there are
various call sites using it.

• rendering/RenderBlockFlow.cpp:

(WebCore::RenderBlockFlow::inlineBlockBaseline const):

• rendering/RenderBox.cpp:

(WebCore::synthesizedBaselineFromBorderBox):

• rendering/RenderBox.h:
• rendering/RenderFlexibleBox.cpp:

(WebCore::synthesizedBaselineFromBorderBox): Deleted.

• rendering/RenderGrid.cpp:

(WebCore::synthesizedBaselineFromBorderBox): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlockFlow.cpp (modified) (1 diff)
• rendering/RenderBox.cpp (modified) (1 diff)
• rendering/RenderBox.h (modified) (1 diff)
• rendering/RenderFlexibleBox.cpp (modified) (1 diff)
• rendering/RenderGrid.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-04-06  Rob Buis  <rbuis@igalia.com>
+
+        Move synthesizedBaselineFromBorderBox to RenderBox
+        https://bugs.webkit.org/show_bug.cgi?id=224186
+
+        Reviewed by Javier Fernandez.
+
+        Move synthesizedBaselineFromBorderBox to RenderBox since there are
+        various call sites using it.
+
+        * rendering/RenderBlockFlow.cpp:
+        (WebCore::RenderBlockFlow::inlineBlockBaseline const):
+        * rendering/RenderBox.cpp:
+        (WebCore::synthesizedBaselineFromBorderBox):
+        * rendering/RenderBox.h:
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::synthesizedBaselineFromBorderBox): Deleted.
+        * rendering/RenderGrid.cpp:
+        (WebCore::synthesizedBaselineFromBorderBox): Deleted.
+
 2021-04-05  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlockFlow.cpp

@@ -3142 +3142 @@
     }
     // Note that here we only take the left and bottom into consideration. Our caller takes the right and top into consideration.
-    float boxHeight = lineDirection == HorizontalLine ? height() + m_marginBox.bottom() : width() + m_marginBox.left();
+    float boxHeight = synthesizedBaselineFromBorderBox(*this, lineDirection) + (lineDirection == HorizontalLine ? m_marginBox.bottom() : m_marginBox.left());
     float lastBaseline = 0;
     if (!childrenInline()) {

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -5238 +5238 @@
 }
 
+LayoutUnit synthesizedBaselineFromBorderBox(const RenderBox& box, LineDirectionMode direction)
+{
+    return direction == HorizontalLine ? box.height() : box.width();
+}
+
 } // namespace WebCore

trunk/Source/WebCore/rendering/RenderBox.h

@@ -852 +852 @@
 }
 
+LayoutUnit synthesizedBaselineFromBorderBox(const RenderBox&, LineDirectionMode);
+
 } // namespace WebCore
 

trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

@@ -143 +143 @@
     maxLogicalWidth += scrollbarWidth;
     minLogicalWidth += scrollbarWidth;
-}
-
-static LayoutUnit synthesizedBaselineFromBorderBox(const RenderBox& box, LineDirectionMode direction)
-{
-    return direction == HorizontalLine ? box.size().height() : box.size().width();
 }
 

trunk/Source/WebCore/rendering/RenderGrid.cpp

@@ -1231 +1231 @@
         child.setMarginAfter(availableAlignmentSpace, &parentStyle);
     }
-}
-
-// FIXME: This logic could be refactored somehow and defined in RenderBox.
-static LayoutUnit synthesizedBaselineFromBorderBox(const RenderBox& box, LineDirectionMode direction)
-{
-    return (direction == HorizontalLine ? box.size().height() : box.size().width()).toInt();
 }