<!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>[207088] releases/WebKitGTK/webkit-2.14/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/207088">207088</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-11 04:36:43 -0700 (Tue, 11 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/206197">r206197</a> - [GTK] Clean up DataObjectGtk handling
https://bugs.webkit.org/show_bug.cgi?id=162267
Reviewed by Michael Catanzaro.
Source/WebCore:
* platform/Pasteboard.h: Use Ref instead of RefPtr for DataObjectGtk member.
* platform/PasteboardStrategy.h: Pass a const reference to DataObjectGtk in write method and return a Ref from read.
* platform/PlatformPasteboard.h: Ditto.
* platform/gtk/DataObjectGtk.h:
(WebCore::DataObjectGtk::image): Use Image instead of GdkPixbuf.
(WebCore::DataObjectGtk::setImage):
* platform/gtk/PasteboardGtk.cpp:
(WebCore::Pasteboard::createForDragAndDrop): Use a reference instead of a pointer.
(WebCore::Pasteboard::Pasteboard): Receives a reference, so we can also remove the ASSERT.
(WebCore::Pasteboard::dataObject):
(WebCore::Pasteboard::writeToClipboard): Remove the ShouldIncludeSmartPaste parameter, callers should also update
canSmartPaste property of DataObjectGtk before calling this.
(WebCore::Pasteboard::writePlainText):
(WebCore::Pasteboard::write): Do not convert the image the GdkPixbuf, pass the image to the DataObjectGtk instead.
* platform/gtk/PasteboardHelper.cpp:
(WebCore::PasteboardHelper::fillSelectionData): Convert the DataObjectGtk image to GdkPixbuf right before
passing it to gtk_selection_data_set_pixbuf().
(WebCore::ClipboardSetData::ClipboardSetData): Use reference instead of pointer.
(WebCore::getClipboardContentsCallback):
(WebCore::clearClipboardContentsCallback): Never clear the saved DataObjectGtk, that was only needed when we had
a global DataObjectGtk associated to a GtkClipboard.
(WebCore::PasteboardHelper::writeClipboardContents): Use TemporaryChange to set the settingClipboardDataObject global.
* platform/gtk/PlatformPasteboardGtk.cpp:
(WebCore::PlatformPasteboard::writeToClipboard):
(WebCore::PlatformPasteboard::readFromClipboard):
Source/WebKit2:
In some cases the ownership of DataObjectGtk instances is not clear enough, and we have hacks to avoid memory
leaks because of that.
* Shared/gtk/ArgumentCodersGtk.cpp:
(IPC::encodeImage): Use Image instead of GdkPixbuf.
(IPC::decodeImage): Ditto.
(IPC::ArgumentCoder<DataObjectGtk>::encode):
(IPC::ArgumentCoder<DataObjectGtk>::decode):
(IPC::encode): Deleted.
(IPC::decode): Deleted.
(IPC::ArgumentCoder<DragData>::encode): Deleted.
(IPC::ArgumentCoder<DragData>::decode): Deleted.
* Shared/gtk/ArgumentCodersGtk.h:
* Shared/gtk/PasteboardContent.cpp:
(WebKit::PasteboardContent::PasteboardContent): Add empty constructor that creates a new DataObjectGtk, a
constructor that receives a const reference and another one that takes the ownership of the given DataObjectGtk.
(WebKit::PasteboardContent::encode):
(WebKit::PasteboardContent::decode):
* Shared/gtk/PasteboardContent.h: Use Ref instead of RefPtr for the DataObjectGtk member.
* UIProcess/API/gtk/PageClientImpl.cpp:
(WebKit::PageClientImpl::startDrag): Transfer the DataObjectGtk to the DragAndDropHandler, instead of using DragData.
* UIProcess/API/gtk/PageClientImpl.h:
* UIProcess/PageClient.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::performDragControllerAction): Instead of sending a DragData object to the web process,
send the DataObjectGtk and DragData members needed as parameters.
(WebKit::WebPageProxy::startDrag): Transfer the received DataObjectGtk to page client, instead of using
DragData. Also notify the web process that drag started.
* UIProcess/WebPageProxy.h:
* UIProcess/WebPageProxy.messages.in: Update StartDrag message parameters.
* UIProcess/gtk/DragAndDropHandler.cpp:
(WebKit::DragAndDropHandler::DragAndDropHandler): Remove unneeded initialization.
(WebKit::DragAndDropHandler::startDrag): Take ownership of the given DataObjectGtk.
* UIProcess/gtk/DragAndDropHandler.h:
* UIProcess/gtk/WebPasteboardProxyGtk.cpp:
(WebKit::WebPasteboardProxy::writeToClipboard):
(WebKit::WebPasteboardProxy::readFromClipboard):
* WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
(WebKit::WebPlatformStrategies::writeToClipboard):
(WebKit::WebPlatformStrategies::readFromClipboard):
* WebProcess/WebCoreSupport/WebPlatformStrategies.h:
* WebProcess/WebCoreSupport/gtk/WebDragClientGtk.cpp:
(WebKit::convertCairoSurfaceToShareableBitmap):
(WebKit::WebDragClient::startDrag): Do not create a DragData and pass the DataObjectGtk directly to the
message. Also notify the WebPage that drag is about to start.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::performDragControllerAction): Remove explicit DataObjectGtk derefs and simply create a
DragData using the DataObjectGtk pointer as platform data.
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in: Update PerformDragControllerAction message parameters.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreplatformPasteboardh">releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/Pasteboard.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreplatformPasteboardStrategyh">releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/PasteboardStrategy.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreplatformPlatformPasteboardh">releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/PlatformPasteboard.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreplatformgtkDataObjectGtkh">releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/gtk/DataObjectGtk.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreplatformgtkPasteboardGtkcpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/gtk/PasteboardGtk.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreplatformgtkPasteboardHelpercpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/gtk/PasteboardHelper.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreplatformgtkPlatformPasteboardGtkcpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/gtk/PlatformPasteboardGtk.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2SharedgtkArgumentCodersGtkcpp">releases/WebKitGTK/webkit-2.14/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2SharedgtkArgumentCodersGtkh">releases/WebKitGTK/webkit-2.14/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2SharedgtkPasteboardContentcpp">releases/WebKitGTK/webkit-2.14/Source/WebKit2/Shared/gtk/PasteboardContent.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2SharedgtkPasteboardContenth">releases/WebKitGTK/webkit-2.14/Source/WebKit2/Shared/gtk/PasteboardContent.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2UIProcessAPIgtkPageClientImplcpp">releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2UIProcessAPIgtkPageClientImplh">releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2UIProcessPageClienth">releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/PageClient.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2UIProcessWebPageProxycpp">releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2UIProcessWebPageProxyh">releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2UIProcessWebPageProxymessagesin">releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/WebPageProxy.messages.in</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2UIProcessgtkDragAndDropHandlercpp">releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2UIProcessgtkDragAndDropHandlerh">releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2UIProcessgtkWebPasteboardProxyGtkcpp">releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/WebPasteboardProxyGtk.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiescpp">releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiesh">releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2WebProcessWebCoreSupportgtkWebDragClientGtkcpp">releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebDragClientGtk.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2WebProcessWebPageWebPagecpp">releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2WebProcessWebPageWebPageh">releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2WebProcessWebPageWebPagemessagesin">releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit214SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (207087 => 207088)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-10-11 11:09:55 UTC (rev 207087)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-10-11 11:36:43 UTC (rev 207088)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2016-09-20 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Clean up DataObjectGtk handling
+ https://bugs.webkit.org/show_bug.cgi?id=162267
+
+ Reviewed by Michael Catanzaro.
+
+ * platform/Pasteboard.h: Use Ref instead of RefPtr for DataObjectGtk member.
+ * platform/PasteboardStrategy.h: Pass a const reference to DataObjectGtk in write method and return a Ref from read.
+ * platform/PlatformPasteboard.h: Ditto.
+ * platform/gtk/DataObjectGtk.h:
+ (WebCore::DataObjectGtk::image): Use Image instead of GdkPixbuf.
+ (WebCore::DataObjectGtk::setImage):
+ * platform/gtk/PasteboardGtk.cpp:
+ (WebCore::Pasteboard::createForDragAndDrop): Use a reference instead of a pointer.
+ (WebCore::Pasteboard::Pasteboard): Receives a reference, so we can also remove the ASSERT.
+ (WebCore::Pasteboard::dataObject):
+ (WebCore::Pasteboard::writeToClipboard): Remove the ShouldIncludeSmartPaste parameter, callers should also update
+ canSmartPaste property of DataObjectGtk before calling this.
+ (WebCore::Pasteboard::writePlainText):
+ (WebCore::Pasteboard::write): Do not convert the image the GdkPixbuf, pass the image to the DataObjectGtk instead.
+ * platform/gtk/PasteboardHelper.cpp:
+ (WebCore::PasteboardHelper::fillSelectionData): Convert the DataObjectGtk image to GdkPixbuf right before
+ passing it to gtk_selection_data_set_pixbuf().
+ (WebCore::ClipboardSetData::ClipboardSetData): Use reference instead of pointer.
+ (WebCore::getClipboardContentsCallback):
+ (WebCore::clearClipboardContentsCallback): Never clear the saved DataObjectGtk, that was only needed when we had
+ a global DataObjectGtk associated to a GtkClipboard.
+ (WebCore::PasteboardHelper::writeClipboardContents): Use TemporaryChange to set the settingClipboardDataObject global.
+ * platform/gtk/PlatformPasteboardGtk.cpp:
+ (WebCore::PlatformPasteboard::writeToClipboard):
+ (WebCore::PlatformPasteboard::readFromClipboard):
+
</ins><span class="cx"> 2016-09-20 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r204552): Athlete search on Strava gives bad rendering.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreplatformPasteboardh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/Pasteboard.h (207087 => 207088)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/Pasteboard.h 2016-10-11 11:09:55 UTC (rev 207087)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/Pasteboard.h 2016-10-11 11:36:43 UTC (rev 207088)
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> explicit Pasteboard(const String& name);
</span><del>- explicit Pasteboard(RefPtr<DataObjectGtk>&&);
</del><ins>+ explicit Pasteboard(DataObjectGtk&);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span><span class="lines">@@ -220,10 +220,9 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><del>- enum class ShouldIncludeSmartPaste { No, Yes };
- void writeToClipboard(ShouldIncludeSmartPaste = ShouldIncludeSmartPaste::No);
</del><ins>+ void writeToClipboard();
</ins><span class="cx"> void readFromClipboard();
</span><del>- RefPtr<DataObjectGtk> m_dataObject;
</del><ins>+ Ref<DataObjectGtk> m_dataObject;
</ins><span class="cx"> String m_name;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreplatformPasteboardStrategyh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/PasteboardStrategy.h (207087 => 207088)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/PasteboardStrategy.h 2016-10-11 11:09:55 UTC (rev 207087)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/PasteboardStrategy.h 2016-10-11 11:36:43 UTC (rev 207088)
</span><span class="lines">@@ -73,8 +73,8 @@
</span><span class="cx"> virtual long setStringForType(const String&, const String& pasteboardType, const String& pasteboardName) = 0;
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(GTK)
</span><del>- virtual void writeToClipboard(const String& pasteboardName, const RefPtr<DataObjectGtk>&) = 0;
- virtual RefPtr<DataObjectGtk> readFromClipboard(const String& pasteboardName) = 0;
</del><ins>+ virtual void writeToClipboard(const String& pasteboardName, const DataObjectGtk&) = 0;
+ virtual Ref<DataObjectGtk> readFromClipboard(const String& pasteboardName) = 0;
</ins><span class="cx"> #endif // PLATFORM(GTK)
</span><span class="cx"> protected:
</span><span class="cx"> virtual ~PasteboardStrategy()
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreplatformPlatformPasteboardh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/PlatformPasteboard.h (207087 => 207088)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/PlatformPasteboard.h 2016-10-11 11:09:55 UTC (rev 207087)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/PlatformPasteboard.h 2016-10-11 11:36:43 UTC (rev 207088)
</span><span class="lines">@@ -86,8 +86,8 @@
</span><span class="cx"> WEBCORE_EXPORT int count();
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><del>- WEBCORE_EXPORT void writeToClipboard(const RefPtr<DataObjectGtk>&, std::function<void()>&& primarySelectionCleared);
- WEBCORE_EXPORT RefPtr<DataObjectGtk> readFromClipboard();
</del><ins>+ WEBCORE_EXPORT void writeToClipboard(const DataObjectGtk&, std::function<void()>&& primarySelectionCleared);
+ WEBCORE_EXPORT Ref<DataObjectGtk> readFromClipboard();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreplatformgtkDataObjectGtkh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/gtk/DataObjectGtk.h (207087 => 207088)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/gtk/DataObjectGtk.h 2016-10-11 11:09:55 UTC (rev 207087)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/gtk/DataObjectGtk.h 2016-10-11 11:36:43 UTC (rev 207088)
</span><span class="lines">@@ -18,11 +18,10 @@
</span><span class="cx">
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><del>-#include "FileList.h"
</del><ins>+#include "Image.h"
</ins><span class="cx"> #include "URL.h"
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><del>-#include <wtf/glib/GRefPtr.h>
</del><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -37,8 +36,8 @@
</span><span class="cx"> const URL& url() const { return m_url; }
</span><span class="cx"> const String& uriList() const { return m_uriList; }
</span><span class="cx"> const Vector<String>& filenames() const { return m_filenames; }
</span><del>- GdkPixbuf* image() const { return m_image.get(); }
- void setImage(GdkPixbuf* newImage) { m_image = newImage; }
</del><ins>+ Image* image() const { return m_image.get(); }
+ void setImage(Image* newImage) { m_image = newImage; }
</ins><span class="cx"> void setURL(const URL&, const String&);
</span><span class="cx"> bool hasUnknownTypeData() const { return !m_unknownTypeData.isEmpty(); }
</span><span class="cx"> bool hasText() const { return !m_text.isEmpty(); }
</span><span class="lines">@@ -74,7 +73,7 @@
</span><span class="cx"> URL m_url;
</span><span class="cx"> String m_uriList;
</span><span class="cx"> Vector<String> m_filenames;
</span><del>- GRefPtr<GdkPixbuf> m_image;
</del><ins>+ RefPtr<Image> m_image;
</ins><span class="cx"> HashMap<String, String> m_unknownTypeData;
</span><span class="cx"> bool m_canSmartReplace { false };
</span><span class="cx"> };
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreplatformgtkPasteboardGtkcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/gtk/PasteboardGtk.cpp (207087 => 207088)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/gtk/PasteboardGtk.cpp 2016-10-11 11:09:55 UTC (rev 207087)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/gtk/PasteboardGtk.cpp 2016-10-11 11:36:43 UTC (rev 207088)
</span><span class="lines">@@ -62,7 +62,8 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<Pasteboard> Pasteboard::createForDragAndDrop(const DragData& dragData)
</span><span class="cx"> {
</span><del>- return std::make_unique<Pasteboard>(dragData.platformData());
</del><ins>+ ASSERT(dragData.platformData());
+ return std::make_unique<Pasteboard>(*dragData.platformData());
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -75,10 +76,9 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Pasteboard::Pasteboard(RefPtr<DataObjectGtk>&& dataObject)
- : m_dataObject(WTFMove(dataObject))
</del><ins>+Pasteboard::Pasteboard(DataObjectGtk& dataObject)
+ : m_dataObject(dataObject)
</ins><span class="cx"> {
</span><del>- ASSERT(m_dataObject);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Pasteboard::Pasteboard(const String& name)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx">
</span><span class="cx"> const DataObjectGtk& Pasteboard::dataObject() const
</span><span class="cx"> {
</span><del>- return *m_dataObject;
</del><ins>+ return m_dataObject.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static ClipboardDataType dataObjectTypeFromHTMLClipboardType(const String& rawType)
</span><span class="lines">@@ -119,11 +119,11 @@
</span><span class="cx"> return ClipboardDataTypeUnknown;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Pasteboard::writeToClipboard(ShouldIncludeSmartPaste shouldIncludeSmartPaste)
</del><ins>+void Pasteboard::writeToClipboard()
</ins><span class="cx"> {
</span><span class="cx"> if (m_name.isNull())
</span><span class="cx"> return;
</span><del>- m_dataObject->setCanSmartReplace(shouldIncludeSmartPaste == ShouldIncludeSmartPaste::Yes);
</del><ins>+
</ins><span class="cx"> platformStrategies()->pasteboardStrategy()->writeToClipboard(m_name, m_dataObject);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -159,8 +159,9 @@
</span><span class="cx"> {
</span><span class="cx"> m_dataObject->clearAll();
</span><span class="cx"> m_dataObject->setText(text);
</span><ins>+ m_dataObject->setCanSmartReplace(smartReplaceOption == CanSmartReplace);
</ins><span class="cx">
</span><del>- writeToClipboard(smartReplaceOption == CanSmartReplace ? ShouldIncludeSmartPaste::Yes : ShouldIncludeSmartPaste::No);
</del><ins>+ writeToClipboard();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Pasteboard::write(const PasteboardURL& pasteboardURL)
</span><span class="lines">@@ -180,11 +181,8 @@
</span><span class="cx"> m_dataObject->setURL(pasteboardImage.url.url, pasteboardImage.url.title);
</span><span class="cx"> m_dataObject->setMarkup(pasteboardImage.url.markup);
</span><span class="cx"> }
</span><ins>+ m_dataObject->setImage(pasteboardImage.image.get());
</ins><span class="cx">
</span><del>- GRefPtr<GdkPixbuf> pixbuf = adoptGRef(pasteboardImage.image->getGdkPixbuf());
- if (pixbuf)
- m_dataObject->setImage(pixbuf.get());
-
</del><span class="cx"> writeToClipboard();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -193,8 +191,9 @@
</span><span class="cx"> m_dataObject->clearAll();
</span><span class="cx"> m_dataObject->setText(pasteboardContent.text);
</span><span class="cx"> m_dataObject->setMarkup(pasteboardContent.markup);
</span><ins>+ m_dataObject->setCanSmartReplace(pasteboardContent.canSmartCopyOrDelete);
</ins><span class="cx">
</span><del>- writeToClipboard(pasteboardContent.canSmartCopyOrDelete ? ShouldIncludeSmartPaste::Yes : ShouldIncludeSmartPaste::No);
</del><ins>+ writeToClipboard();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Pasteboard::writePasteboard(const Pasteboard& sourcePasteboard)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreplatformgtkPasteboardHelpercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/gtk/PasteboardHelper.cpp (207087 => 207088)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/gtk/PasteboardHelper.cpp 2016-10-11 11:09:55 UTC (rev 207087)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/gtk/PasteboardHelper.cpp 2016-10-11 11:36:43 UTC (rev 207088)
</span><span class="lines">@@ -25,9 +25,8 @@
</span><span class="cx">
</span><span class="cx"> #include "DataObjectGtk.h"
</span><span class="cx"> #include "GtkVersioning.h"
</span><del>-#include "Pasteboard.h"
-#include "TextResourceDecoder.h"
</del><span class="cx"> #include <gtk/gtk.h>
</span><ins>+#include <wtf/TemporaryChange.h>
</ins><span class="cx"> #include <wtf/glib/GUniquePtr.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="lines">@@ -148,10 +147,11 @@
</span><span class="cx"> gtk_selection_data_set(selectionData, netscapeURLAtom, 8,
</span><span class="cx"> reinterpret_cast<const guchar*>(resultData.get()), strlen(resultData.get()));
</span><span class="cx">
</span><del>- } else if (info == TargetTypeImage)
- gtk_selection_data_set_pixbuf(selectionData, dataObject.image());
</del><ins>+ } else if (info == TargetTypeImage && dataObject.hasImage()) {
+ GRefPtr<GdkPixbuf> pixbuf = adoptGRef(dataObject.image()->getGdkPixbuf());
+ gtk_selection_data_set_pixbuf(selectionData, pixbuf.get());
</ins><span class="cx">
</span><del>- else if (info == TargetTypeSmartPaste)
</del><ins>+ } else if (info == TargetTypeSmartPaste)
</ins><span class="cx"> gtk_selection_data_set_text(selectionData, "", -1);
</span><span class="cx">
</span><span class="cx"> else if (info == TargetTypeUnknown) {
</span><span class="lines">@@ -257,7 +257,7 @@
</span><span class="cx"> static DataObjectGtk* settingClipboardDataObject = 0;
</span><span class="cx">
</span><span class="cx"> struct ClipboardSetData {
</span><del>- ClipboardSetData(DataObjectGtk* dataObject, std::function<void()>&& selectionClearedCallback)
</del><ins>+ ClipboardSetData(DataObjectGtk& dataObject, std::function<void()>&& selectionClearedCallback)
</ins><span class="cx"> : dataObject(dataObject)
</span><span class="cx"> , selectionClearedCallback(WTFMove(selectionClearedCallback))
</span><span class="cx"> {
</span><span class="lines">@@ -267,7 +267,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<DataObjectGtk> dataObject;
</del><ins>+ Ref<DataObjectGtk> dataObject;
</ins><span class="cx"> std::function<void()> selectionClearedCallback;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -274,17 +274,12 @@
</span><span class="cx"> static void getClipboardContentsCallback(GtkClipboard*, GtkSelectionData *selectionData, guint info, gpointer userData)
</span><span class="cx"> {
</span><span class="cx"> auto* data = static_cast<ClipboardSetData*>(userData);
</span><del>- PasteboardHelper::singleton().fillSelectionData(selectionData, info, *data->dataObject);
</del><ins>+ PasteboardHelper::singleton().fillSelectionData(selectionData, info, data->dataObject);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void clearClipboardContentsCallback(GtkClipboard*, gpointer userData)
</span><span class="cx"> {
</span><span class="cx"> std::unique_ptr<ClipboardSetData> data(static_cast<ClipboardSetData*>(userData));
</span><del>-
- // Only clear the DataObject for this clipboard if we are not currently setting it.
- if (data->dataObject.get() != settingClipboardDataObject)
- data->dataObject->clearAll();
-
</del><span class="cx"> if (data->selectionClearedCallback)
</span><span class="cx"> data->selectionClearedCallback();
</span><span class="cx"> }
</span><span class="lines">@@ -297,16 +292,13 @@
</span><span class="cx"> GtkTargetEntry* table = gtk_target_table_new_from_list(list.get(), &numberOfTargets);
</span><span class="cx">
</span><span class="cx"> if (numberOfTargets > 0 && table) {
</span><del>- settingClipboardDataObject = const_cast<DataObjectGtk*>(&dataObject);
-
- auto data = std::make_unique<ClipboardSetData>(settingClipboardDataObject, WTFMove(primarySelectionCleared));
</del><ins>+ TemporaryChange<DataObjectGtk*> change(settingClipboardDataObject, const_cast<DataObjectGtk*>(&dataObject));
+ auto data = std::make_unique<ClipboardSetData>(*settingClipboardDataObject, WTFMove(primarySelectionCleared));
</ins><span class="cx"> if (gtk_clipboard_set_with_data(clipboard, table, numberOfTargets, getClipboardContentsCallback, clearClipboardContentsCallback, data.get())) {
</span><span class="cx"> gtk_clipboard_set_can_store(clipboard, nullptr, 0);
</span><span class="cx"> // When gtk_clipboard_set_with_data() succeeds clearClipboardContentsCallback takes the ownership of data, so we leak it here.
</span><span class="cx"> data.release();
</span><span class="cx"> }
</span><del>-
- settingClipboardDataObject = nullptr;
</del><span class="cx"> } else
</span><span class="cx"> gtk_clipboard_clear(clipboard);
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreplatformgtkPlatformPasteboardGtkcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/gtk/PlatformPasteboardGtk.cpp (207087 => 207088)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/gtk/PlatformPasteboardGtk.cpp 2016-10-11 11:09:55 UTC (rev 207087)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/gtk/PlatformPasteboardGtk.cpp 2016-10-11 11:36:43 UTC (rev 207088)
</span><span class="lines">@@ -34,15 +34,15 @@
</span><span class="cx"> ASSERT(m_clipboard);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PlatformPasteboard::writeToClipboard(const RefPtr<DataObjectGtk>& dataObject, std::function<void()>&& primarySelectionCleared)
</del><ins>+void PlatformPasteboard::writeToClipboard(const DataObjectGtk& dataObject, std::function<void()>&& primarySelectionCleared)
</ins><span class="cx"> {
</span><del>- PasteboardHelper::singleton().writeClipboardContents(m_clipboard, *dataObject, gtk_clipboard_get(GDK_SELECTION_PRIMARY) == m_clipboard ? WTFMove(primarySelectionCleared) : nullptr);
</del><ins>+ PasteboardHelper::singleton().writeClipboardContents(m_clipboard, dataObject, gtk_clipboard_get(GDK_SELECTION_PRIMARY) == m_clipboard ? WTFMove(primarySelectionCleared) : nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<DataObjectGtk> PlatformPasteboard::readFromClipboard()
</del><ins>+Ref<DataObjectGtk> PlatformPasteboard::readFromClipboard()
</ins><span class="cx"> {
</span><del>- RefPtr<DataObjectGtk> dataObject = DataObjectGtk::create();
- PasteboardHelper::singleton().getClipboardContents(m_clipboard, *dataObject);
</del><ins>+ Ref<DataObjectGtk> dataObject(DataObjectGtk::create());
+ PasteboardHelper::singleton().getClipboardContents(m_clipboard, dataObject.get());
</ins><span class="cx"> return dataObject;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog (207087 => 207088)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog 2016-10-11 11:09:55 UTC (rev 207087)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog 2016-10-11 11:36:43 UTC (rev 207088)
</span><span class="lines">@@ -1,3 +1,61 @@
</span><ins>+2016-09-20 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Clean up DataObjectGtk handling
+ https://bugs.webkit.org/show_bug.cgi?id=162267
+
+ Reviewed by Michael Catanzaro.
+
+ In some cases the ownership of DataObjectGtk instances is not clear enough, and we have hacks to avoid memory
+ leaks because of that.
+
+ * Shared/gtk/ArgumentCodersGtk.cpp:
+ (IPC::encodeImage): Use Image instead of GdkPixbuf.
+ (IPC::decodeImage): Ditto.
+ (IPC::ArgumentCoder<DataObjectGtk>::encode):
+ (IPC::ArgumentCoder<DataObjectGtk>::decode):
+ (IPC::encode): Deleted.
+ (IPC::decode): Deleted.
+ (IPC::ArgumentCoder<DragData>::encode): Deleted.
+ (IPC::ArgumentCoder<DragData>::decode): Deleted.
+ * Shared/gtk/ArgumentCodersGtk.h:
+ * Shared/gtk/PasteboardContent.cpp:
+ (WebKit::PasteboardContent::PasteboardContent): Add empty constructor that creates a new DataObjectGtk, a
+ constructor that receives a const reference and another one that takes the ownership of the given DataObjectGtk.
+ (WebKit::PasteboardContent::encode):
+ (WebKit::PasteboardContent::decode):
+ * Shared/gtk/PasteboardContent.h: Use Ref instead of RefPtr for the DataObjectGtk member.
+ * UIProcess/API/gtk/PageClientImpl.cpp:
+ (WebKit::PageClientImpl::startDrag): Transfer the DataObjectGtk to the DragAndDropHandler, instead of using DragData.
+ * UIProcess/API/gtk/PageClientImpl.h:
+ * UIProcess/PageClient.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::performDragControllerAction): Instead of sending a DragData object to the web process,
+ send the DataObjectGtk and DragData members needed as parameters.
+ (WebKit::WebPageProxy::startDrag): Transfer the received DataObjectGtk to page client, instead of using
+ DragData. Also notify the web process that drag started.
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in: Update StartDrag message parameters.
+ * UIProcess/gtk/DragAndDropHandler.cpp:
+ (WebKit::DragAndDropHandler::DragAndDropHandler): Remove unneeded initialization.
+ (WebKit::DragAndDropHandler::startDrag): Take ownership of the given DataObjectGtk.
+ * UIProcess/gtk/DragAndDropHandler.h:
+ * UIProcess/gtk/WebPasteboardProxyGtk.cpp:
+ (WebKit::WebPasteboardProxy::writeToClipboard):
+ (WebKit::WebPasteboardProxy::readFromClipboard):
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+ (WebKit::WebPlatformStrategies::writeToClipboard):
+ (WebKit::WebPlatformStrategies::readFromClipboard):
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.h:
+ * WebProcess/WebCoreSupport/gtk/WebDragClientGtk.cpp:
+ (WebKit::convertCairoSurfaceToShareableBitmap):
+ (WebKit::WebDragClient::startDrag): Do not create a DragData and pass the DataObjectGtk directly to the
+ message. Also notify the WebPage that drag is about to start.
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::performDragControllerAction): Remove explicit DataObjectGtk derefs and simply create a
+ DragData using the DataObjectGtk pointer as platform data.
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in: Update PerformDragControllerAction message parameters.
+
</ins><span class="cx"> 2016-09-07 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Remove stale WebSoupRequestManager headers
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2SharedgtkArgumentCodersGtkcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.cpp (207087 => 207088)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.cpp 2016-10-11 11:09:55 UTC (rev 207087)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.cpp 2016-10-11 11:36:43 UTC (rev 207088)
</span><span class="lines">@@ -30,10 +30,9 @@
</span><span class="cx"> #include "ShareableBitmap.h"
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="cx"> #include <WebCore/DataObjectGtk.h>
</span><del>-#include <WebCore/DragData.h>
</del><span class="cx"> #include <WebCore/GraphicsContext.h>
</span><del>-#include <WebCore/GtkVersioning.h>
-#include <WebCore/PlatformContextCairo.h>
</del><ins>+#include <WebCore/Image.h>
+#include <gtk/gtk.h>
</ins><span class="cx"> #include <wtf/glib/GUniquePtr.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -41,16 +40,11 @@
</span><span class="cx">
</span><span class="cx"> namespace IPC {
</span><span class="cx">
</span><del>-static void encodeImage(Encoder& encoder, const GdkPixbuf* pixbuf)
</del><ins>+static void encodeImage(Encoder& encoder, Image& image)
</ins><span class="cx"> {
</span><del>- IntSize imageSize(gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf));
- RefPtr<ShareableBitmap> bitmap = ShareableBitmap::createShareable(imageSize, ShareableBitmap::SupportsAlpha);
- auto graphicsContext = bitmap->createGraphicsContext();
</del><ins>+ RefPtr<ShareableBitmap> bitmap = ShareableBitmap::createShareable(IntSize(image.size()), ShareableBitmap::SupportsAlpha);
+ bitmap->createGraphicsContext()->drawImage(image, IntPoint());
</ins><span class="cx">
</span><del>- cairo_t* cr = graphicsContext->platformContext()->cr();
- gdk_cairo_set_source_pixbuf(cr, pixbuf, 0, 0);
- cairo_paint(cr);
-
</del><span class="cx"> ShareableBitmap::Handle handle;
</span><span class="cx"> bitmap->createHandle(handle);
</span><span class="cx">
</span><span class="lines">@@ -57,7 +51,7 @@
</span><span class="cx"> encoder << handle;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool decodeImage(Decoder& decoder, GRefPtr<GdkPixbuf>& pixbuf)
</del><ins>+static bool decodeImage(Decoder& decoder, RefPtr<Image>& image)
</ins><span class="cx"> {
</span><span class="cx"> ShareableBitmap::Handle handle;
</span><span class="cx"> if (!decoder.decode(handle))
</span><span class="lines">@@ -66,61 +60,51 @@
</span><span class="cx"> RefPtr<ShareableBitmap> bitmap = ShareableBitmap::create(handle);
</span><span class="cx"> if (!bitmap)
</span><span class="cx"> return false;
</span><del>-
- RefPtr<Image> image = bitmap->createImage();
</del><ins>+ image = bitmap->createImage();
</ins><span class="cx"> if (!image)
</span><span class="cx"> return false;
</span><del>-
- RefPtr<cairo_surface_t> surface = image->nativeImageForCurrentFrame();
- if (!surface)
- return false;
-
- pixbuf = adoptGRef(gdk_pixbuf_get_from_surface(surface.get(), 0, 0, cairo_image_surface_get_width(surface.get()), cairo_image_surface_get_height(surface.get())));
- if (!pixbuf)
- return false;
-
</del><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void encode(Encoder& encoder, const DataObjectGtk* dataObject)
</del><ins>+void ArgumentCoder<DataObjectGtk>::encode(Encoder& encoder, const DataObjectGtk& dataObject)
</ins><span class="cx"> {
</span><del>- bool hasText = dataObject->hasText();
</del><ins>+ bool hasText = dataObject.hasText();
</ins><span class="cx"> encoder << hasText;
</span><span class="cx"> if (hasText)
</span><del>- encoder << dataObject->text();
</del><ins>+ encoder << dataObject.text();
</ins><span class="cx">
</span><del>- bool hasMarkup = dataObject->hasMarkup();
</del><ins>+ bool hasMarkup = dataObject.hasMarkup();
</ins><span class="cx"> encoder << hasMarkup;
</span><span class="cx"> if (hasMarkup)
</span><del>- encoder << dataObject->markup();
</del><ins>+ encoder << dataObject.markup();
</ins><span class="cx">
</span><del>- bool hasURL = dataObject->hasURL();
</del><ins>+ bool hasURL = dataObject.hasURL();
</ins><span class="cx"> encoder << hasURL;
</span><span class="cx"> if (hasURL)
</span><del>- encoder << dataObject->url().string();
</del><ins>+ encoder << dataObject.url().string();
</ins><span class="cx">
</span><del>- bool hasURIList = dataObject->hasURIList();
</del><ins>+ bool hasURIList = dataObject.hasURIList();
</ins><span class="cx"> encoder << hasURIList;
</span><span class="cx"> if (hasURIList)
</span><del>- encoder << dataObject->uriList();
</del><ins>+ encoder << dataObject.uriList();
</ins><span class="cx">
</span><del>- bool hasImage = dataObject->hasImage();
</del><ins>+ bool hasImage = dataObject.hasImage();
</ins><span class="cx"> encoder << hasImage;
</span><span class="cx"> if (hasImage)
</span><del>- encodeImage(encoder, dataObject->image());
</del><ins>+ encodeImage(encoder, *dataObject.image());
</ins><span class="cx">
</span><del>- bool hasUnknownTypeData = dataObject->hasUnknownTypeData();
</del><ins>+ bool hasUnknownTypeData = dataObject.hasUnknownTypeData();
</ins><span class="cx"> encoder << hasUnknownTypeData;
</span><span class="cx"> if (hasUnknownTypeData)
</span><del>- encoder << dataObject->unknownTypes();
</del><ins>+ encoder << dataObject.unknownTypes();
</ins><span class="cx">
</span><del>- bool canSmartReplace = dataObject->canSmartReplace();
</del><ins>+ bool canSmartReplace = dataObject.canSmartReplace();
</ins><span class="cx"> encoder << canSmartReplace;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool decode(Decoder& decoder, RefPtr<DataObjectGtk>& dataObject)
</del><ins>+bool ArgumentCoder<DataObjectGtk>::decode(Decoder& decoder, DataObjectGtk& dataObject)
</ins><span class="cx"> {
</span><del>- RefPtr<DataObjectGtk> data = DataObjectGtk::create();
</del><ins>+ dataObject.clearAll();
</ins><span class="cx">
</span><span class="cx"> bool hasText;
</span><span class="cx"> if (!decoder.decode(hasText))
</span><span class="lines">@@ -129,7 +113,7 @@
</span><span class="cx"> String text;
</span><span class="cx"> if (!decoder.decode(text))
</span><span class="cx"> return false;
</span><del>- data->setText(text);
</del><ins>+ dataObject.setText(text);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool hasMarkup;
</span><span class="lines">@@ -139,7 +123,7 @@
</span><span class="cx"> String markup;
</span><span class="cx"> if (!decoder.decode(markup))
</span><span class="cx"> return false;
</span><del>- data->setMarkup(markup);
</del><ins>+ dataObject.setMarkup(markup);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool hasURL;
</span><span class="lines">@@ -149,7 +133,7 @@
</span><span class="cx"> String url;
</span><span class="cx"> if (!decoder.decode(url))
</span><span class="cx"> return false;
</span><del>- data->setURL(URL(URL(), url), String());
</del><ins>+ dataObject.setURL(URL(URL(), url), String());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool hasURIList;
</span><span class="lines">@@ -159,7 +143,7 @@
</span><span class="cx"> String uriList;
</span><span class="cx"> if (!decoder.decode(uriList))
</span><span class="cx"> return false;
</span><del>- data->setURIList(uriList);
</del><ins>+ dataObject.setURIList(uriList);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool hasImage;
</span><span class="lines">@@ -166,10 +150,10 @@
</span><span class="cx"> if (!decoder.decode(hasImage))
</span><span class="cx"> return false;
</span><span class="cx"> if (hasImage) {
</span><del>- GRefPtr<GdkPixbuf> image;
</del><ins>+ RefPtr<Image> image;
</ins><span class="cx"> if (!decodeImage(decoder, image))
</span><span class="cx"> return false;
</span><del>- data->setImage(image.get());
</del><ins>+ dataObject.setImage(image.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool hasUnknownTypeData;
</span><span class="lines">@@ -182,68 +166,17 @@
</span><span class="cx">
</span><span class="cx"> auto end = unknownTypes.end();
</span><span class="cx"> for (auto it = unknownTypes.begin(); it != end; ++it)
</span><del>- data->setUnknownTypeData(it->key, it->value);
</del><ins>+ dataObject.setUnknownTypeData(it->key, it->value);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool canSmartReplace;
</span><span class="cx"> if (!decoder.decode(canSmartReplace))
</span><span class="cx"> return false;
</span><del>- data->setCanSmartReplace(canSmartReplace);
</del><ins>+ dataObject.setCanSmartReplace(canSmartReplace);
</ins><span class="cx">
</span><del>- dataObject = data;
-
</del><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(DRAG_SUPPORT)
-void ArgumentCoder<DragData>::encode(Encoder& encoder, const DragData& dragData)
-{
- encoder << dragData.clientPosition();
- encoder << dragData.globalPosition();
- encoder << static_cast<uint64_t>(dragData.draggingSourceOperationMask());
- encoder << static_cast<uint64_t>(dragData.flags());
-
- DataObjectGtk* platformData = dragData.platformData();
- encoder << static_cast<bool>(platformData);
- if (platformData)
- IPC::encode(encoder, platformData);
-}
-
-bool ArgumentCoder<DragData>::decode(Decoder& decoder, DragData& dragData)
-{
- IntPoint clientPosition;
- if (!decoder.decode(clientPosition))
- return false;
-
- IntPoint globalPosition;
- if (!decoder.decode(globalPosition))
- return false;
-
- uint64_t sourceOperationMask;
- if (!decoder.decode(sourceOperationMask))
- return false;
-
- uint64_t flags;
- if (!decoder.decode(flags))
- return false;
-
- bool hasPlatformData;
- if (!decoder.decode(hasPlatformData))
- return false;
-
- RefPtr<DataObjectGtk> platformData;
- if (hasPlatformData) {
- if (!IPC::decode(decoder, platformData))
- return false;
- }
-
- dragData = DragData(platformData.leakRef(), clientPosition, globalPosition, static_cast<DragOperation>(sourceOperationMask),
- static_cast<DragApplicationFlags>(flags));
-
- return true;
-}
-#endif // ENABLE(DRAG_SUPPORT)
-
</del><span class="cx"> static void encodeGKeyFile(Encoder& encoder, GKeyFile* keyFile)
</span><span class="cx"> {
</span><span class="cx"> gsize dataSize;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2SharedgtkArgumentCodersGtkh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.h (207087 => 207088)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.h 2016-10-11 11:09:55 UTC (rev 207087)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.h 2016-10-11 11:36:43 UTC (rev 207088)
</span><span class="lines">@@ -34,18 +34,10 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> class DataObjectGtk;
</span><del>-class DragData;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace IPC {
</span><span class="cx">
</span><del>-#if ENABLE(DRAG_SUPPORT)
-template<> struct ArgumentCoder<WebCore::DragData> {
- static void encode(Encoder&, const WebCore::DragData&);
- static bool decode(Decoder&, WebCore::DragData&);
-};
-#endif
-
</del><span class="cx"> void encode(Encoder&, GtkPrintSettings*);
</span><span class="cx"> bool decode(Decoder&, GRefPtr<GtkPrintSettings>&);
</span><span class="cx">
</span><span class="lines">@@ -52,8 +44,10 @@
</span><span class="cx"> void encode(Encoder&, GtkPageSetup*);
</span><span class="cx"> bool decode(Decoder&, GRefPtr<GtkPageSetup>&);
</span><span class="cx">
</span><del>-void encode(Encoder&, const WebCore::DataObjectGtk*);
-bool decode(Decoder&, RefPtr<WebCore::DataObjectGtk>&);
</del><ins>+template<> struct ArgumentCoder<WebCore::DataObjectGtk> {
+ static void encode(Encoder&, const WebCore::DataObjectGtk&);
+ static bool decode(Decoder&, WebCore::DataObjectGtk&);
+};
</ins><span class="cx">
</span><span class="cx"> } // namespace IPC
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2SharedgtkPasteboardContentcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/Shared/gtk/PasteboardContent.cpp (207087 => 207088)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/Shared/gtk/PasteboardContent.cpp 2016-10-11 11:09:55 UTC (rev 207087)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/Shared/gtk/PasteboardContent.cpp 2016-10-11 11:36:43 UTC (rev 207088)
</span><span class="lines">@@ -27,20 +27,29 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-PasteboardContent::PasteboardContent(const RefPtr<WebCore::DataObjectGtk>& data)
- : dataObject(data)
</del><ins>+PasteboardContent::PasteboardContent()
+ : dataObject(WebCore::DataObjectGtk::create())
</ins><span class="cx"> {
</span><del>- ASSERT(dataObject);
</del><span class="cx"> }
</span><span class="cx">
</span><ins>+PasteboardContent::PasteboardContent(const WebCore::DataObjectGtk& data)
+ : dataObject(const_cast<WebCore::DataObjectGtk&>(data))
+{
+}
+
+PasteboardContent::PasteboardContent(Ref<WebCore::DataObjectGtk>&& data)
+ : dataObject(WTFMove(data))
+{
+}
+
</ins><span class="cx"> void PasteboardContent::encode(IPC::Encoder& encoder) const
</span><span class="cx"> {
</span><del>- IPC::encode(encoder, dataObject.get());
</del><ins>+ encoder << dataObject.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool PasteboardContent::decode(IPC::Decoder& decoder, PasteboardContent& pasteboardContent)
</span><span class="cx"> {
</span><del>- return IPC::decode(decoder, pasteboardContent.dataObject);
</del><ins>+ return decoder.decode(pasteboardContent.dataObject.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2SharedgtkPasteboardContenth"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/Shared/gtk/PasteboardContent.h (207087 => 207088)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/Shared/gtk/PasteboardContent.h 2016-10-11 11:09:55 UTC (rev 207087)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/Shared/gtk/PasteboardContent.h 2016-10-11 11:36:43 UTC (rev 207088)
</span><span class="lines">@@ -29,10 +29,11 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> struct PasteboardContent {
</span><del>- PasteboardContent() = default;
- explicit PasteboardContent(const RefPtr<WebCore::DataObjectGtk>&);
</del><ins>+ PasteboardContent();
+ explicit PasteboardContent(const WebCore::DataObjectGtk&);
+ explicit PasteboardContent(Ref<WebCore::DataObjectGtk>&&);
</ins><span class="cx">
</span><del>- RefPtr<WebCore::DataObjectGtk> dataObject;
</del><ins>+ Ref<WebCore::DataObjectGtk> dataObject;
</ins><span class="cx">
</span><span class="cx"> void encode(IPC::Encoder&) const;
</span><span class="cx"> static bool decode(IPC::Decoder&, PasteboardContent&);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2UIProcessAPIgtkPageClientImplcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp (207087 => 207088)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp 2016-10-11 11:09:55 UTC (rev 207087)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp 2016-10-11 11:36:43 UTC (rev 207088)
</span><span class="lines">@@ -254,10 +254,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><del>-void PageClientImpl::startDrag(const WebCore::DragData& dragData, PassRefPtr<ShareableBitmap> dragImage)
</del><ins>+void PageClientImpl::startDrag(Ref<DataObjectGtk>&& selection, DragOperation dragOperation, RefPtr<ShareableBitmap>&& dragImage)
</ins><span class="cx"> {
</span><span class="cx"> WebKitWebViewBase* webView = WEBKIT_WEB_VIEW_BASE(m_viewWidget);
</span><del>- webkitWebViewBaseDragAndDropHandler(webView).startDrag(dragData, dragImage);
</del><ins>+ webkitWebViewBaseDragAndDropHandler(webView).startDrag(WTFMove(selection), dragOperation, WTFMove(dragImage));
</ins><span class="cx">
</span><span class="cx"> // A drag starting should prevent a double-click from happening. This might
</span><span class="cx"> // happen if a drag is followed very quickly by another click (like in the WTR).
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2UIProcessAPIgtkPageClientImplh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h (207087 => 207088)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h 2016-10-11 11:09:55 UTC (rev 207087)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h 2016-10-11 11:36:43 UTC (rev 207088)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> void selectionDidChange() override;
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><del>- void startDrag(const WebCore::DragData&, PassRefPtr<ShareableBitmap> dragImage) override;
</del><ins>+ void startDrag(Ref<WebCore::DataObjectGtk>&&, WebCore::DragOperation, RefPtr<ShareableBitmap>&& dragImage) override;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void enterAcceleratedCompositingMode(const LayerTreeContext&) override;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2UIProcessPageClienth"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/PageClient.h (207087 => 207088)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/PageClient.h 2016-10-11 11:09:55 UTC (rev 207087)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/PageClient.h 2016-10-11 11:36:43 UTC (rev 207088)
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> virtual void didChangeContentSize(const WebCore::IntSize&) = 0;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK) && ENABLE(DRAG_SUPPORT)
</span><del>- virtual void startDrag(const WebCore::DragData&, PassRefPtr<ShareableBitmap> dragImage) = 0;
</del><ins>+ virtual void startDrag(Ref<WebCore::DataObjectGtk>&&, WebCore::DragOperation, RefPtr<ShareableBitmap>&& dragImage) = 0;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> virtual void setCursor(const WebCore::Cursor&) = 0;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/WebPageProxy.cpp (207087 => 207088)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-10-11 11:09:55 UTC (rev 207087)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-10-11 11:36:43 UTC (rev 207088)
</span><span class="lines">@@ -155,6 +155,10 @@
</span><span class="cx"> #include <WebCore/TextIndicatorWindow.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(GTK)
+#include "PasteboardContent.h"
+#endif
+
</ins><span class="cx"> #if USE(CAIRO)
</span><span class="cx"> #include <WebCore/CairoUtilities.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -1768,7 +1772,10 @@
</span><span class="cx"> String url = dragData.asURL();
</span><span class="cx"> if (!url.isEmpty())
</span><span class="cx"> m_process->assumeReadAccessToBaseURL(url);
</span><del>- m_process->send(Messages::WebPage::PerformDragControllerAction(action, dragData), m_pageID);
</del><ins>+
+ ASSERT(dragData.platformData());
+ PasteboardContent selection(*dragData.platformData());
+ m_process->send(Messages::WebPage::PerformDragControllerAction(action, dragData.clientPosition(), dragData.globalPosition(), dragData.draggingSourceOperationMask(), selection, dragData.flags()), m_pageID);
</ins><span class="cx"> #else
</span><span class="cx"> m_process->send(Messages::WebPage::PerformDragControllerAction(action, dragData.clientPosition(), dragData.globalPosition(), dragData.draggingSourceOperationMask(), dragStorageName, dragData.flags(), sandboxExtensionHandle, sandboxExtensionsForUpload), m_pageID);
</span><span class="cx"> #endif
</span><span class="lines">@@ -1784,16 +1791,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><del>-void WebPageProxy::startDrag(const DragData& dragData, const ShareableBitmap::Handle& dragImageHandle)
</del><ins>+void WebPageProxy::startDrag(PasteboardContent&& selection, uint64_t dragOperation, const ShareableBitmap::Handle& dragImageHandle)
</ins><span class="cx"> {
</span><del>- RefPtr<ShareableBitmap> dragImage = 0;
- if (!dragImageHandle.isNull()) {
- dragImage = ShareableBitmap::create(dragImageHandle);
- if (!dragImage)
- return;
- }
</del><ins>+ RefPtr<ShareableBitmap> dragImage = !dragImageHandle.isNull() ? ShareableBitmap::create(dragImageHandle) : nullptr;
+ m_pageClient.startDrag(WTFMove(selection.dataObject), static_cast<WebCore::DragOperation>(dragOperation), WTFMove(dragImage));
</ins><span class="cx">
</span><del>- m_pageClient.startDrag(dragData, dragImage.release());
</del><ins>+ m_process->send(Messages::WebPage::DidStartDrag(), m_pageID);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/WebPageProxy.h (207087 => 207088)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/WebPageProxy.h 2016-10-11 11:09:55 UTC (rev 207087)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/WebPageProxy.h 2016-10-11 11:36:43 UTC (rev 207088)
</span><span class="lines">@@ -807,7 +807,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(GTK)
</span><del>- void startDrag(const WebCore::DragData&, const ShareableBitmap::Handle& dragImage);
</del><ins>+ void startDrag(PasteboardContent&&, uint64_t dragOperation, const ShareableBitmap::Handle& dragImage);
</ins><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2UIProcessWebPageProxymessagesin"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/WebPageProxy.messages.in (207087 => 207088)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2016-10-11 11:09:55 UTC (rev 207087)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2016-10-11 11:36:43 UTC (rev 207088)
</span><span class="lines">@@ -303,7 +303,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(GTK) && ENABLE(DRAG_SUPPORT)
</span><del>- StartDrag(WebCore::DragData dragData, WebKit::ShareableBitmap::Handle dragImage)
</del><ins>+ StartDrag(struct WebKit::PasteboardContent selection, uint64_t dragOperation, WebKit::ShareableBitmap::Handle dragImage)
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2UIProcessgtkDragAndDropHandlercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp (207087 => 207088)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp 2016-10-11 11:09:55 UTC (rev 207087)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp 2016-10-11 11:36:43 UTC (rev 207088)
</span><span class="lines">@@ -44,9 +44,6 @@
</span><span class="cx">
</span><span class="cx"> DragAndDropHandler::DragAndDropHandler(WebPageProxy& page)
</span><span class="cx"> : m_page(page)
</span><del>-#if GTK_CHECK_VERSION(3, 16, 0)
- , m_dragContext(nullptr)
-#endif
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -111,18 +108,18 @@
</span><span class="cx"> return static_cast<DragOperation>(action);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DragAndDropHandler::startDrag(const DragData& dragData, PassRefPtr<ShareableBitmap> dragImage)
</del><ins>+void DragAndDropHandler::startDrag(Ref<DataObjectGtk>&& selection, DragOperation dragOperation, RefPtr<ShareableBitmap>&& dragImage)
</ins><span class="cx"> {
</span><span class="cx"> #if GTK_CHECK_VERSION(3, 16, 0)
</span><del>- m_draggingDataObject = adoptRef(dragData.platformData());
</del><ins>+ m_draggingDataObject = WTFMove(selection);
</ins><span class="cx"> GRefPtr<GtkTargetList> targetList = PasteboardHelper::singleton().targetListForDataObject(*m_draggingDataObject);
</span><span class="cx"> #else
</span><del>- RefPtr<DataObjectGtk> dataObject = adoptRef(dragData.platformData());
</del><ins>+ RefPtr<DataObjectGtk> dataObject = WTFMove(selection);
</ins><span class="cx"> GRefPtr<GtkTargetList> targetList = PasteboardHelper::singleton().targetListForDataObject(*dataObject);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> GUniquePtr<GdkEvent> currentEvent(gtk_get_current_event());
</span><del>- GdkDragContext* context = gtk_drag_begin(m_page.viewWidget(), targetList.get(), dragOperationToGdkDragActions(dragData.draggingSourceOperationMask()),
</del><ins>+ GdkDragContext* context = gtk_drag_begin(m_page.viewWidget(), targetList.get(), dragOperationToGdkDragActions(dragOperation),
</ins><span class="cx"> GDK_BUTTON_PRIMARY, currentEvent.get());
</span><span class="cx">
</span><span class="cx"> #if GTK_CHECK_VERSION(3, 16, 0)
</span><span class="lines">@@ -135,7 +132,7 @@
</span><span class="cx"> #else
</span><span class="cx"> // We don't have gtk_drag_cancel() in GTK+ < 3.16, so we use the old code.
</span><span class="cx"> // See https://bugs.webkit.org/show_bug.cgi?id=138468
</span><del>- m_draggingDataObjects.set(context, dataObject.get());
</del><ins>+ m_draggingDataObjects.set(context, WTFMove(dataObject));
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (dragImage) {
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2UIProcessgtkDragAndDropHandlerh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.h (207087 => 207088)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.h 2016-10-11 11:09:55 UTC (rev 207087)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.h 2016-10-11 11:36:43 UTC (rev 207088)
</span><span class="lines">@@ -23,16 +23,17 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef DragAndDropHandler_h
-#define DragAndDropHandler_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><span class="cx">
</span><span class="cx"> #include <WebCore/DataObjectGtk.h>
</span><ins>+#include <WebCore/DragActions.h>
</ins><span class="cx"> #include <WebCore/IntPoint.h>
</span><span class="cx"> #include <gtk/gtk.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> typedef struct _GdkDragContext GdkDragContext;
</span><span class="cx"> typedef struct _GtkSelectionData GtkSelectionData;
</span><span class="lines">@@ -51,7 +52,7 @@
</span><span class="cx"> public:
</span><span class="cx"> DragAndDropHandler(WebPageProxy&);
</span><span class="cx">
</span><del>- void startDrag(const WebCore::DragData&, PassRefPtr<ShareableBitmap> dragImage);
</del><ins>+ void startDrag(Ref<WebCore::DataObjectGtk>&&, WebCore::DragOperation, RefPtr<ShareableBitmap>&& dragImage);
</ins><span class="cx"> void fillDragData(GdkDragContext*, GtkSelectionData*, unsigned info);
</span><span class="cx"> void finishDrag(GdkDragContext*);
</span><span class="cx">
</span><span class="lines">@@ -90,5 +91,3 @@
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(DRAG_SUPPORT)
</span><del>-
-#endif // DragAndDropHandler_h
</del></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2UIProcessgtkWebPasteboardProxyGtkcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/WebPasteboardProxyGtk.cpp (207087 => 207088)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/WebPasteboardProxyGtk.cpp 2016-10-11 11:09:55 UTC (rev 207087)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/WebPasteboardProxyGtk.cpp 2016-10-11 11:36:43 UTC (rev 207088)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> void WebPasteboardProxy::writeToClipboard(const String& pasteboardName, const PasteboardContent& pasteboardContent)
</span><span class="cx"> {
</span><span class="cx"> TemporaryChange<WebFrameProxy*> frameWritingToClipboard(m_frameWritingToClipboard, m_primarySelectionOwner);
</span><del>- PlatformPasteboard(pasteboardName).writeToClipboard(pasteboardContent.dataObject, [this] {
</del><ins>+ PlatformPasteboard(pasteboardName).writeToClipboard(pasteboardContent.dataObject.get(), [this] {
</ins><span class="cx"> if (m_frameWritingToClipboard == m_primarySelectionOwner)
</span><span class="cx"> return;
</span><span class="cx"> setPrimarySelectionOwner(nullptr);
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx">
</span><span class="cx"> void WebPasteboardProxy::readFromClipboard(const String& pasteboardName, PasteboardContent& pasteboardContent)
</span><span class="cx"> {
</span><del>- pasteboardContent = PasteboardContent(PlatformPasteboard(pasteboardName).readFromClipboard().get());
</del><ins>+ pasteboardContent = PasteboardContent(PlatformPasteboard(pasteboardName).readFromClipboard());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPasteboardProxy::setPrimarySelectionOwner(WebFrameProxy* frame)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiescpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (207087 => 207088)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2016-10-11 11:09:55 UTC (rev 207087)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2016-10-11 11:36:43 UTC (rev 207088)
</span><span class="lines">@@ -346,17 +346,17 @@
</span><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> // PasteboardStrategy
</span><span class="cx">
</span><del>-void WebPlatformStrategies::writeToClipboard(const String& pasteboardName, const RefPtr<WebCore::DataObjectGtk>& dataObject)
</del><ins>+void WebPlatformStrategies::writeToClipboard(const String& pasteboardName, const DataObjectGtk& dataObject)
</ins><span class="cx"> {
</span><del>- PasteboardContent pasteboardContent = PasteboardContent(dataObject.get());
</del><ins>+ PasteboardContent pasteboardContent(dataObject);
</ins><span class="cx"> WebProcess::singleton().parentProcessConnection()->send(Messages::WebPasteboardProxy::WriteToClipboard(pasteboardName, pasteboardContent), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<WebCore::DataObjectGtk> WebPlatformStrategies::readFromClipboard(const String& pasteboardName)
</del><ins>+Ref<DataObjectGtk> WebPlatformStrategies::readFromClipboard(const String& pasteboardName)
</ins><span class="cx"> {
</span><span class="cx"> PasteboardContent pasteboardContent;
</span><span class="cx"> WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::ReadFromClipboard(pasteboardName), Messages::WebPasteboardProxy::ReadFromClipboard::Reply(pasteboardContent), 0);
</span><del>- return pasteboardContent.dataObject;
</del><ins>+ return WTFMove(pasteboardContent.dataObject);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(GTK)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiesh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h (207087 => 207088)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h 2016-10-11 11:09:55 UTC (rev 207087)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h 2016-10-11 11:36:43 UTC (rev 207088)
</span><span class="lines">@@ -87,8 +87,8 @@
</span><span class="cx"> long setStringForType(const String&, const String& pasteboardType, const String& pasteboardName) override;
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(GTK)
</span><del>- void writeToClipboard(const String& pasteboardName, const RefPtr<WebCore::DataObjectGtk>&) override;
- RefPtr<WebCore::DataObjectGtk> readFromClipboard(const String& pasteboardName) override;
</del><ins>+ void writeToClipboard(const String& pasteboardName, const WebCore::DataObjectGtk&) override;
+ Ref<WebCore::DataObjectGtk> readFromClipboard(const String& pasteboardName) override;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2WebProcessWebCoreSupportgtkWebDragClientGtkcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebDragClientGtk.cpp (207087 => 207088)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebDragClientGtk.cpp 2016-10-11 11:09:55 UTC (rev 207087)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebDragClientGtk.cpp 2016-10-11 11:36:43 UTC (rev 207088)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><span class="cx">
</span><span class="cx"> #include "ArgumentCodersGtk.h"
</span><ins>+#include "PasteboardContent.h"
</ins><span class="cx"> #include "ShareableBitmap.h"
</span><span class="cx"> #include "WebPage.h"
</span><span class="cx"> #include "WebPageProxyMessages.h"
</span><span class="lines">@@ -43,10 +44,10 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-static PassRefPtr<ShareableBitmap> convertCairoSurfaceToShareableBitmap(cairo_surface_t* surface)
</del><ins>+static RefPtr<ShareableBitmap> convertCairoSurfaceToShareableBitmap(cairo_surface_t* surface)
</ins><span class="cx"> {
</span><span class="cx"> if (!surface)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> IntSize imageSize(cairo_image_surface_get_width(surface), cairo_image_surface_get_height(surface));
</span><span class="cx"> RefPtr<ShareableBitmap> bitmap = ShareableBitmap::createShareable(imageSize, ShareableBitmap::SupportsAlpha);
</span><span class="lines">@@ -53,7 +54,7 @@
</span><span class="cx"> auto graphicsContext = bitmap->createGraphicsContext();
</span><span class="cx">
</span><span class="cx"> graphicsContext->platformContext()->drawSurfaceToContext(surface, IntRect(IntPoint(), imageSize), IntRect(IntPoint(), imageSize), *graphicsContext);
</span><del>- return bitmap.release();
</del><ins>+ return bitmap;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebDragClient::startDrag(DragImageRef dragImage, const IntPoint& clientPosition, const IntPoint& globalPosition, DataTransfer& dataTransfer, Frame&, bool)
</span><span class="lines">@@ -65,9 +66,10 @@
</span><span class="cx"> if (bitmap && !bitmap->createHandle(handle))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- const auto& dataObject = dataTransfer.pasteboard().dataObject();
- DragData dragData(const_cast<DataObjectGtk*>(&dataObject), clientPosition, globalPosition, dataTransfer.sourceOperation());
- m_page->send(Messages::WebPageProxy::StartDrag(dragData, handle));
</del><ins>+ m_page->willStartDrag();
+
+ PasteboardContent selection(dataTransfer.pasteboard().dataObject());
+ m_page->send(Messages::WebPageProxy::StartDrag(selection, dataTransfer.sourceOperation(), handle));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }; // namespace WebKit.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (207087 => 207088)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-10-11 11:09:55 UTC (rev 207087)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-10-11 11:36:43 UTC (rev 207088)
</span><span class="lines">@@ -214,9 +214,10 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><ins>+#include "PasteboardContent.h"
+#include "WebPrintOperationGtk.h"
+#include <WebCore/DataObjectGtk.h>
</ins><span class="cx"> #include <gtk/gtk.h>
</span><del>-#include "DataObjectGtk.h"
-#include "WebPrintOperationGtk.h"
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -3360,15 +3361,14 @@
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><del>-void WebPage::performDragControllerAction(uint64_t action, WebCore::DragData dragData)
</del><ins>+void WebPage::performDragControllerAction(uint64_t action, const IntPoint& clientPosition, const IntPoint& globalPosition, uint64_t draggingSourceOperationMask, PasteboardContent&& selection, uint32_t flags)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_page) {
</span><span class="cx"> send(Messages::WebPageProxy::DidPerformDragControllerAction(DragOperationNone, false, 0));
</span><del>- DataObjectGtk* data = const_cast<DataObjectGtk*>(dragData.platformData());
- data->deref();
</del><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ DragData dragData(selection.dataObject.ptr(), clientPosition, globalPosition, static_cast<DragOperation>(draggingSourceOperationMask), static_cast<DragApplicationFlags>(flags));
</ins><span class="cx"> switch (action) {
</span><span class="cx"> case DragControllerActionEntered: {
</span><span class="cx"> DragOperation resolvedDragOperation = m_page->dragController().dragEntered(dragData);
</span><span class="lines">@@ -3392,11 +3392,7 @@
</span><span class="cx"> default:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><del>- // DragData does not delete its platformData so we need to do that here.
- DataObjectGtk* data = const_cast<DataObjectGtk*>(dragData.platformData());
- data->deref();
</del><span class="cx"> }
</span><del>-
</del><span class="cx"> #else
</span><span class="cx"> void WebPage::performDragControllerAction(uint64_t action, WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, uint64_t draggingSourceOperationMask, const String& dragStorageName, uint32_t flags, const SandboxExtension::Handle& sandboxExtensionHandle, const SandboxExtension::HandleArray& sandboxExtensionsHandleArray)
</span><span class="cx"> {
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebPage/WebPage.h (207087 => 207088)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-10-11 11:09:55 UTC (rev 207087)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-10-11 11:36:43 UTC (rev 207088)
</span><span class="lines">@@ -203,6 +203,10 @@
</span><span class="cx"> class RemoteLayerTreeTransaction;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(GTK)
+struct PasteboardContent;
+#endif
+
</ins><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> class WebTouchEvent;
</span><span class="cx"> #endif
</span><span class="lines">@@ -726,7 +730,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><span class="cx"> #if PLATFORM(GTK)
</span><del>- void performDragControllerAction(uint64_t action, WebCore::DragData);
</del><ins>+ void performDragControllerAction(uint64_t action, const WebCore::IntPoint& clientPosition, const WebCore::IntPoint& globalPosition, uint64_t draggingSourceOperationMask, PasteboardContent&&, uint32_t flags);
</ins><span class="cx"> #else
</span><span class="cx"> void performDragControllerAction(uint64_t action, WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, uint64_t draggingSourceOperationMask, const WTF::String& dragStorageName, uint32_t flags, const SandboxExtension::Handle&, const SandboxExtension::HandleArray&);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (207087 => 207088)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2016-10-11 11:09:55 UTC (rev 207087)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2016-10-11 11:36:43 UTC (rev 207088)
</span><span class="lines">@@ -236,7 +236,7 @@
</span><span class="cx">
</span><span class="cx"> # Drag and drop.
</span><span class="cx"> #if PLATFORM(GTK) && ENABLE(DRAG_SUPPORT)
</span><del>- PerformDragControllerAction(uint64_t action, WebCore::DragData dragData)
</del><ins>+ PerformDragControllerAction(uint64_t action, WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, uint64_t draggingSourceOperationMask, struct WebKit::PasteboardContent selection, uint32_t flags)
</ins><span class="cx"> #endif
</span><span class="cx"> #if !PLATFORM(GTK) && ENABLE(DRAG_SUPPORT)
</span><span class="cx"> PerformDragControllerAction(uint64_t action, WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, uint64_t draggingSourceOperationMask, String dragStorageName, uint32_t flags, WebKit::SandboxExtension::Handle sandboxExtensionHandle, WebKit::SandboxExtension::HandleArray sandboxExtensionsForUpload)
</span></span></pre>
</div>
</div>
</body>
</html>