Refactoring ImageBuffer to decouple it from Canvas2DLayerBridge

Source/core/platform/graphics/GraphicsContextTest.cpp

 /*
  * Copyright (C) 2012 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.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 13 matching lines @@
 
 #include "config.h"
 
 #include "core/platform/graphics/GraphicsContext.h"
 
 #include "SkCanvas.h"
 #include "core/platform/graphics/BitmapImage.h"
 #include "core/platform/graphics/ImageBuffer.h"
 #include "core/platform/graphics/skia/NativeImageSkia.h"
 #include "platform/graphics/DisplayList.h"
+#include "platform/graphics/UnacceleratedImageBufferSurface.h"
 #include "third_party/skia/include/core/SkBitmapDevice.h"
 #include <gtest/gtest.h>
 
 using namespace WebCore;
 
 namespace {
 
 #define EXPECT_EQ_RECT(a, b) \
     EXPECT_EQ(a.x(), b.x()); \
     EXPECT_EQ(a.y(), b.y()); \
@@ skipping 193 matching lines @@
     // out a transparency layer below that is filled with the mask color. In the end this should
     // not be marked opaque.
 
     context.setCompositeOperation(CompositeSourceOver);
     context.beginTransparencyLayer(1);
     context.fillRect(FloatRect(10, 10, 10, 10), opaque, CompositeSourceOver);
 
     context.setCompositeOperation(CompositeDestinationIn);
     context.beginTransparencyLayer(1);
 
-    OwnPtr<ImageBuffer> alphaImage = ImageBuffer::create(IntSize(100, 100));
-    alphaImage->context()->fillRect(IntRect(0, 0, 100, 100), alpha);
+    OwnPtr<ImageBufferSurface> surface = adoptPtr(new UnacceleratedImageBufferSurface(IntSize(100, 100)));
+    ImageBuffer alphaImage(surface.release());

[Stephen White, 2013/12/04 21:18:40]

Ooooh, ImageBuffer on the stack. *mindblown*

+    alphaImage.context()->fillRect(IntRect(0, 0, 100, 100), alpha);
 
     context.setCompositeOperation(CompositeSourceOver);
-    context.drawImageBuffer(alphaImage.get(), FloatRect(10, 10, 10, 10));
+    context.drawImageBuffer(&alphaImage, FloatRect(10, 10, 10, 10));
 
     context.endLayer();
     context.endLayer();
 
     EXPECT_EQ_RECT(IntRect(), context.opaqueRegion().asRect());
     EXPECT_PIXELS_MATCH_EXACT(bitmap, context.opaqueRegion().asRect());
 }
 
 TEST(GraphicsContextTest, trackImageMaskWithOpaqueRect)
 {
@@ skipping 13 matching lines @@
     // out a transparency layer below that is filled with the mask color. In the end this should
     // not be marked opaque.
 
     context.setCompositeOperation(CompositeSourceOver);
     context.beginTransparencyLayer(1);
     context.fillRect(FloatRect(10, 10, 10, 10), opaque, CompositeSourceOver);
 
     context.setCompositeOperation(CompositeDestinationIn);
     context.beginTransparencyLayer(1);
 
-    OwnPtr<ImageBuffer> alphaImage = ImageBuffer::create(IntSize(100, 100));
-    alphaImage->context()->fillRect(IntRect(0, 0, 100, 100), alpha);
+    OwnPtr<ImageBufferSurface> surface = adoptPtr(new UnacceleratedImageBufferSurface(IntSize(100, 100)));
+    ImageBuffer alphaImage(surface.release());
+    alphaImage.context()->fillRect(IntRect(0, 0, 100, 100), alpha);
 
     context.setCompositeOperation(CompositeSourceOver);
-    context.drawImageBuffer(alphaImage.get(), FloatRect(10, 10, 10, 10));
+    context.drawImageBuffer(&alphaImage, FloatRect(10, 10, 10, 10));
 
     // We can't have an opaque mask actually, but we can pretend here like it would look if we did.
     context.fillRect(FloatRect(12, 12, 3, 3), opaque, CompositeSourceOver);
 
     context.endLayer();
     context.endLayer();
 
     EXPECT_EQ_RECT(IntRect(12, 12, 3, 3), context.opaqueRegion().asRect());
     EXPECT_PIXELS_MATCH_EXACT(bitmap, context.opaqueRegion().asRect());
 }
@@ skipping 814 matching lines @@
     controlContext.restore();
     context.endRecording();
     EXPECT_EQ(context.getCTM(), controlContext.getCTM());
 
     controlContext.restore();
     context.endRecording();
     EXPECT_EQ(context.getCTM(), controlContext.getCTM());
 }
 
 } // namespace