<!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>[167040] trunk/Source</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/167040">167040</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-04-09 15:24:42 -0700 (Wed, 09 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename some dragging functions
https://bugs.webkit.org/show_bug.cgi?id=131460
Reviewed by Tim Horton.
Source/WebCore:
Renamed performDrag to performDragOperation. This function is responsible for
accepting a drop, not for the whole drag.
The new name is not perfect either, but I think that it's better, and at least
it matches AppKit, like the other dragging destination functions already do.
* WebCore.exp.in:
* page/DragController.cpp:
(WebCore::DragController::performDragOperation):
(WebCore::DragController::performDrag): Deleted.
* page/DragController.h:
Source/WebKit/mac:
Renamed performDrag to performDragOperation.
* WebView/WebView.mm: (-[WebView performDragOperation:]):
Source/WebKit/win:
Renamed performDrag to performDragOperation.
* WebView.cpp: (WebView::Drop):
Source/WebKit2:
Renamed performDrag to performDragOperation.
Also renamed resetDragOperation to resetDragSession, because it's m_dragSession
that it resets.
* Shared/DragControllerAction.h:
* UIProcess/API/gtk/WebKitWebViewBase.cpp:
(webkitWebViewBaseDragDrop):
* UIProcess/API/mac/WKView.mm:
(-[WKView draggingEntered:]):
(-[WKView draggingExited:]):
(-[WKView performDragOperation:]):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::performDragOperation):
(WebKit::WebPageProxy::performDrag): Deleted.
* UIProcess/WebPageProxy.h:
(WebKit::WebPageProxy::resetDragSession):
(WebKit::WebPageProxy::resetDragOperation): Deleted.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::performDragControllerAction):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</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>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedDragControllerActionh">trunk/Source/WebKit2/Shared/DragControllerAction.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKViewmm">trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167039 => 167040)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-09 22:13:07 UTC (rev 167039)
+++ trunk/Source/WebCore/ChangeLog 2014-04-09 22:24:42 UTC (rev 167040)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-04-09 Alexey Proskuryakov <ap@apple.com>
+
+ Rename some dragging functions
+ https://bugs.webkit.org/show_bug.cgi?id=131460
+
+ Reviewed by Tim Horton.
+
+ Renamed performDrag to performDragOperation. This function is responsible for
+ accepting a drop, not for the whole drag.
+
+ The new name is not perfect either, but I think that it's better, and at least
+ it matches AppKit, like the other dragging destination functions already do.
+
+ * WebCore.exp.in:
+ * page/DragController.cpp:
+ (WebCore::DragController::performDragOperation):
+ (WebCore::DragController::performDrag): Deleted.
+ * page/DragController.h:
+
</ins><span class="cx"> 2014-04-08 Samuel White <samuel_white@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Initial text selection point should respect element focus.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (167039 => 167040)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-04-09 22:13:07 UTC (rev 167039)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-04-09 22:24:42 UTC (rev 167040)
</span><span class="lines">@@ -2913,8 +2913,8 @@
</span><span class="cx"> __ZN7WebCore14DragController10dragExitedERNS_8DragDataE
</span><span class="cx"> __ZN7WebCore14DragController11dragEnteredERNS_8DragDataE
</span><span class="cx"> __ZN7WebCore14DragController11dragUpdatedERNS_8DragDataE
</span><del>-__ZN7WebCore14DragController11performDragERNS_8DragDataE
</del><span class="cx"> __ZN7WebCore14DragController14placeDragCaretERKNS_8IntPointE
</span><ins>+__ZN7WebCore14DragController20performDragOperationERNS_8DragDataE
</ins><span class="cx"> __ZN7WebCore14DragController9dragEndedEv
</span><span class="cx"> __ZN7WebCore8DragDataC1ERKN3WTF6StringERKNS_8IntPointES7_NS_13DragOperationENS_20DragApplicationFlagsE
</span><span class="cx"> __ZNK7WebCore12EventHandler17eventMayStartDragERKNS_18PlatformMouseEventE
</span></span></pre></div>
<a id="trunkSourceWebCorepageDragControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DragController.cpp (167039 => 167040)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DragController.cpp 2014-04-09 22:13:07 UTC (rev 167039)
+++ trunk/Source/WebCore/page/DragController.cpp 2014-04-09 22:24:42 UTC (rev 167040)
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx"> return dragEnteredOrUpdated(dragData);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool DragController::performDrag(DragData& dragData)
</del><ins>+bool DragController::performDragOperation(DragData& dragData)
</ins><span class="cx"> {
</span><span class="cx"> m_documentUnderMouse = m_page.mainFrame().documentAtPoint(dragData.clientPosition());
</span><span class="cx"> if ((m_dragDestinationAction & DragDestinationActionDHTML) && m_documentIsHandlingDrag) {
</span></span></pre></div>
<a id="trunkSourceWebCorepageDragControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DragController.h (167039 => 167040)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DragController.h 2014-04-09 22:13:07 UTC (rev 167039)
+++ trunk/Source/WebCore/page/DragController.h 2014-04-09 22:24:42 UTC (rev 167040)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> DragSession dragEntered(DragData&);
</span><span class="cx"> void dragExited(DragData&);
</span><span class="cx"> DragSession dragUpdated(DragData&);
</span><del>- bool performDrag(DragData&);
</del><ins>+ bool performDragOperation(DragData&);
</ins><span class="cx">
</span><span class="cx"> // FIXME: It should be possible to remove a number of these accessors once all
</span><span class="cx"> // drag logic is in WebCore.
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (167039 => 167040)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-04-09 22:13:07 UTC (rev 167039)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-04-09 22:24:42 UTC (rev 167040)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-04-09 Alexey Proskuryakov <ap@apple.com>
+
+ Rename some dragging functions
+ https://bugs.webkit.org/show_bug.cgi?id=131460
+
+ Reviewed by Tim Horton.
+
+ Renamed performDrag to performDragOperation.
+
+ * WebView/WebView.mm: (-[WebView performDragOperation:]):
+
</ins><span class="cx"> 2014-04-08 Jon Lee <jonlee@apple.com>
</span><span class="cx">
</span><span class="cx"> Turn MSE on by default
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (167039 => 167040)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-04-09 22:13:07 UTC (rev 167039)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-04-09 22:24:42 UTC (rev 167040)
</span><span class="lines">@@ -6017,7 +6017,7 @@
</span><span class="cx"> IntPoint client([draggingInfo draggingLocation]);
</span><span class="cx"> IntPoint global(globalPoint([draggingInfo draggingLocation], [self window]));
</span><span class="cx"> DragData dragData(draggingInfo, client, global, static_cast<DragOperation>([draggingInfo draggingSourceOperationMask]), [self applicationFlags:draggingInfo]);
</span><del>- return core(self)->dragController().performDrag(dragData);
</del><ins>+ return core(self)->dragController().performDragOperation(dragData);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSView *)_hitTest:(NSPoint *)point dragTypes:(NSSet *)types
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (167039 => 167040)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2014-04-09 22:13:07 UTC (rev 167039)
+++ trunk/Source/WebKit/win/ChangeLog 2014-04-09 22:24:42 UTC (rev 167040)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-04-09 Alexey Proskuryakov <ap@apple.com>
+
+ Rename some dragging functions
+ https://bugs.webkit.org/show_bug.cgi?id=131460
+
+ Reviewed by Tim Horton.
+
+ Renamed performDrag to performDragOperation.
+
+ * WebView.cpp: (WebView::Drop):
+
</ins><span class="cx"> 2014-04-02 Mark Rowe <mrowe@apple.com>
</span><span class="cx">
</span><span class="cx"> Build fix after r166684.
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (167039 => 167040)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.cpp 2014-04-09 22:13:07 UTC (rev 167039)
+++ trunk/Source/WebKit/win/WebView.cpp 2014-04-09 22:24:42 UTC (rev 167040)
</span><span class="lines">@@ -5299,7 +5299,7 @@
</span><span class="cx"> ::ScreenToClient(m_viewWindow, (LPPOINT)&localpt);
</span><span class="cx"> DragData data(pDataObject, IntPoint(localpt.x, localpt.y),
</span><span class="cx"> IntPoint(pt.x, pt.y), keyStateToDragOperation(grfKeyState));
</span><del>- m_page->dragController().performDrag(data);
</del><ins>+ m_page->dragController().performDragOperation(data);
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (167039 => 167040)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-09 22:13:07 UTC (rev 167039)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-09 22:24:42 UTC (rev 167040)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-04-09 Alexey Proskuryakov <ap@apple.com>
+
+ Rename some dragging functions
+ https://bugs.webkit.org/show_bug.cgi?id=131460
+
+ Reviewed by Tim Horton.
+
+ Renamed performDrag to performDragOperation.
+
+ Also renamed resetDragOperation to resetDragSession, because it's m_dragSession
+ that it resets.
+
+ * Shared/DragControllerAction.h:
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ (webkitWebViewBaseDragDrop):
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView draggingEntered:]):
+ (-[WKView draggingExited:]):
+ (-[WKView performDragOperation:]):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::performDragOperation):
+ (WebKit::WebPageProxy::performDrag): Deleted.
+ * UIProcess/WebPageProxy.h:
+ (WebKit::WebPageProxy::resetDragSession):
+ (WebKit::WebPageProxy::resetDragOperation): Deleted.
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::performDragControllerAction):
+
</ins><span class="cx"> 2014-04-09 Gavin Barraclough <baraclough@apple.com>
</span><span class="cx">
</span><span class="cx"> Update SPI for managing tabs
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedDragControllerActionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/DragControllerAction.h (167039 => 167040)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/DragControllerAction.h 2014-04-09 22:13:07 UTC (rev 167039)
+++ trunk/Source/WebKit2/Shared/DragControllerAction.h 2014-04-09 22:24:42 UTC (rev 167040)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> DragControllerActionEntered,
</span><span class="cx"> DragControllerActionUpdated,
</span><span class="cx"> DragControllerActionExited,
</span><del>- DragControllerActionPerformDrag
</del><ins>+ DragControllerActionPerformDragOperation
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (167039 => 167040)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2014-04-09 22:13:07 UTC (rev 167039)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2014-04-09 22:24:42 UTC (rev 167040)
</span><span class="lines">@@ -856,7 +856,7 @@
</span><span class="cx"> DragData dragData(dataObject, position, convertWidgetPointToScreenPoint(widget, position), gdkDragActionToDragOperation(gdk_drag_context_get_actions(context)));
</span><span class="cx"> SandboxExtension::Handle handle;
</span><span class="cx"> SandboxExtension::HandleArray sandboxExtensionForUpload;
</span><del>- webViewBase->priv->pageProxy->performDrag(dragData, String(), handle, sandboxExtensionForUpload);
</del><ins>+ webViewBase->priv->pageProxy->performDragOperation(dragData, String(), handle, sandboxExtensionForUpload);
</ins><span class="cx"> gtk_drag_finish(context, TRUE, FALSE, time);
</span><span class="cx"> return TRUE;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (167039 => 167040)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-04-09 22:13:07 UTC (rev 167039)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-04-09 22:24:42 UTC (rev 167040)
</span><span class="lines">@@ -2237,7 +2237,7 @@
</span><span class="cx"> IntPoint global(globalPoint([draggingInfo draggingLocation], [self window]));
</span><span class="cx"> DragData dragData(draggingInfo, client, global, static_cast<DragOperation>([draggingInfo draggingSourceOperationMask]), [self applicationFlags:draggingInfo]);
</span><span class="cx">
</span><del>- _data->_page->resetDragOperation();
</del><ins>+ _data->_page->resetDragSession();
</ins><span class="cx"> _data->_page->dragEntered(dragData, [[draggingInfo draggingPasteboard] name]);
</span><span class="cx"> return NSDragOperationCopy;
</span><span class="cx"> }
</span><span class="lines">@@ -2269,7 +2269,7 @@
</span><span class="cx"> IntPoint global(globalPoint([draggingInfo draggingLocation], [self window]));
</span><span class="cx"> DragData dragData(draggingInfo, client, global, static_cast<DragOperation>([draggingInfo draggingSourceOperationMask]), [self applicationFlags:draggingInfo]);
</span><span class="cx"> _data->_page->dragExited(dragData, [[draggingInfo draggingPasteboard] name]);
</span><del>- _data->_page->resetDragOperation();
</del><ins>+ _data->_page->resetDragSession();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)prepareForDragOperation:(id <NSDraggingInfo>)draggingInfo
</span><span class="lines">@@ -2332,7 +2332,7 @@
</span><span class="cx"> SandboxExtension::HandleArray sandboxExtensionForUpload;
</span><span class="cx"> createSandboxExtensionsForFileUpload([draggingInfo draggingPasteboard], sandboxExtensionForUpload);
</span><span class="cx">
</span><del>- _data->_page->performDrag(dragData, [[draggingInfo draggingPasteboard] name], sandboxExtensionHandle, sandboxExtensionForUpload);
</del><ins>+ _data->_page->performDragOperation(dragData, [[draggingInfo draggingPasteboard] name], sandboxExtensionHandle, sandboxExtensionForUpload);
</ins><span class="cx">
</span><span class="cx"> return YES;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (167039 => 167040)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-04-09 22:13:07 UTC (rev 167039)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-04-09 22:24:42 UTC (rev 167040)
</span><span class="lines">@@ -1186,9 +1186,9 @@
</span><span class="cx"> performDragControllerAction(DragControllerActionExited, dragData, dragStorageName, sandboxExtensionHandle, sandboxExtensionHandleEmptyArray);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::performDrag(DragData& dragData, const String& dragStorageName, const SandboxExtension::Handle& sandboxExtensionHandle, const SandboxExtension::HandleArray& sandboxExtensionsForUpload)
</del><ins>+void WebPageProxy::performDragOperation(DragData& dragData, const String& dragStorageName, const SandboxExtension::Handle& sandboxExtensionHandle, const SandboxExtension::HandleArray& sandboxExtensionsForUpload)
</ins><span class="cx"> {
</span><del>- performDragControllerAction(DragControllerActionPerformDrag, dragData, dragStorageName, sandboxExtensionHandle, sandboxExtensionsForUpload);
</del><ins>+ performDragControllerAction(DragControllerActionPerformDragOperation, dragData, dragStorageName, sandboxExtensionHandle, sandboxExtensionsForUpload);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::performDragControllerAction(DragControllerAction action, DragData& dragData, const String& dragStorageName, const SandboxExtension::Handle& sandboxExtensionHandle, const SandboxExtension::HandleArray& sandboxExtensionsForUpload)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (167039 => 167040)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-04-09 22:13:07 UTC (rev 167039)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-04-09 22:24:42 UTC (rev 167040)
</span><span class="lines">@@ -849,7 +849,7 @@
</span><span class="cx"> void dragEntered(WebCore::DragData&, const String& dragStorageName = String());
</span><span class="cx"> void dragUpdated(WebCore::DragData&, const String& dragStorageName = String());
</span><span class="cx"> void dragExited(WebCore::DragData&, const String& dragStorageName = String());
</span><del>- void performDrag(WebCore::DragData&, const String& dragStorageName, const SandboxExtension::Handle&, const SandboxExtension::HandleArray&);
</del><ins>+ void performDragOperation(WebCore::DragData&, const String& dragStorageName, const SandboxExtension::Handle&, const SandboxExtension::HandleArray&);
</ins><span class="cx">
</span><span class="cx"> void didPerformDragControllerAction(WebCore::DragSession);
</span><span class="cx"> void dragEnded(const WebCore::IntPoint& clientPosition, const WebCore::IntPoint& globalPosition, uint64_t operation);
</span><span class="lines">@@ -902,7 +902,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><span class="cx"> WebCore::DragSession dragSession() const { return m_currentDragSession; }
</span><del>- void resetDragOperation() { m_currentDragSession = WebCore::DragSession(); }
</del><ins>+ void resetDragSession() { m_currentDragSession = WebCore::DragSession(); }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void preferencesDidChange();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (167039 => 167040)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-04-09 22:13:07 UTC (rev 167039)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-04-09 22:24:42 UTC (rev 167040)
</span><span class="lines">@@ -2759,8 +2759,8 @@
</span><span class="cx"> m_page->dragController().dragExited(dragData);
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- case DragControllerActionPerformDrag: {
- m_page->dragController().performDrag(dragData);
</del><ins>+ case DragControllerActionPerformDragOperation: {
+ m_page->dragController().performDragOperation(dragData);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2794,7 +2794,7 @@
</span><span class="cx"> m_page->dragController().dragExited(dragData);
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- case DragControllerActionPerformDrag: {
</del><ins>+ case DragControllerActionPerformDragOperation: {
</ins><span class="cx"> ASSERT(!m_pendingDropSandboxExtension);
</span><span class="cx">
</span><span class="cx"> m_pendingDropSandboxExtension = SandboxExtension::create(sandboxExtensionHandle);
</span><span class="lines">@@ -2803,7 +2803,7 @@
</span><span class="cx"> m_pendingDropExtensionsForFileUpload.append(extension);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_page->dragController().performDrag(dragData);
</del><ins>+ m_page->dragController().performDragOperation(dragData);
</ins><span class="cx">
</span><span class="cx"> // If we started loading a local file, the sandbox extension tracker would have adopted this
</span><span class="cx"> // pending drop sandbox extension. If not, we'll play it safe and clear it.
</span></span></pre>
</div>
</div>
</body>
</html>