| Index: Source/core/platform/graphics/Canvas2DLayerManagerTest.cpp
|
| diff --git a/Source/core/platform/graphics/Canvas2DLayerManagerTest.cpp b/Source/core/platform/graphics/Canvas2DLayerManagerTest.cpp
|
| deleted file mode 100644
|
| index 1d386741480385ba76776e43ffdcd049bb4ba6cf..0000000000000000000000000000000000000000
|
| --- a/Source/core/platform/graphics/Canvas2DLayerManagerTest.cpp
|
| +++ /dev/null
|
| @@ -1,262 +0,0 @@
|
| -/*
|
| - * 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
|
| - * documentation and/or other materials provided with the distribution.
|
| - *
|
| - * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
|
| - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
| - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
| - * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
|
| - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
| - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
| - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
| - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
| - * (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/Canvas2DLayerManager.h"
|
| -
|
| -#include "SkDevice.h"
|
| -#include "SkSurface.h"
|
| -#include "core/platform/graphics/GraphicsContext3D.h"
|
| -#include "core/platform/testing/FakeWebGraphicsContext3D.h"
|
| -#include "public/platform/Platform.h"
|
| -#include "public/platform/WebThread.h"
|
| -
|
| -#include <gmock/gmock.h>
|
| -#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)
|
| - : 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
|
| - // return status quo. Allocation changes that would normally be
|
| - // initiated by the canvas can be faked by invoking
|
| - // storageAllocatedForRecordingChanged directly from the test code.
|
| - return m_bytesAllocated;
|
| - }
|
| -
|
| - void fakeFreeableBytes(size_t size)
|
| - {
|
| - 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;
|
| - return bytesFreed;
|
| - }
|
| -
|
| - virtual void flush() OVERRIDE
|
| - {
|
| - flushedDrawCommands();
|
| - m_flushCount++;
|
| - }
|
| -
|
| -public:
|
| - size_t m_freeableBytes;
|
| - int m_freeMemoryIfPossibleCount;
|
| - int m_flushCount;
|
| -};
|
| -
|
| -static PassRefPtr<SkDeferredCanvas> createCanvas(GraphicsContext3D* context)
|
| -{
|
| - return adoptRef(SkDeferredCanvas::Create(SkSurface::NewRasterPMColor(1, 1)));
|
| -}
|
| -
|
| -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 blink::FakeWebGraphicsContext3D));
|
| - RefPtr<SkDeferredCanvas> canvas1(createCanvas(context.get()));
|
| - Canvas2DLayerBridgePtr 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())));
|
| - EXPECT_EQ((size_t)1, manager.m_bytesAllocated);
|
| - // verify multi-layer allocation tracking
|
| - 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 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);
|
| - 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 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
|
| - 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();
|
| - 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));
|
| - 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);
|
| -
|
| - // 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()->enterRunLoop();
|
| - EXPECT_FALSE(Canvas2DLayerManager::get().m_taskObserverActive);
|
| - EXPECT_EQ(0, fake(layer)->m_flushCount);
|
| -
|
| - blink::Platform::current()->currentThread()->postTask(new DeferredFrameTestTask(this, fake(layer), true));
|
| - blink::Platform::current()->currentThread()->enterRunLoop();
|
| - EXPECT_FALSE(Canvas2DLayerManager::get().m_taskObserverActive);
|
| - EXPECT_EQ(0, fake(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()->enterRunLoop();
|
| - EXPECT_FALSE(Canvas2DLayerManager::get().m_taskObserverActive);
|
| - EXPECT_EQ(1, fake(layer)->m_flushCount);
|
| -
|
| - blink::Platform::current()->currentThread()->postTask(new DeferredFrameTestTask(this, fake(layer), false));
|
| - blink::Platform::current()->currentThread()->enterRunLoop();
|
| - EXPECT_FALSE(Canvas2DLayerManager::get().m_taskObserverActive);
|
| - 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
|
| -
|
|
|