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

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

Issue 18454002: Reland "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, 5 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_tree_test.h ('k') | cc/trees/layer_tree_host_unittest.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 #include "cc/test/layer_tree_test.h" 5 #include "cc/test/layer_tree_test.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "cc/animation/animation.h" 8 #include "cc/animation/animation.h"
9 #include "cc/animation/animation_registrar.h" 9 #include "cc/animation/animation_registrar.h"
10 #include "cc/animation/layer_animation_controller.h" 10 #include "cc/animation/layer_animation_controller.h"
(...skipping 609 matching lines...) Expand 10 before | Expand all | Expand 10 after
620 } 620 }
621 621
622 scoped_refptr<cc::ContextProvider> LayerTreeTest:: 622 scoped_refptr<cc::ContextProvider> LayerTreeTest::
623 OffscreenContextProviderForCompositorThread() { 623 OffscreenContextProviderForCompositorThread() {
624 if (!compositor_thread_contexts_.get() || 624 if (!compositor_thread_contexts_.get() ||
625 compositor_thread_contexts_->DestroyedOnMainThread()) 625 compositor_thread_contexts_->DestroyedOnMainThread())
626 compositor_thread_contexts_ = FakeContextProvider::Create(); 626 compositor_thread_contexts_ = FakeContextProvider::Create();
627 return compositor_thread_contexts_; 627 return compositor_thread_contexts_;
628 } 628 }
629 629
630 LayerTreeHost* LayerTreeTest::layer_tree_host() {
631 DCHECK(proxy()->IsMainThread() || proxy()->IsMainThreadBlocked());
632 return layer_tree_host_.get();
633 }
634
630 } // namespace cc 635 } // namespace cc
OLDNEW
« no previous file with comments | « cc/test/layer_tree_test.h ('k') | cc/trees/layer_tree_host_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698