<!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>[159837] trunk</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/159837">159837</a></dd>
<dt>Author</dt> <dd>gns@gnome.org</dd>
<dt>Date</dt> <dd>2013-11-28 04:40:59 -0800 (Thu, 28 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Support custom types for drag and drop data
https://bugs.webkit.org/show_bug.cgi?id=124659
Patch by Gustavo Noronha Silva <gustavo.noronha@collabora.com> on 2013-11-27
Reviewed by Martin Robinson.
Source/WebCore:
Covered by fast/events/drag-customData.html.
* platform/gtk/DataObjectGtk.cpp:
(WebCore::DataObjectGtk::unknownTypes): returns a hash map with all custom types set.
(WebCore::DataObjectGtk::clearAllExceptFilenames): clear custom types.
* platform/gtk/DataObjectGtk.h:
(WebCore::DataObjectGtk::hasUnknownTypeData): returns whether custom types are set.
(WebCore::DataObjectGtk::unknownTypeData): returns the data for a custom type.
(WebCore::DataObjectGtk::setUnknownTypeData): sets the data for a custom type.
* platform/gtk/PasteboardGtk.cpp:
(WebCore::Pasteboard::writeString): handle unknown types as custom.
(WebCore::Pasteboard::writePasteboard): ditto.
(WebCore::Pasteboard::hasData): also check for custom types.
(WebCore::Pasteboard::types): also obtain the list of custom types.
(WebCore::Pasteboard::readString): handle unknown types as custom.
* platform/gtk/PasteboardHelper.cpp:
(WebCore::initGdkAtoms): new unknown atom.
(WebCore::PasteboardHelper::PasteboardHelper): add custom type to the list of targets.
(WebCore::PasteboardHelper::fillSelectionData): turns any custom types' data into a GVariant, which
is in turn serialized to a single string for GtkSelectionData to hold.
(WebCore::PasteboardHelper::targetListForDataObject): add custom data to the target list if any is
set.
(WebCore::PasteboardHelper::fillDataObjectFromDropData): retrieve the custom types and their data
from the serialized GVariant string held by GtkSelectionData.
(WebCore::PasteboardHelper::dropAtomsForContext): handle custom types.
Source/WebKit2:
* Shared/gtk/ArgumentCodersGtk.cpp:
(CoreIPC::encodeDataObject): encode the unknown types data.
(CoreIPC::decodeDataObject): decode the unknown types data.
LayoutTests:
* platform/gtk/TestExpectations: remove failure expectation for test that now passes.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformgtkTestExpectations">trunk/LayoutTests/platform/gtk/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedgtkArgumentCodersGtkcpp">trunk/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (159836 => 159837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2013-11-28 10:28:04 UTC (rev 159836)
+++ trunk/LayoutTests/ChangeLog 2013-11-28 12:40:59 UTC (rev 159837)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2013-11-27 Gustavo Noronha Silva <gustavo.noronha@collabora.com>
+
+ [GTK] Support custom types for drag and drop data
+ https://bugs.webkit.org/show_bug.cgi?id=124659
+
+ Reviewed by Martin Robinson.
+
+ * platform/gtk/TestExpectations: remove failure expectation for test that now passes.
+
</ins><span class="cx"> 2013-11-27 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Infer one-time scopes
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/TestExpectations (159836 => 159837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/TestExpectations 2013-11-28 10:28:04 UTC (rev 159836)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2013-11-28 12:40:59 UTC (rev 159837)
</span><span class="lines">@@ -220,14 +220,15 @@
</span><span class="cx"> webkit.org/b/98940 fast/events/drag-dataTransferItemList.html [ Skip ]
</span><span class="cx"> webkit.org/b/98940 fast/events/drag-dataTransferItemList-file-handling.html [ Skip ]
</span><span class="cx">
</span><ins>+# Custom MIME type support in DataTransfer is not yet implemented; this test was added
+# by Google while implementing a different pasteboard API that was only being used by
+# Chromium and Qt, might make sense to remove.
+webkit.org/b/99068 editing/pasteboard/clipboard-customData.html [ Failure ]
+
</ins><span class="cx"> # setAutomaticLinkDetectionEnabled is not yet implemented.
</span><span class="cx"> webkit.org/b/99069 editing/inserting/typing-space-to-trigger-smart-link.html [ Failure ]
</span><span class="cx"> webkit.org/b/85463 editing/inserting/smart-link-when-caret-is-moved-before-URL.html [ Failure ]
</span><span class="cx">
</span><del>-# Custom MIME type support in DataTransfer is not yet implemented.
-webkit.org/b/99068 editing/pasteboard/clipboard-customData.html [ Failure ]
-webkit.org/b/99068 fast/events/drag-customData.html [ Failure ]
-
</del><span class="cx"> # PasteBoard::plainText() does not support file names.
</span><span class="cx"> webkit.org/b/99070 editing/pasteboard/drag-files-to-editable-element.html [ Failure ]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (159836 => 159837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-11-28 10:28:04 UTC (rev 159836)
+++ trunk/Source/WebCore/ChangeLog 2013-11-28 12:40:59 UTC (rev 159837)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2013-11-27 Gustavo Noronha Silva <gustavo.noronha@collabora.com>
+
+ [GTK] Support custom types for drag and drop data
+ https://bugs.webkit.org/show_bug.cgi?id=124659
+
+ Reviewed by Martin Robinson.
+
+ Covered by fast/events/drag-customData.html.
+
+ * platform/gtk/DataObjectGtk.cpp:
+ (WebCore::DataObjectGtk::unknownTypes): returns a hash map with all custom types set.
+ (WebCore::DataObjectGtk::clearAllExceptFilenames): clear custom types.
+ * platform/gtk/DataObjectGtk.h:
+ (WebCore::DataObjectGtk::hasUnknownTypeData): returns whether custom types are set.
+ (WebCore::DataObjectGtk::unknownTypeData): returns the data for a custom type.
+ (WebCore::DataObjectGtk::setUnknownTypeData): sets the data for a custom type.
+ * platform/gtk/PasteboardGtk.cpp:
+ (WebCore::Pasteboard::writeString): handle unknown types as custom.
+ (WebCore::Pasteboard::writePasteboard): ditto.
+ (WebCore::Pasteboard::hasData): also check for custom types.
+ (WebCore::Pasteboard::types): also obtain the list of custom types.
+ (WebCore::Pasteboard::readString): handle unknown types as custom.
+ * platform/gtk/PasteboardHelper.cpp:
+ (WebCore::initGdkAtoms): new unknown atom.
+ (WebCore::PasteboardHelper::PasteboardHelper): add custom type to the list of targets.
+ (WebCore::PasteboardHelper::fillSelectionData): turns any custom types' data into a GVariant, which
+ is in turn serialized to a single string for GtkSelectionData to hold.
+ (WebCore::PasteboardHelper::targetListForDataObject): add custom data to the target list if any is
+ set.
+ (WebCore::PasteboardHelper::fillDataObjectFromDropData): retrieve the custom types and their data
+ from the serialized GVariant string held by GtkSelectionData.
+ (WebCore::PasteboardHelper::dropAtomsForContext): handle custom types.
+
</ins><span class="cx"> 2013-11-27 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> Allow the QuickTime plug-in to be replaced by script in an isolated word
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkDataObjectGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/DataObjectGtk.cpp (159836 => 159837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/DataObjectGtk.cpp 2013-11-28 10:28:04 UTC (rev 159836)
+++ trunk/Source/WebCore/platform/gtk/DataObjectGtk.cpp 2013-11-28 12:40:59 UTC (rev 159837)
</span><span class="lines">@@ -50,6 +50,11 @@
</span><span class="cx"> return m_markup;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+HashMap<String, String> DataObjectGtk::unknownTypes() const
+{
+ return m_unknownTypeData;
+}
+
</ins><span class="cx"> void DataObjectGtk::setText(const String& newText)
</span><span class="cx"> {
</span><span class="cx"> m_range = 0;
</span><span class="lines">@@ -155,6 +160,7 @@
</span><span class="cx"> m_url = URL();
</span><span class="cx"> m_image = 0;
</span><span class="cx"> m_range = 0;
</span><ins>+ m_unknownTypeData.clear();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DataObjectGtk::clearAll()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkDataObjectGtkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/DataObjectGtk.h (159836 => 159837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/DataObjectGtk.h 2013-11-28 10:28:04 UTC (rev 159836)
+++ trunk/Source/WebCore/platform/gtk/DataObjectGtk.h 2013-11-28 12:40:59 UTC (rev 159837)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> void setRange(PassRefPtr<Range> newRange) { m_range = newRange; }
</span><span class="cx"> void setImage(GdkPixbuf* newImage) { m_image = newImage; }
</span><span class="cx"> void setURL(const URL&, const String&);
</span><ins>+ bool hasUnknownTypeData() const { return !m_unknownTypeData.isEmpty(); }
</ins><span class="cx"> bool hasText() const { return m_range || !m_text.isEmpty(); }
</span><span class="cx"> bool hasMarkup() const { return m_range || !m_markup.isEmpty(); }
</span><span class="cx"> bool hasURIList() const { return !m_uriList.isEmpty(); }
</span><span class="lines">@@ -55,8 +56,11 @@
</span><span class="cx">
</span><span class="cx"> String text() const;
</span><span class="cx"> String markup() const;
</span><ins>+ String unknownTypeData(const String& type) const { return m_unknownTypeData.get(type); }
+ HashMap<String, String> unknownTypes() const;
</ins><span class="cx"> void setText(const String&);
</span><span class="cx"> void setMarkup(const String&);
</span><ins>+ void setUnknownTypeData(const String& type, const String& data) { m_unknownTypeData.set(type, data); }
</ins><span class="cx"> void setURIList(const String&);
</span><span class="cx"> String urlLabel() const;
</span><span class="cx">
</span><span class="lines">@@ -75,6 +79,7 @@
</span><span class="cx"> Vector<String> m_filenames;
</span><span class="cx"> GRefPtr<GdkPixbuf> m_image;
</span><span class="cx"> RefPtr<Range> m_range;
</span><ins>+ HashMap<String, String> m_unknownTypeData;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkPasteboardGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp (159836 => 159837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp 2013-11-28 10:28:04 UTC (rev 159836)
+++ trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp 2013-11-28 12:40:59 UTC (rev 159837)
</span><span class="lines">@@ -149,8 +149,10 @@
</span><span class="cx"> case ClipboardDataTypeText:
</span><span class="cx"> m_dataObject->setText(data);
</span><span class="cx"> return true;
</span><ins>+ case ClipboardDataTypeUnknown:
+ m_dataObject->setUnknownTypeData(type, data);
+ return true;
</ins><span class="cx"> case ClipboardDataTypeImage:
</span><del>- case ClipboardDataTypeUnknown:
</del><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -246,6 +248,12 @@
</span><span class="cx"> m_dataObject->setURIList(sourceDataObject->uriList());
</span><span class="cx"> if (sourceDataObject->hasImage())
</span><span class="cx"> m_dataObject->setImage(sourceDataObject->image());
</span><ins>+ if (sourceDataObject->hasUnknownTypeData()) {
+ auto types = m_dataObject->unknownTypes();
+ auto end = types.end();
+ for (auto it = types.begin(); it != end; ++it)
+ m_dataObject->setUnknownTypeData(it->key, it->value);
+ }
</ins><span class="cx">
</span><span class="cx"> if (m_gtkClipboard)
</span><span class="cx"> PasteboardHelper::defaultPasteboardHelper()->writeClipboardContents(m_gtkClipboard);
</span><span class="lines">@@ -339,7 +347,7 @@
</span><span class="cx"> if (m_gtkClipboard)
</span><span class="cx"> PasteboardHelper::defaultPasteboardHelper()->getClipboardContents(m_gtkClipboard);
</span><span class="cx">
</span><del>- return m_dataObject->hasText() || m_dataObject->hasMarkup() || m_dataObject->hasURIList() || m_dataObject->hasImage();
</del><ins>+ return m_dataObject->hasText() || m_dataObject->hasMarkup() || m_dataObject->hasURIList() || m_dataObject->hasImage() || m_dataObject->hasUnknownTypeData();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Vector<String> Pasteboard::types()
</span><span class="lines">@@ -365,6 +373,11 @@
</span><span class="cx"> if (m_dataObject->hasFilenames())
</span><span class="cx"> types.append(ASCIILiteral("Files"));
</span><span class="cx">
</span><ins>+ auto unknownTypes = m_dataObject->unknownTypes();
+ auto end = unknownTypes.end();
+ for (auto it = unknownTypes.begin(); it != end; ++it)
+ types.append(it->key);
+
</ins><span class="cx"> return types;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -382,8 +395,9 @@
</span><span class="cx"> return m_dataObject->markup();
</span><span class="cx"> case ClipboardDataTypeText:
</span><span class="cx"> return m_dataObject->text();
</span><ins>+ case ClipboardDataTypeUnknown:
+ return m_dataObject->unknownTypeData(type);
</ins><span class="cx"> case ClipboardDataTypeImage:
</span><del>- case ClipboardDataTypeUnknown:
</del><span class="cx"> break;
</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 (159836 => 159837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/PasteboardHelper.cpp 2013-11-28 10:28:04 UTC (rev 159836)
+++ trunk/Source/WebCore/platform/gtk/PasteboardHelper.cpp 2013-11-28 12:40:59 UTC (rev 159837)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2010 Martin Robinson <mrobinson@webkit.org>
</span><span class="cx"> * Copyright (C) Igalia S.L.
</span><ins>+ * Copyright (C) 2013 Collabora Ltd.
</ins><span class="cx"> * All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="lines">@@ -25,6 +26,7 @@
</span><span class="cx"> #include "Chrome.h"
</span><span class="cx"> #include "DataObjectGtk.h"
</span><span class="cx"> #include "Frame.h"
</span><ins>+#include "GRefPtrGtk.h"
</ins><span class="cx"> #include "GtkVersioning.h"
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "Pasteboard.h"
</span><span class="lines">@@ -39,6 +41,8 @@
</span><span class="cx"> static GdkAtom netscapeURLAtom;
</span><span class="cx"> static GdkAtom uriListAtom;
</span><span class="cx"> static GdkAtom smartPasteAtom;
</span><ins>+static GdkAtom unknownAtom;
+
</ins><span class="cx"> static String gMarkupPrefix;
</span><span class="cx">
</span><span class="cx"> static void removeMarkupPrefix(String& markup)
</span><span class="lines">@@ -63,6 +67,7 @@
</span><span class="cx"> netscapeURLAtom = gdk_atom_intern("_NETSCAPE_URL", FALSE);
</span><span class="cx"> uriListAtom = gdk_atom_intern("text/uri-list", FALSE);
</span><span class="cx"> smartPasteAtom = gdk_atom_intern("application/vnd.webkitgtk.smartpaste", FALSE);
</span><ins>+ unknownAtom = gdk_atom_intern("application/vnd.webkitgtk.unknown", FALSE);
</ins><span class="cx"> gMarkupPrefix = "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\">";
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -82,6 +87,7 @@
</span><span class="cx"> gtk_target_list_add_uri_targets(m_targetList, PasteboardHelper::TargetTypeURIList);
</span><span class="cx"> gtk_target_list_add(m_targetList, netscapeURLAtom, 0, PasteboardHelper::TargetTypeNetscapeURL);
</span><span class="cx"> gtk_target_list_add_image_targets(m_targetList, PasteboardHelper::TargetTypeImage, TRUE);
</span><ins>+ gtk_target_list_add(m_targetList, unknownAtom, 0, PasteboardHelper::TargetTypeUnknown);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PasteboardHelper::~PasteboardHelper()
</span><span class="lines">@@ -179,6 +185,22 @@
</span><span class="cx">
</span><span class="cx"> else if (info == TargetTypeSmartPaste)
</span><span class="cx"> gtk_selection_data_set_text(selectionData, "", -1);
</span><ins>+
+ else if (info == TargetTypeUnknown) {
+ GVariantBuilder builder;
+ g_variant_builder_init(&builder, G_VARIANT_TYPE_ARRAY);
+
+ auto types = dataObject->unknownTypes();
+ auto end = types.end();
+ for (auto it = types.begin(); it != end; ++it) {
+ GOwnPtr<gchar> dictItem(g_strdup_printf("{'%s', '%s'}", it->key.utf8().data(), it->value.utf8().data()));
+ g_variant_builder_add_parsed(&builder, dictItem.get());
+ }
+
+ GRefPtr<GVariant> variant = adoptGRef(g_variant_builder_end(&builder));
+ GOwnPtr<gchar> serializedVariant(g_variant_print(variant.get(), TRUE));
+ gtk_selection_data_set(selectionData, unknownAtom, 1, reinterpret_cast<const guchar*>(serializedVariant.get()), strlen(serializedVariant.get()));
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> GtkTargetList* PasteboardHelper::targetListForDataObject(DataObjectGtk* dataObject, SmartPasteInclusion shouldInludeSmartPaste)
</span><span class="lines">@@ -199,6 +221,9 @@
</span><span class="cx"> if (dataObject->hasImage())
</span><span class="cx"> gtk_target_list_add_image_targets(list, TargetTypeImage, TRUE);
</span><span class="cx">
</span><ins>+ if (dataObject->hasUnknownTypeData())
+ gtk_target_list_add(list, unknownAtom, 0, TargetTypeUnknown);
+
</ins><span class="cx"> if (shouldInludeSmartPaste == IncludeSmartPaste)
</span><span class="cx"> gtk_target_list_add(list, smartPasteAtom, 0, TargetTypeSmartPaste);
</span><span class="cx">
</span><span class="lines">@@ -230,6 +255,21 @@
</span><span class="cx"> dataObject->setURIList(pieces[0]);
</span><span class="cx"> if (pieces.size() > 1)
</span><span class="cx"> dataObject->setText(pieces[1]);
</span><ins>+ } else if (target == unknownAtom) {
+ GRefPtr<GVariant> variant = adoptGRef(g_variant_new_parsed(reinterpret_cast<const char*>(gtk_selection_data_get_data(data))));
+
+ GOwnPtr<gchar> key;
+ GOwnPtr<gchar> value;
+ GVariantIter iter;
+
+ g_variant_iter_init(&iter, variant.get());
+ while (g_variant_iter_next(&iter, "{ss}", &key.outPtr(), &value.outPtr())) {
+ dataObject->setUnknownTypeData(key.get(), value.get());
+
+ // FIXME: should GOwnPtr be smarter about this and replace the existing ptr when outPtr() is used?
+ key.clear();
+ value.clear();
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -241,6 +281,7 @@
</span><span class="cx"> dropAtoms.append(markupAtom);
</span><span class="cx"> dropAtoms.append(uriListAtom);
</span><span class="cx"> dropAtoms.append(netscapeURLAtom);
</span><ins>+ dropAtoms.append(unknownAtom);
</ins><span class="cx">
</span><span class="cx"> // For images, try to find the most applicable image type.
</span><span class="cx"> GRefPtr<GtkTargetList> list = adoptGRef(gtk_target_list_new(0, 0));
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (159836 => 159837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-11-28 10:28:04 UTC (rev 159836)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-28 12:40:59 UTC (rev 159837)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2013-11-27 Gustavo Noronha Silva <gustavo.noronha@collabora.com>
+
+ [GTK] Support custom types for drag and drop data
+ https://bugs.webkit.org/show_bug.cgi?id=124659
+
+ Reviewed by Martin Robinson.
+
+ * Shared/gtk/ArgumentCodersGtk.cpp:
+ (CoreIPC::encodeDataObject): encode the unknown types data.
+ (CoreIPC::decodeDataObject): decode the unknown types data.
+
</ins><span class="cx"> 2013-11-27 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Give the PageClient a chance to handle geolocation permission requests if the UIClient doesn't handle it
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedgtkArgumentCodersGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.cpp (159836 => 159837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.cpp 2013-11-28 10:28:04 UTC (rev 159836)
+++ trunk/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.cpp 2013-11-28 12:40:59 UTC (rev 159837)
</span><span class="lines">@@ -108,6 +108,11 @@
</span><span class="cx"> encoder << hasImage;
</span><span class="cx"> if (hasImage)
</span><span class="cx"> encodeImage(encoder, dataObject->image());
</span><ins>+
+ bool hasUnknownTypeData = dataObject->hasUnknownTypeData();
+ encoder << hasUnknownTypeData;
+ if (hasUnknownTypeData)
+ encoder << dataObject->unknownTypes();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool decodeDataObject(ArgumentDecoder& decoder, RefPtr<DataObjectGtk>& dataObject)
</span><span class="lines">@@ -164,6 +169,19 @@
</span><span class="cx"> data->setImage(image.get());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ bool hasUnknownTypeData;
+ if (!decoder.decode(hasUnknownTypeData))
+ return false;
+ if (hasUnknownTypeData) {
+ HashMap<String, String> unknownTypes;
+ if (!decoder.decode(unknownTypes))
+ return false;
+
+ auto end = unknownTypes.end();
+ for (auto it = unknownTypes.begin(); it != end; ++it)
+ data->setUnknownTypeData(it->key, it->value);
+ }
+
</ins><span class="cx"> dataObject = data;
</span><span class="cx">
</span><span class="cx"> return true;
</span></span></pre>
</div>
</div>
</body>
</html>