Move load progress tracking logic to the frame tree.

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 28 matching lines @@
                                 FrameTreeNode* node) {
   // If a new frame is created in the current SiteInstance, other frames in
   // that SiteInstance don't need a proxy for the new frame.
   SiteInstance* current_instance =
       node->render_manager()->current_frame_host()->GetSiteInstance();
   if (current_instance != instance.get())
     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)
+    return true;
+
+  // Collect progress.
+  *progress += frame_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);
+  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;
+  }
+  return true;
+}
+
 }  // namespace
 
 FrameTree::FrameTree(Navigator* navigator,
                      RenderFrameHostDelegate* render_frame_delegate,
                      RenderViewHostDelegate* render_view_delegate,
                      RenderWidgetHostDelegate* render_widget_delegate,
                      RenderFrameHostManager::Delegate* manager_delegate)
     : render_frame_delegate_(render_frame_delegate),
       render_view_delegate_(render_view_delegate),
       render_widget_delegate_(render_widget_delegate),
@@ skipping 246 matching lines @@
 void FrameTree::FrameRemoved(FrameTreeNode* frame) {
   // No notification for the root frame.
   if (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() {
+  double progress = 0.0;
+  int frame_count = 0;
+
+  ForEach(base::Bind(&CollectLoadProgress, &progress, &frame_count));
+  if (frame_count != 0)
+    progress /= frame_count;
+  return progress;
+}
+
+void FrameTree::ResetLoadProgress() {
+  ForEach(base::Bind(&ResetNodeLoadProgress));
+}
+
+bool FrameTree::IsLoading() {
+  bool is_loading = false;
+  ForEach(base::Bind(&IsNodeLoading, &is_loading));
+  return is_loading;
+}
+
 }  // namespace content