Changeset 268815 in webkit

Timestamp:

Oct 21, 2020, 12:19:36 PM (6 years ago)

Author:

Alan Bujtas

Message:

[LFC][Integration] Ascent and descent are rounded to integral position
​https://bugs.webkit.org/show_bug.cgi?id=218036

Reviewed by Antti Koivisto.

In this patch, we round ascent/descent vertical position values to integral to match legacy behavior.

• layout/inlineformatting/InlineFormattingContextGeometry.cpp:

(WebCore::Layout::LineBoxBuilder::constructInlineLevelBoxes):

• layout/inlineformatting/InlineLineBox.cpp:

(WebCore::Layout::LineBox::InlineLevelBox::setBaseline):
(WebCore::Layout::LineBox::InlineLevelBox::setDescent):
(WebCore::Layout::LineBox::InlineLevelBox::setLayoutBounds):

• layout/inlineformatting/InlineLineBox.h:

(WebCore::Layout::LineBox::InlineLevelBox::setBaseline): Deleted.
(WebCore::Layout::LineBox::InlineLevelBox::setDescent): Deleted.
(WebCore::Layout::LineBox::InlineLevelBox::setLayoutBounds): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/inlineformatting/InlineFormattingContextGeometry.cpp (modified) (1 diff)
• layout/inlineformatting/InlineLineBox.cpp (modified) (1 diff)
• layout/inlineformatting/InlineLineBox.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-10-21  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][Integration] Ascent and descent are rounded to integral position
+        https://bugs.webkit.org/show_bug.cgi?id=218036
+
+        Reviewed by Antti Koivisto.
+
+        In this patch, we round ascent/descent vertical position values to integral to match legacy behavior.
+
+        * layout/inlineformatting/InlineFormattingContextGeometry.cpp:
+        (WebCore::Layout::LineBoxBuilder::constructInlineLevelBoxes):
+        * layout/inlineformatting/InlineLineBox.cpp:
+        (WebCore::Layout::LineBox::InlineLevelBox::setBaseline):
+        (WebCore::Layout::LineBox::InlineLevelBox::setDescent):
+        (WebCore::Layout::LineBox::InlineLevelBox::setLayoutBounds):
+        * layout/inlineformatting/InlineLineBox.h:
+        (WebCore::Layout::LineBox::InlineLevelBox::setBaseline): Deleted.
+        (WebCore::Layout::LineBox::InlineLevelBox::setDescent): Deleted.
+        (WebCore::Layout::LineBox::InlineLevelBox::setLayoutBounds): Deleted.
+
 2020-10-21  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContextGeometry.cpp

@@ -261 +261 @@
             auto& inlineLevelBoxGeometry = formattingContext().geometryForBox(layoutBox);
             auto logicalHeight = inlineLevelBoxGeometry.marginBoxHeight();
-            auto baseline = logicalHeight;
+            auto ascent = logicalHeight;
             if (layoutBox.isInlineBlockBox() && layoutBox.establishesInlineFormattingContext()) {
                 auto& formattingState = layoutState().establishedInlineFormattingState(downcast<ContainerBox>(layoutBox));
                 auto& lastLine = formattingState.lines().last();
                 auto inlineBlockBaseline = lastLine.logicalTop() + lastLine.baseline();
-                baseline = inlineLevelBoxGeometry.marginBefore() + inlineLevelBoxGeometry.borderTop() + inlineLevelBoxGeometry.paddingTop().valueOr(0) + inlineBlockBaseline;
+                ascent = inlineLevelBoxGeometry.marginBefore() + inlineLevelBoxGeometry.borderTop() + inlineLevelBoxGeometry.paddingTop().valueOr(0) + inlineBlockBaseline;
             }
             auto atomicInlineLevelBox = LineBox::InlineLevelBox::createAtomicInlineLevelBox(layoutBox, logicalLeft, { run.logicalWidth(), logicalHeight });
-            atomicInlineLevelBox->setBaseline(baseline);
-            atomicInlineLevelBox->setLayoutBounds(LineBox::InlineLevelBox::LayoutBounds { baseline, { } });
+            atomicInlineLevelBox->setBaseline(ascent);
+            atomicInlineLevelBox->setLayoutBounds(LineBox::InlineLevelBox::LayoutBounds { ascent, { } });
             if (logicalHeight)
                 atomicInlineLevelBox->setIsNonEmpty();

trunk/Source/WebCore/layout/inlineformatting/InlineLineBox.cpp

@@ -38 +38 @@
     , m_type(type)
 {
+}
+
+void LineBox::InlineLevelBox::setBaseline(InlineLayoutUnit baseline)
+{
+    // FIXME: Remove legacy rounding.
+    m_baseline = roundToInt(baseline);
+}
+
+void LineBox::InlineLevelBox::setDescent(InlineLayoutUnit descent)
+{
+    // FIXME: Remove legacy rounding.
+    m_descent = roundToInt(descent);
+}
+
+void LineBox::InlineLevelBox::setLayoutBounds(const LayoutBounds& layoutBounds)
+{
+    // FIXME: Remove legacy rounding.
+    m_layoutBounds = { InlineLayoutUnit(roundToInt(layoutBounds.ascent)), InlineLayoutUnit(roundToInt(layoutBounds.descent)) };
 }
 

trunk/Source/WebCore/layout/inlineformatting/InlineLineBox.h

@@ -103 +103 @@
         void setLogicalWidth(InlineLayoutUnit logicalWidth) { m_logicalRect.setWidth(logicalWidth); }
         void setLogicalHeight(InlineLayoutUnit logicalHeight) { m_logicalRect.setHeight(logicalHeight); }
-        void setBaseline(InlineLayoutUnit baseline) { m_baseline = baseline; }
-        void setDescent(InlineLayoutUnit descent) { m_descent = descent; }
+        void setBaseline(InlineLayoutUnit);
+        void setDescent(InlineLayoutUnit);
 
         // See https://www.w3.org/TR/css-inline-3/#layout-bounds
@@ -113 +113 @@
             InlineLayoutUnit descent { 0 };
         };
-        void setLayoutBounds(const LayoutBounds& layoutBounds) { m_layoutBounds = layoutBounds; }
+        void setLayoutBounds(const LayoutBounds&);
         LayoutBounds layoutBounds() const { return m_layoutBounds; }