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

Side by Side Diff: cc/test/layer_tree_host_common_test.h

Issue 1101823002: CC Animations: Make LayerAnimationController creation optional (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Plumb LayerSettings parameter for cc::Layer construction. Created 5 years, 7 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef CC_TEST_LAYER_TREE_HOST_COMMON_TEST_H_ 5 #ifndef CC_TEST_LAYER_TREE_HOST_COMMON_TEST_H_
6 #define CC_TEST_LAYER_TREE_HOST_COMMON_TEST_H_ 6 #define CC_TEST_LAYER_TREE_HOST_COMMON_TEST_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "cc/layers/layer_lists.h" 11 #include "cc/layers/layer_lists.h"
12 #include "cc/test/fake_layer_tree_host_client.h" 12 #include "cc/test/fake_layer_tree_host_client.h"
13 #include "cc/trees/layer_tree_settings.h"
13 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
14 15
15 namespace gfx { 16 namespace gfx {
16 class PointF; 17 class PointF;
17 class Point3F; 18 class Point3F;
18 class Size; 19 class Size;
19 class Transform; 20 class Transform;
20 } 21 }
21 22
22 namespace cc { 23 namespace cc {
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 LayerImplList* render_surface_layer_list_impl() const { 112 LayerImplList* render_surface_layer_list_impl() const {
112 return render_surface_layer_list_impl_.get(); 113 return render_surface_layer_list_impl_.get();
113 } 114 }
114 115
115 int render_surface_layer_list_count() const { 116 int render_surface_layer_list_count() const {
116 return render_surface_layer_list_count_; 117 return render_surface_layer_list_count_;
117 } 118 }
118 119
119 scoped_ptr<FakeLayerTreeHost> CreateFakeLayerTreeHost(); 120 scoped_ptr<FakeLayerTreeHost> CreateFakeLayerTreeHost();
120 121
122 const LayerSettings& layer_settings() { return layer_settings_; }
123
121 private: 124 private:
122 scoped_ptr<RenderSurfaceLayerList> render_surface_layer_list_; 125 scoped_ptr<RenderSurfaceLayerList> render_surface_layer_list_;
123 scoped_ptr<std::vector<LayerImpl*>> render_surface_layer_list_impl_; 126 scoped_ptr<std::vector<LayerImpl*>> render_surface_layer_list_impl_;
127 LayerSettings layer_settings_;
124 128
125 FakeLayerTreeHostClient client_; 129 FakeLayerTreeHostClient client_;
126 int render_surface_layer_list_count_; 130 int render_surface_layer_list_count_;
127 }; 131 };
128 132
129 class LayerTreeHostCommonTest : public LayerTreeHostCommonTestBase, 133 class LayerTreeHostCommonTest : public LayerTreeHostCommonTestBase,
130 public testing::Test {}; 134 public testing::Test {};
131 135
132 } // namespace cc 136 } // namespace cc
133 137
134 #endif // CC_TEST_LAYER_TREE_HOST_COMMON_TEST_H_ 138 #endif // CC_TEST_LAYER_TREE_HOST_COMMON_TEST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698