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

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

Issue 1122393003: CC: Plumb LayerSettings parameter for cc::Layer construction. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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
« no previous file with comments | « cc/test/fake_picture_layer.cc ('k') | cc/test/layer_tree_json_parser.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 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 "cc/trees/property_tree.h" 14 #include "cc/trees/property_tree.h"
14 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
15 16
16 namespace gfx { 17 namespace gfx {
17 class PointF; 18 class PointF;
18 class Point3F; 19 class Point3F;
19 class Size; 20 class Size;
20 class Transform; 21 class Transform;
21 } 22 }
22 23
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 LayerImplList* render_surface_layer_list_impl() const { 116 LayerImplList* render_surface_layer_list_impl() const {
116 return render_surface_layer_list_impl_.get(); 117 return render_surface_layer_list_impl_.get();
117 } 118 }
118 119
119 int render_surface_layer_list_count() const { 120 int render_surface_layer_list_count() const {
120 return render_surface_layer_list_count_; 121 return render_surface_layer_list_count_;
121 } 122 }
122 123
123 scoped_ptr<FakeLayerTreeHost> CreateFakeLayerTreeHost(); 124 scoped_ptr<FakeLayerTreeHost> CreateFakeLayerTreeHost();
124 125
126 const LayerSettings& layer_settings() { return layer_settings_; }
127
125 private: 128 private:
126 scoped_ptr<RenderSurfaceLayerList> render_surface_layer_list_; 129 scoped_ptr<RenderSurfaceLayerList> render_surface_layer_list_;
127 scoped_ptr<std::vector<LayerImpl*>> render_surface_layer_list_impl_; 130 scoped_ptr<std::vector<LayerImpl*>> render_surface_layer_list_impl_;
131 LayerSettings layer_settings_;
128 132
129 FakeLayerTreeHostClient client_; 133 FakeLayerTreeHostClient client_;
130 int render_surface_layer_list_count_; 134 int render_surface_layer_list_count_;
131 }; 135 };
132 136
133 class LayerTreeHostCommonTest : public LayerTreeHostCommonTestBase, 137 class LayerTreeHostCommonTest : public LayerTreeHostCommonTestBase,
134 public testing::Test {}; 138 public testing::Test {};
135 139
136 } // namespace cc 140 } // namespace cc
137 141
138 #endif // CC_TEST_LAYER_TREE_HOST_COMMON_TEST_H_ 142 #endif // CC_TEST_LAYER_TREE_HOST_COMMON_TEST_H_
OLDNEW
« no previous file with comments | « cc/test/fake_picture_layer.cc ('k') | cc/test/layer_tree_json_parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698