cc: Block commit on activate by setting a flag on LayerTreeHost.

cc/trees/layer_tree_host.h

 // 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.
 
 #ifndef CC_TREES_LAYER_TREE_HOST_H_
 #define CC_TREES_LAYER_TREE_HOST_H_
 
 #include <limits>
 #include <list>
 #include <vector>
@@ skipping 248 matching lines @@
                               bool animate);
 
   HeadsUpDisplayLayer* hud_layer() const { return hud_layer_.get(); }
 
   Proxy* proxy() const { return proxy_.get(); }
 
   AnimationRegistrar* animation_registrar() const {
     return animation_registrar_.get();
   }
 
-  bool BlocksPendingCommit() const;
+  void SetNextCommitWaitsForActivation() {
+    commit_waits_for_activation_ = true;

[danakj, 2013/08/29 01:58:18]

It occured to me, maybe this should just set a bit on the proxy, so the proxy
doesn't have to read it off the LTH later, and it can reset it once it's done
with it. Less magical maybe?

I'll do it this way tomorrow if no one cries foul.

+  }
+  bool CommitWaitsForActivation() const {
+    return commit_waits_for_activation_;
+  }
 
   // Obtains a thorough dump of the LayerTreeHost as a value.
   scoped_ptr<base::Value> AsValue() const;
 
   bool in_paint_layer_contents() const { return in_paint_layer_contents_; }
 
   // CreateUIResource creates a resource given a bitmap.  The bitmap is
   // generated via an interface function, which is called when initializing the
   // resource and when the resource has been lost (due to lost context).  The
   // parameter of the interface is a single boolean, which indicates whether the
@@ skipping 48 matching lines @@
   int next_ui_resource_id_;
 
   typedef std::list<UIResourceRequest> UIResourceRequestQueue;
   UIResourceRequestQueue ui_resource_request_queue_;
 
   void CalculateLCDTextMetricsCallback(Layer* layer);
 
   bool animating_;
   bool needs_full_tree_sync_;
   bool needs_filter_context_;
+  bool commit_waits_for_activation_;
 
   base::CancelableClosure prepaint_callback_;
 
   LayerTreeHostClient* client_;
   scoped_ptr<Proxy> proxy_;
 
   int source_frame_number_;
   scoped_ptr<RenderingStatsInstrumentation> rendering_stats_instrumentation_;
 
   bool output_surface_can_be_initialized_;
@@ skipping 63 matching lines @@
   };
   LCDTextMetrics lcd_text_metrics_;
   int tree_id_;
 
   DISALLOW_COPY_AND_ASSIGN(LayerTreeHost);
 };
 
 }  // namespace cc
 
 #endif  // CC_TREES_LAYER_TREE_HOST_H_