Changeset 269818 in webkit

Timestamp:

Nov 14, 2020 9:38:37 AM (3 years ago)

Author:

Alan Bujtas

Message:

[LFC][Integration] Use the physical size when setting the pre-computed width/height on ReplacedBox
​https://bugs.webkit.org/show_bug.cgi?id=218915

Reviewed by Antti Koivisto.

This is where the logical vs. physical coordinate flip happens on the integration level.

• layout/integration/LayoutIntegrationLineLayout.cpp:

(WebCore::LayoutIntegration::LineLayout::updateReplacedDimensions):
(WebCore::LayoutIntegration::LineLayout::updateInlineBlockDimensions):

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

(WebCore::RenderBlockFlow::layoutModernLines):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-11-14  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][Integration] Use the physical size when setting the pre-computed width/height on ReplacedBox
+        https://bugs.webkit.org/show_bug.cgi?id=218915
+
+        Reviewed by Antti Koivisto.
+
+        This is where the logical vs. physical coordinate flip happens on the integration level.
+
+        * layout/integration/LayoutIntegrationLineLayout.cpp:
+        (WebCore::LayoutIntegration::LineLayout::updateReplacedDimensions):
+        (WebCore::LayoutIntegration::LineLayout::updateInlineBlockDimensions):
+        * layout/integration/LayoutIntegrationLineLayout.h:
+        * rendering/RenderBlockFlow.cpp:
+        (WebCore::RenderBlockFlow::layoutModernLines):
+
 2020-11-14  Zalan Bujtas  <zalan@apple.com>
 

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

@@ -111 +111 @@
 void LineLayout::updateReplacedDimensions(const RenderBox& replaced)
 {
-    auto& layoutBox = m_boxTree.layoutBoxForRenderer(replaced);
+    updateLayoutBoxDimensions(replaced);
+}
+
+void LineLayout::updateInlineBlockDimensions(const RenderBlock& inlineBlock)
+{
+    updateLayoutBoxDimensions(inlineBlock);
+}
+
+void LineLayout::updateLayoutBoxDimensions(const RenderBox& replacedOrInlineBlock)
+{
+    auto& layoutBox = m_boxTree.layoutBoxForRenderer(replacedOrInlineBlock);
+    // Internally both replaced and inline-box content use replaced boxes.
     auto& replacedBox = downcast<Layout::ReplacedBox>(layoutBox);
 
-    replacedBox.setContentSizeForIntegration({ replaced.contentLogicalWidth(), replaced.contentLogicalHeight() });
-
-    auto baseline = replaced.baselinePosition(AlphabeticBaseline, false /* firstLine */, HorizontalLine, PositionOnContainingLine);
+    // Always use the physical size here for inline level boxes (this is where the logical vs. physical coords flip happens).
+    replacedBox.setContentSizeForIntegration({ replacedOrInlineBlock.contentWidth(), replacedOrInlineBlock.contentHeight() });
+
+    auto baseline = replacedOrInlineBlock.baselinePosition(AlphabeticBaseline, false /* firstLine */, HorizontalLine, PositionOnContainingLine);
     replacedBox.setBaseline(baseline);
 }

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

@@ -65 +65 @@
 
     void updateReplacedDimensions(const RenderBox&);
+    void updateInlineBlockDimensions(const RenderBlock&);
     void updateStyle(const RenderBoxModelObject&);
     void layout();
@@ -102 +103 @@
     void constructContent();
     InlineContent& ensureInlineContent();
+    void updateLayoutBoxDimensions(const RenderBox&);
 
     RenderBlockFlow& flow() { return m_boxTree.flow(); }

trunk/Source/WebCore/rendering/RenderBlockFlow.cpp

@@ -3622 +3622 @@
             auto& block = downcast<RenderBlock>(renderer);
             block.layoutIfNeeded();
-            // FIXME: Taking the same path as replaced for now.
-            layoutFormattingContextLineLayout.updateReplacedDimensions(block);
+            ASSERT(block.style().display() == DisplayType::InlineBlock);
+            layoutFormattingContextLineLayout.updateInlineBlockDimensions(block);
             continue;
         }