RenderFrame: flesh out Observer

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 6ff7cea3fa7d2e6819e867c39700d2594abbb1e4..4c1aada1e5500e4e8d455e85584cbe76597b23ee 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -805,6 +805,10 @@ void RenderFrameImpl::didStartProvisionalLoad(blink::WebFrame* frame) {
       RenderViewObserver, render_view_->observers(),
       DidStartProvisionalLoad(frame));
 
+  FOR_EACH_OBSERVER(
+      RenderFrameObserver, observers_,
+      DidStartProvisionalLoad());
+
   Send(new FrameHostMsg_DidStartProvisionalLoadForFrame(
        routing_id_, frame->identifier(),
        frame->parent() ? frame->parent()->identifier() : -1,
@@ -844,6 +848,9 @@ void RenderFrameImpl::didFailProvisionalLoad(
   // Call out to RenderViewImpl, so observers are notified.
   render_view_->didFailProvisionalLoad(frame, error);
 
+  FOR_EACH_OBSERVER(RenderFrameObserver, observers_,
+                    DidFailProvisionalLoad(error));
+
   bool show_repost_interstitial =
       (error.reason == net::ERR_CACHE_MISS &&
        EqualsASCII(failed_request.httpMethod(), "POST"));
@@ -1009,6 +1016,8 @@ void RenderFrameImpl::didFailLoad(blink::WebFrame* frame,
 void RenderFrameImpl::didFinishLoad(blink::WebFrame* frame) {
   // TODO(nasko): Move implementation here. No state needed, just observers
   // notification before sending message to the browser process.
+  FOR_EACH_OBSERVER(RenderFrameObserver, observers_,

[nasko, 2014/01/28 20:41:39]

In all other cases we notify RVO before RFO, let's keep them consistent here as
well.

[Elly Fong-Jones, 2014/01/28 21:34:20]

Done.

+                    DidFinishLoad());
   render_view_->didFinishLoad(frame);
 }
 
@@ -1267,12 +1276,13 @@ void RenderFrameImpl::didRunInsecureContent(
 }
 
 void RenderFrameImpl::didAbortLoading(blink::WebFrame* frame) {
-#if defined(ENABLE_PLUGINS)
   if (frame != render_view_->webview()->mainFrame())
     return;
+#if defined(ENABLE_PLUGINS)

[nasko, 2014/01/28 20:41:39]

Why is this define moved?

[Elly Fong-Jones, 2014/01/28 21:34:20]

Done.

   PluginChannelHost::Broadcast(
       new PluginHostMsg_DidAbortLoading(render_view_->GetRoutingID()));
 #endif
+  FOR_EACH_OBSERVER(RenderFrameObserver, observers_, DidAbortLoad());

[nasko, 2014/01/28 20:41:39]

Let's remove this.

[Elly Fong-Jones, 2014/01/28 21:34:20]

Done.

 }
 
 void RenderFrameImpl::didExhaustMemoryAvailableForScript(
@@ -1445,4 +1455,8 @@ void RenderFrameImpl::RemoveObserver(RenderFrameObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
+void RenderFrameImpl::OnStop() {
+  FOR_EACH_OBSERVER(RenderFrameObserver, observers_, OnStop());
+}
+
 }  // namespace content