Move DidStartLoading, DidStopLoading, DidChangeLoadProgress to RFHI.

content/browser/frame_host/frame_tree.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.h"
 
 #include <queue>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 34 matching lines @@
     node->render_manager()->CreateRenderFrameProxy(instance.get());
   return true;
 }
 
 // Helper function used with FrameTree::ForEach() for retrieving the total
 // loading progress and number of frames in a frame tree.
 bool CollectLoadProgress(double* progress,
                          int* frame_count,
                          FrameTreeNode* node) {
   // Ignore the current frame if it has not started loading.
-  double frame_progress = node->loading_progress();
-  if (frame_progress == FrameTreeNode::kLoadingProgressNotStarted)
+  if (!node->has_started_loading())
     return true;
 
   // Collect progress.
-  *progress += frame_progress;
+  *progress += node->loading_progress();
   (*frame_count)++;
   return true;
 }
 
 // Helper function used with FrameTree::ForEach() to reset the load progress.
 bool ResetNodeLoadProgress(FrameTreeNode* node) {
-  node->set_loading_progress(FrameTreeNode::kLoadingProgressNotStarted);
+  node->reset_loading_progress();
   return true;
 }
 
 // Helper function used with FrameTree::ForEach() to check if at least one of
 // the nodes is loading.
 bool IsNodeLoading(bool* is_loading, FrameTreeNode* node) {
   if (node->IsLoading()) {
     // There is at least one node loading, so abort traversal.
     *is_loading = true;
     return false;
@@ skipping 12 matching lines @@
       render_view_delegate_(render_view_delegate),
       render_widget_delegate_(render_widget_delegate),
       manager_delegate_(manager_delegate),
       root_(new FrameTreeNode(this,
                               navigator,
                               render_frame_delegate,
                               render_view_delegate,
                               render_widget_delegate,
                               manager_delegate,
                               std::string())),
-      focused_frame_tree_node_id_(-1) {
+      focused_frame_tree_node_id_(-1),
+      load_progress_(0.0) {
 }
 
 FrameTree::~FrameTree() {
 }
 
 FrameTreeNode* FrameTree::FindByID(int64 frame_tree_node_id) {
   FrameTreeNode* node = NULL;
   ForEach(base::Bind(&FrameTreeNodeForId, frame_tree_node_id, &node));
   return node;
 }
@@ skipping 229 matching lines @@
   if (!frame->parent()) {
     CHECK_EQ(frame, root_.get());
     return;
   }
 
   // Notify observers of the frame removal.
   if (!on_frame_removed_.is_null())
     on_frame_removed_.Run(frame->current_frame_host());
 }
 
-double FrameTree::GetLoadProgress() {
+void FrameTree::UpdateLoadProgress() {
   double progress = 0.0;
   int frame_count = 0;
 
   ForEach(base::Bind(&CollectLoadProgress, &progress, &frame_count));
   if (frame_count != 0)
     progress /= frame_count;
-  return progress;
+
+  if (progress <= load_progress_)
+    return;
+  load_progress_ = progress;
+
+  // Notify the WebContents.
+  root_->navigator()->GetDelegate()->DidChangeLoadProgress();
 }
 
 void FrameTree::ResetLoadProgress() {
   ForEach(base::Bind(&ResetNodeLoadProgress));
+  load_progress_ = 0.0;
 }
 
 bool FrameTree::IsLoading() {
   bool is_loading = false;
   ForEach(base::Bind(&IsNodeLoading, &is_loading));
   return is_loading;
 }
 
 }  // namespace content