Make RenderViewImpl::OnForceRedraw more robust

content/renderer/render_view_impl.cc

Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 8ed17334975b79f18c5239932794bfc79f372ed8..ac58abe90b9cb14270011d5cc6bc742966f21cd5 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -37,6 +37,7 @@
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
 #include "cc/base/switches.h"
+#include "cc/output/forced_redraw_swap_promise.h"
 #include "content/child/appcache/appcache_dispatcher.h"
 #include "content/child/appcache/web_application_cache_host_impl.h"
 #include "content/child/child_shared_bitmap_manager.h"
@@ -1464,17 +1465,11 @@ void RenderViewImpl::ApplyWebPreferencesInternal(
   ApplyWebPreferences(prefs, web_view);
 }
 
-void RenderViewImpl::OnForceRedraw(int id) {
-  ui::LatencyInfo latency_info;
-  if (id) {
-    latency_info.AddLatencyNumber(ui::WINDOW_SNAPSHOT_FRAME_NUMBER_COMPONENT,
-                                  0,
-                                  id);
-  }
-  std::unique_ptr<cc::SwapPromiseMonitor> latency_info_swap_promise_monitor;
+void RenderViewImpl::OnForceRedraw(const ui::LatencyInfo& latency_info) {
   if (RenderWidgetCompositor* rwc = compositor()) {
-    latency_info_swap_promise_monitor =
-        rwc->CreateLatencyInfoSwapPromiseMonitor(&latency_info);
+    std::unique_ptr<cc::SwapPromise> swap_promise(
+        new cc::ForcedRedrawSwapPromise(latency_info));

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

Why does this SwapPromise impl live in cc::? There's only this one creation
site, it could live entirely in this .cc file?

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

Yes, for now it's true. 
But I think this file is already too big, that's why i'd like to keep
AlwaysDrawPromise in separate file...
However, i can fix it in the next patch set, if you want.

+    rwc->QueueSwapPromise(std::move(swap_promise));

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

nit:
rwc->QueueSwapPromise(base::MakeUnique<ForcedRedrawSwapPromise>(latency_info));

(no need for the temp |swap_promise| var.)

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

Done.

   }
   ScheduleCompositeWithForcedRedraw();
 }