Refactor the loading tracking logic in WebContentsImpl.

content/browser/frame_host/render_frame_host_impl.h

 // 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.
 
 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 76 matching lines @@
   // The RenderFrameHost will have a new RenderWidgetHost created and
   // attached to it. This is used when the RenderFrameHost is in a different
   // process from its parent frame.
   CREATE_RF_NEEDS_RENDER_WIDGET_HOST = 1 << 3
 };
 
 class CONTENT_EXPORT RenderFrameHostImpl
     : public RenderFrameHost,
       public BrowserAccessibilityDelegate {
  public:
+  // These values indicate the loading progress status. The minimum progress
+  // value matches what Blink's ProgressTracker has traditionally used for a
+  // minimum progress value.
+  // TODO(fdegans): Move these values to the implementation when the relevant
+  // IPCs are moved from WebContentsImpl to RFHI.
+  static const double kLoadingProgressNotStarted;
+  static const double kLoadingProgressMinimum;
+  static const double kLoadingProgressDone;
+
   // Keeps track of the state of the RenderFrameHostImpl, particularly with
   // respect to swap out.
   enum RenderFrameHostImplState {
     // The standard state for a RFH handling the communication with an active
     // RenderFrame.
     STATE_DEFAULT = 0,
     // The RFH has not received the SwapOutACK yet, but the new page has
     // committed in a different RFH.  Upon reception of the SwapOutACK, the RFH
     // will either enter STATE_SWAPPED_OUT (if it is a main frame and there are
     // other active frames in its SiteInstance) or it will be deleted.
@@ skipping 89 matching lines @@
 
   int routing_id() const { return routing_id_; }
   void OnCreateChildFrame(int new_routing_id,
                           const std::string& frame_name,
                           SandboxFlags sandbox_flags);
 
   RenderViewHostImpl* render_view_host() { return render_view_host_; }
   RenderFrameHostDelegate* delegate() { return delegate_; }
   FrameTreeNode* frame_tree_node() { return frame_tree_node_; }
 
+  // Sets this RenderFrameHost loading state.
+  void set_is_loading(bool is_loading) {
+    is_loading_ = is_loading;
+  }
+
+  // Returns this RenderFrameHost loading state. This method is only to be used

[Charlie Reis, 2015/03/05 04:46:18]

nit: RenderFrameHost's
nit: used by

(Same in loading_progress below)

[Fabrice (no longer in Chrome), 2015/03/05 12:37:43]

Done.

+  // in FrameTreeNode. The proper way to check whether a frame is loading is to
+  // call FrameTreeNode::IsLoading.
+  bool is_loading() const { return is_loading_; }
+
+  // Sets this RenderFrameHost loading progress (from 0 to 1).

[Charlie Reis, 2015/03/05 04:46:18]

nit: RenderFrameHost's

[Fabrice (no longer in Chrome), 2015/03/05 12:37:43]

Done.

+  void set_loading_progress(double loading_progress) {
+    loading_progress_ = loading_progress;
+  }
+
+  // Returns this RenderFrameHost loading progress. This is only to be used in
+  // FrameTreeNode. The proper way to check a frame loading progress is to call
+  // FrameTreeNode::GetLoadingProgress.
+  double loading_progress() const { return loading_progress_; }
+
   // This returns the RenderFrameHost's owned RenderWidgetHost if it has one,
   // or else it returns nullptr.
   // If the RenderFrameHost is the page's main frame, this returns instead a
   // pointer to the RenderViewHost (which inherits RenderWidgetHost).
   RenderWidgetHostImpl* GetRenderWidgetHost();
 
   // This returns the RenderWidgetHostView that can be used to control
   // focus and visibility for this frame.
   RenderWidgetHostView* GetView();
 
@@ skipping 441 matching lines @@
   bool is_waiting_for_beforeunload_ack_;
 
   // Valid only when is_waiting_for_beforeunload_ack_ or
   // IsWaitingForUnloadACK is true.  This tells us if the unload request
   // is for closing the entire tab ( = false), or only this RenderFrameHost in
   // the case of a navigation ( = true). Currently only cross-site navigations
   // require a beforeUnload/unload ACK.
   // PlzNavigate: all navigations require a beforeUnload ACK.
   bool unload_ack_is_for_navigation_;
 
+  // Indicates whether this RenderFrameHost is in the process of loading a
+  // document or not.
+  bool is_loading_;
+
+  // Used to represent this RenderFrameHost loading progress (from 0 to 1).

[Charlie Reis, 2015/03/05 04:46:18]

nit: RenderFrameHost's

[Fabrice (no longer in Chrome), 2015/03/05 12:37:43]

Done.

+  double loading_progress_;
+
   // Used to swap out or shut down this RFH when the unload event is taking too
   // long to execute, depending on the number of active frames in the
   // SiteInstance.
   scoped_ptr<TimeoutMonitor> swapout_event_monitor_timeout_;
 
   scoped_ptr<ServiceRegistryImpl> service_registry_;
 
 #if defined(OS_ANDROID)
   scoped_ptr<ServiceRegistryAndroid> service_registry_android_;
 #endif
@@ skipping 27 matching lines @@
 
   // NOTE: This must be the last member.
   base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_