Remove SkDevice and SkBaseDevice outside skia/ext/

third_party/WebKit/Source/platform/graphics/UnacceleratedImageBufferSurface.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 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "platform/graphics/UnacceleratedImageBufferSurface.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/SkSurface.h"
 #include "wtf/PassRefPtr.h"
 
+class SkCanvas;
+
+namespace {
+
+SkBitmap ReadPixels(SkCanvas* canvas)

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

This is copied in two places, perhaps it should go in SkiaUtils.h/cpp

+{
+    SkBitmap bitmap;
+    bitmap.setInfo(canvas->imageInfo());
+    canvas->readPixels(&bitmap, 0, 0);
+    return bitmap;
+}
+
+}
+
 namespace blink {
 
 UnacceleratedImageBufferSurface::UnacceleratedImageBufferSurface(const IntSize& size, OpacityMode opacityMode, ImageInitializationMode initializationMode)
     : ImageBufferSurface(size, opacityMode)
 {
     SkAlphaType alphaType = (Opaque == opacityMode) ? kOpaque_SkAlphaType : kPremul_SkAlphaType;
     SkImageInfo info = SkImageInfo::MakeN32(size.width(), size.height(), alphaType);
     SkSurfaceProps disableLCDProps(0, kUnknown_SkPixelGeometry);
     m_surface = adoptRef(SkSurface::NewRaster(info, Opaque == opacityMode ? 0 : &disableLCDProps));
 
     if (initializationMode == InitializeImagePixels) {
         if (m_surface)
             clear();
     }
 }
 
 UnacceleratedImageBufferSurface::~UnacceleratedImageBufferSurface() { }
 
 SkCanvas* UnacceleratedImageBufferSurface::canvas()
 {
     return m_surface->getCanvas();
 }
 
-const SkBitmap& UnacceleratedImageBufferSurface::deprecatedBitmapForOverwrite()
+const SkBitmap UnacceleratedImageBufferSurface::deprecatedBitmapForOverwrite()
 {
     m_surface->notifyContentWillChange(SkSurface::kDiscard_ContentChangeMode);
-    return m_surface->getCanvas()->getDevice()->accessBitmap(false);
+    return ReadPixels(m_surface->getCanvas());

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

I am surprised this does not break any layout tests (toDataURL on a webgl
canvas, drawing webgl to a 2D canvas, etc.). I did not expect
SkCanvas::readPixels to return an SkBitmap that references the surface's
backing, I would have expected it to make a copy (as implied by the 'read'
verb).  Are we garanteed this will continue to work going forward?

IMHO, I think the calls sites that use this should be re-written to use
ImageBufferSurface::canvas() for writing to the surface. An we should just get
rid of this method entirely.

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

I was just about to suggest returning a SkSurface instead of SkBitmap.  A canvas
would work too.
Even better, thanks for doing that :)

 }
 
 bool UnacceleratedImageBufferSurface::isValid() const
 {
     return m_surface;
 }
 
 PassRefPtr<SkImage> UnacceleratedImageBufferSurface::newImageSnapshot(AccelerationHint)
 {
     return adoptRef(m_surface->newImageSnapshot());
 }
 
 } // namespace blink