<!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>[181115] trunk/Source/WebCore</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/181115">181115</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-03-05 16:36:37 -0800 (Thu, 05 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Two text carets result when dragging a file into a contentEditable area that preventDefault()s the "drop" event
https://bugs.webkit.org/show_bug.cgi?id=142362
<rdar://problem/20046434>
Reviewed by Simon Fraser.
* page/DragController.h:
* page/DragController.cpp:
(WebCore::DragController::clearDragCaret):
Rename cancelDrag to clearDragCaret, since that's really what it does.
(WebCore::DragController::tryDocumentDrag):
When updating the drag position, if we're now over a <input type="file">,
clear the drag caret. This avoids leaving a caret behind when dragging
over a <input type="file"> inside a contentEditable area.
(WebCore::DragController::performDragOperation):
When the content preventDefault()s while finishing a drag, we should still
clear the drag caret, because it's possible that the client did not
preventDefault() on dragover/etc., so we would have set a cursor, and
now need to clear it so that it doesn't get left behind.
(WebCore::DragController::mouseMovedIntoDocument):
(WebCore::DragController::dragEnteredOrUpdated):
(WebCore::DragController::concludeEditDrag):
Adjust to renamed clearDragCaret.
(WebCore::DragController::dragEnded):
Make use of clearDragCaret (which is equivalent to this line).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageDragControllercpp">trunk/Source/WebCore/page/DragController.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDragControllerh">trunk/Source/WebCore/page/DragController.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (181114 => 181115)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-06 00:34:25 UTC (rev 181114)
+++ trunk/Source/WebCore/ChangeLog 2015-03-06 00:36:37 UTC (rev 181115)
</span><span class="lines">@@ -1,5 +1,37 @@
</span><span class="cx"> 2015-03-05 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><ins>+ Two text carets result when dragging a file into a contentEditable area that preventDefault()s the "drop" event
+ https://bugs.webkit.org/show_bug.cgi?id=142362
+ <rdar://problem/20046434>
+
+ Reviewed by Simon Fraser.
+
+ * page/DragController.h:
+ * page/DragController.cpp:
+ (WebCore::DragController::clearDragCaret):
+ Rename cancelDrag to clearDragCaret, since that's really what it does.
+
+ (WebCore::DragController::tryDocumentDrag):
+ When updating the drag position, if we're now over a <input type="file">,
+ clear the drag caret. This avoids leaving a caret behind when dragging
+ over a <input type="file"> inside a contentEditable area.
+
+ (WebCore::DragController::performDragOperation):
+ When the content preventDefault()s while finishing a drag, we should still
+ clear the drag caret, because it's possible that the client did not
+ preventDefault() on dragover/etc., so we would have set a cursor, and
+ now need to clear it so that it doesn't get left behind.
+
+ (WebCore::DragController::mouseMovedIntoDocument):
+ (WebCore::DragController::dragEnteredOrUpdated):
+ (WebCore::DragController::concludeEditDrag):
+ Adjust to renamed clearDragCaret.
+
+ (WebCore::DragController::dragEnded):
+ Make use of clearDragCaret (which is equivalent to this line).
+
+2015-03-05 Timothy Horton <timothy_horton@apple.com>
+
</ins><span class="cx"> <attachment> should support indication of download progress
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=142336
</span><span class="cx"> <rdar://problem/19982504>
</span></span></pre></div>
<a id="trunkSourceWebCorepageDragControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DragController.cpp (181114 => 181115)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DragController.cpp 2015-03-06 00:34:25 UTC (rev 181114)
+++ trunk/Source/WebCore/page/DragController.cpp 2015-03-06 00:36:37 UTC (rev 181115)
</span><span class="lines">@@ -156,8 +156,7 @@
</span><span class="cx"> return m_documentUnderMouse == m_dragInitiator && visibleSelection.isContentEditable() && visibleSelection.isRange() && !isCopyKeyDown(dragData);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// FIXME: This method is poorly named. We're just clearing the selection from the document this drag is exiting.
-void DragController::cancelDrag()
</del><ins>+void DragController::clearDragCaret()
</ins><span class="cx"> {
</span><span class="cx"> m_page.dragCaretController().clear();
</span><span class="cx"> }
</span><span class="lines">@@ -166,7 +165,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_dragInitiator = 0;
</span><span class="cx"> m_didInitiateDrag = false;
</span><del>- m_page.dragCaretController().clear();
</del><ins>+ clearDragCaret();
</ins><span class="cx">
</span><span class="cx"> m_client.dragEnded();
</span><span class="cx"> }
</span><span class="lines">@@ -216,6 +215,7 @@
</span><span class="cx"> dataTransfer->setAccessPolicy(DataTransferAccessPolicy::Numb); // Invalidate dataTransfer here for security.
</span><span class="cx"> }
</span><span class="cx"> if (preventedDefault) {
</span><ins>+ clearDragCaret();
</ins><span class="cx"> m_documentUnderMouse = 0;
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -243,7 +243,7 @@
</span><span class="cx">
</span><span class="cx"> // If we were over another document clear the selection
</span><span class="cx"> if (m_documentUnderMouse)
</span><del>- cancelDrag();
</del><ins>+ clearDragCaret();
</ins><span class="cx"> m_documentUnderMouse = newDocument;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -253,7 +253,7 @@
</span><span class="cx">
</span><span class="cx"> m_dragDestinationAction = m_client.actionMaskForDrag(dragData);
</span><span class="cx"> if (m_dragDestinationAction == DragDestinationActionNone) {
</span><del>- cancelDrag(); // FIXME: Why not call mouseMovedIntoDocument(nullptr)?
</del><ins>+ clearDragCaret(); // FIXME: Why not call mouseMovedIntoDocument(nullptr)?
</ins><span class="cx"> return DragOperationNone;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -323,7 +323,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (isHandlingDrag) {
</span><del>- m_page.dragCaretController().clear();
</del><ins>+ clearDragCaret();
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -347,6 +347,8 @@
</span><span class="cx">
</span><span class="cx"> if (!m_fileInputElementUnderMouse)
</span><span class="cx"> m_page.dragCaretController().setCaretPosition(m_documentUnderMouse->frame()->visiblePositionForPoint(point));
</span><ins>+ else
+ clearDragCaret();
</ins><span class="cx">
</span><span class="cx"> Frame* innerFrame = element->document().frame();
</span><span class="cx"> dragOperation = dragIsMove(innerFrame->selection(), dragData) ? DragOperationMove : DragOperationCopy;
</span><span class="lines">@@ -376,7 +378,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // We are not over an editable region. Make sure we're clearing any prior drag cursor.
</span><del>- m_page.dragCaretController().clear();
</del><ins>+ clearDragCaret();
</ins><span class="cx"> if (m_fileInputElementUnderMouse)
</span><span class="cx"> m_fileInputElementUnderMouse->setCanReceiveDroppedFiles(false);
</span><span class="cx"> m_fileInputElementUnderMouse = 0;
</span><span class="lines">@@ -473,12 +475,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!m_page.dragController().canProcessDrag(dragData)) {
</span><del>- m_page.dragCaretController().clear();
</del><ins>+ clearDragCaret();
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> VisibleSelection dragCaret = m_page.dragCaretController().caretPosition();
</span><del>- m_page.dragCaretController().clear();
</del><ins>+ clearDragCaret();
</ins><span class="cx"> RefPtr<Range> range = dragCaret.toNormalizedRange();
</span><span class="cx"> RefPtr<Element> rootEditableElement = innerFrame->selection().selection().rootEditableElement();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageDragControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DragController.h (181114 => 181115)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DragController.h 2015-03-06 00:34:25 UTC (rev 181114)
+++ trunk/Source/WebCore/page/DragController.h 2015-03-06 00:36:37 UTC (rev 181115)
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> bool tryDocumentDrag(DragData&, DragDestinationAction, DragOperation&);
</span><span class="cx"> bool tryDHTMLDrag(DragData&, DragOperation&);
</span><span class="cx"> DragOperation dragOperation(DragData&);
</span><del>- void cancelDrag();
</del><ins>+ void clearDragCaret();
</ins><span class="cx"> bool dragIsMove(FrameSelection&, DragData&);
</span><span class="cx"> bool isCopyKeyDown(DragData&);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>