diff options
| author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-23 20:55:08 +0000 |
|---|---|---|
| committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-23 20:55:08 +0000 |
| commit | 57047da61489644b8b3604dffd915a1ebcf78f91 (patch) | |
| tree | e15a0fae2a4eee1fe1e96b4d9df6d623175cbeaf /chrome/common/badge_util.cc | |
| parent | a2a5801c6c7eeb9b5d7a7068a6ff50a2dd51ebd8 (diff) | |
| download | chromium_src-57047da61489644b8b3604dffd915a1ebcf78f91.zip chromium_src-57047da61489644b8b3604dffd915a1ebcf78f91.tar.gz chromium_src-57047da61489644b8b3604dffd915a1ebcf78f91.tar.bz2 | |
Revert 147915 - Cleanup gfx::Canvas now that 10562027 has landed
Reverting because composite_unittests were failing on Linux (aura) and Linux ChromeOS Tests bots.
Bug=None
Test=Compiles on Mac and CrOS
R=oshima,sky
TBR=sadrul,sail
Review URL: https://chromiumcodereview.appspot.com/10701063
TBR=pkotwicz@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10790128
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147936 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/badge_util.cc')
| -rw-r--r-- | chrome/common/badge_util.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/common/badge_util.cc b/chrome/common/badge_util.cc index 42668e8..3859a72 100644 --- a/chrome/common/badge_util.cc +++ b/chrome/common/badge_util.cc @@ -84,8 +84,8 @@ SkBitmap DrawBadgeIconOverlay(const SkBitmap& icon, badge_width--; // Render the badge bitmap and overlay into a canvas. - scoped_ptr<gfx::Canvas> canvas(new gfx::Canvas( - gfx::Size(badge_width, icon.height()), ui::SCALE_FACTOR_100P, false)); + scoped_ptr<gfx::Canvas> canvas( + new gfx::Canvas(gfx::Size(badge_width, icon.height()), false)); canvas->DrawImageInt(icon, 0, 0); // Draw the text overlay centered horizontally and vertically. Skia expects @@ -97,7 +97,7 @@ SkBitmap DrawBadgeIconOverlay(const SkBitmap& icon, badge_text.c_str(), badge_text.size(), x, y, *paint); // Return the generated image. - return canvas->ExtractImageRep().sk_bitmap(); + return canvas->ExtractBitmap(); } } // namespace badge_util |