Prepare for per frame did{Start,Stop}Loading calls

content/renderer/render_frame_impl.cc

 // Copyright 2013 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/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 
 #include "base/auto_reset.h"
@@ skipping 280 matching lines @@
     RenderFrameImpl* (*create_render_frame_impl)(RenderViewImpl*, int32)) {
   CHECK(!g_create_render_frame_impl);
   g_create_render_frame_impl = create_render_frame_impl;
 }
 
 // RenderFrameImpl ----------------------------------------------------------
 RenderFrameImpl::RenderFrameImpl(RenderViewImpl* render_view, int routing_id)
     : frame_(NULL),
       render_view_(render_view->AsWeakPtr()),
       routing_id_(routing_id),
+      is_loading_(false),
       is_swapped_out_(false),
       is_detaching_(false),
       cookie_jar_(this) {
   RenderThread::Get()->AddRoute(routing_id_, this);
 }
 
 RenderFrameImpl::~RenderFrameImpl() {
   FOR_EACH_OBSERVER(RenderFrameObserver, observers_, RenderFrameGone());
   FOR_EACH_OBSERVER(RenderFrameObserver, observers_, OnDestruct());
   RenderThread::Get()->RemoveRoute(routing_id_);
@@ skipping 2112 matching lines @@
 }
 
 WebElement RenderFrameImpl::GetFocusedElement() {
   WebDocument doc = frame_->document();
   if (!doc.isNull())
     return doc.focusedElement();
 
   return WebElement();
 }
 
-void RenderFrameImpl::didStartLoading() {
+void RenderFrameImpl::didStartLoading(bool to_different_document) {
+  if (is_loading_) {
+    DVLOG(1) << "didStartLoading called while loading";
+    return;
+  }
+
+  is_loading_ = true;
+
+  render_view_->didStartLoading(frame_);
+
   Send(new FrameHostMsg_DidStartLoading(routing_id_));
 }
 
 void RenderFrameImpl::didStopLoading() {
+  if (!is_loading_) {
+    DVLOG(1) << "DidStopLoading called while not loading";
+    return;
+  }
+
+  is_loading_ = false;
+
+  render_view_->didStopLoading(frame_);
+
+  // NOTE: For now we're doing the safest thing, and sending out notification
+  // when done loading. This currently isn't an issue as the favicon is only
+  // displayed when done loading. Ideally we would send notification when
+  // finished parsing the head, but webkit doesn't support that yet.
+  // The feed discovery code would also benefit from access to the head.
+  // NOTE: Sending of the IPC message happens through the top-level frame.
   Send(new FrameHostMsg_DidStopLoading(routing_id_));
 }
 
 WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
     RenderFrame* render_frame,
     WebFrame* frame,
     WebDataSource::ExtraData* extraData,
     const WebURLRequest& request,
     WebNavigationType type,
     WebNavigationPolicy default_policy,
@@ skipping 240 matching lines @@
   if (policy == blink::WebNavigationPolicyNewBackgroundTab ||
       policy == blink::WebNavigationPolicyNewForegroundTab ||
       policy == blink::WebNavigationPolicyNewWindow ||
       policy == blink::WebNavigationPolicyNewPopup) {
     WebUserGestureIndicator::consumeUserGesture();
   }
 
   Send(new FrameHostMsg_OpenURL(routing_id_, params));
 }
 
+void RenderFrameImpl::didChangeLoadProgress(double load_progress) {
+  render_view_->didChangeLoadProgress(frame_, load_progress);
+}
+
 }  // namespace content