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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/bookmark_app_helper.cc

Issue 2855503003: Replace uses of legacy SkBitmap::copyTo() API (Closed)
Patch Set: Remove braces Created 3 years, 8 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
« no previous file with comments | « chrome/browser/chromeos/login/screenshot_testing/SkPMetric.cpp ('k') | chrome/browser/profiles/profile_shortcut_manager_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/bookmark_app_helper.cc
diff --git a/chrome/browser/extensions/bookmark_app_helper.cc b/chrome/browser/extensions/bookmark_app_helper.cc
index 3c327d281d02d3d77230072ec9cdc3277a883a23..671c980ee7e6eb46ad5d7e00420fcbd1cd1ddd1b 100644
--- a/chrome/browser/extensions/bookmark_app_helper.cc
+++ b/chrome/browser/extensions/bookmark_app_helper.cc
@@ -416,7 +416,11 @@ void BookmarkAppHelper::GenerateIcon(
gfx::ImageSkia icon_image(
new GeneratedIconImageSource(letter, color, output_size),
gfx::Size(output_size, output_size));
- icon_image.bitmap()->deepCopyTo(&(*bitmaps)[output_size].bitmap);
+ SkBitmap& dst = (*bitmaps)[output_size].bitmap;
+ if (dst.tryAllocPixels(icon_image.bitmap()->info())) {
+ icon_image.bitmap()->readPixels(dst.info(), dst.getPixels(), dst.rowBytes(),
+ 0, 0);
+ }
}
// static
« no previous file with comments | « chrome/browser/chromeos/login/screenshot_testing/SkPMetric.cpp ('k') | chrome/browser/profiles/profile_shortcut_manager_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698