Refactoring ImageBuffer to decouple it from Canvas2DLayerBridge

Source/platform/graphics/GraphicsContext.h

 /*
  * Copyright (C) 2003, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008-2009 Torch Mobile, Inc.
  * 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 16 matching lines @@
 
 #ifndef GraphicsContext_h
 #define GraphicsContext_h
 
 #include "platform/PlatformExport.h"
 #include "platform/TraceEvent.h"
 #include "platform/fonts/Font.h"
 #include "platform/geometry/FloatRect.h"
 #include "platform/graphics/DashArray.h"
 #include "platform/graphics/DrawLooper.h"
-#include "platform/graphics/ImageBuffer.h"
+#include "platform/graphics/ImageBufferSurface.h"
 #include "platform/graphics/ImageOrientation.h"
 #include "platform/graphics/GraphicsContextAnnotation.h"
 #include "platform/graphics/GraphicsContextState.h"
 #include "platform/graphics/skia/OpaqueRegionSkia.h"
 #include "platform/graphics/skia/SkiaUtils.h"
 // TODO(robertphillips): replace this include with "class SkBaseDevice;"
 #include "third_party/skia/include/core/SkDevice.h"
 #include "wtf/FastAllocBase.h"
 #include "wtf/Forward.h"
 #include "wtf/Noncopyable.h"
@@ skipping 35 matching lines @@
         realizeSave(SkCanvas::kMatrixClip_SaveFlag);
 
         return m_canvas;
     }
     const SkCanvas* canvas() const { return m_canvas; }
     bool paintingDisabled() const { return !m_canvas; }
 
     const SkBitmap* bitmap() const;
     const SkBitmap& layerBitmap(AccessMode = ReadOnly) const;
 
-    SkBaseDevice* createCompatibleDevice(const IntSize&, bool hasAlpha) const;
-
     // ---------- State management methods -----------------
     void save();
     void restore();
 
     void saveLayer(const SkRect* bounds, const SkPaint*, SkCanvas::SaveFlags = SkCanvas::kARGB_ClipLayer_SaveFlag);
     void restoreLayer();
 
     float strokeThickness() const { return m_state->m_strokeData.thickness(); }
     void setStrokeThickness(float thickness) { m_state->m_strokeData.setThickness(thickness); }
 
@@ skipping 256 matching lines @@
     // ---------- End transformation methods -----------------
 
     // URL drawing
     void setURLForRect(const KURL&, const IntRect&);
     void setURLFragmentForRect(const String& name, const IntRect&);
     void addURLTargetAtPoint(const String& name, const IntPoint&);
     bool supportsURLFragments() { return printing(); }
 
     // Create an image buffer compatible with this context, with suitable resolution
     // for drawing into the buffer and then into this context.
-    PassOwnPtr<ImageBuffer> createCompatibleBuffer(const IntSize&, bool hasAlpha = true) const;
+    PassOwnPtr<ImageBuffer> createCompatibleBuffer(const IntSize&, OpacityMode = NonOpaque) const;
 
     static void adjustLineToPixelBoundaries(FloatPoint& p1, FloatPoint& p2, float strokeWidth, StrokeStyle);
 
     void beginAnnotation(const char*, const char*, const String&, const String&, const String&);
     void endAnnotation();
 
 private:
     static void addCornerArc(SkPath*, const SkRect&, const IntSize&, int);
     static void setPathFromConvexPoints(SkPath*, size_t, const FloatPoint*);
     static void setRadii(SkVector*, IntSize, IntSize, IntSize, IntSize);
@@ skipping 101 matching lines @@
     // FIXME: Make this go away: crbug.com/236892
     bool m_updatingControlTints : 1;
     bool m_accelerated : 1;
     bool m_isCertainlyOpaque : 1;
     bool m_printing : 1;
 };
 
 } // namespace WebCore
 
 #endif // GraphicsContext_h