<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[198163] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/198163">198163</a></dd>
<dt>Author</dt> <dd>tonikitoo@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-14 15:08:32 -0700 (Mon, 14 Mar 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>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.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorTestExpectations">trunk/LayoutTests/platform/ios-simulator/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageEventHandlercpp">trunk/Source/WebCore/page/EventHandler.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasteventsshiftdragselectionnodragndropexpectedtxt">trunk/LayoutTests/fast/events/shift-drag-selection-no-drag-n-drop-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventsshiftdragselectionnodragndrophtml">trunk/LayoutTests/fast/events/shift-drag-selection-no-drag-n-drop.html</a></li>
<li><a href="#trunkLayoutTestsfasteventsshiftdragselectiononimagetriggersdragndropexpectedtxt">trunk/LayoutTests/fast/events/shift-drag-selection-on-image-triggers-drag-n-drop-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventsshiftdragselectiononimagetriggersdragndrophtml">trunk/LayoutTests/fast/events/shift-drag-selection-on-image-triggers-drag-n-drop.html</a></li>
<li><a href="#trunkLayoutTestsfasteventsshiftdragselectiononlinktriggersdragndropexpectedtxt">trunk/LayoutTests/fast/events/shift-drag-selection-on-link-triggers-drag-n-drop-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventsshiftdragselectiononlinktriggersdragndrophtml">trunk/LayoutTests/fast/events/shift-drag-selection-on-link-triggers-drag-n-drop.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (198162 => 198163)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-03-14 22:03:21 UTC (rev 198162)
+++ trunk/LayoutTests/ChangeLog        2016-03-14 22:08:32 UTC (rev 198163)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2016-03-10  Antonio Gomes  &lt;tonikitoo@webkit.org&gt;
+
+        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.
+
</ins><span class="cx"> 2016-03-14  Ryan Haddad  &lt;ryanhaddad@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Marking storage/indexeddb/transaction-abort-private.html as flaky on mac-wk1
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventsshiftdragselectionnodragndropexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/shift-drag-selection-no-drag-n-drop-expected.txt (0 => 198163)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/shift-drag-selection-no-drag-n-drop-expected.txt                                (rev 0)
+++ trunk/LayoutTests/fast/events/shift-drag-selection-no-drag-n-drop-expected.txt        2016-03-14 22:08:32 UTC (rev 198163)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+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
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventsshiftdragselectionnodragndrophtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/shift-drag-selection-no-drag-n-drop.html (0 => 198163)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/shift-drag-selection-no-drag-n-drop.html                                (rev 0)
+++ trunk/LayoutTests/fast/events/shift-drag-selection-no-drag-n-drop.html        2016-03-14 22:08:32 UTC (rev 198163)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;body&gt;
+&lt;p&gt;This test ensures drag-n-drop does not start when extending an existing selecting with shift + mouse drag, starting over a #text.&lt;/p&gt;
+&lt;span style='font-size: 50px; padding: 10px;'&gt;hello world&lt;/span&gt;
+&lt;pre&gt;
+&lt;script&gt;
+
+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(&quot;Drag count: &quot; + dragStartCount);
+    span.parentNode.removeChild(span);
+}
+&lt;/script&gt;&lt;/pre&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventsshiftdragselectiononimagetriggersdragndropexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/shift-drag-selection-on-image-triggers-drag-n-drop-expected.txt (0 => 198163)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/shift-drag-selection-on-image-triggers-drag-n-drop-expected.txt                                (rev 0)
+++ trunk/LayoutTests/fast/events/shift-drag-selection-on-image-triggers-drag-n-drop-expected.txt        2016-03-14 22:08:32 UTC (rev 198163)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+This test ensures drag-n-drop does start when extending an existing selecting with shift + mouse drag, starting over an image.
+
+ Drag count: 1
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventsshiftdragselectiononimagetriggersdragndrophtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/shift-drag-selection-on-image-triggers-drag-n-drop.html (0 => 198163)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/shift-drag-selection-on-image-triggers-drag-n-drop.html                                (rev 0)
+++ trunk/LayoutTests/fast/events/shift-drag-selection-on-image-triggers-drag-n-drop.html        2016-03-14 22:08:32 UTC (rev 198163)
</span><span class="lines">@@ -0,0 +1,45 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;body&gt;
+&lt;p&gt;This test ensures drag-n-drop does start when extending an existing selecting with shift + mouse drag, starting over an image.&lt;/p&gt;
+&lt;span style='font-size: 30px; padding: 10px;'&gt;Some text with an image &lt;img src=&quot;resources/webkit-logo.png&quot; width=&quot;50&quot; height=&quot;50&quot;&gt; at end.&lt;/span&gt;
+&lt;pre&gt;
+&lt;script&gt;
+
+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(&quot;Drag count: &quot; + dragStartCount);
+    span.parentNode.removeChild(span);
+}
+&lt;/script&gt;&lt;/pre&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventsshiftdragselectiononlinktriggersdragndropexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/shift-drag-selection-on-link-triggers-drag-n-drop-expected.txt (0 => 198163)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/shift-drag-selection-on-link-triggers-drag-n-drop-expected.txt                                (rev 0)
+++ trunk/LayoutTests/fast/events/shift-drag-selection-on-link-triggers-drag-n-drop-expected.txt        2016-03-14 22:08:32 UTC (rev 198163)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+This test ensures drag-n-drop does start when extending an existing selecting with shift + mouse drag, starting over a link.
+
+ Drag count: 1
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventsshiftdragselectiononlinktriggersdragndrophtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/shift-drag-selection-on-link-triggers-drag-n-drop.html (0 => 198163)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/shift-drag-selection-on-link-triggers-drag-n-drop.html                                (rev 0)
+++ trunk/LayoutTests/fast/events/shift-drag-selection-on-link-triggers-drag-n-drop.html        2016-03-14 22:08:32 UTC (rev 198163)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;body&gt;
+&lt;p&gt;This test ensures drag-n-drop does start when extending an existing selecting with shift + mouse drag, starting over a link.&lt;/p&gt;
+&lt;span style='font-size: 30px; padding: 10px;'&gt;Some text with a &lt;a href=#&gt;link in the end of sentence&lt;/a&gt;.&lt;/span&gt;
+&lt;pre&gt;
+&lt;script&gt;
+
+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(&quot;Drag count: &quot; + dragStartCount);
+    span.parentNode.removeChild(span);
+}
+&lt;/script&gt;&lt;/pre&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (198162 => 198163)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/TestExpectations        2016-03-14 22:03:21 UTC (rev 198162)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations        2016-03-14 22:08:32 UTC (rev 198163)
</span><span class="lines">@@ -1654,6 +1654,9 @@
</span><span class="cx"> fast/events/selectstart-by-double-triple-clicks.html [ Failure ]
</span><span class="cx"> fast/events/selectstart-by-drag.html [ Failure ]
</span><span class="cx"> fast/events/selectstart-by-single-click-with-shift.html [ Failure ]
</span><ins>+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 ]
</ins><span class="cx"> fast/events/selectstart-prevent-selection-on-right-click.html [ Failure ]
</span><span class="cx"> fast/events/shadow-event-path.html [ Failure ]
</span><span class="cx"> fast/events/show-modal-dialog-onblur-onfocus.html [ Failure ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198162 => 198163)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-03-14 22:03:21 UTC (rev 198162)
+++ trunk/Source/WebCore/ChangeLog        2016-03-14 22:08:32 UTC (rev 198163)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-03-10  Antonio Gomes  &lt;tonikitoo@webkit.org&gt;
+
+        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):
+
</ins><span class="cx"> 2016-03-14  Brent Fulgham  &lt;bfulgham@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         REGRESSION (r197114): Crash in WebCore::MediaDevicesRequest::didCompletePermissionCheck
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.cpp (198162 => 198163)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.cpp        2016-03-14 22:03:21 UTC (rev 198162)
+++ trunk/Source/WebCore/page/EventHandler.cpp        2016-03-14 22:08:32 UTC (rev 198163)
</span><span class="lines">@@ -760,7 +760,12 @@
</span><span class="cx">     
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><span class="cx">     // Careful that the drag starting logic stays in sync with eventMayStartDrag()
</span><del>-    m_mouseDownMayStartDrag = singleClick;
</del><ins>+    // 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 &amp;&amp; (!event.event().shiftKey() || isMouseDownOnLinkOrImage);
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     m_mouseDownWasSingleClickInSelection = false;
</span></span></pre>
</div>
</div>

</body>
</html>