Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6232)

Unified Diff: chrome/browser/themes/browser_theme_pack.cc

Issue 10701063: Cleanup gfx::Canvas now that 10562027 has landed (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/themes/browser_theme_pack.cc
diff --git a/chrome/browser/themes/browser_theme_pack.cc b/chrome/browser/themes/browser_theme_pack.cc
index d1b843c8b4bcc65ac9f2191dc8ac1ec492095313..bf3f74a77f6a6ba2d0011889a38dbc2dfe539384 100644
--- a/chrome/browser/themes/browser_theme_pack.cc
+++ b/chrome/browser/themes/browser_theme_pack.cc
@@ -1009,11 +1009,8 @@ void BrowserThemePack::GenerateTabBackgroundImages(ImageCache* bitmaps) const {
int vertical_offset = bitmaps->count(prs_id)
? kRestoredTabVerticalOffset : 0;
gfx::Canvas canvas(gfx::Size(bg_tint.width(), bg_tint.height()),
+ image_rep_to_tint.scale_factor(),
false);
- SkScalar image_rep_to_tint_scale =
- SkFloatToScalar(image_rep_to_tint.GetScale());
- canvas.sk_canvas()->scale(image_rep_to_tint_scale,
- image_rep_to_tint_scale);
canvas.TileImageInt(bg_tint, 0, vertical_offset, 0, 0,
bg_tint_dip_size.width(), bg_tint_dip_size.height());
@@ -1024,9 +1021,7 @@ void BrowserThemePack::GenerateTabBackgroundImages(ImageCache* bitmaps) const {
canvas.TileImageInt(*overlay, 0, 0, bg_tint_dip_size.width(),
overlay->height());
}
- SkBitmap bg_tab = canvas.ExtractBitmap();
- tinted_image.AddRepresentation(gfx::ImageSkiaRep(bg_tab,
- image_rep_to_tint.scale_factor()));
+ tinted_image.AddRepresentation(canvas.ExtractImageRep());
}
temp_output[prs_id] = new gfx::Image(tinted_image);

Powered by Google App Engine
This is Rietveld 408576698