<!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>[213903] trunk/Source/WebKit2</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/213903">213903</a></dd>
<dt>Author</dt> <dd>wenson_hsieh@apple.com</dd>
<dt>Date</dt> <dd>2017-03-14 10:01:58 -0700 (Tue, 14 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] Adopt updated data operation interfaces for data interaction
https://bugs.webkit.org/show_bug.cgi?id=169414
<rdar://problem/30948186>
Reviewed by Tim Horton.
Plumb additional information about the data interaction caret over to the UI process after handling a data
interaction action in the web process.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::didPerformDragControllerAction):
(WebKit::WebPageProxy::resetCurrentDragInformation):
* UIProcess/WebPageProxy.h:
(WebKit::WebPageProxy::currentDragCaretRect):
(WebKit::WebPageProxy::resetCurrentDragInformation): Deleted.
* UIProcess/WebPageProxy.messages.in:
* UIProcess/ios/WKContentViewInteraction.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::performDragControllerAction):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</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="#trunkSourceWebKit2UIProcessWebPageProxymessagesin">trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionh">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.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="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (213902 => 213903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-03-14 17:01:40 UTC (rev 213902)
+++ trunk/Source/WebKit2/ChangeLog 2017-03-14 17:01:58 UTC (rev 213903)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2017-03-14 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><ins>+ [WK2] Adopt updated data operation interfaces for data interaction
+ https://bugs.webkit.org/show_bug.cgi?id=169414
+ <rdar://problem/30948186>
+
+ Reviewed by Tim Horton.
+
+ Plumb additional information about the data interaction caret over to the UI process after handling a data
+ interaction action in the web process.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didPerformDragControllerAction):
+ (WebKit::WebPageProxy::resetCurrentDragInformation):
+ * UIProcess/WebPageProxy.h:
+ (WebKit::WebPageProxy::currentDragCaretRect):
+ (WebKit::WebPageProxy::resetCurrentDragInformation): Deleted.
+ * UIProcess/WebPageProxy.messages.in:
+ * UIProcess/ios/WKContentViewInteraction.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::performDragControllerAction):
+
+2017-03-14 Wenson Hsieh <wenson_hsieh@apple.com>
+
</ins><span class="cx"> [WK2] Data interaction tests occasionally hit assertions in debug builds
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=169002
</span><span class="cx"> <rdar://problem/30994806>
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (213902 => 213903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-03-14 17:01:40 UTC (rev 213902)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-03-14 17:01:58 UTC (rev 213903)
</span><span class="lines">@@ -1815,7 +1815,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::didPerformDragControllerAction(uint64_t dragOperation, bool mouseIsOverFileInput, unsigned numberOfItemsToBeAccepted)
</del><ins>+void WebPageProxy::didPerformDragControllerAction(uint64_t dragOperation, bool mouseIsOverFileInput, unsigned numberOfItemsToBeAccepted, const IntRect& insertionRect)
</ins><span class="cx"> {
</span><span class="cx"> MESSAGE_CHECK(dragOperation <= DragOperationDelete);
</span><span class="cx">
</span><span class="lines">@@ -1822,6 +1822,7 @@
</span><span class="cx"> m_currentDragOperation = static_cast<DragOperation>(dragOperation);
</span><span class="cx"> m_currentDragIsOverFileInput = mouseIsOverFileInput;
</span><span class="cx"> m_currentDragNumberOfFilesToBeAccepted = numberOfItemsToBeAccepted;
</span><ins>+ m_currentDragCaretRect = insertionRect;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><span class="lines">@@ -1846,6 +1847,14 @@
</span><span class="cx"> if (isValid())
</span><span class="cx"> m_process->send(Messages::WebPage::DragCancelled(), m_pageID);
</span><span class="cx"> }
</span><ins>+
+void WebPageProxy::resetCurrentDragInformation()
+{
+ m_currentDragOperation = WebCore::DragOperationNone;
+ m_currentDragIsOverFileInput = false;
+ m_currentDragNumberOfFilesToBeAccepted = 0;
+ m_currentDragCaretRect = { };
+}
</ins><span class="cx"> #endif // ENABLE(DRAG_SUPPORT)
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::handleMouseEvent(const NativeWebMouseEvent& event)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (213902 => 213903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2017-03-14 17:01:40 UTC (rev 213902)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2017-03-14 17:01:58 UTC (rev 213903)
</span><span class="lines">@@ -833,7 +833,7 @@
</span><span class="cx"> void dragExited(WebCore::DragData&, const String& dragStorageName = String());
</span><span class="cx"> void performDragOperation(WebCore::DragData&, const String& dragStorageName, const SandboxExtension::Handle&, const SandboxExtension::HandleArray&);
</span><span class="cx">
</span><del>- void didPerformDragControllerAction(uint64_t dragOperation, bool mouseIsOverFileInput, unsigned numberOfItemsToBeAccepted);
</del><ins>+ void didPerformDragControllerAction(uint64_t dragOperation, bool mouseIsOverFileInput, unsigned numberOfItemsToBeAccepted, const WebCore::IntRect& insertionRect);
</ins><span class="cx"> void dragEnded(const WebCore::IntPoint& clientPosition, const WebCore::IntPoint& globalPosition, uint64_t operation);
</span><span class="cx"> void dragCancelled();
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="lines">@@ -889,12 +889,8 @@
</span><span class="cx"> WebCore::DragOperation currentDragOperation() const { return m_currentDragOperation; }
</span><span class="cx"> bool currentDragIsOverFileInput() const { return m_currentDragIsOverFileInput; }
</span><span class="cx"> unsigned currentDragNumberOfFilesToBeAccepted() const { return m_currentDragNumberOfFilesToBeAccepted; }
</span><del>- void resetCurrentDragInformation()
- {
- m_currentDragOperation = WebCore::DragOperationNone;
- m_currentDragIsOverFileInput = false;
- m_currentDragNumberOfFilesToBeAccepted = 0;
- }
</del><ins>+ WebCore::IntRect currentDragCaretRect() const { return m_currentDragCaretRect; }
+ void resetCurrentDragInformation();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void preferencesDidChange();
</span><span class="lines">@@ -1873,6 +1869,7 @@
</span><span class="cx"> WebCore::DragOperation m_currentDragOperation;
</span><span class="cx"> bool m_currentDragIsOverFileInput;
</span><span class="cx"> unsigned m_currentDragNumberOfFilesToBeAccepted;
</span><ins>+ WebCore::IntRect m_currentDragCaretRect;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> PageLoadState m_pageLoadState;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (213902 => 213903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2017-03-14 17:01:40 UTC (rev 213902)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2017-03-14 17:01:58 UTC (rev 213903)
</span><span class="lines">@@ -295,7 +295,7 @@
</span><span class="cx">
</span><span class="cx"> # Drag and drop messages
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><del>- DidPerformDragControllerAction(uint64_t dragOperation, bool mouseIsOverFileInput, unsigned numberOfItemsToBeAccepted)
</del><ins>+ DidPerformDragControllerAction(uint64_t dragOperation, bool mouseIsOverFileInput, unsigned numberOfItemsToBeAccepted, WebCore::IntRect insertionRect)
</ins><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(COCOA) && ENABLE(DRAG_SUPPORT)
</span><span class="cx"> SetDragImage(WebCore::IntPoint clientPosition, WebKit::ShareableBitmap::Handle dragImage, std::optional<WebCore::TextIndicatorData> textIndicator, WebCore::FloatPoint dragImageAnchor, uint64_t action)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h (213902 => 213903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2017-03-14 17:01:40 UTC (rev 213902)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2017-03-14 17:01:58 UTC (rev 213903)
</span><span class="lines">@@ -195,6 +195,7 @@
</span><span class="cx"> BOOL _isPerformingDataInteractionOperation;
</span><span class="cx"> #if HAS_DATA_INTERACTION_SPI
</span><span class="cx"> RetainPtr<WKDataInteraction> _dataInteraction;
</span><ins>+ RetainPtr<WKDataOperation> _dataOperation;
</ins><span class="cx"> #endif
</span><span class="cx"> CGPoint _deferredActionSheetRequestLocation;
</span><span class="cx"> RetainPtr<UIView> _visibleContentViewSnapshot;
</span><span class="lines">@@ -207,11 +208,8 @@
</span><span class="cx">
</span><span class="cx"> @interface WKContentView (WKInteraction) <UIGestureRecognizerDelegate, UIWebTouchEventsGestureRecognizerDelegate, UITextInputPrivate, UIWebFormAccessoryDelegate, UIWKInteractionViewProtocol, WKFileUploadPanelDelegate, WKActionSheetAssistantDelegate
</span><span class="cx"> #if ENABLE(DATA_INTERACTION)
</span><del>- , WKDataInteractionItemVisualTarget, WKViewDataInteractionDestinationDelegate
-#if HAS_DATA_INTERACTION_SPI
- , WKDataInteractionDelegate
</del><ins>+ , WKDataInteractionDelegate, WKDataOperationDelegate
</ins><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx"> >
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, readonly) CGPoint lastInteractionLocation;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (213902 => 213903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2017-03-14 17:01:40 UTC (rev 213902)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2017-03-14 17:01:58 UTC (rev 213903)
</span><span class="lines">@@ -3463,7 +3463,7 @@
</span><span class="cx"> void WebPage::performDragControllerAction(uint64_t action, const IntPoint& clientPosition, const IntPoint& globalPosition, uint64_t draggingSourceOperationMask, WebSelectionData&& selection, uint32_t flags)
</span><span class="cx"> {
</span><span class="cx"> if (!m_page) {
</span><del>- send(Messages::WebPageProxy::DidPerformDragControllerAction(DragOperationNone, false, 0));
</del><ins>+ send(Messages::WebPageProxy::DidPerformDragControllerAction(DragOperationNone, false, 0, { }));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3471,12 +3471,12 @@
</span><span class="cx"> switch (action) {
</span><span class="cx"> case DragControllerActionEntered: {
</span><span class="cx"> DragOperation resolvedDragOperation = m_page->dragController().dragEntered(dragData);
</span><del>- send(Messages::WebPageProxy::DidPerformDragControllerAction(resolvedDragOperation, m_page->dragController().mouseIsOverFileInput(), m_page->dragController().numberOfItemsToBeAccepted()));
</del><ins>+ send(Messages::WebPageProxy::DidPerformDragControllerAction(resolvedDragOperation, m_page->dragController().mouseIsOverFileInput(), m_page->dragController().numberOfItemsToBeAccepted(), { }));
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case DragControllerActionUpdated: {
</span><span class="cx"> DragOperation resolvedDragOperation = m_page->dragController().dragEntered(dragData);
</span><del>- send(Messages::WebPageProxy::DidPerformDragControllerAction(resolvedDragOperation, m_page->dragController().mouseIsOverFileInput(), m_page->dragController().numberOfItemsToBeAccepted()));
</del><ins>+ send(Messages::WebPageProxy::DidPerformDragControllerAction(resolvedDragOperation, m_page->dragController().mouseIsOverFileInput(), m_page->dragController().numberOfItemsToBeAccepted(), { }));
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case DragControllerActionExited:
</span><span class="lines">@@ -3496,7 +3496,7 @@
</span><span class="cx"> void WebPage::performDragControllerAction(uint64_t action, const WebCore::DragData& dragData, const SandboxExtension::Handle& sandboxExtensionHandle, const SandboxExtension::HandleArray& sandboxExtensionsHandleArray)
</span><span class="cx"> {
</span><span class="cx"> if (!m_page) {
</span><del>- send(Messages::WebPageProxy::DidPerformDragControllerAction(DragOperationNone, false, 0));
</del><ins>+ send(Messages::WebPageProxy::DidPerformDragControllerAction(DragOperationNone, false, 0, { }));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3503,17 +3503,18 @@
</span><span class="cx"> switch (action) {
</span><span class="cx"> case DragControllerActionEntered: {
</span><span class="cx"> DragOperation resolvedDragOperation = m_page->dragController().dragEntered(dragData);
</span><del>- send(Messages::WebPageProxy::DidPerformDragControllerAction(resolvedDragOperation, m_page->dragController().mouseIsOverFileInput(), m_page->dragController().numberOfItemsToBeAccepted()));
</del><ins>+ send(Messages::WebPageProxy::DidPerformDragControllerAction(resolvedDragOperation, m_page->dragController().mouseIsOverFileInput(), m_page->dragController().numberOfItemsToBeAccepted(), m_page->dragCaretController().caretPosition().absoluteCaretBounds()));
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx"> case DragControllerActionUpdated: {
</span><span class="cx"> DragOperation resolvedDragOperation = m_page->dragController().dragUpdated(dragData);
</span><del>- send(Messages::WebPageProxy::DidPerformDragControllerAction(resolvedDragOperation, m_page->dragController().mouseIsOverFileInput(), m_page->dragController().numberOfItemsToBeAccepted()));
</del><ins>+ send(Messages::WebPageProxy::DidPerformDragControllerAction(resolvedDragOperation, m_page->dragController().mouseIsOverFileInput(), m_page->dragController().numberOfItemsToBeAccepted(), m_page->dragCaretController().caretPosition().absoluteCaretBounds()));
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case DragControllerActionExited:
</span><span class="cx"> m_page->dragController().dragExited(dragData);
</span><ins>+ send(Messages::WebPageProxy::DidPerformDragControllerAction(DragOperationNone, false, 0, { }));
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case DragControllerActionPerformDragOperation: {
</span></span></pre>
</div>
</div>
</body>
</html>