Index: content/browser/frame_host/frame_tree_node.h |
diff --git a/content/browser/frame_host/frame_tree_node.h b/content/browser/frame_host/frame_tree_node.h |
index 5d0a34bd366fd3875a632891acc18ac624c64080..715eb48b3884751ef5e7246bcc926b0578c938cd 100644 |
--- a/content/browser/frame_host/frame_tree_node.h |
+++ b/content/browser/frame_host/frame_tree_node.h |
@@ -30,7 +30,6 @@ class RenderFrameHostImpl; |
// are frame-specific (as opposed to page-specific). |
class CONTENT_EXPORT FrameTreeNode { |
public: |
- |
FrameTreeNode(FrameTree* frame_tree, |
Navigator* navigator, |
RenderFrameHostDelegate* render_frame_delegate, |
@@ -105,19 +104,20 @@ class CONTENT_EXPORT FrameTreeNode { |
return replication_state_; |
} |
- void set_is_loading(bool is_loading) { |
- is_loading_ = is_loading; |
- } |
- bool is_loading() const { |
- return is_loading_; |
- } |
- |
RenderFrameHostImpl* current_frame_host() const { |
return render_manager_.current_frame_host(); |
} |
bool IsDescendantOf(FrameTreeNode* other) const; |
+ // Returns true if any of the current or pending RenderFrameHost from the |
Charlie Reis
2015/02/24 04:55:00
if either the current or pending
("any" implies t
Fabrice (no longer in Chrome)
2015/02/24 13:14:47
Done.
|
+ // associated RenderFrameHostManager is loading. |
+ bool IsLoading() const; |
+ |
+ // Returns the average loading progress of the RenderFrameHostImpl from the |
Charlie Reis
2015/02/24 04:55:00
of the current RenderFrameHost
(We should be cons
Fabrice (no longer in Chrome)
2015/02/24 13:14:47
Fixed the wording but I am keeping the average loa
|
+ // associated RenderFrameHostManager. |
+ double GetLoadingProgress() const; |
+ |
private: |
void set_parent(FrameTreeNode* parent) { parent_ = parent; } |
@@ -133,7 +133,7 @@ class CONTENT_EXPORT FrameTreeNode { |
// Manages creation and swapping of RenderFrameHosts for this frame. This |
// must be declared before |children_| so that it gets deleted after them. |
- // That's currently necessary so that RenderFrameHostImpl's destructor can |
+ // That's currently necessary so that RenderFrameHostImpl's destructor can |
// call GetProcess. |
RenderFrameHostManager render_manager_; |
@@ -158,15 +158,6 @@ class CONTENT_EXPORT FrameTreeNode { |
// proxies for this frame. |
FrameReplicationState replication_state_; |
- // Boolean value indicating whether the frame is in the process of loading |
- // a document or not. In cross-process transfer navigation the DidStartLoading |
- // message is received from both existing RenderFrame and from the pending |
- // RenderFrame. However, there will be only one DidStopLoading message sent by |
- // the pending-which-becomes-current RenderFrame. Since both renderers belong |
- // to the FrameTreeNode, it is better to ask it about the loading status than |
- // RenderFrameHost or using a counter to balance the events out. |
- bool is_loading_; |
- |
DISALLOW_COPY_AND_ASSIGN(FrameTreeNode); |
}; |