diff options
| author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-10 16:16:35 +0000 |
|---|---|---|
| committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-10 16:16:35 +0000 |
| commit | c4b347b36152d693f2914f13c3b6f83f16a6d9b8 (patch) | |
| tree | 9ef3b6ea138959fb4f59f97a791c0c4c4efebecd /chrome/views | |
| parent | f3750b3846cc639d75046be16826ff1cf109d76e (diff) | |
| download | chromium_src-c4b347b36152d693f2914f13c3b6f83f16a6d9b8.zip chromium_src-c4b347b36152d693f2914f13c3b6f83f16a6d9b8.tar.gz chromium_src-c4b347b36152d693f2914f13c3b6f83f16a6d9b8.tar.bz2 | |
Reverting 6709,6708,6706.
Review URL: http://codereview.chromium.org/13345
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6710 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 36c228a..11dad29 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 = skia::ImageOperations::CreateBlendedBitmap(images_[BS_NORMAL], + img = gfx::ImageOperations::CreateBlendedBitmap(images_[BS_NORMAL], images_[BS_HOT], hover_animation_->GetCurrentValue()); } else { img = images_[GetState()]; |