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

Unified Diff: content/browser/web_contents/web_contents_impl.cc

Issue 16325021: Check for NULL frame tree root. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Just checking for the condition. Created 7 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 81c00b1d78d4ff6ec6eabbc3a8f2235c00ed1554..11a66b1fbb570707ca499724f1af97fef7840784 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -2483,6 +2483,11 @@ void WebContentsImpl::OnUpdateFaviconURL(
}
FrameTreeNode* WebContentsImpl::FindFrameTreeNodeByID(int64 frame_id) {
+ // TODO(nasko): Remove this check once we move to creating the root node
+ // through RenderFrameHost creation.
+ if (!frame_tree_root_.get())
+ return NULL;
+
FrameTreeNode* node = NULL;
std::queue<FrameTreeNode*> queue;
queue.push(frame_tree_root_.get());
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698