| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "cc/trees/layer_tree_host.h" | 5 #include "cc/trees/layer_tree_host.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/callback.h" | 8 #include "base/callback.h" |
| 9 #include "base/location.h" | 9 #include "base/location.h" |
| 10 #include "base/time/time.h" | 10 #include "base/time/time.h" |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 LayerTreeHostDamageTest::SetupTree(); | 34 LayerTreeHostDamageTest::SetupTree(); |
| 35 client_.set_bounds(root->bounds()); | 35 client_.set_bounds(root->bounds()); |
| 36 } | 36 } |
| 37 | 37 |
| 38 void BeginTest() override { | 38 void BeginTest() override { |
| 39 draw_count_ = 0; | 39 draw_count_ = 0; |
| 40 PostSetNeedsCommitToMainThread(); | 40 PostSetNeedsCommitToMainThread(); |
| 41 } | 41 } |
| 42 | 42 |
| 43 void DidCommitAndDrawFrame() override { | 43 void DidCommitAndDrawFrame() override { |
| 44 switch (layer_tree_host()->source_frame_number()) { | 44 switch (layer_tree_host()->SourceFrameNumber()) { |
| 45 case 1: | 45 case 1: |
| 46 layer_tree_host()->SetNeedsRedraw(); | 46 layer_tree_host()->SetNeedsRedraw(); |
| 47 break; | 47 break; |
| 48 } | 48 } |
| 49 } | 49 } |
| 50 | 50 |
| 51 DrawResult PrepareToDrawOnThread(LayerTreeHostImpl* impl, | 51 DrawResult PrepareToDrawOnThread(LayerTreeHostImpl* impl, |
| 52 LayerTreeHostImpl::FrameData* frame_data, | 52 LayerTreeHostImpl::FrameData* frame_data, |
| 53 DrawResult draw_result) override { | 53 DrawResult draw_result) override { |
| 54 EXPECT_EQ(DRAW_SUCCESS, draw_result); | 54 EXPECT_EQ(DRAW_SUCCESS, draw_result); |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 LayerTreeHostDamageTest::SetupTree(); | 96 LayerTreeHostDamageTest::SetupTree(); |
| 97 client_.set_bounds(root->bounds()); | 97 client_.set_bounds(root->bounds()); |
| 98 } | 98 } |
| 99 | 99 |
| 100 void BeginTest() override { | 100 void BeginTest() override { |
| 101 draw_count_ = 0; | 101 draw_count_ = 0; |
| 102 PostSetNeedsCommitToMainThread(); | 102 PostSetNeedsCommitToMainThread(); |
| 103 } | 103 } |
| 104 | 104 |
| 105 void DidCommitAndDrawFrame() override { | 105 void DidCommitAndDrawFrame() override { |
| 106 switch (layer_tree_host()->source_frame_number()) { | 106 switch (layer_tree_host()->SourceFrameNumber()) { |
| 107 case 1: | 107 case 1: |
| 108 layer_tree()->SetViewportSize(gfx::Size(15, 15)); | 108 layer_tree()->SetViewportSize(gfx::Size(15, 15)); |
| 109 break; | 109 break; |
| 110 } | 110 } |
| 111 } | 111 } |
| 112 | 112 |
| 113 DrawResult PrepareToDrawOnThread(LayerTreeHostImpl* impl, | 113 DrawResult PrepareToDrawOnThread(LayerTreeHostImpl* impl, |
| 114 LayerTreeHostImpl::FrameData* frame_data, | 114 LayerTreeHostImpl::FrameData* frame_data, |
| 115 DrawResult draw_result) override { | 115 DrawResult draw_result) override { |
| 116 EXPECT_EQ(DRAW_SUCCESS, draw_result); | 116 EXPECT_EQ(DRAW_SUCCESS, draw_result); |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 196 } | 196 } |
| 197 return draw_result; | 197 return draw_result; |
| 198 } | 198 } |
| 199 | 199 |
| 200 void DisplayDidDrawAndSwapOnThread() override { | 200 void DisplayDidDrawAndSwapOnThread() override { |
| 201 ++did_swap_; | 201 ++did_swap_; |
| 202 EXPECT_EQ(expect_swap_, did_swap_); | 202 EXPECT_EQ(expect_swap_, did_swap_); |
| 203 } | 203 } |
| 204 | 204 |
| 205 void DidCommit() override { | 205 void DidCommit() override { |
| 206 int next_frame = layer_tree_host()->source_frame_number(); | 206 int next_frame = layer_tree_host()->SourceFrameNumber(); |
| 207 switch (next_frame) { | 207 switch (next_frame) { |
| 208 case 1: | 208 case 1: |
| 209 layer_tree_host()->SetNeedsCommit(); | 209 layer_tree_host()->SetNeedsCommit(); |
| 210 break; | 210 break; |
| 211 case 2: | 211 case 2: |
| 212 // Cause visible damage. | 212 // Cause visible damage. |
| 213 content_->SetNeedsDisplayRect( | 213 content_->SetNeedsDisplayRect( |
| 214 gfx::Rect(layer_tree()->device_viewport_size())); | 214 gfx::Rect(layer_tree()->device_viewport_size())); |
| 215 break; | 215 break; |
| 216 case 3: | 216 case 3: |
| (...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 520 | 520 |
| 521 void AfterTest() override { EXPECT_EQ(3, num_draws_); } | 521 void AfterTest() override { EXPECT_EQ(3, num_draws_); } |
| 522 | 522 |
| 523 int num_draws_; | 523 int num_draws_; |
| 524 }; | 524 }; |
| 525 | 525 |
| 526 MULTI_THREAD_TEST_F(LayerTreeHostDamageTestScrollbarCommitDoesNoDamage); | 526 MULTI_THREAD_TEST_F(LayerTreeHostDamageTestScrollbarCommitDoesNoDamage); |
| 527 | 527 |
| 528 } // namespace | 528 } // namespace |
| 529 } // namespace cc | 529 } // namespace cc |
| OLD | NEW |