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

cc/trees/remote_channel_main.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_main.h"
 
 #include <memory>
 
 #include "base/memory/ptr_util.h"
 #include "cc/proto/base_conversions.h"
@@ skipping 137 matching lines @@
   proto::CompositorMessageToImpl* to_impl_proto = proto.mutable_to_impl();
   to_impl_proto->set_message_type(
       proto::CompositorMessageToImpl::SET_NEEDS_COMMIT);
 
   VLOG(1) << "Sending commit request to client.";
   SendMessageProto(proto);
 }
 
 void RemoteChannelMain::BeginMainFrameAbortedOnImpl(
     CommitEarlyOutReason reason,
-    base::TimeTicks main_thread_start_time) {
+    base::TimeTicks main_thread_start_time,
+    std::vector<std::unique_ptr<SwapPromise>> swap_promises) {
   TRACE_EVENT1("cc.remote", "RemoteChannelMain::BeginMainFrameAbortedOnImpl",
                "reason", CommitEarlyOutReasonToString(reason));
   proto::CompositorMessage proto;
   proto::CompositorMessageToImpl* to_impl_proto = proto.mutable_to_impl();
   to_impl_proto->set_message_type(
       proto::CompositorMessageToImpl::BEGIN_MAIN_FRAME_ABORTED);
   proto::BeginMainFrameAborted* begin_main_frame_aborted_message =
       to_impl_proto->mutable_begin_main_frame_aborted_message();
   CommitEarlyOutReasonToProtobuf(
       reason, begin_main_frame_aborted_message->mutable_reason());
 
   VLOG(1) << "Sending BeginMainFrameAborted message to client with reason: "
           << CommitEarlyOutReasonToString(reason);
   SendMessageProto(proto);
+
+  // Notify swap promises that commit had no updates. In the local compositor
+  // case this goes to the impl thread to be queued up in case we have an
+  // activation pending but that never happens for remote compositor.
+  for (const auto& swap_promise : swap_promises)
+    swap_promise->DidNotSwap(SwapPromise::COMMIT_NO_UPDATE);
 }
 
 void RemoteChannelMain::NotifyReadyToCommitOnImpl(
     CompletionEvent* completion,
     LayerTreeHost* layer_tree_host,
     base::TimeTicks main_thread_start_time,
     bool hold_commit_for_activation) {
   TRACE_EVENT0("cc.remote", "RemoteChannelMain::NotifyReadyToCommitOnImpl");
   proto::CompositorMessage proto;
   proto::CompositorMessageToImpl* to_impl_proto = proto.mutable_to_impl();
@@ skipping 106 matching lines @@
 
 void RemoteChannelMain::DidCompleteSwapBuffers() {
   proxy_main_->DidCompleteSwapBuffers();
 }
 
 base::SingleThreadTaskRunner* RemoteChannelMain::MainThreadTaskRunner() const {
   return task_runner_provider_->MainThreadTaskRunner();
 }
 
 }  // namespace cc