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

Unified Diff: chrome/renderer/chrome_render_frame_observer.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
Index: chrome/renderer/chrome_render_frame_observer.cc
diff --git a/chrome/renderer/chrome_render_frame_observer.cc b/chrome/renderer/chrome_render_frame_observer.cc
index c27edeb7db40e0e5b623902abd17edb6f2599e41..ed9440f5ed1d3c62447d395202a8c20769a4127d 100644
--- a/chrome/renderer/chrome_render_frame_observer.cc
+++ b/chrome/renderer/chrome_render_frame_observer.cc
@@ -203,10 +203,14 @@ void ChromeRenderFrameObserver::RequestThumbnailForContextNode(
}
SkBitmap bitmap;
- if (thumbnail.colorType() == kN32_SkColorType)
+ if (thumbnail.colorType() == kN32_SkColorType) {
bitmap = thumbnail;
- else
- thumbnail.copyTo(&bitmap, kN32_SkColorType);
+ } else {
+ SkImageInfo info = thumbnail.info().makeColorType(kN32_SkColorType);
+ if (bitmap.tryAllocPixels(info)) {
+ thumbnail.readPixels(info, bitmap.getPixels(), bitmap.rowBytes(), 0, 0);
+ }
+ }
std::vector<uint8_t> thumbnail_data;
if (bitmap.getPixels()) {
« no previous file with comments | « chrome/browser/profiles/profile_shortcut_manager_win.cc ('k') | components/arc/bitmap/bitmap_struct_traits.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698