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 /chrome | |
| 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 'chrome')
| -rw-r--r-- | chrome/common/gtk_util.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/common/gtk_util.cc b/chrome/common/gtk_util.cc index 0576c0c..fba765b 100644 --- a/chrome/common/gtk_util.cc +++ b/chrome/common/gtk_util.cc @@ -6,7 +6,7 @@ #include <gtk/gtk.h> -#include "base/gfx/gtk_util.h" +#include "base/linux_util.h" #include "skia/include/SkBitmap.h" namespace { @@ -45,7 +45,7 @@ GdkPixbuf* GdkPixbufFromSkBitmap(const SkBitmap* bitmap) { int height = bitmap->height(); int stride = bitmap->rowBytes(); const guchar* orig_data = static_cast<guchar*>(bitmap->getPixels()); - guchar* data = BGRAToRGBA(orig_data, width, height, stride); + guchar* data = base::BGRAToRGBA(orig_data, width, height, stride); // This pixbuf takes ownership of our malloc()ed data and will // free it for us when it is destroyed. |