Refactor the loading tracking logic in WebContentsImpl.

content/browser/frame_host/frame_tree_node.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/browser/frame_host/frame_tree_node.h"
 
 #include <queue>
 
 #include "base/command_line.h"
 #include "base/stl_util.h"
 #include "content/browser/frame_host/frame_tree.h"
 #include "content/browser/frame_host/navigator.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/public/common/content_switches.h"
 
 namespace content {
 
+double FrameTreeNode::kNotStartedLoadingProgress = 0.0;

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

const double

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

Done.

+double FrameTreeNode::kMinimumLoadingProgress = 0.1;
+double FrameTreeNode::kDoneLoadingProgress = 1.0;
 int64 FrameTreeNode::next_frame_tree_node_id_ = 1;
 
 FrameTreeNode::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)
     : frame_tree_(frame_tree),
       navigator_(navigator),
       render_manager_(this,
                       render_frame_delegate,
                       render_view_delegate,
                       render_widget_delegate,
                       manager_delegate),
       frame_tree_node_id_(next_frame_tree_node_id_++),
       parent_(NULL),
       replication_state_(name),
-      is_loading_(false) {
+      is_loading_(false),
+      loading_progress_(kNotStartedLoadingProgress) {
 }
 
 FrameTreeNode::~FrameTreeNode() {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableBrowserSideNavigation)) {
     navigator_->CancelNavigation(this);
   }
 }
 
 bool FrameTreeNode::IsMainFrame() const {
@@ skipping 60 matching lines @@
 
   for (FrameTreeNode* node = parent(); node; node = node->parent()) {
     if (node == other)
       return true;
   }
 
   return false;
 }
 
 }  // namespace content