| Index: cc/trees/layer_tree_host_unittest.cc
|
| diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
|
| index b818f20743b0ca9b7ece40ef3e74867b53f2b781..d394c3fca2e62a1dbd3110b2c84066c00133e537 100644
|
| --- a/cc/trees/layer_tree_host_unittest.cc
|
| +++ b/cc/trees/layer_tree_host_unittest.cc
|
| @@ -2092,7 +2092,6 @@ TEST(LayerTreeHostTest, LimitPartialUpdates) {
|
| settings.max_partial_texture_updates = 10;
|
|
|
| LayerTreeHostWithProxy host(&client, settings, proxy.Pass());
|
| - host.OnCreateAndInitializeOutputSurfaceAttempted(true);
|
|
|
| EXPECT_EQ(0u, host.MaxPartialTextureUpdates());
|
| }
|
| @@ -2110,7 +2109,6 @@ TEST(LayerTreeHostTest, LimitPartialUpdates) {
|
| settings.max_partial_texture_updates = 10;
|
|
|
| LayerTreeHostWithProxy host(&client, settings, proxy.Pass());
|
| - host.OnCreateAndInitializeOutputSurfaceAttempted(true);
|
|
|
| EXPECT_EQ(5u, host.MaxPartialTextureUpdates());
|
| }
|
| @@ -2128,7 +2126,6 @@ TEST(LayerTreeHostTest, LimitPartialUpdates) {
|
| settings.max_partial_texture_updates = 10;
|
|
|
| LayerTreeHostWithProxy host(&client, settings, proxy.Pass());
|
| - host.OnCreateAndInitializeOutputSurfaceAttempted(true);
|
|
|
| EXPECT_EQ(10u, host.MaxPartialTextureUpdates());
|
| }
|
| @@ -2690,8 +2687,7 @@ class MockIOSurfaceWebGraphicsContext3D : public TestWebGraphicsContext3D {
|
|
|
| class LayerTreeHostTestIOSurfaceDrawing : public LayerTreeHostTest {
|
| protected:
|
| - scoped_ptr<FakeOutputSurface> CreateFakeOutputSurface(
|
| - bool fallback) override {
|
| + scoped_ptr<FakeOutputSurface> CreateFakeOutputSurface() override {
|
| scoped_ptr<MockIOSurfaceWebGraphicsContext3D> mock_context_owned(
|
| new MockIOSurfaceWebGraphicsContext3D);
|
| mock_context_ = mock_context_owned.get();
|
| @@ -2885,8 +2881,7 @@ class LayerTreeHostTestDeferredInitialize : public LayerTreeHostTest {
|
| PostSetNeedsCommitToMainThread();
|
| }
|
|
|
| - scoped_ptr<FakeOutputSurface> CreateFakeOutputSurface(
|
| - bool fallback) override {
|
| + scoped_ptr<FakeOutputSurface> CreateFakeOutputSurface() override {
|
| scoped_ptr<TestWebGraphicsContext3D> context3d(
|
| TestWebGraphicsContext3D::Create());
|
|
|
| @@ -4404,8 +4399,7 @@ class LayerTreeHostTestMaxTransferBufferUsageBytes : public LayerTreeHostTest {
|
| settings->use_one_copy = false;
|
| }
|
|
|
| - scoped_ptr<FakeOutputSurface> CreateFakeOutputSurface(
|
| - bool fallback) override {
|
| + scoped_ptr<FakeOutputSurface> CreateFakeOutputSurface() override {
|
| scoped_refptr<TestContextProvider> context_provider =
|
| TestContextProvider::Create();
|
| context_provider->SetMaxTransferBufferUsageBytes(512 * 512);
|
| @@ -4546,8 +4540,7 @@ class LayerTreeHostTestSetMemoryPolicyOnLostOutputSurface
|
| : first_output_surface_memory_limit_(4321234),
|
| second_output_surface_memory_limit_(1234321) {}
|
|
|
| - scoped_ptr<FakeOutputSurface> CreateFakeOutputSurface(
|
| - bool fallback) override {
|
| + scoped_ptr<FakeOutputSurface> CreateFakeOutputSurface() override {
|
| if (!first_context_provider_.get()) {
|
| first_context_provider_ = TestContextProvider::Create();
|
| } else {
|
| @@ -5738,8 +5731,7 @@ class LayerTreeHostTestCrispUpAfterPinchEndsWithOneCopy
|
| settings->use_one_copy = true;
|
| }
|
|
|
| - scoped_ptr<FakeOutputSurface> CreateFakeOutputSurface(
|
| - bool fallback) override {
|
| + scoped_ptr<FakeOutputSurface> CreateFakeOutputSurface() override {
|
| scoped_ptr<TestWebGraphicsContext3D> context3d =
|
| TestWebGraphicsContext3D::Create();
|
| context3d->set_support_image(true);
|
|
|