<!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>[211192] 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/211192">211192</a></dd>
<dt>Author</dt> <dd>wenson_hsieh@apple.com</dd>
<dt>Date</dt> <dd>2017-01-25 18:01:29 -0800 (Wed, 25 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Refactor drag and drop implementation on Mac
https://bugs.webkit.org/show_bug.cgi?id=167427
Reviewed by Enrica Casucci.
Source/WebCore:
Refactors some code around drag and drop on Mac, and cleans up some other related code as needed. This patch
should result in no behavior change.
* dom/DataTransfer.cpp:
* page/EventHandler.cpp:
* page/ios/EventHandlerIOS.mm:
(WebCore::EventHandler::eventLoopHandleMouseDragged):
* page/mac/EventHandlerMac.mm:
* platform/DragImage.cpp:
* platform/Pasteboard.h:
* platform/ios/DragImageIOS.mm:
* platform/ios/PasteboardIOS.mm:
* platform/mac/DragDataMac.mm:
(rtfPasteboardType):
(rtfdPasteboardType):
(stringPasteboardType):
(urlPasteboardType):
(htmlPasteboardType):
(colorPasteboardType):
(pdfPasteboardType):
(tiffPasteboardType):
(WebCore::DragData::DragData):
(WebCore::DragData::containsColor):
(WebCore::DragData::containsFiles):
(WebCore::DragData::numberOfFiles):
(WebCore::DragData::asFilenames):
(WebCore::DragData::containsPlainText):
(WebCore::DragData::containsCompatibleContent):
(WebCore::DragData::containsPromise):
(WebCore::DragData::asURL):
* platform/mac/DragImageMac.mm:
Source/WebKit/mac:
Refactor some WebKit1 code on the Mac pertaining to drag and drop. See WebCore ChangeLog for more details.
* Misc/WebNSPasteboardExtras.h:
* WebCoreSupport/WebDragClient.mm:
* WebView/WebFrame.mm:
* WebView/WebFrameInternal.h:
* WebView/WebHTMLView.mm:
* WebView/WebView.mm:
(-[WebView initSimpleHTMLDocumentWithStyle:frame:preferences:groupName:]):
Source/WebKit2:
See WebCore ChangeLog for more details.
* Shared/WebCoreArgumentCoders.cpp:
(IPC::ArgumentCoder<DragData>::encode):
(IPC::ArgumentCoder<DragData>::decode):
* UIProcess/Cocoa/WebPageProxyCocoa.mm:
* WebProcess/WebCoreSupport/mac/WebDragClientMac.mm:</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="#trunkSourceWebCorepageEventHandlercpp">trunk/Source/WebCore/page/EventHandler.cpp</a></li>
<li><a href="#trunkSourceWebCorepageEventHandlerh">trunk/Source/WebCore/page/EventHandler.h</a></li>
<li><a href="#trunkSourceWebCorepageiosEventHandlerIOSmm">trunk/Source/WebCore/page/ios/EventHandlerIOS.mm</a></li>
<li><a href="#trunkSourceWebCorepagemacEventHandlerMacmm">trunk/Source/WebCore/page/mac/EventHandlerMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformDragImagecpp">trunk/Source/WebCore/platform/DragImage.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformPasteboardh">trunk/Source/WebCore/platform/Pasteboard.h</a></li>
<li><a href="#trunkSourceWebCoreplatformiosDragImageIOSmm">trunk/Source/WebCore/platform/ios/DragImageIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosPasteboardIOSmm">trunk/Source/WebCore/platform/ios/PasteboardIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacDragDataMacmm">trunk/Source/WebCore/platform/mac/DragDataMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacDragImageMacmm">trunk/Source/WebCore/platform/mac/DragImageMac.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebDragClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebDragClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFramemm">trunk/Source/WebKit/mac/WebView/WebFrame.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFrameInternalh">trunk/Source/WebKit/mac/WebView/WebFrameInternal.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewmm">trunk/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCoreArgumentCoderscpp">trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebPageProxyCocoamm">trunk/Source/WebKit2/UIProcess/Cocoa/WebPageProxyCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportmacWebDragClientMacmm">trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211191 => 211192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-26 01:43:44 UTC (rev 211191)
+++ trunk/Source/WebCore/ChangeLog 2017-01-26 02:01:29 UTC (rev 211192)
</span><span class="lines">@@ -1,3 +1,42 @@
</span><ins>+2017-01-25 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ Refactor drag and drop implementation on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=167427
+
+ Reviewed by Enrica Casucci.
+
+ Refactors some code around drag and drop on Mac, and cleans up some other related code as needed. This patch
+ should result in no behavior change.
+
+ * dom/DataTransfer.cpp:
+ * page/EventHandler.cpp:
+ * page/ios/EventHandlerIOS.mm:
+ (WebCore::EventHandler::eventLoopHandleMouseDragged):
+ * page/mac/EventHandlerMac.mm:
+ * platform/DragImage.cpp:
+ * platform/Pasteboard.h:
+ * platform/ios/DragImageIOS.mm:
+ * platform/ios/PasteboardIOS.mm:
+ * platform/mac/DragDataMac.mm:
+ (rtfPasteboardType):
+ (rtfdPasteboardType):
+ (stringPasteboardType):
+ (urlPasteboardType):
+ (htmlPasteboardType):
+ (colorPasteboardType):
+ (pdfPasteboardType):
+ (tiffPasteboardType):
+ (WebCore::DragData::DragData):
+ (WebCore::DragData::containsColor):
+ (WebCore::DragData::containsFiles):
+ (WebCore::DragData::numberOfFiles):
+ (WebCore::DragData::asFilenames):
+ (WebCore::DragData::containsPlainText):
+ (WebCore::DragData::containsCompatibleContent):
+ (WebCore::DragData::containsPromise):
+ (WebCore::DragData::asURL):
+ * platform/mac/DragImageMac.mm:
+
</ins><span class="cx"> 2017-01-25 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> [WebRTC] Add support for incoming and outgoing libwebrtc audio tracks
</span></span></pre></div>
<a id="trunkSourceWebCoredomDataTransfercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DataTransfer.cpp (211191 => 211192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DataTransfer.cpp 2017-01-26 01:43:44 UTC (rev 211191)
+++ trunk/Source/WebCore/dom/DataTransfer.cpp 2017-01-26 02:01:29 UTC (rev 211192)
</span><span class="lines">@@ -290,7 +290,7 @@
</span><span class="cx"> m_pasteboard->setDragImage(computedImage, computedHotSpot);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(COCOA)
</del><ins>+#if !PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> DragImageRef DataTransfer::createDragImage(IntPoint& location) const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.cpp (211191 => 211192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.cpp 2017-01-26 01:43:44 UTC (rev 211191)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2017-01-26 02:01:29 UTC (rev 211192)
</span><span class="lines">@@ -131,6 +131,9 @@
</span><span class="cx"> const int ImageDragHysteresis = 5;
</span><span class="cx"> const int TextDragHysteresis = 3;
</span><span class="cx"> const int GeneralDragHysteresis = 3;
</span><ins>+#if PLATFORM(COCOA)
+const double EventHandler::TextDragDelay = 0.15;
+#endif
</ins><span class="cx"> #endif // ENABLE(DRAG_SUPPORT)
</span><span class="cx">
</span><span class="cx"> #if ENABLE(IOS_GESTURE_EVENTS) || ENABLE(MAC_GESTURE_EVENTS)
</span><span class="lines">@@ -806,7 +809,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><del>-bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& event)
</del><ins>+bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& event, CheckDragHysteresis checkDragHysteresis)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_mousePressed)
</span><span class="cx"> return false;
</span><span class="lines">@@ -813,7 +816,7 @@
</span><span class="cx">
</span><span class="cx"> Ref<Frame> protectedFrame(m_frame);
</span><span class="cx">
</span><del>- if (handleDrag(event, ShouldCheckDragHysteresis))
</del><ins>+ if (handleDrag(event, checkDragHysteresis))
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> Node* targetNode = event.targetNode();
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.h (211191 => 211192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.h 2017-01-26 01:43:44 UTC (rev 211191)
+++ trunk/Source/WebCore/page/EventHandler.h 2017-01-26 02:01:29 UTC (rev 211192)
</span><span class="lines">@@ -338,7 +338,7 @@
</span><span class="cx"> bool handleMousePressEventTripleClick(const MouseEventWithHitTestResults&);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><del>- bool handleMouseDraggedEvent(const MouseEventWithHitTestResults&);
</del><ins>+ bool handleMouseDraggedEvent(const MouseEventWithHitTestResults&, CheckDragHysteresis = ShouldCheckDragHysteresis);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT bool handleMouseReleaseEvent(const MouseEventWithHitTestResults&);
</span></span></pre></div>
<a id="trunkSourceWebCorepageiosEventHandlerIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ios/EventHandlerIOS.mm (211191 => 211192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ios/EventHandlerIOS.mm 2017-01-26 01:43:44 UTC (rev 211191)
+++ trunk/Source/WebCore/page/ios/EventHandlerIOS.mm 2017-01-26 02:01:29 UTC (rev 211192)
</span><span class="lines">@@ -49,6 +49,10 @@
</span><span class="cx"> #import <WebKitAdditions/EventHandlerIOSTouch.cpp>
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/EventHandlerAdditions.mm>)
+#import <WebKitAdditions/EventHandlerAdditions.mm>
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> static RetainPtr<WebEvent>& currentEventSlot()
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacEventHandlerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/EventHandlerMac.mm (211191 => 211192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2017-01-26 01:43:44 UTC (rev 211191)
+++ trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2017-01-26 02:01:29 UTC (rev 211192)
</span><span class="lines">@@ -74,10 +74,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-#if ENABLE(DRAG_SUPPORT)
-const double EventHandler::TextDragDelay = 0.15;
-#endif
-
</del><span class="cx"> const double resetLatchedStateTimeout = 0.1;
</span><span class="cx">
</span><span class="cx"> static RetainPtr<NSEvent>& currentNSEventSlot()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformDragImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/DragImage.cpp (211191 => 211192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/DragImage.cpp 2017-01-26 01:43:44 UTC (rev 211191)
+++ trunk/Source/WebCore/platform/DragImage.cpp 2017-01-26 02:01:29 UTC (rev 211192)
</span><span class="lines">@@ -120,6 +120,8 @@
</span><span class="cx"> return createDragImageFromSnapshot(snapshotNode(frame, node), &node);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if !ENABLE(DATA_INTERACTION)
+
</ins><span class="cx"> DragImageRef createDragImageForSelection(Frame& frame, bool forceBlackText)
</span><span class="cx"> {
</span><span class="cx"> SnapshotOptions options = forceBlackText ? SnapshotOptionsForceBlackText : SnapshotOptionsNone;
</span><span class="lines">@@ -126,6 +128,8 @@
</span><span class="cx"> return createDragImageFromSnapshot(snapshotSelection(frame, options), nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#endif
+
</ins><span class="cx"> struct ScopedFrameSelectionState {
</span><span class="cx"> ScopedFrameSelectionState(Frame& frame)
</span><span class="cx"> : frame(frame)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPasteboardh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Pasteboard.h (211191 => 211192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Pasteboard.h 2017-01-26 01:43:44 UTC (rev 211191)
+++ trunk/Source/WebCore/platform/Pasteboard.h 2017-01-26 02:01:29 UTC (rev 211192)
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx">
</span><span class="cx"> struct PasteboardPlainText {
</span><span class="cx"> String text;
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> bool isURL;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="lines">@@ -179,8 +179,8 @@
</span><span class="cx"> virtual void writePasteboard(const Pasteboard& sourcePasteboard);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><del>- static std::unique_ptr<Pasteboard> createForDragAndDrop();
- static std::unique_ptr<Pasteboard> createForDragAndDrop(const DragData&);
</del><ins>+ WEBCORE_EXPORT static std::unique_ptr<Pasteboard> createForDragAndDrop();
+ WEBCORE_EXPORT static std::unique_ptr<Pasteboard> createForDragAndDrop(const DragData&);
</ins><span class="cx">
</span><span class="cx"> virtual void setDragImage(DragImageRef, const IntPoint& hotSpot);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosDragImageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/DragImageIOS.mm (211191 => 211192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/DragImageIOS.mm 2017-01-26 01:43:44 UTC (rev 211191)
+++ trunk/Source/WebCore/platform/ios/DragImageIOS.mm 2017-01-26 02:01:29 UTC (rev 211192)
</span><span class="lines">@@ -28,6 +28,12 @@
</span><span class="cx">
</span><span class="cx"> #import <CoreGraphics/CoreGraphics.h>
</span><span class="cx">
</span><ins>+#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/DragImageAdditions.mm>)
+
+#import <WebKitAdditions/DragImageAdditions.mm>
+
+#else
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> // FIXME: fix signature of dragImageSize() to avoid copying the argument.
</span><span class="lines">@@ -49,3 +55,5 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><ins>+
+#endif // USE(APPLE_INTERNAL_SDK)
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformiosPasteboardIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/PasteboardIOS.mm (211191 => 211192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/PasteboardIOS.mm 2017-01-26 01:43:44 UTC (rev 211191)
+++ trunk/Source/WebCore/platform/ios/PasteboardIOS.mm 2017-01-26 02:01:29 UTC (rev 211192)
</span><span class="lines">@@ -58,6 +58,10 @@
</span><span class="cx"> - (BOOL)containsAttachments;
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/PasteboardAdditions.mm>)
+#import <WebKitAdditions/PasteboardAdditions.mm>
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> // FIXME: Does this need to be declared in the header file?
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacDragDataMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/DragDataMac.mm (211191 => 211192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/DragDataMac.mm 2017-01-26 01:43:44 UTC (rev 211191)
+++ trunk/Source/WebCore/platform/mac/DragDataMac.mm 2017-01-26 02:01:29 UTC (rev 211192)
</span><span class="lines">@@ -33,6 +33,54 @@
</span><span class="cx"> #import "PlatformStrategies.h"
</span><span class="cx"> #import "WebCoreNSURLExtras.h"
</span><span class="cx">
</span><ins>+#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/DragDataAdditions.mm>)
+
+#import <WebKitAdditions/DragDataAdditions.mm>
+
+#else
+
+static inline String rtfPasteboardType()
+{
+ return String(NSRTFPboardType);
+}
+
+static inline String rtfdPasteboardType()
+{
+ return String(NSRTFDPboardType);
+}
+
+static inline String stringPasteboardType()
+{
+ return String(NSStringPboardType);
+}
+
+static inline String urlPasteboardType()
+{
+ return String(NSURLPboardType);
+}
+
+static inline String htmlPasteboardType()
+{
+ return String(NSHTMLPboardType);
+}
+
+static inline String colorPasteboardType()
+{
+ return String(NSColorPboardType);
+}
+
+static inline String pdfPasteboardType()
+{
+ return String(NSPDFPboardType);
+}
+
+static inline String tiffPasteboardType()
+{
+ return String(NSTIFFPboardType);
+}
+
+#endif // USE(APPLE_INTERNAL_SDK)
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> DragData::DragData(DragDataRef data, const IntPoint& clientPosition, const IntPoint& globalPosition,
</span><span class="lines">@@ -42,7 +90,11 @@
</span><span class="cx"> , m_platformDragData(data)
</span><span class="cx"> , m_draggingSourceOperationMask(sourceOperationMask)
</span><span class="cx"> , m_applicationFlags(flags)
</span><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> , m_pasteboardName([[m_platformDragData draggingPasteboard] name])
</span><ins>+#else
+ , m_pasteboardName("data interaction pasteboard")
+#endif
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -66,30 +118,40 @@
</span><span class="cx"> {
</span><span class="cx"> Vector<String> types;
</span><span class="cx"> platformStrategies()->pasteboardStrategy()->getTypes(types, m_pasteboardName);
</span><del>- return types.contains(String(NSColorPboardType));
</del><ins>+ return types.contains(colorPasteboardType());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool DragData::containsFiles() const
</span><span class="cx"> {
</span><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> Vector<String> types;
</span><span class="cx"> platformStrategies()->pasteboardStrategy()->getTypes(types, m_pasteboardName);
</span><span class="cx"> return types.contains(String(NSFilenamesPboardType)) || types.contains(String(NSFilesPromisePboardType));
</span><ins>+#else
+ return false;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned DragData::numberOfFiles() const
</span><span class="cx"> {
</span><span class="cx"> Vector<String> files;
</span><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> platformStrategies()->pasteboardStrategy()->getPathnamesForType(files, String(NSFilenamesPboardType), m_pasteboardName);
</span><span class="cx"> if (!files.size())
</span><span class="cx"> platformStrategies()->pasteboardStrategy()->getPathnamesForType(files, String(NSFilesPromisePboardType), m_pasteboardName);
</span><ins>+#endif
</ins><span class="cx"> return files.size();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DragData::asFilenames(Vector<String>& result) const
</span><span class="cx"> {
</span><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> platformStrategies()->pasteboardStrategy()->getPathnamesForType(result, String(NSFilenamesPboardType), m_pasteboardName);
</span><span class="cx"> if (!result.size())
</span><span class="cx"> result = fileNames();
</span><ins>+#else
+ UNUSED_PARAM(result);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool DragData::containsPlainText() const
</span><span class="lines">@@ -97,11 +159,13 @@
</span><span class="cx"> Vector<String> types;
</span><span class="cx"> platformStrategies()->pasteboardStrategy()->getTypes(types, m_pasteboardName);
</span><span class="cx">
</span><del>- return types.contains(String(NSStringPboardType))
- || types.contains(String(NSRTFDPboardType))
- || types.contains(String(NSRTFPboardType))
</del><ins>+ return types.contains(stringPasteboardType())
+ || types.contains(rtfdPasteboardType())
+ || types.contains(rtfPasteboardType())
+#if PLATFORM(MAC)
</ins><span class="cx"> || types.contains(String(NSFilenamesPboardType))
</span><del>- || platformStrategies()->pasteboardStrategy()->stringForType(String(NSURLPboardType), m_pasteboardName).length();
</del><ins>+#endif
+ || platformStrategies()->pasteboardStrategy()->stringForType(urlPasteboardType(), m_pasteboardName).length();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String DragData::asPlainText() const
</span><span class="lines">@@ -130,16 +194,18 @@
</span><span class="cx"> Vector<String> types;
</span><span class="cx"> platformStrategies()->pasteboardStrategy()->getTypes(types, m_pasteboardName);
</span><span class="cx"> return types.contains(String(WebArchivePboardType))
</span><del>- || types.contains(String(NSHTMLPboardType))
</del><ins>+ || types.contains(htmlPasteboardType())
+#if PLATFORM(MAC)
</ins><span class="cx"> || types.contains(String(NSFilenamesPboardType))
</span><span class="cx"> || types.contains(String(NSFilesPromisePboardType))
</span><del>- || types.contains(String(NSTIFFPboardType))
- || types.contains(String(NSPDFPboardType))
- || types.contains(String(NSURLPboardType))
- || types.contains(String(NSRTFDPboardType))
- || types.contains(String(NSRTFPboardType))
- || types.contains(String(NSStringPboardType))
- || types.contains(String(NSColorPboardType))
</del><ins>+#endif
+ || types.contains(tiffPasteboardType())
+ || types.contains(pdfPasteboardType())
+ || types.contains(urlPasteboardType())
+ || types.contains(rtfdPasteboardType())
+ || types.contains(rtfPasteboardType())
+ || types.contains(stringPasteboardType())
+ || types.contains(colorPasteboardType())
</ins><span class="cx"> || types.contains(String(kUTTypePNG));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -146,7 +212,9 @@
</span><span class="cx"> bool DragData::containsPromise() const
</span><span class="cx"> {
</span><span class="cx"> Vector<String> files;
</span><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> platformStrategies()->pasteboardStrategy()->getPathnamesForType(files, String(NSFilesPromisePboardType), m_pasteboardName);
</span><ins>+#endif
</ins><span class="cx"> return files.size() == 1;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -160,16 +228,18 @@
</span><span class="cx"> // FIXME: Use filenamePolicy.
</span><span class="cx">
</span><span class="cx"> if (title) {
</span><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> String URLTitleString = platformStrategies()->pasteboardStrategy()->stringForType(String(WebURLNamePboardType), m_pasteboardName);
</span><span class="cx"> if (!URLTitleString.isEmpty())
</span><span class="cx"> *title = URLTitleString;
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Vector<String> types;
</span><span class="cx"> platformStrategies()->pasteboardStrategy()->getTypes(types, m_pasteboardName);
</span><span class="cx">
</span><del>- if (types.contains(String(NSURLPboardType))) {
- NSURL *URLFromPasteboard = [NSURL URLWithString:platformStrategies()->pasteboardStrategy()->stringForType(String(NSURLPboardType), m_pasteboardName)];
</del><ins>+ if (types.contains(urlPasteboardType())) {
+ NSURL *URLFromPasteboard = [NSURL URLWithString:platformStrategies()->pasteboardStrategy()->stringForType(urlPasteboardType(), m_pasteboardName)];
</ins><span class="cx"> NSString *scheme = [URLFromPasteboard scheme];
</span><span class="cx"> // Cannot drop other schemes unless <rdar://problem/10562662> and <rdar://problem/11187315> are fixed.
</span><span class="cx"> if ([scheme isEqualToString:@"http"] || [scheme isEqualToString:@"https"])
</span><span class="lines">@@ -176,8 +246,8 @@
</span><span class="cx"> return [URLByCanonicalizingURL(URLFromPasteboard) absoluteString];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (types.contains(String(NSStringPboardType))) {
- NSURL *URLFromPasteboard = [NSURL URLWithString:platformStrategies()->pasteboardStrategy()->stringForType(String(NSStringPboardType), m_pasteboardName)];
</del><ins>+ if (types.contains(stringPasteboardType())) {
+ NSURL *URLFromPasteboard = [NSURL URLWithString:platformStrategies()->pasteboardStrategy()->stringForType(stringPasteboardType(), m_pasteboardName)];
</ins><span class="cx"> NSString *scheme = [URLFromPasteboard scheme];
</span><span class="cx"> // Pasteboard content is not trusted, because JavaScript code can modify it. We can sanitize it for URLs and other typed content, but not for strings.
</span><span class="cx"> // The result of this function is used to initiate navigation, so we shouldn't allow arbitrary file URLs.
</span><span class="lines">@@ -186,6 +256,7 @@
</span><span class="cx"> return [URLByCanonicalizingURL(URLFromPasteboard) absoluteString];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> if (types.contains(String(NSFilenamesPboardType))) {
</span><span class="cx"> Vector<String> files;
</span><span class="cx"> platformStrategies()->pasteboardStrategy()->getPathnamesForType(files, String(NSFilenamesPboardType), m_pasteboardName);
</span><span class="lines">@@ -199,6 +270,7 @@
</span><span class="cx">
</span><span class="cx"> if (types.contains(String(NSFilesPromisePboardType)) && fileNames().size() == 1)
</span><span class="cx"> return [URLByCanonicalizingURL([NSURL fileURLWithPath:fileNames()[0]]) absoluteString];
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> return String();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacDragImageMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/DragImageMac.mm (211191 => 211192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/DragImageMac.mm 2017-01-26 01:43:44 UTC (rev 211191)
+++ trunk/Source/WebCore/platform/mac/DragImageMac.mm 2017-01-26 02:01:29 UTC (rev 211192)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "DragImage.h"
</span><span class="cx">
</span><del>-#if ENABLE(DRAG_SUPPORT)
</del><ins>+#if ENABLE(DRAG_SUPPORT) && PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> #import "BitmapImage.h"
</span><span class="cx"> #import "CoreGraphicsSPI.h"
</span><span class="lines">@@ -348,4 +348,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(DRAG_SUPPORT)
</del><ins>+#endif // ENABLE(DRAG_SUPPORT) && PLATFORM(MAC)
</ins></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (211191 => 211192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2017-01-26 01:43:44 UTC (rev 211191)
+++ trunk/Source/WebKit/mac/ChangeLog 2017-01-26 02:01:29 UTC (rev 211192)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2017-01-25 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ Refactor drag and drop implementation on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=167427
+
+ Reviewed by Enrica Casucci.
+
+ Refactor some WebKit1 code on the Mac pertaining to drag and drop. See WebCore ChangeLog for more details.
+
+ * Misc/WebNSPasteboardExtras.h:
+ * WebCoreSupport/WebDragClient.mm:
+ * WebView/WebFrame.mm:
+ * WebView/WebFrameInternal.h:
+ * WebView/WebHTMLView.mm:
+ * WebView/WebView.mm:
+ (-[WebView initSimpleHTMLDocumentWithStyle:frame:preferences:groupName:]):
+
</ins><span class="cx"> 2017-01-24 Youenn Fablet <youennf@gmail.com>
</span><span class="cx">
</span><span class="cx"> [WebRTC] Introduce libwebrtc abstraction for WK1/WK2 implementations
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebDragClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebDragClient.mm (211191 => 211192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebDragClient.mm 2017-01-26 01:43:44 UTC (rev 211191)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebDragClient.mm 2017-01-26 02:01:29 UTC (rev 211192)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #import "WebDragClient.h"
</span><span class="cx">
</span><del>-#if ENABLE(DRAG_SUPPORT)
</del><ins>+#if ENABLE(DRAG_SUPPORT) && PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> #import "DOMElementInternal.h"
</span><span class="cx"> #import "WebArchive.h"
</span><span class="lines">@@ -143,4 +143,4 @@
</span><span class="cx"> delete this;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // ENABLE(DRAG_SUPPORT)
</del><ins>+#endif // ENABLE(DRAG_SUPPORT) && PLATFORM(MAC)
</ins></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFramemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrame.mm (211191 => 211192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrame.mm 2017-01-26 01:43:44 UTC (rev 211191)
+++ trunk/Source/WebKit/mac/WebView/WebFrame.mm 2017-01-26 02:01:29 UTC (rev 211192)
</span><span class="lines">@@ -933,7 +933,7 @@
</span><span class="cx"> _private->coreFrame->editor().computeAndSetTypingStyle(properties.get(), undoAction);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(DRAG_SUPPORT)
</del><ins>+#if ENABLE(DRAG_SUPPORT) && PLATFORM(MAC)
</ins><span class="cx"> - (void)_dragSourceEndedAt:(NSPoint)windowLoc operation:(NSDragOperation)operation
</span><span class="cx"> {
</span><span class="cx"> if (!_private->coreFrame)
</span><span class="lines">@@ -946,7 +946,7 @@
</span><span class="cx"> LeftButton, PlatformEvent::MouseMoved, 0, false, false, false, false, currentTime(), WebCore::ForceAtClick, WebCore::NoTap);
</span><span class="cx"> _private->coreFrame->eventHandler().dragSourceEndedAt(event, (DragOperation)operation);
</span><span class="cx"> }
</span><del>-#endif
</del><ins>+#endif // ENABLE(DRAG_SUPPORT) && PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> - (BOOL)_canProvideDocumentSource
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFrameInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrameInternal.h (211191 => 211192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrameInternal.h 2017-01-26 01:43:44 UTC (rev 211191)
+++ trunk/Source/WebKit/mac/WebView/WebFrameInternal.h 2017-01-26 02:01:29 UTC (rev 211192)
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx"> - (DOMCSSStyleDeclaration *)_typingStyle;
</span><span class="cx"> - (void)_setTypingStyle:(DOMCSSStyleDeclaration *)style withUndoAction:(WebCore::EditAction)undoAction;
</span><span class="cx">
</span><del>-#if ENABLE(DRAG_SUPPORT)
</del><ins>+#if ENABLE(DRAG_SUPPORT) && PLATFORM(MAC)
</ins><span class="cx"> - (void)_dragSourceEndedAt:(NSPoint)windowLoc operation:(NSDragOperation)operation;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (211191 => 211192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2017-01-26 01:43:44 UTC (rev 211191)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2017-01-26 02:01:29 UTC (rev 211192)
</span><span class="lines">@@ -4544,7 +4544,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(DRAG_SUPPORT)
</del><ins>+#if ENABLE(DRAG_SUPPORT) && PLATFORM(MAC)
</ins><span class="cx"> - (void)dragImage:(NSImage *)dragImage
</span><span class="cx"> at:(NSPoint)at
</span><span class="cx"> offset:(NSSize)offset
</span><span class="lines">@@ -4688,7 +4688,7 @@
</span><span class="cx">
</span><span class="cx"> return [NSArray arrayWithObject:[path lastPathComponent]];
</span><span class="cx"> }
</span><del>-#endif
</del><ins>+#endif // ENABLE(DRAG_SUPPORT) && PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> - (void)mouseUp:(NSEvent *)event
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (211191 => 211192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2017-01-26 01:43:44 UTC (rev 211191)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2017-01-26 02:01:29 UTC (rev 211192)
</span><span class="lines">@@ -1608,7 +1608,7 @@
</span><span class="cx"> makeUniqueRef<WebCore::LibWebRTCProvider>()
</span><span class="cx"> );
</span><span class="cx"> pageConfiguration.chromeClient = new WebChromeClientIOS(self);
</span><del>-#if ENABLE(DRAG_SUPPORT)
</del><ins>+#if ENABLE(DRAG_SUPPORT) && PLATFORM(MAC)
</ins><span class="cx"> pageConfiguration.dragClient = new WebDragClient(self);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -6475,7 +6475,7 @@
</span><span class="cx"> return [self _elementAtWindowPoint:[self convertPoint:point toView:nil]];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(DRAG_SUPPORT)
</del><ins>+#if ENABLE(DRAG_SUPPORT) && PLATFORM(MAC)
</ins><span class="cx"> // The following 2 internal NSView methods are called on the drag destination to make scrolling while dragging work.
</span><span class="cx"> // Scrolling while dragging will only work if the drag destination is in a scroll view. The WebView is the drag destination.
</span><span class="cx"> // When dragging to a WebView, the document subview should scroll, but it doesn't because it is not the drag destination.
</span><span class="lines">@@ -6596,7 +6596,7 @@
</span><span class="cx"> return self;
</span><span class="cx"> return hitView;
</span><span class="cx"> }
</span><del>-#endif
</del><ins>+#endif // ENABLE(DRAG_SUPPORT) && PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> - (BOOL)acceptsFirstResponder
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (211191 => 211192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-01-26 01:43:44 UTC (rev 211191)
+++ trunk/Source/WebKit2/ChangeLog 2017-01-26 02:01:29 UTC (rev 211192)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-01-25 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ Refactor drag and drop implementation on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=167427
+
+ Reviewed by Enrica Casucci.
+
+ See WebCore ChangeLog for more details.
+
+ * Shared/WebCoreArgumentCoders.cpp:
+ (IPC::ArgumentCoder<DragData>::encode):
+ (IPC::ArgumentCoder<DragData>::decode):
+ * UIProcess/Cocoa/WebPageProxyCocoa.mm:
+ * WebProcess/WebCoreSupport/mac/WebDragClientMac.mm:
+
</ins><span class="cx"> 2017-01-25 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> Use #pragma once in a few places
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCoreArgumentCoderscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp (211191 => 211192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2017-01-26 01:43:44 UTC (rev 211191)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2017-01-26 02:01:29 UTC (rev 211192)
</span><span class="lines">@@ -1223,8 +1223,10 @@
</span><span class="cx"> encoder << dragData.globalPosition();
</span><span class="cx"> encoder.encodeEnum(dragData.draggingSourceOperationMask());
</span><span class="cx"> encoder.encodeEnum(dragData.flags());
</span><ins>+#if PLATFORM(COCOA)
+ encoder << dragData.pasteboardName();
+#endif
</ins><span class="cx"> #if PLATFORM(MAC)
</span><del>- encoder << dragData.pasteboardName();
</del><span class="cx"> encoder << dragData.fileNames();
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -1248,13 +1250,15 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> String pasteboardName;
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> if (!decoder.decode(pasteboardName))
</span><span class="cx"> return false;
</span><span class="cx"> #endif
</span><span class="cx"> Vector<String> fileNames;
</span><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> if (!decoder.decode(fileNames))
</span><span class="cx"> return false;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> dragData = DragData(pasteboardName, clientPosition, globalPosition, draggingSourceOperationMask, applicationFlags);
</span><span class="cx"> dragData.setFileNames(fileNames);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebPageProxyCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebPageProxyCocoa.mm (211191 => 211192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebPageProxyCocoa.mm 2017-01-26 01:43:44 UTC (rev 211191)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebPageProxyCocoa.mm 2017-01-26 02:01:29 UTC (rev 211192)
</span><span class="lines">@@ -34,6 +34,10 @@
</span><span class="cx"> #import <WebCore/ValidationBubble.h>
</span><span class="cx"> #import <wtf/cf/TypeCastsCF.h>
</span><span class="cx">
</span><ins>+#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WebPageProxyAdditions.mm>)
+#import <WebKitAdditions/WebPageProxyAdditions.mm>
+#endif
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DATA_DETECTION)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportmacWebDragClientMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm (211191 => 211192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm 2017-01-26 01:43:44 UTC (rev 211191)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm 2017-01-26 02:01:29 UTC (rev 211192)
</span><span class="lines">@@ -51,6 +51,12 @@
</span><span class="cx"> using namespace WebCore;
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><ins>+#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WebDragClientAdditions.mm>)
+#import <WebKitAdditions/WebDragClientAdditions.mm>
+#endif
+
+#if PLATFORM(MAC)
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> static PassRefPtr<ShareableBitmap> convertImageToBitmap(NSImage *image, const IntSize& size, Frame& frame)
</span><span class="lines">@@ -160,4 +166,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><ins>+#endif // PLATFORM(MAC)
+
</ins><span class="cx"> #endif // ENABLE(DRAG_SUPPORT)
</span></span></pre>
</div>
</div>
</body>
</html>