| 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 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 // for a WebRemoteFrame in the frame tree. In this case, this WebRemoteFrame | 105 // for a WebRemoteFrame in the frame tree. In this case, this WebRemoteFrame |
| 106 // is not attached to the frame tree and there is no blink::Frame associated | 106 // is not attached to the frame tree and there is no blink::Frame associated |
| 107 // with it, so it is not in state where most operations on it will succeed. | 107 // with it, so it is not in state where most operations on it will succeed. |
| 108 bool IsMainFrameDetachedFromTree() const; | 108 bool IsMainFrameDetachedFromTree() const; |
| 109 | 109 |
| 110 int routing_id() { return routing_id_; } | 110 int routing_id() { return routing_id_; } |
| 111 RenderViewImpl* render_view() { return render_view_; } | 111 RenderViewImpl* render_view() { return render_view_; } |
| 112 blink::WebRemoteFrame* web_frame() { return web_frame_; } | 112 blink::WebRemoteFrame* web_frame() { return web_frame_; } |
| 113 | 113 |
| 114 // blink::WebRemoteFrameClient implementation: | 114 // blink::WebRemoteFrameClient implementation: |
| 115 // TODO(lfg): Remove this method once the blink patch lands. |
| 115 virtual void frameDetached(); | 116 virtual void frameDetached(); |
| 117 virtual void frameDetached(blink::WebRemoteFrameClient::DetachType type); |
| 116 virtual void postMessageEvent( | 118 virtual void postMessageEvent( |
| 117 blink::WebLocalFrame* sourceFrame, | 119 blink::WebLocalFrame* sourceFrame, |
| 118 blink::WebRemoteFrame* targetFrame, | 120 blink::WebRemoteFrame* targetFrame, |
| 119 blink::WebSecurityOrigin target, | 121 blink::WebSecurityOrigin target, |
| 120 blink::WebDOMMessageEvent event); | 122 blink::WebDOMMessageEvent event); |
| 121 virtual void initializeChildFrame( | 123 virtual void initializeChildFrame( |
| 122 const blink::WebRect& frame_rect, | 124 const blink::WebRect& frame_rect, |
| 123 float scale_factor); | 125 float scale_factor); |
| 124 virtual void navigate(const blink::WebURLRequest& request, | 126 virtual void navigate(const blink::WebURLRequest& request, |
| 125 bool should_replace_current_entry); | 127 bool should_replace_current_entry); |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 scoped_refptr<ChildFrameCompositingHelper> compositing_helper_; | 161 scoped_refptr<ChildFrameCompositingHelper> compositing_helper_; |
| 160 | 162 |
| 161 RenderViewImpl* render_view_; | 163 RenderViewImpl* render_view_; |
| 162 | 164 |
| 163 DISALLOW_COPY_AND_ASSIGN(RenderFrameProxy); | 165 DISALLOW_COPY_AND_ASSIGN(RenderFrameProxy); |
| 164 }; | 166 }; |
| 165 | 167 |
| 166 } // namespace | 168 } // namespace |
| 167 | 169 |
| 168 #endif // CONTENT_RENDERER_RENDER_FRAME_PROXY_H_ | 170 #endif // CONTENT_RENDERER_RENDER_FRAME_PROXY_H_ |
| OLD | NEW |