<!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>[206256] 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/206256">206256</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-22 05:14:39 -0700 (Thu, 22 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Rename DataObjectGtk as SelectionData
https://bugs.webkit.org/show_bug.cgi?id=162380
Reviewed by Žan Doberšek.
Source/WebCore:
DataObjectGtk represents the data of a selection, like GtkSelectionData, used for clipboard and drag adn drop
operations. Data object is a very generic name, and the Gtk suffix sounds like if this is the GTK implementation
of a generic DataObject class.
* PlatformGTK.cmake:
* editing/gtk/EditorGtk.cpp:
(WebCore::createFragmentFromPasteboardData):
* page/gtk/DragControllerGtk.cpp:
* platform/DragData.h:
* platform/Pasteboard.h:
* platform/PasteboardStrategy.h:
(WebCore::PasteboardStrategy::~PasteboardStrategy): Deleted.
* platform/PlatformPasteboard.h:
* platform/gtk/DragDataGtk.cpp:
* platform/gtk/PasteboardGtk.cpp:
(WebCore::Pasteboard::createPrivate):
(WebCore::Pasteboard::createForDragAndDrop):
(WebCore::Pasteboard::Pasteboard):
(WebCore::Pasteboard::selectionData):
(WebCore::selectionDataTypeFromHTMLClipboardType):
(WebCore::Pasteboard::writeToClipboard):
(WebCore::Pasteboard::readFromClipboard):
(WebCore::Pasteboard::writeString):
(WebCore::Pasteboard::writePlainText):
(WebCore::Pasteboard::write):
(WebCore::Pasteboard::writePasteboard):
(WebCore::Pasteboard::clear):
(WebCore::Pasteboard::canSmartReplace):
(WebCore::Pasteboard::read):
(WebCore::Pasteboard::hasData):
(WebCore::Pasteboard::types):
(WebCore::Pasteboard::readString):
(WebCore::Pasteboard::readFilenames):
* platform/gtk/PasteboardHelper.cpp:
(WebCore::PasteboardHelper::getClipboardContents):
(WebCore::PasteboardHelper::targetListForSelectionData):
(WebCore::PasteboardHelper::fillSelectionData):
(WebCore::ClipboardSetData::ClipboardSetData):
(WebCore::getClipboardContentsCallback):
(WebCore::PasteboardHelper::writeClipboardContents):
(WebCore::clearClipboardContentsCallback): Deleted.
* platform/gtk/PasteboardHelper.h:
* platform/gtk/PlatformPasteboardGtk.cpp:
(WebCore::PlatformPasteboard::writeToClipboard):
(WebCore::PlatformPasteboard::readFromClipboard):
* platform/gtk/SelectionData.cpp: Renamed from Source/WebCore/platform/gtk/DataObjectGtk.cpp.
(WebCore::SelectionData::setText):
(WebCore::SelectionData::setURIList):
(WebCore::SelectionData::setURL):
(WebCore::SelectionData::urlLabel):
(WebCore::SelectionData::clearAllExceptFilenames):
(WebCore::SelectionData::clearAll):
* platform/gtk/SelectionData.h: Renamed from Source/WebCore/platform/gtk/DataObjectGtk.h.
(WebCore::SelectionData::create):
(WebCore::SelectionData::text):
(WebCore::SelectionData::hasText):
(WebCore::SelectionData::clearText):
(WebCore::SelectionData::setMarkup):
(WebCore::SelectionData::markup):
(WebCore::SelectionData::hasMarkup):
(WebCore::SelectionData::clearMarkup):
(WebCore::SelectionData::hasURL):
(WebCore::SelectionData::clearURL):
(WebCore::SelectionData::filenames):
(WebCore::SelectionData::hasURIList):
(WebCore::SelectionData::hasFilenames):
(WebCore::SelectionData::setImage):
(WebCore::SelectionData::image):
(WebCore::SelectionData::hasImage):
(WebCore::SelectionData::unknownTypeData):
(WebCore::SelectionData::unknownTypes):
(WebCore::SelectionData::hasUnknownTypeData):
(WebCore::SelectionData::canSmartReplace):
(WebCore::SelectionData::url): Deleted.
(WebCore::SelectionData::uriList): Deleted.
(WebCore::SelectionData::clearURIList): Deleted.
(WebCore::SelectionData::clearImage): Deleted.
(WebCore::SelectionData::setUnknownTypeData): Deleted.
Source/WebKit2:
* PlatformGTK.cmake:
* Shared/gtk/ArgumentCodersGtk.cpp:
(IPC::ArgumentCoder<SelectionData>::encode):
(IPC::ArgumentCoder<SelectionData>::decode):
* Shared/gtk/ArgumentCodersGtk.h:
* Shared/gtk/WebSelectionData.cpp: Renamed from Source/WebKit2/Shared/gtk/PasteboardContent.cpp.
(WebKit::WebSelectionData::WebSelectionData):
(WebKit::WebSelectionData::encode):
(WebKit::WebSelectionData::decode):
* Shared/gtk/WebSelectionData.h: Renamed from Source/WebKit2/Shared/gtk/PasteboardContent.h.
* UIProcess/API/gtk/PageClientImpl.cpp:
(WebKit::PageClientImpl::startDrag):
* UIProcess/API/gtk/PageClientImpl.h:
* UIProcess/PageClient.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::performDragControllerAction):
(WebKit::WebPageProxy::startDrag):
* UIProcess/WebPageProxy.h:
* UIProcess/WebPageProxy.messages.in:
* UIProcess/WebPasteboardProxy.h:
* UIProcess/WebPasteboardProxy.messages.in:
* UIProcess/gtk/DragAndDropHandler.cpp:
(WebKit::DragAndDropHandler::DroppingContext::DroppingContext):
(WebKit::DragAndDropHandler::startDrag):
(WebKit::DragAndDropHandler::fillDragData):
(WebKit::DragAndDropHandler::finishDrag):
(WebKit::DragAndDropHandler::dropDataSelection):
(WebKit::DragAndDropHandler::dragEntered):
(WebKit::DragAndDropHandler::dragDataSelection):
(WebKit::DragAndDropHandler::dragMotion):
(WebKit::DragAndDropHandler::dragLeave):
(WebKit::DragAndDropHandler::drop):
* UIProcess/gtk/DragAndDropHandler.h:
* UIProcess/gtk/WebPasteboardProxyGtk.cpp:
(WebKit::WebPasteboardProxy::writeToClipboard):
(WebKit::WebPasteboardProxy::readFromClipboard):
(WebKit::WebPasteboardProxy::setPrimarySelectionOwner): Deleted.
* WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
(WebKit::WebPlatformStrategies::writeToClipboard):
(WebKit::WebPlatformStrategies::readFromClipboard):
* WebProcess/WebCoreSupport/WebPlatformStrategies.h:
* WebProcess/WebCoreSupport/gtk/WebDragClientGtk.cpp:
(WebKit::WebDragClient::startDrag):
* WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::performDragControllerAction):
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformGTKcmake">trunk/Source/WebCore/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebCoreeditinggtkEditorGtkcpp">trunk/Source/WebCore/editing/gtk/EditorGtk.cpp</a></li>
<li><a href="#trunkSourceWebCorepagegtkDragControllerGtkcpp">trunk/Source/WebCore/page/gtk/DragControllerGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformDragDatah">trunk/Source/WebCore/platform/DragData.h</a></li>
<li><a href="#trunkSourceWebCoreplatformPasteboardh">trunk/Source/WebCore/platform/Pasteboard.h</a></li>
<li><a href="#trunkSourceWebCoreplatformPasteboardStrategyh">trunk/Source/WebCore/platform/PasteboardStrategy.h</a></li>
<li><a href="#trunkSourceWebCoreplatformPlatformPasteboardh">trunk/Source/WebCore/platform/PlatformPasteboard.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkDragDataGtkcpp">trunk/Source/WebCore/platform/gtk/DragDataGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkPasteboardGtkcpp">trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkPasteboardHelpercpp">trunk/Source/WebCore/platform/gtk/PasteboardHelper.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkPasteboardHelperh">trunk/Source/WebCore/platform/gtk/PasteboardHelper.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkPlatformPasteboardGtkcpp">trunk/Source/WebCore/platform/gtk/PlatformPasteboardGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformGTKcmake">trunk/Source/WebKit2/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebKit2SharedgtkArgumentCodersGtkcpp">trunk/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedgtkArgumentCodersGtkh">trunk/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkPageClientImplcpp">trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkPageClientImplh">trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPageClienth">trunk/Source/WebKit2/UIProcess/PageClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxymessagesin">trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPasteboardProxyh">trunk/Source/WebKit2/UIProcess/WebPasteboardProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPasteboardProxymessagesin">trunk/Source/WebKit2/UIProcess/WebPasteboardProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkDragAndDropHandlercpp">trunk/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkDragAndDropHandlerh">trunk/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkWebPasteboardProxyGtkcpp">trunk/Source/WebKit2/UIProcess/gtk/WebPasteboardProxyGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiescpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiesh">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportgtkWebDragClientGtkcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebDragClientGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportgtkWebEditorClientGtkcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagemessagesin">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformgtkSelectionDatacpp">trunk/Source/WebCore/platform/gtk/SelectionData.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkSelectionDatah">trunk/Source/WebCore/platform/gtk/SelectionData.h</a></li>
<li><a href="#trunkSourceWebKit2SharedgtkWebSelectionDatacpp">trunk/Source/WebKit2/Shared/gtk/WebSelectionData.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedgtkWebSelectionDatah">trunk/Source/WebKit2/Shared/gtk/WebSelectionData.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformgtkDataObjectGtkcpp">trunk/Source/WebCore/platform/gtk/DataObjectGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkDataObjectGtkh">trunk/Source/WebCore/platform/gtk/DataObjectGtk.h</a></li>
<li><a href="#trunkSourceWebKit2SharedgtkPasteboardContentcpp">trunk/Source/WebKit2/Shared/gtk/PasteboardContent.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedgtkPasteboardContenth">trunk/Source/WebKit2/Shared/gtk/PasteboardContent.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (206255 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-22 08:57:12 UTC (rev 206255)
+++ trunk/Source/WebCore/ChangeLog 2016-09-22 12:14:39 UTC (rev 206256)
</span><span class="lines">@@ -1,3 +1,89 @@
</span><ins>+2016-09-22 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Rename DataObjectGtk as SelectionData
+ https://bugs.webkit.org/show_bug.cgi?id=162380
+
+ Reviewed by Žan Doberšek.
+
+ DataObjectGtk represents the data of a selection, like GtkSelectionData, used for clipboard and drag adn drop
+ operations. Data object is a very generic name, and the Gtk suffix sounds like if this is the GTK implementation
+ of a generic DataObject class.
+
+ * PlatformGTK.cmake:
+ * editing/gtk/EditorGtk.cpp:
+ (WebCore::createFragmentFromPasteboardData):
+ * page/gtk/DragControllerGtk.cpp:
+ * platform/DragData.h:
+ * platform/Pasteboard.h:
+ * platform/PasteboardStrategy.h:
+ (WebCore::PasteboardStrategy::~PasteboardStrategy): Deleted.
+ * platform/PlatformPasteboard.h:
+ * platform/gtk/DragDataGtk.cpp:
+ * platform/gtk/PasteboardGtk.cpp:
+ (WebCore::Pasteboard::createPrivate):
+ (WebCore::Pasteboard::createForDragAndDrop):
+ (WebCore::Pasteboard::Pasteboard):
+ (WebCore::Pasteboard::selectionData):
+ (WebCore::selectionDataTypeFromHTMLClipboardType):
+ (WebCore::Pasteboard::writeToClipboard):
+ (WebCore::Pasteboard::readFromClipboard):
+ (WebCore::Pasteboard::writeString):
+ (WebCore::Pasteboard::writePlainText):
+ (WebCore::Pasteboard::write):
+ (WebCore::Pasteboard::writePasteboard):
+ (WebCore::Pasteboard::clear):
+ (WebCore::Pasteboard::canSmartReplace):
+ (WebCore::Pasteboard::read):
+ (WebCore::Pasteboard::hasData):
+ (WebCore::Pasteboard::types):
+ (WebCore::Pasteboard::readString):
+ (WebCore::Pasteboard::readFilenames):
+ * platform/gtk/PasteboardHelper.cpp:
+ (WebCore::PasteboardHelper::getClipboardContents):
+ (WebCore::PasteboardHelper::targetListForSelectionData):
+ (WebCore::PasteboardHelper::fillSelectionData):
+ (WebCore::ClipboardSetData::ClipboardSetData):
+ (WebCore::getClipboardContentsCallback):
+ (WebCore::PasteboardHelper::writeClipboardContents):
+ (WebCore::clearClipboardContentsCallback): Deleted.
+ * platform/gtk/PasteboardHelper.h:
+ * platform/gtk/PlatformPasteboardGtk.cpp:
+ (WebCore::PlatformPasteboard::writeToClipboard):
+ (WebCore::PlatformPasteboard::readFromClipboard):
+ * platform/gtk/SelectionData.cpp: Renamed from Source/WebCore/platform/gtk/DataObjectGtk.cpp.
+ (WebCore::SelectionData::setText):
+ (WebCore::SelectionData::setURIList):
+ (WebCore::SelectionData::setURL):
+ (WebCore::SelectionData::urlLabel):
+ (WebCore::SelectionData::clearAllExceptFilenames):
+ (WebCore::SelectionData::clearAll):
+ * platform/gtk/SelectionData.h: Renamed from Source/WebCore/platform/gtk/DataObjectGtk.h.
+ (WebCore::SelectionData::create):
+ (WebCore::SelectionData::text):
+ (WebCore::SelectionData::hasText):
+ (WebCore::SelectionData::clearText):
+ (WebCore::SelectionData::setMarkup):
+ (WebCore::SelectionData::markup):
+ (WebCore::SelectionData::hasMarkup):
+ (WebCore::SelectionData::clearMarkup):
+ (WebCore::SelectionData::hasURL):
+ (WebCore::SelectionData::clearURL):
+ (WebCore::SelectionData::filenames):
+ (WebCore::SelectionData::hasURIList):
+ (WebCore::SelectionData::hasFilenames):
+ (WebCore::SelectionData::setImage):
+ (WebCore::SelectionData::image):
+ (WebCore::SelectionData::hasImage):
+ (WebCore::SelectionData::unknownTypeData):
+ (WebCore::SelectionData::unknownTypes):
+ (WebCore::SelectionData::hasUnknownTypeData):
+ (WebCore::SelectionData::canSmartReplace):
+ (WebCore::SelectionData::url): Deleted.
+ (WebCore::SelectionData::uriList): Deleted.
+ (WebCore::SelectionData::clearURIList): Deleted.
+ (WebCore::SelectionData::clearImage): Deleted.
+ (WebCore::SelectionData::setUnknownTypeData): Deleted.
+
</ins><span class="cx"> 2016-09-22 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> CachedResourceRequest should store a SecurityOrigin
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (206255 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake 2016-09-22 08:57:12 UTC (rev 206255)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2016-09-22 12:14:39 UTC (rev 206256)
</span><span class="lines">@@ -149,9 +149,12 @@
</span><span class="cx"> platform/graphics/x11/PlatformDisplayX11.cpp
</span><span class="cx"> platform/graphics/x11/XUniqueResource.cpp
</span><span class="cx">
</span><ins>+ platform/gtk/DragDataGtk.cpp
</ins><span class="cx"> platform/gtk/ErrorsGtk.cpp
</span><span class="cx"> platform/gtk/MIMETypeRegistryGtk.cpp
</span><ins>+ platform/gtk/PasteboardGtk.cpp
</ins><span class="cx"> platform/gtk/ScrollAnimatorGtk.cpp
</span><ins>+ platform/gtk/SelectionData.cpp
</ins><span class="cx"> platform/gtk/TemporaryLinkStubs.cpp
</span><span class="cx"> platform/gtk/UserAgentGtk.cpp
</span><span class="cx">
</span><span class="lines">@@ -210,14 +213,11 @@
</span><span class="cx"> platform/graphics/gtk/ImageGtk.cpp
</span><span class="cx">
</span><span class="cx"> platform/gtk/CursorGtk.cpp
</span><del>- platform/gtk/DataObjectGtk.cpp
- platform/gtk/DragDataGtk.cpp
</del><span class="cx"> platform/gtk/DragImageGtk.cpp
</span><span class="cx"> platform/gtk/GRefPtrGtk.cpp
</span><span class="cx"> platform/gtk/GtkUtilities.cpp
</span><span class="cx"> platform/gtk/GtkVersioning.c
</span><span class="cx"> platform/gtk/LocalizedStringsGtk.cpp
</span><del>- platform/gtk/PasteboardGtk.cpp
</del><span class="cx"> platform/gtk/PasteboardHelper.cpp
</span><span class="cx"> platform/gtk/PlatformKeyboardEventGtk.cpp
</span><span class="cx"> platform/gtk/PlatformMouseEventGtk.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreeditinggtkEditorGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/gtk/EditorGtk.cpp (206255 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/gtk/EditorGtk.cpp 2016-09-22 08:57:12 UTC (rev 206255)
+++ trunk/Source/WebCore/editing/gtk/EditorGtk.cpp 2016-09-22 12:14:39 UTC (rev 206256)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> #include "Editor.h"
</span><span class="cx">
</span><span class="cx"> #include "CachedImage.h"
</span><del>-#include "DataObjectGtk.h"
</del><span class="cx"> #include "DocumentFragment.h"
</span><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "HTMLEmbedElement.h"
</span><span class="lines">@@ -41,6 +40,7 @@
</span><span class="cx"> #include "RenderImage.h"
</span><span class="cx"> #include "SVGElement.h"
</span><span class="cx"> #include "SVGImageElement.h"
</span><ins>+#include "SelectionData.h"
</ins><span class="cx"> #include "XLinkNames.h"
</span><span class="cx"> #include "markup.h"
</span><span class="cx">
</span><span class="lines">@@ -53,16 +53,16 @@
</span><span class="cx"> if (!pasteboard.hasData())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- const auto& dataObject = pasteboard.dataObject();
- if (dataObject.hasMarkup() && frame.document())
- return createFragmentFromMarkup(*frame.document(), dataObject.markup(), emptyString(), DisallowScriptingAndPluginContent);
</del><ins>+ const auto& selection = pasteboard.selectionData();
+ if (selection.hasMarkup() && frame.document())
+ return createFragmentFromMarkup(*frame.document(), selection.markup(), emptyString(), DisallowScriptingAndPluginContent);
</ins><span class="cx">
</span><span class="cx"> if (!allowPlainText)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- if (dataObject.hasText()) {
</del><ins>+ if (selection.hasText()) {
</ins><span class="cx"> chosePlainText = true;
</span><del>- return createFragmentFromText(range, dataObject.text());
</del><ins>+ return createFragmentFromText(range, selection.text());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCorepagegtkDragControllerGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/gtk/DragControllerGtk.cpp (206255 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/gtk/DragControllerGtk.cpp 2016-09-22 08:57:12 UTC (rev 206255)
+++ trunk/Source/WebCore/page/gtk/DragControllerGtk.cpp 2016-09-22 12:14:39 UTC (rev 206256)
</span><span class="lines">@@ -26,16 +26,12 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "DragController.h"
</span><span class="cx">
</span><del>-#include "DataObjectGtk.h"
</del><span class="cx"> #include "DataTransfer.h"
</span><span class="cx"> #include "Document.h"
</span><del>-#include "DocumentFragment.h"
</del><span class="cx"> #include "DragData.h"
</span><span class="cx"> #include "Editor.h"
</span><span class="cx"> #include "Element.h"
</span><span class="cx"> #include "Frame.h"
</span><del>-#include "FrameView.h"
-#include "Page.h"
</del><span class="cx"> #include "Pasteboard.h"
</span><span class="cx"> #include "markup.h"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformDragDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/DragData.h (206255 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/DragData.h 2016-09-22 08:57:12 UTC (rev 206255)
+++ trunk/Source/WebCore/platform/DragData.h 2016-09-22 12:14:39 UTC (rev 206256)
</span><span class="lines">@@ -50,9 +50,9 @@
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx"> #elif PLATFORM(GTK)
</span><span class="cx"> namespace WebCore {
</span><del>-class DataObjectGtk;
</del><ins>+class SelectionData;
</ins><span class="cx"> }
</span><del>-typedef WebCore::DataObjectGtk* DragDataRef;
</del><ins>+typedef WebCore::SelectionData* DragDataRef;
</ins><span class="cx"> #elif PLATFORM(EFL) || PLATFORM(IOS)
</span><span class="cx"> typedef void* DragDataRef;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPasteboardh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Pasteboard.h (206255 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Pasteboard.h 2016-09-22 08:57:12 UTC (rev 206255)
+++ trunk/Source/WebCore/platform/Pasteboard.h 2016-09-22 12:14:39 UTC (rev 206256)
</span><span class="lines">@@ -50,12 +50,12 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class DataObjectGtk;
</del><span class="cx"> class DocumentFragment;
</span><span class="cx"> class DragData;
</span><span class="cx"> class Element;
</span><span class="cx"> class Frame;
</span><span class="cx"> class Range;
</span><ins>+class SelectionData;
</ins><span class="cx"> class SharedBuffer;
</span><span class="cx">
</span><span class="cx"> enum ShouldSerializeSelectedTextForDataTransfer { DefaultSelectedTextType, IncludeImageAltTextForDataTransfer };
</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(DataObjectGtk&);
</del><ins>+ explicit Pasteboard(SelectionData&);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><del>- const DataObjectGtk& dataObject() const;
</del><ins>+ const SelectionData& selectionData() const;
</ins><span class="cx"> static std::unique_ptr<Pasteboard> createForGlobalSelection();
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -222,7 +222,7 @@
</span><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> void writeToClipboard();
</span><span class="cx"> void readFromClipboard();
</span><del>- Ref<DataObjectGtk> m_dataObject;
</del><ins>+ Ref<SelectionData> m_selectionData;
</ins><span class="cx"> String m_name;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPasteboardStrategyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/PasteboardStrategy.h (206255 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/PasteboardStrategy.h 2016-09-22 08:57:12 UTC (rev 206255)
+++ trunk/Source/WebCore/platform/PasteboardStrategy.h 2016-09-22 12:14:39 UTC (rev 206256)
</span><span class="lines">@@ -33,15 +33,12 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class Color;
</span><ins>+class SelectionData;
</ins><span class="cx"> class SharedBuffer;
</span><span class="cx"> class URL;
</span><span class="cx"> struct PasteboardImage;
</span><span class="cx"> struct PasteboardWebContent;
</span><span class="cx">
</span><del>-#if PLATFORM(GTK)
-class DataObjectGtk;
-#endif
-
</del><span class="cx"> class PasteboardStrategy {
</span><span class="cx"> public:
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -73,8 +70,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 DataObjectGtk&) = 0;
- virtual Ref<DataObjectGtk> readFromClipboard(const String& pasteboardName) = 0;
</del><ins>+ virtual void writeToClipboard(const String& pasteboardName, const SelectionData&) = 0;
+ virtual Ref<SelectionData> 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="trunkSourceWebCoreplatformPlatformPasteboardh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/PlatformPasteboard.h (206255 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/PlatformPasteboard.h 2016-09-22 08:57:12 UTC (rev 206255)
+++ trunk/Source/WebCore/platform/PlatformPasteboard.h 2016-09-22 12:14:39 UTC (rev 206256)
</span><span class="lines">@@ -43,15 +43,12 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class Color;
</span><ins>+class SelectionData;
</ins><span class="cx"> class SharedBuffer;
</span><span class="cx"> class URL;
</span><span class="cx"> struct PasteboardImage;
</span><span class="cx"> struct PasteboardWebContent;
</span><span class="cx">
</span><del>-#if PLATFORM(GTK)
-class DataObjectGtk;
-#endif
-
</del><span class="cx"> class PlatformPasteboard {
</span><span class="cx"> public:
</span><span class="cx"> // FIXME: probably we don't need a constructor that takes a pasteboard name for iOS.
</span><span class="lines">@@ -87,8 +84,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 DataObjectGtk&, std::function<void()>&& primarySelectionCleared);
- WEBCORE_EXPORT Ref<DataObjectGtk> readFromClipboard();
</del><ins>+ WEBCORE_EXPORT void writeToClipboard(const SelectionData&, std::function<void()>&& primarySelectionCleared);
+ WEBCORE_EXPORT Ref<SelectionData> readFromClipboard();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkDataObjectGtkcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/gtk/DataObjectGtk.cpp (206255 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/DataObjectGtk.cpp 2016-09-22 08:57:12 UTC (rev 206255)
+++ trunk/Source/WebCore/platform/gtk/DataObjectGtk.cpp 2016-09-22 12:14:39 UTC (rev 206256)
</span><span class="lines">@@ -1,151 +0,0 @@
</span><del>-/*
- * Copyright (C) 2009, Martin Robinson
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "config.h"
-#include "DataObjectGtk.h"
-
-#include <gtk/gtk.h>
-#include <wtf/glib/GUniquePtr.h>
-#include <wtf/text/CString.h>
-#include <wtf/text/StringBuilder.h>
-
-namespace WebCore {
-
-static void replaceNonBreakingSpaceWithSpace(String& str)
-{
- static const UChar NonBreakingSpaceCharacter = 0xA0;
- static const UChar SpaceCharacter = ' ';
- str.replace(NonBreakingSpaceCharacter, SpaceCharacter);
-}
-
-const HashMap<String, String>& DataObjectGtk::unknownTypes() const
-{
- return m_unknownTypeData;
-}
-
-void DataObjectGtk::setText(const String& newText)
-{
- m_text = newText;
- replaceNonBreakingSpaceWithSpace(m_text);
-}
-
-void DataObjectGtk::setMarkup(const String& newMarkup)
-{
- m_markup = newMarkup;
-}
-
-void DataObjectGtk::setURIList(const String& uriListString)
-{
- m_uriList = uriListString;
-
- // This code is originally from: platform/chromium/ChromiumDataObject.cpp.
- // FIXME: We should make this code cross-platform eventually.
-
- // Line separator is \r\n per RFC 2483 - however, for compatibility
- // reasons we also allow just \n here.
- Vector<String> uriList;
- uriListString.split('\n', uriList);
-
- // Process the input and copy the first valid URL into the url member.
- // In case no URLs can be found, subsequent calls to getData("URL")
- // will get an empty string. This is in line with the HTML5 spec (see
- // "The DragEvent and DataTransfer interfaces"). Also extract all filenames
- // from the URI list.
- bool setURL = false;
- for (size_t i = 0; i < uriList.size(); ++i) {
- String& line = uriList[i];
- line = line.stripWhiteSpace();
- if (line.isEmpty())
- continue;
- if (line[0] == '#')
- continue;
-
- URL url = URL(URL(), line);
- if (url.isValid()) {
- if (!setURL) {
- m_url = url;
- setURL = true;
- }
-
- GUniqueOutPtr<GError> error;
- GUniquePtr<gchar> filename(g_filename_from_uri(line.utf8().data(), 0, &error.outPtr()));
- if (!error && filename)
- m_filenames.append(String::fromUTF8(filename.get()));
- }
- }
-}
-
-void DataObjectGtk::setURL(const URL& url, const String& label)
-{
- m_url = url;
- m_uriList = url;
- setText(url.string());
-
- String actualLabel(label);
- if (actualLabel.isEmpty())
- actualLabel = url;
-
- StringBuilder markup;
- markup.append("<a href=\"");
- markup.append(url.string());
- markup.append("\">");
- GUniquePtr<gchar> escaped(g_markup_escape_text(actualLabel.utf8().data(), -1));
- markup.append(String::fromUTF8(escaped.get()));
- markup.append("</a>");
- setMarkup(markup.toString());
-}
-
-void DataObjectGtk::clearText()
-{
- m_text = emptyString();
-}
-
-void DataObjectGtk::clearMarkup()
-{
- m_markup = emptyString();
-}
-
-String DataObjectGtk::urlLabel() const
-{
- if (hasText())
- return text();
-
- if (hasURL())
- return url();
-
- return String();
-}
-
-void DataObjectGtk::clearAllExceptFilenames()
-{
- m_text = emptyString();
- m_markup = emptyString();
- m_uriList = emptyString();
- m_url = URL();
- m_image = nullptr;
- m_unknownTypeData.clear();
- m_canSmartReplace = false;
-}
-
-void DataObjectGtk::clearAll()
-{
- clearAllExceptFilenames();
- m_filenames.clear();
-}
-
-}
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkDataObjectGtkh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/gtk/DataObjectGtk.h (206255 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/DataObjectGtk.h 2016-09-22 08:57:12 UTC (rev 206255)
+++ trunk/Source/WebCore/platform/gtk/DataObjectGtk.h 2016-09-22 12:14:39 UTC (rev 206256)
</span><span class="lines">@@ -1,81 +0,0 @@
</span><del>-/*
- * Copyright (C) 2009, Martin Robinson
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#pragma once
-
-#include "Image.h"
-#include "URL.h"
-#include <wtf/HashMap.h>
-#include <wtf/RefCounted.h>
-#include <wtf/text/StringHash.h>
-
-namespace WebCore {
-
-class DataObjectGtk : public RefCounted<DataObjectGtk> {
-public:
- static Ref<DataObjectGtk> create()
- {
- return adoptRef(*new DataObjectGtk);
- }
-
- const URL& url() const { return m_url; }
- const String& uriList() const { return m_uriList; }
- const Vector<String>& filenames() const { return m_filenames; }
- Image* image() const { return m_image.get(); }
- void setImage(Image* newImage) { m_image = newImage; }
- void setURL(const URL&, const String&);
- bool hasUnknownTypeData() const { return !m_unknownTypeData.isEmpty(); }
- bool hasText() const { return !m_text.isEmpty(); }
- bool hasMarkup() const { return !m_markup.isEmpty(); }
- bool hasURIList() const { return !m_uriList.isEmpty(); }
- bool hasURL() const { return !m_url.isEmpty() && m_url.isValid(); }
- bool hasFilenames() const { return !m_filenames.isEmpty(); }
- bool hasImage() const { return m_image; }
- bool canSmartReplace() const { return m_canSmartReplace; }
- void clearURIList() { m_uriList = emptyString(); }
- void clearURL() { m_url = URL(); }
- void clearImage() { m_image = nullptr; }
-
- String text() const { return m_text; }
- String markup() const { return m_markup; }
- String unknownTypeData(const String& type) const { return m_unknownTypeData.get(type); }
- const HashMap<String, String>& unknownTypes() const;
- void setText(const String&);
- void setMarkup(const String&);
- void setUnknownTypeData(const String& type, const String& data) { m_unknownTypeData.set(type, data); }
- void setURIList(const String&);
- void setCanSmartReplace(bool canSmartReplace) { m_canSmartReplace = canSmartReplace; }
- String urlLabel() const;
-
- void clearAllExceptFilenames();
- void clearAll();
- void clearText();
- void clearMarkup();
-
-private:
- String m_text;
- String m_markup;
- URL m_url;
- String m_uriList;
- Vector<String> m_filenames;
- RefPtr<Image> m_image;
- HashMap<String, String> m_unknownTypeData;
- bool m_canSmartReplace { false };
-};
-
-}
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkDragDataGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/DragDataGtk.cpp (206255 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/DragDataGtk.cpp 2016-09-22 08:57:12 UTC (rev 206255)
+++ trunk/Source/WebCore/platform/gtk/DragDataGtk.cpp 2016-09-22 12:14:39 UTC (rev 206256)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "DragData.h"
</span><span class="cx">
</span><del>-#include "DataObjectGtk.h"
</del><ins>+#include "SelectionData.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkPasteboardGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp (206255 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp 2016-09-22 08:57:12 UTC (rev 206255)
+++ trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp 2016-09-22 12:14:39 UTC (rev 206256)
</span><span class="lines">@@ -20,11 +20,11 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "Pasteboard.h"
</span><span class="cx">
</span><del>-#include "DataObjectGtk.h"
</del><span class="cx"> #include "DragData.h"
</span><span class="cx"> #include "Image.h"
</span><span class="cx"> #include "PasteboardStrategy.h"
</span><span class="cx"> #include "PlatformStrategies.h"
</span><ins>+#include "SelectionData.h"
</ins><span class="cx"> #include "URL.h"
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><span class="lines">@@ -51,13 +51,13 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<Pasteboard> Pasteboard::createPrivate()
</span><span class="cx"> {
</span><del>- return std::make_unique<Pasteboard>(DataObjectGtk::create());
</del><ins>+ return std::make_unique<Pasteboard>(SelectionData::create());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><span class="cx"> std::unique_ptr<Pasteboard> Pasteboard::createForDragAndDrop()
</span><span class="cx"> {
</span><del>- return std::make_unique<Pasteboard>(DataObjectGtk::create());
</del><ins>+ return std::make_unique<Pasteboard>(SelectionData::create());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<Pasteboard> Pasteboard::createForDragAndDrop(const DragData& dragData)
</span><span class="lines">@@ -76,13 +76,13 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Pasteboard::Pasteboard(DataObjectGtk& dataObject)
- : m_dataObject(dataObject)
</del><ins>+Pasteboard::Pasteboard(SelectionData& selectionData)
+ : m_selectionData(selectionData)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Pasteboard::Pasteboard(const String& name)
</span><del>- : m_dataObject(DataObjectGtk::create())
</del><ins>+ : m_selectionData(SelectionData::create())
</ins><span class="cx"> , m_name(name)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -91,12 +91,12 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const DataObjectGtk& Pasteboard::dataObject() const
</del><ins>+const SelectionData& Pasteboard::selectionData() const
</ins><span class="cx"> {
</span><del>- return m_dataObject.get();
</del><ins>+ return m_selectionData.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static ClipboardDataType dataObjectTypeFromHTMLClipboardType(const String& rawType)
</del><ins>+static ClipboardDataType selectionDataTypeFromHTMLClipboardType(const String& rawType)
</ins><span class="cx"> {
</span><span class="cx"> String type(rawType.stripWhiteSpace());
</span><span class="cx">
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> if (m_name.isNull())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- platformStrategies()->pasteboardStrategy()->writeToClipboard(m_name, m_dataObject);
</del><ins>+ platformStrategies()->pasteboardStrategy()->writeToClipboard(m_name, m_selectionData);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Pasteboard::readFromClipboard()
</span><span class="lines">@@ -131,24 +131,24 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_name.isNull())
</span><span class="cx"> return;
</span><del>- m_dataObject = platformStrategies()->pasteboardStrategy()->readFromClipboard(m_name);
</del><ins>+ m_selectionData = platformStrategies()->pasteboardStrategy()->readFromClipboard(m_name);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Pasteboard::writeString(const String& type, const String& data)
</span><span class="cx"> {
</span><del>- switch (dataObjectTypeFromHTMLClipboardType(type)) {
</del><ins>+ switch (selectionDataTypeFromHTMLClipboardType(type)) {
</ins><span class="cx"> case ClipboardDataTypeURIList:
</span><span class="cx"> case ClipboardDataTypeURL:
</span><del>- m_dataObject->setURIList(data);
</del><ins>+ m_selectionData->setURIList(data);
</ins><span class="cx"> return;
</span><span class="cx"> case ClipboardDataTypeMarkup:
</span><del>- m_dataObject->setMarkup(data);
</del><ins>+ m_selectionData->setMarkup(data);
</ins><span class="cx"> return;
</span><span class="cx"> case ClipboardDataTypeText:
</span><del>- m_dataObject->setText(data);
</del><ins>+ m_selectionData->setText(data);
</ins><span class="cx"> return;
</span><span class="cx"> case ClipboardDataTypeUnknown:
</span><del>- m_dataObject->setUnknownTypeData(type, data);
</del><ins>+ m_selectionData->setUnknownTypeData(type, data);
</ins><span class="cx"> return;
</span><span class="cx"> case ClipboardDataTypeImage:
</span><span class="cx"> break;
</span><span class="lines">@@ -157,9 +157,9 @@
</span><span class="cx">
</span><span class="cx"> void Pasteboard::writePlainText(const String& text, SmartReplaceOption smartReplaceOption)
</span><span class="cx"> {
</span><del>- m_dataObject->clearAll();
- m_dataObject->setText(text);
- m_dataObject->setCanSmartReplace(smartReplaceOption == CanSmartReplace);
</del><ins>+ m_selectionData->clearAll();
+ m_selectionData->setText(text);
+ m_selectionData->setCanSmartReplace(smartReplaceOption == CanSmartReplace);
</ins><span class="cx">
</span><span class="cx"> writeToClipboard();
</span><span class="cx"> }
</span><span class="lines">@@ -168,8 +168,8 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!pasteboardURL.url.isEmpty());
</span><span class="cx">
</span><del>- m_dataObject->clearAll();
- m_dataObject->setURL(pasteboardURL.url, pasteboardURL.title);
</del><ins>+ m_selectionData->clearAll();
+ m_selectionData->setURL(pasteboardURL.url, pasteboardURL.title);
</ins><span class="cx">
</span><span class="cx"> writeToClipboard();
</span><span class="cx"> }
</span><span class="lines">@@ -176,12 +176,12 @@
</span><span class="cx">
</span><span class="cx"> void Pasteboard::write(const PasteboardImage& pasteboardImage)
</span><span class="cx"> {
</span><del>- m_dataObject->clearAll();
</del><ins>+ m_selectionData->clearAll();
</ins><span class="cx"> if (!pasteboardImage.url.url.isEmpty()) {
</span><del>- m_dataObject->setURL(pasteboardImage.url.url, pasteboardImage.url.title);
- m_dataObject->setMarkup(pasteboardImage.url.markup);
</del><ins>+ m_selectionData->setURL(pasteboardImage.url.url, pasteboardImage.url.title);
+ m_selectionData->setMarkup(pasteboardImage.url.markup);
</ins><span class="cx"> }
</span><del>- m_dataObject->setImage(pasteboardImage.image.get());
</del><ins>+ m_selectionData->setImage(pasteboardImage.image.get());
</ins><span class="cx">
</span><span class="cx"> writeToClipboard();
</span><span class="cx"> }
</span><span class="lines">@@ -188,10 +188,10 @@
</span><span class="cx">
</span><span class="cx"> void Pasteboard::write(const PasteboardWebContent& pasteboardContent)
</span><span class="cx"> {
</span><del>- m_dataObject->clearAll();
- m_dataObject->setText(pasteboardContent.text);
- m_dataObject->setMarkup(pasteboardContent.markup);
- m_dataObject->setCanSmartReplace(pasteboardContent.canSmartCopyOrDelete);
</del><ins>+ m_selectionData->clearAll();
+ m_selectionData->setText(pasteboardContent.text);
+ m_selectionData->setMarkup(pasteboardContent.markup);
+ m_selectionData->setCanSmartReplace(pasteboardContent.canSmartCopyOrDelete);
</ins><span class="cx">
</span><span class="cx"> writeToClipboard();
</span><span class="cx"> }
</span><span class="lines">@@ -198,22 +198,22 @@
</span><span class="cx">
</span><span class="cx"> void Pasteboard::writePasteboard(const Pasteboard& sourcePasteboard)
</span><span class="cx"> {
</span><del>- const auto& sourceDataObject = sourcePasteboard.dataObject();
- m_dataObject->clearAll();
</del><ins>+ const auto& sourceDataObject = sourcePasteboard.selectionData();
+ m_selectionData->clearAll();
</ins><span class="cx">
</span><span class="cx"> if (sourceDataObject.hasText())
</span><del>- m_dataObject->setText(sourceDataObject.text());
</del><ins>+ m_selectionData->setText(sourceDataObject.text());
</ins><span class="cx"> if (sourceDataObject.hasMarkup())
</span><del>- m_dataObject->setMarkup(sourceDataObject.markup());
</del><ins>+ m_selectionData->setMarkup(sourceDataObject.markup());
</ins><span class="cx"> if (sourceDataObject.hasURL())
</span><del>- m_dataObject->setURL(sourceDataObject.url(), sourceDataObject.urlLabel());
</del><ins>+ m_selectionData->setURL(sourceDataObject.url(), sourceDataObject.urlLabel());
</ins><span class="cx"> if (sourceDataObject.hasURIList())
</span><del>- m_dataObject->setURIList(sourceDataObject.uriList());
</del><ins>+ m_selectionData->setURIList(sourceDataObject.uriList());
</ins><span class="cx"> if (sourceDataObject.hasImage())
</span><del>- m_dataObject->setImage(sourceDataObject.image());
</del><ins>+ m_selectionData->setImage(sourceDataObject.image());
</ins><span class="cx"> if (sourceDataObject.hasUnknownTypeData()) {
</span><span class="cx"> for (auto& it : sourceDataObject.unknownTypes())
</span><del>- m_dataObject->setUnknownTypeData(it.key, it.value);
</del><ins>+ m_selectionData->setUnknownTypeData(it.key, it.value);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> writeToClipboard();
</span><span class="lines">@@ -225,28 +225,28 @@
</span><span class="cx"> // does not affect whether any files were included in the drag, so the types
</span><span class="cx"> // attribute's list might still not be empty after calling clearData() (it would
</span><span class="cx"> // still contain the "Files" string if any files were included in the drag)."
</span><del>- m_dataObject->clearAllExceptFilenames();
</del><ins>+ m_selectionData->clearAllExceptFilenames();
</ins><span class="cx"> writeToClipboard();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Pasteboard::clear(const String& type)
</span><span class="cx"> {
</span><del>- switch (dataObjectTypeFromHTMLClipboardType(type)) {
</del><ins>+ switch (selectionDataTypeFromHTMLClipboardType(type)) {
</ins><span class="cx"> case ClipboardDataTypeURIList:
</span><span class="cx"> case ClipboardDataTypeURL:
</span><del>- m_dataObject->clearURIList();
</del><ins>+ m_selectionData->clearURIList();
</ins><span class="cx"> break;
</span><span class="cx"> case ClipboardDataTypeMarkup:
</span><del>- m_dataObject->clearMarkup();
</del><ins>+ m_selectionData->clearMarkup();
</ins><span class="cx"> break;
</span><span class="cx"> case ClipboardDataTypeText:
</span><del>- m_dataObject->clearText();
</del><ins>+ m_selectionData->clearText();
</ins><span class="cx"> break;
</span><span class="cx"> case ClipboardDataTypeImage:
</span><del>- m_dataObject->clearImage();
</del><ins>+ m_selectionData->clearImage();
</ins><span class="cx"> break;
</span><span class="cx"> case ClipboardDataTypeUnknown:
</span><del>- m_dataObject->clearAll();
</del><ins>+ m_selectionData->clearAll();
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -256,7 +256,7 @@
</span><span class="cx"> bool Pasteboard::canSmartReplace()
</span><span class="cx"> {
</span><span class="cx"> readFromClipboard();
</span><del>- return m_dataObject->canSmartReplace();
</del><ins>+ return m_selectionData->canSmartReplace();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><span class="lines">@@ -268,13 +268,13 @@
</span><span class="cx"> void Pasteboard::read(PasteboardPlainText& text)
</span><span class="cx"> {
</span><span class="cx"> readFromClipboard();
</span><del>- text.text = m_dataObject->text();
</del><ins>+ text.text = m_selectionData->text();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Pasteboard::hasData()
</span><span class="cx"> {
</span><span class="cx"> readFromClipboard();
</span><del>- return m_dataObject->hasText() || m_dataObject->hasMarkup() || m_dataObject->hasURIList() || m_dataObject->hasImage() || m_dataObject->hasUnknownTypeData();
</del><ins>+ return m_selectionData->hasText() || m_selectionData->hasMarkup() || m_selectionData->hasURIList() || m_selectionData->hasImage() || m_selectionData->hasUnknownTypeData();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Vector<String> Pasteboard::types()
</span><span class="lines">@@ -282,24 +282,24 @@
</span><span class="cx"> readFromClipboard();
</span><span class="cx">
</span><span class="cx"> Vector<String> types;
</span><del>- if (m_dataObject->hasText()) {
</del><ins>+ if (m_selectionData->hasText()) {
</ins><span class="cx"> types.append(ASCIILiteral("text/plain"));
</span><span class="cx"> types.append(ASCIILiteral("Text"));
</span><span class="cx"> types.append(ASCIILiteral("text"));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_dataObject->hasMarkup())
</del><ins>+ if (m_selectionData->hasMarkup())
</ins><span class="cx"> types.append(ASCIILiteral("text/html"));
</span><span class="cx">
</span><del>- if (m_dataObject->hasURIList()) {
</del><ins>+ if (m_selectionData->hasURIList()) {
</ins><span class="cx"> types.append(ASCIILiteral("text/uri-list"));
</span><span class="cx"> types.append(ASCIILiteral("URL"));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_dataObject->hasFilenames())
</del><ins>+ if (m_selectionData->hasFilenames())
</ins><span class="cx"> types.append(ASCIILiteral("Files"));
</span><span class="cx">
</span><del>- for (auto& key : m_dataObject->unknownTypes().keys())
</del><ins>+ for (auto& key : m_selectionData->unknownTypes().keys())
</ins><span class="cx"> types.append(key);
</span><span class="cx">
</span><span class="cx"> return types;
</span><span class="lines">@@ -309,17 +309,17 @@
</span><span class="cx"> {
</span><span class="cx"> readFromClipboard();
</span><span class="cx">
</span><del>- switch (dataObjectTypeFromHTMLClipboardType(type)) {
</del><ins>+ switch (selectionDataTypeFromHTMLClipboardType(type)) {
</ins><span class="cx"> case ClipboardDataTypeURIList:
</span><del>- return m_dataObject->uriList();
</del><ins>+ return m_selectionData->uriList();
</ins><span class="cx"> case ClipboardDataTypeURL:
</span><del>- return m_dataObject->url();
</del><ins>+ return m_selectionData->url();
</ins><span class="cx"> case ClipboardDataTypeMarkup:
</span><del>- return m_dataObject->markup();
</del><ins>+ return m_selectionData->markup();
</ins><span class="cx"> case ClipboardDataTypeText:
</span><del>- return m_dataObject->text();
</del><ins>+ return m_selectionData->text();
</ins><span class="cx"> case ClipboardDataTypeUnknown:
</span><del>- return m_dataObject->unknownTypeData(type);
</del><ins>+ return m_selectionData->unknownTypeData(type);
</ins><span class="cx"> case ClipboardDataTypeImage:
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -330,7 +330,7 @@
</span><span class="cx"> Vector<String> Pasteboard::readFilenames()
</span><span class="cx"> {
</span><span class="cx"> readFromClipboard();
</span><del>- return m_dataObject->filenames();
</del><ins>+ return m_selectionData->filenames();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkPasteboardHelpercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/PasteboardHelper.cpp (206255 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/PasteboardHelper.cpp 2016-09-22 08:57:12 UTC (rev 206255)
+++ trunk/Source/WebCore/platform/gtk/PasteboardHelper.cpp 2016-09-22 12:14:39 UTC (rev 206256)
</span><span class="lines">@@ -23,8 +23,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "PasteboardHelper.h"
</span><span class="cx">
</span><del>-#include "DataObjectGtk.h"
</del><span class="cx"> #include "GtkVersioning.h"
</span><ins>+#include "SelectionData.h"
</ins><span class="cx"> #include <gtk/gtk.h>
</span><span class="cx"> #include <wtf/TemporaryChange.h>
</span><span class="cx"> #include <wtf/glib/GUniquePtr.h>
</span><span class="lines">@@ -89,12 +89,12 @@
</span><span class="cx"> return String::fromUTF8(markupString.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PasteboardHelper::getClipboardContents(GtkClipboard* clipboard, DataObjectGtk& dataObject)
</del><ins>+void PasteboardHelper::getClipboardContents(GtkClipboard* clipboard, SelectionData& selection)
</ins><span class="cx"> {
</span><span class="cx"> if (gtk_clipboard_wait_is_text_available(clipboard)) {
</span><span class="cx"> GUniquePtr<gchar> textData(gtk_clipboard_wait_for_text(clipboard));
</span><span class="cx"> if (textData)
</span><del>- dataObject.setText(String::fromUTF8(textData.get()));
</del><ins>+ selection.setText(String::fromUTF8(textData.get()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (gtk_clipboard_wait_is_target_available(clipboard, markupAtom)) {
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> if (GtkSelectionData* data = gtk_clipboard_wait_for_contents(clipboard, markupAtom)) {
</span><span class="cx"> String markup(selectionDataToUTF8String(data));
</span><span class="cx"> removeMarkupPrefix(markup);
</span><del>- dataObject.setMarkup(markup);
</del><ins>+ selection.setMarkup(markup);
</ins><span class="cx"> gtk_selection_data_free(data);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -108,47 +108,71 @@
</span><span class="cx">
</span><span class="cx"> if (gtk_clipboard_wait_is_target_available(clipboard, uriListAtom)) {
</span><span class="cx"> if (GtkSelectionData* data = gtk_clipboard_wait_for_contents(clipboard, uriListAtom)) {
</span><del>- dataObject.setURIList(selectionDataToUTF8String(data));
</del><ins>+ selection.setURIList(selectionDataToUTF8String(data));
</ins><span class="cx"> gtk_selection_data_free(data);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- dataObject.setCanSmartReplace(gtk_clipboard_wait_is_target_available(clipboard, smartPasteAtom));
</del><ins>+ selection.setCanSmartReplace(gtk_clipboard_wait_is_target_available(clipboard, smartPasteAtom));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void PasteboardHelper::fillSelectionData(GtkSelectionData* selectionData, guint info, const DataObjectGtk& dataObject)
</del><ins>+GRefPtr<GtkTargetList> PasteboardHelper::targetListForSelectionData(const SelectionData& selection)
</ins><span class="cx"> {
</span><ins>+ GRefPtr<GtkTargetList> list = adoptGRef(gtk_target_list_new(nullptr, 0));
+
+ if (selection.hasText())
+ gtk_target_list_add_text_targets(list.get(), TargetTypeText);
+
+ if (selection.hasMarkup())
+ gtk_target_list_add(list.get(), markupAtom, 0, TargetTypeMarkup);
+
+ if (selection.hasURIList()) {
+ gtk_target_list_add_uri_targets(list.get(), TargetTypeURIList);
+ gtk_target_list_add(list.get(), netscapeURLAtom, 0, TargetTypeNetscapeURL);
+ }
+
+ if (selection.hasImage())
+ gtk_target_list_add_image_targets(list.get(), TargetTypeImage, TRUE);
+
+ if (selection.hasUnknownTypeData())
+ gtk_target_list_add(list.get(), unknownAtom, 0, TargetTypeUnknown);
+
+ if (selection.canSmartReplace())
+ gtk_target_list_add(list.get(), smartPasteAtom, 0, TargetTypeSmartPaste);
+
+ return list;
+}
+
+void PasteboardHelper::fillSelectionData(const SelectionData& selection, unsigned info, GtkSelectionData* selectionData)
+{
</ins><span class="cx"> if (info == TargetTypeText)
</span><del>- gtk_selection_data_set_text(selectionData, dataObject.text().utf8().data(), -1);
</del><ins>+ gtk_selection_data_set_text(selectionData, selection.text().utf8().data(), -1);
</ins><span class="cx">
</span><span class="cx"> else if (info == TargetTypeMarkup) {
</span><span class="cx"> // Some Linux applications refuse to accept pasted markup unless it is
</span><span class="cx"> // prefixed by a content-type meta tag.
</span><del>- CString markup = String(gMarkupPrefix + dataObject.markup()).utf8();
- gtk_selection_data_set(selectionData, markupAtom, 8,
- reinterpret_cast<const guchar*>(markup.data()), markup.length());
</del><ins>+ CString markup = String(gMarkupPrefix + selection.markup()).utf8();
+ gtk_selection_data_set(selectionData, markupAtom, 8, reinterpret_cast<const guchar*>(markup.data()), markup.length());
</ins><span class="cx">
</span><span class="cx"> } else if (info == TargetTypeURIList) {
</span><del>- CString uriList = dataObject.uriList().utf8();
- gtk_selection_data_set(selectionData, uriListAtom, 8,
- reinterpret_cast<const guchar*>(uriList.data()), uriList.length());
</del><ins>+ CString uriList = selection.uriList().utf8();
+ gtk_selection_data_set(selectionData, uriListAtom, 8, reinterpret_cast<const guchar*>(uriList.data()), uriList.length());
</ins><span class="cx">
</span><del>- } else if (info == TargetTypeNetscapeURL && dataObject.hasURL()) {
- String url(dataObject.url());
</del><ins>+ } else if (info == TargetTypeNetscapeURL && selection.hasURL()) {
+ String url(selection.url());
</ins><span class="cx"> String result(url);
</span><span class="cx"> result.append("\n");
</span><span class="cx">
</span><del>- if (dataObject.hasText())
- result.append(dataObject.text());
</del><ins>+ if (selection.hasText())
+ result.append(selection.text());
</ins><span class="cx"> else
</span><span class="cx"> result.append(url);
</span><span class="cx">
</span><span class="cx"> GUniquePtr<gchar> resultData(g_strdup(result.utf8().data()));
</span><del>- gtk_selection_data_set(selectionData, netscapeURLAtom, 8,
- reinterpret_cast<const guchar*>(resultData.get()), strlen(resultData.get()));
</del><ins>+ gtk_selection_data_set(selectionData, netscapeURLAtom, 8, reinterpret_cast<const guchar*>(resultData.get()), strlen(resultData.get()));
</ins><span class="cx">
</span><del>- } else if (info == TargetTypeImage && dataObject.hasImage()) {
- GRefPtr<GdkPixbuf> pixbuf = adoptGRef(dataObject.image()->getGdkPixbuf());
</del><ins>+ } else if (info == TargetTypeImage && selection.hasImage()) {
+ GRefPtr<GdkPixbuf> pixbuf = adoptGRef(selection.image()->getGdkPixbuf());
</ins><span class="cx"> gtk_selection_data_set_pixbuf(selectionData, pixbuf.get());
</span><span class="cx">
</span><span class="cx"> } else if (info == TargetTypeSmartPaste)
</span><span class="lines">@@ -158,7 +182,7 @@
</span><span class="cx"> GVariantBuilder builder;
</span><span class="cx"> g_variant_builder_init(&builder, G_VARIANT_TYPE_ARRAY);
</span><span class="cx">
</span><del>- for (auto& it : dataObject.unknownTypes()) {
</del><ins>+ for (auto& it : selection.unknownTypes()) {
</ins><span class="cx"> GUniquePtr<gchar> dictItem(g_strdup_printf("{'%s', '%s'}", it.key.utf8().data(), it.value.utf8().data()));
</span><span class="cx"> g_variant_builder_add_parsed(&builder, dictItem.get());
</span><span class="cx"> }
</span><span class="lines">@@ -169,47 +193,20 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-GRefPtr<GtkTargetList> PasteboardHelper::targetListForDataObject(const DataObjectGtk& dataObject)
</del><ins>+void PasteboardHelper::fillSelectionData(GtkSelectionData* data, unsigned /* info */, SelectionData& selection)
</ins><span class="cx"> {
</span><del>- GRefPtr<GtkTargetList> list = adoptGRef(gtk_target_list_new(nullptr, 0));
-
- if (dataObject.hasText())
- gtk_target_list_add_text_targets(list.get(), TargetTypeText);
-
- if (dataObject.hasMarkup())
- gtk_target_list_add(list.get(), markupAtom, 0, TargetTypeMarkup);
-
- if (dataObject.hasURIList()) {
- gtk_target_list_add_uri_targets(list.get(), TargetTypeURIList);
- gtk_target_list_add(list.get(), netscapeURLAtom, 0, TargetTypeNetscapeURL);
- }
-
- if (dataObject.hasImage())
- gtk_target_list_add_image_targets(list.get(), TargetTypeImage, TRUE);
-
- if (dataObject.hasUnknownTypeData())
- gtk_target_list_add(list.get(), unknownAtom, 0, TargetTypeUnknown);
-
- if (dataObject.canSmartReplace())
- gtk_target_list_add(list.get(), smartPasteAtom, 0, TargetTypeSmartPaste);
-
- return list;
-}
-
-void PasteboardHelper::fillDataObjectFromDropData(GtkSelectionData* data, guint /* info */, DataObjectGtk& dataObject)
-{
</del><span class="cx"> if (!gtk_selection_data_get_data(data))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> GdkAtom target = gtk_selection_data_get_target(data);
</span><span class="cx"> if (target == textPlainAtom)
</span><del>- dataObject.setText(selectionDataToUTF8String(data));
</del><ins>+ selection.setText(selectionDataToUTF8String(data));
</ins><span class="cx"> else if (target == markupAtom) {
</span><span class="cx"> String markup(selectionDataToUTF8String(data));
</span><span class="cx"> removeMarkupPrefix(markup);
</span><del>- dataObject.setMarkup(markup);
</del><ins>+ selection.setMarkup(markup);
</ins><span class="cx"> } else if (target == uriListAtom) {
</span><del>- dataObject.setURIList(selectionDataToUTF8String(data));
</del><ins>+ selection.setURIList(selectionDataToUTF8String(data));
</ins><span class="cx"> } else if (target == netscapeURLAtom) {
</span><span class="cx"> String urlWithLabel(selectionDataToUTF8String(data));
</span><span class="cx"> Vector<String> pieces;
</span><span class="lines">@@ -217,10 +214,10 @@
</span><span class="cx">
</span><span class="cx"> // Give preference to text/uri-list here, as it can hold more
</span><span class="cx"> // than one URI but still take the label if there is one.
</span><del>- if (!dataObject.hasURIList())
- dataObject.setURIList(pieces[0]);
</del><ins>+ if (!selection.hasURIList())
+ selection.setURIList(pieces[0]);
</ins><span class="cx"> if (pieces.size() > 1)
</span><del>- dataObject.setText(pieces[1]);
</del><ins>+ selection.setText(pieces[1]);
</ins><span class="cx"> } else if (target == unknownAtom) {
</span><span class="cx"> GRefPtr<GVariant> variant = g_variant_new_parsed(reinterpret_cast<const char*>(gtk_selection_data_get_data(data)));
</span><span class="cx">
</span><span class="lines">@@ -230,7 +227,7 @@
</span><span class="cx">
</span><span class="cx"> g_variant_iter_init(&iter, variant.get());
</span><span class="cx"> while (g_variant_iter_next(&iter, "{ss}", &key.outPtr(), &value.outPtr()))
</span><del>- dataObject.setUnknownTypeData(key.get(), value.get());
</del><ins>+ selection.setUnknownTypeData(key.get(), value.get());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -254,11 +251,11 @@
</span><span class="cx"> return dropAtoms;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static DataObjectGtk* settingClipboardDataObject = 0;
</del><ins>+static SelectionData* settingClipboardSelection;
</ins><span class="cx">
</span><span class="cx"> struct ClipboardSetData {
</span><del>- ClipboardSetData(DataObjectGtk& dataObject, std::function<void()>&& selectionClearedCallback)
- : dataObject(dataObject)
</del><ins>+ ClipboardSetData(SelectionData& selection, std::function<void()>&& selectionClearedCallback)
+ : selectionData(selection)
</ins><span class="cx"> , selectionClearedCallback(WTFMove(selectionClearedCallback))
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -267,7 +264,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Ref<DataObjectGtk> dataObject;
</del><ins>+ Ref<SelectionData> selectionData;
</ins><span class="cx"> std::function<void()> selectionClearedCallback;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -274,7 +271,7 @@
</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(data->selectionData, info, selectionData);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void clearClipboardContentsCallback(GtkClipboard*, gpointer userData)
</span><span class="lines">@@ -284,16 +281,16 @@
</span><span class="cx"> data->selectionClearedCallback();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PasteboardHelper::writeClipboardContents(GtkClipboard* clipboard, const DataObjectGtk& dataObject, std::function<void()>&& primarySelectionCleared)
</del><ins>+void PasteboardHelper::writeClipboardContents(GtkClipboard* clipboard, const SelectionData& selection, std::function<void()>&& primarySelectionCleared)
</ins><span class="cx"> {
</span><del>- GRefPtr<GtkTargetList> list = targetListForDataObject(dataObject);
</del><ins>+ GRefPtr<GtkTargetList> list = targetListForSelectionData(selection);
</ins><span class="cx">
</span><span class="cx"> int numberOfTargets;
</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>- TemporaryChange<DataObjectGtk*> change(settingClipboardDataObject, const_cast<DataObjectGtk*>(&dataObject));
- auto data = std::make_unique<ClipboardSetData>(*settingClipboardDataObject, WTFMove(primarySelectionCleared));
</del><ins>+ TemporaryChange<SelectionData*> change(settingClipboardSelection, const_cast<SelectionData*>(&selection));
+ auto data = std::make_unique<ClipboardSetData>(*settingClipboardSelection, 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></pre></div>
<a id="trunkSourceWebCoreplatformgtkPasteboardHelperh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/PasteboardHelper.h (206255 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/PasteboardHelper.h 2016-09-22 08:57:12 UTC (rev 206255)
+++ trunk/Source/WebCore/platform/gtk/PasteboardHelper.h 2016-09-22 12:14:39 UTC (rev 206256)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class DataObjectGtk;
</del><ins>+class SelectionData;
</ins><span class="cx">
</span><span class="cx"> class PasteboardHelper {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(PasteboardHelper);
</span><span class="lines">@@ -43,12 +43,12 @@
</span><span class="cx"> enum SmartPasteInclusion { IncludeSmartPaste, DoNotIncludeSmartPaste };
</span><span class="cx">
</span><span class="cx"> GtkTargetList* targetList() const;
</span><del>- GRefPtr<GtkTargetList> targetListForDataObject(const DataObjectGtk&);
- void fillSelectionData(GtkSelectionData*, guint, const DataObjectGtk&);
- void fillDataObjectFromDropData(GtkSelectionData*, guint, DataObjectGtk&);
</del><ins>+ GRefPtr<GtkTargetList> targetListForSelectionData(const SelectionData&);
+ void fillSelectionData(const SelectionData&, unsigned, GtkSelectionData*);
+ void fillSelectionData(GtkSelectionData*, unsigned, SelectionData&);
</ins><span class="cx"> Vector<GdkAtom> dropAtomsForContext(GtkWidget*, GdkDragContext*);
</span><del>- void writeClipboardContents(GtkClipboard*, const DataObjectGtk&, std::function<void()>&& primarySelectionCleared = nullptr);
- void getClipboardContents(GtkClipboard*, DataObjectGtk&);
</del><ins>+ void writeClipboardContents(GtkClipboard*, const SelectionData&, std::function<void()>&& primarySelectionCleared = nullptr);
+ void getClipboardContents(GtkClipboard*, SelectionData&);
</ins><span class="cx">
</span><span class="cx"> enum PasteboardTargetType { TargetTypeMarkup, TargetTypeText, TargetTypeImage, TargetTypeURIList, TargetTypeNetscapeURL, TargetTypeSmartPaste, TargetTypeUnknown };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkPlatformPasteboardGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/PlatformPasteboardGtk.cpp (206255 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/PlatformPasteboardGtk.cpp 2016-09-22 08:57:12 UTC (rev 206255)
+++ trunk/Source/WebCore/platform/gtk/PlatformPasteboardGtk.cpp 2016-09-22 12:14:39 UTC (rev 206256)
</span><span class="lines">@@ -20,8 +20,8 @@
</span><span class="cx"> #include "PlatformPasteboard.h"
</span><span class="cx">
</span><span class="cx"> #include "Color.h"
</span><del>-#include "DataObjectGtk.h"
</del><span class="cx"> #include "PasteboardHelper.h"
</span><ins>+#include "SelectionData.h"
</ins><span class="cx"> #include "SharedBuffer.h"
</span><span class="cx"> #include "URL.h"
</span><span class="cx"> #include <gtk/gtk.h>
</span><span class="lines">@@ -34,16 +34,16 @@
</span><span class="cx"> ASSERT(m_clipboard);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PlatformPasteboard::writeToClipboard(const DataObjectGtk& dataObject, std::function<void()>&& primarySelectionCleared)
</del><ins>+void PlatformPasteboard::writeToClipboard(const SelectionData& selection, 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, selection, gtk_clipboard_get(GDK_SELECTION_PRIMARY) == m_clipboard ? WTFMove(primarySelectionCleared) : nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<DataObjectGtk> PlatformPasteboard::readFromClipboard()
</del><ins>+Ref<SelectionData> PlatformPasteboard::readFromClipboard()
</ins><span class="cx"> {
</span><del>- Ref<DataObjectGtk> dataObject(DataObjectGtk::create());
- PasteboardHelper::singleton().getClipboardContents(m_clipboard, dataObject.get());
- return dataObject;
</del><ins>+ Ref<SelectionData> selection(SelectionData::create());
+ PasteboardHelper::singleton().getClipboardContents(m_clipboard, selection.get());
+ return selection;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkSelectionDatacppfromrev206255trunkSourceWebCoreplatformgtkDataObjectGtkcpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/gtk/SelectionData.cpp (from rev 206255, trunk/Source/WebCore/platform/gtk/DataObjectGtk.cpp) (0 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/SelectionData.cpp (rev 0)
+++ trunk/Source/WebCore/platform/gtk/SelectionData.cpp 2016-09-22 12:14:39 UTC (rev 206256)
</span><span class="lines">@@ -0,0 +1,131 @@
</span><ins>+/*
+ * Copyright (C) 2009, Martin Robinson
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+#include "SelectionData.h"
+
+#include <wtf/glib/GUniquePtr.h>
+#include <wtf/text/CString.h>
+#include <wtf/text/StringBuilder.h>
+
+namespace WebCore {
+
+static void replaceNonBreakingSpaceWithSpace(String& str)
+{
+ static const UChar NonBreakingSpaceCharacter = 0xA0;
+ static const UChar SpaceCharacter = ' ';
+ str.replace(NonBreakingSpaceCharacter, SpaceCharacter);
+}
+
+void SelectionData::setText(const String& newText)
+{
+ m_text = newText;
+ replaceNonBreakingSpaceWithSpace(m_text);
+}
+
+void SelectionData::setURIList(const String& uriListString)
+{
+ m_uriList = uriListString;
+
+ // This code is originally from: platform/chromium/ChromiumDataObject.cpp.
+ // FIXME: We should make this code cross-platform eventually.
+
+ // Line separator is \r\n per RFC 2483 - however, for compatibility
+ // reasons we also allow just \n here.
+ Vector<String> uriList;
+ uriListString.split('\n', uriList);
+
+ // Process the input and copy the first valid URL into the url member.
+ // In case no URLs can be found, subsequent calls to getData("URL")
+ // will get an empty string. This is in line with the HTML5 spec (see
+ // "The DragEvent and DataTransfer interfaces"). Also extract all filenames
+ // from the URI list.
+ bool setURL = false;
+ for (size_t i = 0; i < uriList.size(); ++i) {
+ String& line = uriList[i];
+ line = line.stripWhiteSpace();
+ if (line.isEmpty())
+ continue;
+ if (line[0] == '#')
+ continue;
+
+ URL url = URL(URL(), line);
+ if (url.isValid()) {
+ if (!setURL) {
+ m_url = url;
+ setURL = true;
+ }
+
+ GUniqueOutPtr<GError> error;
+ GUniquePtr<gchar> filename(g_filename_from_uri(line.utf8().data(), 0, &error.outPtr()));
+ if (!error && filename)
+ m_filenames.append(String::fromUTF8(filename.get()));
+ }
+ }
+}
+
+void SelectionData::setURL(const URL& url, const String& label)
+{
+ m_url = url;
+ m_uriList = url;
+ setText(url.string());
+
+ String actualLabel(label);
+ if (actualLabel.isEmpty())
+ actualLabel = url;
+
+ StringBuilder markup;
+ markup.append("<a href=\"");
+ markup.append(url.string());
+ markup.append("\">");
+ GUniquePtr<gchar> escaped(g_markup_escape_text(actualLabel.utf8().data(), -1));
+ markup.append(String::fromUTF8(escaped.get()));
+ markup.append("</a>");
+ setMarkup(markup.toString());
+}
+
+const String& SelectionData::urlLabel() const
+{
+ if (hasText())
+ return text();
+
+ if (hasURL())
+ return url();
+
+ return emptyString();
+}
+
+void SelectionData::clearAllExceptFilenames()
+{
+ clearText();
+ clearMarkup();
+ clearURIList();
+ clearURL();
+ clearImage();
+
+ m_unknownTypeData.clear();
+ m_canSmartReplace = false;
+}
+
+void SelectionData::clearAll()
+{
+ clearAllExceptFilenames();
+ m_filenames.clear();
+}
+
+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkSelectionDatahfromrev206255trunkSourceWebCoreplatformgtkDataObjectGtkh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/gtk/SelectionData.h (from rev 206255, trunk/Source/WebCore/platform/gtk/DataObjectGtk.h) (0 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/SelectionData.h (rev 0)
+++ trunk/Source/WebCore/platform/gtk/SelectionData.h 2016-09-22 12:14:39 UTC (rev 206256)
</span><span class="lines">@@ -0,0 +1,87 @@
</span><ins>+/*
+ * Copyright (C) 2009, Martin Robinson
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#pragma once
+
+#include "Image.h"
+#include "URL.h"
+#include <wtf/HashMap.h>
+#include <wtf/RefCounted.h>
+#include <wtf/text/StringHash.h>
+
+namespace WebCore {
+
+class SelectionData : public RefCounted<SelectionData> {
+ WTF_MAKE_FAST_ALLOCATED;
+public:
+ static Ref<SelectionData> create()
+ {
+ return adoptRef(*new SelectionData);
+ }
+
+ void setText(const String&);
+ const String& text() const { return m_text; }
+ bool hasText() const { return !m_text.isEmpty(); }
+ void clearText() { m_text = emptyString(); }
+
+ void setMarkup(const String& newMarkup) { m_markup = newMarkup; }
+ const String& markup() const { return m_markup; }
+ bool hasMarkup() const { return !m_markup.isEmpty(); }
+ void clearMarkup() { m_markup = emptyString(); }
+
+ void setURL(const URL&, const String&);
+ const URL& url() const { return m_url; }
+ const String& urlLabel() const;
+ bool hasURL() const { return !m_url.isEmpty() && m_url.isValid(); }
+ void clearURL() { m_url = URL(); }
+
+ void setURIList(const String&);
+ const String& uriList() const { return m_uriList; }
+ const Vector<String>& filenames() const { return m_filenames; }
+ bool hasURIList() const { return !m_uriList.isEmpty(); }
+ bool hasFilenames() const { return !m_filenames.isEmpty(); }
+ void clearURIList() { m_uriList = emptyString(); }
+
+ void setImage(Image* newImage) { m_image = newImage; }
+ Image* image() const { return m_image.get(); }
+ bool hasImage() const { return m_image; }
+ void clearImage() { m_image = nullptr; }
+
+ void setUnknownTypeData(const String& type, const String& data) { m_unknownTypeData.set(type, data); }
+ String unknownTypeData(const String& type) const { return m_unknownTypeData.get(type); }
+ const HashMap<String, String>& unknownTypes() const { return m_unknownTypeData; }
+ bool hasUnknownTypeData() const { return !m_unknownTypeData.isEmpty(); }
+
+ void setCanSmartReplace(bool canSmartReplace) { m_canSmartReplace = canSmartReplace; }
+ bool canSmartReplace() const { return m_canSmartReplace; }
+
+ void clearAll();
+ void clearAllExceptFilenames();
+
+private:
+ String m_text;
+ String m_markup;
+ URL m_url;
+ String m_uriList;
+ Vector<String> m_filenames;
+ RefPtr<Image> m_image;
+ HashMap<String, String> m_unknownTypeData;
+ bool m_canSmartReplace { false };
+};
+
+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (206255 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-09-22 08:57:12 UTC (rev 206255)
+++ trunk/Source/WebKit2/ChangeLog 2016-09-22 12:14:39 UTC (rev 206256)
</span><span class="lines">@@ -1,3 +1,59 @@
</span><ins>+2016-09-22 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Rename DataObjectGtk as SelectionData
+ https://bugs.webkit.org/show_bug.cgi?id=162380
+
+ Reviewed by Žan Doberšek.
+
+ * PlatformGTK.cmake:
+ * Shared/gtk/ArgumentCodersGtk.cpp:
+ (IPC::ArgumentCoder<SelectionData>::encode):
+ (IPC::ArgumentCoder<SelectionData>::decode):
+ * Shared/gtk/ArgumentCodersGtk.h:
+ * Shared/gtk/WebSelectionData.cpp: Renamed from Source/WebKit2/Shared/gtk/PasteboardContent.cpp.
+ (WebKit::WebSelectionData::WebSelectionData):
+ (WebKit::WebSelectionData::encode):
+ (WebKit::WebSelectionData::decode):
+ * Shared/gtk/WebSelectionData.h: Renamed from Source/WebKit2/Shared/gtk/PasteboardContent.h.
+ * UIProcess/API/gtk/PageClientImpl.cpp:
+ (WebKit::PageClientImpl::startDrag):
+ * UIProcess/API/gtk/PageClientImpl.h:
+ * UIProcess/PageClient.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::performDragControllerAction):
+ (WebKit::WebPageProxy::startDrag):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * UIProcess/WebPasteboardProxy.h:
+ * UIProcess/WebPasteboardProxy.messages.in:
+ * UIProcess/gtk/DragAndDropHandler.cpp:
+ (WebKit::DragAndDropHandler::DroppingContext::DroppingContext):
+ (WebKit::DragAndDropHandler::startDrag):
+ (WebKit::DragAndDropHandler::fillDragData):
+ (WebKit::DragAndDropHandler::finishDrag):
+ (WebKit::DragAndDropHandler::dropDataSelection):
+ (WebKit::DragAndDropHandler::dragEntered):
+ (WebKit::DragAndDropHandler::dragDataSelection):
+ (WebKit::DragAndDropHandler::dragMotion):
+ (WebKit::DragAndDropHandler::dragLeave):
+ (WebKit::DragAndDropHandler::drop):
+ * UIProcess/gtk/DragAndDropHandler.h:
+ * UIProcess/gtk/WebPasteboardProxyGtk.cpp:
+ (WebKit::WebPasteboardProxy::writeToClipboard):
+ (WebKit::WebPasteboardProxy::readFromClipboard):
+ (WebKit::WebPasteboardProxy::setPrimarySelectionOwner): Deleted.
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+ (WebKit::WebPlatformStrategies::writeToClipboard):
+ (WebKit::WebPlatformStrategies::readFromClipboard):
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.h:
+ * WebProcess/WebCoreSupport/gtk/WebDragClientGtk.cpp:
+ (WebKit::WebDragClient::startDrag):
+ * WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::performDragControllerAction):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+
</ins><span class="cx"> 2016-09-21 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [macOS] Upon layout, _webView:renderingProgressDidChange: fires before the intrinsic content size is updated
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformGTK.cmake (206255 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformGTK.cmake 2016-09-22 08:57:12 UTC (rev 206255)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2016-09-22 12:14:39 UTC (rev 206256)
</span><span class="lines">@@ -71,12 +71,12 @@
</span><span class="cx"> Shared/gtk/NativeWebMouseEventGtk.cpp
</span><span class="cx"> Shared/gtk/NativeWebTouchEventGtk.cpp
</span><span class="cx"> Shared/gtk/NativeWebWheelEventGtk.cpp
</span><del>- Shared/gtk/PasteboardContent.cpp
</del><span class="cx"> Shared/gtk/PrintInfoGtk.cpp
</span><span class="cx"> Shared/gtk/ProcessExecutablePathGtk.cpp
</span><span class="cx"> Shared/gtk/WebContextMenuItemGtk.cpp
</span><span class="cx"> Shared/gtk/WebEventFactory.cpp
</span><span class="cx"> Shared/gtk/WebKit2InitializeGTK.cpp
</span><ins>+ Shared/gtk/WebSelectionData.cpp
</ins><span class="cx">
</span><span class="cx"> Shared/linux/WebMemorySamplerLinux.cpp
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedgtkArgumentCodersGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.cpp (206255 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.cpp 2016-09-22 08:57:12 UTC (rev 206255)
+++ trunk/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.cpp 2016-09-22 12:14:39 UTC (rev 206256)
</span><span class="lines">@@ -29,9 +29,9 @@
</span><span class="cx"> #include "DataReference.h"
</span><span class="cx"> #include "ShareableBitmap.h"
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><del>-#include <WebCore/DataObjectGtk.h>
</del><span class="cx"> #include <WebCore/GraphicsContext.h>
</span><span class="cx"> #include <WebCore/Image.h>
</span><ins>+#include <WebCore/SelectionData.h>
</ins><span class="cx"> #include <gtk/gtk.h>
</span><span class="cx"> #include <wtf/glib/GUniquePtr.h>
</span><span class="cx">
</span><span class="lines">@@ -66,45 +66,45 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ArgumentCoder<DataObjectGtk>::encode(Encoder& encoder, const DataObjectGtk& dataObject)
</del><ins>+void ArgumentCoder<SelectionData>::encode(Encoder& encoder, const SelectionData& selection)
</ins><span class="cx"> {
</span><del>- bool hasText = dataObject.hasText();
</del><ins>+ bool hasText = selection.hasText();
</ins><span class="cx"> encoder << hasText;
</span><span class="cx"> if (hasText)
</span><del>- encoder << dataObject.text();
</del><ins>+ encoder << selection.text();
</ins><span class="cx">
</span><del>- bool hasMarkup = dataObject.hasMarkup();
</del><ins>+ bool hasMarkup = selection.hasMarkup();
</ins><span class="cx"> encoder << hasMarkup;
</span><span class="cx"> if (hasMarkup)
</span><del>- encoder << dataObject.markup();
</del><ins>+ encoder << selection.markup();
</ins><span class="cx">
</span><del>- bool hasURL = dataObject.hasURL();
</del><ins>+ bool hasURL = selection.hasURL();
</ins><span class="cx"> encoder << hasURL;
</span><span class="cx"> if (hasURL)
</span><del>- encoder << dataObject.url().string();
</del><ins>+ encoder << selection.url().string();
</ins><span class="cx">
</span><del>- bool hasURIList = dataObject.hasURIList();
</del><ins>+ bool hasURIList = selection.hasURIList();
</ins><span class="cx"> encoder << hasURIList;
</span><span class="cx"> if (hasURIList)
</span><del>- encoder << dataObject.uriList();
</del><ins>+ encoder << selection.uriList();
</ins><span class="cx">
</span><del>- bool hasImage = dataObject.hasImage();
</del><ins>+ bool hasImage = selection.hasImage();
</ins><span class="cx"> encoder << hasImage;
</span><span class="cx"> if (hasImage)
</span><del>- encodeImage(encoder, *dataObject.image());
</del><ins>+ encodeImage(encoder, *selection.image());
</ins><span class="cx">
</span><del>- bool hasUnknownTypeData = dataObject.hasUnknownTypeData();
</del><ins>+ bool hasUnknownTypeData = selection.hasUnknownTypeData();
</ins><span class="cx"> encoder << hasUnknownTypeData;
</span><span class="cx"> if (hasUnknownTypeData)
</span><del>- encoder << dataObject.unknownTypes();
</del><ins>+ encoder << selection.unknownTypes();
</ins><span class="cx">
</span><del>- bool canSmartReplace = dataObject.canSmartReplace();
</del><ins>+ bool canSmartReplace = selection.canSmartReplace();
</ins><span class="cx"> encoder << canSmartReplace;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ArgumentCoder<DataObjectGtk>::decode(Decoder& decoder, DataObjectGtk& dataObject)
</del><ins>+bool ArgumentCoder<SelectionData>::decode(Decoder& decoder, SelectionData& selection)
</ins><span class="cx"> {
</span><del>- dataObject.clearAll();
</del><ins>+ selection.clearAll();
</ins><span class="cx">
</span><span class="cx"> bool hasText;
</span><span class="cx"> if (!decoder.decode(hasText))
</span><span class="lines">@@ -113,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>- dataObject.setText(text);
</del><ins>+ selection.setText(text);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool hasMarkup;
</span><span class="lines">@@ -123,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>- dataObject.setMarkup(markup);
</del><ins>+ selection.setMarkup(markup);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool hasURL;
</span><span class="lines">@@ -133,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>- dataObject.setURL(URL(URL(), url), String());
</del><ins>+ selection.setURL(URL(URL(), url), String());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool hasURIList;
</span><span class="lines">@@ -143,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>- dataObject.setURIList(uriList);
</del><ins>+ selection.setURIList(uriList);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool hasImage;
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx"> RefPtr<Image> image;
</span><span class="cx"> if (!decodeImage(decoder, image))
</span><span class="cx"> return false;
</span><del>- dataObject.setImage(image.get());
</del><ins>+ selection.setImage(image.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool hasUnknownTypeData;
</span><span class="lines">@@ -166,13 +166,13 @@
</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>- dataObject.setUnknownTypeData(it->key, it->value);
</del><ins>+ selection.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>- dataObject.setCanSmartReplace(canSmartReplace);
</del><ins>+ selection.setCanSmartReplace(canSmartReplace);
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedgtkArgumentCodersGtkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.h (206255 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.h 2016-09-22 08:57:12 UTC (rev 206255)
+++ trunk/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.h 2016-09-22 12:14:39 UTC (rev 206256)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> typedef struct _GtkPageSetup GtkPageSetup;
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><del>-class DataObjectGtk;
</del><ins>+class SelectionData;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace IPC {
</span><span class="lines">@@ -44,9 +44,9 @@
</span><span class="cx"> void encode(Encoder&, GtkPageSetup*);
</span><span class="cx"> bool decode(Decoder&, GRefPtr<GtkPageSetup>&);
</span><span class="cx">
</span><del>-template<> struct ArgumentCoder<WebCore::DataObjectGtk> {
- static void encode(Encoder&, const WebCore::DataObjectGtk&);
- static bool decode(Decoder&, WebCore::DataObjectGtk&);
</del><ins>+template<> struct ArgumentCoder<WebCore::SelectionData> {
+ static void encode(Encoder&, const WebCore::SelectionData&);
+ static bool decode(Decoder&, WebCore::SelectionData&);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace IPC
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedgtkPasteboardContentcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/gtk/PasteboardContent.cpp (206255 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/gtk/PasteboardContent.cpp 2016-09-22 08:57:12 UTC (rev 206255)
+++ trunk/Source/WebKit2/Shared/gtk/PasteboardContent.cpp 2016-09-22 12:14:39 UTC (rev 206256)
</span><span class="lines">@@ -1,55 +0,0 @@
</span><del>-/*
- * Copyright (C) 2016 Red Hat Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "config.h"
-#include "PasteboardContent.h"
-
-#include "ArgumentCodersGtk.h"
-#include "DataObjectGtk.h"
-#include "Decoder.h"
-#include "Encoder.h"
-#include <wtf/RetainPtr.h>
-
-namespace WebKit {
-
-PasteboardContent::PasteboardContent()
- : dataObject(WebCore::DataObjectGtk::create())
-{
-}
-
-PasteboardContent::PasteboardContent(const WebCore::DataObjectGtk& data)
- : dataObject(const_cast<WebCore::DataObjectGtk&>(data))
-{
-}
-
-PasteboardContent::PasteboardContent(Ref<WebCore::DataObjectGtk>&& data)
- : dataObject(WTFMove(data))
-{
-}
-
-void PasteboardContent::encode(IPC::Encoder& encoder) const
-{
- encoder << dataObject.get();
-}
-
-bool PasteboardContent::decode(IPC::Decoder& decoder, PasteboardContent& pasteboardContent)
-{
- return decoder.decode(pasteboardContent.dataObject.get());
-}
-
-} // namespace WebKit
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedgtkPasteboardContenth"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/gtk/PasteboardContent.h (206255 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/gtk/PasteboardContent.h 2016-09-22 08:57:12 UTC (rev 206255)
+++ trunk/Source/WebKit2/Shared/gtk/PasteboardContent.h 2016-09-22 12:14:39 UTC (rev 206256)
</span><span class="lines">@@ -1,44 +0,0 @@
</span><del>-/*
- * Copyright (C) 2016 Red Hat Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef PasteboardContent_h
-#define PasteboardContent_h
-
-#include "DataObjectGtk.h"
-
-namespace IPC {
-class Decoder;
-class Encoder;
-}
-
-namespace WebKit {
-
-struct PasteboardContent {
- PasteboardContent();
- explicit PasteboardContent(const WebCore::DataObjectGtk&);
- explicit PasteboardContent(Ref<WebCore::DataObjectGtk>&&);
-
- Ref<WebCore::DataObjectGtk> dataObject;
-
- void encode(IPC::Encoder&) const;
- static bool decode(IPC::Decoder&, PasteboardContent&);
-};
-
-} // namespace WebKit
-
-#endif // PasteboardContent_h
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedgtkWebSelectionDatacppfromrev206255trunkSourceWebKit2SharedgtkPasteboardContentcpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Shared/gtk/WebSelectionData.cpp (from rev 206255, trunk/Source/WebKit2/Shared/gtk/PasteboardContent.cpp) (0 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/gtk/WebSelectionData.cpp (rev 0)
+++ trunk/Source/WebKit2/Shared/gtk/WebSelectionData.cpp 2016-09-22 12:14:39 UTC (rev 206256)
</span><span class="lines">@@ -0,0 +1,54 @@
</span><ins>+/*
+ * Copyright (C) 2016 Red Hat Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+#include "WebSelectionData.h"
+
+#include "ArgumentCodersGtk.h"
+#include "Decoder.h"
+#include "Encoder.h"
+#include <wtf/RetainPtr.h>
+
+namespace WebKit {
+
+WebSelectionData::WebSelectionData()
+ : selectionData(WebCore::SelectionData::create())
+{
+}
+
+WebSelectionData::WebSelectionData(const WebCore::SelectionData& data)
+ : selectionData(const_cast<WebCore::SelectionData&>(data))
+{
+}
+
+WebSelectionData::WebSelectionData(Ref<WebCore::SelectionData>&& data)
+ : selectionData(WTFMove(data))
+{
+}
+
+void WebSelectionData::encode(IPC::Encoder& encoder) const
+{
+ encoder << selectionData.get();
+}
+
+bool WebSelectionData::decode(IPC::Decoder& decoder, WebSelectionData& selection)
+{
+ return decoder.decode(selection.selectionData.get());
+}
+
+} // namespace WebKit
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedgtkWebSelectionDatahfromrev206255trunkSourceWebKit2SharedgtkPasteboardContenth"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Shared/gtk/WebSelectionData.h (from rev 206255, trunk/Source/WebKit2/Shared/gtk/PasteboardContent.h) (0 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/gtk/WebSelectionData.h (rev 0)
+++ trunk/Source/WebKit2/Shared/gtk/WebSelectionData.h 2016-09-22 12:14:39 UTC (rev 206256)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+/*
+ * Copyright (C) 2016 Red Hat Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#pragma once
+
+#include <WebCore/SelectionData.h>
+
+namespace IPC {
+class Decoder;
+class Encoder;
+}
+
+namespace WebKit {
+
+struct WebSelectionData {
+ WebSelectionData();
+ explicit WebSelectionData(const WebCore::SelectionData&);
+ explicit WebSelectionData(Ref<WebCore::SelectionData>&&);
+
+ Ref<WebCore::SelectionData> selectionData;
+
+ void encode(IPC::Encoder&) const;
+ static bool decode(IPC::Decoder&, WebSelectionData&);
+};
+
+} // namespace WebKit
+
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkPageClientImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp (206255 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp 2016-09-22 08:57:12 UTC (rev 206255)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp 2016-09-22 12:14:39 UTC (rev 206256)
</span><span class="lines">@@ -254,7 +254,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><del>-void PageClientImpl::startDrag(Ref<DataObjectGtk>&& selection, DragOperation dragOperation, RefPtr<ShareableBitmap>&& dragImage)
</del><ins>+void PageClientImpl::startDrag(Ref<SelectionData>&& selection, DragOperation dragOperation, RefPtr<ShareableBitmap>&& dragImage)
</ins><span class="cx"> {
</span><span class="cx"> WebKitWebViewBase* webView = WEBKIT_WEB_VIEW_BASE(m_viewWidget);
</span><span class="cx"> webkitWebViewBaseDragAndDropHandler(webView).startDrag(WTFMove(selection), dragOperation, WTFMove(dragImage));
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkPageClientImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h (206255 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h 2016-09-22 08:57:12 UTC (rev 206255)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h 2016-09-22 12:14:39 UTC (rev 206256)
</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(Ref<WebCore::DataObjectGtk>&&, WebCore::DragOperation, RefPtr<ShareableBitmap>&& dragImage) override;
</del><ins>+ void startDrag(Ref<WebCore::SelectionData>&&, 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="trunkSourceWebKit2UIProcessPageClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/PageClient.h (206255 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/PageClient.h 2016-09-22 08:57:12 UTC (rev 206255)
+++ trunk/Source/WebKit2/UIProcess/PageClient.h 2016-09-22 12:14:39 UTC (rev 206256)
</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(Ref<WebCore::DataObjectGtk>&&, WebCore::DragOperation, RefPtr<ShareableBitmap>&& dragImage) = 0;
</del><ins>+ virtual void startDrag(Ref<WebCore::SelectionData>&&, 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="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (206255 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-09-22 08:57:12 UTC (rev 206255)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-09-22 12:14:39 UTC (rev 206256)
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><del>-#include "PasteboardContent.h"
</del><ins>+#include "WebSelectionData.h"
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if USE(CAIRO)
</span><span class="lines">@@ -1774,7 +1774,7 @@
</span><span class="cx"> m_process->assumeReadAccessToBaseURL(url);
</span><span class="cx">
</span><span class="cx"> ASSERT(dragData.platformData());
</span><del>- PasteboardContent selection(*dragData.platformData());
</del><ins>+ WebSelectionData selection(*dragData.platformData());
</ins><span class="cx"> m_process->send(Messages::WebPage::PerformDragControllerAction(action, dragData.clientPosition(), dragData.globalPosition(), dragData.draggingSourceOperationMask(), selection, dragData.flags()), m_pageID);
</span><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="lines">@@ -1791,10 +1791,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><del>-void WebPageProxy::startDrag(PasteboardContent&& selection, uint64_t dragOperation, const ShareableBitmap::Handle& dragImageHandle)
</del><ins>+void WebPageProxy::startDrag(WebSelectionData&& selection, uint64_t dragOperation, const ShareableBitmap::Handle& dragImageHandle)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<ShareableBitmap> dragImage = !dragImageHandle.isNull() ? ShareableBitmap::create(dragImageHandle) : nullptr;
</span><del>- m_pageClient.startDrag(WTFMove(selection.dataObject), static_cast<WebCore::DragOperation>(dragOperation), WTFMove(dragImage));
</del><ins>+ m_pageClient.startDrag(WTFMove(selection.selectionData), static_cast<WebCore::DragOperation>(dragOperation), WTFMove(dragImage));
</ins><span class="cx">
</span><span class="cx"> m_process->send(Messages::WebPage::DidStartDrag(), m_pageID);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (206255 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-09-22 08:57:12 UTC (rev 206255)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-09-22 12:14:39 UTC (rev 206256)
</span><span class="lines">@@ -809,7 +809,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(GTK)
</span><del>- void startDrag(PasteboardContent&&, uint64_t dragOperation, const ShareableBitmap::Handle& dragImage);
</del><ins>+ void startDrag(WebSelectionData&&, 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="trunkSourceWebKit2UIProcessWebPageProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (206255 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2016-09-22 08:57:12 UTC (rev 206255)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2016-09-22 12:14:39 UTC (rev 206256)
</span><span class="lines">@@ -308,7 +308,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(GTK) && ENABLE(DRAG_SUPPORT)
</span><del>- StartDrag(struct WebKit::PasteboardContent selection, uint64_t dragOperation, WebKit::ShareableBitmap::Handle dragImage)
</del><ins>+ StartDrag(struct WebKit::WebSelectionData 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="trunkSourceWebKit2UIProcessWebPasteboardProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPasteboardProxy.h (206255 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPasteboardProxy.h 2016-09-22 08:57:12 UTC (rev 206255)
+++ trunk/Source/WebKit2/UIProcess/WebPasteboardProxy.h 2016-09-22 12:14:39 UTC (rev 206256)
</span><span class="lines">@@ -42,11 +42,8 @@
</span><span class="cx">
</span><span class="cx"> class WebFrameProxy;
</span><span class="cx"> class WebProcessProxy;
</span><ins>+struct WebSelectionData;
</ins><span class="cx">
</span><del>-#if PLATFORM(GTK)
-class PasteboardContent;
-#endif
-
</del><span class="cx"> class WebPasteboardProxy : public IPC::MessageReceiver {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(WebPasteboardProxy);
</span><span class="cx"> friend class LazyNeverDestroyed<WebPasteboardProxy>;
</span><span class="lines">@@ -92,8 +89,8 @@
</span><span class="cx"> void setPasteboardBufferForType(const String& pasteboardName, const String& pasteboardType, const SharedMemory::Handle&, uint64_t size, uint64_t& newChangeCount);
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(GTK)
</span><del>- void writeToClipboard(const String& pasteboardName, const PasteboardContent&);
- void readFromClipboard(const String& pasteboardName, PasteboardContent&);
</del><ins>+ void writeToClipboard(const String& pasteboardName, const WebSelectionData&);
+ void readFromClipboard(const String& pasteboardName, WebSelectionData&);
</ins><span class="cx">
</span><span class="cx"> WebFrameProxy* m_primarySelectionOwner { nullptr };
</span><span class="cx"> WebFrameProxy* m_frameWritingToClipboard { nullptr };
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPasteboardProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPasteboardProxy.messages.in (206255 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPasteboardProxy.messages.in 2016-09-22 08:57:12 UTC (rev 206255)
+++ trunk/Source/WebKit2/UIProcess/WebPasteboardProxy.messages.in 2016-09-22 12:14:39 UTC (rev 206256)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><del>- WriteToClipboard(String pasteboardName, struct WebKit::PasteboardContent pasteboardContent)
- ReadFromClipboard(String pasteboardName) -> (struct WebKit::PasteboardContent pasteboardContent)
</del><ins>+ WriteToClipboard(String pasteboardName, struct WebKit::WebSelectionData pasteboardContent)
+ ReadFromClipboard(String pasteboardName) -> (struct WebKit::WebSelectionData pasteboardContent)
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkDragAndDropHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp (206255 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp 2016-09-22 08:57:12 UTC (rev 206255)
+++ trunk/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp 2016-09-22 12:14:39 UTC (rev 206256)
</span><span class="lines">@@ -29,12 +29,10 @@
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><span class="cx">
</span><span class="cx"> #include "WebPageProxy.h"
</span><del>-#include <WebCore/DataObjectGtk.h>
</del><span class="cx"> #include <WebCore/DragData.h>
</span><span class="cx"> #include <WebCore/GRefPtrGtk.h>
</span><span class="cx"> #include <WebCore/GtkUtilities.h>
</span><span class="cx"> #include <WebCore/PasteboardHelper.h>
</span><del>-#include <gtk/gtk.h>
</del><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="cx"> #include <wtf/glib/GUniquePtr.h>
</span><span class="cx">
</span><span class="lines">@@ -49,9 +47,8 @@
</span><span class="cx">
</span><span class="cx"> DragAndDropHandler::DroppingContext::DroppingContext(GdkDragContext* gdkContext, const IntPoint& position)
</span><span class="cx"> : gdkContext(gdkContext)
</span><del>- , dataObject(DataObjectGtk::create())
</del><span class="cx"> , lastMotionPosition(position)
</span><del>- , dropHappened(false)
</del><ins>+ , selectionData(SelectionData::create())
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -108,14 +105,14 @@
</span><span class="cx"> return static_cast<DragOperation>(action);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DragAndDropHandler::startDrag(Ref<DataObjectGtk>&& selection, DragOperation dragOperation, RefPtr<ShareableBitmap>&& dragImage)
</del><ins>+void DragAndDropHandler::startDrag(Ref<SelectionData>&& 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 = WTFMove(selection);
- GRefPtr<GtkTargetList> targetList = PasteboardHelper::singleton().targetListForDataObject(*m_draggingDataObject);
</del><ins>+ m_draggingSelectionData = WTFMove(selection);
+ GRefPtr<GtkTargetList> targetList = PasteboardHelper::singleton().targetListForSelectionData(*m_draggingSelectionData);
</ins><span class="cx"> #else
</span><del>- RefPtr<DataObjectGtk> dataObject = WTFMove(selection);
- GRefPtr<GtkTargetList> targetList = PasteboardHelper::singleton().targetListForDataObject(*dataObject);
</del><ins>+ RefPtr<SelectionData> selectionData = WTFMove(selection);
+ GRefPtr<GtkTargetList> targetList = PasteboardHelper::singleton().targetListForSelectionData(*selectionData);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> GUniquePtr<GdkEvent> currentEvent(gtk_get_current_event());
</span><span class="lines">@@ -132,7 +129,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, WTFMove(dataObject));
</del><ins>+ m_draggingSelectionDataMap.set(context, WTFMove(selectionData));
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (dragImage) {
</span><span class="lines">@@ -152,11 +149,11 @@
</span><span class="cx"> if (m_dragContext.get() != context)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ASSERT(m_draggingDataObject);
- PasteboardHelper::singleton().fillSelectionData(selectionData, info, *m_draggingDataObject);
</del><ins>+ ASSERT(m_draggingSelectionData);
+ PasteboardHelper::singleton().fillSelectionData(*m_draggingSelectionData, info, selectionData);
</ins><span class="cx"> #else
</span><del>- if (DataObjectGtk* dataObject = m_draggingDataObjects.get(context))
- PasteboardHelper::singleton().fillSelectionData(selectionData, info, *dataObject);
</del><ins>+ if (auto* selection = m_draggingSelectionDataMap.get(context))
+ PasteboardHelper::singleton().fillSelectionData(*selection, info, selectionData);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -168,13 +165,13 @@
</span><span class="cx"> if (m_dragContext.get() != context)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!m_draggingDataObject)
</del><ins>+ if (!m_draggingSelectionData)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_dragContext = nullptr;
</span><del>- m_draggingDataObject = nullptr;
</del><ins>+ m_draggingSelectionData = nullptr;
</ins><span class="cx"> #else
</span><del>- if (!m_draggingDataObjects.remove(context))
</del><ins>+ if (!m_draggingSelectionDataMap.remove(context))
</ins><span class="cx"> return;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -186,7 +183,7 @@
</span><span class="cx"> m_page.dragEnded(IntPoint(x, y), IntPoint(xRoot, yRoot), gdkDragActionToDragOperation(gdk_drag_context_get_selected_action(context)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-DataObjectGtk* DragAndDropHandler::dataObjectForDropData(GdkDragContext* context, GtkSelectionData* selectionData, unsigned info, IntPoint& position)
</del><ins>+SelectionData* DragAndDropHandler::dropDataSelection(GdkDragContext* context, GtkSelectionData* selectionData, unsigned info, IntPoint& position)
</ins><span class="cx"> {
</span><span class="cx"> DroppingContext* droppingContext = m_droppingContexts.get(context);
</span><span class="cx"> if (!droppingContext)
</span><span class="lines">@@ -193,7 +190,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> droppingContext->pendingDataRequests--;
</span><del>- PasteboardHelper::singleton().fillDataObjectFromDropData(selectionData, info, *droppingContext->dataObject);
</del><ins>+ PasteboardHelper::singleton().fillSelectionData(selectionData, info, droppingContext->selectionData);
</ins><span class="cx"> if (droppingContext->pendingDataRequests)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="lines">@@ -202,17 +199,17 @@
</span><span class="cx"> position = droppingContext->lastMotionPosition;
</span><span class="cx">
</span><span class="cx"> // If there are no more pending requests, start sending dragging data to WebCore.
</span><del>- return droppingContext->dataObject.get();
</del><ins>+ return droppingContext->selectionData.ptr();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DragAndDropHandler::dragEntered(GdkDragContext* context, GtkSelectionData* selectionData, unsigned info, unsigned time)
</span><span class="cx"> {
</span><span class="cx"> IntPoint position;
</span><del>- DataObjectGtk* dataObject = dataObjectForDropData(context, selectionData, info, position);
- if (!dataObject)
</del><ins>+ auto* selection = dropDataSelection(context, selectionData, info, position);
+ if (!selection)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- DragData dragData(dataObject, position, convertWidgetPointToScreenPoint(m_page.viewWidget(), position), gdkDragActionToDragOperation(gdk_drag_context_get_actions(context)));
</del><ins>+ DragData dragData(selection, position, convertWidgetPointToScreenPoint(m_page.viewWidget(), position), gdkDragActionToDragOperation(gdk_drag_context_get_actions(context)));
</ins><span class="cx"> m_page.resetCurrentDragInformation();
</span><span class="cx"> m_page.dragEntered(dragData);
</span><span class="cx"> DragOperation operation = m_page.currentDragOperation();
</span><span class="lines">@@ -219,7 +216,7 @@
</span><span class="cx"> gdk_drag_status(context, dragOperationToSingleGdkDragAction(operation), time);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-DataObjectGtk* DragAndDropHandler::requestDragData(GdkDragContext* context, const IntPoint& position, unsigned time)
</del><ins>+SelectionData* DragAndDropHandler::dragDataSelection(GdkDragContext* context, const IntPoint& position, unsigned time)
</ins><span class="cx"> {
</span><span class="cx"> std::unique_ptr<DroppingContext>& droppingContext = m_droppingContexts.add(context, nullptr).iterator->value;
</span><span class="cx"> if (!droppingContext) {
</span><span class="lines">@@ -237,16 +234,16 @@
</span><span class="cx"> if (droppingContext->pendingDataRequests > 0)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- return droppingContext->dataObject.get();
</del><ins>+ return droppingContext->selectionData.ptr();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DragAndDropHandler::dragMotion(GdkDragContext* context, const IntPoint& position, unsigned time)
</span><span class="cx"> {
</span><del>- DataObjectGtk* dataObject = requestDragData(context, position, time);
- if (!dataObject)
</del><ins>+ auto* selection = dragDataSelection(context, position, time);
+ if (!selection)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- DragData dragData(dataObject, position, convertWidgetPointToScreenPoint(m_page.viewWidget(), position), gdkDragActionToDragOperation(gdk_drag_context_get_actions(context)));
</del><ins>+ DragData dragData(selection, position, convertWidgetPointToScreenPoint(m_page.viewWidget(), position), gdkDragActionToDragOperation(gdk_drag_context_get_actions(context)));
</ins><span class="cx"> m_page.dragUpdated(dragData);
</span><span class="cx"> DragOperation operation = m_page.currentDragOperation();
</span><span class="cx"> gdk_drag_status(context, dragOperationToSingleGdkDragAction(operation), time);
</span><span class="lines">@@ -275,7 +272,7 @@
</span><span class="cx"> // Don't call dragExited if we have just received a drag-drop signal. This
</span><span class="cx"> // happens in the case of a successful drop onto the view.
</span><span class="cx"> const IntPoint& position = droppingContext->lastMotionPosition;
</span><del>- DragData dragData(droppingContext->dataObject.get(), position, convertWidgetPointToScreenPoint(m_page.viewWidget(), position), DragOperationNone);
</del><ins>+ DragData dragData(droppingContext->selectionData.ptr(), position, convertWidgetPointToScreenPoint(m_page.viewWidget(), position), DragOperationNone);
</ins><span class="cx"> m_page.dragExited(dragData);
</span><span class="cx"> m_page.resetCurrentDragInformation();
</span><span class="cx"> }
</span><span class="lines">@@ -292,11 +289,7 @@
</span><span class="cx">
</span><span class="cx"> droppingContext->dropHappened = true;
</span><span class="cx">
</span><del>- DataObjectGtk* dataObject = droppingContext->dataObject.get();
- if (!dataObject)
- return false;
-
- DragData dragData(dataObject, position, convertWidgetPointToScreenPoint(m_page.viewWidget(), position), gdkDragActionToDragOperation(gdk_drag_context_get_actions(context)));
</del><ins>+ DragData dragData(droppingContext->selectionData.ptr(), position, convertWidgetPointToScreenPoint(m_page.viewWidget(), position), gdkDragActionToDragOperation(gdk_drag_context_get_actions(context)));
</ins><span class="cx"> SandboxExtension::Handle handle;
</span><span class="cx"> SandboxExtension::HandleArray sandboxExtensionForUpload;
</span><span class="cx"> m_page.performDragOperation(dragData, String(), handle, sandboxExtensionForUpload);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkDragAndDropHandlerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.h (206255 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.h 2016-09-22 08:57:12 UTC (rev 206255)
+++ trunk/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.h 2016-09-22 12:14:39 UTC (rev 206256)
</span><span class="lines">@@ -27,9 +27,9 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><span class="cx">
</span><del>-#include <WebCore/DataObjectGtk.h>
</del><span class="cx"> #include <WebCore/DragActions.h>
</span><span class="cx"> #include <WebCore/IntPoint.h>
</span><ins>+#include <WebCore/SelectionData.h>
</ins><span class="cx"> #include <gtk/gtk.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> class DragData;
</span><ins>+class SelectionData;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -52,7 +53,7 @@
</span><span class="cx"> public:
</span><span class="cx"> DragAndDropHandler(WebPageProxy&);
</span><span class="cx">
</span><del>- void startDrag(Ref<WebCore::DataObjectGtk>&&, WebCore::DragOperation, RefPtr<ShareableBitmap>&& dragImage);
</del><ins>+ void startDrag(Ref<WebCore::SelectionData>&&, 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">@@ -65,15 +66,15 @@
</span><span class="cx"> struct DroppingContext {
</span><span class="cx"> DroppingContext(GdkDragContext*, const WebCore::IntPoint& position);
</span><span class="cx">
</span><del>- GdkDragContext* gdkContext;
- RefPtr<WebCore::DataObjectGtk> dataObject;
</del><ins>+ GdkDragContext* gdkContext { nullptr };
</ins><span class="cx"> WebCore::IntPoint lastMotionPosition;
</span><del>- unsigned pendingDataRequests;
- bool dropHappened;
</del><ins>+ Ref<WebCore::SelectionData> selectionData;
+ unsigned pendingDataRequests { 0 };
+ bool dropHappened { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><del>- WebCore::DataObjectGtk* dataObjectForDropData(GdkDragContext*, GtkSelectionData*, unsigned info, WebCore::IntPoint& position);
- WebCore::DataObjectGtk* requestDragData(GdkDragContext*, const WebCore::IntPoint& position, unsigned time);
</del><ins>+ WebCore::SelectionData* dropDataSelection(GdkDragContext*, GtkSelectionData*, unsigned info, WebCore::IntPoint& position);
+ WebCore::SelectionData* dragDataSelection(GdkDragContext*, const WebCore::IntPoint& position, unsigned time);
</ins><span class="cx">
</span><span class="cx"> WebPageProxy& m_page;
</span><span class="cx"> HashMap<GdkDragContext*, std::unique_ptr<DroppingContext>> m_droppingContexts;
</span><span class="lines">@@ -80,11 +81,11 @@
</span><span class="cx">
</span><span class="cx"> #if GTK_CHECK_VERSION(3, 16, 0)
</span><span class="cx"> GRefPtr<GdkDragContext> m_dragContext;
</span><del>- RefPtr<WebCore::DataObjectGtk> m_draggingDataObject;
</del><ins>+ RefPtr<WebCore::SelectionData> m_draggingSelectionData;
</ins><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>- HashMap<GdkDragContext*, RefPtr<WebCore::DataObjectGtk>> m_draggingDataObjects;
</del><ins>+ HashMap<GdkDragContext*, RefPtr<WebCore::SelectionData>> m_draggingSelectionDataMap;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWebPasteboardProxyGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WebPasteboardProxyGtk.cpp (206255 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WebPasteboardProxyGtk.cpp 2016-09-22 08:57:12 UTC (rev 206255)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebPasteboardProxyGtk.cpp 2016-09-22 12:14:39 UTC (rev 206256)
</span><span class="lines">@@ -26,22 +26,19 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebPasteboardProxy.h"
</span><span class="cx">
</span><del>-#include "PasteboardContent.h"
</del><span class="cx"> #include "WebFrameProxy.h"
</span><ins>+#include "WebSelectionData.h"
</ins><span class="cx"> #include <WebCore/PlatformPasteboard.h>
</span><del>-#include <wtf/HashMap.h>
-#include <wtf/NeverDestroyed.h>
</del><span class="cx"> #include <wtf/TemporaryChange.h>
</span><del>-#include <wtf/text/StringHash.h>
</del><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-void WebPasteboardProxy::writeToClipboard(const String& pasteboardName, const PasteboardContent& pasteboardContent)
</del><ins>+void WebPasteboardProxy::writeToClipboard(const String& pasteboardName, const WebSelectionData& selection)
</ins><span class="cx"> {
</span><span class="cx"> TemporaryChange<WebFrameProxy*> frameWritingToClipboard(m_frameWritingToClipboard, m_primarySelectionOwner);
</span><del>- PlatformPasteboard(pasteboardName).writeToClipboard(pasteboardContent.dataObject.get(), [this] {
</del><ins>+ PlatformPasteboard(pasteboardName).writeToClipboard(selection.selectionData, [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">@@ -48,9 +45,9 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPasteboardProxy::readFromClipboard(const String& pasteboardName, PasteboardContent& pasteboardContent)
</del><ins>+void WebPasteboardProxy::readFromClipboard(const String& pasteboardName, WebSelectionData& selection)
</ins><span class="cx"> {
</span><del>- pasteboardContent = PasteboardContent(PlatformPasteboard(pasteboardName).readFromClipboard());
</del><ins>+ selection = WebSelectionData(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="trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (206255 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2016-09-22 08:57:12 UTC (rev 206255)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2016-09-22 12:14:39 UTC (rev 206256)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><del>-#include "PasteboardContent.h"
</del><ins>+#include "WebSelectionData.h"
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</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 DataObjectGtk& dataObject)
</del><ins>+void WebPlatformStrategies::writeToClipboard(const String& pasteboardName, const SelectionData& selection)
</ins><span class="cx"> {
</span><del>- PasteboardContent pasteboardContent(dataObject);
- WebProcess::singleton().parentProcessConnection()->send(Messages::WebPasteboardProxy::WriteToClipboard(pasteboardName, pasteboardContent), 0);
</del><ins>+ WebSelectionData selectionData(selection);
+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebPasteboardProxy::WriteToClipboard(pasteboardName, selectionData), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<DataObjectGtk> WebPlatformStrategies::readFromClipboard(const String& pasteboardName)
</del><ins>+Ref<SelectionData> WebPlatformStrategies::readFromClipboard(const String& pasteboardName)
</ins><span class="cx"> {
</span><del>- PasteboardContent pasteboardContent;
- WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::ReadFromClipboard(pasteboardName), Messages::WebPasteboardProxy::ReadFromClipboard::Reply(pasteboardContent), 0);
- return WTFMove(pasteboardContent.dataObject);
</del><ins>+ WebSelectionData selection;
+ WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::ReadFromClipboard(pasteboardName), Messages::WebPasteboardProxy::ReadFromClipboard::Reply(selection), 0);
+ return WTFMove(selection.selectionData);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(GTK)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h (206255 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h 2016-09-22 08:57:12 UTC (rev 206255)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h 2016-09-22 12:14:39 UTC (rev 206256)
</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 WebCore::DataObjectGtk&) override;
- Ref<WebCore::DataObjectGtk> readFromClipboard(const String& pasteboardName) override;
</del><ins>+ void writeToClipboard(const String& pasteboardName, const WebCore::SelectionData&) override;
+ Ref<WebCore::SelectionData> readFromClipboard(const String& pasteboardName) override;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportgtkWebDragClientGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebDragClientGtk.cpp (206255 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebDragClientGtk.cpp 2016-09-22 08:57:12 UTC (rev 206255)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebDragClientGtk.cpp 2016-09-22 12:14:39 UTC (rev 206256)
</span><span class="lines">@@ -29,11 +29,10 @@
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><span class="cx">
</span><span class="cx"> #include "ArgumentCodersGtk.h"
</span><del>-#include "PasteboardContent.h"
</del><span class="cx"> #include "ShareableBitmap.h"
</span><span class="cx"> #include "WebPage.h"
</span><span class="cx"> #include "WebPageProxyMessages.h"
</span><del>-#include <WebCore/DataObjectGtk.h>
</del><ins>+#include "WebSelectionData.h"
</ins><span class="cx"> #include <WebCore/DataTransfer.h>
</span><span class="cx"> #include <WebCore/DragData.h>
</span><span class="cx"> #include <WebCore/GraphicsContext.h>
</span><span class="lines">@@ -68,7 +67,7 @@
</span><span class="cx">
</span><span class="cx"> m_page->willStartDrag();
</span><span class="cx">
</span><del>- PasteboardContent selection(dataTransfer.pasteboard().dataObject());
</del><ins>+ WebSelectionData selection(dataTransfer.pasteboard().selectionData());
</ins><span class="cx"> m_page->send(Messages::WebPageProxy::StartDrag(selection, dataTransfer.sourceOperation(), handle));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportgtkWebEditorClientGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp (206255 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp 2016-09-22 08:57:12 UTC (rev 206255)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp 2016-09-22 12:14:39 UTC (rev 206256)
</span><span class="lines">@@ -21,12 +21,10 @@
</span><span class="cx"> #include "WebEditorClient.h"
</span><span class="cx">
</span><span class="cx"> #include "PlatformKeyboardEvent.h"
</span><del>-#include <WebCore/DataObjectGtk.h>
</del><span class="cx"> #include <WebCore/Document.h>
</span><span class="cx"> #include <WebCore/Editor.h>
</span><span class="cx"> #include <WebCore/EventNames.h>
</span><span class="cx"> #include <WebCore/Frame.h>
</span><del>-#include <WebCore/FrameDestructionObserver.h>
</del><span class="cx"> #include <WebCore/KeyboardEvent.h>
</span><span class="cx"> #include <WebCore/Pasteboard.h>
</span><span class="cx"> #include <WebCore/markup.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (206255 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-09-22 08:57:12 UTC (rev 206255)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-09-22 12:14:39 UTC (rev 206256)
</span><span class="lines">@@ -217,9 +217,8 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><del>-#include "PasteboardContent.h"
</del><span class="cx"> #include "WebPrintOperationGtk.h"
</span><del>-#include <WebCore/DataObjectGtk.h>
</del><ins>+#include "WebSelectionData.h"
</ins><span class="cx"> #include <gtk/gtk.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -3397,7 +3396,7 @@
</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, const IntPoint& clientPosition, const IntPoint& globalPosition, uint64_t draggingSourceOperationMask, PasteboardContent&& selection, uint32_t flags)
</del><ins>+void WebPage::performDragControllerAction(uint64_t action, const IntPoint& clientPosition, const IntPoint& globalPosition, uint64_t draggingSourceOperationMask, WebSelectionData&& 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><span class="lines">@@ -3404,7 +3403,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- DragData dragData(selection.dataObject.ptr(), clientPosition, globalPosition, static_cast<DragOperation>(draggingSourceOperationMask), static_cast<DragApplicationFlags>(flags));
</del><ins>+ DragData dragData(selection.selectionData.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></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (206255 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-09-22 08:57:12 UTC (rev 206255)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-09-22 12:14:39 UTC (rev 206256)
</span><span class="lines">@@ -199,15 +199,12 @@
</span><span class="cx"> struct PrintInfo;
</span><span class="cx"> struct WebPageCreationParameters;
</span><span class="cx"> struct WebPreferencesStore;
</span><ins>+struct WebSelectionData;
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> class RemoteLayerTreeTransaction;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(GTK)
-struct PasteboardContent;
-#endif
-
</del><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> class WebTouchEvent;
</span><span class="cx"> #endif
</span><span class="lines">@@ -733,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, const WebCore::IntPoint& clientPosition, const WebCore::IntPoint& globalPosition, uint64_t draggingSourceOperationMask, PasteboardContent&&, uint32_t flags);
</del><ins>+ void performDragControllerAction(uint64_t action, const WebCore::IntPoint& clientPosition, const WebCore::IntPoint& globalPosition, uint64_t draggingSourceOperationMask, WebSelectionData&&, 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="trunkSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (206255 => 206256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2016-09-22 08:57:12 UTC (rev 206255)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2016-09-22 12:14:39 UTC (rev 206256)
</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::IntPoint clientPosition, WebCore::IntPoint globalPosition, uint64_t draggingSourceOperationMask, struct WebKit::PasteboardContent selection, uint32_t flags)
</del><ins>+ PerformDragControllerAction(uint64_t action, WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, uint64_t draggingSourceOperationMask, struct WebKit::WebSelectionData 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>