Changeset 275502 in webkit

Timestamp:

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

Author:

commit-queue@webkit.org

Message:

Migrate layout ascents and descents to LayoutUnits instead of ints
​https://bugs.webkit.org/show_bug.cgi?id=133040

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

Migrate layout ascents and descents to LayoutUnits instead of ints.
The actual ascent/descent values are still integral.

• rendering/InlineFlowBox.cpp:

(WebCore::InlineFlowBox::adjustMaxAscentAndDescent):
(WebCore::InlineFlowBox::computeLogicalBoxHeights):

• rendering/InlineFlowBox.h:
• rendering/RootInlineBox.cpp:

(WebCore::RootInlineBox::alignBoxesInBlockDirection):
(WebCore::setAscentAndDescent):
(WebCore::RootInlineBox::ascentAndDescentForBox const):

• rendering/RootInlineBox.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/InlineFlowBox.cpp (modified) (4 diffs)
• rendering/InlineFlowBox.h (modified) (1 diff)
• rendering/RootInlineBox.cpp (modified) (7 diffs)
• rendering/RootInlineBox.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-04-06  Rob Buis  <rbuis@igalia.com>
+
+        Migrate layout ascents and descents to LayoutUnits instead of ints
+        https://bugs.webkit.org/show_bug.cgi?id=133040
+
+        Reviewed by Zalan Bujtas.
+
+        Migrate layout ascents and descents to LayoutUnits instead of ints.
+        The actual ascent/descent values are still integral.
+
+        * rendering/InlineFlowBox.cpp:
+        (WebCore::InlineFlowBox::adjustMaxAscentAndDescent):
+        (WebCore::InlineFlowBox::computeLogicalBoxHeights):
+        * rendering/InlineFlowBox.h:
+        * rendering/RootInlineBox.cpp:
+        (WebCore::RootInlineBox::alignBoxesInBlockDirection):
+        (WebCore::setAscentAndDescent):
+        (WebCore::RootInlineBox::ascentAndDescentForBox const):
+        * rendering/RootInlineBox.h:
+
 2021-04-06  Chris Lord  <clord@igalia.com>
 

trunk/Source/WebCore/rendering/InlineFlowBox.cpp

@@ -500 +500 @@
 }
 
-void InlineFlowBox::adjustMaxAscentAndDescent(int& maxAscent, int& maxDescent, int maxPositionTop, int maxPositionBottom)
+void InlineFlowBox::adjustMaxAscentAndDescent(LayoutUnit& maxAscent, LayoutUnit& maxDescent, LayoutUnit maxPositionTop, LayoutUnit maxPositionBottom)
 {
     for (InlineBox* child = firstChild(); child; child = child->nextOnLine()) {
@@ -529 +529 @@
 
 void InlineFlowBox::computeLogicalBoxHeights(RootInlineBox& rootBox, LayoutUnit& maxPositionTop, LayoutUnit& maxPositionBottom,
-    int& maxAscent, int& maxDescent, bool& setMaxAscent, bool& setMaxDescent,
+    LayoutUnit& maxAscent, LayoutUnit& maxDescent, bool& setMaxAscent, bool& setMaxDescent,
     bool strictMode, GlyphOverflowAndFallbackFontsMap& textBoxDataMap,
     FontBaseline baselineType, VerticalPositionCache& verticalPositionCache)
@@ -554 +554 @@
     if (isRootInlineBox()) {
         // Examine our root box.
-        int ascent = 0;
-        int descent = 0;
+        LayoutUnit ascent;
+        LayoutUnit descent;
         rootBox.ascentAndDescentForBox(rootBox, textBoxDataMap, ascent, descent, affectsAscent, affectsDescent);
         if (strictMode || hasTextChildren() || (!checkChildren && hasTextDescendants())) {
@@ -587 +587 @@
         child->setLogicalTop(rootBox.verticalPositionForBox(child, verticalPositionCache));
         
-        int ascent = 0;
-        int descent = 0;
+        LayoutUnit ascent;
+        LayoutUnit descent;
         rootBox.ascentAndDescentForBox(*child, textBoxDataMap, ascent, descent, affectsAscent, affectsDescent);
 

trunk/Source/WebCore/rendering/InlineFlowBox.h

@@ -187 +187 @@
 
     void computeLogicalBoxHeights(RootInlineBox&, LayoutUnit& maxPositionTop, LayoutUnit& maxPositionBottom,
-        int& maxAscent, int& maxDescent, bool& setMaxAscent, bool& setMaxDescent,
+        LayoutUnit& maxAscent, LayoutUnit& maxDescent, bool& setMaxAscent, bool& setMaxDescent,
         bool strictMode, GlyphOverflowAndFallbackFontsMap&, FontBaseline, VerticalPositionCache&);
-    void adjustMaxAscentAndDescent(int& maxAscent, int& maxDescent,
-        int maxPositionTop, int maxPositionBottom);
+    void adjustMaxAscentAndDescent(LayoutUnit& maxAscent, LayoutUnit& maxDescent,
+        LayoutUnit maxPositionTop, LayoutUnit maxPositionBottom);
     void placeBoxesInBlockDirection(LayoutUnit logicalTop, LayoutUnit maxHeight, int maxAscent, bool strictMode, LayoutUnit& lineTop, LayoutUnit& lineBottom, bool& setLineTop,
         LayoutUnit& lineTopIncludingMargins, LayoutUnit& lineBottomIncludingMargins, bool& hasAnnotationsBefore, bool& hasAnnotationsAfter, FontBaseline);

trunk/Source/WebCore/rendering/RootInlineBox.cpp

@@ -246 +246 @@
     LayoutUnit maxPositionTop;
     LayoutUnit maxPositionBottom;
-    int maxAscent = 0;
-    int maxDescent = 0;
+    LayoutUnit maxAscent;
+    LayoutUnit maxDescent;
     bool setMaxAscent = false;
     bool setMaxDescent = false;
@@ -767 +767 @@
 }
 
-static void setAscentAndDescent(int& ascent, int& descent, int newAscent, int newDescent, bool& ascentDescentSet)
+static void setAscentAndDescent(LayoutUnit& ascent, LayoutUnit& descent, LayoutUnit newAscent, LayoutUnit newDescent, bool& ascentDescentSet)
 {
     if (!ascentDescentSet) {
@@ -779 +779 @@
 }
 
-void RootInlineBox::ascentAndDescentForBox(InlineBox& box, GlyphOverflowAndFallbackFontsMap& textBoxDataMap, int& ascent, int& descent,
+void RootInlineBox::ascentAndDescentForBox(InlineBox& box, GlyphOverflowAndFallbackFontsMap& textBoxDataMap, LayoutUnit& ascent, LayoutUnit& descent,
                                            bool& affectsAscent, bool& affectsDescent) const
 {
@@ -817 +817 @@
         for (auto& font : *usedFonts) {
             auto& fontMetrics = font->fontMetrics();
-            int usedFontAscent = fontMetrics.ascent(baselineType());
-            int usedFontDescent = fontMetrics.descent(baselineType());
-            int halfLeading = (fontMetrics.lineSpacing() - fontMetrics.height()) / 2;
-            int usedFontAscentAndLeading = usedFontAscent + halfLeading;
-            int usedFontDescentAndLeading = fontMetrics.lineSpacing() - usedFontAscentAndLeading;
+            LayoutUnit usedFontAscent { fontMetrics.ascent(baselineType()) };
+            LayoutUnit usedFontDescent { fontMetrics.descent(baselineType()) };
+            LayoutUnit halfLeading { (fontMetrics.lineSpacing() - fontMetrics.height()) / 2 };
+            LayoutUnit usedFontAscentAndLeading { usedFontAscent + halfLeading };
+            LayoutUnit usedFontDescentAndLeading { fontMetrics.lineSpacing() - usedFontAscentAndLeading };
             if (includeFont) {
                 setAscentAndDescent(ascent, descent, usedFontAscent, usedFontDescent, ascentDescentSet);
@@ -839 +839 @@
     // If leading is included for the box, then we compute that box.
     if (includeLeading && !setUsedFontWithLeading) {
-        int ascentWithLeading = box.baselinePosition(baselineType());
-        int descentWithLeading = box.lineHeight() - ascentWithLeading;
+        LayoutUnit ascentWithLeading { box.baselinePosition(baselineType()) };
+        LayoutUnit descentWithLeading { box.lineHeight() - ascentWithLeading };
         setAscentAndDescent(ascent, descent, ascentWithLeading, descentWithLeading, ascentDescentSet);
         
@@ -852 +852 @@
     
     if (includeFontForBox(box) && !setUsedFont) {
-        int fontAscent = boxLineStyle.fontMetrics().ascent(baselineType());
-        int fontDescent = boxLineStyle.fontMetrics().descent(baselineType());
+        LayoutUnit fontAscent { boxLineStyle.fontMetrics().ascent(baselineType()) };
+        LayoutUnit fontDescent { boxLineStyle.fontMetrics().descent(baselineType()) };
         setAscentAndDescent(ascent, descent, fontAscent, fontDescent, ascentDescentSet);
         affectsAscent = fontAscent - box.logicalTop() > 0;
@@ -869 +869 @@
     if (includeInitialLetterForBox(box)) {
         bool canUseGlyphs = glyphOverflow && glyphOverflow->computeBounds;
-        int letterAscent = baselineType() == AlphabeticBaseline ? boxLineStyle.fontMetrics().capHeight() : (canUseGlyphs ? glyphOverflow->top : boxLineStyle.fontMetrics().ascent(baselineType()));
-        int letterDescent = canUseGlyphs ? glyphOverflow->bottom : (box.isRootInlineBox() ? 0 : boxLineStyle.fontMetrics().descent(baselineType()));
+        LayoutUnit letterAscent { baselineType() == AlphabeticBaseline ? boxLineStyle.fontMetrics().capHeight() : (canUseGlyphs ? glyphOverflow->top : boxLineStyle.fontMetrics().ascent(baselineType())) };
+        LayoutUnit letterDescent { canUseGlyphs ? glyphOverflow->bottom : (box.isRootInlineBox() ? 0 : boxLineStyle.fontMetrics().descent(baselineType())) };
         setAscentAndDescent(ascent, descent, letterAscent, letterDescent, ascentDescentSet);
         affectsAscent = letterAscent - box.logicalTop() > 0;

trunk/Source/WebCore/rendering/RootInlineBox.h

@@ -161 +161 @@
     LayoutRect paddedLayoutOverflowRect(LayoutUnit endPadding) const;
 
-    void ascentAndDescentForBox(InlineBox&, GlyphOverflowAndFallbackFontsMap&, int& ascent, int& descent, bool& affectsAscent, bool& affectsDescent) const;
+    void ascentAndDescentForBox(InlineBox&, GlyphOverflowAndFallbackFontsMap&, LayoutUnit& ascent, LayoutUnit& descent, bool& affectsAscent, bool& affectsDescent) const;
     LayoutUnit verticalPositionForBox(InlineBox*, VerticalPositionCache&);
     bool fitsToGlyphs() const;