diff options
| author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-10 15:01:10 +0000 |
|---|---|---|
| committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-10 15:01:10 +0000 |
| commit | 53c8fdf0f2abd695a66237d901a8d74eb45bb6d0 (patch) | |
| tree | c3d96f89afce15dc055b0c2b3b9f32aadc2d9e8a /chrome/views | |
| parent | 6addd9e9debd24130c31cdfab55c84bca9bfdc72 (diff) | |
| download | chromium_src-53c8fdf0f2abd695a66237d901a8d74eb45bb6d0.zip chromium_src-53c8fdf0f2abd695a66237d901a8d74eb45bb6d0.tar.gz chromium_src-53c8fdf0f2abd695a66237d901a8d74eb45bb6d0.tar.bz2 | |
Remove base dependency from image_operations and associated unittests. I also renamed the namespace from "gfx" to "skia".
This also adds back the image_operations_unittest to a project (this had gotten lost in my move).
Review URL: http://codereview.chromium.org/13143
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6706 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/views')
| -rw-r--r-- | chrome/views/button.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/views/button.cc b/chrome/views/button.cc index 11dad29..36c228a 100644 --- a/chrome/views/button.cc +++ b/chrome/views/button.cc @@ -105,7 +105,7 @@ SkBitmap Button::GetImageToPaint() { SkBitmap img; if (!images_[BS_HOT].isNull() && hover_animation_->IsAnimating()) { - img = gfx::ImageOperations::CreateBlendedBitmap(images_[BS_NORMAL], + img = skia::ImageOperations::CreateBlendedBitmap(images_[BS_NORMAL], images_[BS_HOT], hover_animation_->GetCurrentValue()); } else { img = images_[GetState()]; |