| 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_RENDERER_RENDER_FRAME_PROXY_H_ | 5 #ifndef CONTENT_RENDERER_RENDER_FRAME_PROXY_H_ |
| 6 #define CONTENT_RENDERER_RENDER_FRAME_PROXY_H_ | 6 #define CONTENT_RENDERER_RENDER_FRAME_PROXY_H_ |
| 7 | 7 |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/memory/ref_counted.h" | 9 #include "base/memory/ref_counted.h" |
| 10 #include "content/common/content_export.h" | 10 #include "content/common/content_export.h" |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 public IPC::Sender, | 54 public IPC::Sender, |
| 55 NON_EXPORTED_BASE(public blink::WebRemoteFrameClient) { | 55 NON_EXPORTED_BASE(public blink::WebRemoteFrameClient) { |
| 56 public: | 56 public: |
| 57 // This method should be used to create a RenderFrameProxy, which will replace | 57 // This method should be used to create a RenderFrameProxy, which will replace |
| 58 // an existing RenderFrame during its cross-process navigation from the | 58 // an existing RenderFrame during its cross-process navigation from the |
| 59 // current process to a different one. |routing_id| will be ID of the newly | 59 // current process to a different one. |routing_id| will be ID of the newly |
| 60 // created RenderFrameProxy. |frame_to_replace| is the frame that the new | 60 // created RenderFrameProxy. |frame_to_replace| is the frame that the new |
| 61 // proxy will eventually swap places with. | 61 // proxy will eventually swap places with. |
| 62 static RenderFrameProxy* CreateProxyToReplaceFrame( | 62 static RenderFrameProxy* CreateProxyToReplaceFrame( |
| 63 RenderFrameImpl* frame_to_replace, | 63 RenderFrameImpl* frame_to_replace, |
| 64 int routing_id); | 64 int routing_id, |
| 65 blink::WebTreeScopeType scope); |
| 65 | 66 |
| 66 // This method should be used to create a RenderFrameProxy, when there isn't | 67 // This method should be used to create a RenderFrameProxy, when there isn't |
| 67 // an existing RenderFrame. It should be called to construct a local | 68 // an existing RenderFrame. It should be called to construct a local |
| 68 // representation of a RenderFrame that has been created in another process -- | 69 // representation of a RenderFrame that has been created in another process -- |
| 69 // for example, after a cross-process navigation or after the addition of a | 70 // for example, after a cross-process navigation or after the addition of a |
| 70 // new frame local to some other process. |routing_id| will be the ID of the | 71 // new frame local to some other process. |routing_id| will be the ID of the |
| 71 // newly created RenderFrameProxy. |parent_routing_id| is the routing ID of | 72 // newly created RenderFrameProxy. |parent_routing_id| is the routing ID of |
| 72 // the RenderFrameProxy to which the new frame is parented. | 73 // the RenderFrameProxy to which the new frame is parented. |
| 73 // |render_view_routing_id| identifies the RenderView to be associated with | 74 // |render_view_routing_id| identifies the RenderView to be associated with |
| 74 // this frame. | 75 // this frame. |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 scoped_refptr<ChildFrameCompositingHelper> compositing_helper_; | 160 scoped_refptr<ChildFrameCompositingHelper> compositing_helper_; |
| 160 | 161 |
| 161 RenderViewImpl* render_view_; | 162 RenderViewImpl* render_view_; |
| 162 | 163 |
| 163 DISALLOW_COPY_AND_ASSIGN(RenderFrameProxy); | 164 DISALLOW_COPY_AND_ASSIGN(RenderFrameProxy); |
| 164 }; | 165 }; |
| 165 | 166 |
| 166 } // namespace | 167 } // namespace |
| 167 | 168 |
| 168 #endif // CONTENT_RENDERER_RENDER_FRAME_PROXY_H_ | 169 #endif // CONTENT_RENDERER_RENDER_FRAME_PROXY_H_ |
| OLD | NEW |