Remove SkDevice and SkBaseDevice outside skia/ext/

third_party/WebKit/Source/platform/graphics/ImageBufferSurface.cpp

 /*
  * Copyright (c) 2013, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 17 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 
 #include "platform/graphics/ImageBufferSurface.h"
 
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/ImageBuffer.h"
 #include "platform/graphics/StaticBitmapImage.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
-#include "third_party/skia/include/core/SkDevice.h"
 #include "third_party/skia/include/core/SkImage.h"
 #include "third_party/skia/include/core/SkPicture.h"
 
+namespace {
+
+SkBitmap ReadPixels(SkCanvas* canvas)

[Justin Novosad, 2015/11/04 16:29:36]

Blink style: 'readPixels'

+{
+    SkBitmap bitmap;
+    bitmap.setInfo(canvas->imageInfo());
+    canvas->readPixels(&bitmap, 0, 0);
+    return bitmap;
+}
+
+}
+
 namespace blink {
 
 ImageBufferSurface::ImageBufferSurface(const IntSize& size, OpacityMode opacityMode)
     : m_opacityMode(opacityMode)
     , m_size(size)
 {
     setIsHidden(false);
 }
 
 ImageBufferSurface::~ImageBufferSurface() { }
@@ skipping 21 matching lines @@
 void ImageBufferSurface::draw(GraphicsContext* context, const FloatRect& destRect, const FloatRect& srcRect, SkXfermode::Mode op)
 {
     RefPtr<SkImage> snapshot = newImageSnapshot(PreferNoAcceleration);
     if (!snapshot)
         return;
 
     RefPtr<Image> image = StaticBitmapImage::create(snapshot.release());
     context->drawImage(image.get(), destRect, srcRect, op);
 }
 
-const SkBitmap& ImageBufferSurface::deprecatedBitmapForOverwrite()
+const SkBitmap ImageBufferSurface::deprecatedBitmapForOverwrite()
 {
     ASSERT_NOT_REACHED(); // should only be called on non-accelerated surface types, which have overrides
-    return canvas()->getDevice()->accessBitmap(false); // Because we have to return something for the code to compile, and it can't be a local (by address).
+    return ReadPixels(canvas());

[f(malita), 2015/11/05 13:53:26]

This looks like we're just trying to make the compiler happy, so I'd vote to
return Bitmap() and get rid of ReadPixels().

Then again, IIUC this is all moot after Justin's deprecatedBitmapForOverwrite
removal.

 }
 
 
 void ImageBufferSurface::flush()
 {
     canvas()->flush();
 }
 
 bool ImageBufferSurface::writePixels(const SkImageInfo& origInfo, const void* pixels, size_t rowBytes, int x, int y)
 {
     return canvas()->writePixels(origInfo, pixels, rowBytes, x, y);
 }
 
 } // namespace blink