diff options
| author | vollick <vollick@chromium.org> | 2015-03-19 11:49:09 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-19 18:49:53 +0000 |
| commit | 1aa849117446c8524275bd305226fee8859f0c6f (patch) | |
| tree | 2c6aa245b83ad50fa0c189926183ec462e91e06d /cc/test/layer_tree_test.cc | |
| parent | da3b00060ead40f4c7d41be91a4a2abbceb311c4 (diff) | |
| download | chromium_src-1aa849117446c8524275bd305226fee8859f0c6f.zip chromium_src-1aa849117446c8524275bd305226fee8859f0c6f.tar.gz chromium_src-1aa849117446c8524275bd305226fee8859f0c6f.tar.bz2 | |
Don't let unittests access LTH from the impl thread.
This causes racy sadness.
BUG=235188
Review URL: https://codereview.chromium.org/1020803002
Cr-Commit-Position: refs/heads/master@{#321398}
Diffstat (limited to 'cc/test/layer_tree_test.cc')
| -rw-r--r-- | cc/test/layer_tree_test.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc index 3c6ff57..56ef2c1 100644 --- a/cc/test/layer_tree_test.cc +++ b/cc/test/layer_tree_test.cc @@ -878,4 +878,13 @@ void LayerTreeTest::DestroyLayerTreeHost() { layer_tree_host_ = nullptr; } +LayerTreeHost* LayerTreeTest::layer_tree_host() { + // We check for a null proxy here as we sometimes ask for the layer tree host + // when the proxy does not exist, often for checking settings after a test has + // completed. For example, LTHPixelResourceTest::RunPixelResourceTest. See + // elsewhere in this file for other examples. + DCHECK(!proxy() || proxy()->IsMainThread() || proxy()->IsMainThreadBlocked()); + return layer_tree_host_.get(); +} + } // namespace cc |