Eliminate a circular dependency by making BGRAToRGBA() generic...

base/clipboard_linux.cc

 // Copyright (c) 2006-2008 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 "base/clipboard.h"
 
 #include <gtk/gtk.h>
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
 
-#include "base/gfx/gtk_util.h"
+#include "base/linux_util.h"
 #include "base/string_util.h"
 
 namespace {
 
 const char* kMimeBmp = "image/bmp";
 const char* kMimeHtml = "text/html";
 const char* kMimeText = "text/plain";
 const char* kMimeWebkitSmartPaste = "chromium-internal/webkit-paste";
 
 std::string GdkAtomToString(const GdkAtom& atom) {
@@ skipping 147 matching lines @@
 
 // Write an extra flavor that signifies WebKit was the last to modify the
 // pasteboard. This flavor has no data.
 void Clipboard::WriteWebSmartPaste() {
   InsertMapping(kMimeWebkitSmartPaste, NULL, 0);
 }
 
 void Clipboard::WriteBitmap(const char* pixel_data, const char* size_data) {
   const gfx::Size* size = reinterpret_cast<const gfx::Size*>(size_data);
 
-  guchar* data = gfx::BGRAToRGBA(reinterpret_cast<const uint8_t*>(pixel_data),
-                                 size->width(), size->height(), 0);
+  guchar* data = base::BGRAToRGBA(reinterpret_cast<const uint8_t*>(pixel_data),
+                                  size->width(), size->height(), 0);
 
   GdkPixbuf* pixbuf =
       gdk_pixbuf_new_from_data(data, GDK_COLORSPACE_RGB, TRUE,
                                8, size->width(), size->height(),
                                size->width() * 4, GdkPixbufFree, NULL);
   // We store the GdkPixbuf*, and the size_t half of the pair is meaningless.
   // Note that this contrasts with the vast majority of entries in our target
   // map, which directly store the data and its length.
   InsertMapping(kMimeBmp, reinterpret_cast<char*>(pixbuf), 0);
 }
@@ skipping 124 matching lines @@
 
   if (iter != clipboard_data_->end()) {
     if (strcmp(kMimeBmp, key) == 0)
       g_object_unref(reinterpret_cast<GdkPixbuf*>(iter->second.first));
     else
       delete[] iter->second.first;
   }
 
   (*clipboard_data_)[key] = std::make_pair(data, data_len);
 }