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

Side by Side Diff: cc/test/layer_tree_test.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 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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/layer_tree_test.h" 5 #include "cc/test/layer_tree_test.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "cc/animation/animation.h" 8 #include "cc/animation/animation.h"
9 #include "cc/animation/animation_registrar.h" 9 #include "cc/animation/animation_registrar.h"
10 #include "cc/animation/layer_animation_controller.h" 10 #include "cc/animation/layer_animation_controller.h"
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 virtual ~LayerTreeHostClientForTesting() {} 269 virtual ~LayerTreeHostClientForTesting() {}
270 270
271 virtual void WillBeginMainFrame(int frame_id) OVERRIDE { 271 virtual void WillBeginMainFrame(int frame_id) OVERRIDE {
272 test_hooks_->WillBeginMainFrame(); 272 test_hooks_->WillBeginMainFrame();
273 } 273 }
274 274
275 virtual void DidBeginMainFrame() OVERRIDE { 275 virtual void DidBeginMainFrame() OVERRIDE {
276 test_hooks_->DidBeginMainFrame(); 276 test_hooks_->DidBeginMainFrame();
277 } 277 }
278 278
279 virtual void Animate(base::TimeTicks monotonic_time) OVERRIDE { 279 virtual void BeginMainFrame(const BeginFrameArgs& args) OVERRIDE {
280 test_hooks_->Animate(monotonic_time); 280 test_hooks_->BeginMainFrame(args);
281 } 281 }
282 282
283 virtual void Layout() OVERRIDE { test_hooks_->Layout(); } 283 virtual void Layout() OVERRIDE { test_hooks_->Layout(); }
284 284
285 virtual void ApplyScrollAndScale(const gfx::Vector2d& scroll_delta, 285 virtual void ApplyScrollAndScale(const gfx::Vector2d& scroll_delta,
286 float scale) OVERRIDE { 286 float scale) OVERRIDE {
287 test_hooks_->ApplyScrollAndScale(scroll_delta, scale); 287 test_hooks_->ApplyScrollAndScale(scroll_delta, scale);
288 } 288 }
289 289
290 virtual scoped_ptr<OutputSurface> CreateOutputSurface(bool fallback) 290 virtual scoped_ptr<OutputSurface> CreateOutputSurface(bool fallback)
(...skipping 450 matching lines...) Expand 10 before | Expand all | Expand 10 after
741 return -1; 741 return -1;
742 } 742 }
743 743
744 void LayerTreeTest::DestroyLayerTreeHost() { 744 void LayerTreeTest::DestroyLayerTreeHost() {
745 if (layer_tree_host_ && layer_tree_host_->root_layer()) 745 if (layer_tree_host_ && layer_tree_host_->root_layer())
746 layer_tree_host_->root_layer()->SetLayerTreeHost(NULL); 746 layer_tree_host_->root_layer()->SetLayerTreeHost(NULL);
747 layer_tree_host_.reset(); 747 layer_tree_host_.reset();
748 } 748 }
749 749
750 } // namespace cc 750 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698