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

Side by Side Diff: trunk/src/cc/trees/layer_tree_host_unittest_animation.cc

Issue 13316003: Revert 191364 "cc: Add ‘chromium_code’: 1 to cc.gyp and cc_t..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 8 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
Property Changes:
Deleted: svn:mergeinfo
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/trees/layer_tree_host.h" 5 #include "cc/trees/layer_tree_host.h"
6 6
7 #include "cc/animation/animation_curve.h" 7 #include "cc/animation/animation_curve.h"
8 #include "cc/animation/layer_animation_controller.h" 8 #include "cc/animation/layer_animation_controller.h"
9 #include "cc/animation/timing_function.h" 9 #include "cc/animation/timing_function.h"
10 #include "cc/layers/layer.h" 10 #include "cc/layers/layer.h"
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 PostAddAnimationToMainThread(update_check_layer_.get()); 381 PostAddAnimationToMainThread(update_check_layer_.get());
382 } 382 }
383 383
384 virtual void CommitCompleteOnThread(LayerTreeHostImpl* tree_impl) OVERRIDE { 384 virtual void CommitCompleteOnThread(LayerTreeHostImpl* tree_impl) OVERRIDE {
385 EndTest(); 385 EndTest();
386 } 386 }
387 387
388 virtual void AfterTest() OVERRIDE { 388 virtual void AfterTest() OVERRIDE {
389 // Update() should have been called once, proving that the layer was not 389 // Update() should have been called once, proving that the layer was not
390 // skipped. 390 // skipped.
391 EXPECT_EQ(1u, update_check_layer_->update_count()); 391 EXPECT_EQ(1, update_check_layer_->update_count());
392 392
393 // clear update_check_layer_ so LayerTreeHost dies. 393 // clear update_check_layer_ so LayerTreeHost dies.
394 update_check_layer_ = NULL; 394 update_check_layer_ = NULL;
395 } 395 }
396 396
397 private: 397 private:
398 FakeContentLayerClient client_; 398 FakeContentLayerClient client_;
399 scoped_refptr<FakeContentLayer> update_check_layer_; 399 scoped_refptr<FakeContentLayer> update_check_layer_;
400 }; 400 };
401 401
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
532 532
533 private: 533 private:
534 int num_commit_complete_; 534 int num_commit_complete_;
535 int num_draw_layers_; 535 int num_draw_layers_;
536 }; 536 };
537 537
538 MULTI_THREAD_TEST_F(LayerTreeHostAnimationTestContinuousAnimate); 538 MULTI_THREAD_TEST_F(LayerTreeHostAnimationTestContinuousAnimate);
539 539
540 } // namespace 540 } // namespace
541 } // namespace cc 541 } // namespace cc
OLDNEW
« no previous file with comments | « trunk/src/cc/trees/layer_tree_host_unittest.cc ('k') | trunk/src/cc/trees/layer_tree_host_unittest_context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698