Add a flag to change when android's progress bar completes

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 <stddef.h>
 
 #include <queue>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/containers/hash_tables.h"
 #include "base/lazy_instance.h"
 #include "base/memory/ptr_util.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/frame_host/navigator.h"
 #include "content/browser/frame_host/render_frame_host_factory.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/frame_host/render_frame_proxy_host.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
+#include "content/common/content_switches_internal.h"
 #include "content/common/input_messages.h"
 #include "content/common/site_isolation_policy.h"
 #include "third_party/WebKit/public/web/WebSandboxFlags.h"
 
 namespace content {
 
 namespace {
 
 // Helper function to collect SiteInstances involved in rendering a single
 // FrameTree (which is a subset of SiteInstances in main frame's proxy_hosts_
@@ skipping 328 matching lines @@
   if (!frame->parent()) {
     CHECK_EQ(frame, root_);
     return;
   }
 
   // Notify observers of the frame removal.
   if (!on_frame_removed_.is_null())
     on_frame_removed_.Run(frame->current_frame_host());
 }
 
-void FrameTree::UpdateLoadProgress() {
+void FrameTree::UpdateLoadProgress(FrameTreeNode* frame) {
   double progress = 0.0;
-  int frame_count = 0;
+  ProgressBarCompletionOptions options = GetProgressBarCompletionOptions();
+  if (options == ProgressBarCompletionOptions::DOM_CONTENT_LOADED ||
+      options == ProgressBarCompletionOptions::RESOURCES_BEFORE_DCL) {

[kinuko, 2016/06/08 14:26:29]

nit: slightly prefer switch/case than if/else for enums (I see that the other
else case has another option check inside but still in general)

[Nate Chapin, 2016/06/14 22:51:46]

Done.

+    if (frame->IsMainFrame() && frame->has_started_loading())

[dcheng, 2016/06/08 06:54:17]

I wonder if we really need to pass in |frame| here: we could just hardcode
root() here, right? It should still be a no-op if we called this for a non-main
frame, since it won't change the progress for an already loaded main frame.

[Nate Chapin, 2016/06/14 22:51:46]

True. Done.

+      progress = frame->loading_progress();
+  } else {
+    int frame_count = 0;
+    for (FrameTreeNode* node : Nodes()) {
+      // Ignore the current frame if it has not started loading.
+      if (!node->has_started_loading())
+        continue;
+      if (options == ProgressBarCompletionOptions::
+                         RESOURCES_BEFORE_DCL_AND_SAME_ORIGIN_IFRAMES &&
+          (!node->HasSameOrigin(*root_) ||
+           node->current_url() == GURL(url::kAboutBlankURL)))
+        continue;
 
-  for (FrameTreeNode* node : Nodes()) {
-    // Ignore the current frame if it has not started loading.
-    if (!node->has_started_loading())
-      continue;
-
-    // Collect progress.
-    progress += node->loading_progress();
-    frame_count++;
+      // Collect progress.
+      progress += node->loading_progress();
+      frame_count++;
+    }
+    if (frame_count != 0)
+      progress /= frame_count;
   }
 
-  if (frame_count != 0)
-    progress /= frame_count;
-
   if (progress <= load_progress_)
     return;
   load_progress_ = progress;
 
   // Notify the WebContents.
   root_->navigator()->GetDelegate()->DidChangeLoadProgress();
 }
 
 void FrameTree::ResetLoadProgress() {
   for (FrameTreeNode* node : Nodes())
@@ skipping 28 matching lines @@
   // This is only used to set page-level focus in cross-process subframes, and
   // requests to set focus in main frame's SiteInstance are ignored.
   if (instance != root_manager->current_frame_host()->GetSiteInstance()) {
     RenderFrameProxyHost* proxy =
         root_manager->GetRenderFrameProxyHost(instance);
     proxy->Send(new InputMsg_SetFocus(proxy->GetRoutingID(), is_focused));
   }
 }
 
 }  // namespace content