cc: Allow the main thread to cancel commits

cc/trees/layer_tree_host_unittest_animation.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/trees/layer_tree_host.h"
 
 #include "cc/animation/animation_curve.h"
 #include "cc/animation/layer_animation_controller.h"
 #include "cc/animation/timing_function.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/layer_impl.h"
 #include "cc/test/animation_test_common.h"
 #include "cc/test/fake_content_layer.h"
 #include "cc/test/fake_content_layer_client.h"
 #include "cc/test/layer_tree_test.h"
 #include "cc/trees/layer_tree_impl.h"
 
 namespace cc {
 namespace {
 
+class AlwaysUpdateLayer : public Layer {
+ public:
+  static scoped_refptr<AlwaysUpdateLayer> Create() {
+    return new AlwaysUpdateLayer();
+  }
+
+  virtual bool DrawsContent() const OVERRIDE { return true; }
+  virtual bool Update(ResourceUpdateQueue* queue,
+                      const OcclusionTracker* occlusion) OVERRIDE {
+    return true;

[danakj, 2013/07/17 20:53:24]

Why do you need update to force commit for these tests?

[enne (OOO), 2013/07/18 17:36:37]

Thanks for calling this out.  I dug into this further and realized that I wasn't
handling both (1) Layer::ignore_set_needs_commit_ and (2)
SchedulerStateMachine::needs_forced_redraw_after_next_commit_.

I've reverted all the changes to this file.

+  }
+
+ private:
+  AlwaysUpdateLayer() {}
+  virtual ~AlwaysUpdateLayer() {}
+};
+
 class LayerTreeHostAnimationTest : public LayerTreeTest {
  public:
   virtual void SetupTree() OVERRIDE {
+    scoped_refptr<AlwaysUpdateLayer> root_layer = AlwaysUpdateLayer::Create();
+    root_layer->SetBounds(gfx::Size(1, 1));
+    root_layer->SetIsDrawable(true);
+    root_layer->SetScrollable(true);
+    layer_tree_host()->SetRootLayer(root_layer);
+
     LayerTreeTest::SetupTree();
     layer_tree_host()->root_layer()->set_layer_animation_delegate(this);
   }
 };
 
 // Makes sure that SetNeedsAnimate does not cause the CommitRequested() state to
 // be set.
 class LayerTreeHostAnimationTestSetNeedsAnimateShouldNotSetCommitRequested
     : public LayerTreeHostAnimationTest {
  public:
@@ skipping 404 matching lines @@
 // Ensures that when opacity is being animated, this value does not cause the
 // subtree to be skipped.
 class LayerTreeHostAnimationTestDoNotSkipLayersWithAnimatedOpacity
     : public LayerTreeHostAnimationTest {
  public:
   LayerTreeHostAnimationTestDoNotSkipLayersWithAnimatedOpacity()
       : update_check_layer_(FakeContentLayer::Create(&client_)) {
   }
 
   virtual void SetupTree() OVERRIDE {
+    LayerTreeHostAnimationTest::SetupTree();
     update_check_layer_->SetOpacity(0.f);
-    layer_tree_host()->SetRootLayer(update_check_layer_);
-    LayerTreeHostAnimationTest::SetupTree();
+    layer_tree_host()->root_layer()->AddChild(update_check_layer_);
   }
 
   virtual void BeginTest() OVERRIDE {
     PostAddAnimationToMainThread(update_check_layer_.get());
   }
 
   virtual void DidActivateTreeOnThread(LayerTreeHostImpl* host_impl) OVERRIDE {
+    LayerImpl* update_check_layer_impl =
+        host_impl->active_tree()->LayerById(update_check_layer_->id());
     LayerAnimationController* controller_impl =
-        host_impl->active_tree()->root_layer()->layer_animation_controller();
+        update_check_layer_impl->layer_animation_controller();
     Animation* animation_impl =
         controller_impl->GetAnimation(Animation::Opacity);
     controller_impl->RemoveAnimation(animation_impl->id());
     EndTest();
   }
 
-  virtual void AfterTest() OVERRIDE {
+  virtual void DidCommit() OVERRIDE {
     // Update() should have been called once, proving that the layer was not
     // skipped.
     EXPECT_EQ(1u, update_check_layer_->update_count());
+    update_check_layer_->reset_update_count();

[danakj, 2013/07/17 20:53:24]

Are you seeing more updates now than we were before?

[enne (OOO), 2013/07/18 17:36:37]

Yeah, this was the result of ignoring the ignore set needs commit flag for
SetNeedsUpdate.

+  }
 
-    // clear update_check_layer_ so LayerTreeHost dies.
-    update_check_layer_ = NULL;
-  }
+  virtual void AfterTest() OVERRIDE {}
 
  private:
   FakeContentLayerClient client_;
   scoped_refptr<FakeContentLayer> update_check_layer_;
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(
     LayerTreeHostAnimationTestDoNotSkipLayersWithAnimatedOpacity);
 
 // Layers added to tree with existing active animations should have the
@@ skipping 311 matching lines @@
   int finished_times_;
   FakeContentLayerClient client_;
   scoped_refptr<FakeContentLayer> content_;
 };
 
 MULTI_THREAD_TEST_F(
     LayerTreeHostAnimationTestCheckerboardDoesntStartAnimations);
 
 }  // namespace
 }  // namespace cc