| Index: cc/output/gl_renderer_unittest.cc
|
| diff --git a/cc/output/gl_renderer_unittest.cc b/cc/output/gl_renderer_unittest.cc
|
| index 2ac339d726745fb093c4c2e1c28c7d6c4976f5f8..16db9b48ef8d3388e8b4025e6455fbbfe47a76f8 100644
|
| --- a/cc/output/gl_renderer_unittest.cc
|
| +++ b/cc/output/gl_renderer_unittest.cc
|
| @@ -200,13 +200,10 @@ 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(),
|
| - NULL,
|
| - NULL,
|
| - 0,
|
| - false,
|
| - 1).Pass();
|
| + resource_provider_ =
|
| + ResourceProvider::Create(output_surface_.get(),
|
| + shared_bitmap_manager_.get(), NULL, NULL, 0,
|
| + false, false, 1).Pass();
|
| renderer_ = make_scoped_ptr(new FakeRendererGL(&renderer_client_,
|
| &settings_,
|
| output_surface_.get(),
|
| @@ -236,13 +233,10 @@ 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(),
|
| - NULL,
|
| - NULL,
|
| - 0,
|
| - false,
|
| - 1).Pass();
|
| + resource_provider_ =
|
| + ResourceProvider::Create(output_surface_.get(),
|
| + shared_bitmap_manager_.get(), NULL, NULL, 0,
|
| + false, false, 1).Pass();
|
| renderer_.reset(new FakeRendererGL(&renderer_client_,
|
| &settings_,
|
| output_surface_.get(),
|
| @@ -534,14 +528,9 @@ 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(),
|
| - NULL,
|
| - NULL,
|
| - 0,
|
| - false,
|
| - 1));
|
| + scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(
|
| + output_surface.get(), shared_bitmap_manager.get(), NULL, NULL, 0, false,
|
| + false, 1));
|
|
|
| RendererSettings settings;
|
| FakeRendererClient renderer_client;
|
| @@ -574,14 +563,9 @@ 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(),
|
| - NULL,
|
| - NULL,
|
| - 0,
|
| - false,
|
| - 1));
|
| + scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(
|
| + output_surface.get(), shared_bitmap_manager.get(), NULL, NULL, 0, false,
|
| + false, 1));
|
|
|
| RendererSettings settings;
|
| FakeRendererClient renderer_client;
|
| @@ -613,14 +597,9 @@ 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(),
|
| - NULL,
|
| - NULL,
|
| - 0,
|
| - false,
|
| - 1));
|
| + scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(
|
| + output_surface.get(), shared_bitmap_manager.get(), NULL, NULL, 0, false,
|
| + false, 1));
|
|
|
| RendererSettings settings;
|
| FakeRendererClient renderer_client;
|
| @@ -665,14 +644,9 @@ 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(),
|
| - NULL,
|
| - NULL,
|
| - 0,
|
| - false,
|
| - 1));
|
| + scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(
|
| + output_surface.get(), shared_bitmap_manager.get(), NULL, NULL, 0, false,
|
| + false, 1));
|
|
|
| RendererSettings settings;
|
| FakeRendererClient renderer_client;
|
| @@ -710,14 +684,9 @@ 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(),
|
| - NULL,
|
| - NULL,
|
| - 0,
|
| - false,
|
| - 1));
|
| + scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(
|
| + output_surface.get(), shared_bitmap_manager.get(), NULL, NULL, 0, false,
|
| + false, 1));
|
|
|
| RendererSettings settings;
|
| FakeRendererClient renderer_client;
|
| @@ -795,14 +764,9 @@ 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(),
|
| - NULL,
|
| - NULL,
|
| - 0,
|
| - false,
|
| - 1));
|
| + scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(
|
| + output_surface.get(), shared_bitmap_manager.get(), NULL, NULL, 0, false,
|
| + false, 1));
|
|
|
| RendererSettings settings;
|
| FakeRendererClient renderer_client;
|
| @@ -866,14 +830,9 @@ 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(),
|
| - NULL,
|
| - NULL,
|
| - 0,
|
| - false,
|
| - 1));
|
| + scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(
|
| + output_surface.get(), shared_bitmap_manager.get(), NULL, NULL, 0, false,
|
| + false, 1));
|
|
|
| RendererSettings settings;
|
| FakeRendererClient renderer_client;
|
| @@ -957,14 +916,9 @@ 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(),
|
| - NULL,
|
| - NULL,
|
| - 0,
|
| - false,
|
| - 1));
|
| + scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(
|
| + output_surface.get(), shared_bitmap_manager.get(), NULL, NULL, 0, false,
|
| + false, 1));
|
|
|
| RendererSettings settings;
|
| settings.should_clear_root_render_pass = false;
|
| @@ -1055,14 +1009,9 @@ 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(),
|
| - NULL,
|
| - NULL,
|
| - 0,
|
| - false,
|
| - 1));
|
| + scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(
|
| + output_surface.get(), shared_bitmap_manager.get(), NULL, NULL, 0, false,
|
| + false, 1));
|
|
|
| RendererSettings settings;
|
| FakeRendererClient renderer_client;
|
| @@ -1153,14 +1102,9 @@ 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(),
|
| - NULL,
|
| - NULL,
|
| - 0,
|
| - false,
|
| - 1));
|
| + scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(
|
| + output_surface.get(), shared_bitmap_manager.get(), NULL, NULL, 0, false,
|
| + false, 1));
|
|
|
| RendererSettings settings;
|
| settings.partial_swap_enabled = true;
|
| @@ -1342,14 +1286,9 @@ 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(),
|
| - NULL,
|
| - NULL,
|
| - 0,
|
| - false,
|
| - 1));
|
| + scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(
|
| + output_surface.get(), shared_bitmap_manager.get(), NULL, NULL, 0, false,
|
| + false, 1));
|
|
|
| RendererSettings settings;
|
| FakeRendererClient renderer_client;
|
| @@ -1764,13 +1703,9 @@ 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(),
|
| - NULL,
|
| - NULL,
|
| - 0,
|
| - false,
|
| - 1).Pass();
|
| + resource_provider_ =
|
| + ResourceProvider::Create(&output_surface_, shared_bitmap_manager_.get(),
|
| + NULL, NULL, 0, false, false, 1).Pass();
|
|
|
| renderer_.reset(new FakeRendererGL(&renderer_client_,
|
| &settings_,
|
|
|