Changeset 252906 in webkit

Timestamp:

Nov 27, 2019 9:01:11 AM (4 years ago)

Author:

Antti Koivisto

Message:

[LFC][Render tree] RenderBlockFlow::ensureLineBoxes should work with lfc layout
​https://bugs.webkit.org/show_bug.cgi?id=204633

Reviewed by Zalan Bujtas.

We need to be able to switch to linebox layout when needed.

• rendering/RenderBlockFlow.cpp:

(WebCore::RenderBlockFlow::deleteLines):
(WebCore::RenderBlockFlow::invalidateLineLayoutPath):
(WebCore::RenderBlockFlow::ensureLineBoxes):

• rendering/RenderBlockFlow.h:

(WebCore::RenderBlockFlow::hasLineLayout const):

Also switch to using WTF::Monostate as empty state.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlockFlow.cpp (modified) (4 diffs)
• rendering/RenderBlockFlow.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-11-27  Antti Koivisto  <antti@apple.com>
+
+        [LFC][Render tree] RenderBlockFlow::ensureLineBoxes should work with lfc layout
+        https://bugs.webkit.org/show_bug.cgi?id=204633
+
+        Reviewed by Zalan Bujtas.
+
+        We need to be able to switch to linebox layout when needed.
+
+        * rendering/RenderBlockFlow.cpp:
+        (WebCore::RenderBlockFlow::deleteLines):
+        (WebCore::RenderBlockFlow::invalidateLineLayoutPath):
+        (WebCore::RenderBlockFlow::ensureLineBoxes):
+        * rendering/RenderBlockFlow.h:
+        (WebCore::RenderBlockFlow::hasLineLayout const):
+
+        Also switch to using WTF::Monostate as empty state.
+
 2019-11-27  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlockFlow.cpp

@@ -2122 +2122 @@
 void RenderBlockFlow::deleteLines()
 {
-    m_lineLayout = nullptr;
+    m_lineLayout = WTF::Monostate();
 
     RenderBlock::deleteLines();
@@ -3634 +3634 @@
     case SimpleLinesPath:
         // The simple line layout may have become invalid.
-        m_lineLayout = nullptr;
+        m_lineLayout = WTF::Monostate();
         setLineLayoutPath(UndeterminedPath);
         if (needsLayout())
@@ -3696 +3696 @@
     setLineLayoutPath(ForceLineBoxesPath);
 
-    if (!simpleLineLayout())
-        return;
-
-    auto simpleLineLayout = makeRef(*this->simpleLineLayout());
+    if (complexLineLayout() || !hasLineLayout())
+        return;
+
+    auto simpleLineLayout = makeRefPtr(this->simpleLineLayout());
 
     m_lineLayout = makeUnique<ComplexLineLayout>(*this);
 
-    if (SimpleLineLayout::canUseForLineBoxTree(*this, simpleLineLayout.get())) {
-        SimpleLineLayout::generateLineBoxTree(*this, simpleLineLayout.get());
-        return;
+    if (simpleLineLayout) {
+        if (SimpleLineLayout::canUseForLineBoxTree(*this, *simpleLineLayout)) {
+            SimpleLineLayout::generateLineBoxTree(*this, *simpleLineLayout);
+            return;
+        }
     }
 
@@ -3718 +3720 @@
     LayoutUnit repaintLogicalTop;
     LayoutUnit repaintLogicalBottom;
-    if (simpleLineLayout->isPaginated()) {
+    if (simpleLineLayout && simpleLineLayout->isPaginated()) {
         PaginatedLayoutStateMaintainer state(*this);
         complexLineLayout.layoutLineBoxes(relayoutChildren, repaintLogicalTop, repaintLogicalBottom);

trunk/Source/WebCore/rendering/RenderBlockFlow.h

@@ -541 +541 @@
 
 private:
+    bool hasLineLayout() const;
     bool hasSimpleLineLayout() const;
     bool hasComplexLineLayout() const;
@@ -589 +590 @@
 private:
     Variant<
-        std::nullptr_t,
+        WTF::Monostate,
         Ref<SimpleLineLayout::Layout>,
 #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
@@ -602 +603 @@
 };
 
+inline bool RenderBlockFlow::hasLineLayout() const
+{
+    return !WTF::holds_alternative<WTF::Monostate>(m_lineLayout);
+}
+
 inline bool RenderBlockFlow::hasComplexLineLayout() const
 {