Refactoring ImageBuffer to decouple it from Canvas2DLayerBridge

Source/core/platform/graphics/Canvas2DLayerManagerTest.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 26 matching lines @@
 #include <gtest/gtest.h>
 
 using namespace WebCore;
 using testing::InSequence;
 using testing::Return;
 using testing::Test;
 
 
 class FakeCanvas2DLayerBridge : public Canvas2DLayerBridge {
 public:
-    FakeCanvas2DLayerBridge(PassRefPtr<GraphicsContext3D> context, PassRefPtr<SkDeferredCanvas> canvas)
+    FakeCanvas2DLayerBridge(PassRefPtr<GraphicsContext3D> context, PassOwnPtr<SkDeferredCanvas> canvas)
         : Canvas2DLayerBridge(context, canvas, 0, NonOpaque)
         , m_freeableBytes(0)
         , m_freeMemoryIfPossibleCount(0)
         , m_flushCount(0)
     {
     }
 
     virtual size_t storageAllocatedForRecording() OVERRIDE
     {
         // Because the fake layer has no canvas to query, just
@@ skipping 24 matching lines @@
         flushedDrawCommands();
         m_flushCount++;
     }
 
 public:
     size_t m_freeableBytes;
     int m_freeMemoryIfPossibleCount;
     int m_flushCount;
 };
 
-static PassRefPtr<SkDeferredCanvas> createCanvas(GraphicsContext3D* context)
+static PassOwnPtr<SkDeferredCanvas> createCanvas(GraphicsContext3D* context)
 {
-    return adoptRef(SkDeferredCanvas::Create(SkSurface::NewRasterPMColor(1, 1)));
-}
-
-FakeCanvas2DLayerBridge* fake(const Canvas2DLayerBridgePtr& layer)
-{
-    return static_cast<FakeCanvas2DLayerBridge*>(layer.get());
+    return adoptPtr(SkDeferredCanvas::Create(SkSurface::NewRasterPMColor(1, 1)));
 }
 
 class Canvas2DLayerManagerTest : public Test {
 protected:
     void storageAllocationTrackingTest()
     {
         Canvas2DLayerManager& manager = Canvas2DLayerManager::get();
         manager.init(10, 10);
         {
             RefPtr<GraphicsContext3D> context = GraphicsContext3D::createGraphicsContextFromWebContext(adoptPtr(new blink::FakeWebGraphicsContext3D));
-            RefPtr<SkDeferredCanvas> canvas1(createCanvas(context.get()));
-            Canvas2DLayerBridgePtr layer1(adoptRef(new FakeCanvas2DLayerBridge(context, canvas1.release())));
+            OwnPtr<SkDeferredCanvas> canvas1 = createCanvas(context.get());
+            RefPtr<FakeCanvas2DLayerBridge> layer1 = adoptRef(new FakeCanvas2DLayerBridge(context, canvas1.release()));
             EXPECT_EQ((size_t)0, manager.m_bytesAllocated);
             layer1->storageAllocatedForRecordingChanged(1);
             EXPECT_EQ((size_t)1, manager.m_bytesAllocated);
             // Test allocation increase
             layer1->storageAllocatedForRecordingChanged(2);
             EXPECT_EQ((size_t)2, manager.m_bytesAllocated);
             // Test allocation decrease
             layer1->storageAllocatedForRecordingChanged(1);
             EXPECT_EQ((size_t)1, manager.m_bytesAllocated);
             {
-                RefPtr<SkDeferredCanvas> canvas2(createCanvas(context.get()));
-                Canvas2DLayerBridgePtr layer2(adoptRef(new FakeCanvas2DLayerBridge(context, canvas2.release())));
+                OwnPtr<SkDeferredCanvas> canvas2 = createCanvas(context.get());
+                RefPtr<FakeCanvas2DLayerBridge> layer2 = adoptRef(new FakeCanvas2DLayerBridge(context, canvas2.release()));
                 EXPECT_EQ((size_t)1, manager.m_bytesAllocated);
                 // verify multi-layer allocation tracking
                 layer2->storageAllocatedForRecordingChanged(2);
                 EXPECT_EQ((size_t)3, manager.m_bytesAllocated);
+                layer2->destroy();
             }
             // Verify tracking after destruction
             EXPECT_EQ((size_t)1, manager.m_bytesAllocated);
+            layer1->destroy();
         }
     }
 
     void evictionTest()
     {
         RefPtr<GraphicsContext3D> context = GraphicsContext3D::createGraphicsContextFromWebContext(adoptPtr(new blink::FakeWebGraphicsContext3D));
         Canvas2DLayerManager& manager = Canvas2DLayerManager::get();
         manager.init(10, 5);
-        RefPtr<SkDeferredCanvas> canvas(createCanvas(context.get()));
-        Canvas2DLayerBridgePtr layer(adoptRef(new FakeCanvas2DLayerBridge(context, canvas.release())));
-        fake(layer)->fakeFreeableBytes(10);
+        OwnPtr<SkDeferredCanvas> canvas = createCanvas(context.get());
+        RefPtr<FakeCanvas2DLayerBridge> layer = adoptRef(new FakeCanvas2DLayerBridge(context, canvas.release()));
+        layer->fakeFreeableBytes(10);
         layer->storageAllocatedForRecordingChanged(8); // under the max
-        EXPECT_EQ(0, fake(layer)->m_freeMemoryIfPossibleCount);
+        EXPECT_EQ(0, layer->m_freeMemoryIfPossibleCount);
         layer->storageAllocatedForRecordingChanged(12); // over the max
-        EXPECT_EQ(1, fake(layer)->m_freeMemoryIfPossibleCount);
-        EXPECT_EQ((size_t)3, fake(layer)->m_freeableBytes);
-        EXPECT_EQ(0, fake(layer)->m_flushCount); // eviction succeeded without triggering a flush
+        EXPECT_EQ(1, layer->m_freeMemoryIfPossibleCount);
+        EXPECT_EQ((size_t)3, layer->m_freeableBytes);
+        EXPECT_EQ(0, layer->m_flushCount); // eviction succeeded without triggering a flush
         EXPECT_EQ((size_t)5, layer->bytesAllocated());
+        layer->destroy();
     }
 
     void flushEvictionTest()
     {
         RefPtr<GraphicsContext3D> context = GraphicsContext3D::createGraphicsContextFromWebContext(adoptPtr(new blink::FakeWebGraphicsContext3D));
         Canvas2DLayerManager& manager = Canvas2DLayerManager::get();
         manager.init(10, 5);
-        RefPtr<SkDeferredCanvas> canvas(createCanvas(context.get()));
-        Canvas2DLayerBridgePtr layer(adoptRef(new FakeCanvas2DLayerBridge(context, canvas.release())));
-        fake(layer)->fakeFreeableBytes(1); // Not enough freeable bytes, will cause aggressive eviction by flushing
+        OwnPtr<SkDeferredCanvas> canvas = createCanvas(context.get());
+        RefPtr<FakeCanvas2DLayerBridge> layer = adoptRef(new FakeCanvas2DLayerBridge(context, canvas.release()));
+        layer->fakeFreeableBytes(1); // Not enough freeable bytes, will cause aggressive eviction by flushing
         layer->storageAllocatedForRecordingChanged(8); // under the max
-        EXPECT_EQ(0, fake(layer)->m_freeMemoryIfPossibleCount);
+        EXPECT_EQ(0, layer->m_freeMemoryIfPossibleCount);
         layer->storageAllocatedForRecordingChanged(12); // over the max
-        EXPECT_EQ(2, fake(layer)->m_freeMemoryIfPossibleCount); // Two tries, one before flush, one after flush
-        EXPECT_EQ((size_t)0, fake(layer)->m_freeableBytes);
-        EXPECT_EQ(1, fake(layer)->m_flushCount); // flush was attempted
+        EXPECT_EQ(2, layer->m_freeMemoryIfPossibleCount); // Two tries, one before flush, one after flush
+        EXPECT_EQ((size_t)0, layer->m_freeableBytes);
+        EXPECT_EQ(1, layer->m_flushCount); // flush was attempted
         EXPECT_EQ((size_t)11, layer->bytesAllocated()); // flush drops the layer from manager's tracking list
         EXPECT_FALSE(manager.isInList(layer.get()));
+        layer->destroy();
     }
 
     void doDeferredFrameTestTask(FakeCanvas2DLayerBridge* layer, bool skipCommands)
     {
         EXPECT_FALSE(Canvas2DLayerManager::get().m_taskObserverActive);
-        layer->contextAcquired();
+        layer->aboutToUse();
         layer->storageAllocatedForRecordingChanged(1);
         EXPECT_TRUE(Canvas2DLayerManager::get().m_taskObserverActive);
         if (skipCommands) {
-            layer->contextAcquired();
+            layer->aboutToUse();
             layer->storageAllocatedForRecordingChanged(0);
             layer->skippedPendingDrawCommands();
         }
         blink::Platform::current()->currentThread()->exitRunLoop();
     }
 
     class DeferredFrameTestTask : public blink::WebThread::Task {
     public:
         DeferredFrameTestTask(Canvas2DLayerManagerTest* test, FakeCanvas2DLayerBridge* layer, bool skipCommands)
         {
             m_test = test;
             m_layer = layer;
             m_skipCommands = skipCommands;
         }
 
         virtual void run() OVERRIDE
         {
             m_test->doDeferredFrameTestTask(m_layer, m_skipCommands);
         }
     private:
         Canvas2DLayerManagerTest* m_test;
         FakeCanvas2DLayerBridge* m_layer;
         bool m_skipCommands;
     };
 
     void deferredFrameTest()
     {
         RefPtr<GraphicsContext3D> context = GraphicsContext3D::createGraphicsContextFromWebContext(adoptPtr(new blink::FakeWebGraphicsContext3D));
         Canvas2DLayerManager::get().init(10, 10);
-        RefPtr<SkDeferredCanvas> canvas(createCanvas(context.get()));
-        Canvas2DLayerBridgePtr layer(adoptRef(new FakeCanvas2DLayerBridge(context, canvas.release())));
-        blink::Platform::current()->currentThread()->postTask(new DeferredFrameTestTask(this, fake(layer), true));
+        OwnPtr<SkDeferredCanvas> canvas = createCanvas(context.get());
+        RefPtr<FakeCanvas2DLayerBridge> layer = adoptRef(new FakeCanvas2DLayerBridge(context, canvas.release()));
+        blink::Platform::current()->currentThread()->postTask(new DeferredFrameTestTask(this, layer.get(), true));
         blink::Platform::current()->currentThread()->enterRunLoop();
         // Verify that didProcessTask was called upon completion
         EXPECT_FALSE(Canvas2DLayerManager::get().m_taskObserverActive);
         // Verify that no flush was performed because frame is fresh
-        EXPECT_EQ(0, fake(layer)->m_flushCount);
+        EXPECT_EQ(0, layer->m_flushCount);
 
         // Verify that no flushes are triggered as long as frame are fresh
-        blink::Platform::current()->currentThread()->postTask(new DeferredFrameTestTask(this, fake(layer), true));
+        blink::Platform::current()->currentThread()->postTask(new DeferredFrameTestTask(this, layer.get(), true));
         blink::Platform::current()->currentThread()->enterRunLoop();
         EXPECT_FALSE(Canvas2DLayerManager::get().m_taskObserverActive);
-        EXPECT_EQ(0, fake(layer)->m_flushCount);
+        EXPECT_EQ(0, layer->m_flushCount);
 
-        blink::Platform::current()->currentThread()->postTask(new DeferredFrameTestTask(this, fake(layer), true));
+        blink::Platform::current()->currentThread()->postTask(new DeferredFrameTestTask(this, layer.get(), true));
         blink::Platform::current()->currentThread()->enterRunLoop();
         EXPECT_FALSE(Canvas2DLayerManager::get().m_taskObserverActive);
-        EXPECT_EQ(0, fake(layer)->m_flushCount);
+        EXPECT_EQ(0, layer->m_flushCount);
 
         // Verify that a flush is triggered when queue is accumulating a multi-frame backlog.
-        blink::Platform::current()->currentThread()->postTask(new DeferredFrameTestTask(this, fake(layer), false));
+        blink::Platform::current()->currentThread()->postTask(new DeferredFrameTestTask(this, layer.get(), false));
         blink::Platform::current()->currentThread()->enterRunLoop();
         EXPECT_FALSE(Canvas2DLayerManager::get().m_taskObserverActive);
-        EXPECT_EQ(1, fake(layer)->m_flushCount);
+        EXPECT_EQ(1, layer->m_flushCount);
 
-        blink::Platform::current()->currentThread()->postTask(new DeferredFrameTestTask(this, fake(layer), false));
+        blink::Platform::current()->currentThread()->postTask(new DeferredFrameTestTask(this, layer.get(), false));
         blink::Platform::current()->currentThread()->enterRunLoop();
         EXPECT_FALSE(Canvas2DLayerManager::get().m_taskObserverActive);
-        EXPECT_EQ(2, fake(layer)->m_flushCount);
+        EXPECT_EQ(2, layer->m_flushCount);
+
+        layer->destroy();

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

As discussed, let's mock out the ImageBufferSurface as well, so it can take care
of cleaning up the layer bridge too.

     }
 };
 
 namespace {
 
 TEST_F(Canvas2DLayerManagerTest, testStorageAllocationTracking)
 {
     storageAllocationTrackingTest();
 }
 
 TEST_F(Canvas2DLayerManagerTest, testEviction)
 {
     evictionTest();
 }
 
 TEST_F(Canvas2DLayerManagerTest, testFlushEviction)
 {
     flushEvictionTest();
 }
 
 TEST_F(Canvas2DLayerManagerTest, testDeferredFrame)
 {
     deferredFrameTest();
 }
 
 } // namespace