Changeset 254339 in webkit

Timestamp:

Jan 10, 2020 7:46:26 AM (4 years ago)

Author:

Antti Koivisto

Message:

[LFC][Integration] Fix accessibility/scroll-to-make-visible-iframe-offscreen.html
​https://bugs.webkit.org/show_bug.cgi?id=206063

Reviewed by Zalan Bujtas.

This is failing due to missing LFC implementation for RenderText::absoluteQuad.

• rendering/RenderText.cpp:

(WebCore::collectAbsoluteQuadsForNonComplexPaths):

Implement generic version for collecting absolute quads. It doesn't cover everything that is needed for
the complex path so that still calls into layout system specific code.

(WebCore::RenderText::absoluteQuadsClippedToEllipsis const):
(WebCore::RenderText::absoluteQuads const):
(WebCore::RenderText::layoutFormattingContextLineLayout const):
(WebCore::RenderText::usesComplexLineLayoutPath const):

• rendering/RenderText.h:
• rendering/SimpleLineLayoutFunctions.cpp:

(WebCore::SimpleLineLayout::collectAbsoluteQuads): Deleted.

Not needed anymore.

• rendering/SimpleLineLayoutFunctions.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderText.cpp (modified) (3 diffs)
• rendering/RenderText.h (modified) (2 diffs)
• rendering/SimpleLineLayoutFunctions.cpp (modified) (1 diff)
• rendering/SimpleLineLayoutFunctions.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-01-10  Antti Koivisto  <antti@apple.com>
+
+        [LFC][Integration] Fix accessibility/scroll-to-make-visible-iframe-offscreen.html
+        https://bugs.webkit.org/show_bug.cgi?id=206063
+
+        Reviewed by Zalan Bujtas.
+
+        This is failing due to missing LFC implementation for RenderText::absoluteQuad.
+
+        * rendering/RenderText.cpp:
+        (WebCore::collectAbsoluteQuadsForNonComplexPaths):
+
+        Implement generic version for collecting absolute quads. It doesn't cover everything that is needed for
+        the complex path so that still calls into layout system specific code.
+
+        (WebCore::RenderText::absoluteQuadsClippedToEllipsis const):
+        (WebCore::RenderText::absoluteQuads const):
+        (WebCore::RenderText::layoutFormattingContextLineLayout const):
+        (WebCore::RenderText::usesComplexLineLayoutPath const):
+        * rendering/RenderText.h:
+        * rendering/SimpleLineLayoutFunctions.cpp:
+        (WebCore::SimpleLineLayout::collectAbsoluteQuads): Deleted.
+
+        Not needed anymore.
+
+        * rendering/SimpleLineLayoutFunctions.h:
+
 2020-01-10  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/rendering/RenderText.cpp

@@ -414 +414 @@
 #endif
 
+static Vector<FloatQuad> collectAbsoluteQuadsForNonComplexPaths(const RenderText& textRenderer, bool* wasFixed)
+{
+    // FIXME: This generic function doesn't currently cover everything that is needed for the complex line layout path.
+    ASSERT(!textRenderer.usesComplexLineLayoutPath());
+
+    Vector<FloatQuad> quads;
+    for (auto& box : LineLayoutTraversal::textBoxesFor(textRenderer))
+        quads.append(textRenderer.localToAbsoluteQuad(FloatQuad(box.rect()), UseTransforms, wasFixed));
+    return quads;
+}
+
 Vector<FloatQuad> RenderText::absoluteQuadsClippedToEllipsis() const
 {
-    if (auto* layout = simpleLineLayout()) {
+    if (!usesComplexLineLayoutPath()) {
         ASSERT(style().textOverflow() != TextOverflow::Ellipsis);
-        return SimpleLineLayout::collectAbsoluteQuads(*this, *layout, nullptr);
+        return collectAbsoluteQuadsForNonComplexPaths(*this, nullptr);
     }
     return m_lineBoxes.absoluteQuads(*this, nullptr, RenderTextLineBoxes::ClipToEllipsis);
@@ -425 +436 @@
 void RenderText::absoluteQuads(Vector<FloatQuad>& quads, bool* wasFixed) const
 {
-    if (auto* layout = simpleLineLayout()) {
-        quads.appendVector(SimpleLineLayout::collectAbsoluteQuads(*this, *layout, wasFixed));
+    if (!usesComplexLineLayoutPath()) {
+        quads.appendVector(collectAbsoluteQuadsForNonComplexPaths(*this, wasFixed));
         return;
     }
@@ -1330 +1341 @@
 }
 
+#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
+const LayoutIntegration::LineLayout* RenderText::layoutFormattingContextLineLayout() const
+{
+    if (!is<RenderBlockFlow>(*parent()))
+        return nullptr;
+    return downcast<RenderBlockFlow>(*parent()).layoutFormattingContextLineLayout();
+}
+#endif
+
+bool RenderText::usesComplexLineLayoutPath() const
+{
+    if (simpleLineLayout())
+        return false;
+#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
+    if (layoutFormattingContextLineLayout())
+        return false;
+#endif
+    return true;
+}
+
 float RenderText::width(unsigned from, unsigned len, float xPos, bool firstLine, HashSet<const Font*>* fallbackFonts, GlyphOverflow* glyphOverflow) const
 {

trunk/Source/WebCore/rendering/RenderText.h

@@ -36 +36 @@
 struct GlyphOverflow;
 
+namespace LayoutIntegration {
+class LineLayout;
+}
+
 class RenderText : public RenderObject {
     WTF_MAKE_ISO_ALLOCATED(RenderText);
@@ -166 +170 @@
     void ensureLineBoxes();
     const SimpleLineLayout::Layout* simpleLineLayout() const;
+#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
+    const LayoutIntegration::LineLayout* layoutFormattingContextLineLayout() const;
+#endif
+    bool usesComplexLineLayoutPath() const;
 
     StringView stringView(unsigned start = 0, Optional<unsigned> stop = WTF::nullopt) const;

trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp

@@ -186 +186 @@
 }
 
-Vector<FloatQuad> collectAbsoluteQuads(const RenderObject& renderer, const Layout& layout, bool* wasFixed)
-{
-    Vector<FloatQuad> quads;
-    auto& resolver = layout.runResolver();
-    for (auto run : resolver.rangeForRenderer(renderer))
-        quads.append(renderer.localToAbsoluteQuad(FloatQuad(run.rect()), UseTransforms, wasFixed));
-    return quads;
-}
-
 unsigned textOffsetForPoint(const LayoutPoint& point, const RenderText& renderer, const Layout& layout)
 {

trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.h

@@ -50 +50 @@
 void collectFlowOverflow(RenderBlockFlow&, const Layout&);
 
-Vector<FloatQuad> collectAbsoluteQuads(const RenderObject&, const Layout&, bool* wasFixed);
 unsigned textOffsetForPoint(const LayoutPoint&, const RenderText&, const Layout&);
 Vector<FloatQuad> collectAbsoluteQuadsForRange(const RenderObject&, unsigned start, unsigned end, const Layout&, bool ignoreEmptyTextSelections, bool* wasFixed);