Make rendering timeouts work even if paint data received early

content/browser/web_contents/web_contents_impl.cc

 // Copyright (c) 2012 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 "content/browser/web_contents/web_contents_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 611 matching lines @@
     IPC_MESSAGE_HANDLER(FrameHostMsg_OpenColorChooser, OnOpenColorChooser)
     IPC_MESSAGE_HANDLER(FrameHostMsg_EndColorChooser, OnEndColorChooser)
     IPC_MESSAGE_HANDLER(FrameHostMsg_SetSelectedColorInColorChooser,
                         OnSetSelectedColorInColorChooser)
     IPC_MESSAGE_HANDLER(FrameHostMsg_MediaPlayingNotification,
                         OnMediaPlayingNotification)
     IPC_MESSAGE_HANDLER(FrameHostMsg_MediaPausedNotification,
                         OnMediaPausedNotification)
     IPC_MESSAGE_HANDLER(ViewHostMsg_DidFirstVisuallyNonEmptyPaint,
                         OnFirstVisuallyNonEmptyPaint)
+    IPC_MESSAGE_HANDLER(ViewHostMsg_DidFirstPaintAfterLoad,
+                        OnFirstPaintAfterLoad)
     IPC_MESSAGE_HANDLER(FrameHostMsg_DidLoadResourceFromMemoryCache,
                         OnDidLoadResourceFromMemoryCache)
     IPC_MESSAGE_HANDLER(FrameHostMsg_DidDisplayInsecureContent,
                         OnDidDisplayInsecureContent)
     IPC_MESSAGE_HANDLER(FrameHostMsg_DidRunInsecureContent,
                         OnDidRunInsecureContent)
     IPC_MESSAGE_HANDLER(ViewHostMsg_GoToEntryAtOffset, OnGoToEntryAtOffset)
     IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateZoomLimits, OnUpdateZoomLimits)
     IPC_MESSAGE_HANDLER(ViewHostMsg_EnumerateDirectory, OnEnumerateDirectory)
     IPC_MESSAGE_HANDLER(FrameHostMsg_RegisterProtocolHandler,
@@ skipping 2791 matching lines @@
   did_first_visually_non_empty_paint_ = true;
 
   if (theme_color_ != last_sent_theme_color_) {
     // Theme color should have updated by now if there was one.
     FOR_EACH_OBSERVER(WebContentsObserver, observers_,
                       DidChangeThemeColor(theme_color_));
     last_sent_theme_color_ = theme_color_;
   }
 }
 
+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);
 
     SecurityStyleExplanations security_style_explanations;
     SecurityStyle security_style =
         delegate_->GetSecurityStyle(this, &security_style_explanations);
     FOR_EACH_OBSERVER(
         WebContentsObserver, observers_,
         SecurityStyleChanged(security_style, security_style_explanations));
@@ skipping 1196 matching lines @@
   return NULL;
 }
 
 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
   force_disable_overscroll_content_ = force_disable;
   if (view_)
     view_->SetOverscrollControllerEnabled(CanOverscrollContent());
 }
 
 }  // namespace content