Changeset 275594 in webkit

Timestamp:

Apr 7, 2021 2:03:08 AM (3 years ago)

Author:

commit-queue@webkit.org

Message:

Make synthesizedBaselineFromContentBox return LayoutUnit
​https://bugs.webkit.org/show_bug.cgi?id=224234

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

Make synthesizedBaselineFromContentBox return LayoutUnit. This
makes it consistent with synthesizedBaselineFromBorderBox.

• rendering/RenderButton.cpp:

(WebCore::synthesizedBaselineFromContentBox):
(WebCore::RenderButton::baselinePosition const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderButton.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-04-07  Rob Buis  <rbuis@igalia.com>
+
+        Make synthesizedBaselineFromContentBox return LayoutUnit
+        https://bugs.webkit.org/show_bug.cgi?id=224234
+
+        Reviewed by Javier Fernandez.
+
+        Make synthesizedBaselineFromContentBox return LayoutUnit. This
+        makes it consistent with synthesizedBaselineFromBorderBox.
+
+        * rendering/RenderButton.cpp:
+        (WebCore::synthesizedBaselineFromContentBox):
+        (WebCore::RenderButton::baselinePosition const):
+
 2021-04-07  Alejandro G. Castro  <alex@igalia.com>
 

trunk/Source/WebCore/rendering/RenderButton.cpp

@@ -144 +144 @@
 }
 
-static int synthesizedBaselineFromContentBox(const RenderBox& box, LineDirectionMode direction)
+static LayoutUnit synthesizedBaselineFromContentBox(const RenderBox& box, LineDirectionMode direction)
 {
     return direction == HorizontalLine ? box.borderTop() + box.paddingTop() + box.contentHeight() : box.borderRight() + box.paddingRight() + box.contentWidth();
@@ -153 +153 @@
     // We cannot rely on RenderFlexibleBox::baselinePosition() because of flexboxes have some special behavior
     // regarding baselines that shouldn't apply to buttons.
-    int baseline = firstLineBaseline().valueOr(synthesizedBaselineFromContentBox(*this, direction));
-    int marginAscent = direction == HorizontalLine ? marginTop() : marginRight();
+    LayoutUnit baseline = firstLineBaseline().valueOr(synthesizedBaselineFromContentBox(*this, direction));
+    LayoutUnit marginAscent = direction == HorizontalLine ? marginTop() : marginRight();
     return baseline + marginAscent;
 }