- Revision
- 199364
- Author
- [email protected]
- Date
- 2016-04-12 09:40:27 -0700 (Tue, 12 Apr 2016)
Log Message
Merge r198163 - Selecting with shift+drag results in unexpected drag-n-drop
https://bugs.webkit.org/show_bug.cgi?id=155314
Reviewed by Darin Adler.
Source/WebCore:
Test: editing/selection/shift-drag-selection-no-drag-n-drop.html
Whenever user tries to extend an existing text selection by dragging the mouse
(left button hold) with shift key pressed, WebKit enters drag-n-drop mode.
This behavior does not match common editing behavior out there, including other
browsers' (Firefox, Opera/Presto and IE).
Patch changes WebKit so that whenever one extends a selection with mouse
and shift key pressed off of a #text node, it does not enter drag-n-drop mode.
Additionally, patch also adds some further tests to ensure that when
selection is extended off of either a link or an image, drag-n-drop does
get triggered, no matter if shift key is pressed.
* page/EventHandler.cpp:
(WebCore::EventHandler::handleMousePressEvent):
LayoutTests:
Tests that ensure that WebKit:
1) does not enter drag-n-drop mode and extending selection by dragging with mouse with shift key is pressed,
off of a #text node.
2) does enter drag-n-drop mode and extending selection by dragging with mouse with shift key is pressed,
off of a link.
3) does enter drag-n-drop mode and extending selection by dragging with mouse with shift key is pressed,
off of an image.
Note that (1) is a behavior changed by this patch, whereas (2) and (3) represent existing
behavior that is kept.
Tests are also skip for iOS similarly to other drag-n-drop related tests.
* fast/events/shift-drag-selection-no-drag-n-drop-expected.txt: Added.
* fast/events/shift-drag-selection-no-drag-n-drop.html: Added.
* fast/events/shift-drag-selection-on-link-triggers-drag-n-drop-expected.txt: Added.
* fast/events/shift-drag-selection-on-link-triggers-drag-n-drop.html: Added.
* fast/events/shift-drag-selection-on-image-triggers-drag-n-drop-expected.txt: Added.
* fast/events/shift-drag-selection-on-image-triggers-drag-n-drop.html: Added.
Modified Paths
Added Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog (199363 => 199364)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-04-12 16:32:57 UTC (rev 199363)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-04-12 16:40:27 UTC (rev 199364)
@@ -1,3 +1,30 @@
+2016-03-10 Antonio Gomes <[email protected]>
+
+ Selecting with shift+drag results in unexpected drag-n-drop
+ https://bugs.webkit.org/show_bug.cgi?id=155314
+
+ Reviewed by Darin Adler.
+
+ Tests that ensure that WebKit:
+
+ 1) does not enter drag-n-drop mode and extending selection by dragging with mouse with shift key is pressed,
+ off of a #text node.
+ 2) does enter drag-n-drop mode and extending selection by dragging with mouse with shift key is pressed,
+ off of a link.
+ 3) does enter drag-n-drop mode and extending selection by dragging with mouse with shift key is pressed,
+ off of an image.
+
+ Note that (1) is a behavior changed by this patch, whereas (2) and (3) represent existing
+ behavior that is kept.
+ Tests are also skip for iOS similarly to other drag-n-drop related tests.
+
+ * fast/events/shift-drag-selection-no-drag-n-drop-expected.txt: Added.
+ * fast/events/shift-drag-selection-no-drag-n-drop.html: Added.
+ * fast/events/shift-drag-selection-on-link-triggers-drag-n-drop-expected.txt: Added.
+ * fast/events/shift-drag-selection-on-link-triggers-drag-n-drop.html: Added.
+ * fast/events/shift-drag-selection-on-image-triggers-drag-n-drop-expected.txt: Added.
+ * fast/events/shift-drag-selection-on-image-triggers-drag-n-drop.html: Added.
+
2016-03-13 Ryosuke Niwa <[email protected]>
REGRESSION (r190840): crash inside details element's slotNameFunction
Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/events/shift-drag-selection-no-drag-n-drop-expected.txt (0 => 199364)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/events/shift-drag-selection-no-drag-n-drop-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/events/shift-drag-selection-no-drag-n-drop-expected.txt 2016-04-12 16:40:27 UTC (rev 199364)
@@ -0,0 +1,4 @@
+This test ensures drag-n-drop does not start when extending an existing selecting with shift + mouse drag, starting over a #text.
+
+ Drag count: 0
+
Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/events/shift-drag-selection-no-drag-n-drop.html (0 => 199364)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/events/shift-drag-selection-no-drag-n-drop.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/events/shift-drag-selection-no-drag-n-drop.html 2016-04-12 16:40:27 UTC (rev 199364)
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html>
+<body>
+<p>This test ensures drag-n-drop does not start when extending an existing selecting with shift + mouse drag, starting over a #text.</p>
+<span style='font-size: 50px; padding: 10px;'>hello world</span>
+<pre>
+<script>
+
+var span = document.getElementsByTagName('span')[0];
+span.focus();
+
+var dragStartCount = 0;
+document.addEventListener('dragstart', function (event) { dragStartCount++; });
+
+if (!window.testRunner || !window.eventSender)
+ document.write('This test requires eventSender');
+else {
+ testRunner.dumpAsText();
+
+ var y = span.offsetTop + span.offsetHeight / 2;
+ eventSender.mouseMoveTo(span.offsetLeft + 5, y);
+ eventSender.mouseDown();
+ eventSender.leapForward(200);
+ eventSender.mouseUp();
+
+ eventSender.mouseMoveTo(span.offsetLeft + span.offsetWidth / 4, y);
+ eventSender.mouseDown(0, ['shiftKey']);
+ eventSender.leapForward(200);
+ eventSender.mouseUp();
+
+ eventSender.mouseMoveTo(span.offsetLeft + span.offsetWidth / 2, y);
+ eventSender.mouseDown(0, ['shiftKey']);
+ eventSender.leapForward(200);
+ eventSender.mouseMoveTo(span.offsetLeft + span.offsetWidth, y);
+ eventSender.leapForward(200);
+ eventSender.mouseUp();
+
+ document.writeln("Drag count: " + dragStartCount);
+ span.parentNode.removeChild(span);
+}
+</script></pre>
+</body>
+</html>
Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/events/shift-drag-selection-on-image-triggers-drag-n-drop-expected.txt (0 => 199364)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/events/shift-drag-selection-on-image-triggers-drag-n-drop-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/events/shift-drag-selection-on-image-triggers-drag-n-drop-expected.txt 2016-04-12 16:40:27 UTC (rev 199364)
@@ -0,0 +1,4 @@
+This test ensures drag-n-drop does start when extending an existing selecting with shift + mouse drag, starting over an image.
+
+ Drag count: 1
+
Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/events/shift-drag-selection-on-image-triggers-drag-n-drop.html (0 => 199364)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/events/shift-drag-selection-on-image-triggers-drag-n-drop.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/events/shift-drag-selection-on-image-triggers-drag-n-drop.html 2016-04-12 16:40:27 UTC (rev 199364)
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html>
+<body>
+<p>This test ensures drag-n-drop does start when extending an existing selecting with shift + mouse drag, starting over an image.</p>
+<span style='font-size: 30px; padding: 10px;'>Some text with an image <img src="" width="50" height="50"> at end.</span>
+<pre>
+<script>
+
+var span = document.getElementsByTagName('span')[0];
+span.focus();
+
+var img = document.getElementsByTagName('img')[0];
+
+var dragStartCount = 0;
+document.addEventListener('dragstart', function (event) { dragStartCount++; });
+
+if (!window.testRunner || !window.eventSender)
+ document.write('This test requires eventSender');
+else {
+ testRunner.dumpAsText();
+
+ var y = span.offsetTop + span.offsetHeight / 2;
+ eventSender.mouseMoveTo(span.offsetLeft + 5, y);
+ eventSender.mouseDown();
+ eventSender.leapForward(200);
+ eventSender.mouseUp();
+
+ eventSender.mouseMoveTo(span.offsetLeft + span.offsetWidth / 4, y);
+ eventSender.mouseDown(0, ['shiftKey']);
+ eventSender.leapForward(200);
+ eventSender.mouseUp();
+
+ eventSender.mouseMoveTo(img.offsetLeft + img.offsetWidth / 2 , y);
+ eventSender.mouseDown(0, ['shiftKey']);
+ eventSender.leapForward(200);
+ eventSender.mouseMoveTo(img.offsetLeft + img.offsetWidth / 2 , y + 120);
+ eventSender.leapForward(200);
+ eventSender.mouseUp();
+
+ document.writeln("Drag count: " + dragStartCount);
+ span.parentNode.removeChild(span);
+}
+</script></pre>
+</body>
+</html>
Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/events/shift-drag-selection-on-link-triggers-drag-n-drop-expected.txt (0 => 199364)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/events/shift-drag-selection-on-link-triggers-drag-n-drop-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/events/shift-drag-selection-on-link-triggers-drag-n-drop-expected.txt 2016-04-12 16:40:27 UTC (rev 199364)
@@ -0,0 +1,4 @@
+This test ensures drag-n-drop does start when extending an existing selecting with shift + mouse drag, starting over a link.
+
+ Drag count: 1
+
Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/events/shift-drag-selection-on-link-triggers-drag-n-drop.html (0 => 199364)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/events/shift-drag-selection-on-link-triggers-drag-n-drop.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/events/shift-drag-selection-on-link-triggers-drag-n-drop.html 2016-04-12 16:40:27 UTC (rev 199364)
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html>
+<body>
+<p>This test ensures drag-n-drop does start when extending an existing selecting with shift + mouse drag, starting over a link.</p>
+<span style='font-size: 30px; padding: 10px;'>Some text with a <a href="" in the end of sentence</a>.</span>
+<pre>
+<script>
+
+var span = document.getElementsByTagName('span')[0];
+span.focus();
+
+var dragStartCount = 0;
+document.addEventListener('dragstart', function (event) { dragStartCount++; });
+
+if (!window.testRunner || !window.eventSender)
+ document.write('This test requires eventSender');
+else {
+ testRunner.dumpAsText();
+
+ var y = span.offsetTop + span.offsetHeight / 2;
+ eventSender.mouseMoveTo(span.offsetLeft + 5, y);
+ eventSender.mouseDown();
+ eventSender.leapForward(200);
+ eventSender.mouseUp();
+
+ eventSender.mouseMoveTo(span.offsetLeft + span.offsetWidth / 4, y);
+ eventSender.mouseDown(0, ['shiftKey']);
+ eventSender.leapForward(200);
+ eventSender.mouseUp();
+
+ eventSender.mouseMoveTo(span.offsetLeft + span.offsetWidth * .75 , y);
+ eventSender.mouseDown(0, ['shiftKey']);
+ eventSender.leapForward(200);
+ eventSender.mouseMoveTo(span.offsetLeft + span.offsetWidth * .75, y + 120);
+ eventSender.leapForward(200);
+ eventSender.mouseUp();
+
+ document.writeln("Drag count: " + dragStartCount);
+ span.parentNode.removeChild(span);
+}
+</script></pre>
+</body>
+</html>
Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/platform/ios-simulator/TestExpectations (199363 => 199364)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/platform/ios-simulator/TestExpectations 2016-04-12 16:32:57 UTC (rev 199363)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/platform/ios-simulator/TestExpectations 2016-04-12 16:40:27 UTC (rev 199364)
@@ -1631,6 +1631,9 @@
fast/events/selectstart-by-double-triple-clicks.html [ Failure ]
fast/events/selectstart-by-drag.html [ Failure ]
fast/events/selectstart-by-single-click-with-shift.html [ Failure ]
+fast/events/shift-drag-selection-no-drag-n-drop.html [ Failure ]
+fast/events/shift-drag-selection-on-link-triggers-drag-n-drop.html [ Failure ]
+fast/events/shift-drag-selection-on-image-triggers-drag-n-drop.html [ Failure ]
fast/events/selectstart-prevent-selection-on-right-click.html [ Failure ]
fast/events/shadow-event-path.html [ Failure ]
fast/events/show-modal-dialog-onblur-onfocus.html [ Failure ]
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (199363 => 199364)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-12 16:32:57 UTC (rev 199363)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-12 16:40:27 UTC (rev 199364)
@@ -1,3 +1,27 @@
+2016-03-10 Antonio Gomes <[email protected]>
+
+ Selecting with shift+drag results in unexpected drag-n-drop
+ https://bugs.webkit.org/show_bug.cgi?id=155314
+
+ Reviewed by Darin Adler.
+
+ Test: editing/selection/shift-drag-selection-no-drag-n-drop.html
+
+ Whenever user tries to extend an existing text selection by dragging the mouse
+ (left button hold) with shift key pressed, WebKit enters drag-n-drop mode.
+ This behavior does not match common editing behavior out there, including other
+ browsers' (Firefox, Opera/Presto and IE).
+
+ Patch changes WebKit so that whenever one extends a selection with mouse
+ and shift key pressed off of a #text node, it does not enter drag-n-drop mode.
+
+ Additionally, patch also adds some further tests to ensure that when
+ selection is extended off of either a link or an image, drag-n-drop does
+ get triggered, no matter if shift key is pressed.
+
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::handleMousePressEvent):
+
2016-03-13 Ryosuke Niwa <[email protected]>
REGRESSION (r190840): crash inside details element's slotNameFunction
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/page/EventHandler.cpp (199363 => 199364)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/page/EventHandler.cpp 2016-04-12 16:32:57 UTC (rev 199363)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/page/EventHandler.cpp 2016-04-12 16:40:27 UTC (rev 199364)
@@ -760,7 +760,12 @@
#if ENABLE(DRAG_SUPPORT)
// Careful that the drag starting logic stays in sync with eventMayStartDrag()
- m_mouseDownMayStartDrag = singleClick;
+ // FIXME: eventMayStartDrag() does not check for shift key press, link or image event targets.
+ // Bug: https://bugs.webkit.org/show_bug.cgi?id=155390
+
+ // Single mouse down on links or images can always trigger drag-n-drop.
+ bool isMouseDownOnLinkOrImage = event.isOverLink() || event.hitTestResult().image();
+ m_mouseDownMayStartDrag = singleClick && (!event.event().shiftKey() || isMouseDownOnLinkOrImage);
#endif
m_mouseDownWasSingleClickInSelection = false;
