Make rendering timeouts work even if paint data received early

content/browser/renderer_host/render_widget_host_impl.cc

Index: content/browser/renderer_host/render_widget_host_impl.cc
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
index 323c0b810fd32f4d2ac3c1f3e9618bc8cbc2af73..6ece2ad9782279cf25db2cab9c600c761446450a 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -197,6 +197,7 @@ RenderWidgetHostImpl::RenderWidgetHostImpl(RenderWidgetHostDelegate* delegate,
       allow_privileged_mouse_lock_(false),
       has_touch_handler_(false),
       is_in_gesture_scroll_(false),
+      received_paint_after_load_(false),
       next_browser_snapshot_id_(1),
       owned_by_render_frame_host_(false),
       is_focused_(false),
@@ -478,6 +479,8 @@ bool RenderWidgetHostImpl::OnMessageReceived(const IPC::Message &msg) {
 #endif
     IPC_MESSAGE_HANDLER(InputHostMsg_ImeCompositionRangeChanged,
                         OnImeCompositionRangeChanged)
+    IPC_MESSAGE_HANDLER(ViewHostMsg_DidFirstPaintAfterLoad,
+                        OnFirstPaintAfterLoad)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
@@ -920,13 +923,23 @@ void RenderWidgetHostImpl::StopHangMonitorTimeout() {
 }
 
 void RenderWidgetHostImpl::StartNewContentRenderingTimeout() {
-  if (new_content_rendering_timeout_)
-    new_content_rendering_timeout_->Start(new_content_rendering_delay_);
+  // It is possible for a compositor frame to arrive before the browser is
+  // notified about the page being committed, in which case no timer is
+  // necessary.
+  if (received_paint_after_load_) {
+    received_paint_after_load_ = false;
+    return;
+  }
+
+  new_content_rendering_timeout_->Start(new_content_rendering_delay_);
 }
 
-void RenderWidgetHostImpl::StopNewContentRenderingTimeout() {
-  if (new_content_rendering_timeout_)
+void RenderWidgetHostImpl::OnFirstPaintAfterLoad() {
+  if (new_content_rendering_timeout_->IsRunning()) {
     new_content_rendering_timeout_->Stop();
+  } else {
+    received_paint_after_load_ = true;
+  }
 }
 
 void RenderWidgetHostImpl::ForwardMouseEvent(const WebMouseEvent& mouse_event) {
@@ -1522,8 +1535,6 @@ bool RenderWidgetHostImpl::OnSwapCompositorFrame(
   // chrome/browser/extensions/api/cast_streaming/performance_test.cc
   TRACE_EVENT0("test_fps,benchmark", "OnSwapCompositorFrame");
 
-  StopNewContentRenderingTimeout();
-
   ViewHostMsg_SwapCompositorFrame::Param param;
   if (!ViewHostMsg_SwapCompositorFrame::Read(&message, &param))
     return false;