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

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

Issue 14179022: Shouldn't access LayerTreeTest::layer_tree_host on impl thread (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 6 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 | « no previous file | cc/test/layer_tree_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 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 #ifndef CC_TEST_LAYER_TREE_TEST_H_ 5 #ifndef CC_TEST_LAYER_TREE_TEST_H_
6 #define CC_TEST_LAYER_TREE_TEST_H_ 6 #define CC_TEST_LAYER_TREE_TEST_H_
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/threading/thread.h" 9 #include "base/threading/thread.h"
10 #include "cc/base/thread.h" 10 #include "cc/base/thread.h"
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 bool delegating_renderer, 139 bool delegating_renderer,
140 bool impl_side_painting); 140 bool impl_side_painting);
141 141
142 Thread* ImplThread() { return proxy() ? proxy()->ImplThread() : NULL; } 142 Thread* ImplThread() { return proxy() ? proxy()->ImplThread() : NULL; }
143 Proxy* proxy() const { 143 Proxy* proxy() const {
144 return layer_tree_host_ ? layer_tree_host_->proxy() : NULL; 144 return layer_tree_host_ ? layer_tree_host_->proxy() : NULL;
145 } 145 }
146 146
147 bool TestEnded() const { return ended_; } 147 bool TestEnded() const { return ended_; }
148 148
149 LayerTreeHost* layer_tree_host() { return layer_tree_host_.get(); } 149 LayerTreeHost* layer_tree_host();
150 bool delegating_renderer() const { return delegating_renderer_; } 150 bool delegating_renderer() const { return delegating_renderer_; }
151 151
152 virtual scoped_ptr<OutputSurface> CreateOutputSurface() OVERRIDE; 152 virtual scoped_ptr<OutputSurface> CreateOutputSurface() OVERRIDE;
153 virtual scoped_refptr<cc::ContextProvider> 153 virtual scoped_refptr<cc::ContextProvider>
154 OffscreenContextProviderForMainThread() OVERRIDE; 154 OffscreenContextProviderForMainThread() OVERRIDE;
155 virtual scoped_refptr<cc::ContextProvider> 155 virtual scoped_refptr<cc::ContextProvider>
156 OffscreenContextProviderForCompositorThread() OVERRIDE; 156 OffscreenContextProviderForCompositorThread() OVERRIDE;
157 157
158 private: 158 private:
159 LayerTreeSettings settings_; 159 LayerTreeSettings settings_;
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 228
229 #define SINGLE_AND_MULTI_THREAD_DELEGATING_RENDERER_TEST_F(TEST_FIXTURE_NAME) \ 229 #define SINGLE_AND_MULTI_THREAD_DELEGATING_RENDERER_TEST_F(TEST_FIXTURE_NAME) \
230 SINGLE_THREAD_DELEGATING_RENDERER_TEST_F(TEST_FIXTURE_NAME); \ 230 SINGLE_THREAD_DELEGATING_RENDERER_TEST_F(TEST_FIXTURE_NAME); \
231 MULTI_THREAD_DELEGATING_RENDERER_TEST_F(TEST_FIXTURE_NAME) 231 MULTI_THREAD_DELEGATING_RENDERER_TEST_F(TEST_FIXTURE_NAME)
232 232
233 #define SINGLE_AND_MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME) \ 233 #define SINGLE_AND_MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME) \
234 SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F(TEST_FIXTURE_NAME); \ 234 SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F(TEST_FIXTURE_NAME); \
235 SINGLE_AND_MULTI_THREAD_DELEGATING_RENDERER_TEST_F(TEST_FIXTURE_NAME) 235 SINGLE_AND_MULTI_THREAD_DELEGATING_RENDERER_TEST_F(TEST_FIXTURE_NAME)
236 236
237 #endif // CC_TEST_LAYER_TREE_TEST_H_ 237 #endif // CC_TEST_LAYER_TREE_TEST_H_
OLDNEW
« no previous file with comments | « no previous file | cc/test/layer_tree_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698