OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_PROXY_HOST_H_ | 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_PROXY_HOST_H_ |
6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_PROXY_HOST_H_ | 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_PROXY_HOST_H_ |
7 | 7 |
8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
9 #include "content/browser/frame_host/render_frame_host_impl.h" | 9 #include "content/browser/frame_host/render_frame_host_impl.h" |
10 #include "content/browser/site_instance_impl.h" | 10 #include "content/browser/site_instance_impl.h" |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
53 // complete, the RenderFrameHost is deleted. | 53 // complete, the RenderFrameHost is deleted. |
54 class RenderFrameProxyHost | 54 class RenderFrameProxyHost |
55 : public IPC::Listener, | 55 : public IPC::Listener, |
56 public IPC::Sender { | 56 public IPC::Sender { |
57 public: | 57 public: |
58 RenderFrameProxyHost(SiteInstance* site_instance, | 58 RenderFrameProxyHost(SiteInstance* site_instance, |
59 FrameTreeNode* frame_tree_node); | 59 FrameTreeNode* frame_tree_node); |
60 virtual ~RenderFrameProxyHost(); | 60 virtual ~RenderFrameProxyHost(); |
61 | 61 |
62 RenderProcessHost* GetProcess() { | 62 RenderProcessHost* GetProcess() { |
63 return site_instance_->GetProcess(); | 63 return site_instance_->HasProcess() ? site_instance_->GetProcess() : NULL; |
Charlie Reis
2014/07/24 22:36:30
When does this matter? I'd like to avoid adding a
nasko
2014/07/25 07:13:20
Initially it was meant to not create a process if
kenrb
2014/07/25 23:42:05
Changed.
| |
64 } | 64 } |
65 | 65 |
66 // Initializes the object and creates the RenderFrameProxy in the process | |
67 // for the SiteInstance. | |
68 bool InitRenderFrameProxy(); | |
69 | |
66 int GetRoutingID() { | 70 int GetRoutingID() { |
67 return routing_id_; | 71 return routing_id_; |
68 } | 72 } |
69 | 73 |
70 SiteInstance* GetSiteInstance() { | 74 SiteInstance* GetSiteInstance() { |
71 return site_instance_.get(); | 75 return site_instance_.get(); |
72 } | 76 } |
73 | 77 |
74 void SetChildRWHView(RenderWidgetHostView* view); | 78 void SetChildRWHView(RenderWidgetHostView* view); |
75 | 79 |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
115 // TODO(nasko): This can be removed once we don't have a swapped out state on | 119 // TODO(nasko): This can be removed once we don't have a swapped out state on |
116 // RenderFrameHosts. See https://crbug.com/357747. | 120 // RenderFrameHosts. See https://crbug.com/357747. |
117 scoped_ptr<RenderFrameHostImpl> render_frame_host_; | 121 scoped_ptr<RenderFrameHostImpl> render_frame_host_; |
118 | 122 |
119 DISALLOW_COPY_AND_ASSIGN(RenderFrameProxyHost); | 123 DISALLOW_COPY_AND_ASSIGN(RenderFrameProxyHost); |
120 }; | 124 }; |
121 | 125 |
122 } // namespace | 126 } // namespace |
123 | 127 |
124 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_PROXY_HOST_H_ | 128 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_PROXY_HOST_H_ |
OLD | NEW |