| Index: cc/gl_renderer_unittest.cc
|
| diff --git a/cc/gl_renderer_unittest.cc b/cc/gl_renderer_unittest.cc
|
| index 1ed21b0d788a03911e89b664423d74c1a57295f2..a2ae5d56629deb58fc8fd8f4a1579eac1f9471b3 100644
|
| --- a/cc/gl_renderer_unittest.cc
|
| +++ b/cc/gl_renderer_unittest.cc
|
| @@ -126,7 +126,7 @@ protected:
|
|
|
| virtual void SetUp()
|
| {
|
| - m_renderer.initialize();
|
| + m_renderer.initialize(m_resourceProvider.get());
|
| }
|
|
|
| void swapBuffers()
|
| @@ -304,7 +304,7 @@ TEST(GLRendererTest2, initializationDoesNotMakeSynchronousCalls)
|
| scoped_ptr<ResourceProvider> resourceProvider(ResourceProvider::create(context.get()));
|
| FakeRendererGL renderer(&mockClient, resourceProvider.get());
|
|
|
| - EXPECT_TRUE(renderer.initialize());
|
| + EXPECT_TRUE(renderer.initialize(resourceProvider.get()));
|
| }
|
|
|
| class LoseContextOnFirstGetContext : public FakeWebGraphicsContext3D {
|
| @@ -347,7 +347,7 @@ TEST(GLRendererTest2, initializationWithQuicklyLostContextDoesNotAssert)
|
| scoped_ptr<ResourceProvider> resourceProvider(ResourceProvider::create(context.get()));
|
| FakeRendererGL renderer(&mockClient, resourceProvider.get());
|
|
|
| - renderer.initialize();
|
| + renderer.initialize(resourceProvider.get());
|
| }
|
|
|
| class ContextThatDoesNotSupportMemoryManagmentExtensions : public FakeWebGraphicsContext3D {
|
| @@ -369,7 +369,7 @@ TEST(GLRendererTest2, initializationWithoutGpuMemoryManagerExtensionSupportShoul
|
| scoped_ptr<ResourceProvider> resourceProvider(ResourceProvider::create(outputSurface.get()));
|
| FakeRendererGL renderer(&mockClient, resourceProvider.get());
|
|
|
| - renderer.initialize();
|
| + renderer.initialize(resourceProvider.get());
|
|
|
| EXPECT_GT(mockClient.memoryAllocationLimitBytes(), 0ul);
|
| }
|
| @@ -399,7 +399,7 @@ TEST(GLRendererTest2, opaqueBackground)
|
|
|
| mockClient.rootRenderPass()->has_transparent_background = false;
|
|
|
| - EXPECT_TRUE(renderer.initialize());
|
| + EXPECT_TRUE(renderer.initialize(resourceProvider.get()));
|
|
|
| renderer.drawFrame(mockClient.renderPassesInDrawOrder(), mockClient.renderPasses());
|
|
|
| @@ -422,7 +422,7 @@ TEST(GLRendererTest2, transparentBackground)
|
|
|
| mockClient.rootRenderPass()->has_transparent_background = true;
|
|
|
| - EXPECT_TRUE(renderer.initialize());
|
| + EXPECT_TRUE(renderer.initialize(resourceProvider.get()));
|
|
|
| renderer.drawFrame(mockClient.renderPassesInDrawOrder(), mockClient.renderPasses());
|
|
|
| @@ -471,7 +471,7 @@ TEST(GLRendererTest2, visibilityChangeIsLastCall)
|
| scoped_ptr<ResourceProvider> resourceProvider(ResourceProvider::create(outputSurface.get()));
|
| FakeRendererGL renderer(&mockClient, resourceProvider.get());
|
|
|
| - EXPECT_TRUE(renderer.initialize());
|
| + EXPECT_TRUE(renderer.initialize(resourceProvider.get()));
|
|
|
| bool lastCallWasSetVisiblity = false;
|
| // Ensure that the call to setVisibilityCHROMIUM is the last call issue to the GPU
|
| @@ -525,7 +525,7 @@ TEST(GLRendererTest2, activeTextureState)
|
|
|
| // During initialization we are allowed to set any texture parameters.
|
| EXPECT_CALL(*context, texParameteri(_, _, _)).Times(AnyNumber());
|
| - EXPECT_TRUE(renderer.initialize());
|
| + EXPECT_TRUE(renderer.initialize(resourceProvider.get()));
|
|
|
| cc::RenderPass::Id id(1, 1);
|
| scoped_ptr<TestRenderPass> pass = TestRenderPass::Create();
|
|
|