cc: Complete swap promise for aborted commit after pending activation.

cc/trees/layer_tree_host_impl.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_IMPL_H_
 #define CC_TREES_LAYER_TREE_HOST_IMPL_H_
 
 #include <stddef.h>
 
 #include <bitset>
@@ skipping 217 matching lines @@
     LayerImplList will_draw_layers;
     bool has_no_damage;
 
     // RenderPassSink implementation.
     void AppendRenderPass(std::unique_ptr<RenderPass> render_pass) override;
 
    private:
     DISALLOW_COPY_AND_ASSIGN(FrameData);
   };
 
-  virtual void BeginMainFrameAborted(CommitEarlyOutReason reason);
+  virtual void BeginMainFrameAborted(
+      CommitEarlyOutReason reason,
+      std::vector<std::unique_ptr<SwapPromise>> swap_promises);
   virtual void ReadyToCommit() {}  // For tests.
   virtual void BeginCommit();
   virtual void CommitComplete();
   virtual void UpdateAnimationState(bool start_ready_animations);
   bool Mutate(base::TimeTicks monotonic_time);
   void ActivateAnimations();
   void Animate();
   void AnimatePendingTreeAfterCommit();
   void MainThreadHasStoppedFlinging();
   void DidAnimateScrollOffset();
@@ skipping 233 matching lines @@
   const gfx::Transform& DrawTransform() const;
 
   std::unique_ptr<BeginFrameCallbackList> ProcessLayerTreeMutations();
 
   std::unique_ptr<ScrollAndScaleSet> ProcessScrollDeltas();
 
   void set_max_memory_needed_bytes(size_t bytes) {
     max_memory_needed_bytes_ = bytes;
   }
 
-  FrameRateCounter* fps_counter() {
-    return fps_counter_.get();
-  }
-  MemoryHistory* memory_history() {
-    return memory_history_.get();
-  }
-  DebugRectHistory* debug_rect_history() {
-    return debug_rect_history_.get();
-  }
-  ResourceProvider* resource_provider() {
-    return resource_provider_.get();
-  }
+  FrameRateCounter* fps_counter() { return fps_counter_.get(); }
+  MemoryHistory* memory_history() { return memory_history_.get(); }
+  DebugRectHistory* debug_rect_history() { return debug_rect_history_.get(); }
+  ResourceProvider* resource_provider() { return resource_provider_.get(); }
   TopControlsManager* top_controls_manager() {
     return top_controls_manager_.get();
   }
   const GlobalStateThatImpactsTilePriority& global_tile_state() {
     return global_tile_state_;
   }
 
   TaskRunnerProvider* task_runner_provider() const {
     return task_runner_provider_;
   }
@@ skipping 340 matching lines @@
 
   std::unique_ptr<PendingTreeDurationHistogramTimer>
       pending_tree_duration_timer_;
 
   DISALLOW_COPY_AND_ASSIGN(LayerTreeHostImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_TREES_LAYER_TREE_HOST_IMPL_H_