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

Unified Diff: cc/test/fake_layer_tree_host_impl.cc

Issue 787763006: cc: Adding BeginFrameTracker object and removing Now() from LTHI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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/test/fake_layer_tree_host_impl.cc
diff --git a/cc/test/fake_layer_tree_host_impl.cc b/cc/test/fake_layer_tree_host_impl.cc
index bfac501fe0d743dade4d47ad55fc40d36493508c..5ca82dbf93f4b5d497b9ce4ae613569776b776ea 100644
--- a/cc/test/fake_layer_tree_host_impl.cc
+++ b/cc/test/fake_layer_tree_host_impl.cc
@@ -57,14 +57,19 @@ void FakeLayerTreeHostImpl::CreatePendingTree() {
}
BeginFrameArgs FakeLayerTreeHostImpl::CurrentBeginFrameArgs() const {
- if (!current_begin_frame_args_.IsValid())
- return LayerTreeHostImpl::CurrentBeginFrameArgs();
- return current_begin_frame_args_;
+ if (!current_begin_frame_args_.HasFinished()) {
+ return current_begin_frame_args_.Get();
+ } else {
+ return current_begin_frame_args_.Last();
+ }
}
void FakeLayerTreeHostImpl::SetCurrentBeginFrameArgs(
const BeginFrameArgs& args) {
- current_begin_frame_args_ = args;
+ if (!current_begin_frame_args_.HasFinished()) {
+ current_begin_frame_args_.Finish();
+ }
+ current_begin_frame_args_.Start(args);
}
int FakeLayerTreeHostImpl::RecursiveUpdateNumChildren(LayerImpl* layer) {

Powered by Google App Engine
This is Rietveld 408576698