Use SkImage as a backing store for copying 2d Contexts to ImageBitmaps.

Source/core/platform/graphics/ImageBuffer.cpp

 /*
  * Copyright (c) 2008, Google Inc. All rights reserved.
  * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
  * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. 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
@@ skipping 23 matching lines @@
 #include "core/platform/graphics/ImageBuffer.h"
 
 #include "core/html/ImageData.h"
 #include "core/platform/MIMETypeRegistry.h"
 #include "core/platform/PlatformMemoryInstrumentation.h"
 #include "core/platform/graphics/BitmapImage.h"
 #include "core/platform/graphics/Extensions3D.h"
 #include "core/platform/graphics/GraphicsContext.h"
 #include "core/platform/graphics/GraphicsContext3D.h"
 #include "core/platform/graphics/IntRect.h"
+#include "core/platform/graphics/SkiaImage.h"
 #include "core/platform/graphics/chromium/Canvas2DLayerBridge.h"
 #include "core/platform/graphics/gpu/SharedGraphicsContext3D.h"
 #include "core/platform/graphics/skia/MemoryInstrumentationSkia.h"
 #include "core/platform/graphics/skia/NativeImageSkia.h"
 #include "core/platform/graphics/skia/SkiaUtils.h"
 #include "core/platform/image-encoders/skia/JPEGImageEncoder.h"
 #include "core/platform/image-encoders/skia/PNGImageEncoder.h"
 #include "core/platform/image-encoders/skia/WEBPImageEncoder.h"
 #include "public/platform/Platform.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/skia/include/core/SkColorPriv.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "third_party/skia/include/gpu/GrContext.h"
 #include "third_party/skia/include/gpu/SkGpuDevice.h"
 #include "wtf/MathExtras.h"
 #include "wtf/text/Base64.h"
 #include "wtf/text/WTFString.h"
 
 using namespace std;
 
 namespace WebCore {
 
-static SkCanvas* createAcceleratedCanvas(const IntSize& size, OwnPtr<Canvas2DLayerBridge>* outLayerBridge, OpacityMode opacityMode)
+SkCanvas* ImageBuffer::createAcceleratedCanvas(const IntSize& size, OwnPtr<Canvas2DLayerBridge>* outLayerBridge, OpacityMode opacityMode)
 {
     RefPtr<GraphicsContext3D> context3D = SharedGraphicsContext3D::get();
     if (!context3D)
         return 0;
     GrContext* gr = context3D->grContext();
     if (!gr)
         return 0;
     gr->resetContext();
     Canvas2DLayerBridge::OpacityMode bridgeOpacityMode = opacityMode == Opaque ? Canvas2DLayerBridge::Opaque : Canvas2DLayerBridge::NonOpaque;
     SkImage::Info info;
     info.fWidth = size.width();
     info.fHeight = size.height();
     info.fColorType = SkImage::kPMColor_ColorType;
     info.fAlphaType = SkImage::kPremul_AlphaType;
-    SkAutoTUnref<SkSurface> surface(SkSurface::NewRenderTarget(context3D->grContext(), info));
-    if (!surface.get())
+    m_surface = SkSurface::NewRenderTarget(context3D->grContext(), info);

[Justin Novosad, 2013/07/22 15:35:41]

You will need adoptPtr here, once m_surface is an OwnPtr.

+    if (!m_surface.get())
         return 0;
-    SkDeferredCanvas* canvas = new SkDeferredCanvas(surface.get());
+    SkDeferredCanvas* canvas = new SkDeferredCanvas(m_surface.get());
     *outLayerBridge = Canvas2DLayerBridge::create(context3D.release(), canvas, bridgeOpacityMode);
     // If canvas buffer allocation failed, debug build will have asserted
     // For release builds, we must verify whether the device has a render target
     return canvas;

[Justin Novosad, 2013/07/22 15:35:41]

Now that createAcceleratedCanvas is a member of ImageBuffer, no need to return
the canvas.  You could just set m_canvas directly.

 }
 
-static SkCanvas* createNonPlatformCanvas(const IntSize& size)
+SkCanvas* ImageBuffer::createNonPlatformCanvas(const IntSize& size)
 {
-    SkAutoTUnref<SkDevice> device(new SkDevice(SkBitmap::kARGB_8888_Config, size.width(), size.height()));
-    SkPixelRef* pixelRef = device->accessBitmap(false).pixelRef();
-    return pixelRef ? new SkCanvas(device) : 0;
+    SkImage::Info info;
+    info.fWidth = size.width();
+    info.fHeight = size.height();
+    info.fColorType = SkImage::kPMColor_ColorType;
+    info.fAlphaType = SkImage::kPremul_AlphaType;
+    m_surface = SkSurface::NewRaster(info);
+    if (!m_surface.get())
+        return 0;
+    SkCanvas* canvas = m_surface->getCanvas();
+    return canvas;
 }
 
 PassOwnPtr<ImageBuffer> ImageBuffer::createCompatibleBuffer(const IntSize& size, float resolutionScale, const GraphicsContext* context, bool hasAlpha)
 {
     bool success = false;
     OwnPtr<ImageBuffer> buf = adoptPtr(new ImageBuffer(size, resolutionScale, context, hasAlpha, success));
     if (!success)
         return nullptr;
     return buf.release();
 }
@@ skipping 82 matching lines @@
 
 static SkBitmap deepSkBitmapCopy(const SkBitmap& bitmap)
 {
     SkBitmap tmp;
     if (!bitmap.deepCopyTo(&tmp, bitmap.config()))
         bitmap.copyTo(&tmp, bitmap.config());
 
     return tmp;
 }
 
+PassRefPtr<Image> ImageBuffer::imageSnapshot() const
+{
+    if (!m_surface.get())

[Justin Novosad, 2013/07/22 15:35:41]

Inside this 'if' you add ASSERT(!m_canvas) With this comment: A canvas without a
surface indicates that a platform buffer is being used. imageSnapshot() on a
platform buffer is not supported.

+        return 0;
+    return SkiaImage::create(m_surface->newImageSnapshot());
+}
+
 PassRefPtr<Image> ImageBuffer::copyImage(BackingStoreCopy copyBehavior, ScaleBehavior) const
 {
     const SkBitmap& bitmap = *context()->bitmap();
     // FIXME: Start honoring ScaleBehavior to scale 2x buffers down to 1x.
     return BitmapImage::create(NativeImageSkia::create(copyBehavior == CopyBackingStore ? deepSkBitmapCopy(bitmap) : bitmap, m_resolutionScale));
 }
 
 BackingStoreCopy ImageBuffer::fastCopyImageMode()
 {
     return DontCopyBackingStore;
@@ skipping 281 matching lines @@
 
 void ImageBuffer::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
 {
     MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Image);
     info.addMember(m_canvas, "canvas");
     info.addMember(m_context, "context");
     info.addMember(m_layerBridge, "layerBridge");
 }
 
 } // namespace WebCore