diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-24 01:14:52 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-24 01:14:52 +0000 |
| commit | cab34d6a13d3044c59cd5dccdf4b04725a395aac (patch) | |
| tree | d9c05fd2e59a12cedf72f97d8cb4c420ff4793bb /chrome/browser/gtk/custom_button.cc | |
| parent | 37cc1a1eaaa0c425a1ba889cf619f464227f9906 (diff) | |
| download | chromium_src-cab34d6a13d3044c59cd5dccdf4b04725a395aac.zip chromium_src-cab34d6a13d3044c59cd5dccdf4b04725a395aac.tar.gz chromium_src-cab34d6a13d3044c59cd5dccdf4b04725a395aac.tar.bz2 | |
Move functions from skia/ext to app/gfx where possible: most of skia_utils.* and image_operations.* can be moved because they are not used by WebKit code.
This also fixes the spelling of "Convolusion" to "Convolution" and updates some copyrights.
This is a re-do of r26975, this time with WebKit update and some fixes to compile on Mac and Linux.
BUG=none
TEST=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27031 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/custom_button.cc')
| -rw-r--r-- | chrome/browser/gtk/custom_button.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/gtk/custom_button.cc b/chrome/browser/gtk/custom_button.cc index 745f495..3e4e1cf 100644 --- a/chrome/browser/gtk/custom_button.cc +++ b/chrome/browser/gtk/custom_button.cc @@ -4,6 +4,7 @@ #include "chrome/browser/gtk/custom_button.h" +#include "app/gfx/skbitmap_operations.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "app/theme_provider.h" @@ -15,7 +16,6 @@ #include "chrome/common/gtk_util.h" #include "chrome/common/notification_service.h" #include "grit/theme_resources.h" -#include "skia/ext/image_operations.h" CustomDrawButtonBase::CustomDrawButtonBase(GtkThemeProvider* theme_provider, int normal_id, int active_id, int highlight_id, int depressed_id) @@ -104,8 +104,8 @@ void CustomDrawButtonBase::SetBackground(SkColor color, background_image_->UsePixbuf(NULL); } } else { - SkBitmap img = skia::ImageOperations::CreateButtonBackground(color, - *image, *mask); + SkBitmap img = + SkBitmapOperations::CreateButtonBackground(color, *image, *mask); GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(&img); background_image_->UsePixbuf(pixbuf); |