Changeset 271349 in webkit

Timestamp:

Jan 10, 2021, 4:04:02 AM (6 years ago)

Author:

Antti Koivisto

Message:

Remove InlineBox::hasSelectedChildren bit
​https://bugs.webkit.org/show_bug.cgi?id=220240

Reviewed by Sam Weinig.

It is only needed for selection gap painting and easily computed.

• rendering/ComplexLineLayout.cpp:

(WebCore::ComplexLineLayout::constructLine):

• rendering/InlineBox.h:

(WebCore::InlineBox::setCanHaveLeftExpansion):
(WebCore::InlineBox::InlineBoxBitfields::InlineBoxBitfields):
(WebCore::InlineBox::hasEllipsisBox const):
(WebCore::InlineBox::canHaveLeftExpansion const):
(WebCore::InlineBox::hasSelectedChildren const): Deleted.
(WebCore::InlineBox::setHasSelectedChildren): Deleted.

• rendering/RenderBlockFlow.cpp:

(WebCore::RenderBlockFlow::inlineSelectionGaps):

• rendering/RenderLineBreak.cpp:

(WebCore::RenderLineBreak::setSelectionState): Deleted.

• rendering/RenderLineBreak.h:
• rendering/RenderListMarker.cpp:

(WebCore::RenderListMarker::setSelectionState): Deleted.

• rendering/RenderListMarker.h:
• rendering/RenderReplaced.cpp:

(WebCore::RenderReplaced::setSelectionState): Deleted.

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

(WebCore::RenderText::setSelectionState):

• rendering/RenderTextLineBoxes.cpp:

(WebCore::RenderTextLineBoxes::setSelectionState): Deleted.

• rendering/RenderTextLineBoxes.h:
• rendering/RootInlineBox.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/ComplexLineLayout.cpp (modified) (3 diffs)
• rendering/InlineBox.h (modified) (4 diffs)
• rendering/RenderBlockFlow.cpp (modified) (1 diff)
• rendering/RenderLineBreak.cpp (modified) (1 diff)
• rendering/RenderLineBreak.h (modified) (1 diff)
• rendering/RenderListMarker.cpp (modified) (1 diff)
• rendering/RenderListMarker.h (modified) (1 diff)
• rendering/RenderReplaced.cpp (modified) (1 diff)
• rendering/RenderReplaced.h (modified) (1 diff)
• rendering/RenderText.cpp (modified) (1 diff)
• rendering/RenderTextLineBoxes.cpp (modified) (1 diff)
• rendering/RenderTextLineBoxes.h (modified) (1 diff)
• rendering/RootInlineBox.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-01-10  Antti Koivisto  <antti@apple.com>
+
+        Remove InlineBox::hasSelectedChildren bit
+        https://bugs.webkit.org/show_bug.cgi?id=220240
+
+        Reviewed by Sam Weinig.
+
+        It is only needed for selection gap painting and easily computed.
+
+        * rendering/ComplexLineLayout.cpp:
+        (WebCore::ComplexLineLayout::constructLine):
+        * rendering/InlineBox.h:
+        (WebCore::InlineBox::setCanHaveLeftExpansion):
+        (WebCore::InlineBox::InlineBoxBitfields::InlineBoxBitfields):
+        (WebCore::InlineBox::hasEllipsisBox const):
+        (WebCore::InlineBox::canHaveLeftExpansion const):
+        (WebCore::InlineBox::hasSelectedChildren const): Deleted.
+        (WebCore::InlineBox::setHasSelectedChildren): Deleted.
+        * rendering/RenderBlockFlow.cpp:
+        (WebCore::RenderBlockFlow::inlineSelectionGaps):
+        * rendering/RenderLineBreak.cpp:
+        (WebCore::RenderLineBreak::setSelectionState): Deleted.
+        * rendering/RenderLineBreak.h:
+        * rendering/RenderListMarker.cpp:
+        (WebCore::RenderListMarker::setSelectionState): Deleted.
+        * rendering/RenderListMarker.h:
+        * rendering/RenderReplaced.cpp:
+        (WebCore::RenderReplaced::setSelectionState): Deleted.
+        * rendering/RenderReplaced.h:
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::setSelectionState):
+        * rendering/RenderTextLineBoxes.cpp:
+        (WebCore::RenderTextLineBoxes::setSelectionState): Deleted.
+        * rendering/RenderTextLineBoxes.h:
+        * rendering/RootInlineBox.h:
+
 2021-01-09  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/rendering/ComplexLineLayout.cpp

@@ -295 +295 @@
     ASSERT(bidiRuns.firstRun());
 
-    bool rootHasSelectedChildren = false;
     InlineFlowBox* parentBox = 0;
     int runCount = bidiRuns.runCount() - lineInfo.runsFromLeadingWhitespace();
@@ -311 +310 @@
         r->setBox(box);
 
-        if (!rootHasSelectedChildren && box->renderer().selectionState() != RenderObject::HighlightState::None)
-            rootHasSelectedChildren = true;
-        
         // If we have no parent box yet, or if the run is not simply a sibling,
         // then we need to construct inline boxes as necessary to properly enclose the
@@ -343 +339 @@
     // be the last continuation of our line list.
     ASSERT(lastRootBox() && !lastRootBox()->isConstructed());
-
-    // Set the m_selectedChildren flag on the root inline box if one of the leaf inline box
-    // from the bidi runs walk above has a selection state.
-    if (rootHasSelectedChildren)
-        lastRootBox()->root().setHasSelectedChildren(true);
 
     // Set bits on our inline flow boxes that indicate which sides should

trunk/Source/WebCore/rendering/InlineBox.h

@@ -276 +276 @@
 
     void setHasHyphen(bool hasHyphen) { m_bitfields.setHasEllipsisBoxOrHyphen(hasHyphen); }
-    void setCanHaveLeftExpansion(bool canHaveLeftExpansion) { m_bitfields.setHasSelectedChildrenOrCanHaveLeftExpansion(canHaveLeftExpansion); }
+    void setCanHaveLeftExpansion(bool canHaveLeftExpansion) { m_bitfields.setCanHaveLeftExpansion(canHaveLeftExpansion); }
     void setCanHaveRightExpansion(bool canHaveRightExpansion) { m_bitfields.setCanHaveRightExpansion(canHaveRightExpansion); }
     void setForceRightExpansion() { m_bitfields.setForceRightExpansion(true); }
@@ -312 +312 @@
             , m_isHorizontal(isHorizontal)
             , m_endsWithBreak(false)
-            , m_hasSelectedChildrenOrCanHaveLeftExpansion(false)
+            , m_canHaveLeftExpansion(false)
             , m_canHaveRightExpansion(false)
             , m_knownToHaveNoOverflow(true)  
@@ -344 +344 @@
         ADD_BOOLEAN_BITFIELD(endsWithBreak, EndsWithBreak); // Whether the line ends with a <br>.
         // shared between RootInlineBox and InlineTextBox
-        ADD_BOOLEAN_BITFIELD(hasSelectedChildrenOrCanHaveLeftExpansion, HasSelectedChildrenOrCanHaveLeftExpansion);
+        ADD_BOOLEAN_BITFIELD(canHaveLeftExpansion, CanHaveLeftExpansion);
         ADD_BOOLEAN_BITFIELD(canHaveRightExpansion, CanHaveRightExpansion);
         ADD_BOOLEAN_BITFIELD(knownToHaveNoOverflow, KnownToHaveNoOverflow);
@@ -393 +393 @@
     void setEndsWithBreak(bool endsWithBreak) { m_bitfields.setEndsWithBreak(endsWithBreak); }
     bool hasEllipsisBox() const { return m_bitfields.hasEllipsisBoxOrHyphen(); }
-    bool hasSelectedChildren() const { return m_bitfields.hasSelectedChildrenOrCanHaveLeftExpansion(); }
-    void setHasSelectedChildren(bool hasSelectedChildren) { m_bitfields.setHasSelectedChildrenOrCanHaveLeftExpansion(hasSelectedChildren); }
     void setHasEllipsisBox(bool hasEllipsisBox) { m_bitfields.setHasEllipsisBoxOrHyphen(hasEllipsisBox); }
 
     // For InlineTextBox
     bool hasHyphen() const { return m_bitfields.hasEllipsisBoxOrHyphen(); }
-    bool canHaveLeftExpansion() const { return m_bitfields.hasSelectedChildrenOrCanHaveLeftExpansion(); }
+    bool canHaveLeftExpansion() const { return m_bitfields.canHaveLeftExpansion(); }
     bool canHaveRightExpansion() const { return m_bitfields.canHaveRightExpansion(); }
     bool forceRightExpansion() const { return m_bitfields.forceRightExpansion(); }

trunk/Source/WebCore/rendering/RenderBlockFlow.cpp

@@ -3203 +3203 @@
     }
 
+    auto hasSelectedChildren = [&](const RootInlineBox& root) {
+        for (auto* box = root.firstLeafDescendant(); box; box = box->nextLeafOnLine()) {
+            if (!is<InlineTextBox>(*box)) {
+                if (box->selectionState() != HighlightState::None)
+                    return true;
+                continue;
+            }
+
+            auto start = view().selection().startOffset();
+            auto end = view().selection().endOffset();
+
+            auto& textBox = downcast<InlineTextBox>(*box);
+            switch (textBox.renderer().selectionState()) {
+            case RenderObject::HighlightState::None:
+                continue;
+            case RenderObject::HighlightState::Inside:
+                return true;
+            case RenderObject::HighlightState::Start:
+                end = textBox.renderer().text().length();
+                // to handle selection from end of text to end of line
+                if (start && start == end)
+                    start = end - 1;
+                break;
+            case RenderObject::HighlightState::End:
+                start = 0;
+                break;
+            case RenderObject::HighlightState::Both:
+                break;
+            }
+            if (textBox.isSelected(start, end))
+                return true;
+        }
+        return false;
+    };
+
     RootInlineBox* lastSelectedLine = 0;
     RootInlineBox* curr;
-    for (curr = firstRootBox(); curr && !curr->hasSelectedChildren(); curr = curr->nextRootBox()) { }
+    for (curr = firstRootBox(); curr && !hasSelectedChildren(*curr); curr = curr->nextRootBox()) { }
 
     // Now paint the gaps for the lines.
-    for (; curr && curr->hasSelectedChildren(); curr = curr->nextRootBox()) {
+    for (; curr && hasSelectedChildren(*curr); curr = curr->nextRootBox()) {
         LayoutUnit selTop =  curr->selectionTopAdjustedForPrecedingBlock();
         LayoutUnit selHeight = curr->selectionHeightAdjustedForPrecedingBlock();

trunk/Source/WebCore/rendering/RenderLineBreak.cpp

@@ -143 +143 @@
 }
 
-void RenderLineBreak::setSelectionState(HighlightState state)
-{
-    RenderBoxModelObject::setSelectionState(state);
-    if (!m_inlineBoxWrapper)
-        return;
-    m_inlineBoxWrapper->root().setHasSelectedChildren(state != HighlightState::None);
-}
-
 IntRect RenderLineBreak::linesBoundingBox() const
 {

trunk/Source/WebCore/rendering/RenderLineBreak.h

@@ -66 +66 @@
     int caretMaxOffset() const final;
     bool canBeSelectionLeaf() const final;
-    void setSelectionState(HighlightState) final;
 
     LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositionMode) const final;

trunk/Source/WebCore/rendering/RenderListMarker.cpp

@@ -1949 +1949 @@
 }
 
-void RenderListMarker::setSelectionState(HighlightState state)
-{
-    // The selection state for our containing block hierarchy is updated by the base class call.
-    RenderBox::setSelectionState(state);
-
-    if (m_inlineBoxWrapper && canUpdateSelectionOnRootLineBoxes())
-        m_inlineBoxWrapper->root().setHasSelectedChildren(state != HighlightState::None);
-}
-
 LayoutRect RenderListMarker::selectionRectForRepaint(const RenderLayerModelObject* repaintContainer, bool clipToVisibleContent)
 {

trunk/Source/WebCore/rendering/RenderListMarker.h

@@ -75 +75 @@
     bool isText() const { return !isImage(); }
 
-    void setSelectionState(HighlightState) override;
     LayoutRect selectionRectForRepaint(const RenderLayerModelObject* repaintContainer, bool clipToVisibleContent = true) override;
     bool canBeSelectionLeaf() const override { return true; }

trunk/Source/WebCore/rendering/RenderReplaced.cpp

@@ -737 +737 @@
 }
 
-void RenderReplaced::setSelectionState(HighlightState state)
-{
-    // The selection state for our containing block hierarchy is updated by the base class call.
-    RenderBox::setSelectionState(state);
-
-    if (m_inlineBoxWrapper && canUpdateSelectionOnRootLineBoxes())
-        m_inlineBoxWrapper->root().setHasSelectedChildren(isHighlighted(selectionState(), view().selection()));
-}
-
 bool RenderReplaced::isSelected() const
 {

trunk/Source/WebCore/rendering/RenderReplaced.h

@@ -58 +58 @@
     virtual LayoutUnit minimumReplacedHeight() const { return 0_lu; }
 
-    void setSelectionState(HighlightState) override;
-
     bool isSelected() const;
 

trunk/Source/WebCore/rendering/RenderText.cpp

@@ -1277 +1277 @@
     RenderObject::setSelectionState(state);
 
-    if (canUpdateSelectionOnRootLineBoxes())
-        m_lineBoxes.setSelectionState(*this, state);
-
     // The containing block can be null in case of an orphaned tree.
     RenderBlock* containingBlock = this->containingBlock();

trunk/Source/WebCore/rendering/RenderTextLineBoxes.cpp

@@ -171 +171 @@
 }
 
-void RenderTextLineBoxes::setSelectionState(RenderText& renderer, RenderObject::HighlightState state)
-{
-    if (state == RenderObject::HighlightState::Inside || state == RenderObject::HighlightState::None) {
-        for (auto* box = m_first; box; box = box->nextTextBox())
-            box->root().setHasSelectedChildren(state == RenderObject::HighlightState::Inside);
-        return;
-    }
-
-    auto start = renderer.view().selection().startOffset();
-    auto end = renderer.view().selection().endOffset();
-    if (state == RenderObject::HighlightState::Start) {
-        end = renderer.text().length();
-        // to handle selection from end of text to end of line
-        if (start && start == end)
-            start = end - 1;
-    } else if (state == RenderObject::HighlightState::End)
-        start = 0;
-
-    for (auto* box = m_first; box; box = box->nextTextBox()) {
-        if (box->isSelected(start, end))
-            box->root().setHasSelectedChildren(true);
-    }
-}
-
 void RenderTextLineBoxes::dirtyAll()
 {

trunk/Source/WebCore/rendering/RenderTextLineBoxes.h

@@ -57 +57 @@
     InlineTextBox* findNext(int offset, int& position) const;
 
-    void setSelectionState(RenderText&, RenderObject::HighlightState);
-
     LayoutRect visualOverflowBoundingBox(const RenderText&) const;
 

trunk/Source/WebCore/rendering/RootInlineBox.h

@@ -123 +123 @@
     bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom, HitTestAction) override;
 
-    using InlineBox::hasSelectedChildren;
-    using InlineBox::setHasSelectedChildren;
-
     RenderObject::HighlightState selectionState() final;
     InlineBox* firstSelectedBox();