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

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

Issue 606113003: Revert of Make cc output surface creation async (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 2 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
« no previous file with comments | « cc/test/layer_test_common.cc ('k') | cc/test/layer_tree_host_common_test.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"
13 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
14 13
15 namespace gfx { 14 namespace gfx {
16 class PointF; 15 class PointF;
17 class Point3F; 16 class Point3F;
18 class Size; 17 class Size;
19 class Transform; 18 class Transform;
20 } 19 }
21 20
22 namespace cc { 21 namespace cc {
23 22
24 class FakeLayerTreeHost;
25 class Layer; 23 class Layer;
26 class LayerImpl; 24 class LayerImpl;
27 class RenderSurfaceLayerList; 25 class RenderSurfaceLayerList;
28 26
29 class LayerTreeHostCommonTestBase { 27 class LayerTreeHostCommonTestBase {
30 protected: 28 protected:
31 LayerTreeHostCommonTestBase(); 29 LayerTreeHostCommonTestBase();
32 virtual ~LayerTreeHostCommonTestBase(); 30 virtual ~LayerTreeHostCommonTestBase();
33 31
34 template <typename LayerType> 32 template <typename LayerType>
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 } 109 }
112 110
113 LayerImplList* render_surface_layer_list_impl() const { 111 LayerImplList* render_surface_layer_list_impl() const {
114 return render_surface_layer_list_impl_.get(); 112 return render_surface_layer_list_impl_.get();
115 } 113 }
116 114
117 int render_surface_layer_list_count() const { 115 int render_surface_layer_list_count() const {
118 return render_surface_layer_list_count_; 116 return render_surface_layer_list_count_;
119 } 117 }
120 118
121 scoped_ptr<FakeLayerTreeHost> CreateFakeLayerTreeHost();
122
123 private: 119 private:
124 scoped_ptr<RenderSurfaceLayerList> render_surface_layer_list_; 120 scoped_ptr<RenderSurfaceLayerList> render_surface_layer_list_;
125 scoped_ptr<std::vector<LayerImpl*> > render_surface_layer_list_impl_; 121 scoped_ptr<std::vector<LayerImpl*> > render_surface_layer_list_impl_;
126 122
127 FakeLayerTreeHostClient client_;
128 int render_surface_layer_list_count_; 123 int render_surface_layer_list_count_;
129 }; 124 };
130 125
131 class LayerTreeHostCommonTest : public LayerTreeHostCommonTestBase, 126 class LayerTreeHostCommonTest : public LayerTreeHostCommonTestBase,
132 public testing::Test {}; 127 public testing::Test {};
133 128
134 } // namespace cc 129 } // namespace cc
135 130
136 #endif // CC_TEST_LAYER_TREE_HOST_COMMON_TEST_H_ 131 #endif // CC_TEST_LAYER_TREE_HOST_COMMON_TEST_H_
OLDNEW
« no previous file with comments | « cc/test/layer_test_common.cc ('k') | cc/test/layer_tree_host_common_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698