| Index: cc/layer_tree_host_unittest.cc
|
| diff --git a/cc/layer_tree_host_unittest.cc b/cc/layer_tree_host_unittest.cc
|
| index a1fbce3546027e465edb237ac1dac0b0c42274da..87d47e060d734180dfdfc68f8dd6244a431e3a53 100644
|
| --- a/cc/layer_tree_host_unittest.cc
|
| +++ b/cc/layer_tree_host_unittest.cc
|
| @@ -2960,11 +2960,6 @@ public:
|
| m_children.push_back(ContentLayerWithUpdateTracking::create(&m_client));
|
| }
|
|
|
| - virtual scoped_ptr<OutputSurface> createOutputSurface()
|
| - {
|
| - return FakeOutputSurface::Create3d(CompositorFakeWebGraphicsContext3DWithEndQueryCausingLostContext::create(WebGraphicsContext3D::Attributes()).PassAs<WebKit::WebGraphicsContext3D>()).PassAs<OutputSurface>();
|
| - }
|
| -
|
| virtual void beginTest()
|
| {
|
| m_layerTreeHost->setRootLayer(m_parent);
|
| @@ -3335,7 +3330,8 @@ TEST(LayerTreeHostTest, LimitPartialUpdates)
|
| TEST(LayerTreeHostTest, PartialUpdatesWithGLRenderer)
|
| {
|
| bool useSoftwareRendering = false;
|
| - FakeLayerImplTreeHostClient client(useSoftwareRendering);
|
| + bool useDelegatingRenderer = false;
|
| + FakeLayerImplTreeHostClient client(useSoftwareRendering, useDelegatingRenderer);
|
|
|
| LayerTreeSettings settings;
|
| settings.maxPartialTextureUpdates = 4;
|
| @@ -3348,7 +3344,8 @@ TEST(LayerTreeHostTest, PartialUpdatesWithGLRenderer)
|
| TEST(LayerTreeHostTest, PartialUpdatesWithSoftwareRenderer)
|
| {
|
| bool useSoftwareRendering = true;
|
| - FakeLayerImplTreeHostClient client(useSoftwareRendering);
|
| + bool useDelegatingRenderer = false;
|
| + FakeLayerImplTreeHostClient client(useSoftwareRendering, useDelegatingRenderer);
|
|
|
| LayerTreeSettings settings;
|
| settings.maxPartialTextureUpdates = 4;
|
| @@ -3358,5 +3355,33 @@ TEST(LayerTreeHostTest, PartialUpdatesWithSoftwareRenderer)
|
| EXPECT_EQ(4u, host->settings().maxPartialTextureUpdates);
|
| }
|
|
|
| +TEST(LayerTreeHostTest, PartialUpdatesWithDelegatingRendererAndGLContent)
|
| +{
|
| + bool useSoftwareRendering = false;
|
| + bool useDelegatingRenderer = true;
|
| + FakeLayerImplTreeHostClient client(useSoftwareRendering, useDelegatingRenderer);
|
| +
|
| + LayerTreeSettings settings;
|
| + settings.maxPartialTextureUpdates = 4;
|
| +
|
| + scoped_ptr<LayerTreeHost> host = LayerTreeHost::create(&client, settings, scoped_ptr<Thread>());
|
| + EXPECT_TRUE(host->initializeRendererIfNeeded());
|
| + EXPECT_EQ(0u, host->settings().maxPartialTextureUpdates);
|
| +}
|
| +
|
| +TEST(LayerTreeHostTest, PartialUpdatesWithDelegatingRendererAndSoftwareContent)
|
| +{
|
| + bool useSoftwareRendering = true;
|
| + bool useDelegatingRenderer = true;
|
| + FakeLayerImplTreeHostClient client(useSoftwareRendering, useDelegatingRenderer);
|
| +
|
| + LayerTreeSettings settings;
|
| + settings.maxPartialTextureUpdates = 4;
|
| +
|
| + scoped_ptr<LayerTreeHost> host = LayerTreeHost::create(&client, settings, scoped_ptr<Thread>());
|
| + EXPECT_TRUE(host->initializeRendererIfNeeded());
|
| + EXPECT_EQ(0u, host->settings().maxPartialTextureUpdates);
|
| +}
|
| +
|
| } // namespace
|
| } // namespace cc
|
|
|