Changeset 268847 in webkit

Timestamp:

Oct 21, 2020, 5:40:55 PM (6 years ago)

Author:

Megan Gardner

Message:

Stop gap patch fix for regression in r267329.
​https://bugs.webkit.org/show_bug.cgi?id=218020
Source/WebCore:

<rdar://problem/69542459>

Reviewed by Darin Adler.

The refactoring in ​https://bugs.webkit.org/show_bug.cgi?id=216739 caused selections to
expand in both directions after a double-click and drag to expand on mac. This behavior
was not observed on iOS. This removes the error-prone calculation.
Note that this bug does not occur if only testing immediatly moving the drag point to the
end of the selection. Dragging across all the words as a real user would needs to be emulated.

Test: editing/selection/double-click-and-drag-over-anchor-to-select.html

• editing/VisibleSelection.cpp:

(WebCore::VisibleSelection::validate):

LayoutTests:

Reviewed by Darin Adler.

• editing/selection/double-click-and-drag-over-anchor-to-select-expected.txt: Added.
• editing/selection/double-click-and-drag-over-anchor-to-select.html: Added.
• resources/ui-helper.js:

(window.UIHelper.doubleClickAtMouseDown):
(window.UIHelper.mouseUp):
(window.UIHelper.dragMouseAcrossElement):
(window.UIHelper.doubleClickElementMouseDown):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/mac/selection/double-click-and-drag-over-anchor-to-select-expected.txt (added)
• LayoutTests/editing/mac/selection/double-click-and-drag-over-anchor-to-select.html (added)
• LayoutTests/resources/ui-helper.js (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/VisibleSelection.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-10-21  Megan Gardner  <megan_gardner@apple.com>
+
+        Stop gap patch fix for regression in r267329.
+        https://bugs.webkit.org/show_bug.cgi?id=218020
+
+        Reviewed by Darin Adler.
+
+        * editing/selection/double-click-and-drag-over-anchor-to-select-expected.txt: Added.
+        * editing/selection/double-click-and-drag-over-anchor-to-select.html: Added.
+        * resources/ui-helper.js:
+        (window.UIHelper.doubleClickAtMouseDown):
+        (window.UIHelper.mouseUp):
+        (window.UIHelper.dragMouseAcrossElement):
+        (window.UIHelper.doubleClickElementMouseDown):
+
 2020-10-21  Karl Rackler  <rackler@apple.com>
 

trunk/LayoutTests/resources/ui-helper.js

@@ -17 +17 @@
         eventSender.mouseUp();
         eventSender.mouseDown();
+        eventSender.mouseUp();
+    }
+
+    static doubleClickAtMouseDown(x1, y1)
+    {
+        eventSender.mouseMoveTo(x1, y1);
+        eventSender.mouseDown();
+        eventSender.mouseUp();
+        eventSender.mouseDown();
+    }
+
+    static mouseUp()
+    {
         eventSender.mouseUp();
     }
@@ -28 +41 @@
         eventSender.mouseMoveTo(x2, y2);
         eventSender.mouseUp();
+    }
+
+    static dragMouseAcrossElement(element)
+    {
+        const x1 = element.offsetLeft + element.offsetWidth;
+        const x2 = element.offsetLeft + element.offsetWidth * .75;
+        const x3 = element.offsetLeft + element.offsetWidth / 2;
+        const x4 = element.offsetLeft + element.offsetWidth / 4;
+        const x5 = element.offsetLeft;
+        const y = element.offsetTop + element.offsetHeight / 2;
+        eventSender.mouseMoveTo(x1, y);
+        eventSender.mouseMoveTo(x2, y);
+        eventSender.mouseMoveTo(x3, y);
+        eventSender.mouseMoveTo(x4, y);
+        eventSender.mouseMoveTo(x5, y);
+    }
+
+    static doubleClickElementMouseDown(element1)
+    {
+        const x1 = element1.offsetLeft + element1.offsetWidth / 2;
+        const y1 = element1.offsetTop + element1.offsetHeight / 2;
+        return UIHelper.doubleClickAtMouseDown(x1, y1);
     }
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-10-21  Megan Gardner  <megan_gardner@apple.com>
+
+        Stop gap patch fix for regression in r267329.
+        https://bugs.webkit.org/show_bug.cgi?id=218020
+        <rdar://problem/69542459>
+
+        Reviewed by Darin Adler.
+
+        The refactoring in https://bugs.webkit.org/show_bug.cgi?id=216739 caused selections to 
+        expand in both directions after a double-click and drag to expand on mac. This behavior
+        was not observed on iOS. This removes the error-prone calculation. 
+        Note that this bug does not occur if only testing immediatly moving the drag point to the
+        end of the selection. Dragging across all the words as a real user would needs to be emulated. 
+
+        Test: editing/selection/double-click-and-drag-over-anchor-to-select.html
+
+        * editing/VisibleSelection.cpp:
+        (WebCore::VisibleSelection::validate):
+
 2020-10-21  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/editing/VisibleSelection.cpp

@@ -387 +387 @@
     updateSelectionType();
 
-    bool shouldUpdateAnchor = m_start != startBeforeAdjustments;
-    bool shouldUpdateFocus = m_end != endBeforeAdjustments;
+    bool shouldUpdateAnchor = false; // Set to false because of <rdar://problem/69542459>. Can be returned to original logic when this problem is fully fixed.
+    bool shouldUpdateFocus = false; // Ditto.
 
     if (isRange()) {