summaryrefslogtreecommitdiffstats
path: root/chrome/browser/download
diff options
context:
space:
mode:
authorreed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-04 21:06:05 +0000
committerreed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-04 21:06:05 +0000
commit224b6d7b5ea4765d6285eeaf15b9739ed134b9e4 (patch)
tree32d1c3637b32e60f56f0c3803a32c62abf2426fb /chrome/browser/download
parent595d15903addc431672179ba2dcc66404645c37f (diff)
downloadchromium_src-224b6d7b5ea4765d6285eeaf15b9739ed134b9e4.zip
chromium_src-224b6d7b5ea4765d6285eeaf15b9739ed134b9e4.tar.gz
chromium_src-224b6d7b5ea4765d6285eeaf15b9739ed134b9e4.tar.bz2
No need to kClear_Mode a layer right after its created, as that will automatically
be done by Skia (assuming kHasAlphaLayer_SaveFlag was set, which it is by default). Also, catch one more place where saveLayer(alpha) drawimage restore can be replaced with drawimage(alpha) Review URL: https://codereview.chromium.org/11058003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160227 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/download')
-rw-r--r--chrome/browser/download/download_util.cc12
1 files changed, 4 insertions, 8 deletions
diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc
index d18d876..d043c22 100644
--- a/chrome/browser/download/download_util.cc
+++ b/chrome/browser/download/download_util.cc
@@ -270,10 +270,8 @@ void PaintDownloadComplete(gfx::Canvas* canvas,
// Start at full opacity, then loop back and forth five times before ending
// at zero opacity.
- canvas->SaveLayerAlpha(GetOpacity(animation_progress), complete_bounds);
- canvas->sk_canvas()->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode);
- canvas->DrawImageInt(*complete, complete_bounds.x(), complete_bounds.y());
- canvas->Restore();
+ canvas->DrawImageInt(*complete, complete_bounds.x(), complete_bounds.y(),
+ GetOpacity(animation_progress));
}
void PaintDownloadInterrupted(gfx::Canvas* canvas,
@@ -302,10 +300,8 @@ void PaintDownloadInterrupted(gfx::Canvas* canvas,
// Start at zero opacity, then loop back and forth five times before ending
// at full opacity.
- canvas->SaveLayerAlpha(GetOpacity(1.0 - animation_progress), complete_bounds);
- canvas->sk_canvas()->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode);
- canvas->DrawImageInt(*complete, complete_bounds.x(), complete_bounds.y());
- canvas->Restore();
+ canvas->DrawImageInt(*complete, complete_bounds.x(), complete_bounds.y(),
+ GetOpacity(1.0 - animation_progress));
}
// Load a language dependent height so that the dangerous download confirmation