Remove SkDevice and SkBaseDevice outside skia/ext/

ui/base/clipboard/clipboard_win.cc

Index: ui/base/clipboard/clipboard_win.cc
diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc
index 2743755dfd4d3470db499f111965414e93ab2aa4..6682801a1071b26ddb18973e84a417a33312ef74 100644
--- a/ui/base/clipboard/clipboard_win.cc
+++ b/ui/base/clipboard/clipboard_win.cc
@@ -160,10 +160,10 @@ HGLOBAL CreateGlobalData(const std::basic_string<charT>& str) {
   return data;
 }
 
-bool BitmapHasInvalidPremultipliedColors(const SkBitmap& bitmap) {
-  for (int x = 0; x < bitmap.width(); ++x) {
-    for (int y = 0; y < bitmap.height(); ++y) {
-      uint32_t pixel = *bitmap.getAddr32(x, y);
+bool BitmapHasInvalidPremultipliedColors(const SkPixmap& pixmap) {
+  for (int x = 0; x < pixmap.width(); ++x) {
+    for (int y = 0; y < pixmap.height(); ++y) {
+      uint32_t pixel = *pixmap.addr32(x, y);
       if (SkColorGetR(pixel) > SkColorGetA(pixel) ||
           SkColorGetG(pixel) > SkColorGetA(pixel) ||
           SkColorGetB(pixel) > SkColorGetA(pixel))
@@ -173,10 +173,10 @@ bool BitmapHasInvalidPremultipliedColors(const SkBitmap& bitmap) {
   return false;
 }
 
-void MakeBitmapOpaque(const SkBitmap& bitmap) {
-  for (int x = 0; x < bitmap.width(); ++x) {
-    for (int y = 0; y < bitmap.height(); ++y) {
-      *bitmap.getAddr32(x, y) = SkColorSetA(*bitmap.getAddr32(x, y), 0xFF);
+void MakeBitmapOpaque(SkPixmap pixmap) {

[dcheng, 2015/11/18 18:10:35]

I can't tell from the header comments. Is SkPixmap a cheap handle type that's
easy to copy, and all copies refer to the same pixel store?

[Tom Hudson, 2015/11/20 15:20:48]

Yep! (Sorry that I missed responding to this.)

I'd like to get more intent into the header comments, and just haven't figured
out what the important context is. Suggestions welcome.

[dcheng, 2015/11/20 19:25:27]

Compare:
https://code.google.com/p/chromium/codesearch#search/&q=%5B(,%5DSkPixmap%5B*%...

vs

https://code.google.com/p/chromium/codesearch#search/&q=%5B(,%5DSkPixmap%5B%2...

It seems like passing it by value is non-existent. Is there any advantage to
pass by value? It seems like it'd require a memcpy where pass-by-pointer would
be free-ish.

[Tom Hudson, 2015/11/20 20:09:09]

D'oh, yes, done.

There are lots of places around here where I have to pass copies of SkBitmaps
that we used to pass by reference, but here we can perfectly well pass a pointer
to the SkPixmap.

(This doesn't require a memcpy of the actual pixels, but yes, it was copying the
several-words-big struct, and with the API changes we do have to do a bit more
of that.)

+  for (int x = 0; x < pixmap.width(); ++x) {
+    for (int y = 0; y < pixmap.height(); ++y) {
+      *pixmap.writable_addr32(x, y) = SkColorSetA(*pixmap.addr32(x, y), 0xFF);
     }
   }
 }
@@ -631,14 +631,13 @@ SkBitmap ClipboardWin::ReadImage(ClipboardType type) const {
   // we assume the alpha channel contains garbage and force the bitmap to be
   // opaque as well. Note that this  heuristic will fail on a transparent bitmap
   // containing only black pixels...
-  const SkBitmap& device_bitmap =
-      canvas.sk_canvas()->getDevice()->accessBitmap(true);
+  SkPixmap device_pixels;
+  skia::GetWritablePixels(canvas.sk_canvas(), &device_pixels);
   {
-    SkAutoLockPixels lock(device_bitmap);
     bool has_invalid_alpha_channel = bitmap->bmiHeader.biBitCount < 32 ||
-        BitmapHasInvalidPremultipliedColors(device_bitmap);
+        BitmapHasInvalidPremultipliedColors(device_pixels);
     if (has_invalid_alpha_channel) {
-      MakeBitmapOpaque(device_bitmap);
+      MakeBitmapOpaque(device_pixels);
     }
   }