Change Canvas2DLayerBridge to stay alive until last mailbox is returned.

Source/core/platform/graphics/chromium/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 82 matching lines @@
 {
     SkImage::Info info = {
         1,
         1,
         SkImage::kPMColor_ColorType,
         SkImage::kPremul_AlphaType,
     };
     return adoptPtr(SkDeferredCanvas::Create(SkSurface::NewRaster(info)));
 }
 
+FakeCanvas2DLayerBridge* fake(const Canvas2DLayerBridgePtr& layer)
+{
+    return static_cast<FakeCanvas2DLayerBridge*>(layer.get());
+}
+
 class Canvas2DLayerManagerTest : public Test {
 protected:
     void storageAllocationTrackingTest()
     {
         Canvas2DLayerManager& manager = Canvas2DLayerManager::get();
         manager.init(10, 10);
         {
             RefPtr<GraphicsContext3D> context = GraphicsContext3D::createGraphicsContextFromWebContext(adoptPtr(new WebKit::FakeWebGraphicsContext3D));
             OwnPtr<SkDeferredCanvas> canvas1 = createCanvas(context.get());
-            FakeCanvas2DLayerBridge layer1(context, canvas1.get());
+            Canvas2DLayerBridgePtr layer1(adoptRef(new FakeCanvas2DLayerBridge(context, canvas1.get())));
             EXPECT_EQ((size_t)0, manager.m_bytesAllocated);
-            layer1.storageAllocatedForRecordingChanged(1);
+            layer1->storageAllocatedForRecordingChanged(1);
             EXPECT_EQ((size_t)1, manager.m_bytesAllocated);
             // Test allocation increase
-            layer1.storageAllocatedForRecordingChanged(2);
+            layer1->storageAllocatedForRecordingChanged(2);
             EXPECT_EQ((size_t)2, manager.m_bytesAllocated);
             // Test allocation decrease
-            layer1.storageAllocatedForRecordingChanged(1);
+            layer1->storageAllocatedForRecordingChanged(1);
             EXPECT_EQ((size_t)1, manager.m_bytesAllocated);
             {
                 OwnPtr<SkDeferredCanvas> canvas2 = createCanvas(context.get());
-                FakeCanvas2DLayerBridge layer2(context, canvas2.get());
+                Canvas2DLayerBridgePtr layer2(adoptRef(new FakeCanvas2DLayerBridge(context, canvas2.get())));
                 EXPECT_EQ((size_t)1, manager.m_bytesAllocated);
                 // verify multi-layer allocation tracking
-                layer2.storageAllocatedForRecordingChanged(2);
+                layer2->storageAllocatedForRecordingChanged(2);
                 EXPECT_EQ((size_t)3, manager.m_bytesAllocated);
             }
             // Verify tracking after destruction
             EXPECT_EQ((size_t)1, manager.m_bytesAllocated);
         }
     }
 
     void evictionTest()
     {
         RefPtr<GraphicsContext3D> context = GraphicsContext3D::createGraphicsContextFromWebContext(adoptPtr(new WebKit::FakeWebGraphicsContext3D));
         Canvas2DLayerManager& manager = Canvas2DLayerManager::get();
         manager.init(10, 5);
         OwnPtr<SkDeferredCanvas> canvas = createCanvas(context.get());
-        FakeCanvas2DLayerBridge layer(context, canvas.get());
-        layer.fakeFreeableBytes(10);
-        layer.storageAllocatedForRecordingChanged(8); // under the max
-        EXPECT_EQ(0, layer.m_freeMemoryIfPossibleCount);
-        layer.storageAllocatedForRecordingChanged(12); // over the max
-        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());
+        Canvas2DLayerBridgePtr layer(adoptRef(new FakeCanvas2DLayerBridge(context, canvas.get())));
+        fake(layer)->fakeFreeableBytes(10);
+        layer->storageAllocatedForRecordingChanged(8); // under the max
+        EXPECT_EQ(0, fake(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((size_t)5, layer->bytesAllocated());
     }
 
     void flushEvictionTest()
     {
         RefPtr<GraphicsContext3D> context = GraphicsContext3D::createGraphicsContextFromWebContext(adoptPtr(new WebKit::FakeWebGraphicsContext3D));
         Canvas2DLayerManager& manager = Canvas2DLayerManager::get();
         manager.init(10, 5);
         OwnPtr<SkDeferredCanvas> canvas = createCanvas(context.get());
-        FakeCanvas2DLayerBridge layer(context, canvas.get());
-        layer.fakeFreeableBytes(1); // Not enough freeable bytes, will cause aggressive eviction by flushing
-        layer.storageAllocatedForRecordingChanged(8); // under the max
-        EXPECT_EQ(0, layer.m_freeMemoryIfPossibleCount);
-        layer.storageAllocatedForRecordingChanged(12); // over the max
-        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));
+        Canvas2DLayerBridgePtr layer(adoptRef(new FakeCanvas2DLayerBridge(context, canvas.get())));
+        fake(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);
+        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((size_t)11, layer->bytesAllocated()); // flush drops the layer from manager's tracking list
+        EXPECT_FALSE(manager.isInList(layer.get()));
     }
 
     void doDeferredFrameTestTask(FakeCanvas2DLayerBridge* layer, bool skipCommands)
     {
         EXPECT_FALSE(Canvas2DLayerManager::get().m_taskObserverActive);
         layer->contextAcquired();
         layer->storageAllocatedForRecordingChanged(1);
         EXPECT_TRUE(Canvas2DLayerManager::get().m_taskObserverActive);
         if (skipCommands) {
             layer->contextAcquired();
@@ skipping 20 matching lines @@
         Canvas2DLayerManagerTest* m_test;
         FakeCanvas2DLayerBridge* m_layer;
         bool m_skipCommands;
     };
 
     void deferredFrameTest()
     {
         RefPtr<GraphicsContext3D> context = GraphicsContext3D::createGraphicsContextFromWebContext(adoptPtr(new WebKit::FakeWebGraphicsContext3D));
         Canvas2DLayerManager::get().init(10, 10);
         OwnPtr<SkDeferredCanvas> canvas = createCanvas(context.get());
-        FakeCanvas2DLayerBridge fakeLayer(context, canvas.get());
-        WebKit::Platform::current()->currentThread()->postTask(new DeferredFrameTestTask(this, &fakeLayer, true));
+        Canvas2DLayerBridgePtr layer(adoptRef(new FakeCanvas2DLayerBridge(context, canvas.get())));
+        WebKit::Platform::current()->currentThread()->postTask(new DeferredFrameTestTask(this, fake(layer), true));
         WebKit::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, fakeLayer.m_flushCount);
+        EXPECT_EQ(0, fake(layer)->m_flushCount);
 
         // Verify that no flushes are triggered as long as frame are fresh
-        WebKit::Platform::current()->currentThread()->postTask(new DeferredFrameTestTask(this, &fakeLayer, true));
+        WebKit::Platform::current()->currentThread()->postTask(new DeferredFrameTestTask(this, fake(layer), true));
         WebKit::Platform::current()->currentThread()->enterRunLoop();
         EXPECT_FALSE(Canvas2DLayerManager::get().m_taskObserverActive);
-        EXPECT_EQ(0, fakeLayer.m_flushCount);
+        EXPECT_EQ(0, fake(layer)->m_flushCount);
 
-        WebKit::Platform::current()->currentThread()->postTask(new DeferredFrameTestTask(this, &fakeLayer, true));
+        WebKit::Platform::current()->currentThread()->postTask(new DeferredFrameTestTask(this, fake(layer), true));
         WebKit::Platform::current()->currentThread()->enterRunLoop();
         EXPECT_FALSE(Canvas2DLayerManager::get().m_taskObserverActive);
-        EXPECT_EQ(0, fakeLayer.m_flushCount);
+        EXPECT_EQ(0, fake(layer)->m_flushCount);
 
         // Verify that a flush is triggered when queue is accumulating a multi-frame backlog.
-        WebKit::Platform::current()->currentThread()->postTask(new DeferredFrameTestTask(this, &fakeLayer, false));
+        WebKit::Platform::current()->currentThread()->postTask(new DeferredFrameTestTask(this, fake(layer), false));
         WebKit::Platform::current()->currentThread()->enterRunLoop();
         EXPECT_FALSE(Canvas2DLayerManager::get().m_taskObserverActive);
-        EXPECT_EQ(1, fakeLayer.m_flushCount);
+        EXPECT_EQ(1, fake(layer)->m_flushCount);
 
-        WebKit::Platform::current()->currentThread()->postTask(new DeferredFrameTestTask(this, &fakeLayer, false));
+        WebKit::Platform::current()->currentThread()->postTask(new DeferredFrameTestTask(this, fake(layer), false));
         WebKit::Platform::current()->currentThread()->enterRunLoop();
         EXPECT_FALSE(Canvas2DLayerManager::get().m_taskObserverActive);
-        EXPECT_EQ(2, fakeLayer.m_flushCount);
+        EXPECT_EQ(2, fake(layer)->m_flushCount);
     }
 };
 
 namespace {
 
 TEST_F(Canvas2DLayerManagerTest, testStorageAllocationTracking)
 {
     storageAllocationTrackingTest();
 }
 
 TEST_F(Canvas2DLayerManagerTest, testEviction)
 {
     evictionTest();
 }
 
 TEST_F(Canvas2DLayerManagerTest, testFlushEviction)
 {
     flushEvictionTest();
 }
 
 TEST_F(Canvas2DLayerManagerTest, testDeferredFrame)
 {
     deferredFrameTest();
 }
 
 } // namespace