Changeset 268976 in webkit

Timestamp:

Oct 26, 2020, 6:58:58 AM (6 years ago)

Author:

Antti Koivisto

Message:

[LFC][Integration] Allow all replaced elements
​https://bugs.webkit.org/show_bug.cgi?id=218074

Reviewed by Zalan Bujtas.

Add a #define to allow all RenderReplaced in modern line layout.
Also add one for inline-blocks.

Both are disabled for now.

• layout/integration/LayoutIntegrationBoxTree.cpp:

(WebCore::LayoutIntegration::BoxTree::buildTree):

• layout/integration/LayoutIntegrationCoverage.cpp:

(WebCore::LayoutIntegration::canUseForChild):
(WebCore::LayoutIntegration::canUseForLineLayoutWithReason):

• layout/integration/LayoutIntegrationLineLayout.cpp:

(WebCore::LayoutIntegration::LineLayout::containing):
(WebCore::LayoutIntegration::LineLayout::hitTest):

Implement hit testing.

• rendering/RenderBlockFlow.cpp:

(WebCore::RenderBlockFlow::layoutLFCLines):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-10-26  Antti Koivisto  <antti@apple.com>
+
+        [LFC][Integration] Allow all replaced elements
+        https://bugs.webkit.org/show_bug.cgi?id=218074
+
+        Reviewed by Zalan Bujtas.
+
+        Add a #define to allow all RenderReplaced in modern line layout.
+        Also add one for inline-blocks.
+
+        Both are disabled for now.
+
+        * layout/integration/LayoutIntegrationBoxTree.cpp:
+        (WebCore::LayoutIntegration::BoxTree::buildTree):
+        * layout/integration/LayoutIntegrationCoverage.cpp:
+        (WebCore::LayoutIntegration::canUseForChild):
+        (WebCore::LayoutIntegration::canUseForLineLayoutWithReason):
+        * layout/integration/LayoutIntegrationLineLayout.cpp:
+        (WebCore::LayoutIntegration::LineLayout::containing):
+        (WebCore::LayoutIntegration::LineLayout::hitTest):
+
+        Implement hit testing.
+
+        * rendering/RenderBlockFlow.cpp:
+        (WebCore::RenderBlockFlow::layoutLFCLines):
+
 2020-10-26  Xabier Rodriguez Calvar  <calvaris@igalia.com>
 

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

@@ -72 +72 @@
             clonedStyle.setPosition(PositionType::Static);
             childBox = makeUnique<Layout::LineBreakBox>(downcast<RenderLineBreak>(childRenderer).isWBR(), WTFMove(clonedStyle));
-        } else if (is<RenderImage>(childRenderer)) {
-            auto& image = downcast<RenderImage>(childRenderer);
-            auto clonedStyle = RenderStyle::clone(image.style());
-            childBox = makeUnique<Layout::ReplacedBox>(Layout::Box::ElementAttributes { Layout::Box::ElementType::Image }, WTFMove(clonedStyle));
+        } else if (is<RenderReplaced>(childRenderer)) {
+            auto clonedStyle = RenderStyle::clone(childRenderer.style());
+            childBox = makeUnique<Layout::ReplacedBox>(Layout::Box::ElementAttributes { is<RenderImage>(childRenderer) ? Layout::Box::ElementType::Image : Layout::Box::ElementType::GenericElement }, WTFMove(clonedStyle));
+        } else if (is<RenderBlock>(childRenderer)) {
+            auto clonedStyle = RenderStyle::clone(childRenderer.style());
+            childBox = makeUnique<Layout::ReplacedBox>(Layout::Box::ElementAttributes { Layout::Box::ElementType::GenericElement }, WTFMove(clonedStyle));
         }
         ASSERT(childBox);

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

@@ -43 +43 @@
 #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
 
-#define ALLOW_INLINE_IMAGES 0
+#define ALLOW_IMAGES 0
+#define ALLOW_ALL_REPLACED 0
+#define ALLOW_INLINE_BLOCK 0
 
 #ifndef NDEBUG
@@ -246 +248 @@
 }
 
+static OptionSet<AvoidanceReason> canUseForChild(const RenderObject& child, IncludeReasons includeReasons)
+{
+    OptionSet<AvoidanceReason> reasons;
+    if (child.selectionState() != RenderObject::HighlightState::None)
+        SET_REASON_AND_RETURN_IF_NEEDED(FlowChildIsSelected, reasons, includeReasons);
+    if (is<RenderText>(child)) {
+        const auto& renderText = downcast<RenderText>(child);
+        if (renderText.textNode() && !renderText.document().markers().markersFor(*renderText.textNode()).isEmpty())
+            SET_REASON_AND_RETURN_IF_NEEDED(FlowIncludesDocumentMarkers, reasons, includeReasons);
+        return reasons;
+    }
+
+    if (is<RenderLineBreak>(child))
+        return reasons;
+
+#if ALLOW_IMAGES || ALLOW_ALL_REPLACED
+    if (is<RenderReplaced>(child)) {
+        auto& replaced = downcast<RenderReplaced>(child);
+        if (replaced.isFloating() || replaced.isPositioned())
+            SET_REASON_AND_RETURN_IF_NEEDED(FlowHasNonSupportedChild, reasons, includeReasons)
+
+        if (replaced.isSVGRoot())
+            SET_REASON_AND_RETURN_IF_NEEDED(FlowHasNonSupportedChild, reasons, includeReasons);
+
+        auto& style = replaced.style();
+        if (style.verticalAlign() != VerticalAlign::Baseline)
+            SET_REASON_AND_RETURN_IF_NEEDED(FlowHasNonSupportedChild, reasons, includeReasons);
+        if (style.width().isPercent() || style.height().isPercent())
+            SET_REASON_AND_RETURN_IF_NEEDED(FlowHasNonSupportedChild, reasons, includeReasons);
+        if (style.objectFit() != RenderStyle::initialObjectFit())
+            SET_REASON_AND_RETURN_IF_NEEDED(FlowHasNonSupportedChild, reasons, includeReasons);
+
+        if (is<RenderImage>(replaced)) {
+            auto& image = downcast<RenderImage>(replaced);
+            if (image.imageMap())
+                SET_REASON_AND_RETURN_IF_NEEDED(FlowHasNonSupportedChild, reasons, includeReasons);
+            return reasons;
+        }
+#if !ALLOW_ALL_REPLACED
+        SET_REASON_AND_RETURN_IF_NEEDED(FlowHasNonSupportedChild, reasons, includeReasons);
+#endif
+        return reasons;
+    }
+#endif
+
+#if ALLOW_INLINE_BLOCK
+    if (is<RenderBlock>(child)) {
+        auto& block = downcast<RenderBlock>(child);
+        if (!block.isReplaced() || !block.isInline())
+            SET_REASON_AND_RETURN_IF_NEEDED(FlowHasNonSupportedChild, reasons, includeReasons)
+        if (block.isFloating() || block.isPositioned())
+            SET_REASON_AND_RETURN_IF_NEEDED(FlowHasNonSupportedChild, reasons, includeReasons)
+        if (block.isRubyRun())
+            SET_REASON_AND_RETURN_IF_NEEDED(FlowHasNonSupportedChild, reasons, includeReasons);
+
+        auto& style = block.style();
+        if (style.verticalAlign() != VerticalAlign::Baseline)
+            SET_REASON_AND_RETURN_IF_NEEDED(FlowHasNonSupportedChild, reasons, includeReasons);
+        if (style.width().isPercent() || style.height().isPercent())
+            SET_REASON_AND_RETURN_IF_NEEDED(FlowHasNonSupportedChild, reasons, includeReasons);
+
+        return reasons;
+    }
+#endif
+
+    SET_REASON_AND_RETURN_IF_NEEDED(FlowHasNonSupportedChild, reasons, includeReasons);
+    return reasons;
+}
+
+
 OptionSet<AvoidanceReason> canUseForLineLayoutWithReason(const RenderBlockFlow& flow, IncludeReasons includeReasons)
 {
@@ -310 +382 @@
     // The <blockflow><inline>#text</inline></blockflow> case is also popular and should be relatively easy to cover.
     for (const auto* child = flow.firstChild(); child; child = child->nextSibling()) {
-        if (child->selectionState() != RenderObject::HighlightState::None)
-            SET_REASON_AND_RETURN_IF_NEEDED(FlowChildIsSelected, reasons, includeReasons);
-        if (is<RenderText>(*child)) {
-            const auto& renderText = downcast<RenderText>(*child);
-            if (renderText.textNode() && !renderText.document().markers().markersFor(*renderText.textNode()).isEmpty())
-                SET_REASON_AND_RETURN_IF_NEEDED(FlowIncludesDocumentMarkers, reasons, includeReasons);
-            continue;
-        }
-        if (is<RenderLineBreak>(*child))
-            continue;
-#if ALLOW_INLINE_IMAGES
-        if (is<RenderImage>(*child)) {
-            auto& image = downcast<RenderImage>(*child);
-            if (image.imageMap())
-                SET_REASON_AND_RETURN_IF_NEEDED(FlowHasNonSupportedChild, reasons, includeReasons);                
-            if (image.isFloating() || image.isPositioned())
-                SET_REASON_AND_RETURN_IF_NEEDED(FlowHasNonSupportedChild, reasons, includeReasons);
-            auto& style = image.style();
-            if (style.verticalAlign() != VerticalAlign::Baseline)
-                SET_REASON_AND_RETURN_IF_NEEDED(FlowHasNonSupportedChild, reasons, includeReasons);
-            if (style.width().isPercent() || style.height().isPercent())
-                SET_REASON_AND_RETURN_IF_NEEDED(FlowHasNonSupportedChild, reasons, includeReasons);
-            if (style.objectFit() != RenderStyle::initialObjectFit())
-                SET_REASON_AND_RETURN_IF_NEEDED(FlowHasNonSupportedChild, reasons, includeReasons);
-            continue;
-        }
-#endif
-        SET_REASON_AND_RETURN_IF_NEEDED(FlowHasNonSupportedChild, reasons, includeReasons);
-        break;
+        auto childReasons = canUseForChild(*child, includeReasons);
+        if (childReasons)
+            ADD_REASONS_AND_RETURN_IF_NEEDED(childReasons, reasons, includeReasons);
     }
     auto styleReasons = canUseForStyle(flow.style(), includeReasons);

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

@@ -69 +69 @@
 LineLayout* LineLayout::containing(RenderObject& renderer)
 {
-    if (!is<RenderText>(renderer) && !is<RenderLineBreak>(renderer) && !is<RenderImage>(renderer))
+    if (!renderer.isInline())
+        return nullptr;
+
+    if (renderer.isReplica())
         return nullptr;
     
@@ -520 +523 @@
         auto& renderer = m_boxTree.rendererForLayoutBox(run.layoutBox());
 
-        renderer.updateHitTestResult(result, locationInContainer.point() - toLayoutSize(accumulatedOffset));
-        if (result.addNodeToListBasedTestResult(renderer.nodeForHitTest(), request, locationInContainer, runRect) == HitTestProgress::Stop)
-            return true;
+        if (is<RenderText>(renderer)) {
+            renderer.updateHitTestResult(result, locationInContainer.point() - toLayoutSize(accumulatedOffset));
+            if (result.addNodeToListBasedTestResult(renderer.nodeForHitTest(), request, locationInContainer, runRect) == HitTestProgress::Stop)
+                return true;
+            continue;
+        }
+
+        if (is<RenderBox>(renderer)) {
+            auto& renderBox = downcast<RenderBox>(renderer);
+            if (renderBox.hasSelfPaintingLayer())
+                continue;
+            
+            if (renderBox.hitTest(request, result, locationInContainer, accumulatedOffset)) {
+                renderBox.updateHitTestResult(result, locationInContainer.point() - toLayoutSize(accumulatedOffset));
+                return true;
+            }
+        }
     }
 

trunk/Source/WebCore/rendering/RenderBlockFlow.cpp

@@ -3677 +3677 @@
             continue;
         }
+        if (is<RenderBlock>(renderer)) {
+            auto& block = downcast<RenderBlock>(renderer);
+            block.layoutIfNeeded();
+            // FIXME: Taking the same path as replaced for now.
+            layoutFormattingContextLineLayout.updateReplacedDimensions(block);
+            continue;
+        }
+
         renderer.clearNeedsLayout();
     }