diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-23 20:40:52 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-23 20:40:52 +0000 |
| commit | 0819b02efb758f7b3f6e5661a18fa7908720cac5 (patch) | |
| tree | 7e0cce071d63804f06451d08c4a26e747a28ecc2 /chrome/browser/gtk/tabs | |
| parent | b5685797f80769c3db0c3c3a1c6bc117b2029b71 (diff) | |
| download | chromium_src-0819b02efb758f7b3f6e5661a18fa7908720cac5.zip chromium_src-0819b02efb758f7b3f6e5661a18fa7908720cac5.tar.gz chromium_src-0819b02efb758f7b3f6e5661a18fa7908720cac5.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.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/207059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26975 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/tabs')
| -rw-r--r-- | chrome/browser/gtk/tabs/tab_renderer_gtk.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/gtk/tabs/tab_renderer_gtk.cc b/chrome/browser/gtk/tabs/tab_renderer_gtk.cc index 213475a..658d01f 100644 --- a/chrome/browser/gtk/tabs/tab_renderer_gtk.cc +++ b/chrome/browser/gtk/tabs/tab_renderer_gtk.cc @@ -9,6 +9,7 @@ #include "app/gfx/canvas_paint.h" #include "app/gfx/favicon_size.h" +#include "app/gfx/skbitmap_operations.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "chrome/browser/browser.h" @@ -23,7 +24,6 @@ #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "skia/ext/image_operations.h" namespace { @@ -697,13 +697,13 @@ SkBitmap* TabRendererGtk::GetMaskedBitmap(const SkBitmap* mask, // offsets. delete it->second.bitmap; } - SkBitmap image = skia::ImageOperations::CreateTiledBitmap( + SkBitmap image = SkBitmapOperations::CreateTiledBitmap( *background, bg_offset_x, bg_offset_y, mask->width(), height() + kToolbarOverlap); CachedBitmap bitmap = { bg_offset_x, bg_offset_y, - new SkBitmap(skia::ImageOperations::CreateMaskedBitmap(image, *mask)) + new SkBitmap(SkBitmapOperations::CreateMaskedBitmap(image, *mask)) }; cached_bitmaps_[std::make_pair(mask, background)] = bitmap; return bitmap.bitmap; |