cc/CCRendererGLTest.cpp - Issue 10961008: cc: Remove TextureUploaderOption.

Unified Diff: cc/CCRendererGLTest.cpp

Issue 10961008: cc: Remove TextureUploaderOption. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Settle for removing TextureUploaderOption in this CL. I'll figure out what to do with the uploader … Created 8 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: cc/CCRendererGLTest.cpp

diff --git a/cc/CCRendererGLTest.cpp b/cc/CCRendererGLTest.cpp

index 14986e628dce7e8aa1e92bb5c3a99cbe6de9958f..f3a1f0e8f01e5fe66aefa959e1f74f09fff9e62a 100644

--- a/cc/CCRendererGLTest.cpp

+++ b/cc/CCRendererGLTest.cpp

@@ -113,7 +113,7 @@ protected:

, m_suggestHaveBackbufferNo(1, false)

, m_compositorInitializer(0)

, m_context(FakeWebCompositorOutputSurface::create(adoptPtr(new FrameCountingMemoryAllocationSettingContext())))

- , m_resourceProvider(CCResourceProvider::create(m_context.get(), UnthrottledUploader))

+ , m_resourceProvider(CCResourceProvider::create(m_context.get()))

, m_renderer(&m_mockClient, m_resourceProvider.get())

{

}

@@ -298,7 +298,7 @@ TEST(CCRendererGLTest2, initializationDoesNotMakeSynchronousCalls)

CCScopedSettings scopedSettings;

FakeCCRendererClient mockClient;

OwnPtr<CCGraphicsContext> context(FakeWebCompositorOutputSurface::create(adoptPtr(new ForbidSynchronousCallContext)));

- OwnPtr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get(), UnthrottledUploader));

+ OwnPtr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get()));

FakeCCRendererGL renderer(&mockClient, resourceProvider.get());

EXPECT_TRUE(renderer.initialize());

@@ -342,7 +342,7 @@ TEST(CCRendererGLTest2, initializationWithQuicklyLostContextDoesNotAssert)

CCScopedSettings scopedSettings;

FakeCCRendererClient mockClient;

OwnPtr<CCGraphicsContext> context(FakeWebCompositorOutputSurface::create(adoptPtr(new LoseContextOnFirstGetContext)));

- OwnPtr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get(), UnthrottledUploader));

+ OwnPtr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get()));

FakeCCRendererGL renderer(&mockClient, resourceProvider.get());

renderer.initialize();

@@ -364,7 +364,7 @@ TEST(CCRendererGLTest2, initializationWithoutGpuMemoryManagerExtensionSupportSho

{

FakeCCRendererClient mockClient;

OwnPtr<CCGraphicsContext> context(FakeWebCompositorOutputSurface::create(adoptPtr(new ContextThatDoesNotSupportMemoryManagmentExtensions)));

- OwnPtr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get(), UnthrottledUploader));

+ OwnPtr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get()));

FakeCCRendererGL renderer(&mockClient, resourceProvider.get());

renderer.initialize();

@@ -392,7 +392,7 @@ TEST(CCRendererGLTest2, opaqueBackground)

FakeCCRendererClient mockClient;

OwnPtr<CCGraphicsContext> ccContext(FakeWebCompositorOutputSurface::create(adoptPtr(new ClearCountingContext)));

ClearCountingContext* context = static_cast<ClearCountingContext*>(ccContext->context3D());

- OwnPtr<CCResourceProvider> resourceProvider(CCResourceProvider::create(ccContext.get(), UnthrottledUploader));

+ OwnPtr<CCResourceProvider> resourceProvider(CCResourceProvider::create(ccContext.get()));

FakeCCRendererGL renderer(&mockClient, resourceProvider.get());

mockClient.rootRenderPass()->setHasTransparentBackground(false);

@@ -415,7 +415,7 @@ TEST(CCRendererGLTest2, transparentBackground)

FakeCCRendererClient mockClient;

OwnPtr<CCGraphicsContext> ccContext(FakeWebCompositorOutputSurface::create(adoptPtr(new ClearCountingContext)));

ClearCountingContext* context = static_cast<ClearCountingContext*>(ccContext->context3D());

- OwnPtr<CCResourceProvider> resourceProvider(CCResourceProvider::create(ccContext.get(), UnthrottledUploader));

+ OwnPtr<CCResourceProvider> resourceProvider(CCResourceProvider::create(ccContext.get()));

FakeCCRendererGL renderer(&mockClient, resourceProvider.get());

mockClient.rootRenderPass()->setHasTransparentBackground(true);

« no previous file with comments | « cc/CCPrioritizedTextureTest.cpp ('k') | cc/CCResourceProvider.h » ('j') | no next file with comments »