Revert 183123

ui/base/clipboard/clipboard_gtk.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/base/clipboard/clipboard.h"
 
 #include <gtk/gtk.h>
 #include <X11/extensions/Xfixes.h>
 #include <X11/Xatom.h>
 #include <map>
@@ skipping 88 matching lines @@
       clipboard_sequence_number_++;
     } else if (ev->selection == XA_PRIMARY) {
       primary_sequence_number_++;
     } else {
       DLOG(ERROR) << "Unexpected selection atom: " << ev->selection;
     }
   }
   return GDK_FILTER_CONTINUE;
 }
 
-const char kSourceTagType[] = "org.chromium.source-tag";
 const char kMimeTypeBitmap[] = "image/bmp";
 const char kMimeTypeMozillaURL[] = "text/x-moz-url";
 const char kMimeTypePepperCustomData[] = "chromium/x-pepper-custom-data";
 const char kMimeTypeWebkitSmartPaste[] = "chromium/x-webkit-paste";
 
 std::string GdkAtomToString(const GdkAtom& atom) {
   gchar* name = gdk_atom_name(atom);
   std::string rv(name);
   g_free(name);
   return rv;
@@ skipping 26 matching lines @@
     gtk_selection_data_set(selection_data,
                            gtk_selection_data_get_target(selection_data), 8,
                            reinterpret_cast<guchar*>(iter->second.first),
                            iter->second.second);
   }
 }
 
 // GtkClipboardClearFunc callback.
 // We are guaranteed this will be called exactly once for each call to
 // gtk_clipboard_set_with_data.
-void ClearData(GtkClipboard* /*clipboard*/,
+void ClearData(GtkClipboard* clipboard,
                gpointer user_data) {
   Clipboard::TargetMap* map =
       reinterpret_cast<Clipboard::TargetMap*>(user_data);
   // The same data may be inserted under multiple keys, so use a set to
   // uniq them.
   std::set<char*> ptrs;
 
   for (Clipboard::TargetMap::iterator iter = map->begin();
        iter != map->end(); ++iter) {
     if (iter->first == kMimeTypeBitmap)
@@ skipping 44 matching lines @@
   DCHECK(CalledOnValidThread());
   clipboard_ = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
   primary_selection_ = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
 }
 
 Clipboard::~Clipboard() {
   DCHECK(CalledOnValidThread());
   gtk_clipboard_store(clipboard_);
 }
 
-void Clipboard::WriteObjectsImpl(Buffer buffer,
-                                 const ObjectMap& objects,
-                                 SourceTag tag) {
+void Clipboard::WriteObjects(Buffer buffer, const ObjectMap& objects) {
   DCHECK(CalledOnValidThread());
   clipboard_data_ = new TargetMap();
 
   for (ObjectMap::const_iterator iter = objects.begin();
        iter != objects.end(); ++iter) {
     DispatchObject(static_cast<ObjectType>(iter->first), iter->second);
   }
-  WriteSourceTag(tag);
+
   SetGtkClipboard(buffer);
-
-  if (buffer == BUFFER_STANDARD) {
-    ObjectMap::const_iterator text_iter = objects.find(CBF_TEXT);
-    if (text_iter != objects.end()) {
-      // Copy text and SourceTag to the selection clipboard.
-      ObjectMap::const_iterator next_iter = text_iter;
-      WriteObjectsImpl(BUFFER_SELECTION,
-                       ObjectMap(text_iter, ++next_iter),
-                       tag);
-    }
-  }
 }
 
 // Take ownership of the GTK clipboard and inform it of the targets we support.
 void Clipboard::SetGtkClipboard(Buffer buffer) {
-  scoped_array<GtkTargetEntry> targets(
+  scoped_ptr<GtkTargetEntry[]> targets(
       new GtkTargetEntry[clipboard_data_->size()]);
 
   int i = 0;
   for (Clipboard::TargetMap::iterator iter = clipboard_data_->begin();
        iter != clipboard_data_->end(); ++iter, ++i) {
     targets[i].target = const_cast<char*>(iter->first.c_str());
     targets[i].flags = 0;
     targets[i].info = 0;
   }
 
   GtkClipboard *clipboard = LookupBackingClipboard(buffer);
 
   if (gtk_clipboard_set_with_data(clipboard, targets.get(),
                                   clipboard_data_->size(),
                                   GetData, ClearData,
                                   clipboard_data_)) {
     gtk_clipboard_set_can_store(clipboard,
                                 targets.get(),
                                 clipboard_data_->size());
   }
 
+  if (buffer == BUFFER_STANDARD) {
+    Clipboard::TargetMap::iterator text_iter = clipboard_data_->find("TEXT");
+    if (text_iter != clipboard_data_->end()) {
+      gtk_clipboard_set_text(primary_selection_, text_iter->second.first,
+                             text_iter->second.second);
+    }
+  }
+
   // clipboard_data_ now owned by the GtkClipboard.
   clipboard_data_ = NULL;
 }
 
 void Clipboard::WriteText(const char* text_data, size_t text_len) {
   char* data = new char[text_len];
   memcpy(data, text_data, text_len);
 
   InsertMapping(kMimeTypeText, data, text_len);
   InsertMapping("TEXT", data, text_len);
@@ skipping 69 matching lines @@
   // We assume that certain mapping types are only written by trusted code.
   // Therefore we must upkeep their integrity.
   if (format.Equals(GetBitmapFormatType()))
     return;
   char* data = new char[data_len];
   memcpy(data, data_data, data_len);
   // TODO(dcheng): Maybe this map should use GdkAtoms...
   InsertMapping(GdkAtomToString(format.ToGdkAtom()).c_str(), data, data_len);
 }
 
-void Clipboard::WriteSourceTag(SourceTag tag) {
-  if (tag != SourceTag()) {
-    ObjectMapParam binary = SourceTag2Binary(tag);
-    WriteData(GetSourceTagFormatType(), &binary[0], binary.size());
-  }
-}
-
 // We do not use gtk_clipboard_wait_is_target_available because of
 // a bug with the gtk clipboard. It caches the available targets
 // and does not always refresh the cache when it is appropriate.
 bool Clipboard::IsFormatAvailable(const Clipboard::FormatType& format,
                                   Clipboard::Buffer buffer) const {
   DCHECK(CalledOnValidThread());
   GtkClipboard* clipboard = LookupBackingClipboard(buffer);
   if (clipboard == NULL)
     return false;
 
@@ skipping 206 matching lines @@
                         type, result);
   gtk_selection_data_free(data);
 }
 
 void Clipboard::ReadBookmark(string16* title, std::string* url) const {
   // TODO(estade): implement this.
   NOTIMPLEMENTED();
 }
 
 void Clipboard::ReadData(const FormatType& format, std::string* result) const {
-  ReadDataImpl(BUFFER_STANDARD, format, result);
-}
-
-void Clipboard::ReadDataImpl(Buffer buffer,
-                             const FormatType& format,
-                             std::string* result) const {
   DCHECK(CalledOnValidThread());
-  result->clear();
-  GtkClipboard* clipboard = LookupBackingClipboard(buffer);
   GtkSelectionData* data =
-      gtk_clipboard_wait_for_contents(clipboard, format.ToGdkAtom());
+      gtk_clipboard_wait_for_contents(clipboard_, format.ToGdkAtom());
   if (!data)
     return;
   result->assign(reinterpret_cast<const char*>(
                      gtk_selection_data_get_data(data)),
                  gtk_selection_data_get_length(data));
   gtk_selection_data_free(data);
 }
 
-Clipboard::SourceTag Clipboard::ReadSourceTag(Buffer buffer) const {
-  std::string result;
-  ReadDataImpl(buffer, GetSourceTagFormatType(), &result);
-  return Binary2SourceTag(result);
-}
-
 uint64 Clipboard::GetSequenceNumber(Buffer buffer) {
   DCHECK(CalledOnValidThread());
   if (buffer == BUFFER_STANDARD)
     return SelectionChangeObserver::GetInstance()->clipboard_sequence_number();
   else
     return SelectionChangeObserver::GetInstance()->primary_sequence_number();
 }
 
 //static
 Clipboard::FormatType Clipboard::GetFormatType(
@@ skipping 52 matching lines @@
   CR_DEFINE_STATIC_LOCAL(FormatType, type, (kMimeTypeWebCustomData));
   return type;
 }
 
 // static
 const Clipboard::FormatType& Clipboard::GetPepperCustomDataFormatType() {
   CR_DEFINE_STATIC_LOCAL(FormatType, type, (kMimeTypePepperCustomData));
   return type;
 }
 
-// static
-const Clipboard::FormatType& Clipboard::GetSourceTagFormatType() {
-  CR_DEFINE_STATIC_LOCAL(FormatType, type, (kSourceTagType));
-  return type;
-}
-
 void Clipboard::InsertMapping(const char* key,
                               char* data,
                               size_t data_len) {
   DCHECK(clipboard_data_->find(key) == clipboard_data_->end());
   (*clipboard_data_)[key] = std::make_pair(data, data_len);
 }
 
 GtkClipboard* Clipboard::LookupBackingClipboard(Buffer clipboard) const {
   switch (clipboard) {
     case BUFFER_STANDARD:
       return clipboard_;
     case BUFFER_SELECTION:
       return primary_selection_;
     default:
       NOTREACHED();
       return NULL;
   }
 }
 
 }  // namespace ui