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

cc/trees/threaded_channel.cc

 // 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.
 
 #include "cc/trees/threaded_channel.h"
 
 #include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/memory/ptr_util.h"
 #include "base/single_thread_task_runner.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/animation/animation_events.h"
 #include "cc/animation/layer_tree_mutator.h"
 #include "cc/trees/layer_tree_host.h"
 
 namespace cc {
 
 std::unique_ptr<ThreadedChannel> ThreadedChannel::Create(
     ProxyMain* proxy_main,
     TaskRunnerProvider* task_runner_provider) {
   return base::WrapUnique(
       new ThreadedChannel(proxy_main, task_runner_provider));
 }
 
 ThreadedChannel::ThreadedChannel(ProxyMain* proxy_main,
                                  TaskRunnerProvider* task_runner_provider)
     : task_runner_provider_(task_runner_provider),
       main_thread_only_vars_unsafe_(proxy_main),
       compositor_thread_vars_unsafe_(
-          main()
-              .proxy_main_weak_factory.GetWeakPtr()) {
+          main().proxy_main_weak_factory.GetWeakPtr()) {
   DCHECK(IsMainThread());
 }
 
 ThreadedChannel::~ThreadedChannel() {
   TRACE_EVENT0("cc", "ThreadChannel::~ThreadChannel");
   DCHECK(IsMainThread());
   DCHECK(!IsInitialized());
 }
 
 void ThreadedChannel::UpdateTopControlsStateOnImpl(TopControlsState constraints,
@@ skipping 45 matching lines @@
 
 void ThreadedChannel::SetNeedsCommitOnImpl() {
   DCHECK(IsMainThread());
   ImplThreadTaskRunner()->PostTask(
       FROM_HERE,
       base::Bind(&ProxyImpl::SetNeedsCommitOnImpl, proxy_impl_weak_ptr_));
 }
 
 void ThreadedChannel::BeginMainFrameAbortedOnImpl(
     CommitEarlyOutReason reason,
-    base::TimeTicks main_thread_start_time) {
+    base::TimeTicks main_thread_start_time,
+    std::vector<std::unique_ptr<SwapPromise>> swap_promises) {
   DCHECK(IsMainThread());
   ImplThreadTaskRunner()->PostTask(
       FROM_HERE,
       base::Bind(&ProxyImpl::BeginMainFrameAbortedOnImpl, proxy_impl_weak_ptr_,
-                 reason, main_thread_start_time));
+                 reason, main_thread_start_time, base::Passed(&swap_promises)));
 }
 
 void ThreadedChannel::SetNeedsRedrawOnImpl(const gfx::Rect& damage_rect) {
   DCHECK(IsMainThread());
   ImplThreadTaskRunner()->PostTask(
       FROM_HERE, base::Bind(&ProxyImpl::SetNeedsRedrawOnImpl,
                             proxy_impl_weak_ptr_, damage_rect));
 }
 
 void ThreadedChannel::SetVisibleOnImpl(bool visible) {
@@ skipping 243 matching lines @@
 
 ThreadedChannel::MainThreadOnly::~MainThreadOnly() {}
 
 ThreadedChannel::CompositorThreadOnly::CompositorThreadOnly(
     base::WeakPtr<ProxyMain> proxy_main_weak_ptr)
     : proxy_main_weak_ptr(proxy_main_weak_ptr) {}
 
 ThreadedChannel::CompositorThreadOnly::~CompositorThreadOnly() {}
 
 }  // namespace cc