content/browser/frame_host/frame_tree_node.cc - Issue 925623002: Refactor the loading tracking logic in WebContentsImpl.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 925623002: Refactor the loading tracking logic in WebContentsImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: WIP, just to run tests Created 5 years, 10 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

« content/browser/frame_host/frame_tree_node.h ('K') | « content/browser/frame_host/frame_tree_node.h ('k') | content/browser/web_contents/web_contents_impl.h » ('j') | content/browser/web_contents/web_contents_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/frame_host/frame_tree_node.cc

diff --git a/content/browser/frame_host/frame_tree_node.cc b/content/browser/frame_host/frame_tree_node.cc

index 845aecea62afc5945311f283f029c8d8b6504682..bbc262e19267f5bcfbda989ed53b63b5a7b80d3f 100644

--- a/content/browser/frame_host/frame_tree_node.cc

+++ b/content/browser/frame_host/frame_tree_node.cc

@@ -16,6 +16,9 @@

namespace content {

+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;

FrameTreeNode::FrameTreeNode(FrameTree* frame_tree,

@@ -35,7 +38,9 @@ FrameTreeNode::FrameTreeNode(FrameTree* frame_tree,

frame_tree_node_id_(next_frame_tree_node_id_++),

parent_(NULL),

replication_state_(name),

- is_loading_(false) {

+ is_loading_(false),

+ loading_progress_(kLoadingProgressNotStarted),

+ pending_frame_host_(nullptr) {

}

FrameTreeNode::~FrameTreeNode() {