Make RenderViewImpl::OnForceRedraw more robust

cc/output/swap_promise.h

 // Copyright 2013 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.
 
 #ifndef CC_OUTPUT_SWAP_PROMISE_H_
 #define CC_OUTPUT_SWAP_PROMISE_H_
 
 #include <stdint.h>
 
 #include "cc/output/compositor_frame_metadata.h"
@@ skipping 32 matching lines @@
 // member data in Did*().
 class CC_EXPORT SwapPromise {
  public:
   enum DidNotSwapReason {
     SWAP_FAILS,
     COMMIT_FAILS,
     COMMIT_NO_UPDATE,
     ACTIVATION_FAILS,
   };
 
+  enum class DidNotSwapAction {
+    DEFAULT_ACTION,

[danakj, 2016/08/10 01:04:15]

I'd like this name to actually talk about what it means. This is RETIRE or
BREAK_PROMISE or something.

[svartmetal, 2016/08/10 17:38:21]

Done.

+    KEEP_ACTIVE,
+  };
+
   SwapPromise() {}
   virtual ~SwapPromise() {}
 
   virtual void DidActivate() = 0;
   virtual void DidSwap(CompositorFrameMetadata* metadata) = 0;
-  virtual void DidNotSwap(DidNotSwapReason reason) = 0;
+  // Return |KEEP_ACTIVE| if this promise should remain active (should not be
+  // broken by the owner).
+  virtual DidNotSwapAction DidNotSwap(DidNotSwapReason reason) = 0;
   // This is called when the main thread starts a (blocking) commit
   virtual void OnCommit() {}
 
   // A non-zero trace id identifies a trace flow object that is embedded in the
   // swap promise. This can be used for registering additional flow steps to
   // visualize the object's path through the system.
   virtual int64_t TraceId() const = 0;
 };
 
 }  // namespace cc
 
 #endif  // CC_OUTPUT_SWAP_PROMISE_H_