Index: cc/test/scheduler_test_common.cc |
diff --git a/cc/test/scheduler_test_common.cc b/cc/test/scheduler_test_common.cc |
index b0461ec3f86c6f9a8e629d399b3842e7232753d9..21dd8332f529804a3a06be0988b41432626d5266 100644 |
--- a/cc/test/scheduler_test_common.cc |
+++ b/cc/test/scheduler_test_common.cc |
@@ -83,23 +83,29 @@ FakeCompositorTimingHistory::FakeCompositorTimingHistory( |
FakeCompositorTimingHistory::~FakeCompositorTimingHistory() { |
} |
-void FakeCompositorTimingHistory::SetDrawDurationEstimate( |
+void FakeCompositorTimingHistory::SetBeginMainFrameToCommitDurationEstimate( |
mithro-old
2015/06/30 07:55:49
Any resound these moved around?
brianderson
2015/06/30 17:35:15
I wanted to put them in the approximate order we'd
|
base::TimeDelta duration) { |
- draw_duration_ = duration; |
+ begin_main_frame_to_commit_duration_ = duration; |
} |
-void FakeCompositorTimingHistory::SetBeginMainFrameToCommitDurationEstimate( |
+void FakeCompositorTimingHistory::SetPrepareTilesDurationEstimate( |
base::TimeDelta duration) { |
- begin_main_frame_to_commit_duration_ = duration; |
+ prepare_tiles_duration_ = duration; |
} |
-void FakeCompositorTimingHistory::SetCommitToActivateDurationEstimate( |
+void FakeCompositorTimingHistory::SetCommitToReadyToActivateDurationEstimate( |
base::TimeDelta duration) { |
- commit_to_activate_duration_ = duration; |
+ prepare_tiles_begin_to_ready_to_activate_duration_ = duration; |
} |
-base::TimeDelta FakeCompositorTimingHistory::DrawDurationEstimate() const { |
- return draw_duration_; |
+void FakeCompositorTimingHistory::SetActivateDurationEstimate( |
+ base::TimeDelta duration) { |
+ activate_duration_ = duration; |
+} |
+ |
+void FakeCompositorTimingHistory::SetDrawDurationEstimate( |
+ base::TimeDelta duration) { |
+ draw_duration_ = duration; |
} |
base::TimeDelta |
@@ -107,9 +113,22 @@ FakeCompositorTimingHistory::BeginMainFrameToCommitDurationEstimate() const { |
return begin_main_frame_to_commit_duration_; |
} |
-base::TimeDelta FakeCompositorTimingHistory::CommitToActivateDurationEstimate() |
+base::TimeDelta FakeCompositorTimingHistory::PrepareTilesDurationEstimate() |
const { |
- return commit_to_activate_duration_; |
+ return prepare_tiles_duration_; |
+} |
+ |
+base::TimeDelta |
+FakeCompositorTimingHistory::CommitToReadyToActivateDurationEstimate() const { |
+ return prepare_tiles_begin_to_ready_to_activate_duration_; |
+} |
+ |
+base::TimeDelta FakeCompositorTimingHistory::ActivateDurationEstimate() const { |
+ return activate_duration_; |
+} |
+ |
+base::TimeDelta FakeCompositorTimingHistory::DrawDurationEstimate() const { |
+ return draw_duration_; |
} |
scoped_ptr<TestScheduler> TestScheduler::Create( |