<!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>[186954] 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/186954">186954</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-07-17 02:23:28 -0700 (Fri, 17 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Cleanup PasteboardHelper
https://bugs.webkit.org/show_bug.cgi?id=147035
Reviewed by Žan Doberšek.
Source/WebCore:
It's actually a singleton, but the API suggests you can create
your own or use the default one, but the default one should be the
only one. Rename PasteboardHelper::defaultPasteboardHelper() as
PasteboardHelper::singleton() and make it non-copyable and never
destroyed.
* platform/gtk/PasteboardGtk.cpp:
(WebCore::Pasteboard::writePlainText): Use PasteboardHelper::singleton().
(WebCore::Pasteboard::write): Ditto.
(WebCore::Pasteboard::writePasteboard): Ditto.
(WebCore::Pasteboard::clear): Ditto.
(WebCore::Pasteboard::canSmartReplace): 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::singleton): Renamed as singleton, also
use NeverDestroyed and return a reference instead of a pointer.
(WebCore::PasteboardHelper::PasteboardHelper): Do all
initializations here and remove the initialization static flag,
since this is a real singleton now. Also use
gdk_atom_intern_static_string() to initialize the atoms instead of
gdk_atom_intern().
(WebCore::PasteboardHelper::targetList):
(WebCore::PasteboardHelper::targetListForDataObject):
(WebCore::getClipboardContentsCallback):
* platform/gtk/PasteboardHelper.h:
Source/WebKit2:
Use PasteboardHelper::singleton() instead of
PasteboardHelper::defaultPasteboardHelper().
* UIProcess/API/gtk/WebKitWebViewBase.cpp:
(webkitWebViewBaseConstructed):
* UIProcess/gtk/DragAndDropHandler.cpp:
(WebKit::DragAndDropHandler::startDrag):
(WebKit::DragAndDropHandler::fillDragData):
(WebKit::DragAndDropHandler::dataObjectForDropData):
(WebKit::DragAndDropHandler::requestDragData):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkDragAndDropHandlercpp">trunk/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186953 => 186954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-17 06:24:47 UTC (rev 186953)
+++ trunk/Source/WebCore/ChangeLog 2015-07-17 09:23:28 UTC (rev 186954)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2015-07-17 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Cleanup PasteboardHelper
+ https://bugs.webkit.org/show_bug.cgi?id=147035
+
+ Reviewed by Žan Doberšek.
+
+ It's actually a singleton, but the API suggests you can create
+ your own or use the default one, but the default one should be the
+ only one. Rename PasteboardHelper::defaultPasteboardHelper() as
+ PasteboardHelper::singleton() and make it non-copyable and never
+ destroyed.
+
+ * platform/gtk/PasteboardGtk.cpp:
+ (WebCore::Pasteboard::writePlainText): Use PasteboardHelper::singleton().
+ (WebCore::Pasteboard::write): Ditto.
+ (WebCore::Pasteboard::writePasteboard): Ditto.
+ (WebCore::Pasteboard::clear): Ditto.
+ (WebCore::Pasteboard::canSmartReplace): 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::singleton): Renamed as singleton, also
+ use NeverDestroyed and return a reference instead of a pointer.
+ (WebCore::PasteboardHelper::PasteboardHelper): Do all
+ initializations here and remove the initialization static flag,
+ since this is a real singleton now. Also use
+ gdk_atom_intern_static_string() to initialize the atoms instead of
+ gdk_atom_intern().
+ (WebCore::PasteboardHelper::targetList):
+ (WebCore::PasteboardHelper::targetListForDataObject):
+ (WebCore::getClipboardContentsCallback):
+ * platform/gtk/PasteboardHelper.h:
+
</ins><span class="cx"> 2015-07-16 Matt Rajca <mrajca@apple.com>
</span><span class="cx">
</span><span class="cx"> Media Session: handle 'Transient' and 'Transient Solo' interruption events
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkPasteboardGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp (186953 => 186954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp 2015-07-17 06:24:47 UTC (rev 186953)
+++ trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp 2015-07-17 09:23:28 UTC (rev 186954)
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx"> m_dataObject->setText(text);
</span><span class="cx">
</span><span class="cx"> if (m_gtkClipboard)
</span><del>- PasteboardHelper::defaultPasteboardHelper()->writeClipboardContents(m_gtkClipboard, (smartReplaceOption == CanSmartReplace) ? PasteboardHelper::IncludeSmartPaste : PasteboardHelper::DoNotIncludeSmartPaste);
</del><ins>+ PasteboardHelper::singleton().writeClipboardContents(m_gtkClipboard, (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">@@ -158,7 +158,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::defaultPasteboardHelper()->writeClipboardContents(m_gtkClipboard);
</del><ins>+ PasteboardHelper::singleton().writeClipboardContents(m_gtkClipboard);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Pasteboard::write(const PasteboardImage& pasteboardImage)
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx"> m_dataObject->setImage(pixbuf.get());
</span><span class="cx">
</span><span class="cx"> if (m_gtkClipboard)
</span><del>- PasteboardHelper::defaultPasteboardHelper()->writeClipboardContents(m_gtkClipboard);
</del><ins>+ PasteboardHelper::singleton().writeClipboardContents(m_gtkClipboard);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Pasteboard::write(const PasteboardWebContent& pasteboardContent)
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx"> m_dataObject->setMarkup(pasteboardContent.markup);
</span><span class="cx">
</span><span class="cx"> if (m_gtkClipboard)
</span><del>- PasteboardHelper::defaultPasteboardHelper()->writeClipboardContents(m_gtkClipboard, pasteboardContent.canSmartCopyOrDelete ? PasteboardHelper::IncludeSmartPaste : PasteboardHelper::DoNotIncludeSmartPaste, pasteboardContent.callback.get());
</del><ins>+ PasteboardHelper::singleton().writeClipboardContents(m_gtkClipboard, 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="lines">@@ -210,7 +210,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_gtkClipboard)
</span><del>- PasteboardHelper::defaultPasteboardHelper()->writeClipboardContents(m_gtkClipboard);
</del><ins>+ PasteboardHelper::singleton().writeClipboardContents(m_gtkClipboard);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Pasteboard::clear()
</span><span class="lines">@@ -222,7 +222,7 @@
</span><span class="cx"> m_dataObject->clearAllExceptFilenames();
</span><span class="cx">
</span><span class="cx"> if (m_gtkClipboard)
</span><del>- PasteboardHelper::defaultPasteboardHelper()->writeClipboardContents(m_gtkClipboard);
</del><ins>+ PasteboardHelper::singleton().writeClipboardContents(m_gtkClipboard);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Pasteboard::clear(const String& type)
</span><span class="lines">@@ -247,12 +247,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_gtkClipboard)
</span><del>- PasteboardHelper::defaultPasteboardHelper()->writeClipboardContents(m_gtkClipboard);
</del><ins>+ PasteboardHelper::singleton().writeClipboardContents(m_gtkClipboard);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Pasteboard::canSmartReplace()
</span><span class="cx"> {
</span><del>- return m_gtkClipboard && PasteboardHelper::defaultPasteboardHelper()->clipboardContentSupportsSmartReplace(m_gtkClipboard);
</del><ins>+ return m_gtkClipboard && PasteboardHelper::singleton().clipboardContentSupportsSmartReplace(m_gtkClipboard);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><span class="lines">@@ -264,14 +264,14 @@
</span><span class="cx"> void Pasteboard::read(PasteboardPlainText& text)
</span><span class="cx"> {
</span><span class="cx"> if (m_gtkClipboard)
</span><del>- PasteboardHelper::defaultPasteboardHelper()->getClipboardContents(m_gtkClipboard);
</del><ins>+ PasteboardHelper::singleton().getClipboardContents(m_gtkClipboard);
</ins><span class="cx"> text.text = m_dataObject->text();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Pasteboard::hasData()
</span><span class="cx"> {
</span><span class="cx"> if (m_gtkClipboard)
</span><del>- PasteboardHelper::defaultPasteboardHelper()->getClipboardContents(m_gtkClipboard);
</del><ins>+ PasteboardHelper::singleton().getClipboardContents(m_gtkClipboard);
</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">@@ -279,7 +279,7 @@
</span><span class="cx"> Vector<String> Pasteboard::types()
</span><span class="cx"> {
</span><span class="cx"> if (m_gtkClipboard)
</span><del>- PasteboardHelper::defaultPasteboardHelper()->getClipboardContents(m_gtkClipboard);
</del><ins>+ PasteboardHelper::singleton().getClipboardContents(m_gtkClipboard);
</ins><span class="cx">
</span><span class="cx"> Vector<String> types;
</span><span class="cx"> if (m_dataObject->hasText()) {
</span><span class="lines">@@ -310,7 +310,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::defaultPasteboardHelper()->getClipboardContents(m_gtkClipboard);
</del><ins>+ PasteboardHelper::singleton().getClipboardContents(m_gtkClipboard);
</ins><span class="cx">
</span><span class="cx"> switch (dataObjectTypeFromHTMLClipboardType(type)) {
</span><span class="cx"> case ClipboardDataTypeURIList:
</span><span class="lines">@@ -333,7 +333,7 @@
</span><span class="cx"> Vector<String> Pasteboard::readFilenames()
</span><span class="cx"> {
</span><span class="cx"> if (m_gtkClipboard)
</span><del>- PasteboardHelper::defaultPasteboardHelper()->getClipboardContents(m_gtkClipboard);
</del><ins>+ PasteboardHelper::singleton().getClipboardContents(m_gtkClipboard);
</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 (186953 => 186954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/PasteboardHelper.cpp 2015-07-17 06:24:47 UTC (rev 186953)
+++ trunk/Source/WebCore/platform/gtk/PasteboardHelper.cpp 2015-07-17 09:23:28 UTC (rev 186954)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> static GdkAtom smartPasteAtom;
</span><span class="cx"> static GdkAtom unknownAtom;
</span><span class="cx">
</span><del>-static String gMarkupPrefix;
</del><ins>+static const String gMarkupPrefix = ASCIILiteral("<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\">");
</ins><span class="cx">
</span><span class="cx"> static void removeMarkupPrefix(String& markup)
</span><span class="cx"> {
</span><span class="lines">@@ -51,51 +51,33 @@
</span><span class="cx"> markup.remove(0, gMarkupPrefix.length());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void initGdkAtoms()
</del><ins>+PasteboardHelper& PasteboardHelper::singleton()
</ins><span class="cx"> {
</span><del>- static gboolean initialized = FALSE;
-
- if (initialized)
- return;
-
- initialized = TRUE;
-
- textPlainAtom = gdk_atom_intern("text/plain;charset=utf-8", FALSE);
- markupAtom = gdk_atom_intern("text/html", FALSE);
- netscapeURLAtom = gdk_atom_intern("_NETSCAPE_URL", FALSE);
- uriListAtom = gdk_atom_intern("text/uri-list", FALSE);
- smartPasteAtom = gdk_atom_intern("application/vnd.webkitgtk.smartpaste", FALSE);
- unknownAtom = gdk_atom_intern("application/vnd.webkitgtk.unknown", FALSE);
- gMarkupPrefix = "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\">";
</del><ins>+ static NeverDestroyed<PasteboardHelper> helper;
+ return helper;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PasteboardHelper* PasteboardHelper::defaultPasteboardHelper()
-{
- DEPRECATED_DEFINE_STATIC_LOCAL(PasteboardHelper, defaultHelper, ());
- return &defaultHelper;
-}
-
</del><span class="cx"> PasteboardHelper::PasteboardHelper()
</span><del>- : m_targetList(gtk_target_list_new(0, 0))
</del><ins>+ : m_targetList(adoptGRef(gtk_target_list_new(nullptr, 0)))
</ins><span class="cx"> {
</span><del>- initGdkAtoms();
</del><ins>+ textPlainAtom = gdk_atom_intern_static_string("text/plain;charset=utf-8");
+ markupAtom = gdk_atom_intern_static_string("text/html");
+ netscapeURLAtom = gdk_atom_intern_static_string("_NETSCAPE_URL");
+ uriListAtom = gdk_atom_intern_static_string("text/uri-list");
+ smartPasteAtom = gdk_atom_intern_static_string("application/vnd.webkitgtk.smartpaste");
+ unknownAtom = gdk_atom_intern_static_string("application/vnd.webkitgtk.unknown");
</ins><span class="cx">
</span><del>- gtk_target_list_add_text_targets(m_targetList, PasteboardHelper::TargetTypeText);
- gtk_target_list_add(m_targetList, markupAtom, 0, PasteboardHelper::TargetTypeMarkup);
- gtk_target_list_add_uri_targets(m_targetList, PasteboardHelper::TargetTypeURIList);
- gtk_target_list_add(m_targetList, netscapeURLAtom, 0, PasteboardHelper::TargetTypeNetscapeURL);
- gtk_target_list_add_image_targets(m_targetList, PasteboardHelper::TargetTypeImage, TRUE);
- gtk_target_list_add(m_targetList, unknownAtom, 0, PasteboardHelper::TargetTypeUnknown);
</del><ins>+ gtk_target_list_add_text_targets(m_targetList.get(), PasteboardHelper::TargetTypeText);
+ gtk_target_list_add(m_targetList.get(), markupAtom, 0, PasteboardHelper::TargetTypeMarkup);
+ gtk_target_list_add_uri_targets(m_targetList.get(), PasteboardHelper::TargetTypeURIList);
+ gtk_target_list_add(m_targetList.get(), netscapeURLAtom, 0, PasteboardHelper::TargetTypeNetscapeURL);
+ gtk_target_list_add_image_targets(m_targetList.get(), PasteboardHelper::TargetTypeImage, TRUE);
+ gtk_target_list_add(m_targetList.get(), unknownAtom, 0, PasteboardHelper::TargetTypeUnknown);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PasteboardHelper::~PasteboardHelper()
-{
- gtk_target_list_unref(m_targetList);
-}
-
</del><span class="cx"> GtkTargetList* PasteboardHelper::targetList() const
</span><span class="cx"> {
</span><del>- return m_targetList;
</del><ins>+ return m_targetList.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static String selectionDataToUTF8String(GtkSelectionData* data)
</span><span class="lines">@@ -189,7 +171,7 @@
</span><span class="cx">
</span><span class="cx"> GtkTargetList* PasteboardHelper::targetListForDataObject(DataObjectGtk* dataObject, SmartPasteInclusion shouldInludeSmartPaste)
</span><span class="cx"> {
</span><del>- GtkTargetList* list = gtk_target_list_new(0, 0);
</del><ins>+ GtkTargetList* list = gtk_target_list_new(nullptr, 0);
</ins><span class="cx">
</span><span class="cx"> if (dataObject->hasText())
</span><span class="cx"> gtk_target_list_add_text_targets(list, TargetTypeText);
</span><span class="lines">@@ -278,7 +260,7 @@
</span><span class="cx"> {
</span><span class="cx"> DataObjectGtk* dataObject = DataObjectGtk::forClipboard(clipboard);
</span><span class="cx"> ASSERT(dataObject);
</span><del>- PasteboardHelper::defaultPasteboardHelper()->fillSelectionData(selectionData, info, dataObject);
</del><ins>+ PasteboardHelper::singleton().fillSelectionData(selectionData, info, dataObject);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void clearClipboardContentsCallback(GtkClipboard* clipboard, gpointer data)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkPasteboardHelperh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/PasteboardHelper.h (186953 => 186954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/PasteboardHelper.h 2015-07-17 06:24:47 UTC (rev 186953)
+++ trunk/Source/WebCore/platform/gtk/PasteboardHelper.h 2015-07-17 09:23:28 UTC (rev 186954)
</span><span class="lines">@@ -25,18 +25,19 @@
</span><span class="cx"> #ifndef PasteboardHelper_h
</span><span class="cx"> #define PasteboardHelper_h
</span><span class="cx">
</span><del>-#include <glib-object.h>
</del><ins>+#include <wtf/NeverDestroyed.h>
+#include <wtf/Noncopyable.h>
</ins><span class="cx"> #include <wtf/Vector.h>
</span><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class DataObjectGtk;
</span><span class="cx">
</span><span class="cx"> class PasteboardHelper {
</span><ins>+ WTF_MAKE_NONCOPYABLE(PasteboardHelper);
</ins><span class="cx"> public:
</span><del>- PasteboardHelper();
- virtual ~PasteboardHelper();
- static PasteboardHelper* defaultPasteboardHelper();
</del><ins>+ static PasteboardHelper& singleton();
</ins><span class="cx">
</span><span class="cx"> enum SmartPasteInclusion { IncludeSmartPaste, DoNotIncludeSmartPaste };
</span><span class="cx">
</span><span class="lines">@@ -52,7 +53,12 @@
</span><span class="cx"> bool clipboardContentSupportsSmartReplace(GtkClipboard*);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- GtkTargetList* m_targetList;
</del><ins>+ PasteboardHelper();
+ ~PasteboardHelper() = delete;
+
+ GRefPtr<GtkTargetList> m_targetList;
+
+ friend class WTF::NeverDestroyed<PasteboardHelper>;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (186953 => 186954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-07-17 06:24:47 UTC (rev 186953)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-17 09:23:28 UTC (rev 186954)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-07-17 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Cleanup PasteboardHelper
+ https://bugs.webkit.org/show_bug.cgi?id=147035
+
+ Reviewed by Žan Doberšek.
+
+ Use PasteboardHelper::singleton() instead of
+ PasteboardHelper::defaultPasteboardHelper().
+
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ (webkitWebViewBaseConstructed):
+ * UIProcess/gtk/DragAndDropHandler.cpp:
+ (WebKit::DragAndDropHandler::startDrag):
+ (WebKit::DragAndDropHandler::fillDragData):
+ (WebKit::DragAndDropHandler::dataObjectForDropData):
+ (WebKit::DragAndDropHandler::requestDragData):
+
</ins><span class="cx"> 2015-07-16 Matt Baker <mattbaker@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Web Inspector toolbar can be covered by the Safari tab bar when docked to the right
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (186953 => 186954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2015-07-17 06:24:47 UTC (rev 186953)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2015-07-17 09:23:28 UTC (rev 186954)
</span><span class="lines">@@ -463,7 +463,7 @@
</span><span class="cx"> gtk_widget_set_can_focus(viewWidget, TRUE);
</span><span class="cx"> gtk_drag_dest_set(viewWidget, static_cast<GtkDestDefaults>(0), nullptr, 0,
</span><span class="cx"> static_cast<GdkDragAction>(GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK | GDK_ACTION_PRIVATE));
</span><del>- gtk_drag_dest_set_target_list(viewWidget, PasteboardHelper::defaultPasteboardHelper()->targetList());
</del><ins>+ gtk_drag_dest_set_target_list(viewWidget, PasteboardHelper::singleton().targetList());
</ins><span class="cx">
</span><span class="cx"> WebKitWebViewBasePrivate* priv = WEBKIT_WEB_VIEW_BASE(object)->priv;
</span><span class="cx"> priv->pageClient = std::make_unique<PageClientImpl>(viewWidget);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkDragAndDropHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp (186953 => 186954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp 2015-07-17 06:24:47 UTC (rev 186953)
+++ trunk/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp 2015-07-17 09:23:28 UTC (rev 186954)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> void DragAndDropHandler::startDrag(const DragData& dragData, PassRefPtr<ShareableBitmap> dragImage)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<DataObjectGtk> dataObject = adoptRef(dragData.platformData());
</span><del>- GRefPtr<GtkTargetList> targetList = adoptGRef(PasteboardHelper::defaultPasteboardHelper()->targetListForDataObject(dataObject.get()));
</del><ins>+ GRefPtr<GtkTargetList> targetList = adoptGRef(PasteboardHelper::singleton().targetListForDataObject(dataObject.get()));
</ins><span class="cx"> GUniquePtr<GdkEvent> currentEvent(gtk_get_current_event());
</span><span class="cx">
</span><span class="cx"> GdkDragContext* context = gtk_drag_begin(m_page.viewWidget(), targetList.get(), dragOperationToGdkDragActions(dragData.draggingSourceOperationMask()),
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> void DragAndDropHandler::fillDragData(GdkDragContext* context, GtkSelectionData* selectionData, unsigned info)
</span><span class="cx"> {
</span><span class="cx"> if (DataObjectGtk* dataObject = m_draggingDataObjects.get(context))
</span><del>- PasteboardHelper::defaultPasteboardHelper()->fillSelectionData(selectionData, info, dataObject);
</del><ins>+ PasteboardHelper::singleton().fillSelectionData(selectionData, info, dataObject);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DragAndDropHandler::finishDrag(GdkDragContext* context)
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> droppingContext->pendingDataRequests--;
</span><del>- PasteboardHelper::defaultPasteboardHelper()->fillDataObjectFromDropData(selectionData, info, droppingContext->dataObject.get());
</del><ins>+ PasteboardHelper::singleton().fillDataObjectFromDropData(selectionData, info, droppingContext->dataObject.get());
</ins><span class="cx"> if (droppingContext->pendingDataRequests)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx"> if (!droppingContext) {
</span><span class="cx"> GtkWidget* widget = m_page.viewWidget();
</span><span class="cx"> droppingContext = std::make_unique<DroppingContext>(context, position);
</span><del>- Vector<GdkAtom> acceptableTargets(PasteboardHelper::defaultPasteboardHelper()->dropAtomsForContext(widget, droppingContext->gdkContext));
</del><ins>+ Vector<GdkAtom> acceptableTargets(PasteboardHelper::singleton().dropAtomsForContext(widget, droppingContext->gdkContext));
</ins><span class="cx"> droppingContext->pendingDataRequests = acceptableTargets.size();
</span><span class="cx"> for (auto& target : acceptableTargets)
</span><span class="cx"> gtk_drag_get_data(widget, droppingContext->gdkContext, target, time);
</span></span></pre>
</div>
</div>
</body>
</html>