Make rendering timeouts work even if paint data received early

content/browser/web_contents/web_contents_impl.cc

Index: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 7c84d90115c6c44238406085dd555faa36e63c6c..83791e328286e619bbc730ed234b9757b5f1a762 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -629,6 +629,8 @@ bool WebContentsImpl::OnMessageReceived(RenderViewHost* render_view_host,
                         OnMediaPausedNotification)
     IPC_MESSAGE_HANDLER(ViewHostMsg_DidFirstVisuallyNonEmptyPaint,
                         OnFirstVisuallyNonEmptyPaint)
+    IPC_MESSAGE_HANDLER(ViewHostMsg_DidFirstPaintAfterLoad,
+                        OnFirstPaintAfterLoad)
     IPC_MESSAGE_HANDLER(FrameHostMsg_DidLoadResourceFromMemoryCache,
                         OnDidLoadResourceFromMemoryCache)
     IPC_MESSAGE_HANDLER(FrameHostMsg_DidDisplayInsecureContent,
@@ -3440,6 +3442,10 @@ void WebContentsImpl::OnFirstVisuallyNonEmptyPaint() {
   }
 }
 
+void WebContentsImpl::OnFirstPaintAfterLoad() {
+  GetMainFrame()->GetRenderWidgetHost()->OnFirstPaintAfterLoad();

[Charlie Reis, 2015/09/30 20:36:19]

Why does this need to come through WebContents?  Shouldn't we just handle it in
RenderWidgetHostImpl?

[kenrb, 2015/09/30 21:25:02]

Done.

I was copying how the other QueueMessage() messages were set up, but now that I
look at it, there is no reason.

+}
+
 void WebContentsImpl::DidChangeVisibleSSLState() {
   if (delegate_) {
     delegate_->VisibleSSLStateChanged(this);