Changeset 278561 in webkit

Timestamp:

Jun 7, 2021, 8:06:49 AM (5 years ago)

Author:

Antti Koivisto

Message:

Factor selection state computation out of LegacyInlineTextBox
​https://bugs.webkit.org/show_bug.cgi?id=226718

Reviewed by Alan Bujtas.

Move the code to SelectionRangeData.

• layout/integration/LayoutIntegrationRunIteratorModernPath.h:

(WebCore::LayoutIntegration::RunIteratorModernPath::selectableRange const):

• rendering/HighlightData.cpp:

(WebCore::HighlightData::highlightStateForRenderer):
(WebCore::HighlightData::highlightStateForTextBox):
(WebCore::HighlightData::rangeForTextBox):

• rendering/HighlightData.h:

(WebCore::HighlightData::HighlightData):

• rendering/LegacyInlineTextBox.cpp:

(WebCore::LegacyInlineTextBox::selectionState):
(WebCore::LegacyInlineTextBox::selectableRange const):
(WebCore::LegacyInlineTextBox::selectionStartEnd const):
(WebCore::LegacyInlineTextBox::highlightStartEnd const):
(WebCore::LegacyInlineTextBox::verifySelectionState const): Deleted.
(WebCore::LegacyInlineTextBox::clampedStartEndForState const): Deleted.

• rendering/LegacyInlineTextBox.h:
• rendering/SelectionRangeData.cpp:

(WebCore::SelectionRangeData::SelectionRangeData):

• rendering/TextBoxSelectableRange.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/integration/LayoutIntegrationRunIteratorModernPath.h (modified) (1 diff)
• rendering/HighlightData.cpp (modified) (3 diffs)
• rendering/HighlightData.h (modified) (3 diffs)
• rendering/LegacyInlineTextBox.cpp (modified) (3 diffs)
• rendering/LegacyInlineTextBox.h (modified) (1 diff)
• rendering/SelectionRangeData.cpp (modified) (1 diff)
• rendering/TextBoxSelectableRange.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-06-07  Antti Koivisto  <antti@apple.com>
+
+        Factor selection state computation out of LegacyInlineTextBox
+        https://bugs.webkit.org/show_bug.cgi?id=226718
+
+        Reviewed by Alan Bujtas.
+
+        Move the code to SelectionRangeData.
+
+        * layout/integration/LayoutIntegrationRunIteratorModernPath.h:
+        (WebCore::LayoutIntegration::RunIteratorModernPath::selectableRange const):
+        * rendering/HighlightData.cpp:
+        (WebCore::HighlightData::highlightStateForRenderer):
+        (WebCore::HighlightData::highlightStateForTextBox):
+        (WebCore::HighlightData::rangeForTextBox):
+        * rendering/HighlightData.h:
+        (WebCore::HighlightData::HighlightData):
+        * rendering/LegacyInlineTextBox.cpp:
+        (WebCore::LegacyInlineTextBox::selectionState):
+        (WebCore::LegacyInlineTextBox::selectableRange const):
+        (WebCore::LegacyInlineTextBox::selectionStartEnd const):
+        (WebCore::LegacyInlineTextBox::highlightStartEnd const):
+        (WebCore::LegacyInlineTextBox::verifySelectionState const): Deleted.
+        (WebCore::LegacyInlineTextBox::clampedStartEndForState const): Deleted.
+        * rendering/LegacyInlineTextBox.h:
+        * rendering/SelectionRangeData.cpp:
+        (WebCore::SelectionRangeData::SelectionRangeData):
+        * rendering/TextBoxSelectableRange.h:
+
 2021-06-07  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebCore/layout/integration/LayoutIntegrationRunIteratorModernPath.h

@@ -210 +210 @@
             start(),
             length(),
-            run().style().hyphenString().length()
+            run().style().hyphenString().length(),
+            run().isLineBreak()
         };
     }

trunk/Source/WebCore/rendering/HighlightData.cpp

@@ -42 +42 @@
 #include "RenderObject.h"
 #include "RenderView.h"
+#include "TextBoxSelectableRange.h"
 #include "VisibleSelection.h"
 #include <wtf/text/TextStream.h>
@@ -121 +122 @@
 RenderObject::HighlightState HighlightData::highlightStateForRenderer(const RenderObject& renderer)
 {
+    if (m_isSelection)
+        return renderer.selectionState();
+
     if (&renderer == m_renderRange.start()) {
         if (m_renderRange.start() && m_renderRange.end() && m_renderRange.start() == m_renderRange.end())
@@ -144 +148 @@
 }
 
+RenderObject::HighlightState HighlightData::highlightStateForTextBox(const RenderText& renderer, const TextBoxSelectableRange& textBoxRange)
+{
+    auto state = highlightStateForRenderer(renderer);
+
+    if (state == RenderObject::HighlightState::None || state == RenderObject::HighlightState::Inside)
+        return state;
+
+    auto startOffset = this->startOffset();
+    auto endOffset = this->endOffset();
+
+    // The position after a hard line break is considered to be past its end.
+    ASSERT(textBoxRange.start + textBoxRange.length >= (textBoxRange.isLineBreak ? 1 : 0));
+    unsigned lastSelectable = textBoxRange.start + textBoxRange.length - (textBoxRange.isLineBreak ? 1 : 0);
+
+    bool containsStart = state != RenderObject::HighlightState::End && startOffset >= textBoxRange.start && startOffset < textBoxRange.start + textBoxRange.length;
+    bool containsEnd = state != RenderObject::HighlightState::Start && endOffset > textBoxRange.start && endOffset <= lastSelectable;
+    if (containsStart && containsEnd)
+        return RenderObject::HighlightState::Both;
+    if (containsStart)
+        return RenderObject::HighlightState::Start;
+    if (containsEnd)
+        return RenderObject::HighlightState::End;
+    if ((state == RenderObject::HighlightState::End || startOffset < textBoxRange.start) && (state == RenderObject::HighlightState::Start || endOffset > lastSelectable))
+        return RenderObject::HighlightState::Inside;
+
+    return RenderObject::HighlightState::None;
+}
+
+std::pair<unsigned, unsigned> HighlightData::rangeForTextBox(const RenderText& renderer, const TextBoxSelectableRange& textBoxRange)
+{
+    auto state = highlightStateForTextBox(renderer, textBoxRange);
+
+    switch (state) {
+    case RenderObject::HighlightState::Inside:
+        return textBoxRange.clamp(0, std::numeric_limits<unsigned>::max());
+    case RenderObject::HighlightState::Start:
+        return textBoxRange.clamp(startOffset(), std::numeric_limits<unsigned>::max());
+    case RenderObject::HighlightState::End:
+        return textBoxRange.clamp(0, endOffset());
+    case RenderObject::HighlightState::Both:
+        return textBoxRange.clamp(startOffset(), endOffset());
+    case RenderObject::HighlightState::None:
+        return { 0, 0 };
+    };
+}
+
 } // namespace WebCore

trunk/Source/WebCore/rendering/HighlightData.h

@@ -36 +36 @@
 
 struct HighlightRangeData;
+struct TextBoxSelectableRange;
 class RenderMultiColumnSpannerPlaceholder;
 
@@ -81 +82 @@
 class HighlightData {
 public:
+    enum IsSelectionTag { IsSelection };
+    HighlightData() = default;
+    HighlightData(IsSelectionTag)
+        : m_isSelection(true)
+    { }
+
     void setRenderRange(const RenderRange&);
     bool setRenderRange(const HighlightRangeData&); // Returns true if successful.
@@ -92 +99 @@
 
     RenderObject::HighlightState highlightStateForRenderer(const RenderObject&);
+    RenderObject::HighlightState highlightStateForTextBox(const RenderText&, const TextBoxSelectableRange&);
+    std::pair<unsigned, unsigned> rangeForTextBox(const RenderText&, const TextBoxSelectableRange&);
 
 protected:
     RenderRange m_renderRange;
+    const bool m_isSelection { false };
 };
 

trunk/Source/WebCore/rendering/LegacyInlineTextBox.cpp

@@ -162 +162 @@
 RenderObject::HighlightState LegacyInlineTextBox::selectionState()
 {
-    auto state = verifySelectionState(renderer().selectionState(), renderer().view().selection());
+    auto state = renderer().view().selection().highlightStateForTextBox(renderer(), selectableRange());
     
     // FIXME: this code mutates selection state, but it's used at a simple getter elsewhere
@@ -186 +186 @@
 }
 
-RenderObject::HighlightState LegacyInlineTextBox::verifySelectionState(RenderObject::HighlightState state, HighlightData& selection) const
-{
-    if (state == RenderObject::HighlightState::Start || state == RenderObject::HighlightState::End || state == RenderObject::HighlightState::Both) {
-        auto startOffset = selection.startOffset();
-        auto endOffset = selection.endOffset();
-        // The position after a hard line break is considered to be past its end.
-        ASSERT(start() + len() >= (isLineBreak() ? 1 : 0));
-        unsigned lastSelectable = start() + len() - (isLineBreak() ? 1 : 0);
-
-        bool start = (state != RenderObject::HighlightState::End && startOffset >= m_start && startOffset < m_start + m_len);
-        bool end = (state != RenderObject::HighlightState::Start && endOffset > m_start && endOffset <= lastSelectable);
-        if (start && end)
-            state = RenderObject::HighlightState::Both;
-        else if (start)
-            state = RenderObject::HighlightState::Start;
-        else if (end)
-            state = RenderObject::HighlightState::End;
-        else if ((state == RenderObject::HighlightState::End || startOffset < m_start)
-            && (state == RenderObject::HighlightState::Start || endOffset > lastSelectable))
-            state = RenderObject::HighlightState::Inside;
-        else if (state == RenderObject::HighlightState::Both)
-            state = RenderObject::HighlightState::None;
-    }
-
-    return state;
-}
-
 inline const FontCascade& LegacyInlineTextBox::lineFont() const
 {
@@ -667 +640 @@
         m_len,
         additionalLengthAtEnd,
+        isLineBreak(),
         truncation
     };
 }
 
-std::pair<unsigned, unsigned> LegacyInlineTextBox::clampedStartEndForState(unsigned start, unsigned end, RenderObject::HighlightState selectionState) const
-{
-    if (selectionState == RenderObject::HighlightState::Inside)
-        return { 0, selectableRange().clamp(m_start + m_len) };
-    
-    if (selectionState == RenderObject::HighlightState::Start)
-        end = renderer().text().length();
-    else if (selectionState == RenderObject::HighlightState::End)
-        start = 0;
-    return selectableRange().clamp(start, end);
-}
-
 std::pair<unsigned, unsigned> LegacyInlineTextBox::selectionStartEnd() const
 {
-    auto selectionState = renderer().selectionState();
-    
-    return clampedStartEndForState(renderer().view().selection().startOffset(), renderer().view().selection().endOffset(), selectionState);
-}
-
-std::pair<unsigned, unsigned> LegacyInlineTextBox::highlightStartEnd(HighlightData &rangeData) const
-{
-    auto state = rangeData.highlightStateForRenderer(renderer());
-    state = verifySelectionState(state, rangeData);
-    
-    if (state == RenderObject::HighlightState::None)
-        return {0, 0};
-    
-    return clampedStartEndForState(rangeData.startOffset(), rangeData.endOffset(), state);
+    return renderer().view().selection().rangeForTextBox(renderer(), selectableRange());
+}
+
+std::pair<unsigned, unsigned> LegacyInlineTextBox::highlightStartEnd(HighlightData& rangeData) const
+{
+    return rangeData.rangeForTextBox(renderer(), selectableRange());
 }
 

trunk/Source/WebCore/rendering/LegacyInlineTextBox.h

@@ -135 +135 @@
     void attachLine() final;
     
-    RenderObject::HighlightState verifySelectionState(RenderObject::HighlightState, HighlightData&) const;
-    std::pair<unsigned, unsigned> clampedStartEndForState(unsigned, unsigned, RenderObject::HighlightState) const;
-
 public:
     RenderObject::HighlightState selectionState() final;

trunk/Source/WebCore/rendering/SelectionRangeData.cpp

@@ -109 +109 @@
 
 SelectionRangeData::SelectionRangeData(RenderView& view)
-    : m_renderView(view)
+    : HighlightData(IsSelection)
+    , m_renderView(view)
 #if ENABLE(SERVICE_CONTROLS)
     , m_selectionGeometryGatherer(view)

trunk/Source/WebCore/rendering/TextBoxSelectableRange.h

@@ -33 +33 @@
     const unsigned length;
     const unsigned additionalLengthAtEnd { 0 };
+    const bool isLineBreak { false };
     const std::optional<unsigned> truncation { };