diff options
| author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-12 20:19:14 +0000 |
|---|---|---|
| committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-12 20:19:14 +0000 |
| commit | 465b34b73d11d017dfc546821c8dcb8e4dbe4b56 (patch) | |
| tree | 465760a07b08c237db9026fb968374cad3be6e92 /chrome/views | |
| parent | 76960a40e09420ac2e302f4b307c4dd0d8a61ce8 (diff) | |
| download | chromium_src-465b34b73d11d017dfc546821c8dcb8e4dbe4b56.zip chromium_src-465b34b73d11d017dfc546821c8dcb8e4dbe4b56.tar.gz chromium_src-465b34b73d11d017dfc546821c8dcb8e4dbe4b56.tar.bz2 | |
Move Image operations and convolver to the skia namespace and clean up a few (but not all) base types.
Review URL: http://codereview.chromium.org/13726
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6921 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()]; |