| Index: cc/trees/layer_tree_host_unittest_damage.cc
|
| diff --git a/cc/trees/layer_tree_host_unittest_damage.cc b/cc/trees/layer_tree_host_unittest_damage.cc
|
| index d541751e1465872eda6e88e8f68b040d4bbeb76a..d34cd4dc19d9138c6919c6f75428daaf36773e54 100644
|
| --- a/cc/trees/layer_tree_host_unittest_damage.cc
|
| +++ b/cc/trees/layer_tree_host_unittest_damage.cc
|
| @@ -529,98 +529,5 @@ class LayerTreeHostDamageTestScrollbarCommitDoesNoDamage
|
|
|
| MULTI_THREAD_TEST_F(LayerTreeHostDamageTestScrollbarCommitDoesNoDamage);
|
|
|
| -class LayerTreeHostDamageTestVisibleTilesStillTriggerDraws
|
| - : public LayerTreeHostDamageTest {
|
| - void InitializeSettings(LayerTreeSettings* settings) override {
|
| - settings->impl_side_painting = true;
|
| - }
|
| -
|
| - void BeginTest() override { PostSetNeedsCommitToMainThread(); }
|
| -
|
| - void SetupTree() override {
|
| - scoped_refptr<FakePictureLayer> root = FakePictureLayer::Create(&client_);
|
| - root->SetBounds(gfx::Size(500, 500));
|
| - layer_tree_host()->SetRootLayer(root);
|
| - LayerTreeHostDamageTest::SetupTree();
|
| -
|
| - swap_count_ = 0;
|
| - prepare_to_draw_count_ = 0;
|
| - update_visible_tile_count_ = 0;
|
| - }
|
| -
|
| - DrawResult PrepareToDrawOnThread(LayerTreeHostImpl* host_impl,
|
| - LayerTreeHostImpl::FrameData* frame_data,
|
| - DrawResult draw_result) override {
|
| - EXPECT_EQ(DRAW_SUCCESS, draw_result);
|
| - prepare_to_draw_count_++;
|
| - switch (prepare_to_draw_count_) {
|
| - case 1:
|
| - // Detect that we have an incomplete tile, during the first frame.
|
| - // The first frame should have damage.
|
| - frame_data->contains_incomplete_tile = true;
|
| - DCHECK(!frame_data->has_no_damage);
|
| - break;
|
| - case 2:
|
| - // Make a no-damage frame. We early out and can't detect
|
| - // incomplete tiles, even if they still exist.
|
| - frame_data->contains_incomplete_tile = false;
|
| - frame_data->has_no_damage = true;
|
| - break;
|
| - case 3:
|
| - // Trigger the last swap for the completed tile.
|
| - frame_data->contains_incomplete_tile = false;
|
| - frame_data->has_no_damage = false;
|
| - EndTest();
|
| - break;
|
| - default:
|
| - NOTREACHED();
|
| - break;
|
| - }
|
| -
|
| - return draw_result;
|
| - }
|
| -
|
| - void UpdateVisibleTilesOnThread(LayerTreeHostImpl* host_impl) override {
|
| - // Simulate creating some visible tiles (that trigger prepare-to-draws).
|
| - // The first we make into a no-damage-frame during prepare-to-draw (see
|
| - // above). This is to ensure we still get UpdateVisibleTiles calls after
|
| - // a no-damage or aborted frame.
|
| - update_visible_tile_count_++;
|
| - switch (update_visible_tile_count_) {
|
| - case 3:
|
| - case 6:
|
| - host_impl->DidInitializeVisibleTileForTesting();
|
| - break;
|
| - case 7:
|
| - NOTREACHED();
|
| - break;
|
| - }
|
| - }
|
| -
|
| - void SwapBuffersOnThread(LayerTreeHostImpl* host_impl,
|
| - bool didSwap) override {
|
| - if (!didSwap)
|
| - return;
|
| - ++swap_count_;
|
| - }
|
| -
|
| - void AfterTest() override {
|
| - // We should keep getting update-visible-tiles calls
|
| - // until we report there are no more incomplete-tiles.
|
| - EXPECT_EQ(update_visible_tile_count_, 6);
|
| - // First frame, plus two triggered by DidInitializeVisibleTile()
|
| - EXPECT_EQ(prepare_to_draw_count_, 3);
|
| - // First swap, plus final swap (contained damage).
|
| - EXPECT_EQ(swap_count_, 2);
|
| - }
|
| -
|
| - FakeContentLayerClient client_;
|
| - int swap_count_;
|
| - int prepare_to_draw_count_;
|
| - int update_visible_tile_count_;
|
| -};
|
| -
|
| -MULTI_THREAD_TEST_F(LayerTreeHostDamageTestVisibleTilesStillTriggerDraws);
|
| -
|
| } // namespace
|
| } // namespace cc
|
|
|