| Index: cc/scheduler/scheduler_unittest.cc
|
| diff --git a/cc/scheduler/scheduler_unittest.cc b/cc/scheduler/scheduler_unittest.cc
|
| index 514899b9ed69d72d545fe0383a42c46be7d1ce4e..add50ca6b0ffe013d3ab31c0cd41328bb331d902 100644
|
| --- a/cc/scheduler/scheduler_unittest.cc
|
| +++ b/cc/scheduler/scheduler_unittest.cc
|
| @@ -53,7 +53,7 @@ class FakeSchedulerClient : public SchedulerClient {
|
| FakeSchedulerClient* client)
|
| : client_(client) {}
|
|
|
| - virtual void OnNeedsBeginFramesChange(bool needs_begin_frames) OVERRIDE {
|
| + virtual void OnNeedsBeginFramesChange(bool needs_begin_frames) override {
|
| if (needs_begin_frames) {
|
| client_->actions_.push_back("SetNeedsBeginFrames(true)");
|
| } else {
|
| @@ -107,7 +107,7 @@ class FakeSchedulerClient : public SchedulerClient {
|
| return scheduler_->settings().begin_frame_scheduling_enabled &&
|
| scheduler_->settings().throttle_frame_production;
|
| }
|
| - virtual FakeBeginFrameSource* ExternalBeginFrameSource() OVERRIDE {
|
| + virtual FakeBeginFrameSource* ExternalBeginFrameSource() override {
|
| return &fake_frame_source_;
|
| }
|
|
|
| @@ -159,19 +159,19 @@ class FakeSchedulerClient : public SchedulerClient {
|
| redraw_will_happen_if_update_visible_tiles_happens_ = redraw;
|
| }
|
| // SchedulerClient implementation.
|
| - virtual void WillBeginImplFrame(const BeginFrameArgs& args) OVERRIDE {
|
| + virtual void WillBeginImplFrame(const BeginFrameArgs& args) override {
|
| actions_.push_back("WillBeginImplFrame");
|
| states_.push_back(scheduler_->AsValue());
|
| }
|
| - virtual void ScheduledActionSendBeginMainFrame() OVERRIDE {
|
| + virtual void ScheduledActionSendBeginMainFrame() override {
|
| actions_.push_back("ScheduledActionSendBeginMainFrame");
|
| states_.push_back(scheduler_->AsValue());
|
| }
|
| - virtual void ScheduledActionAnimate() OVERRIDE {
|
| + virtual void ScheduledActionAnimate() override {
|
| actions_.push_back("ScheduledActionAnimate");
|
| states_.push_back(scheduler_->AsValue());
|
| }
|
| - virtual DrawResult ScheduledActionDrawAndSwapIfPossible() OVERRIDE {
|
| + virtual DrawResult ScheduledActionDrawAndSwapIfPossible() override {
|
| actions_.push_back("ScheduledActionDrawAndSwapIfPossible");
|
| states_.push_back(scheduler_->AsValue());
|
| num_draws_++;
|
| @@ -193,48 +193,48 @@ class FakeSchedulerClient : public SchedulerClient {
|
| }
|
| return result;
|
| }
|
| - virtual DrawResult ScheduledActionDrawAndSwapForced() OVERRIDE {
|
| + virtual DrawResult ScheduledActionDrawAndSwapForced() override {
|
| actions_.push_back("ScheduledActionDrawAndSwapForced");
|
| states_.push_back(scheduler_->AsValue());
|
| return DRAW_SUCCESS;
|
| }
|
| - virtual void ScheduledActionCommit() OVERRIDE {
|
| + virtual void ScheduledActionCommit() override {
|
| actions_.push_back("ScheduledActionCommit");
|
| states_.push_back(scheduler_->AsValue());
|
| }
|
| - virtual void ScheduledActionUpdateVisibleTiles() OVERRIDE {
|
| + virtual void ScheduledActionUpdateVisibleTiles() override {
|
| actions_.push_back("ScheduledActionUpdateVisibleTiles");
|
| states_.push_back(scheduler_->AsValue());
|
| if (redraw_will_happen_if_update_visible_tiles_happens_)
|
| scheduler_->SetNeedsRedraw();
|
| }
|
| - virtual void ScheduledActionActivateSyncTree() OVERRIDE {
|
| + virtual void ScheduledActionActivateSyncTree() override {
|
| actions_.push_back("ScheduledActionActivateSyncTree");
|
| states_.push_back(scheduler_->AsValue());
|
| }
|
| - virtual void ScheduledActionBeginOutputSurfaceCreation() OVERRIDE {
|
| + virtual void ScheduledActionBeginOutputSurfaceCreation() override {
|
| actions_.push_back("ScheduledActionBeginOutputSurfaceCreation");
|
| states_.push_back(scheduler_->AsValue());
|
| }
|
| - virtual void ScheduledActionManageTiles() OVERRIDE {
|
| + virtual void ScheduledActionManageTiles() override {
|
| actions_.push_back("ScheduledActionManageTiles");
|
| states_.push_back(scheduler_->AsValue());
|
| }
|
| - virtual void DidAnticipatedDrawTimeChange(base::TimeTicks) OVERRIDE {
|
| + virtual void DidAnticipatedDrawTimeChange(base::TimeTicks) override {
|
| if (log_anticipated_draw_time_change_)
|
| actions_.push_back("DidAnticipatedDrawTimeChange");
|
| }
|
| - virtual base::TimeDelta DrawDurationEstimate() OVERRIDE {
|
| + virtual base::TimeDelta DrawDurationEstimate() override {
|
| return base::TimeDelta();
|
| }
|
| - virtual base::TimeDelta BeginMainFrameToCommitDurationEstimate() OVERRIDE {
|
| + virtual base::TimeDelta BeginMainFrameToCommitDurationEstimate() override {
|
| return base::TimeDelta();
|
| }
|
| - virtual base::TimeDelta CommitToActivateDurationEstimate() OVERRIDE {
|
| + virtual base::TimeDelta CommitToActivateDurationEstimate() override {
|
| return base::TimeDelta();
|
| }
|
|
|
| - virtual void DidBeginImplFrameDeadline() OVERRIDE {}
|
| + virtual void DidBeginImplFrameDeadline() override {}
|
|
|
| base::Callback<bool(void)> ImplFrameDeadlinePending(bool state) {
|
| return base::Bind(&FakeSchedulerClient::ImplFrameDeadlinePendingCallback,
|
| @@ -455,23 +455,23 @@ TEST(SchedulerTest, RequestCommitAfterBeginMainFrameSent) {
|
|
|
| class SchedulerClientThatsetNeedsDrawInsideDraw : public FakeSchedulerClient {
|
| public:
|
| - virtual void ScheduledActionSendBeginMainFrame() OVERRIDE {}
|
| + virtual void ScheduledActionSendBeginMainFrame() override {}
|
| virtual DrawResult ScheduledActionDrawAndSwapIfPossible()
|
| - OVERRIDE {
|
| + override {
|
| // Only SetNeedsRedraw the first time this is called
|
| if (!num_draws_)
|
| scheduler_->SetNeedsRedraw();
|
| return FakeSchedulerClient::ScheduledActionDrawAndSwapIfPossible();
|
| }
|
|
|
| - virtual DrawResult ScheduledActionDrawAndSwapForced() OVERRIDE {
|
| + virtual DrawResult ScheduledActionDrawAndSwapForced() override {
|
| NOTREACHED();
|
| return DRAW_SUCCESS;
|
| }
|
|
|
| - virtual void ScheduledActionCommit() OVERRIDE {}
|
| - virtual void ScheduledActionBeginOutputSurfaceCreation() OVERRIDE {}
|
| - virtual void DidAnticipatedDrawTimeChange(base::TimeTicks) OVERRIDE {}
|
| + virtual void ScheduledActionCommit() override {}
|
| + virtual void ScheduledActionBeginOutputSurfaceCreation() override {}
|
| + virtual void DidAnticipatedDrawTimeChange(base::TimeTicks) override {}
|
| };
|
|
|
| // Tests for two different situations:
|
| @@ -566,9 +566,9 @@ class SchedulerClientThatSetNeedsCommitInsideDraw : public FakeSchedulerClient {
|
| SchedulerClientThatSetNeedsCommitInsideDraw()
|
| : set_needs_commit_on_next_draw_(false) {}
|
|
|
| - virtual void ScheduledActionSendBeginMainFrame() OVERRIDE {}
|
| + virtual void ScheduledActionSendBeginMainFrame() override {}
|
| virtual DrawResult ScheduledActionDrawAndSwapIfPossible()
|
| - OVERRIDE {
|
| + override {
|
| // Only SetNeedsCommit the first time this is called
|
| if (set_needs_commit_on_next_draw_) {
|
| scheduler_->SetNeedsCommit();
|
| @@ -577,14 +577,14 @@ class SchedulerClientThatSetNeedsCommitInsideDraw : public FakeSchedulerClient {
|
| return FakeSchedulerClient::ScheduledActionDrawAndSwapIfPossible();
|
| }
|
|
|
| - virtual DrawResult ScheduledActionDrawAndSwapForced() OVERRIDE {
|
| + virtual DrawResult ScheduledActionDrawAndSwapForced() override {
|
| NOTREACHED();
|
| return DRAW_SUCCESS;
|
| }
|
|
|
| - virtual void ScheduledActionCommit() OVERRIDE {}
|
| - virtual void ScheduledActionBeginOutputSurfaceCreation() OVERRIDE {}
|
| - virtual void DidAnticipatedDrawTimeChange(base::TimeTicks) OVERRIDE {}
|
| + virtual void ScheduledActionCommit() override {}
|
| + virtual void ScheduledActionBeginOutputSurfaceCreation() override {}
|
| + virtual void DidAnticipatedDrawTimeChange(base::TimeTicks) override {}
|
|
|
| void SetNeedsCommitOnNextDraw() { set_needs_commit_on_next_draw_ = true; }
|
|
|
| @@ -722,7 +722,7 @@ TEST(SchedulerTest, NoSwapWhenDrawFails) {
|
| class SchedulerClientNeedsManageTilesInDraw : public FakeSchedulerClient {
|
| public:
|
| virtual DrawResult ScheduledActionDrawAndSwapIfPossible()
|
| - OVERRIDE {
|
| + override {
|
| scheduler_->SetNeedsManageTiles();
|
| return FakeSchedulerClient::ScheduledActionDrawAndSwapIfPossible();
|
| }
|
| @@ -1043,13 +1043,13 @@ class SchedulerClientWithFixedEstimates : public FakeSchedulerClient {
|
| begin_main_frame_to_commit_duration),
|
| commit_to_activate_duration_(commit_to_activate_duration) {}
|
|
|
| - virtual base::TimeDelta DrawDurationEstimate() OVERRIDE {
|
| + virtual base::TimeDelta DrawDurationEstimate() override {
|
| return draw_duration_;
|
| }
|
| - virtual base::TimeDelta BeginMainFrameToCommitDurationEstimate() OVERRIDE {
|
| + virtual base::TimeDelta BeginMainFrameToCommitDurationEstimate() override {
|
| return begin_main_frame_to_commit_duration_;
|
| }
|
| - virtual base::TimeDelta CommitToActivateDurationEstimate() OVERRIDE {
|
| + virtual base::TimeDelta CommitToActivateDurationEstimate() override {
|
| return commit_to_activate_duration_;
|
| }
|
|
|
|
|