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

Unified Diff: cc/scheduler/scheduler_unittest.cc

Issue 131683005: cc: Make PrepareToDraw return an enum for why it aborts (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: DRAW_SUCCESS; assert CanDraw Created 6 years, 11 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
Index: cc/scheduler/scheduler_unittest.cc
diff --git a/cc/scheduler/scheduler_unittest.cc b/cc/scheduler/scheduler_unittest.cc
index b323b826d1a01eed5e3c59c0f23386d92d34cade..2099b8a26cfb11e2f4998603191e741aec7685b6 100644
--- a/cc/scheduler/scheduler_unittest.cc
+++ b/cc/scheduler/scheduler_unittest.cc
@@ -110,26 +110,30 @@ class FakeSchedulerClient : public SchedulerClient {
states_.push_back(scheduler_->StateAsValue().release());
num_draws_++;
bool did_readback = false;
+ DrawSwapReadbackResult::DrawResult result =
+ draw_will_happen_
+ ? DrawSwapReadbackResult::DRAW_SUCCESS
+ : DrawSwapReadbackResult::DRAW_ABORTED_CHECKERBOARD_ANIMATIONS;
return DrawSwapReadbackResult(
- draw_will_happen_,
+ result,
draw_will_happen_ && swap_will_happen_if_draw_happens_,
did_readback);
}
virtual DrawSwapReadbackResult ScheduledActionDrawAndSwapForced() OVERRIDE {
actions_.push_back("ScheduledActionDrawAndSwapForced");
states_.push_back(scheduler_->StateAsValue().release());
- bool did_draw = true;
bool did_swap = swap_will_happen_if_draw_happens_;
bool did_readback = false;
- return DrawSwapReadbackResult(did_draw, did_swap, did_readback);
+ return DrawSwapReadbackResult(
+ DrawSwapReadbackResult::DRAW_SUCCESS, did_swap, did_readback);
}
virtual DrawSwapReadbackResult ScheduledActionDrawAndReadback() OVERRIDE {
actions_.push_back("ScheduledActionDrawAndReadback");
states_.push_back(scheduler_->StateAsValue().release());
- bool did_draw = true;
bool did_swap = false;
bool did_readback = true;
- return DrawSwapReadbackResult(did_draw, did_swap, did_readback);
+ return DrawSwapReadbackResult(
+ DrawSwapReadbackResult::DRAW_SUCCESS, did_swap, did_readback);
}
virtual void ScheduledActionCommit() OVERRIDE {
actions_.push_back("ScheduledActionCommit");
@@ -689,10 +693,10 @@ class SchedulerClientThatsetNeedsDrawInsideDraw : public FakeSchedulerClient {
virtual DrawSwapReadbackResult ScheduledActionDrawAndSwapForced() OVERRIDE {
NOTREACHED();
- bool did_draw = true;
bool did_swap = true;
bool did_readback = false;
- return DrawSwapReadbackResult(did_draw, did_swap, did_readback);
+ return DrawSwapReadbackResult(
+ DrawSwapReadbackResult::DRAW_SUCCESS, did_swap, did_readback);
}
virtual void ScheduledActionCommit() OVERRIDE {}
@@ -805,10 +809,10 @@ class SchedulerClientThatSetNeedsCommitInsideDraw : public FakeSchedulerClient {
virtual DrawSwapReadbackResult ScheduledActionDrawAndSwapForced() OVERRIDE {
NOTREACHED();
- bool did_draw = true;
bool did_swap = false;
bool did_readback = false;
- return DrawSwapReadbackResult(did_draw, did_swap, did_readback);
+ return DrawSwapReadbackResult(
+ DrawSwapReadbackResult::DRAW_SUCCESS, did_swap, did_readback);
}
virtual void ScheduledActionCommit() OVERRIDE {}

Powered by Google App Engine
This is Rietveld 408576698