Chromium Code Reviews| Index: content/browser/renderer_host/render_frame_host_impl.h |
| diff --git a/content/browser/renderer_host/render_frame_host_impl.h b/content/browser/renderer_host/render_frame_host_impl.h |
| index 78df3331efd3ddd9a4e642915e986fa04ed4dcbf..d887469940fd43e9536824fbddbab85e90fee864 100644 |
| --- a/content/browser/renderer_host/render_frame_host_impl.h |
| +++ b/content/browser/renderer_host/render_frame_host_impl.h |
| @@ -5,19 +5,25 @@ |
| #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_FRAME_HOST_IMPL_H_ |
| #define CONTENT_BROWSER_RENDERER_HOST_RENDER_FRAME_HOST_IMPL_H_ |
| +#include <string> |
| + |
| #include "base/compiler_specific.h" |
| #include "content/public/browser/render_frame_host.h" |
| namespace content { |
| +class FrameTree; |
| class RenderProcessHost; |
| -class RenderViewHostImpl; |
| +class RenderViewHost; |
| class CONTENT_EXPORT RenderFrameHostImpl : public RenderFrameHost { |
| public: |
| static RenderFrameHostImpl* FromID(int process_id, int routing_id); |
| - RenderFrameHostImpl(RenderViewHostImpl* render_view_host, |
| + // TODO(nasko): Remove dependency on RenderViewHost here. RenderProcessHost |
|
Charlie Reis
2013/10/02 22:25:19
Can you mention what's blocking this (i.e., needin
nasko
2013/10/02 23:02:06
Done.
|
| + // should be the abstraction needed here. |
| + RenderFrameHostImpl(RenderViewHost* render_view_host, |
| + FrameTree* frame_tree, |
| int routing_id, |
| bool is_swapped_out); |
| virtual ~RenderFrameHostImpl(); |
| @@ -31,11 +37,28 @@ class CONTENT_EXPORT RenderFrameHostImpl : public RenderFrameHost { |
| void Init(); |
| RenderProcessHost* GetProcess() const; |
| int routing_id() const { return routing_id_; } |
| + void OnCreateChildFrame(int new_frame_routing_id, |
| + int64 parent_frame_id, |
| + int64 frame_id, |
| + const std::string& frame_name); |
| + |
| + RenderViewHost* render_view_host() { |
| + return render_view_host_; |
| + } |
| private: |
| bool is_swapped_out() { return is_swapped_out_; } |
| - RenderViewHostImpl* render_view_host_; // Not owned. Outlives this object. |
| + // IPC message handlers. |
| + void OnDetach(int64 parent_frame_id, int64 frame_id); |
| + |
| + // TODO(nasko): This should be removed and replaced by RenderProcessHost. |
| + RenderViewHost* render_view_host_; // Not owned. |
|
Charlie Reis
2013/10/02 22:25:19
nit: One more space before //.
Also, might as wel
nasko
2013/10/02 23:02:06
Done.
|
| + |
| + // Reference to the whole frame tree that this RenderFrameHost belongs too. |
| + // Allows this RenderFrameHost to add and remove nodes in response to |
| + // requests DOM manipulation messages from the renderer. |
| + FrameTree* frame_tree_; |
| int routing_id_; |
| bool is_swapped_out_; |