Revert 116956 - GTK: Seal up GSEALs, focusing on GtkSelectionData.

content/browser/tab_contents/web_drag_dest_gtk.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "content/browser/tab_contents/web_drag_dest_gtk.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/message_loop.h"
@@ skipping 124 matching lines @@
     GtkWidget* sender, GdkDragContext* context, gint x, gint y,
     GtkSelectionData* data, guint info, guint time) {
   // We might get the data from an old get_data() request that we no longer
   // care about.
   if (context != context_)
     return;
 
   data_requests_--;
 
   // Decode the data.
-  gint data_length = gtk_selection_data_get_length(data);
-  const guchar* raw_data = gtk_selection_data_get_data(data);
-  if (raw_data && data_length > 0) {
+  if (data->data && data->length > 0) {
     // If the source can't provide us with valid data for a requested target,
-    // raw_data will be NULL.
+    // data->data will be NULL.
     if (data->target == ui::GetAtomForTarget(ui::TEXT_PLAIN)) {
       guchar* text = gtk_selection_data_get_text(data);
       if (text) {
         drop_data_->plain_text =
-            UTF8ToUTF16(std::string(reinterpret_cast<const char*>(text)));
+            UTF8ToUTF16(std::string(reinterpret_cast<char*>(text)));
         g_free(text);
       }
     } else if (data->target == ui::GetAtomForTarget(ui::TEXT_URI_LIST)) {
       gchar** uris = gtk_selection_data_get_uris(data);
       if (uris) {
         drop_data_->url = GURL();
         for (gchar** uri_iter = uris; *uri_iter; uri_iter++) {
           // Most file managers populate text/uri-list with file URLs when
           // dragging files. To avoid exposing file system paths to web content,
           // file URLs are never set as the URL content for the drop.
@@ skipping 10 matching lines @@
           } else if (!drop_data_->url.is_valid()) {
             // Also set the first non-file URL as the URL content for the drop.
             drop_data_->url = url;
           }
         }
         g_strfreev(uris);
       }
     } else if (data->target == ui::GetAtomForTarget(ui::TEXT_HTML)) {
       // TODO(estade): Can the html have a non-UTF8 encoding?
       drop_data_->text_html =
-          UTF8ToUTF16(std::string(reinterpret_cast<const char*>(raw_data),
-                                  data_length));
+          UTF8ToUTF16(std::string(reinterpret_cast<char*>(data->data),
+                                  data->length));
       // We leave the base URL empty.
     } else if (data->target == ui::GetAtomForTarget(ui::NETSCAPE_URL)) {
-      std::string netscape_url(reinterpret_cast<const char*>(raw_data),
-                               data_length);
+      std::string netscape_url(reinterpret_cast<char*>(data->data),
+                               data->length);
       size_t split = netscape_url.find_first_of('\n');
       if (split != std::string::npos) {
         drop_data_->url = GURL(netscape_url.substr(0, split));
         if (split < netscape_url.size() - 1)
           drop_data_->url_title = UTF8ToUTF16(netscape_url.substr(split + 1));
       }
     } else if (data->target == ui::GetAtomForTarget(ui::CHROME_NAMED_URL)) {
       ui::ExtractNamedURL(data, &drop_data_->url, &drop_data_->url_title);
     } else if (data->target == ui::GetAtomForTarget(ui::CUSTOM_DATA)) {
       ui::ReadCustomDataIntoMap(
-          raw_data, data_length, &drop_data_->custom_data);
+          data->data, data->length, &drop_data_->custom_data);
     }
   }
 
   // For CHROME_BOOKMARK_ITEM, we have to handle the case where the drag source
   // doesn't have any data available for us. In this case we try to synthesize a
   // URL bookmark.
   // Note that bookmark drag data is encoded in the same format for both
   // GTK and Views, hence we can share the same logic here.
   if (delegate() && data->target == delegate()->GetBookmarkTargetAtom()) {
-    if (raw_data && data_length > 0) {
+    if (data->data && data->length > 0) {
       delegate()->OnReceiveDataFromGtk(data);
     } else {
       delegate()->OnReceiveProcessedData(drop_data_->url,
                                          drop_data_->url_title);
     }
   }
 
   if (data_requests_ == 0) {
     // Tell the renderer about the drag.
     // |x| and |y| are seemingly arbitrary at this point.
@@ skipping 39 matching lines @@
 
   // The second parameter is just an educated guess as to whether or not the
   // drag succeeded, but at least we will get the drag-end animation right
   // sometimes.
   gtk_drag_finish(context, is_drop_target_, FALSE, time);
 
   return TRUE;
 }
 
 }  // namespace content