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

cc/trees/remote_channel_impl.cc

 // 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.
 
 #include "cc/trees/remote_channel_impl.h"
 
 #include "base/bind_helpers.h"
 #include "base/memory/ptr_util.h"
 #include "base/single_thread_task_runner.h"
 #include "cc/animation/animation_events.h"
@@ skipping 112 matching lines @@
                        main().layer_tree_host, main_thread_start_time, false));
         completion.Wait();
       }
     } break;
     case proto::CompositorMessageToImpl::BEGIN_MAIN_FRAME_ABORTED: {
       base::TimeTicks main_thread_start_time = base::TimeTicks::Now();
       const proto::BeginMainFrameAborted& begin_main_frame_aborted_message =
           proto.begin_main_frame_aborted_message();
       CommitEarlyOutReason reason = CommitEarlyOutReasonFromProtobuf(
           begin_main_frame_aborted_message.reason());
+      std::vector<std::unique_ptr<SwapPromise>> empty_swap_promises;
       VLOG(1) << "Received BeginMainFrameAborted from the engine with reason: "
               << CommitEarlyOutReasonToString(reason);
       ImplThreadTaskRunner()->PostTask(
           FROM_HERE,
           base::Bind(&ProxyImpl::BeginMainFrameAbortedOnImpl,
-                     proxy_impl_weak_ptr_, reason, main_thread_start_time));
+                     proxy_impl_weak_ptr_, reason, main_thread_start_time,
+                     base::Passed(&empty_swap_promises)));
     } break;
     case proto::CompositorMessageToImpl::SET_NEEDS_REDRAW: {
       VLOG(1) << "Received redraw request from the engine.";
       const proto::SetNeedsRedraw& set_needs_redraw_message =
           proto.set_needs_redraw_message();
       gfx::Rect damaged_rect =
           ProtoToRect(set_needs_redraw_message.damaged_rect());
       PostSetNeedsRedrawToImpl(damaged_rect);
     } break;
   }
@@ skipping 387 matching lines @@
 
 RemoteChannelImpl::CompositorThreadOnly::CompositorThreadOnly(
     base::WeakPtr<RemoteChannelImpl> remote_channel_weak_ptr)
     : proxy_impl(nullptr),
       proxy_impl_weak_factory(nullptr),
       remote_channel_weak_ptr(remote_channel_weak_ptr) {}
 
 RemoteChannelImpl::CompositorThreadOnly::~CompositorThreadOnly() {}
 
 }  // namespace cc