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

cc/trees/remote_channel_main.h

 // Copyright 2016 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_REMOTE_CHANNEL_MAIN_H_
 #define CC_TREES_REMOTE_CHANNEL_MAIN_H_
 
 #include "base/macros.h"
 #include "cc/base/cc_export.h"
 #include "cc/trees/channel_main.h"
@@ skipping 31 matching lines @@
   void FinishAllRenderingOnImpl(CompletionEvent* completion) override;
   void SetVisibleOnImpl(bool visible) override;
   void ReleaseOutputSurfaceOnImpl(CompletionEvent* completion) override;
   void MainFrameWillHappenOnImplForTesting(
       CompletionEvent* completion,
       bool* main_frame_will_happen) override;
   void SetNeedsRedrawOnImpl(const gfx::Rect& damage_rect) override;
   void SetNeedsCommitOnImpl() override;
   void BeginMainFrameAbortedOnImpl(
       CommitEarlyOutReason reason,
-      base::TimeTicks main_thread_start_time) override;
+      base::TimeTicks main_thread_start_time,
+      std::vector<std::unique_ptr<SwapPromise>> swap_promises) override;
   void NotifyReadyToCommitOnImpl(CompletionEvent* completion,
                                  LayerTreeHost* layer_tree_host,
                                  base::TimeTicks main_thread_start_time,
                                  bool hold_commit_for_activation) override;
   void SynchronouslyInitializeImpl(
       LayerTreeHost* layer_tree_host,
       std::unique_ptr<BeginFrameSource> external_begin_frame_source) override;
   void SynchronouslyCloseImpl() override;
 
   // RemoteProtoChannel::ProtoReceiver implementation
@@ skipping 20 matching lines @@
   bool initialized_;
 
   base::WeakPtrFactory<RemoteChannelMain> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RemoteChannelMain);
 };
 
 }  // namespace cc
 
 #endif  // CC_TREES_REMOTE_CHANNEL_MAIN_H_