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

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

Issue 952893003: Update from https://crrev.com/317530 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Fix gn for nacl Created 5 years, 9 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
« no previous file with comments | « cc/test/layer_tree_pixel_test.cc ('k') | cc/test/render_pass_test_common.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 423 matching lines...) Expand 10 before | Expand all | Expand 10 after
434 } 434 }
435 435
436 void DidCompleteSwapBuffers() override { 436 void DidCompleteSwapBuffers() override {
437 test_hooks_->DidCompleteSwapBuffers(); 437 test_hooks_->DidCompleteSwapBuffers();
438 } 438 }
439 439
440 void DidPostSwapBuffers() override {} 440 void DidPostSwapBuffers() override {}
441 void DidAbortSwapBuffers() override {} 441 void DidAbortSwapBuffers() override {}
442 void ScheduleComposite() override { test_hooks_->ScheduleComposite(); } 442 void ScheduleComposite() override { test_hooks_->ScheduleComposite(); }
443 void DidCompletePageScaleAnimation() override {} 443 void DidCompletePageScaleAnimation() override {}
444 void BeginMainFrameNotExpectedSoon() override {}
444 445
445 private: 446 private:
446 explicit LayerTreeHostClientForTesting(TestHooks* test_hooks) 447 explicit LayerTreeHostClientForTesting(TestHooks* test_hooks)
447 : test_hooks_(test_hooks) {} 448 : test_hooks_(test_hooks) {}
448 449
449 TestHooks* test_hooks_; 450 TestHooks* test_hooks_;
450 }; 451 };
451 452
452 // Adapts LayerTreeHost for test. Injects LayerTreeHostImplForTesting. 453 // Adapts LayerTreeHost for test. Injects LayerTreeHostImplForTesting.
453 class LayerTreeHostForTesting : public LayerTreeHost { 454 class LayerTreeHostForTesting : public LayerTreeHost {
(...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after
872 return -1; 873 return -1;
873 } 874 }
874 875
875 void LayerTreeTest::DestroyLayerTreeHost() { 876 void LayerTreeTest::DestroyLayerTreeHost() {
876 if (layer_tree_host_ && layer_tree_host_->root_layer()) 877 if (layer_tree_host_ && layer_tree_host_->root_layer())
877 layer_tree_host_->root_layer()->SetLayerTreeHost(NULL); 878 layer_tree_host_->root_layer()->SetLayerTreeHost(NULL);
878 layer_tree_host_ = nullptr; 879 layer_tree_host_ = nullptr;
879 } 880 }
880 881
881 } // namespace cc 882 } // namespace cc
OLDNEW
« no previous file with comments | « cc/test/layer_tree_pixel_test.cc ('k') | cc/test/render_pass_test_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698