Move load progress tracking logic to the frame tree.

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"
@@ skipping 10 matching lines @@
 
 // This is a global map between frame_tree_node_ids and pointers to
 // FrameTreeNodes.
 typedef base::hash_map<int64, FrameTreeNode*> FrameTreeNodeIDMap;
 
 base::LazyInstance<FrameTreeNodeIDMap> g_frame_tree_node_id_map =
     LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
+const double FrameTreeNode::kLoadingProgressNotStarted = 0.0;
+const double FrameTreeNode::kLoadingProgressMinimum = 0.1;
+const double FrameTreeNode::kLoadingProgressDone = 1.0;
+
 int64 FrameTreeNode::next_frame_tree_node_id_ = 1;
 
 // static
 FrameTreeNode* FrameTreeNode::GloballyFindByID(int64 frame_tree_node_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   FrameTreeNodeIDMap* nodes = g_frame_tree_node_id_map.Pointer();
   FrameTreeNodeIDMap::iterator it = nodes->find(frame_tree_node_id);
   return it == nodes->end() ? nullptr : it->second;
 }
 
 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),
-      effective_sandbox_flags_(SandboxFlags::NONE) {
+      effective_sandbox_flags_(SandboxFlags::NONE),
+      loading_progress_(kLoadingProgressNotStarted) {
   std::pair<FrameTreeNodeIDMap::iterator, bool> result =
       g_frame_tree_node_id_map.Get().insert(
           std::make_pair(frame_tree_node_id_, this));
   CHECK(result.second);
 }
 
 FrameTreeNode::~FrameTreeNode() {
   frame_tree_->FrameRemoved(this);
 
   g_frame_tree_node_id_map.Get().erase(frame_tree_node_id_);
@@ skipping 78 matching lines @@
       render_manager_.pending_frame_host();
 
   DCHECK(current_frame_host);
   // TODO(fdegans): Change the implementation logic for PlzNavigate once
   // DidStartLoading and DidStopLoading are properly called.
   if (pending_frame_host && pending_frame_host->is_loading())
     return true;
   return current_frame_host->is_loading();
 }
 
-double FrameTreeNode::GetLoadingProgress() const {
-  RenderFrameHostImpl* current_frame_host =
-      render_manager_.current_frame_host();
-
-  DCHECK(current_frame_host);
-  return current_frame_host->loading_progress();
-}
-
 bool FrameTreeNode::CommitPendingSandboxFlags() {
   bool did_change_flags =
       effective_sandbox_flags_ != replication_state_.sandbox_flags;
   effective_sandbox_flags_ = replication_state_.sandbox_flags;
   return did_change_flags;
 }
 
 }  // namespace content