Free temporary GPU and memory resources held by inactive or hidden 2D canvases

Source/web/tests/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 23 matching lines @@
 #include "web/tests/MockWebGraphicsContext3D.h"
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 using namespace WebCore;
 using testing::InSequence;
 using testing::Return;
 using testing::Test;
 
+namespace {
 
 class FakeCanvas2DLayerBridge : public Canvas2DLayerBridge {
 public:
     FakeCanvas2DLayerBridge(PassRefPtr<GraphicsContext3D> context, PassOwnPtr<SkDeferredCanvas> canvas)
         : Canvas2DLayerBridge(context, canvas, 0, NonOpaque)
         , m_freeableBytes(0)
         , m_freeMemoryIfPossibleCount(0)
         , m_flushCount(0)
     {
     }
@@ skipping 11 matching lines @@
     {
         m_freeableBytes = size;
     }
 
     virtual size_t freeMemoryIfPossible(size_t size) OVERRIDE
     {
         m_freeMemoryIfPossibleCount++;
         size_t bytesFreed = size < m_freeableBytes ? size : m_freeableBytes;
         m_freeableBytes -= bytesFreed;
         if (bytesFreed)
-            Canvas2DLayerManager::get().layerAllocatedStorageChanged(this, -((intptr_t)bytesFreed));
-        m_bytesAllocated -= bytesFreed;
+            storageAllocatedForRecordingChanged(m_bytesAllocated - bytesFreed);
         return bytesFreed;
     }
 
     virtual void flush() OVERRIDE
     {
         flushedDrawCommands();
+        m_freeableBytes = bytesAllocated();
         m_flushCount++;
     }
 
 public:
     size_t m_freeableBytes;
     int m_freeMemoryIfPossibleCount;
     int m_flushCount;
 };
 
 class FakeCanvas2DLayerBridgePtr {
@@ skipping 11 matching lines @@
 
 private:
     RefPtr<FakeCanvas2DLayerBridge> m_layerBridge;
 };
 
 static PassOwnPtr<SkDeferredCanvas> createCanvas(GraphicsContext3D* context)
 {
     return adoptPtr(SkDeferredCanvas::Create(SkSurface::NewRasterPMColor(1, 1)));
 }
 
+} // unnamed namespace
+
 class Canvas2DLayerManagerTest : public Test {
 protected:
     void storageAllocationTrackingTest()
     {
         Canvas2DLayerManager& manager = Canvas2DLayerManager::get();
         manager.init(10, 10);
         {
             OwnPtr<blink::MockWebGraphicsContext3D> webContext = adoptPtr(new blink::MockWebGraphicsContext3D);
             RefPtr<GraphicsContext3D> context = GraphicsContext3D::createContextSupport(webContext.get());
             OwnPtr<SkDeferredCanvas> canvas1 = createCanvas(context.get());
@@ skipping 31 matching lines @@
         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());
     }
 
+    void hiddenCanvasTest()
+    {
+        OwnPtr<blink::MockWebGraphicsContext3D> webContext = adoptPtr(new blink::MockWebGraphicsContext3D);
+        RefPtr<GraphicsContext3D> context = GraphicsContext3D::createContextSupport(webContext.get());
+        Canvas2DLayerManager& manager = Canvas2DLayerManager::get();
+        manager.init(20, 5);
+        OwnPtr<SkDeferredCanvas> canvas = createCanvas(context.get());
+        FakeCanvas2DLayerBridgePtr layer(adoptRef(new FakeCanvas2DLayerBridge(context, canvas.release())));
+        layer->fakeFreeableBytes(5);
+        layer->storageAllocatedForRecordingChanged(10);
+        EXPECT_EQ(0, layer->m_freeMemoryIfPossibleCount);
+        EXPECT_EQ(0, layer->m_flushCount);
+        layer->setIsHidden(true);
+        EXPECT_EQ(1, layer->m_freeMemoryIfPossibleCount);
+        EXPECT_EQ((size_t)0, layer->m_freeableBytes);
+        EXPECT_EQ((size_t)0, layer->bytesAllocated());

[Stephen White, 2014/01/24 18:52:35]

Could we expect that bytesAllocated() is non-zero at some point before the set
hidden call?

+        EXPECT_EQ(1, layer->m_flushCount);
+    }
+
+    void addRemoveLayerTest()
+    {
+        OwnPtr<blink::MockWebGraphicsContext3D> webContext = adoptPtr(new blink::MockWebGraphicsContext3D);
+        RefPtr<GraphicsContext3D> context = GraphicsContext3D::createContextSupport(webContext.get());
+        Canvas2DLayerManager& manager = Canvas2DLayerManager::get();
+        manager.init(10, 5);
+        OwnPtr<SkDeferredCanvas> canvas = createCanvas(context.get());
+        FakeCanvas2DLayerBridgePtr layer(adoptRef(new FakeCanvas2DLayerBridge(context, canvas.release())));
+        EXPECT_FALSE(manager.isInList(layer.get()));
+        layer->storageAllocatedForRecordingChanged(5);
+        EXPECT_TRUE(manager.isInList(layer.get()));
+        layer->storageAllocatedForRecordingChanged(0);
+        EXPECT_FALSE(manager.isInList(layer.get()));
+    }
+
     void flushEvictionTest()
     {
         OwnPtr<blink::MockWebGraphicsContext3D> webContext = adoptPtr(new blink::MockWebGraphicsContext3D);
         RefPtr<GraphicsContext3D> context = GraphicsContext3D::createContextSupport(webContext.get());
         Canvas2DLayerManager& manager = Canvas2DLayerManager::get();
         manager.init(10, 5);
         OwnPtr<SkDeferredCanvas> canvas = createCanvas(context.get());
         FakeCanvas2DLayerBridgePtr 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, 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((size_t)5, 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()));
+        EXPECT_EQ((size_t)5, layer->bytesAllocated());
+        EXPECT_TRUE(manager.isInList(layer.get()));
     }
 
     void doDeferredFrameTestTask(FakeCanvas2DLayerBridge* layer, bool skipCommands)
     {
         EXPECT_FALSE(Canvas2DLayerManager::get().m_taskObserverActive);
         layer->willUse();
         layer->storageAllocatedForRecordingChanged(1);
         EXPECT_TRUE(Canvas2DLayerManager::get().m_taskObserverActive);
         if (skipCommands) {
             layer->willUse();
-            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;
@@ skipping 64 matching lines @@
 TEST_F(Canvas2DLayerManagerTest, testFlushEviction)
 {
     flushEvictionTest();
 }
 
 TEST_F(Canvas2DLayerManagerTest, testDeferredFrame)
 {
     deferredFrameTest();
 }
 
-} // namespace
+TEST_F(Canvas2DLayerManagerTest, testHiddenCanvas)
+{
+    hiddenCanvasTest();
+}
 
+TEST_F(Canvas2DLayerManagerTest, testAddRemoveLayer)
+{
+    addRemoveLayerTest();
+}
+
+} // unnamed namespace
+