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

Unified Diff: content/renderer/render_frame_impl.h

Issue 1360123006: Introduce RenderFrame::IsMainFrame and clean up a few things. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed use-after-free. Created 5 years, 3 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/public/renderer/render_frame.h ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.h
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index 1cb519c221f8fb1c211ab8cec2cd5bfca64ec7af..4195cc6ea61ce4527ad792981a2821213cd6490a 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -347,6 +347,7 @@ class CONTENT_EXPORT RenderFrameImpl
const blink::WebURLRequest& request,
blink::WebNavigationPolicy policy) override;
void ExecuteJavaScript(const base::string16& javascript) override;
+ bool IsMainFrame() override;
bool IsHidden() override;
ServiceRegistry* GetServiceRegistry() override;
#if defined(ENABLE_PLUGINS)
@@ -863,10 +864,10 @@ class CONTENT_EXPORT RenderFrameImpl
// case of the main frame, but not subframes).
blink::WebLocalFrame* frame_;
- // Boolean value indicating whether this RenderFrameImpl object is for a
- // subframe or not. It remains accurate during destruction, even when |frame_|
- // has been invalidated.
- bool is_subframe_;
+ // Boolean value indicating whether this RenderFrameImpl object is for the
+ // main frame or not. It remains accurate during destruction, even when
+ // |frame_| has been invalidated.
+ bool is_main_frame_;
// Frame is a local root if it is rendered in a process different than parent
// or it is a main frame.
« no previous file with comments | « content/public/renderer/render_frame.h ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698