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