Changeset 269136 in webkit

Timestamp:

Oct 28, 2020, 8:53:02 PM (6 years ago)

Author:

rniwa@webkit.org

Message:

REGRESSION(r267329): Crash in VisibleSelection::toNormalizedRange()
​https://bugs.webkit.org/show_bug.cgi?id=218276

Reviewed by Wenson Hsieh.

Source/WebCore:

The crash was a symptom of the issue that m_extent or m_base could be null but not the other
when canonicalizing a non-null Position with VisiblePosition will make it null.

Fixed the bug by making sure base and extent's nullness match.

Test: editing/selection/delete-selection-with-disconnected-extent.html

• editing/VisibleSelection.cpp:

(WebCore::VisibleSelection::setBaseAndExtentToDeepEquivalents):

LayoutTests:

Added a regression test and rebaselined the test now that we got the pre-r267329 behavior back.

• editing/execCommand/insert-list-nested-with-orphaned-expected.txt: Reverted the rebaseline in r267329.
• editing/selection/delete-selection-with-disconnected-extent-expected.txt: Added.
• editing/selection/delete-selection-with-disconnected-extent.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/execCommand/insert-list-nested-with-orphaned-expected.txt (modified) (1 diff)
• LayoutTests/editing/selection/delete-selection-with-disconnected-extent-expected.txt (added)
• LayoutTests/editing/selection/delete-selection-with-disconnected-extent.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/VisibleSelection.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-10-28  Ryosuke Niwa  <rniwa@webkit.org>
+
+        REGRESSION(r267329): Crash in VisibleSelection::toNormalizedRange()
+        https://bugs.webkit.org/show_bug.cgi?id=218276
+
+        Reviewed by Wenson Hsieh.
+
+        Added a regression test and rebaselined the test now that we got the pre-r267329 behavior back.
+
+        * editing/execCommand/insert-list-nested-with-orphaned-expected.txt: Reverted the rebaseline in r267329.
+        * editing/selection/delete-selection-with-disconnected-extent-expected.txt: Added.
+        * editing/selection/delete-selection-with-disconnected-extent.html: Added.
+
 2020-10-28  Carlos Alberto Lopez Perez  <clopez@igalia.com>
 

trunk/LayoutTests/editing/execCommand/insert-list-nested-with-orphaned-expected.txt

@@ -18 +18 @@
 |     <ol>
 |       <li>
-|         "because of you"
+|         "<#selection-caret>because of you"
 |   "
     "

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-10-28  Ryosuke Niwa  <rniwa@webkit.org>
+
+        REGRESSION(r267329): Crash in VisibleSelection::toNormalizedRange()
+        https://bugs.webkit.org/show_bug.cgi?id=218276
+
+        Reviewed by Wenson Hsieh.
+
+        The crash was a symptom of the issue that m_extent or m_base could be null but not the other
+        when canonicalizing a non-null Position with VisiblePosition will make it null.
+
+        Fixed the bug by making sure base and extent's nullness match.
+
+        Test: editing/selection/delete-selection-with-disconnected-extent.html
+
+        * editing/VisibleSelection.cpp:
+        (WebCore::VisibleSelection::setBaseAndExtentToDeepEquivalents):
+
 2020-10-28  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/editing/VisibleSelection.cpp

@@ -233 +233 @@
     else
         m_extent = VisiblePosition(m_focus, m_affinity).deepEquivalent();
+    if (m_base.isNull() != m_extent.isNull()) {
+        if (m_base.isNull())
+            m_base = m_extent;
+        else
+            m_extent = m_base;
+    }
 }