Deliver IPC messages together with SwapCompositorFrame

content/renderer/render_frame_impl.cc

Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 3c86654c4fb6e2a528239e37d747280325a2c023..24087414970ec5ec6e187f8ca264b867db98c847 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -38,6 +38,7 @@
 #include "content/public/common/context_menu_params.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/common/url_utils.h"
+#include "content/public/common/widget_visible_state.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/public/renderer/context_menu_client.h"
 #include "content/public/renderer/document_state.h"
@@ -1892,6 +1893,11 @@ void RenderFrameImpl::didCommitProvisionalLoad(
 
   // Check whether we have new encoding name.
   render_view_->UpdateEncoding(frame, frame->view()->pageEncoding().utf8());
+
+  if (!frame->parent()) {
+    GetRenderWidget()->SendSourceFrameNumberWhenReady(
+        render_view()->page_id_, WIDGET_VISIBLE_STATE_DID_HANDLE_ONLOAD_EVENTS);
+  }
 }
 
 void RenderFrameImpl::didClearWindowObject(blink::WebLocalFrame* frame,
@@ -1962,6 +1968,11 @@ void RenderFrameImpl::didFinishDocumentLoad(blink::WebLocalFrame* frame) {
 
   // Check whether we have new encoding name.
   render_view_->UpdateEncoding(frame, frame->view()->pageEncoding().utf8());
+
+  if (!frame->parent()) {
+    GetRenderWidget()->SendSourceFrameNumberWhenReady(
+        render_view_->page_id_, WIDGET_VISIBLE_STATE_DID_FINISH_DOCUMENT_LOAD);
+  }
 }
 
 void RenderFrameImpl::didHandleOnloadEvents(blink::WebLocalFrame* frame) {
@@ -1969,6 +1980,11 @@ void RenderFrameImpl::didHandleOnloadEvents(blink::WebLocalFrame* frame) {
   // TODO(nasko): Move implementation here. Needed state:
   // * page_id_
   render_view_->didHandleOnloadEvents(frame);
+
+  if (!frame->parent()) {
+    GetRenderWidget()->SendSourceFrameNumberWhenReady(
+        render_view()->page_id_, WIDGET_VISIBLE_STATE_DID_HANDLE_ONLOAD_EVENTS);
+  }
 }
 
 void RenderFrameImpl::didFailLoad(blink::WebLocalFrame* frame,
@@ -2514,6 +2530,12 @@ void RenderFrameImpl::didFirstVisuallyNonEmptyLayout(
     blink::WebLocalFrame* frame) {
   DCHECK(!frame_ || frame_ == frame);
   render_view_->didFirstVisuallyNonEmptyLayout(frame);
+
+  if (!frame->parent()) {
+    GetRenderWidget()->SendSourceFrameNumberWhenReady(
+        render_view()->page_id_,
+        WIDGET_VISIBLE_STATE_FIRST_VISUALLY_NON_EMPTY_LAYOUT);
+  }
 }
 
 void RenderFrameImpl::didChangeContentsSize(blink::WebLocalFrame* frame,