diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-21 17:20:10 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-21 17:20:10 +0000 |
| commit | 75ae542de5a321e53449c8d5da34ffd519680db5 (patch) | |
| tree | 9bea9a95fdbf0c8c746e31d90c291c564985c0a2 /base/clipboard_linux.cc | |
| parent | 08f75ed78a7f1823b850aa8cc0c90d4f760fc6ca (diff) | |
| download | chromium_src-75ae542de5a321e53449c8d5da34ffd519680db5.zip chromium_src-75ae542de5a321e53449c8d5da34ffd519680db5.tar.gz chromium_src-75ae542de5a321e53449c8d5da34ffd519680db5.tar.bz2 | |
Eliminate a circular dependency by making BGRAToRGBA() generic (no pulling in guchar from gtk.h) and moving it from base/gfx to base.
Review URL: http://codereview.chromium.org/87016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14117 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/clipboard_linux.cc')
| -rw-r--r-- | base/clipboard_linux.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/base/clipboard_linux.cc b/base/clipboard_linux.cc index 7d568e1..ce53902 100644 --- a/base/clipboard_linux.cc +++ b/base/clipboard_linux.cc @@ -10,7 +10,7 @@ #include <string> #include <utility> -#include "base/gfx/gtk_util.h" +#include "base/linux_util.h" #include "base/string_util.h" namespace { @@ -178,8 +178,8 @@ void Clipboard::WriteWebSmartPaste() { 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, |