| Index: cc/trees/layer_tree_host_impl_unittest.cc
|
| diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
|
| index dddc5125a34042aec6a538cf6e736c7da44b7c31..934c526a836b3faba1f28d0ba77b065796e98ceb 100644
|
| --- a/cc/trees/layer_tree_host_impl_unittest.cc
|
| +++ b/cc/trees/layer_tree_host_impl_unittest.cc
|
| @@ -4335,8 +4335,7 @@ TEST_F(LayerTreeHostImplTest, PartialSwapReceivesDamageRect) {
|
| layer_tree_host_impl->DrawLayers(&frame, gfx::FrameTime::Now());
|
| layer_tree_host_impl->DidDrawAllLayers(frame);
|
| layer_tree_host_impl->SwapBuffers(frame);
|
| - EXPECT_EQ(TestContextSupport::SWAP,
|
| - context_provider->support()->last_swap_type());
|
| + EXPECT_EQ(TestGLES2Interface::SWAP, context_provider->last_swap_type());
|
|
|
| // Second frame, only the damaged area should get swapped. Damage should be
|
| // the union of old and new child rects.
|
| @@ -4352,12 +4351,11 @@ TEST_F(LayerTreeHostImplTest, PartialSwapReceivesDamageRect) {
|
| // Make sure that partial swap is constrained to the viewport dimensions
|
| // expected damage rect: gfx::Rect(500, 500);
|
| // expected swap rect: flipped damage rect, but also clamped to viewport
|
| - EXPECT_EQ(TestContextSupport::PARTIAL_SWAP,
|
| - context_provider->support()->last_swap_type());
|
| + EXPECT_EQ(TestGLES2Interface::PARTIAL_SWAP,
|
| + context_provider->last_swap_type());
|
| gfx::Rect expected_swap_rect(0, 500-28, 26, 28);
|
| EXPECT_EQ(expected_swap_rect.ToString(),
|
| - context_provider->support()->
|
| - last_partial_swap_rect().ToString());
|
| + context_provider->last_partial_swap_rect().ToString());
|
|
|
| layer_tree_host_impl->SetViewportSize(gfx::Size(10, 10));
|
| // This will damage everything.
|
| @@ -4368,8 +4366,7 @@ TEST_F(LayerTreeHostImplTest, PartialSwapReceivesDamageRect) {
|
| host_impl_->DidDrawAllLayers(frame);
|
| layer_tree_host_impl->SwapBuffers(frame);
|
|
|
| - EXPECT_EQ(TestContextSupport::SWAP,
|
| - context_provider->support()->last_swap_type());
|
| + EXPECT_EQ(TestGLES2Interface::SWAP, context_provider->last_swap_type());
|
| }
|
|
|
| TEST_F(LayerTreeHostImplTest, RootLayerDoesntCreateExtraSurface) {
|
|
|