| Index: Source/core/platform/graphics/chromium/Canvas2DLayerManagerTest.cpp
|
| diff --git a/Source/core/platform/graphics/chromium/Canvas2DLayerManagerTest.cpp b/Source/core/platform/graphics/chromium/Canvas2DLayerManagerTest.cpp
|
| index c6d7398d728c4656c64184d73c0d2859602f4730..c027a92aec047d3ec2e345e5ca2795c3432f0cb3 100644
|
| --- a/Source/core/platform/graphics/chromium/Canvas2DLayerManagerTest.cpp
|
| +++ b/Source/core/platform/graphics/chromium/Canvas2DLayerManagerTest.cpp
|
| @@ -106,7 +106,7 @@ protected:
|
| Canvas2DLayerManager& manager = Canvas2DLayerManager::get();
|
| manager.init(10, 10);
|
| {
|
| - RefPtr<GraphicsContext3D> context = GraphicsContext3D::createGraphicsContextFromWebContext(adoptPtr(new WebKit::FakeWebGraphicsContext3D));
|
| + 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);
|
| @@ -133,7 +133,7 @@ protected:
|
|
|
| void evictionTest()
|
| {
|
| - RefPtr<GraphicsContext3D> context = GraphicsContext3D::createGraphicsContextFromWebContext(adoptPtr(new WebKit::FakeWebGraphicsContext3D));
|
| + RefPtr<GraphicsContext3D> context = GraphicsContext3D::createGraphicsContextFromWebContext(adoptPtr(new blink::FakeWebGraphicsContext3D));
|
| Canvas2DLayerManager& manager = Canvas2DLayerManager::get();
|
| manager.init(10, 5);
|
| RefPtr<SkDeferredCanvas> canvas(createCanvas(context.get()));
|
| @@ -150,7 +150,7 @@ protected:
|
|
|
| void flushEvictionTest()
|
| {
|
| - RefPtr<GraphicsContext3D> context = GraphicsContext3D::createGraphicsContextFromWebContext(adoptPtr(new WebKit::FakeWebGraphicsContext3D));
|
| + RefPtr<GraphicsContext3D> context = GraphicsContext3D::createGraphicsContextFromWebContext(adoptPtr(new blink::FakeWebGraphicsContext3D));
|
| Canvas2DLayerManager& manager = Canvas2DLayerManager::get();
|
| manager.init(10, 5);
|
| RefPtr<SkDeferredCanvas> canvas(createCanvas(context.get()));
|
| @@ -177,10 +177,10 @@ protected:
|
| layer->storageAllocatedForRecordingChanged(0);
|
| layer->skippedPendingDrawCommands();
|
| }
|
| - WebKit::Platform::current()->currentThread()->exitRunLoop();
|
| + blink::Platform::current()->currentThread()->exitRunLoop();
|
| }
|
|
|
| - class DeferredFrameTestTask : public WebKit::WebThread::Task {
|
| + class DeferredFrameTestTask : public blink::WebThread::Task {
|
| public:
|
| DeferredFrameTestTask(Canvas2DLayerManagerTest* test, FakeCanvas2DLayerBridge* layer, bool skipCommands)
|
| {
|
| @@ -201,36 +201,36 @@ protected:
|
|
|
| void deferredFrameTest()
|
| {
|
| - RefPtr<GraphicsContext3D> context = GraphicsContext3D::createGraphicsContextFromWebContext(adoptPtr(new WebKit::FakeWebGraphicsContext3D));
|
| + 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())));
|
| - WebKit::Platform::current()->currentThread()->postTask(new DeferredFrameTestTask(this, fake(layer), true));
|
| - WebKit::Platform::current()->currentThread()->enterRunLoop();
|
| + 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
|
| - WebKit::Platform::current()->currentThread()->postTask(new DeferredFrameTestTask(this, fake(layer), true));
|
| - WebKit::Platform::current()->currentThread()->enterRunLoop();
|
| + 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);
|
|
|
| - WebKit::Platform::current()->currentThread()->postTask(new DeferredFrameTestTask(this, fake(layer), true));
|
| - WebKit::Platform::current()->currentThread()->enterRunLoop();
|
| + 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.
|
| - WebKit::Platform::current()->currentThread()->postTask(new DeferredFrameTestTask(this, fake(layer), false));
|
| - WebKit::Platform::current()->currentThread()->enterRunLoop();
|
| + 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);
|
|
|
| - WebKit::Platform::current()->currentThread()->postTask(new DeferredFrameTestTask(this, fake(layer), false));
|
| - WebKit::Platform::current()->currentThread()->enterRunLoop();
|
| + 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);
|
| }
|
|
|