Use newImageSnapshot() to get an image from a Canvas

Source/platform/graphics/Canvas2DImageBufferSurface.h

 /*
  * 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.
  */
 
 #ifndef Canvas2DImageBufferSurface_h
 #define Canvas2DImageBufferSurface_h
 
+#include "Image.h"

[Justin Novosad, 2014/07/29 14:56:52]

Avoid unnecessary dependency in header -> use forward declaration.

[Rémi Piotaix, 2014/07/29 17:18:22]

Done.

 #include "platform/graphics/Canvas2DLayerBridge.h"
 #include "platform/graphics/ImageBufferSurface.h"
 
 namespace blink {
 
 // This shim necessary because ImageBufferSurfaces are not allowed to be RefCounted
 class Canvas2DImageBufferSurface FINAL : public ImageBufferSurface {
 public:
     Canvas2DImageBufferSurface(const IntSize& size, OpacityMode opacityMode = NonOpaque, int msaaSampleCount = 1)
         : ImageBufferSurface(size, opacityMode)
@@ skipping 13 matching lines @@
     virtual void willReadback() OVERRIDE { m_layerBridge->willReadback(); }
     virtual SkCanvas* canvas() const OVERRIDE { return m_layerBridge->canvas(); }
     virtual bool isValid() const OVERRIDE { return m_layerBridge && m_layerBridge->checkSurfaceValid(); }
     virtual bool restore() OVERRIDE { return m_layerBridge->restoreSurface(); }
     virtual blink::WebLayer* layer() const OVERRIDE { return m_layerBridge->layer(); }
     virtual Platform3DObject getBackingTexture() const OVERRIDE { return m_layerBridge->getBackingTexture(); }
     virtual bool isAccelerated() const OVERRIDE { return m_layerBridge->isAccelerated(); }
     virtual void setIsHidden(bool hidden) OVERRIDE { m_layerBridge->setIsHidden(hidden); }
     virtual void setImageBuffer(ImageBuffer* imageBuffer) OVERRIDE { m_layerBridge->setImageBuffer(imageBuffer); }
 
+    virtual PassRefPtr<SkImage> newImageSnapshot() const OVERRIDE { return m_layerBridge->newImageSnapshot(); }

[Justin Novosad, 2014/07/29 14:56:52]

You will have to move implementation to .cpp if Image is forward declared.

[Rémi Piotaix, 2014/07/29 17:18:22]

Canvas2DLayerBridge already include SkImage

 private:
     RefPtr<Canvas2DLayerBridge> m_layerBridge;
 };
 
 }
 
 #endif