Refactor the loading tracking logic in WebContentsImpl.

content/browser/frame_host/frame_tree_node.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_FRAME_TREE_NODE_H_
 #define CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_NODE_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 12 matching lines @@
 class FrameTree;
 class Navigator;
 class RenderFrameHostImpl;
 
 // When a page contains iframes, its renderer process maintains a tree structure
 // of those frames. We are mirroring this tree in the browser process. This
 // class represents a node in this tree and is a wrapper for all objects that
 // are frame-specific (as opposed to page-specific).
 class CONTENT_EXPORT FrameTreeNode {
  public:
+  // These values indicate the loading progress status. The minimum progress

[Charlie Reis, 2015/02/20 23:42:12]

Hmm, I'm not thrilled about having these as public constants on FrameTreeNode,
since this class isn't primarily about loading.  I'm not sure I have a better
location to suggest, so maybe we can leave them here for now.

[Fabrice (no longer in Chrome), 2015/02/24 13:14:47]

We should be able to move these out of the class once the IPCs have been moved
to RFHI.

+  // value matches what Blink's ProgressTracker has traditionally used for a
+  // minimum progress value.
+  static double kNotStartedLoadingProgress;

[Charlie Reis, 2015/02/20 23:42:12]

static const double

Also, it would be clearer for LoadingProgress to be the prefix rather than
suffix (e.g., kLoadingProgressNotStarted).

[Fabrice (no longer in Chrome), 2015/02/23 20:02:06]

Done.

+  static double kMinimumLoadingProgress;
+  static double kDoneLoadingProgress;
 
   FrameTreeNode(FrameTree* frame_tree,
                 Navigator* navigator,
                 RenderFrameHostDelegate* render_frame_delegate,
                 RenderViewHostDelegate* render_view_delegate,
                 RenderWidgetHostDelegate* render_widget_delegate,
                 RenderFrameHostManager::Delegate* manager_delegate,
                 const std::string& name);
 
   ~FrameTreeNode();
@@ skipping 58 matching lines @@
     return replication_state_.origin.IsSameAs(node.replication_state_.origin);
   }
 
   const FrameReplicationState& current_replication_state() const {
     return replication_state_;
   }
 
   void set_is_loading(bool is_loading) {
     is_loading_ = is_loading;
   }
+
   bool is_loading() const {
     return is_loading_;
   }
 
+  void set_loading_progress(double loading_progress) {
+    loading_progress_ = loading_progress;
+  }
+
+  double loading_progress() const { return loading_progress_; }
+
   RenderFrameHostImpl* current_frame_host() const {
     return render_manager_.current_frame_host();
   }
 
   bool IsDescendantOf(FrameTreeNode* other) const;
 
  private:
   void set_parent(FrameTreeNode* parent) { parent_ = parent; }
 
   // The next available browser-global FrameTreeNode ID.
@@ skipping 35 matching lines @@
 
   // Boolean value indicating whether the frame is in the process of loading
   // a document or not. In cross-process transfer navigation the DidStartLoading
   // message is received from both existing RenderFrame and from the pending
   // RenderFrame. However, there will be only one DidStopLoading message sent by
   // the pending-which-becomes-current RenderFrame. Since both renderers belong
   // to the FrameTreeNode, it is better to ask it about the loading status than
   // RenderFrameHost or using a counter to balance the events out.
   bool is_loading_;
 
+  // Double value representing the frame's completion progress (from 0 to 1).
+  double loading_progress_;
+
   DISALLOW_COPY_AND_ASSIGN(FrameTreeNode);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_NODE_H_