Shouldn't access LayerTreeTest::layer_tree_host on impl thread

If the main thread is unblocked and we access this function on the impl thread,
we're in a racy situation. This should be an error.

BUG=235188

Review URL: https://chromiumcodereview.appspot.com/14179022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202942 0039d316-1c4b-4281-b951-d872f2087c98

cc/test/layer_tree_test.cc

@@ -605,4 +605,9 @@ scoped_refptr<cc::ContextProvider> LayerTreeTest::
   return compositor_thread_contexts_;
 }
 
+LayerTreeHost* LayerTreeTest::layer_tree_host() {
+  DCHECK(proxy()->IsMainThread() || proxy()->IsMainThreadBlocked());
+  return layer_tree_host_.get();
+}
+
 }  // namespace cc

cc/test/layer_tree_test.h

@@ -146,7 +146,7 @@ class LayerTreeTest : public testing::Test, public TestHooks {
 
   bool TestEnded() const { return ended_; }
 
-  LayerTreeHost* layer_tree_host() { return layer_tree_host_.get(); }
+  LayerTreeHost* layer_tree_host();
   bool delegating_renderer() const { return delegating_renderer_; }
 
   virtual scoped_ptr<OutputSurface> CreateOutputSurface() OVERRIDE;

cc/trees/layer_tree_host_unittest_animation.cc

@@ -291,7 +291,6 @@ class LayerTreeHostAnimationTestTickAnimationWhileBackgrounded
 SINGLE_AND_MULTI_THREAD_TEST_F(
     LayerTreeHostAnimationTestTickAnimationWhileBackgrounded);
 
-// Ensures that animations continue to be ticked when we are backgrounded.
 class LayerTreeHostAnimationTestAddAnimationWithTimingFunction
     : public LayerTreeHostAnimationTest {
  public:
@@ -301,6 +300,7 @@ class LayerTreeHostAnimationTestAddAnimationWithTimingFunction
     LayerTreeHostAnimationTest::SetupTree();
     content_ = FakeContentLayer::Create(&client_);
     content_->SetBounds(gfx::Size(4, 4));
+    content_->set_layer_animation_delegate(this);
     layer_tree_host()->root_layer()->AddChild(content_);
   }
 
@@ -308,17 +308,12 @@ class LayerTreeHostAnimationTestAddAnimationWithTimingFunction
     PostAddAnimationToMainThread(content_);
   }
 
-  virtual void AnimateLayers(
-      LayerTreeHostImpl* host_impl,
-      base::TimeTicks monotonic_time) OVERRIDE {
+  virtual void notifyAnimationStarted(double wallClockTime) OVERRIDE {
     LayerAnimationController* controller =
         layer_tree_host()->root_layer()->children()[0]->
         layer_animation_controller();
     Animation* animation =
         controller->GetAnimation(Animation::Opacity);
-    if (!animation)
-      return;
-
     const FloatAnimationCurve* curve =
         animation->curve()->ToFloatAnimationCurve();
     float start_opacity = curve->GetValue(0.0);
@@ -331,14 +326,8 @@ class LayerTreeHostAnimationTestAddAnimationWithTimingFunction
     // because of the default ease timing function.
     EXPECT_FLOAT_EQ(linearly_interpolated_opacity, curve->GetValue(time));
 
-    LayerAnimationController* controller_impl =
-        host_impl->active_tree()->root_layer()->children()[0]->
-        layer_animation_controller();
-    Animation* animation_impl =
-        controller_impl->GetAnimation(Animation::Opacity);
-
     controller->RemoveAnimation(animation->id());
-    controller_impl->RemoveAnimation(animation_impl->id());
+
     EndTest();
   }
 

cc/trees/single_thread_proxy.cc

@@ -97,7 +97,7 @@ void SingleThreadProxy::SetLayerTreeHostClientReady() {
 }
 
 void SingleThreadProxy::SetVisible(bool visible) {
-  DebugScopedSetImplThread impl(this);
+  DebugScopedSetImplThreadAndMainThreadBlocked impl(this);
   layer_tree_host_impl_->SetVisible(visible);
 }
 
@@ -176,9 +176,7 @@ void SingleThreadProxy::DoCommit(scoped_ptr<ResourceUpdateQueue> queue) {
   DCHECK(Proxy::IsMainThread());
   // Commit immediately.
   {
-    DebugScopedSetMainThreadBlocked mainThreadBlocked(this);
-    DebugScopedSetImplThread impl(this);
-
+    DebugScopedSetImplThreadAndMainThreadBlocked impl_with_main_blocked(this);
     RenderingStatsInstrumentation* stats_instrumentation =
         layer_tree_host_->rendering_stats_instrumentation();
     base::TimeTicks start_time = stats_instrumentation->StartRecording();