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

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

Issue 1020803002: Don't let unittests access LTH from the impl thread. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added a comment. Created 5 years, 9 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 | « 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/animation/animation_delegate.h" 10 #include "cc/animation/animation_delegate.h"
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 } 191 }
192 base::SingleThreadTaskRunner* MainThreadTaskRunner() { 192 base::SingleThreadTaskRunner* MainThreadTaskRunner() {
193 return main_task_runner_.get(); 193 return main_task_runner_.get();
194 } 194 }
195 Proxy* proxy() const { 195 Proxy* proxy() const {
196 return layer_tree_host_ ? layer_tree_host_->proxy() : NULL; 196 return layer_tree_host_ ? layer_tree_host_->proxy() : NULL;
197 } 197 }
198 198
199 bool TestEnded() const { return ended_; } 199 bool TestEnded() const { return ended_; }
200 200
201 LayerTreeHost* layer_tree_host() { return layer_tree_host_.get(); } 201 LayerTreeHost* layer_tree_host();
202 bool delegating_renderer() const { return delegating_renderer_; } 202 bool delegating_renderer() const { return delegating_renderer_; }
203 FakeOutputSurface* output_surface() { return output_surface_; } 203 FakeOutputSurface* output_surface() { return output_surface_; }
204 int LastCommittedSourceFrameNumber(LayerTreeHostImpl* impl) const; 204 int LastCommittedSourceFrameNumber(LayerTreeHostImpl* impl) const;
205 205
206 void DestroyLayerTreeHost(); 206 void DestroyLayerTreeHost();
207 207
208 // By default, output surface recreation is synchronous. 208 // By default, output surface recreation is synchronous.
209 void RequestNewOutputSurface() override; 209 void RequestNewOutputSurface() override;
210 // Override this for pixel tests, where you need a real output surface. 210 // Override this for pixel tests, where you need a real output surface.
211 virtual scoped_ptr<OutputSurface> CreateOutputSurface(); 211 virtual scoped_ptr<OutputSurface> CreateOutputSurface();
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
372 SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F(TEST_FIXTURE_NAME); \ 372 SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F(TEST_FIXTURE_NAME); \
373 SINGLE_AND_MULTI_THREAD_DELEGATING_RENDERER_TEST_F(TEST_FIXTURE_NAME) 373 SINGLE_AND_MULTI_THREAD_DELEGATING_RENDERER_TEST_F(TEST_FIXTURE_NAME)
374 374
375 // Some tests want to control when notify ready for activation occurs, 375 // Some tests want to control when notify ready for activation occurs,
376 // but this is not supported in the single-threaded case. 376 // but this is not supported in the single-threaded case.
377 #define SINGLE_AND_MULTI_THREAD_BLOCKNOTIFY_TEST_F(TEST_FIXTURE_NAME) \ 377 #define SINGLE_AND_MULTI_THREAD_BLOCKNOTIFY_TEST_F(TEST_FIXTURE_NAME) \
378 SINGLE_THREAD_NOIMPL_TEST_F(TEST_FIXTURE_NAME); \ 378 SINGLE_THREAD_NOIMPL_TEST_F(TEST_FIXTURE_NAME); \
379 MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME) 379 MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME)
380 380
381 #endif // CC_TEST_LAYER_TREE_TEST_H_ 381 #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