Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(55)

Unified Diff: content/browser/frame_host/frame_tree.cc

Issue 1860743002: Add a flag to change when android's progress bar completes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix a bad merge Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/frame_host/frame_tree.cc
diff --git a/content/browser/frame_host/frame_tree.cc b/content/browser/frame_host/frame_tree.cc
index a85c7fa3a5adca9163e41f361c7fa367aa728fd9..fd78babe87e2085402c0ea4c303a0c159bdc13d5 100644
--- a/content/browser/frame_host/frame_tree.cc
+++ b/content/browser/frame_host/frame_tree.cc
@@ -21,6 +21,7 @@
#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"
@@ -371,16 +372,36 @@ void FrameTree::FrameRemoved(FrameTreeNode* frame) {
void FrameTree::UpdateLoadProgress() {
double progress = 0.0;
+ ProgressBarCompletion completion = GetProgressBarCompletionPolicy();
int frame_count = 0;
-
- 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++;
+ switch (completion) {
+ case ProgressBarCompletion::DOM_CONTENT_LOADED:
+ case ProgressBarCompletion::RESOURCES_BEFORE_DCL:
+ if (root_->has_started_loading())
+ progress = root_->loading_progress();
+ break;
+ case ProgressBarCompletion::LOAD_EVENT:
+ for (FrameTreeNode* node : Nodes()) {
+ // Ignore the current frame if it has not started loading.
+ if (!node->has_started_loading())
+ continue;
+ progress += node->loading_progress();
+ frame_count++;
+ }
+ break;
+ case ProgressBarCompletion::RESOURCES_BEFORE_DCL_AND_SAME_ORIGIN_IFRAMES:
+ for (FrameTreeNode* node : Nodes()) {
+ // Ignore the current frame if it has not started loading,
+ // if the frame is cross-origin, or about:blank.
+ if (!node->has_started_loading() || !node->HasSameOrigin(*root_) ||
+ node->current_url() == GURL(url::kAboutBlankURL))
+ continue;
+ progress += node->loading_progress();
+ frame_count++;
+ }
+ break;
+ default:
+ NOTREACHED();
}
if (frame_count != 0)

Powered by Google App Engine
This is Rietveld 408576698