Index: cc/output/gl_renderer_unittest.cc |
diff --git a/cc/output/gl_renderer_unittest.cc b/cc/output/gl_renderer_unittest.cc |
index 41fa60ef63aa132256c45121319051d4d69abbd5..4befaf51e28e19eca6deacb42e8025f25c51fedb 100644 |
--- a/cc/output/gl_renderer_unittest.cc |
+++ b/cc/output/gl_renderer_unittest.cc |
@@ -153,10 +153,13 @@ class GLRendererWithDefaultHarnessTest : public GLRendererTest { |
CHECK(output_surface_->BindToClient(&output_surface_client_)); |
shared_bitmap_manager_.reset(new TestSharedBitmapManager()); |
- resource_provider_ = |
- ResourceProvider::Create( |
- output_surface_.get(), shared_bitmap_manager_.get(), 0, false, 1, |
- false).Pass(); |
+ resource_provider_ = ResourceProvider::Create(output_surface_.get(), |
+ shared_bitmap_manager_.get(), |
+ NULL, |
+ 0, |
+ false, |
+ 1, |
+ false).Pass(); |
renderer_ = make_scoped_ptr(new FakeRendererGL(&renderer_client_, |
&settings_, |
output_surface_.get(), |
@@ -186,10 +189,13 @@ class GLRendererShaderTest : public GLRendererTest { |
CHECK(output_surface_->BindToClient(&output_surface_client_)); |
shared_bitmap_manager_.reset(new TestSharedBitmapManager()); |
- resource_provider_ = |
- ResourceProvider::Create( |
- output_surface_.get(), shared_bitmap_manager_.get(), 0, false, 1, |
- false).Pass(); |
+ resource_provider_ = ResourceProvider::Create(output_surface_.get(), |
+ shared_bitmap_manager_.get(), |
+ NULL, |
+ 0, |
+ false, |
+ 1, |
+ false).Pass(); |
renderer_.reset(new FakeRendererGL(&renderer_client_, |
&settings_, |
output_surface_.get(), |
@@ -475,8 +481,14 @@ TEST_F(GLRendererTest, InitializationDoesNotMakeSynchronousCalls) { |
scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
new TestSharedBitmapManager()); |
- scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( |
- output_surface.get(), shared_bitmap_manager.get(), 0, false, 1, false)); |
+ scoped_ptr<ResourceProvider> resource_provider( |
+ ResourceProvider::Create(output_surface.get(), |
+ shared_bitmap_manager.get(), |
+ NULL, |
+ 0, |
+ false, |
+ 1, |
+ false)); |
LayerTreeSettings settings; |
FakeRendererClient renderer_client; |
@@ -511,8 +523,14 @@ TEST_F(GLRendererTest, InitializationWithQuicklyLostContextDoesNotAssert) { |
scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
new TestSharedBitmapManager()); |
- scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( |
- output_surface.get(), shared_bitmap_manager.get(), 0, false, 1, false)); |
+ scoped_ptr<ResourceProvider> resource_provider( |
+ ResourceProvider::Create(output_surface.get(), |
+ shared_bitmap_manager.get(), |
+ NULL, |
+ 0, |
+ false, |
+ 1, |
+ false)); |
LayerTreeSettings settings; |
FakeRendererClient renderer_client; |
@@ -544,8 +562,14 @@ TEST_F(GLRendererTest, OpaqueBackground) { |
scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
new TestSharedBitmapManager()); |
- scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( |
- output_surface.get(), shared_bitmap_manager.get(), 0, false, 1, false)); |
+ scoped_ptr<ResourceProvider> resource_provider( |
+ ResourceProvider::Create(output_surface.get(), |
+ shared_bitmap_manager.get(), |
+ NULL, |
+ 0, |
+ false, |
+ 1, |
+ false)); |
LayerTreeSettings settings; |
FakeRendererClient renderer_client; |
@@ -590,8 +614,14 @@ TEST_F(GLRendererTest, TransparentBackground) { |
scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
new TestSharedBitmapManager()); |
- scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( |
- output_surface.get(), shared_bitmap_manager.get(), 0, false, 1, false)); |
+ scoped_ptr<ResourceProvider> resource_provider( |
+ ResourceProvider::Create(output_surface.get(), |
+ shared_bitmap_manager.get(), |
+ NULL, |
+ 0, |
+ false, |
+ 1, |
+ false)); |
LayerTreeSettings settings; |
FakeRendererClient renderer_client; |
@@ -629,8 +659,14 @@ TEST_F(GLRendererTest, OffscreenOutputSurface) { |
scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
new TestSharedBitmapManager()); |
- scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( |
- output_surface.get(), shared_bitmap_manager.get(), 0, false, 1, false)); |
+ scoped_ptr<ResourceProvider> resource_provider( |
+ ResourceProvider::Create(output_surface.get(), |
+ shared_bitmap_manager.get(), |
+ NULL, |
+ 0, |
+ false, |
+ 1, |
+ false)); |
LayerTreeSettings settings; |
FakeRendererClient renderer_client; |
@@ -710,8 +746,14 @@ TEST_F(GLRendererTest, VisibilityChangeIsLastCall) { |
scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
new TestSharedBitmapManager()); |
- scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( |
- output_surface.get(), shared_bitmap_manager.get(), 0, false, 1, false)); |
+ scoped_ptr<ResourceProvider> resource_provider( |
+ ResourceProvider::Create(output_surface.get(), |
+ shared_bitmap_manager.get(), |
+ NULL, |
+ 0, |
+ false, |
+ 1, |
+ false)); |
LayerTreeSettings settings; |
FakeRendererClient renderer_client; |
@@ -775,8 +817,14 @@ TEST_F(GLRendererTest, ActiveTextureState) { |
scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
new TestSharedBitmapManager()); |
- scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( |
- output_surface.get(), shared_bitmap_manager.get(), 0, false, 1, false)); |
+ scoped_ptr<ResourceProvider> resource_provider( |
+ ResourceProvider::Create(output_surface.get(), |
+ shared_bitmap_manager.get(), |
+ NULL, |
+ 0, |
+ false, |
+ 1, |
+ false)); |
LayerTreeSettings settings; |
FakeRendererClient renderer_client; |
@@ -860,8 +908,14 @@ TEST_F(GLRendererTest, ShouldClearRootRenderPass) { |
scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
new TestSharedBitmapManager()); |
- scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( |
- output_surface.get(), shared_bitmap_manager.get(), 0, false, 1, false)); |
+ scoped_ptr<ResourceProvider> resource_provider( |
+ ResourceProvider::Create(output_surface.get(), |
+ shared_bitmap_manager.get(), |
+ NULL, |
+ 0, |
+ false, |
+ 1, |
+ false)); |
LayerTreeSettings settings; |
settings.should_clear_root_render_pass = false; |
@@ -952,8 +1006,14 @@ TEST_F(GLRendererTest, ScissorTestWhenClearing) { |
scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
new TestSharedBitmapManager()); |
- scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( |
- output_surface.get(), shared_bitmap_manager.get(), 0, false, 1, false)); |
+ scoped_ptr<ResourceProvider> resource_provider( |
+ ResourceProvider::Create(output_surface.get(), |
+ shared_bitmap_manager.get(), |
+ NULL, |
+ 0, |
+ false, |
+ 1, |
+ false)); |
LayerTreeSettings settings; |
FakeRendererClient renderer_client; |
@@ -1045,8 +1105,14 @@ TEST_F(GLRendererTest, NoDiscardOnPartialUpdates) { |
scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
new TestSharedBitmapManager()); |
- scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( |
- output_surface.get(), shared_bitmap_manager.get(), 0, false, 1, false)); |
+ scoped_ptr<ResourceProvider> resource_provider( |
+ ResourceProvider::Create(output_surface.get(), |
+ shared_bitmap_manager.get(), |
+ NULL, |
+ 0, |
+ false, |
+ 1, |
+ false)); |
LayerTreeSettings settings; |
settings.partial_swap_enabled = true; |
@@ -1230,8 +1296,14 @@ TEST_F(GLRendererTest, ScissorAndViewportWithinNonreshapableSurface) { |
scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
new TestSharedBitmapManager()); |
- scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( |
- output_surface.get(), shared_bitmap_manager.get(), 0, false, 1, false)); |
+ scoped_ptr<ResourceProvider> resource_provider( |
+ ResourceProvider::Create(output_surface.get(), |
+ shared_bitmap_manager.get(), |
+ NULL, |
+ 0, |
+ false, |
+ 1, |
+ false)); |
LayerTreeSettings settings; |
FakeRendererClient renderer_client; |
@@ -1604,10 +1676,13 @@ class MockOutputSurfaceTest : public GLRendererTest { |
CHECK(output_surface_.BindToClient(&output_surface_client_)); |
shared_bitmap_manager_.reset(new TestSharedBitmapManager()); |
- resource_provider_ = |
- ResourceProvider::Create( |
- &output_surface_, shared_bitmap_manager_.get(), 0, false, 1, false) |
- .Pass(); |
+ resource_provider_ = ResourceProvider::Create(&output_surface_, |
+ shared_bitmap_manager_.get(), |
+ NULL, |
+ 0, |
+ false, |
+ 1, |
+ false).Pass(); |
renderer_.reset(new FakeRendererGL(&renderer_client_, |
&settings_, |