<!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>[205860] 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/205860">205860</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-13 09:13:38 -0700 (Tue, 13 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Get rid of DataObjectGtk::forClipboard and cleanup pasteboard code
https://bugs.webkit.org/show_bug.cgi?id=161907
Reviewed by Michael Catanzaro.
Source/WebCore:
We don't really need to keep a DataObjectGtk for every clipboard, we could simply pass the DataObjectGtk to read
and write methods of PasteboardHelper.
* editing/gtk/EditorGtk.cpp:
(WebCore::createFragmentFromPasteboardData): Update for DataObjectGtk API changes.
* platform/Pasteboard.h:
* platform/gtk/DataObjectGtk.cpp: Remove forClipboard() static method.
* platform/gtk/DataObjectGtk.h: Ditto.
* platform/gtk/PasteboardGtk.cpp:
(WebCore::Pasteboard::Pasteboard): Always create a new DataObjectGtk.
(WebCore::Pasteboard::dataObject): Return a const reference instead of a pointer.
(WebCore::Pasteboard::writePlainText): Pass the DataObjectGtk to PasteboardHelper.
(WebCore::Pasteboard::write): Ditto.
(WebCore::Pasteboard::writePasteboard): Ditto.
(WebCore::Pasteboard::clear): Ditto.
(WebCore::Pasteboard::read): Ditto.
(WebCore::Pasteboard::hasData): Ditto.
(WebCore::Pasteboard::types): Ditto.
(WebCore::Pasteboard::readString): Ditto.
(WebCore::Pasteboard::readFilenames): Ditto.
* platform/gtk/PasteboardHelper.cpp:
(WebCore::PasteboardHelper::getClipboardContents): Update the given DataObjectGtk.
(WebCore::PasteboardHelper::fillSelectionData): Use a const reference to DataObjectGtk instead of a pointer.
(WebCore::PasteboardHelper::targetListForDataObject): Ditto.
(WebCore::PasteboardHelper::fillDataObjectFromDropData): Use a reference to DataObjectGtk instead of a pointer.
(WebCore::ClipboardSetData::ClipboardSetData): Helper struct to pass DataObjectGtk and callback to clipboard callbacks.
(WebCore::ClipboardSetData::~ClipboardSetData):
(WebCore::getClipboardContentsCallback): Get the DataObjectGtk from ClipboardSetData struct passed as user data.
(WebCore::clearClipboardContentsCallback): Get the DataObjectGtk and callback from ClipboardSetData struct
passed as user data.
(WebCore::PasteboardHelper::writeClipboardContents): Write the given DataObjectGtk.
* platform/gtk/PasteboardHelper.h:
Source/WebKit2:
Update to DataObjectGtk and PasteboardHelper API changes.
* UIProcess/gtk/DragAndDropHandler.cpp:
(WebKit::DragAndDropHandler::startDrag):
(WebKit::DragAndDropHandler::fillDragData):
(WebKit::DragAndDropHandler::dataObjectForDropData):
* WebProcess/WebCoreSupport/gtk/WebDragClientGtk.cpp:
(WebKit::WebDragClient::startDrag):
* WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp:
(WebKit::collapseSelection):
(WebKit::WebEditorClient::updateGlobalSelection): Remove wrong X11 guards, since that code is not X11 specific.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditinggtkEditorGtkcpp">trunk/Source/WebCore/editing/gtk/EditorGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformPasteboardh">trunk/Source/WebCore/platform/Pasteboard.h</a></li>
<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="#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="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkDragAndDropHandlercpp">trunk/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205859 => 205860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-13 15:59:25 UTC (rev 205859)
+++ trunk/Source/WebCore/ChangeLog 2016-09-13 16:13:38 UTC (rev 205860)
</span><span class="lines">@@ -1,3 +1,43 @@
</span><ins>+2016-09-13 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Get rid of DataObjectGtk::forClipboard and cleanup pasteboard code
+ https://bugs.webkit.org/show_bug.cgi?id=161907
+
+ Reviewed by Michael Catanzaro.
+
+ We don't really need to keep a DataObjectGtk for every clipboard, we could simply pass the DataObjectGtk to read
+ and write methods of PasteboardHelper.
+
+ * editing/gtk/EditorGtk.cpp:
+ (WebCore::createFragmentFromPasteboardData): Update for DataObjectGtk API changes.
+ * platform/Pasteboard.h:
+ * platform/gtk/DataObjectGtk.cpp: Remove forClipboard() static method.
+ * platform/gtk/DataObjectGtk.h: Ditto.
+ * platform/gtk/PasteboardGtk.cpp:
+ (WebCore::Pasteboard::Pasteboard): Always create a new DataObjectGtk.
+ (WebCore::Pasteboard::dataObject): Return a const reference instead of a pointer.
+ (WebCore::Pasteboard::writePlainText): Pass the DataObjectGtk to PasteboardHelper.
+ (WebCore::Pasteboard::write): Ditto.
+ (WebCore::Pasteboard::writePasteboard): Ditto.
+ (WebCore::Pasteboard::clear): Ditto.
+ (WebCore::Pasteboard::read): Ditto.
+ (WebCore::Pasteboard::hasData): Ditto.
+ (WebCore::Pasteboard::types): Ditto.
+ (WebCore::Pasteboard::readString): Ditto.
+ (WebCore::Pasteboard::readFilenames): Ditto.
+ * platform/gtk/PasteboardHelper.cpp:
+ (WebCore::PasteboardHelper::getClipboardContents): Update the given DataObjectGtk.
+ (WebCore::PasteboardHelper::fillSelectionData): Use a const reference to DataObjectGtk instead of a pointer.
+ (WebCore::PasteboardHelper::targetListForDataObject): Ditto.
+ (WebCore::PasteboardHelper::fillDataObjectFromDropData): Use a reference to DataObjectGtk instead of a pointer.
+ (WebCore::ClipboardSetData::ClipboardSetData): Helper struct to pass DataObjectGtk and callback to clipboard callbacks.
+ (WebCore::ClipboardSetData::~ClipboardSetData):
+ (WebCore::getClipboardContentsCallback): Get the DataObjectGtk from ClipboardSetData struct passed as user data.
+ (WebCore::clearClipboardContentsCallback): Get the DataObjectGtk and callback from ClipboardSetData struct
+ passed as user data.
+ (WebCore::PasteboardHelper::writeClipboardContents): Write the given DataObjectGtk.
+ * platform/gtk/PasteboardHelper.h:
+
</ins><span class="cx"> 2016-09-13 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Drop support for <isindex>
</span></span></pre></div>
<a id="trunkSourceWebCoreeditinggtkEditorGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/gtk/EditorGtk.cpp (205859 => 205860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/gtk/EditorGtk.cpp 2016-09-13 15:59:25 UTC (rev 205859)
+++ trunk/Source/WebCore/editing/gtk/EditorGtk.cpp 2016-09-13 16:13:38 UTC (rev 205860)
</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>- DataObjectGtk* dataObject = pasteboard.dataObject();
- if (dataObject->hasMarkup() && frame.document())
- return createFragmentFromMarkup(*frame.document(), dataObject->markup(), emptyString(), DisallowScriptingAndPluginContent);
</del><ins>+ const auto& dataObject = pasteboard.dataObject();
+ if (dataObject.hasMarkup() && frame.document())
+ return createFragmentFromMarkup(*frame.document(), dataObject.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 (dataObject.hasText()) {
</ins><span class="cx"> chosePlainText = true;
</span><del>- return createFragmentFromText(range, dataObject->text());
</del><ins>+ return createFragmentFromText(range, dataObject.text());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPasteboardh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Pasteboard.h (205859 => 205860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Pasteboard.h 2016-09-13 15:59:25 UTC (rev 205859)
+++ trunk/Source/WebCore/platform/Pasteboard.h 2016-09-13 16:13:38 UTC (rev 205860)
</span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><del>- DataObjectGtk* dataObject() const;
</del><ins>+ const DataObjectGtk& dataObject() const;
</ins><span class="cx"> static std::unique_ptr<Pasteboard> createForGlobalSelection();
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkDataObjectGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/DataObjectGtk.cpp (205859 => 205860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/DataObjectGtk.cpp 2016-09-13 15:59:25 UTC (rev 205859)
+++ trunk/Source/WebCore/platform/gtk/DataObjectGtk.cpp 2016-09-13 16:13:38 UTC (rev 205860)
</span><span class="lines">@@ -147,15 +147,4 @@
</span><span class="cx"> m_filenames.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-DataObjectGtk* DataObjectGtk::forClipboard(GtkClipboard* clipboard)
-{
- static HashMap<GtkClipboard*, RefPtr<DataObjectGtk> > objectMap;
-
- auto addResult = objectMap.add(clipboard, nullptr);
- if (addResult.isNewEntry)
- addResult.iterator->value = DataObjectGtk::create();
-
- return addResult.iterator->value.get();
</del><span class="cx"> }
</span><del>-
-}
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkDataObjectGtkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/DataObjectGtk.h (205859 => 205860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/DataObjectGtk.h 2016-09-13 15:59:25 UTC (rev 205859)
+++ trunk/Source/WebCore/platform/gtk/DataObjectGtk.h 2016-09-13 16:13:38 UTC (rev 205860)
</span><span class="lines">@@ -66,8 +66,6 @@
</span><span class="cx"> void clearText();
</span><span class="cx"> void clearMarkup();
</span><span class="cx">
</span><del>- static DataObjectGtk* forClipboard(GtkClipboard*);
-
</del><span class="cx"> private:
</span><span class="cx"> String m_text;
</span><span class="cx"> String m_markup;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkPasteboardGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp (205859 => 205860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp 2016-09-13 15:59:25 UTC (rev 205859)
+++ trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp 2016-09-13 16:13:38 UTC (rev 205860)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Pasteboard::Pasteboard(GtkClipboard* gtkClipboard)
</span><del>- : m_dataObject(DataObjectGtk::forClipboard(gtkClipboard))
</del><ins>+ : m_dataObject(DataObjectGtk::create())
</ins><span class="cx"> , m_gtkClipboard(gtkClipboard)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_dataObject);
</span><span class="lines">@@ -93,9 +93,9 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-DataObjectGtk* Pasteboard::dataObject() const
</del><ins>+const DataObjectGtk& Pasteboard::dataObject() const
</ins><span class="cx"> {
</span><del>- return m_dataObject.get();
</del><ins>+ return *m_dataObject;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static ClipboardDataType dataObjectTypeFromHTMLClipboardType(const String& rawType)
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> m_dataObject->setText(text);
</span><span class="cx">
</span><span class="cx"> if (m_gtkClipboard)
</span><del>- PasteboardHelper::singleton().writeClipboardContents(m_gtkClipboard, (smartReplaceOption == CanSmartReplace) ? PasteboardHelper::IncludeSmartPaste : PasteboardHelper::DoNotIncludeSmartPaste);
</del><ins>+ PasteboardHelper::singleton().writeClipboardContents(m_gtkClipboard, *m_dataObject, (smartReplaceOption == CanSmartReplace) ? PasteboardHelper::IncludeSmartPaste : PasteboardHelper::DoNotIncludeSmartPaste);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Pasteboard::write(const PasteboardURL& pasteboardURL)
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx"> m_dataObject->setURL(pasteboardURL.url, pasteboardURL.title);
</span><span class="cx">
</span><span class="cx"> if (m_gtkClipboard)
</span><del>- PasteboardHelper::singleton().writeClipboardContents(m_gtkClipboard);
</del><ins>+ PasteboardHelper::singleton().writeClipboardContents(m_gtkClipboard, *m_dataObject);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Pasteboard::write(const PasteboardImage& pasteboardImage)
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> m_dataObject->setImage(pixbuf.get());
</span><span class="cx">
</span><span class="cx"> if (m_gtkClipboard)
</span><del>- PasteboardHelper::singleton().writeClipboardContents(m_gtkClipboard);
</del><ins>+ PasteboardHelper::singleton().writeClipboardContents(m_gtkClipboard, *m_dataObject);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Pasteboard::write(const PasteboardWebContent& pasteboardContent)
</span><span class="lines">@@ -185,31 +185,31 @@
</span><span class="cx"> m_dataObject->setMarkup(pasteboardContent.markup);
</span><span class="cx">
</span><span class="cx"> if (m_gtkClipboard)
</span><del>- PasteboardHelper::singleton().writeClipboardContents(m_gtkClipboard, pasteboardContent.canSmartCopyOrDelete ? PasteboardHelper::IncludeSmartPaste : PasteboardHelper::DoNotIncludeSmartPaste, pasteboardContent.callback.get());
</del><ins>+ PasteboardHelper::singleton().writeClipboardContents(m_gtkClipboard, *m_dataObject, pasteboardContent.canSmartCopyOrDelete ? PasteboardHelper::IncludeSmartPaste : PasteboardHelper::DoNotIncludeSmartPaste, pasteboardContent.callback.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Pasteboard::writePasteboard(const Pasteboard& sourcePasteboard)
</span><span class="cx"> {
</span><del>- RefPtr<DataObjectGtk> sourceDataObject = sourcePasteboard.dataObject();
</del><ins>+ const auto& sourceDataObject = sourcePasteboard.dataObject();
</ins><span class="cx"> m_dataObject->clearAll();
</span><span class="cx">
</span><del>- if (sourceDataObject->hasText())
- m_dataObject->setText(sourceDataObject->text());
- if (sourceDataObject->hasMarkup())
- m_dataObject->setMarkup(sourceDataObject->markup());
- if (sourceDataObject->hasURL())
- m_dataObject->setURL(sourceDataObject->url(), sourceDataObject->urlLabel());
- if (sourceDataObject->hasURIList())
- m_dataObject->setURIList(sourceDataObject->uriList());
- if (sourceDataObject->hasImage())
- m_dataObject->setImage(sourceDataObject->image());
- if (sourceDataObject->hasUnknownTypeData()) {
- for (auto& it : m_dataObject->unknownTypes())
</del><ins>+ if (sourceDataObject.hasText())
+ m_dataObject->setText(sourceDataObject.text());
+ if (sourceDataObject.hasMarkup())
+ m_dataObject->setMarkup(sourceDataObject.markup());
+ if (sourceDataObject.hasURL())
+ m_dataObject->setURL(sourceDataObject.url(), sourceDataObject.urlLabel());
+ if (sourceDataObject.hasURIList())
+ m_dataObject->setURIList(sourceDataObject.uriList());
+ if (sourceDataObject.hasImage())
+ m_dataObject->setImage(sourceDataObject.image());
+ if (sourceDataObject.hasUnknownTypeData()) {
+ for (auto& it : sourceDataObject.unknownTypes())
</ins><span class="cx"> m_dataObject->setUnknownTypeData(it.key, it.value);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_gtkClipboard)
</span><del>- PasteboardHelper::singleton().writeClipboardContents(m_gtkClipboard);
</del><ins>+ PasteboardHelper::singleton().writeClipboardContents(m_gtkClipboard, *m_dataObject);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Pasteboard::clear()
</span><span class="lines">@@ -221,7 +221,7 @@
</span><span class="cx"> m_dataObject->clearAllExceptFilenames();
</span><span class="cx">
</span><span class="cx"> if (m_gtkClipboard)
</span><del>- PasteboardHelper::singleton().writeClipboardContents(m_gtkClipboard);
</del><ins>+ PasteboardHelper::singleton().writeClipboardContents(m_gtkClipboard, *m_dataObject);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Pasteboard::clear(const String& type)
</span><span class="lines">@@ -246,7 +246,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_gtkClipboard)
</span><del>- PasteboardHelper::singleton().writeClipboardContents(m_gtkClipboard);
</del><ins>+ PasteboardHelper::singleton().writeClipboardContents(m_gtkClipboard, *m_dataObject);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Pasteboard::canSmartReplace()
</span><span class="lines">@@ -263,7 +263,7 @@
</span><span class="cx"> void Pasteboard::read(PasteboardPlainText& text)
</span><span class="cx"> {
</span><span class="cx"> if (m_gtkClipboard)
</span><del>- PasteboardHelper::singleton().getClipboardContents(m_gtkClipboard);
</del><ins>+ PasteboardHelper::singleton().getClipboardContents(m_gtkClipboard, *m_dataObject);
</ins><span class="cx"> text.text = m_dataObject->text();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -270,7 +270,7 @@
</span><span class="cx"> bool Pasteboard::hasData()
</span><span class="cx"> {
</span><span class="cx"> if (m_gtkClipboard)
</span><del>- PasteboardHelper::singleton().getClipboardContents(m_gtkClipboard);
</del><ins>+ PasteboardHelper::singleton().getClipboardContents(m_gtkClipboard, *m_dataObject);
</ins><span class="cx">
</span><span class="cx"> return m_dataObject->hasText() || m_dataObject->hasMarkup() || m_dataObject->hasURIList() || m_dataObject->hasImage() || m_dataObject->hasUnknownTypeData();
</span><span class="cx"> }
</span><span class="lines">@@ -278,7 +278,7 @@
</span><span class="cx"> Vector<String> Pasteboard::types()
</span><span class="cx"> {
</span><span class="cx"> if (m_gtkClipboard)
</span><del>- PasteboardHelper::singleton().getClipboardContents(m_gtkClipboard);
</del><ins>+ PasteboardHelper::singleton().getClipboardContents(m_gtkClipboard, *m_dataObject);
</ins><span class="cx">
</span><span class="cx"> Vector<String> types;
</span><span class="cx"> if (m_dataObject->hasText()) {
</span><span class="lines">@@ -307,7 +307,7 @@
</span><span class="cx"> String Pasteboard::readString(const String& type)
</span><span class="cx"> {
</span><span class="cx"> if (m_gtkClipboard)
</span><del>- PasteboardHelper::singleton().getClipboardContents(m_gtkClipboard);
</del><ins>+ PasteboardHelper::singleton().getClipboardContents(m_gtkClipboard, *m_dataObject);
</ins><span class="cx">
</span><span class="cx"> switch (dataObjectTypeFromHTMLClipboardType(type)) {
</span><span class="cx"> case ClipboardDataTypeURIList:
</span><span class="lines">@@ -330,7 +330,7 @@
</span><span class="cx"> Vector<String> Pasteboard::readFilenames()
</span><span class="cx"> {
</span><span class="cx"> if (m_gtkClipboard)
</span><del>- PasteboardHelper::singleton().getClipboardContents(m_gtkClipboard);
</del><ins>+ PasteboardHelper::singleton().getClipboardContents(m_gtkClipboard, *m_dataObject);
</ins><span class="cx">
</span><span class="cx"> return m_dataObject->filenames();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkPasteboardHelpercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/PasteboardHelper.cpp (205859 => 205860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/PasteboardHelper.cpp 2016-09-13 15:59:25 UTC (rev 205859)
+++ trunk/Source/WebCore/platform/gtk/PasteboardHelper.cpp 2016-09-13 16:13:38 UTC (rev 205860)
</span><span class="lines">@@ -24,7 +24,6 @@
</span><span class="cx"> #include "PasteboardHelper.h"
</span><span class="cx">
</span><span class="cx"> #include "DataObjectGtk.h"
</span><del>-#include "GRefPtrGtk.h"
</del><span class="cx"> #include "GtkVersioning.h"
</span><span class="cx"> #include "Pasteboard.h"
</span><span class="cx"> #include "TextResourceDecoder.h"
</span><span class="lines">@@ -93,15 +92,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)
</del><ins>+void PasteboardHelper::getClipboardContents(GtkClipboard* clipboard, DataObjectGtk& dataObject)
</ins><span class="cx"> {
</span><del>- DataObjectGtk* dataObject = DataObjectGtk::forClipboard(clipboard);
- ASSERT(dataObject);
-
</del><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>+ dataObject.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">@@ -108,7 +104,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>+ dataObject.setMarkup(markup);
</ins><span class="cx"> gtk_selection_data_free(data);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -115,36 +111,36 @@
</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>+ dataObject.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><span class="cx">
</span><del>-void PasteboardHelper::fillSelectionData(GtkSelectionData* selectionData, guint info, DataObjectGtk* dataObject)
</del><ins>+void PasteboardHelper::fillSelectionData(GtkSelectionData* selectionData, guint info, const DataObjectGtk& dataObject)
</ins><span class="cx"> {
</span><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, dataObject.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();
</del><ins>+ CString markup = String(gMarkupPrefix + dataObject.markup()).utf8();
</ins><span class="cx"> gtk_selection_data_set(selectionData, markupAtom, 8,
</span><span class="cx"> reinterpret_cast<const guchar*>(markup.data()), markup.length());
</span><span class="cx">
</span><span class="cx"> } else if (info == TargetTypeURIList) {
</span><del>- CString uriList = dataObject->uriList().utf8();
</del><ins>+ CString uriList = dataObject.uriList().utf8();
</ins><span class="cx"> gtk_selection_data_set(selectionData, uriListAtom, 8,
</span><span class="cx"> reinterpret_cast<const guchar*>(uriList.data()), uriList.length());
</span><span class="cx">
</span><del>- } else if (info == TargetTypeNetscapeURL && dataObject->hasURL()) {
- String url(dataObject->url());
</del><ins>+ } else if (info == TargetTypeNetscapeURL && dataObject.hasURL()) {
+ String url(dataObject.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 (dataObject.hasText())
+ result.append(dataObject.text());
</ins><span class="cx"> else
</span><span class="cx"> result.append(url);
</span><span class="cx">
</span><span class="lines">@@ -153,7 +149,7 @@
</span><span class="cx"> reinterpret_cast<const guchar*>(resultData.get()), strlen(resultData.get()));
</span><span class="cx">
</span><span class="cx"> } else if (info == TargetTypeImage)
</span><del>- gtk_selection_data_set_pixbuf(selectionData, dataObject->image());
</del><ins>+ gtk_selection_data_set_pixbuf(selectionData, dataObject.image());
</ins><span class="cx">
</span><span class="cx"> else if (info == TargetTypeSmartPaste)
</span><span class="cx"> gtk_selection_data_set_text(selectionData, "", -1);
</span><span class="lines">@@ -162,7 +158,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 : dataObject.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">@@ -173,34 +169,34 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-GtkTargetList* PasteboardHelper::targetListForDataObject(DataObjectGtk* dataObject, SmartPasteInclusion shouldInludeSmartPaste)
</del><ins>+GRefPtr<GtkTargetList> PasteboardHelper::targetListForDataObject(const DataObjectGtk& dataObject, SmartPasteInclusion shouldInludeSmartPaste)
</ins><span class="cx"> {
</span><del>- GtkTargetList* list = gtk_target_list_new(nullptr, 0);
</del><ins>+ GRefPtr<GtkTargetList> list = adoptGRef(gtk_target_list_new(nullptr, 0));
</ins><span class="cx">
</span><del>- if (dataObject->hasText())
- gtk_target_list_add_text_targets(list, TargetTypeText);
</del><ins>+ if (dataObject.hasText())
+ gtk_target_list_add_text_targets(list.get(), TargetTypeText);
</ins><span class="cx">
</span><del>- if (dataObject->hasMarkup())
- gtk_target_list_add(list, markupAtom, 0, TargetTypeMarkup);
</del><ins>+ if (dataObject.hasMarkup())
+ gtk_target_list_add(list.get(), markupAtom, 0, TargetTypeMarkup);
</ins><span class="cx">
</span><del>- if (dataObject->hasURIList()) {
- gtk_target_list_add_uri_targets(list, TargetTypeURIList);
- gtk_target_list_add(list, netscapeURLAtom, 0, TargetTypeNetscapeURL);
</del><ins>+ if (dataObject.hasURIList()) {
+ gtk_target_list_add_uri_targets(list.get(), TargetTypeURIList);
+ gtk_target_list_add(list.get(), netscapeURLAtom, 0, TargetTypeNetscapeURL);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (dataObject->hasImage())
- gtk_target_list_add_image_targets(list, TargetTypeImage, TRUE);
</del><ins>+ if (dataObject.hasImage())
+ gtk_target_list_add_image_targets(list.get(), TargetTypeImage, TRUE);
</ins><span class="cx">
</span><del>- if (dataObject->hasUnknownTypeData())
- gtk_target_list_add(list, unknownAtom, 0, TargetTypeUnknown);
</del><ins>+ if (dataObject.hasUnknownTypeData())
+ gtk_target_list_add(list.get(), unknownAtom, 0, TargetTypeUnknown);
</ins><span class="cx">
</span><span class="cx"> if (shouldInludeSmartPaste == IncludeSmartPaste)
</span><del>- gtk_target_list_add(list, smartPasteAtom, 0, TargetTypeSmartPaste);
</del><ins>+ gtk_target_list_add(list.get(), smartPasteAtom, 0, TargetTypeSmartPaste);
</ins><span class="cx">
</span><span class="cx"> return list;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PasteboardHelper::fillDataObjectFromDropData(GtkSelectionData* data, guint /* info */, DataObjectGtk* dataObject)
</del><ins>+void PasteboardHelper::fillDataObjectFromDropData(GtkSelectionData* data, guint /* info */, DataObjectGtk& dataObject)
</ins><span class="cx"> {
</span><span class="cx"> if (!gtk_selection_data_get_data(data))
</span><span class="cx"> return;
</span><span class="lines">@@ -207,13 +203,13 @@
</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>+ dataObject.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>+ dataObject.setMarkup(markup);
</ins><span class="cx"> } else if (target == uriListAtom) {
</span><del>- dataObject->setURIList(selectionDataToUTF8String(data));
</del><ins>+ dataObject.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">@@ -221,10 +217,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 (!dataObject.hasURIList())
+ dataObject.setURIList(pieces[0]);
</ins><span class="cx"> if (pieces.size() > 1)
</span><del>- dataObject->setText(pieces[1]);
</del><ins>+ dataObject.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">@@ -234,7 +230,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>+ dataObject.setUnknownTypeData(key.get(), value.get());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -260,59 +256,67 @@
</span><span class="cx">
</span><span class="cx"> static DataObjectGtk* settingClipboardDataObject = 0;
</span><span class="cx">
</span><del>-static void getClipboardContentsCallback(GtkClipboard* clipboard, GtkSelectionData *selectionData, guint info, gpointer)
</del><ins>+struct ClipboardSetData {
+ ClipboardSetData(DataObjectGtk* dataObject, GClosure* callback)
+ : dataObject(dataObject)
+ , callback(callback)
+ {
+ }
+
+ ~ClipboardSetData()
+ {
+ }
+
+ RefPtr<DataObjectGtk> dataObject;
+ GRefPtr<GClosure> callback;
+};
+
+static void getClipboardContentsCallback(GtkClipboard*, GtkSelectionData *selectionData, guint info, gpointer userData)
</ins><span class="cx"> {
</span><del>- DataObjectGtk* dataObject = DataObjectGtk::forClipboard(clipboard);
- ASSERT(dataObject);
- PasteboardHelper::singleton().fillSelectionData(selectionData, info, dataObject);
</del><ins>+ auto* data = static_cast<ClipboardSetData*>(userData);
+ PasteboardHelper::singleton().fillSelectionData(selectionData, info, *data->dataObject);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static void clearClipboardContentsCallback(GtkClipboard* clipboard, gpointer data)
</del><ins>+static void clearClipboardContentsCallback(GtkClipboard* clipboard, gpointer userData)
</ins><span class="cx"> {
</span><del>- DataObjectGtk* dataObject = DataObjectGtk::forClipboard(clipboard);
- ASSERT(dataObject);
</del><ins>+ std::unique_ptr<ClipboardSetData> data(static_cast<ClipboardSetData*>(userData));
</ins><span class="cx">
</span><span class="cx"> // Only clear the DataObject for this clipboard if we are not currently setting it.
</span><del>- if (dataObject != settingClipboardDataObject)
- dataObject->clearAll();
</del><ins>+ if (data->dataObject.get() != settingClipboardDataObject)
+ data->dataObject->clearAll();
</ins><span class="cx">
</span><del>- if (!data)
</del><ins>+ if (!data->callback)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- GRefPtr<GClosure> callback = adoptGRef(static_cast<GClosure*>(data));
</del><span class="cx"> GValue firstArgument = {0, {{0}}};
</span><span class="cx"> g_value_init(&firstArgument, G_TYPE_POINTER);
</span><span class="cx"> g_value_set_pointer(&firstArgument, clipboard);
</span><del>- g_closure_invoke(callback.get(), nullptr, 1, &firstArgument, 0);
</del><ins>+ g_closure_invoke(data->callback.get(), nullptr, 1, &firstArgument, 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void PasteboardHelper::writeClipboardContents(GtkClipboard* clipboard, SmartPasteInclusion includeSmartPaste, GClosure* callback)
</del><ins>+void PasteboardHelper::writeClipboardContents(GtkClipboard* clipboard, const DataObjectGtk& dataObject, SmartPasteInclusion includeSmartPaste, GClosure* callback)
</ins><span class="cx"> {
</span><del>- DataObjectGtk* dataObject = DataObjectGtk::forClipboard(clipboard);
- GtkTargetList* list = targetListForDataObject(dataObject, includeSmartPaste);
</del><ins>+ GRefPtr<GtkTargetList> list = targetListForDataObject(dataObject, includeSmartPaste);
</ins><span class="cx">
</span><span class="cx"> int numberOfTargets;
</span><del>- GtkTargetEntry* table = gtk_target_table_new_from_list(list, &numberOfTargets);
</del><ins>+ GtkTargetEntry* table = gtk_target_table_new_from_list(list.get(), &numberOfTargets);
</ins><span class="cx">
</span><span class="cx"> if (numberOfTargets > 0 && table) {
</span><del>- settingClipboardDataObject = dataObject;
</del><ins>+ settingClipboardDataObject = const_cast<DataObjectGtk*>(&dataObject);
</ins><span class="cx">
</span><del>- if (gtk_clipboard_set_with_data(clipboard, table, numberOfTargets, getClipboardContentsCallback, clearClipboardContentsCallback, callback ? g_closure_ref(callback) : nullptr))
</del><ins>+ auto data = std::make_unique<ClipboardSetData>(settingClipboardDataObject, callback);
+ if (gtk_clipboard_set_with_data(clipboard, table, numberOfTargets, getClipboardContentsCallback, clearClipboardContentsCallback, data.get())) {
</ins><span class="cx"> gtk_clipboard_set_can_store(clipboard, nullptr, 0);
</span><del>- else {
- // When gtk_clipboard_set_with_data fails the callbacks are ignored, so we need to release the reference we were passing to clearClipboardContentsCallback.
- if (callback)
- g_closure_unref(callback);
</del><ins>+ // When gtk_clipboard_set_with_data() succeeds clearClipboardContentsCallback takes the ownership of data, so we leak it here.
+ data.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> settingClipboardDataObject = nullptr;
</span><del>-
</del><span class="cx"> } else
</span><span class="cx"> gtk_clipboard_clear(clipboard);
</span><span class="cx">
</span><span class="cx"> if (table)
</span><span class="cx"> gtk_target_table_free(table, numberOfTargets);
</span><del>- gtk_target_list_unref(list);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool PasteboardHelper::clipboardContentSupportsSmartReplace(GtkClipboard* clipboard)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkPasteboardHelperh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/PasteboardHelper.h (205859 => 205860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/PasteboardHelper.h 2016-09-13 15:59:25 UTC (rev 205859)
+++ trunk/Source/WebCore/platform/gtk/PasteboardHelper.h 2016-09-13 16:13:38 UTC (rev 205860)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx"> #ifndef PasteboardHelper_h
</span><span class="cx"> #define PasteboardHelper_h
</span><span class="cx">
</span><ins>+#include "GRefPtrGtk.h"
</ins><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="lines">@@ -42,12 +43,12 @@
</span><span class="cx"> enum SmartPasteInclusion { IncludeSmartPaste, DoNotIncludeSmartPaste };
</span><span class="cx">
</span><span class="cx"> GtkTargetList* targetList() const;
</span><del>- GtkTargetList* targetListForDataObject(DataObjectGtk*, SmartPasteInclusion = DoNotIncludeSmartPaste);
- void fillSelectionData(GtkSelectionData*, guint, DataObjectGtk*);
- void fillDataObjectFromDropData(GtkSelectionData*, guint, DataObjectGtk*);
</del><ins>+ GRefPtr<GtkTargetList> targetListForDataObject(const DataObjectGtk&, SmartPasteInclusion = DoNotIncludeSmartPaste);
+ void fillSelectionData(GtkSelectionData*, guint, const DataObjectGtk&);
+ void fillDataObjectFromDropData(GtkSelectionData*, guint, DataObjectGtk&);
</ins><span class="cx"> Vector<GdkAtom> dropAtomsForContext(GtkWidget*, GdkDragContext*);
</span><del>- void writeClipboardContents(GtkClipboard*, SmartPasteInclusion = DoNotIncludeSmartPaste, GClosure* = 0);
- void getClipboardContents(GtkClipboard*);
</del><ins>+ void writeClipboardContents(GtkClipboard*, const DataObjectGtk&, SmartPasteInclusion = DoNotIncludeSmartPaste, GClosure* = 0);
+ void getClipboardContents(GtkClipboard*, DataObjectGtk&);
</ins><span class="cx">
</span><span class="cx"> enum PasteboardTargetType { TargetTypeMarkup, TargetTypeText, TargetTypeImage, TargetTypeURIList, TargetTypeNetscapeURL, TargetTypeSmartPaste, TargetTypeUnknown };
</span><span class="cx"> bool clipboardContentSupportsSmartReplace(GtkClipboard*);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (205859 => 205860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-09-13 15:59:25 UTC (rev 205859)
+++ trunk/Source/WebKit2/ChangeLog 2016-09-13 16:13:38 UTC (rev 205860)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-09-13 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Get rid of DataObjectGtk::forClipboard and cleanup pasteboard code
+ https://bugs.webkit.org/show_bug.cgi?id=161907
+
+ Reviewed by Michael Catanzaro.
+
+ Update to DataObjectGtk and PasteboardHelper API changes.
+
+ * UIProcess/gtk/DragAndDropHandler.cpp:
+ (WebKit::DragAndDropHandler::startDrag):
+ (WebKit::DragAndDropHandler::fillDragData):
+ (WebKit::DragAndDropHandler::dataObjectForDropData):
+ * WebProcess/WebCoreSupport/gtk/WebDragClientGtk.cpp:
+ (WebKit::WebDragClient::startDrag):
+ * WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp:
+ (WebKit::collapseSelection):
+ (WebKit::WebEditorClient::updateGlobalSelection): Remove wrong X11 guards, since that code is not X11 specific.
+
</ins><span class="cx"> 2016-09-12 DAN SAUNDERS <dasau@microsoft.com>
</span><span class="cx">
</span><span class="cx"> AX: WKWebView for macOS does not allow configuration of tabsToLinks
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkDragAndDropHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp (205859 => 205860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp 2016-09-13 15:59:25 UTC (rev 205859)
+++ trunk/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp 2016-09-13 16:13:38 UTC (rev 205860)
</span><span class="lines">@@ -115,10 +115,10 @@
</span><span class="cx"> {
</span><span class="cx"> #if GTK_CHECK_VERSION(3, 16, 0)
</span><span class="cx"> m_draggingDataObject = adoptRef(dragData.platformData());
</span><del>- GRefPtr<GtkTargetList> targetList = adoptGRef(PasteboardHelper::singleton().targetListForDataObject(m_draggingDataObject.get()));
</del><ins>+ GRefPtr<GtkTargetList> targetList = PasteboardHelper::singleton().targetListForDataObject(*m_draggingDataObject);
</ins><span class="cx"> #else
</span><span class="cx"> RefPtr<DataObjectGtk> dataObject = adoptRef(dragData.platformData());
</span><del>- GRefPtr<GtkTargetList> targetList = adoptGRef(PasteboardHelper::singleton().targetListForDataObject(dataObject.get()));
</del><ins>+ GRefPtr<GtkTargetList> targetList = PasteboardHelper::singleton().targetListForDataObject(*dataObject);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> GUniquePtr<GdkEvent> currentEvent(gtk_get_current_event());
</span><span class="lines">@@ -156,10 +156,10 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> ASSERT(m_draggingDataObject);
</span><del>- PasteboardHelper::singleton().fillSelectionData(selectionData, info, m_draggingDataObject.get());
</del><ins>+ PasteboardHelper::singleton().fillSelectionData(selectionData, info, *m_draggingDataObject);
</ins><span class="cx"> #else
</span><span class="cx"> if (DataObjectGtk* dataObject = m_draggingDataObjects.get(context))
</span><del>- PasteboardHelper::singleton().fillSelectionData(selectionData, info, dataObject);
</del><ins>+ PasteboardHelper::singleton().fillSelectionData(selectionData, info, *dataObject);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -196,7 +196,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.get());
</del><ins>+ PasteboardHelper::singleton().fillDataObjectFromDropData(selectionData, info, *droppingContext->dataObject);
</ins><span class="cx"> if (droppingContext->pendingDataRequests)
</span><span class="cx"> return nullptr;
</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 (205859 => 205860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebDragClientGtk.cpp 2016-09-13 15:59:25 UTC (rev 205859)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebDragClientGtk.cpp 2016-09-13 16:13:38 UTC (rev 205860)
</span><span class="lines">@@ -65,8 +65,8 @@
</span><span class="cx"> if (bitmap && !bitmap->createHandle(handle))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RefPtr<DataObjectGtk> dataObject = dataTransfer.pasteboard().dataObject();
- DragData dragData(dataObject.get(), clientPosition, globalPosition, dataTransfer.sourceOperation());
</del><ins>+ const auto& dataObject = dataTransfer.pasteboard().dataObject();
+ DragData dragData(const_cast<DataObjectGtk*>(&dataObject), clientPosition, globalPosition, dataTransfer.sourceOperation());
</ins><span class="cx"> m_page->send(Messages::WebPageProxy::StartDrag(dragData, 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 (205859 => 205860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp 2016-09-13 15:59:25 UTC (rev 205859)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp 2016-09-13 16:13:38 UTC (rev 205860)
</span><span class="lines">@@ -119,7 +119,6 @@
</span><span class="cx"> event->setDefaultHandled();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(X11)
</del><span class="cx"> class EditorClientFrameDestructionObserver : FrameDestructionObserver {
</span><span class="cx"> public:
</span><span class="cx"> EditorClientFrameDestructionObserver(Frame* frame, GClosure* closure)
</span><span class="lines">@@ -158,11 +157,9 @@
</span><span class="cx"> const VisibleSelection& selection = frame->selection().selection();
</span><span class="cx"> frame->selection().setBase(selection.extent(), selection.affinity());
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void WebEditorClient::updateGlobalSelection(Frame* frame)
</span><span class="cx"> {
</span><del>-#if PLATFORM(X11)
</del><span class="cx"> if (!frame->selection().isRange())
</span><span class="cx"> return;
</span><span class="cx"> RefPtr<Range> range = frame->selection().toNormalizedRange();
</span><span class="lines">@@ -184,7 +181,6 @@
</span><span class="cx"> pasteboardContent.callback = callback;
</span><span class="cx"> Pasteboard::createForGlobalSelection()->write(pasteboardContent);
</span><span class="cx"> frameSettingClipboard = nullptr;
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebEditorClient::shouldShowUnicodeMenu()
</span></span></pre>
</div>
</div>
</body>
</html>