Move VISUAL_STATE promise to activation

cc/trees/layer_tree_impl.h

 // 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.
 
 #ifndef CC_TREES_LAYER_TREE_IMPL_H_
 #define CC_TREES_LAYER_TREE_IMPL_H_
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/containers/hash_tables.h"
 #include "base/values.h"
 #include "cc/base/scoped_ptr_vector.h"
 #include "cc/base/synced_property.h"
 #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"
 
 namespace base {
 namespace trace_event {
 class TracedValue;
 }
 }
 
@@ skipping 237 matching lines @@
   // Useful for debug assertions, probably shouldn't be used for anything else.
   Proxy* proxy() const;
 
   void SetRootLayerScrollOffsetDelegate(
       LayerScrollOffsetDelegate* root_layer_scroll_offset_delegate);
   void UpdateRootScrollOffsetDelegate();
   // Distribute the rool scroll between outer and inner viewport scroll layer.
   // 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();
 
   ResourceProvider::ResourceId ResourceIdForUIResource(UIResourceId uid) const;
   void ProcessUIResourceRequestQueue();
 
   bool IsUIResourceOpaque(UIResourceId uid) const;
 
   void RegisterPictureLayerImpl(PictureLayerImpl* layer);
   void UnregisterPictureLayerImpl(PictureLayerImpl* layer);
@@ skipping 105 matching lines @@
   bool needs_update_draw_properties_;
 
   // In impl-side painting mode, this is true when the tree may contain
   // structural differences relative to the active tree.
   bool needs_full_tree_sync_;
 
   bool next_activation_forces_redraw_;
 
   bool has_ever_been_drawn_;
 
-  ScopedPtrVector<SwapPromise> swap_promise_list_;
+  PromiseList promises_;
 
   UIResourceRequestQueue ui_resource_request_queue_;
 
   int render_surface_layer_list_id_;
 
   // Whether or not Blink's viewport size was shrunk by the height of the top
   // controls at the time of the last layout.
   bool top_controls_shrink_blink_size_;
 
   float top_controls_height_;
 
   // The amount that the top controls are shown from 0 (hidden) to 1 (fully
   // shown).
   scoped_refptr<SyncedTopControls> top_controls_shown_ratio_;
 
   scoped_ptr<PendingPageScaleAnimation> pending_page_scale_animation_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_TREES_LAYER_TREE_IMPL_H_