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

Side by Side Diff: cc/test/fake_layer_tree_host_impl.cc

Issue 429743003: Rename Animate as Begin(Main)Frame (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix a typo that made tests fail. Created 6 years, 4 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/test/fake_layer_tree_host_impl.h" 5 #include "cc/test/fake_layer_tree_host_impl.h"
6 #include "cc/test/test_shared_bitmap_manager.h" 6 #include "cc/test/test_shared_bitmap_manager.h"
7 #include "cc/trees/layer_tree_impl.h" 7 #include "cc/trees/layer_tree_impl.h"
8 8
9 namespace cc { 9 namespace cc {
10 10
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 44
45 FakeLayerTreeHostImpl::~FakeLayerTreeHostImpl() {} 45 FakeLayerTreeHostImpl::~FakeLayerTreeHostImpl() {}
46 46
47 void FakeLayerTreeHostImpl::CreatePendingTree() { 47 void FakeLayerTreeHostImpl::CreatePendingTree() {
48 LayerTreeHostImpl::CreatePendingTree(); 48 LayerTreeHostImpl::CreatePendingTree();
49 float arbitrary_large_page_scale = 100000.f; 49 float arbitrary_large_page_scale = 100000.f;
50 pending_tree()->SetPageScaleFactorAndLimits( 50 pending_tree()->SetPageScaleFactorAndLimits(
51 1.f, 1.f / arbitrary_large_page_scale, arbitrary_large_page_scale); 51 1.f, 1.f / arbitrary_large_page_scale, arbitrary_large_page_scale);
52 } 52 }
53 53
54 base::TimeTicks FakeLayerTreeHostImpl::CurrentFrameTimeTicks() { 54 BeginFrameArgs FakeLayerTreeHostImpl::CurrentBeginFrameArgs() const {
55 if (current_frame_time_ticks_.is_null()) 55 if (!current_begin_frame_args_.IsValid())
56 return LayerTreeHostImpl::CurrentFrameTimeTicks(); 56 return LayerTreeHostImpl::CurrentBeginFrameArgs();
57 return current_frame_time_ticks_; 57 return current_begin_frame_args_;
58 } 58 }
59 59
60 void FakeLayerTreeHostImpl::SetCurrentFrameTimeTicks( 60 void FakeLayerTreeHostImpl::SetCurrentFrameTimeTicks(
mithro-old 2014/08/11 07:33:33 Should this be "SetCurrentBeginFrameArgs"?
Sami 2014/08/11 17:51:26 Yes, let's make them symmetric.
61 base::TimeTicks current_frame_time_ticks) { 61 base::TimeTicks time_ticks) {
62 current_frame_time_ticks_ = current_frame_time_ticks; 62 current_begin_frame_args_ = BeginFrameArgs::Create(
63 time_ticks, base::TimeTicks(), BeginFrameArgs::DefaultInterval());
63 } 64 }
64 65
65 } // namespace cc 66 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698