<!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>[212481] 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/212481">212481</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2017-02-16 15:52:26 -0800 (Thu, 16 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename DataTransfer functions to indicate whether they are for dragging or dropping
https://bugs.webkit.org/show_bug.cgi?id=168478
Reviewed by Tim Horton.
* dom/DataTransfer.cpp:
(WebCore::DataTransfer::createForDrag):
(WebCore::DataTransfer::createForDrop):
(WebCore::DataTransfer::createForDragAndDrop): Deleted.
* dom/DataTransfer.h:
* page/DragController.cpp:
(WebCore::DragController::dragExited):
(WebCore::DragController::performDragOperation):
(WebCore::DragController::tryDHTMLDrag):
* page/mac/EventHandlerMac.mm:
(WebCore::EventHandler::createDraggingDataTransfer):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDataTransfercpp">trunk/Source/WebCore/dom/DataTransfer.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDataTransferh">trunk/Source/WebCore/dom/DataTransfer.h</a></li>
<li><a href="#trunkSourceWebCorepageDragControllercpp">trunk/Source/WebCore/page/DragController.cpp</a></li>
<li><a href="#trunkSourceWebCorepagemacEventHandlerMacmm">trunk/Source/WebCore/page/mac/EventHandlerMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212480 => 212481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-16 23:48:50 UTC (rev 212480)
+++ trunk/Source/WebCore/ChangeLog 2017-02-16 23:52:26 UTC (rev 212481)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2017-02-16 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Rename DataTransfer functions to indicate whether they are for dragging or dropping
+ https://bugs.webkit.org/show_bug.cgi?id=168478
+
+ Reviewed by Tim Horton.
+
+ * dom/DataTransfer.cpp:
+ (WebCore::DataTransfer::createForDrag):
+ (WebCore::DataTransfer::createForDrop):
+ (WebCore::DataTransfer::createForDragAndDrop): Deleted.
+ * dom/DataTransfer.h:
+ * page/DragController.cpp:
+ (WebCore::DragController::dragExited):
+ (WebCore::DragController::performDragOperation):
+ (WebCore::DragController::tryDHTMLDrag):
+ * page/mac/EventHandlerMac.mm:
+ (WebCore::EventHandler::createDraggingDataTransfer):
+
+2017-02-16 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Rename EventHandler::freeDataTransfer to invalidateDataTransfer
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=168472
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomDataTransfercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DataTransfer.cpp (212480 => 212481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DataTransfer.cpp 2017-02-16 23:48:50 UTC (rev 212480)
+++ trunk/Source/WebCore/dom/DataTransfer.cpp 2017-02-16 23:52:26 UTC (rev 212481)
</span><span class="lines">@@ -231,12 +231,12 @@
</span><span class="cx">
</span><span class="cx"> #else
</span><span class="cx">
</span><del>-Ref<DataTransfer> DataTransfer::createForDragAndDrop()
</del><ins>+Ref<DataTransfer> DataTransfer::createForDrag()
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new DataTransfer(DataTransferAccessPolicy::Writable, Pasteboard::createForDragAndDrop(), DragAndDrop));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<DataTransfer> DataTransfer::createForDragAndDrop(DataTransferAccessPolicy policy, const DragData& dragData)
</del><ins>+Ref<DataTransfer> DataTransfer::createForDrop(DataTransferAccessPolicy policy, const DragData& dragData)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new DataTransfer(policy, Pasteboard::createForDragAndDrop(dragData), DragAndDrop, dragData.containsFiles()));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomDataTransferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DataTransfer.h (212480 => 212481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DataTransfer.h 2017-02-16 23:48:50 UTC (rev 212480)
+++ trunk/Source/WebCore/dom/DataTransfer.h 2017-02-16 23:52:26 UTC (rev 212481)
</span><span class="lines">@@ -75,8 +75,8 @@
</span><span class="cx"> Pasteboard& pasteboard() { return *m_pasteboard; }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><del>- static Ref<DataTransfer> createForDragAndDrop();
- static Ref<DataTransfer> createForDragAndDrop(DataTransferAccessPolicy, const DragData&);
</del><ins>+ static Ref<DataTransfer> createForDrag();
+ static Ref<DataTransfer> createForDrop(DataTransferAccessPolicy, const DragData&);
</ins><span class="cx">
</span><span class="cx"> bool dropEffectIsUninitialized() const { return m_dropEffect == "uninitialized"; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageDragControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DragController.cpp (212480 => 212481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DragController.cpp 2017-02-16 23:48:50 UTC (rev 212480)
+++ trunk/Source/WebCore/page/DragController.cpp 2017-02-16 23:52:26 UTC (rev 212481)
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx"> #else
</span><span class="cx"> DataTransferAccessPolicy policy = DataTransferAccessPolicy::TypesReadable;
</span><span class="cx"> #endif
</span><del>- auto dataTransfer = DataTransfer::createForDragAndDrop(policy, dragData);
</del><ins>+ auto dataTransfer = DataTransfer::createForDrop(policy, dragData);
</ins><span class="cx"> dataTransfer->setSourceOperation(dragData.draggingSourceOperationMask());
</span><span class="cx"> m_page.mainFrame().eventHandler().cancelDragAndDrop(createMouseEvent(dragData), dataTransfer);
</span><span class="cx"> dataTransfer->setAccessPolicy(DataTransferAccessPolicy::Numb); // Invalidate dataTransfer here for security.
</span><span class="lines">@@ -231,7 +231,7 @@
</span><span class="cx"> bool preventedDefault = false;
</span><span class="cx"> if (mainFrame->view()) {
</span><span class="cx"> // Sending an event can result in the destruction of the view and part.
</span><del>- auto dataTransfer = DataTransfer::createForDragAndDrop(DataTransferAccessPolicy::Readable, dragData);
</del><ins>+ auto dataTransfer = DataTransfer::createForDrop(DataTransferAccessPolicy::Readable, dragData);
</ins><span class="cx"> dataTransfer->setSourceOperation(dragData.draggingSourceOperationMask());
</span><span class="cx"> preventedDefault = mainFrame->eventHandler().performDragAndDrop(createMouseEvent(dragData), dataTransfer);
</span><span class="cx"> dataTransfer->setAccessPolicy(DataTransferAccessPolicy::Numb); // Invalidate dataTransfer here for security.
</span><span class="lines">@@ -622,7 +622,7 @@
</span><span class="cx"> #else
</span><span class="cx"> DataTransferAccessPolicy policy = DataTransferAccessPolicy::TypesReadable;
</span><span class="cx"> #endif
</span><del>- auto dataTransfer = DataTransfer::createForDragAndDrop(policy, dragData);
</del><ins>+ auto dataTransfer = DataTransfer::createForDrop(policy, dragData);
</ins><span class="cx"> DragOperation srcOpMask = dragData.draggingSourceOperationMask();
</span><span class="cx"> dataTransfer->setSourceOperation(srcOpMask);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacEventHandlerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/EventHandlerMac.mm (212480 => 212481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2017-02-16 23:48:50 UTC (rev 212480)
+++ trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2017-02-16 23:52:26 UTC (rev 212481)
</span><span class="lines">@@ -729,7 +729,7 @@
</span><span class="cx"> auto pasteboard = std::make_unique<Pasteboard>(NSDragPboard);
</span><span class="cx"> #pragma clang diagnostic pop
</span><span class="cx"> pasteboard->clear();
</span><del>- return DataTransfer::createForDragAndDrop();
</del><ins>+ return DataTransfer::createForDrag();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>