Move VISUAL_STATE promise to activation

cc/trees/layer_tree_impl.h

Index: cc/trees/layer_tree_impl.h
diff --git a/cc/trees/layer_tree_impl.h b/cc/trees/layer_tree_impl.h
index 76911e1543d345c680d1f297bcf4f03ce36f67ec..001504f42d26579a4903343f9ed3cd8029a4066c 100644
--- a/cc/trees/layer_tree_impl.h
+++ b/cc/trees/layer_tree_impl.h
@@ -16,8 +16,10 @@
 #include "cc/input/layer_selection_bound.h"
 #include "cc/layers/layer_impl.h"
 #include "cc/output/begin_frame_args.h"
+#include "cc/output/promise.h"
+#include "cc/output/promise_list.h"
 #include "cc/output/renderer.h"
-#include "cc/output/swap_promise.h"
+#include "cc/output/viewport_selection_bound.h"
 #include "cc/resources/ui_resource_client.h"
 #include "cc/trees/layer_tree_host_impl.h"
 #include "cc/trees/property_tree.h"
@@ -275,14 +277,14 @@ class CC_EXPORT LayerTreeImpl {
   // The outer viewport scroll layer scrolls first.
   void DistributeRootScrollOffset();
 
-  // Call this function when you expect there to be a swap buffer.
-  // See swap_promise.h for how to use SwapPromise.
-  void QueueSwapPromise(scoped_ptr<SwapPromise> swap_promise);
+  void PassPromises(PromiseList* other);
+  void QueuePromise(scoped_ptr<Promise> promise);
 
-  // Take the |new_swap_promise| and append it to |swap_promise_list_|.
-  void PassSwapPromises(ScopedPtrVector<SwapPromise>* new_swap_promise);
+  void BreakSwapPromises(Promise::DidNotSwap::Reason reason);
   void FinishSwapPromises(CompositorFrameMetadata* metadata);
-  void BreakSwapPromises(SwapPromise::DidNotSwapReason reason);
+
+  void BreakActivationPromises(Promise::DidNotActivate::Reason reason);
+  void FinishActivationPromises(CompositorFrameMetadata* metadata);
 
   void DidModifyTilePriorities();
 
@@ -408,7 +410,7 @@ class CC_EXPORT LayerTreeImpl {
 
   bool has_ever_been_drawn_;
 
-  ScopedPtrVector<SwapPromise> swap_promise_list_;
+  PromiseList promises_;
 
   UIResourceRequestQueue ui_resource_request_queue_;