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

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

Issue 660333004: cc cleanup: Update paths to geometry headers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 6 years, 1 month 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_test_common.cc ('k') | cc/test/pixel_comparator.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 11 matching lines...) Expand all
22 #include "cc/test/test_shared_bitmap_manager.h" 22 #include "cc/test/test_shared_bitmap_manager.h"
23 #include "cc/test/tiled_layer_test_common.h" 23 #include "cc/test/tiled_layer_test_common.h"
24 #include "cc/trees/layer_tree_host_client.h" 24 #include "cc/trees/layer_tree_host_client.h"
25 #include "cc/trees/layer_tree_host_impl.h" 25 #include "cc/trees/layer_tree_host_impl.h"
26 #include "cc/trees/layer_tree_host_single_thread_client.h" 26 #include "cc/trees/layer_tree_host_single_thread_client.h"
27 #include "cc/trees/layer_tree_impl.h" 27 #include "cc/trees/layer_tree_impl.h"
28 #include "cc/trees/single_thread_proxy.h" 28 #include "cc/trees/single_thread_proxy.h"
29 #include "cc/trees/thread_proxy.h" 29 #include "cc/trees/thread_proxy.h"
30 #include "testing/gmock/include/gmock/gmock.h" 30 #include "testing/gmock/include/gmock/gmock.h"
31 #include "ui/gfx/frame_time.h" 31 #include "ui/gfx/frame_time.h"
32 #include "ui/gfx/size_conversions.h" 32 #include "ui/gfx/geometry/size_conversions.h"
33 33
34 namespace cc { 34 namespace cc {
35 35
36 TestHooks::TestHooks() {} 36 TestHooks::TestHooks() {}
37 37
38 TestHooks::~TestHooks() {} 38 TestHooks::~TestHooks() {}
39 39
40 DrawResult TestHooks::PrepareToDrawOnThread( 40 DrawResult TestHooks::PrepareToDrawOnThread(
41 LayerTreeHostImpl* host_impl, 41 LayerTreeHostImpl* host_impl,
42 LayerTreeHostImpl::FrameData* frame_data, 42 LayerTreeHostImpl::FrameData* frame_data,
(...skipping 671 matching lines...) Expand 10 before | Expand all | Expand 10 after
714 return -1; 714 return -1;
715 } 715 }
716 716
717 void LayerTreeTest::DestroyLayerTreeHost() { 717 void LayerTreeTest::DestroyLayerTreeHost() {
718 if (layer_tree_host_ && layer_tree_host_->root_layer()) 718 if (layer_tree_host_ && layer_tree_host_->root_layer())
719 layer_tree_host_->root_layer()->SetLayerTreeHost(NULL); 719 layer_tree_host_->root_layer()->SetLayerTreeHost(NULL);
720 layer_tree_host_ = nullptr; 720 layer_tree_host_ = nullptr;
721 } 721 }
722 722
723 } // namespace cc 723 } // namespace cc
OLDNEW
« no previous file with comments | « cc/test/layer_test_common.cc ('k') | cc/test/pixel_comparator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698