Make RenderViewImpl::OnForceRedraw more robust

cc/layers/surface_layer.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 "cc/layers/surface_layer.h"
 
 #include <stdint.h>
 
 #include "base/macros.h"
 #include "base/trace_event/trace_event.h"
@@ skipping 10 matching lines @@
       : sequence_(sequence), satisfy_callback_(satisfy_callback) {}
 
   ~SatisfySwapPromise() override {}
 
  private:
   void DidActivate() override {}
   void DidSwap(CompositorFrameMetadata* metadata) override {
     metadata->satisfies_sequences.push_back(sequence_.sequence);
   }
 
-  void DidNotSwap(DidNotSwapReason reason) override {
+  DidNotSwapAction DidNotSwap(DidNotSwapReason reason) override {
     satisfy_callback_.Run(sequence_);
+    return DidNotSwapAction::BREAK_PROMISE;
   }
   int64_t TraceId() const override { return 0; }
 
   SurfaceSequence sequence_;
   SurfaceLayer::SatisfyCallback satisfy_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(SatisfySwapPromise);
 };
 
 scoped_refptr<SurfaceLayer> SurfaceLayer::Create(
@@ skipping 69 matching lines @@
   if (!layer_tree_host())
     return;
   DCHECK(!destroy_sequence_.is_null());
   std::unique_ptr<SatisfySwapPromise> satisfy(
       new SatisfySwapPromise(destroy_sequence_, satisfy_callback_));
   layer_tree_host()->QueueSwapPromise(std::move(satisfy));
   destroy_sequence_ = SurfaceSequence();
 }
 
 }  // namespace cc