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

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

Issue 1690633002: Revert of Remove the is_loading_ field from WebContentsImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« no previous file with comments | « content/browser/frame_host/frame_tree.h ('k') | content/browser/frame_host/frame_tree_node.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 2fadc124eb05e5650925273b497680bf19d42146..5e8b2c1d481279fe4c88728d6ccdf4d2455be6e6 100644
--- a/content/browser/frame_host/frame_tree.cc
+++ b/content/browser/frame_host/frame_tree.cc
@@ -79,44 +79,6 @@
FrameTree::NodeRange::NodeRange(FrameTree* tree, FrameTreeNode* node_to_skip)
: tree_(tree), node_to_skip_(node_to_skip) {}
-
-FrameTree::ConstNodeIterator::~ConstNodeIterator() {}
-
-FrameTree::ConstNodeIterator& FrameTree::ConstNodeIterator::operator++() {
- for (size_t i = 0; i < current_node_->child_count(); ++i) {
- const FrameTreeNode* child = current_node_->child_at(i);
- queue_.push(child);
- }
-
- if (!queue_.empty()) {
- current_node_ = queue_.front();
- queue_.pop();
- } else {
- current_node_ = nullptr;
- }
-
- return *this;
-}
-
-bool FrameTree::ConstNodeIterator::operator==(
- const ConstNodeIterator& rhs) const {
- return current_node_ == rhs.current_node_;
-}
-
-FrameTree::ConstNodeIterator::ConstNodeIterator(
- const FrameTreeNode* starting_node)
- : current_node_(starting_node) {}
-
-FrameTree::ConstNodeIterator FrameTree::ConstNodeRange::begin() {
- return ConstNodeIterator(tree_->root());
-}
-
-FrameTree::ConstNodeIterator FrameTree::ConstNodeRange::end() {
- return ConstNodeIterator(nullptr);
-}
-
-FrameTree::ConstNodeRange::ConstNodeRange(const FrameTree* tree)
- : tree_(tree) {}
FrameTree::FrameTree(Navigator* navigator,
RenderFrameHostDelegate* render_frame_delegate,
@@ -192,10 +154,6 @@
FrameTree::NodeRange FrameTree::NodesExcept(FrameTreeNode* node_to_skip) {
return NodeRange(this, node_to_skip);
-}
-
-FrameTree::ConstNodeRange FrameTree::ConstNodes() const {
- return ConstNodeRange(this);
}
bool FrameTree::AddFrame(
@@ -467,8 +425,8 @@
load_progress_ = 0.0;
}
-bool FrameTree::IsLoading() const {
- for (const FrameTreeNode* node : ConstNodes()) {
+bool FrameTree::IsLoading() {
+ for (FrameTreeNode* node : Nodes()) {
if (node->IsLoading())
return true;
}
« no previous file with comments | « content/browser/frame_host/frame_tree.h ('k') | content/browser/frame_host/frame_tree_node.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698