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

Unified Diff: content/browser/frame_host/render_frame_host_impl.h

Issue 404613005: Start using RenderFrameProxyHost objects. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Bug fix + ncarter review comments addressed Created 6 years, 5 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
Index: content/browser/frame_host/render_frame_host_impl.h
diff --git a/content/browser/frame_host/render_frame_host_impl.h b/content/browser/frame_host/render_frame_host_impl.h
index 0aeb37fd888e3a7c4b47a600a57e7d9dca0c380e..779389a95be3ba3e8160e771921640372ef30890 100644
--- a/content/browser/frame_host/render_frame_host_impl.h
+++ b/content/browser/frame_host/render_frame_host_impl.h
@@ -100,6 +100,8 @@ class CONTENT_EXPORT RenderFrameHostImpl
virtual void AccessibilityHitTest(const gfx::Point& point) OVERRIDE;
virtual void AccessibilityFatalError() OVERRIDE;
+ bool CreateRenderFrame(int parent_routing_id);
+ bool IsRenderFrameLive();
void Init();
int routing_id() const { return routing_id_; }
void OnCreateChildFrame(int new_routing_id,
@@ -111,6 +113,7 @@ class CONTENT_EXPORT RenderFrameHostImpl
// TODO(nasko): The RenderWidgetHost will be owned by RenderFrameHost in
// the future, so update this accessor to return the right pointer.
RenderWidgetHostImpl* GetRenderWidgetHost();
+ bool has_received_swap_out_ack() { return has_received_swap_out_ack_; }
Charlie Reis 2014/07/24 22:36:29 This doesn't appear to be called. Is it stale cod
nasko 2014/07/25 07:13:20 I added this to know at time of CommitPending whet
ncarter (slow) 2014/07/25 17:18:16 I think if we remove the getter then we can also r
kenrb 2014/07/25 23:42:05 Removed.
// This function is called when this is a swapped out RenderFrameHost that
// lives in the same process as the parent frame. The
@@ -361,6 +364,8 @@ class CONTENT_EXPORT RenderFrameHostImpl
int routing_id_;
bool is_swapped_out_;
+ bool renderer_initialized_;
+ bool has_received_swap_out_ack_;
// When the last BeforeUnload message was sent.
base::TimeTicks send_before_unload_start_time_;

Powered by Google App Engine
This is Rietveld 408576698