Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(712)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/trees/layer_tree_host_unittest_damage.cc

Issue 246753008: cc: Unify use of DidSwapBuffers() and did_request_swap (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Introduce HasSentDrawRequestThisFrame() Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« cc/scheduler/scheduler_state_machine.cc ('K') | « cc/trees/layer_tree_host_unittest_context.cc ('k') | cc/trees/layer_tree_host_unittest_delegated.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 eb91e53c882b1edf59ce7ed79030c6c502b1cc34..33cd7ad7d4d8e84c268f3812626163ae7bc561af 100644
--- a/cc/trees/layer_tree_host_unittest_damage.cc
+++ b/cc/trees/layer_tree_host_unittest_damage.cc
@@ -48,11 +48,11 @@ class LayerTreeHostDamageTestSetNeedsRedraw
}
}
- virtual DrawSwapReadbackResult::DrawResult PrepareToDrawOnThread(
+ virtual DrawResult PrepareToDrawOnThread(
LayerTreeHostImpl* impl,
LayerTreeHostImpl::FrameData* frame_data,
- DrawSwapReadbackResult::DrawResult draw_result) OVERRIDE {
- EXPECT_EQ(DrawSwapReadbackResult::DRAW_SUCCESS, draw_result);
+ DrawResult draw_result) OVERRIDE {
+ EXPECT_EQ(DRAW_SUCCESS, draw_result);
RenderSurfaceImpl* root_surface =
impl->active_tree()->root_layer()->render_surface();
@@ -110,11 +110,11 @@ class LayerTreeHostDamageTestSetViewportSize
}
}
- virtual DrawSwapReadbackResult::DrawResult PrepareToDrawOnThread(
+ virtual DrawResult PrepareToDrawOnThread(
LayerTreeHostImpl* impl,
LayerTreeHostImpl::FrameData* frame_data,
- DrawSwapReadbackResult::DrawResult draw_result) OVERRIDE {
- EXPECT_EQ(DrawSwapReadbackResult::DRAW_SUCCESS, draw_result);
+ DrawResult draw_result) OVERRIDE {
+ EXPECT_EQ(DRAW_SUCCESS, draw_result);
RenderSurfaceImpl* root_surface =
impl->active_tree()->root_layer()->render_surface();
@@ -169,11 +169,11 @@ class LayerTreeHostDamageTestNoDamageDoesNotSwap
LayerTreeHostDamageTest::SetupTree();
}
- virtual DrawSwapReadbackResult::DrawResult PrepareToDrawOnThread(
+ virtual DrawResult PrepareToDrawOnThread(
LayerTreeHostImpl* host_impl,
LayerTreeHostImpl::FrameData* frame_data,
- DrawSwapReadbackResult::DrawResult draw_result) OVERRIDE {
- EXPECT_EQ(DrawSwapReadbackResult::DRAW_SUCCESS, draw_result);
+ DrawResult draw_result) OVERRIDE {
+ EXPECT_EQ(DRAW_SUCCESS, draw_result);
int source_frame = host_impl->active_tree()->source_frame_number();
switch (source_frame) {
@@ -259,11 +259,11 @@ class LayerTreeHostDamageTestNoDamageReadbackDoesDraw
LayerTreeHostDamageTest::SetupTree();
}
- virtual DrawSwapReadbackResult::DrawResult PrepareToDrawOnThread(
+ virtual DrawResult PrepareToDrawOnThread(
LayerTreeHostImpl* host_impl,
LayerTreeHostImpl::FrameData* frame_data,
- DrawSwapReadbackResult::DrawResult draw_result) OVERRIDE {
- EXPECT_EQ(DrawSwapReadbackResult::DRAW_SUCCESS, draw_result);
+ DrawResult draw_result) OVERRIDE {
+ EXPECT_EQ(DRAW_SUCCESS, draw_result);
int source_frame = host_impl->active_tree()->source_frame_number();
switch (source_frame) {
@@ -330,11 +330,11 @@ class LayerTreeHostDamageTestForcedFullDamage : public LayerTreeHostDamageTest {
LayerTreeHostDamageTest::SetupTree();
}
- virtual DrawSwapReadbackResult::DrawResult PrepareToDrawOnThread(
+ virtual DrawResult PrepareToDrawOnThread(
LayerTreeHostImpl* host_impl,
LayerTreeHostImpl::FrameData* frame_data,
- DrawSwapReadbackResult::DrawResult draw_result) OVERRIDE {
- EXPECT_EQ(DrawSwapReadbackResult::DRAW_SUCCESS, draw_result);
+ DrawResult draw_result) OVERRIDE {
+ EXPECT_EQ(DRAW_SUCCESS, draw_result);
RenderSurfaceImpl* root_surface =
host_impl->active_tree()->root_layer()->render_surface();
@@ -472,11 +472,11 @@ class LayerTreeHostDamageTestScrollbarDoesDamage
PostSetNeedsCommitToMainThread();
}
- virtual DrawSwapReadbackResult::DrawResult PrepareToDrawOnThread(
+ virtual DrawResult PrepareToDrawOnThread(
LayerTreeHostImpl* host_impl,
LayerTreeHostImpl::FrameData* frame_data,
- DrawSwapReadbackResult::DrawResult draw_result) OVERRIDE {
- EXPECT_EQ(DrawSwapReadbackResult::DRAW_SUCCESS, draw_result);
+ DrawResult draw_result) OVERRIDE {
+ EXPECT_EQ(DRAW_SUCCESS, draw_result);
RenderSurfaceImpl* root_surface =
host_impl->active_tree()->root_layer()->render_surface();
gfx::RectF root_damage =
@@ -546,11 +546,11 @@ class LayerTreeHostDamageTestScrollbarCommitDoesNoDamage
PostSetNeedsCommitToMainThread();
}
- virtual DrawSwapReadbackResult::DrawResult PrepareToDrawOnThread(
+ virtual DrawResult PrepareToDrawOnThread(
LayerTreeHostImpl* host_impl,
LayerTreeHostImpl::FrameData* frame_data,
- DrawSwapReadbackResult::DrawResult draw_result) OVERRIDE {
- EXPECT_EQ(DrawSwapReadbackResult::DRAW_SUCCESS, draw_result);
+ DrawResult draw_result) OVERRIDE {
+ EXPECT_EQ(DRAW_SUCCESS, draw_result);
RenderSurfaceImpl* root_surface =
host_impl->active_tree()->root_layer()->render_surface();
gfx::RectF root_damage =
@@ -638,11 +638,11 @@ class LayerTreeHostDamageTestVisibleTilesStillTriggerDraws
update_visible_tile_count_ = 0;
}
- virtual DrawSwapReadbackResult::DrawResult PrepareToDrawOnThread(
+ virtual DrawResult PrepareToDrawOnThread(
LayerTreeHostImpl* host_impl,
LayerTreeHostImpl::FrameData* frame_data,
- DrawSwapReadbackResult::DrawResult draw_result) OVERRIDE {
- EXPECT_EQ(DrawSwapReadbackResult::DRAW_SUCCESS, draw_result);
+ DrawResult draw_result) OVERRIDE {
+ EXPECT_EQ(DRAW_SUCCESS, draw_result);
prepare_to_draw_count_++;
switch (prepare_to_draw_count_) {
case 1:
« cc/scheduler/scheduler_state_machine.cc ('K') | « cc/trees/layer_tree_host_unittest_context.cc ('k') | cc/trees/layer_tree_host_unittest_delegated.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698