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

cc/trees/proxy_impl.h

 // Copyright 2015 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_PROXY_IMPL_H_
 #define CC_TREES_PROXY_IMPL_H_
 
 #include <memory>
 
 #include "base/macros.h"
@@ skipping 22 matching lines @@
   void UpdateTopControlsStateOnImpl(TopControlsState constraints,
                                     TopControlsState current,
                                     bool animate);
   void InitializeOutputSurfaceOnImpl(OutputSurface* output_surface);
   void InitializeMutatorOnImpl(std::unique_ptr<LayerTreeMutator> mutator);
   void MainThreadHasStoppedFlingingOnImpl();
   void SetInputThrottledUntilCommitOnImpl(bool is_throttled);
   void SetDeferCommitsOnImpl(bool defer_commits) const;
   void SetNeedsRedrawOnImpl(const gfx::Rect& damage_rect);
   void SetNeedsCommitOnImpl();
-  void BeginMainFrameAbortedOnImpl(CommitEarlyOutReason reason,
-                                   base::TimeTicks main_thread_start_time);
+  void BeginMainFrameAbortedOnImpl(
+      CommitEarlyOutReason reason,
+      base::TimeTicks main_thread_start_time,
+      std::vector<std::unique_ptr<SwapPromise>> swap_promises);
   void FinishAllRenderingOnImpl(CompletionEvent* completion);
   void SetVisibleOnImpl(bool visible);
   void ReleaseOutputSurfaceOnImpl(CompletionEvent* completion);
   void FinishGLOnImpl(CompletionEvent* completion);
   void NotifyReadyToCommitOnImpl(CompletionEvent* completion,
                                  LayerTreeHost* layer_tree_host,
                                  base::TimeTicks main_thread_start_time,
                                  bool hold_commit_for_activation);
 
   void MainFrameWillHappenOnImplForTesting(CompletionEvent* completion,
@@ skipping 95 matching lines @@
   // Use accessors instead of this variable directly.
   BlockedMainCommitOnly main_thread_blocked_commit_vars_unsafe_;
   BlockedMainCommitOnly& blocked_main_commit();
 
   DISALLOW_COPY_AND_ASSIGN(ProxyImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_TREES_PROXY_IMPL_H_