cc: Allow the main thread to cancel commits

cc/trees/layer_tree_host_unittest.cc

 // Copyright 2011 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 <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/synchronization/lock.h"
@@ skipping 1799 matching lines @@
   virtual void BeginTest() OVERRIDE {
     layer_tree_host()->SetViewportSize(gfx::Size(10, 10));
     layer_tree_host()->root_layer()->SetBounds(gfx::Size(10, 10));
 
     PostSetNeedsCommitToMainThread();
   }
 
   virtual void DidCommit() OVERRIDE {
     if (num_draw_layers_ == 2)
       return;
-    layer_tree_host()->root_layer()->SetNeedsDisplay();
+    layer_tree_host()->SetNeedsCommit();
   }
 
   virtual void CommitCompleteOnThread(LayerTreeHostImpl* impl) OVERRIDE {
     if (num_draw_layers_ == 1)
       num_commit_complete_++;
   }
 
   virtual void DrawLayersOnThread(LayerTreeHostImpl* impl) OVERRIDE {
     num_draw_layers_++;
     if (num_draw_layers_ == 2)
@@ skipping 1264 matching lines @@
 class LayerTreeHostTestDeferredInitialize : public LayerTreeHostTest {
  public:
   virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE {
     // PictureLayer can only be used with impl side painting enabled.
     settings->impl_side_painting = true;
     settings->solid_color_scrollbars = true;
   }
 
   virtual void SetupTree() OVERRIDE {
     layer_ = FakePictureLayer::Create(&client_);
+    layer_->set_always_update_resources(true);

[danakj, 2013/07/18 21:57:23]

Does this mean that if we enable deferred GL, we don't actually end up drawing
the screen with GL without some damage?

[enne (OOO), 2013/07/19 01:23:51]

To fix this case, I'll add a needs_redraw_after_commit flag to
SchedulerStateMachine and make sure normal/aborted commits after did initialize
output surface set needs redraw appropriately in unit tests.

     layer_tree_host()->SetRootLayer(layer_);
     LayerTreeHostTest::SetupTree();
   }
 
   virtual void BeginTest() OVERRIDE {
     did_initialize_gl_ = false;
     did_release_gl_ = false;
     PostSetNeedsCommitToMainThread();
   }
 
@@ skipping 263 matching lines @@
         // Layers added to the tree get committed.
         ++expected_push_properties_child_;
         ++expected_push_properties_grandchild_;
         break;
       case 15:
         grandchild_->SetPosition(gfx::Point(1, 1));
         // The modified layer needs commit
         ++expected_push_properties_grandchild_;
         break;
       case 16:
+        // SetNeedsDisplay does not always set needs commit (so call it
+        // explicitly), but is a property change.
         child_->SetNeedsDisplay();
-        // The modified layer needs commit
         ++expected_push_properties_child_;
+        layer_tree_host()->SetNeedsCommit();
         break;
       case 17:
         EndTest();
         break;
     }
 
     // Content/Picture layers require PushProperties every commit that they are
     // in the tree.
     if ((leaf_content_layer_.get() && leaf_content_layer_->layer_tree_host()) ||
         (leaf_picture_layer_.get() && leaf_picture_layer_->layer_tree_host()))
@@ skipping 485 matching lines @@
         break;
     }
   }
 };
 
 MULTI_THREAD_TEST_F(
     LayerTreeHostTestPushPropertiesSetPropertyInChildThenParent);
 
 }  // namespace
 }  // namespace cc