Make RenderViewImpl::OnForceRedraw more robust

content/renderer/gpu/queue_message_swap_promise.cc

 // Copyright 2014 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 "content/renderer/gpu/queue_message_swap_promise.h"
 
 #include "base/command_line.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/renderer/gpu/frame_swap_message_queue.h"
@@ skipping 48 matching lines @@
 
 void QueueMessageSwapPromise::DidSwap(cc::CompositorFrameMetadata* metadata) {
 #if DCHECK_IS_ON()
   DCHECK(!completed_);
 #endif
   message_queue_->DidSwap(source_frame_number_);
   // The OutputSurface will take care of the Drain+Send.
   PromiseCompleted();
 }
 
-void QueueMessageSwapPromise::DidNotSwap(DidNotSwapReason reason) {
+cc::SwapPromise::DidNotSwapAction QueueMessageSwapPromise::DidNotSwap(
+    DidNotSwapReason reason) {
 #if DCHECK_IS_ON()
   DCHECK(!completed_);
 #endif
   std::vector<std::unique_ptr<IPC::Message>> messages;
   message_queue_->DidNotSwap(source_frame_number_, reason, &messages);
   for (auto& msg : messages) {
     message_sender_->Send(msg.release());
   }
   PromiseCompleted();
+  return DidNotSwapAction::BREAK_PROMISE;
 }
 
 void QueueMessageSwapPromise::PromiseCompleted() {
 #if DCHECK_IS_ON()
   completed_ = true;
 #endif
 }
 
 int64_t QueueMessageSwapPromise::TraceId() const {
   return 0;
 }
 
 }  // namespace content