Refactoring ImageBuffer to decouple it from Canvas2DLayerBridge

Source/core/platform/graphics/win/TransparencyWin.cpp

 /*
  * Copyright (C) 2009 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 16 matching lines @@
  * (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 "core/platform/graphics/GraphicsContext.h"
 #include "core/platform/graphics/SimpleFontData.h"
 #include "core/platform/graphics/skia/SkiaUtils.h"
 #include "core/platform/graphics/win/TransparencyWin.h"
+#include "platform/graphics/UnacceleratedImageBufferSurface.h"
 
 #include "SkColorPriv.h"
 #include "skia/ext/platform_canvas.h"
 
 namespace WebCore {
 
 namespace {
 
 // The maximum size in pixels of the buffer we'll keep around for drawing text
 // into. Buffers larger than this will be destroyed when we're done with them.
@@ skipping 47 matching lines @@
 }
 
 }  // namespace
 
 // If either of these pointers is non-null, both must be valid and point to
 // bitmaps of the same size.
 class TransparencyWin::OwnedBuffers {
 public:
     OwnedBuffers(const IntSize& size, bool needReferenceBuffer)
     {
-        m_destBitmap = ImageBuffer::create(size, 1);
+        OwnPtr<ImageBufferSurface> surface = adoptPtr(new UnacceleratedImageBufferSurface(size));
+        if (surface->isValid())
+            m_destBitmap = adoptPtr(new ImageBuffer(surface.release()));
 
         if (needReferenceBuffer) {
             m_referenceBitmap.setConfig(SkBitmap::kARGB_8888_Config, size.width(), size.height());
             m_referenceBitmap.allocPixels();
             m_referenceBitmap.eraseARGB(0, 0, 0, 0);
         }
     }
 
     ImageBuffer* destBitmap() { return m_destBitmap.get(); }
 
@@ skipping 390 matching lines @@
 
     SkBitmap& bitmap = const_cast<SkBitmap&>(m_drawContext->layerBitmap(GraphicsContext::ReadWrite));
     for (int y = 0; y < m_layerSize.height(); y++) {
         uint32_t* row = bitmap.getAddr32(0, y);
         for (int x = 0; x < m_layerSize.width(); x++)
             row[x] |= 0xFF000000;
     }
 }
 
 } // namespace WebCore