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

Unified Diff: ui/base/clipboard/clipboard_aura.cc

Issue 2855503003: Replace uses of legacy SkBitmap::copyTo() API (Closed)
Patch Set: image_info 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: ui/base/clipboard/clipboard_aura.cc
diff --git a/ui/base/clipboard/clipboard_aura.cc b/ui/base/clipboard/clipboard_aura.cc
index 7c02bcba45221dbb94b02f98e4055fcddb00383f..9e08f7a1f9c1a4465bc9f9b81e6fe460de17acda 100644
--- a/ui/base/clipboard/clipboard_aura.cc
+++ b/ui/base/clipboard/clipboard_aura.cc
@@ -91,7 +91,10 @@ class ClipboardData {
const SkBitmap& bitmap() const { return bitmap_; }
void SetBitmapData(const SkBitmap& bitmap) {
- bitmap.copyTo(&bitmap_);
+ if (bitmap_.tryAllocPixels(bitmap.info())) {
+ bitmap.readPixels(bitmap_.info(), bitmap_.getPixels(), bitmap_.rowBytes(),
+ 0, 0);
+ }
format_ |= BITMAP;
}
@@ -250,7 +253,10 @@ class AuraClipboard {
// A shallow copy should be fine here, but just to be safe...
const SkBitmap& clipboard_bitmap = GetData()->bitmap();
- clipboard_bitmap.copyTo(&img);
+ if (img.tryAllocPixels(clipboard_bitmap.info())) {
+ clipboard_bitmap.readPixels(img.info(), img.getPixels(), img.rowBytes(),
+ 0, 0);
+ }
return img;
}

Powered by Google App Engine
This is Rietveld 408576698