Index: cc/output/gl_renderer_unittest.cc |
diff --git a/cc/output/gl_renderer_unittest.cc b/cc/output/gl_renderer_unittest.cc |
index e2a825ae10c5854f2d7aea05761c24e5ec63d800..8017dfa4146d5ff5b9ffcb0f48d0e7fc710d71a2 100644 |
--- a/cc/output/gl_renderer_unittest.cc |
+++ b/cc/output/gl_renderer_unittest.cc |
@@ -219,7 +219,7 @@ class GLRendererTest : public testing::Test { |
CHECK(output_surface_->BindToClient(&output_surface_client_)); |
resource_provider_ = |
- ResourceProvider::Create(output_surface_.get(), 0).Pass(); |
+ ResourceProvider::Create(output_surface_.get(), 0, false, true).Pass(); |
renderer_ = make_scoped_ptr(new FakeRendererGL(&renderer_client_, |
&settings_, |
output_surface_.get(), |
@@ -310,8 +310,8 @@ class GLRendererShaderTest : public testing::Test { |
new ShaderCreatorMockGraphicsContext())).Pass(); |
CHECK(output_surface_->BindToClient(&output_surface_client_)); |
- resource_provider_ = ResourceProvider::Create(output_surface_.get(), |
- 0).Pass(); |
+ resource_provider_ = ResourceProvider::Create( |
+ output_surface_.get(), 0, false, true).Pass(); |
renderer_.reset(new FakeRendererGL(&renderer_client_, |
&settings_, |
output_surface_.get(), |
@@ -632,7 +632,7 @@ TEST(GLRendererTest2, InitializationDoesNotMakeSynchronousCalls) { |
CHECK(output_surface->BindToClient(&output_surface_client)); |
scoped_ptr<ResourceProvider> resource_provider( |
- ResourceProvider::Create(output_surface.get(), 0)); |
+ ResourceProvider::Create(output_surface.get(), 0, false, true)); |
LayerTreeSettings settings; |
FakeRendererClient renderer_client; |
@@ -677,7 +677,7 @@ TEST(GLRendererTest2, InitializationWithQuicklyLostContextDoesNotAssert) { |
CHECK(output_surface->BindToClient(&output_surface_client)); |
scoped_ptr<ResourceProvider> resource_provider( |
- ResourceProvider::Create(output_surface.get(), 0)); |
+ ResourceProvider::Create(output_surface.get(), 0, false, true)); |
LayerTreeSettings settings; |
FakeRendererClient renderer_client; |
@@ -712,7 +712,7 @@ TEST(GLRendererTest2, OpaqueBackground) { |
CHECK(output_surface->BindToClient(&output_surface_client)); |
scoped_ptr<ResourceProvider> resource_provider( |
- ResourceProvider::Create(output_surface.get(), 0)); |
+ ResourceProvider::Create(output_surface.get(), 0, false, true)); |
LayerTreeSettings settings; |
FakeRendererClient renderer_client; |
@@ -749,7 +749,7 @@ TEST(GLRendererTest2, TransparentBackground) { |
CHECK(output_surface->BindToClient(&output_surface_client)); |
scoped_ptr<ResourceProvider> resource_provider( |
- ResourceProvider::Create(output_surface.get(), 0)); |
+ ResourceProvider::Create(output_surface.get(), 0, false, true)); |
LayerTreeSettings settings; |
FakeRendererClient renderer_client; |
@@ -827,7 +827,7 @@ TEST(GLRendererTest2, VisibilityChangeIsLastCall) { |
CHECK(output_surface->BindToClient(&output_surface_client)); |
scoped_ptr<ResourceProvider> resource_provider( |
- ResourceProvider::Create(output_surface.get(), 0)); |
+ ResourceProvider::Create(output_surface.get(), 0, false, true)); |
LayerTreeSettings settings; |
FakeRendererClient renderer_client; |
@@ -887,7 +887,7 @@ TEST(GLRendererTest2, ActiveTextureState) { |
CHECK(output_surface->BindToClient(&output_surface_client)); |
scoped_ptr<ResourceProvider> resource_provider( |
- ResourceProvider::Create(output_surface.get(), 0)); |
+ ResourceProvider::Create(output_surface.get(), 0, false, true)); |
LayerTreeSettings settings; |
FakeRendererClient renderer_client; |
@@ -974,7 +974,7 @@ TEST(GLRendererTest2, ShouldClearRootRenderPass) { |
CHECK(output_surface->BindToClient(&output_surface_client)); |
scoped_ptr<ResourceProvider> resource_provider( |
- ResourceProvider::Create(output_surface.get(), 0)); |
+ ResourceProvider::Create(output_surface.get(), 0, false, true)); |
LayerTreeSettings settings; |
settings.should_clear_root_render_pass = false; |
@@ -1062,7 +1062,7 @@ TEST(GLRendererTest2, ScissorTestWhenClearing) { |
CHECK(output_surface->BindToClient(&output_surface_client)); |
scoped_ptr<ResourceProvider> resource_provider( |
- ResourceProvider::Create(output_surface.get(), 0)); |
+ ResourceProvider::Create(output_surface.get(), 0, false, true)); |
LayerTreeSettings settings; |
FakeRendererClient renderer_client; |
@@ -1165,7 +1165,7 @@ TEST(GLRendererTest2, ScissorAndViewportWithinNonreshapableSurface) { |
CHECK(output_surface->BindToClient(&output_surface_client)); |
scoped_ptr<ResourceProvider> resource_provider( |
- ResourceProvider::Create(output_surface.get(), 0)); |
+ ResourceProvider::Create(output_surface.get(), 0, false, true)); |
LayerTreeSettings settings; |
OffsetViewportRendererClient renderer_client; |
@@ -1207,9 +1207,9 @@ TEST_F(GLRendererShaderTest, DrawRenderPassQuadShaderPermutations) { |
cc::ResourceProvider::ResourceId mask = |
resource_provider_->CreateResource(gfx::Size(20, 12), |
- resource_provider_->best_texture_format(), |
GL_CLAMP_TO_EDGE, |
- ResourceProvider::TextureUsageAny); |
+ ResourceProvider::TextureUsageAny, |
+ resource_provider_->best_texture_format()); |
resource_provider_->AllocateForTesting(mask); |
SkScalar matrix[20]; |
@@ -1514,7 +1514,8 @@ class MockOutputSurfaceTest : public testing::Test, public FakeRendererClient { |
FakeOutputSurfaceClient output_surface_client_; |
CHECK(output_surface_.BindToClient(&output_surface_client_)); |
- resource_provider_ = ResourceProvider::Create(&output_surface_, 0).Pass(); |
+ resource_provider_ = |
+ ResourceProvider::Create(&output_surface_, 0, false, true).Pass(); |
renderer_.reset(new FakeRendererGL( |
this, &settings_, &output_surface_, resource_provider_.get())); |