| 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 18e117a0bc0032df40c4ea7e1066f1a7aae2d955..9d59397432f319c186b4fa6826872a62283219dd 100644
|
| --- a/cc/trees/layer_tree_host_unittest.cc
|
| +++ b/cc/trees/layer_tree_host_unittest.cc
|
| @@ -40,6 +40,7 @@
|
| #include "cc/test/fake_video_frame_provider.h"
|
| #include "cc/test/geometry_test_utils.h"
|
| #include "cc/test/layer_tree_test.h"
|
| +#include "cc/test/test_shared_bitmap_manager.h"
|
| #include "cc/test/test_web_graphics_context_3d.h"
|
| #include "cc/trees/layer_tree_host_impl.h"
|
| #include "cc/trees/layer_tree_impl.h"
|
| @@ -2441,8 +2442,10 @@ TEST(LayerTreeHostTest, PartialUpdatesWithGLRenderer) {
|
| LayerTreeSettings settings;
|
| settings.max_partial_texture_updates = 4;
|
|
|
| - scoped_ptr<LayerTreeHost> host =
|
| - LayerTreeHost::CreateSingleThreaded(&client, &client, NULL, settings);
|
| + scoped_ptr<SharedBitmapManager> shared_bitmap_manager(
|
| + new TestSharedBitmapManager());
|
| + scoped_ptr<LayerTreeHost> host = LayerTreeHost::CreateSingleThreaded(
|
| + &client, &client, shared_bitmap_manager.get(), settings);
|
| EXPECT_TRUE(host->InitializeOutputSurfaceIfNeeded());
|
| EXPECT_EQ(4u, host->settings().max_partial_texture_updates);
|
| }
|
| @@ -2453,8 +2456,10 @@ TEST(LayerTreeHostTest, PartialUpdatesWithSoftwareRenderer) {
|
| LayerTreeSettings settings;
|
| settings.max_partial_texture_updates = 4;
|
|
|
| - scoped_ptr<LayerTreeHost> host =
|
| - LayerTreeHost::CreateSingleThreaded(&client, &client, NULL, settings);
|
| + scoped_ptr<SharedBitmapManager> shared_bitmap_manager(
|
| + new TestSharedBitmapManager());
|
| + scoped_ptr<LayerTreeHost> host = LayerTreeHost::CreateSingleThreaded(
|
| + &client, &client, shared_bitmap_manager.get(), settings);
|
| EXPECT_TRUE(host->InitializeOutputSurfaceIfNeeded());
|
| EXPECT_EQ(4u, host->settings().max_partial_texture_updates);
|
| }
|
| @@ -2465,8 +2470,10 @@ TEST(LayerTreeHostTest, PartialUpdatesWithDelegatingRendererAndGLContent) {
|
| LayerTreeSettings settings;
|
| settings.max_partial_texture_updates = 4;
|
|
|
| - scoped_ptr<LayerTreeHost> host =
|
| - LayerTreeHost::CreateSingleThreaded(&client, &client, NULL, settings);
|
| + scoped_ptr<SharedBitmapManager> shared_bitmap_manager(
|
| + new TestSharedBitmapManager());
|
| + scoped_ptr<LayerTreeHost> host = LayerTreeHost::CreateSingleThreaded(
|
| + &client, &client, shared_bitmap_manager.get(), settings);
|
| EXPECT_TRUE(host->InitializeOutputSurfaceIfNeeded());
|
| EXPECT_EQ(0u, host->MaxPartialTextureUpdates());
|
| }
|
| @@ -2478,8 +2485,10 @@ TEST(LayerTreeHostTest,
|
| LayerTreeSettings settings;
|
| settings.max_partial_texture_updates = 4;
|
|
|
| - scoped_ptr<LayerTreeHost> host =
|
| - LayerTreeHost::CreateSingleThreaded(&client, &client, NULL, settings);
|
| + scoped_ptr<SharedBitmapManager> shared_bitmap_manager(
|
| + new TestSharedBitmapManager());
|
| + scoped_ptr<LayerTreeHost> host = LayerTreeHost::CreateSingleThreaded(
|
| + &client, &client, shared_bitmap_manager.get(), settings);
|
| EXPECT_TRUE(host->InitializeOutputSurfaceIfNeeded());
|
| EXPECT_EQ(0u, host->MaxPartialTextureUpdates());
|
| }
|
|
|