Changeset 289897 in webkit

Timestamp:

Feb 16, 2022, 9:29:44 AM (4 years ago)

Author:

Alan Bujtas

Message:

[LFC][Integration] LineLayout::firstLineBaseline callers expect physical position
​https://bugs.webkit.org/show_bug.cgi?id=236688

Reviewed by Antti Koivisto.

Legacy line layout returns the physical position too, though in a bit obscure manner:

firstRootBox()->logicalTop() + firstLineStyle().metricsOfPrimaryFont().descent(firstRootBox()->baselineType())
where

The logicalTop[ position is the top edge of the line box in a horizontal line and the left edge in a vertical line.
float logicalTop() const { return isHorizontal() ? m_topLeft.y() : m_topLeft.x(); }

• layout/integration/LayoutIntegrationLine.h:

(WebCore::LayoutIntegration::Line::lineBoxHeight const):
(WebCore::LayoutIntegration::Line::lineBoxWidth const):

• layout/integration/LayoutIntegrationLineLayout.cpp:

(WebCore::LayoutIntegration::LineLayout::firstLinePhysicalBaseline const):
(WebCore::LayoutIntegration::LineLayout::lastLineLogicalBaseline const):
(WebCore::LayoutIntegration::LineLayout::firstLineBaseline const): Deleted.
(WebCore::LayoutIntegration::LineLayout::lastLineBaseline const): Deleted.

• layout/integration/LayoutIntegrationLineLayout.h:
• rendering/RenderBlockFlow.cpp:

(WebCore::RenderBlockFlow::firstLineBaseline const):
(WebCore::RenderBlockFlow::inlineBlockBaseline const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/integration/LayoutIntegrationLine.h (modified) (1 diff)
• layout/integration/LayoutIntegrationLineLayout.cpp (modified) (2 diffs)
• layout/integration/LayoutIntegrationLineLayout.h (modified) (1 diff)
• rendering/RenderBlockFlow.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-02-16  Alan Bujtas  <zalan@apple.com>
+
+        [LFC][Integration] LineLayout::firstLineBaseline callers expect physical position
+        https://bugs.webkit.org/show_bug.cgi?id=236688
+
+        Reviewed by Antti Koivisto.
+
+        Legacy line layout returns the physical position too, though in a bit obscure manner:
+
+          firstRootBox()->logicalTop() + firstLineStyle().metricsOfPrimaryFont().descent(firstRootBox()->baselineType())
+          where
+            // The logicalTop[ position is the top edge of the line box in a horizontal line and the left edge in a vertical line.
+            float logicalTop() const { return isHorizontal() ? m_topLeft.y() : m_topLeft.x(); }
+
+        * layout/integration/LayoutIntegrationLine.h:
+        (WebCore::LayoutIntegration::Line::lineBoxHeight const):
+        (WebCore::LayoutIntegration::Line::lineBoxWidth const):
+        * layout/integration/LayoutIntegrationLineLayout.cpp:
+        (WebCore::LayoutIntegration::LineLayout::firstLinePhysicalBaseline const):
+        (WebCore::LayoutIntegration::LineLayout::lastLineLogicalBaseline const):
+        (WebCore::LayoutIntegration::LineLayout::firstLineBaseline const): Deleted.
+        (WebCore::LayoutIntegration::LineLayout::lastLineBaseline const): Deleted.
+        * layout/integration/LayoutIntegrationLineLayout.h:
+        * rendering/RenderBlockFlow.cpp:
+        (WebCore::RenderBlockFlow::firstLineBaseline const):
+        (WebCore::RenderBlockFlow::inlineBlockBaseline const):
+
 2022-02-16  Gavin Phillips  <gavin.p@apple.com>
 

trunk/Source/WebCore/layout/integration/LayoutIntegrationLine.h

@@ -59 +59 @@
     float lineBoxLeft() const { return m_lineBoxRect.x(); }
     float lineBoxRight() const { return m_lineBoxRect.maxX(); }
+    float lineBoxHeight() const { return m_lineBoxRect.height(); }
+    float lineBoxWidth() const { return m_lineBoxRect.width(); }
 
     float enclosingContentTop() const { return m_enclosingContentTop; }

trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp

@@ -425 +425 @@
 }
 
-LayoutUnit LineLayout::firstLineBaseline() const
+LayoutUnit LineLayout::firstLinePhysicalBaseline() const
 {
     if (!m_inlineContent || m_inlineContent->lines.isEmpty()) {
@@ -436 +436 @@
         return LayoutUnit { firstLine.lineBoxTop() + firstLine.baseline() };
 
-    // See LineLayout::lastLineBaseline below for more info.
-    auto lineLogicalTop = flow().logicalHeight() - firstLine.lineBoxRight();
-    return LayoutUnit { lineLogicalTop + firstLine.baseline() };
-}
-
-LayoutUnit LineLayout::lastLineBaseline() const
+    return LayoutUnit { firstLine.lineBoxLeft() + (firstLine.lineBoxWidth() - firstLine.baseline()) };
+}
+
+LayoutUnit LineLayout::lastLineLogicalBaseline() const
 {
     if (!m_inlineContent || m_inlineContent->lines.isEmpty()) {

trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.h

@@ -89 +89 @@
     size_t lineCount() const;
 
-    LayoutUnit firstLineBaseline() const;
-    LayoutUnit lastLineBaseline() const;
+    LayoutUnit firstLinePhysicalBaseline() const;
+    LayoutUnit lastLineLogicalBaseline() const;
 
     void adjustForPagination();

trunk/Source/WebCore/rendering/RenderBlockFlow.cpp

@@ -2960 +2960 @@
 #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
     if (modernLineLayout())
-        return LayoutUnit { floorToInt(modernLineLayout()->firstLineBaseline()) };
+        return LayoutUnit { floorToInt(modernLineLayout()->firstLinePhysicalBaseline()) };
 #endif
 
@@ -3011 +3011 @@
 #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
         else if (modernLineLayout())
-            lastBaseline = floorToInt(modernLineLayout()->lastLineBaseline());
+            lastBaseline = floorToInt(modernLineLayout()->lastLineLogicalBaseline());
 #endif
     }