Refactoring ImageBuffer to decouple it from Canvas2DLayerBridge

Source/core/platform/graphics/ImageBuffer.h

 /*
  * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2007, 2008, 2009 Apple Inc. All rights reserved.
  * 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 11 matching lines @@
  * 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 ImageBuffer_h
 #define ImageBuffer_h
 
 #include "core/platform/graphics/GraphicsContext.h"
-#include "core/platform/graphics/Canvas2DLayerBridge.h"
 #include "platform/geometry/FloatRect.h"
-#include "platform/geometry/IntSize.h"
 #include "platform/graphics/ColorSpace.h"
 #include "platform/graphics/GraphicsTypes.h"
 #include "platform/graphics/GraphicsTypes3D.h"
+#include "platform/graphics/ImageBufferSurface.h"
 #include "platform/transforms/AffineTransform.h"
 #include "wtf/Forward.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/Uint8ClampedArray.h"
 #include "wtf/Vector.h"
 
 class SkCanvas;
 
-namespace blink { class WebLayer; }
-
 namespace WebCore {
 
+class DrawingBuffer;
+class GraphicsContext3D;
 class Image;
 class IntPoint;
 class IntRect;
-class GraphicsContext3D;
 
 enum Multiply {
     Premultiplied,
     Unmultiplied
 };
 
-enum RenderingMode {
-    Unaccelerated,
-    UnacceleratedNonPlatformBuffer, // Use plain memory allocation rather than platform API to allocate backing store.
-    TextureBacked, // Allocate a texture-based SkBitmap for the backing store.
-    Accelerated, // Besides a texture-based SkBitmap for the backing store, allocate Canvas2DLayerBridge, etc as well for 2D Canvas drawing.
-};
-
 enum BackingStoreCopy {
     CopyBackingStore, // Guarantee subsequent draws don't affect the copy.
     DontCopyBackingStore // Subsequent draws may affect the copy.
 };
 
 enum ScaleBehavior {
     Scaled,
     Unscaled
 };
 
-enum OpacityMode {
-    NonOpaque,
-    Opaque,
-};
-
 class ImageBuffer {
     WTF_MAKE_NONCOPYABLE(ImageBuffer); WTF_MAKE_FAST_ALLOCATED;
 public:
-    // Will return a null pointer on allocation failure.
-    static PassOwnPtr<ImageBuffer> create(const IntSize& size, float resolutionScale = 1, RenderingMode renderingMode = Unaccelerated, OpacityMode opacityMode = NonOpaque, int acceleratedMSAASampleCount = 0)
-    {
-        bool success = false;
-        OwnPtr<ImageBuffer> buf = adoptPtr(new ImageBuffer(size, resolutionScale, renderingMode, opacityMode, acceleratedMSAASampleCount, success));
-        if (!success)
-            return nullptr;
-        return buf.release();
-    }
-
-    static PassOwnPtr<ImageBuffer> createCompatibleBuffer(const IntSize&, float resolutionScale, const GraphicsContext*, bool hasAlpha);
-
-    // Tiles may need float-to-integer coordinate mapping.
-    static PassOwnPtr<ImageBuffer> createBufferForTile(const FloatSize& tileSize, const FloatSize& clampedTileSize, RenderingMode);
-
+    ImageBuffer(PassOwnPtr<ImageBufferSurface>);
     ~ImageBuffer();
 
     // The actual resolution of the backing store
-    const IntSize& internalSize() const { return m_size; }
-    const IntSize& logicalSize() const { return m_logicalSize; }
+    const IntSize& internalSize() const { return m_surface->size(); }
+    const IntSize& logicalSize() const { return m_surface->size(); }
 
     GraphicsContext* context() const;
 
     PassRefPtr<Image> copyImage(BackingStoreCopy = CopyBackingStore, ScaleBehavior = Scaled) const;
     // Give hints on the faster copyImage Mode, return DontCopyBackingStore if it supports the DontCopyBackingStore behavior
     // or return CopyBackingStore if it doesn't.
     static BackingStoreCopy fastCopyImageMode();
 
     enum CoordinateSystem { LogicalCoordinateSystem, BackingStoreCoordinateSystem };
 
@@ skipping 21 matching lines @@
     void draw(GraphicsContext*, const FloatRect&, const FloatRect& = FloatRect(0, 0, -1, -1), CompositeOperator = CompositeSourceOver, blink::WebBlendMode = blink::WebBlendModeNormal, bool useLowQualityScale = false);
     void drawPattern(GraphicsContext*, const FloatRect&, const FloatSize&, const FloatPoint&, CompositeOperator, const FloatRect&, blink::WebBlendMode, const IntSize& repeatSpacing = IntSize());
     static PassRefPtr<SkColorFilter> createColorSpaceFilter(ColorSpace srcColorSpace, ColorSpace dstColorSpace);
 
     friend class GraphicsContext;
     friend class GeneratedImage;
     friend class CrossfadeGeneratedImage;
     friend class GradientGeneratedImage;
     friend class SkiaImageFilterBuilder;
 
-    IntSize m_size;
-    IntSize m_logicalSize;
-    float m_resolutionScale;
-    RefPtr<SkCanvas> m_canvas;
+    OwnPtr<ImageBufferSurface> m_surface;
     OwnPtr<GraphicsContext> m_context;
-    Canvas2DLayerBridgePtr m_layerBridge;
-
-    // This constructor will place its success into the given out-variable
-    // so that create() knows when it should return failure.
-    ImageBuffer(const IntSize&, float resolutionScale, RenderingMode, OpacityMode, int acceleratedSampleCount, bool& success);
-    ImageBuffer(const IntSize&, float resolutionScale, const GraphicsContext*, bool hasAlpha, bool& success);
 };
 
 struct ImageDataBuffer {
     ImageDataBuffer(const IntSize& size, PassRefPtr<Uint8ClampedArray> data) : m_size(size), m_data(data) { }
     IntSize size() const { return m_size; }
     unsigned char* data() const { return m_data->data(); }
 
     IntSize m_size;
     RefPtr<Uint8ClampedArray> m_data;
 };
 
 String ImageDataToDataURL(const ImageDataBuffer&, const String& mimeType, const double* quality);
 
 } // namespace WebCore
 
 #endif // ImageBuffer_h