Changeset 272142 in webkit

Timestamp:

Feb 1, 2021, 7:11:08 AM (6 years ago)

Author:

Antti Koivisto

Message:

[LFC][Integration] RenderInline::offsetLeft needs to call ensureLineBoxes
​https://bugs.webkit.org/show_bug.cgi?id=221196

Reviewed by Zalan Bujtas.

Use ensureLineBoxes for rare API calls before we implement them fully in LFC integration.

• layout/integration/LayoutIntegrationCoverage.cpp:
• rendering/RenderInline.cpp:

(WebCore::RenderInline::absoluteQuadsForSelection const):
(WebCore::RenderInline::offsetLeft const):
(WebCore::RenderInline::offsetTop const):
(WebCore::RenderInline::nodeAtPoint):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderInline.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-02-01  Antti Koivisto  <antti@apple.com>
+
+        [LFC][Integration] RenderInline::offsetLeft needs to call ensureLineBoxes
+        https://bugs.webkit.org/show_bug.cgi?id=221196
+
+        Reviewed by Zalan Bujtas.
+
+        Use ensureLineBoxes for rare API calls before we implement them fully in LFC integration.
+
+        * layout/integration/LayoutIntegrationCoverage.cpp:
+        * rendering/RenderInline.cpp:
+        (WebCore::RenderInline::absoluteQuadsForSelection const):
+        (WebCore::RenderInline::offsetLeft const):
+        (WebCore::RenderInline::offsetTop const):
+        (WebCore::RenderInline::nodeAtPoint):
+
 2021-02-01  Miguel Gomez  <magomez@igalia.com>
 

trunk/Source/WebCore/rendering/RenderInline.cpp

@@ -428 +428 @@
 void RenderInline::absoluteQuadsForSelection(Vector<FloatQuad>& quads) const
 {
+#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
+    if (auto* lineLayout = LayoutIntegration::LineLayout::containing(const_cast<RenderInline&>(*this)))
+        lineLayout->flow().ensureLineBoxes();
+#endif
     AbsoluteQuadsGeneratorContext context(this, quads);
     generateLineBoxRects(context);
@@ -435 +439 @@
 LayoutUnit RenderInline::offsetLeft() const
 {
+#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
+    if (auto* lineLayout = LayoutIntegration::LineLayout::containing(const_cast<RenderInline&>(*this)))
+        lineLayout->flow().ensureLineBoxes();
+#endif
     LayoutPoint topLeft;
     if (InlineBox* firstBox = firstLineBoxIncludingCulling())
@@ -443 +451 @@
 LayoutUnit RenderInline::offsetTop() const
 {
+#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
+    if (auto* lineLayout = LayoutIntegration::LineLayout::containing(const_cast<RenderInline&>(*this)))
+        lineLayout->flow().ensureLineBoxes();
+#endif
     LayoutPoint topLeft;
     if (InlineBox* firstBox = firstLineBoxIncludingCulling())
@@ -517 +529 @@
                                 const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction hitTestAction)
 {
+#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
+    if (auto* lineLayout = LayoutIntegration::LineLayout::containing(const_cast<RenderInline&>(*this)))
+        lineLayout->flow().ensureLineBoxes();
+#endif
     return m_lineBoxes.hitTest(this, request, result, locationInContainer, accumulatedOffset, hitTestAction);
 }