| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #include "content/renderer/render_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 #include "third_party/WebKit/public/web/WebNavigationPolicy.h" | 50 #include "third_party/WebKit/public/web/WebNavigationPolicy.h" |
| 51 #include "third_party/WebKit/public/web/WebPlugin.h" | 51 #include "third_party/WebKit/public/web/WebPlugin.h" |
| 52 #include "third_party/WebKit/public/web/WebPluginParams.h" | 52 #include "third_party/WebKit/public/web/WebPluginParams.h" |
| 53 #include "third_party/WebKit/public/web/WebSearchableFormData.h" | 53 #include "third_party/WebKit/public/web/WebSearchableFormData.h" |
| 54 #include "third_party/WebKit/public/web/WebSecurityOrigin.h" | 54 #include "third_party/WebKit/public/web/WebSecurityOrigin.h" |
| 55 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h" | 55 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h" |
| 56 #include "third_party/WebKit/public/web/WebView.h" | 56 #include "third_party/WebKit/public/web/WebView.h" |
| 57 #include "webkit/child/weburlresponse_extradata_impl.h" | 57 #include "webkit/child/weburlresponse_extradata_impl.h" |
| 58 | 58 |
| 59 #if defined(ENABLE_PLUGINS) | 59 #if defined(ENABLE_PLUGINS) |
| 60 #include "content/renderer/pepper/pepper_browser_connection.h" |
| 60 #include "content/renderer/pepper/pepper_plugin_instance_impl.h" | 61 #include "content/renderer/pepper/pepper_plugin_instance_impl.h" |
| 61 #endif | 62 #endif |
| 62 | 63 |
| 63 #if defined(ENABLE_WEBRTC) | 64 #if defined(ENABLE_WEBRTC) |
| 64 #include "content/renderer/media/rtc_peer_connection_handler.h" | 65 #include "content/renderer/media/rtc_peer_connection_handler.h" |
| 65 #endif | 66 #endif |
| 66 | 67 |
| 67 using blink::WebDataSource; | 68 using blink::WebDataSource; |
| 68 using blink::WebDocument; | 69 using blink::WebDocument; |
| 69 using blink::WebFrame; | 70 using blink::WebFrame; |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 RenderFrameImpl::RenderFrameImpl(RenderViewImpl* render_view, int routing_id) | 121 RenderFrameImpl::RenderFrameImpl(RenderViewImpl* render_view, int routing_id) |
| 121 : render_view_(render_view), | 122 : render_view_(render_view), |
| 122 routing_id_(routing_id), | 123 routing_id_(routing_id), |
| 123 is_swapped_out_(false), | 124 is_swapped_out_(false), |
| 124 is_detaching_(false) | 125 is_detaching_(false) |
| 125 #if defined(ENABLE_PLUGINS) | 126 #if defined(ENABLE_PLUGINS) |
| 126 , focused_pepper_plugin_(NULL), | 127 , focused_pepper_plugin_(NULL), |
| 127 pepper_last_mouse_event_target_(NULL) | 128 pepper_last_mouse_event_target_(NULL) |
| 128 #endif | 129 #endif |
| 129 { | 130 { |
| 131 #if defined(ENABLE_PLUGINS) |
| 132 new PepperBrowserConnection(this); |
| 133 #endif |
| 130 } | 134 } |
| 131 | 135 |
| 132 RenderFrameImpl::~RenderFrameImpl() { | 136 RenderFrameImpl::~RenderFrameImpl() { |
| 133 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, RenderFrameGone()); | 137 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, RenderFrameGone()); |
| 134 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, OnDestruct()); | 138 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, OnDestruct()); |
| 135 } | 139 } |
| 136 | 140 |
| 137 RenderWidget* RenderFrameImpl::GetRenderWidget() { | 141 RenderWidget* RenderFrameImpl::GetRenderWidget() { |
| 138 return render_view_; | 142 return render_view_; |
| 139 } | 143 } |
| (...skipping 1155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1295 void RenderFrameImpl::AddObserver(RenderFrameObserver* observer) { | 1299 void RenderFrameImpl::AddObserver(RenderFrameObserver* observer) { |
| 1296 observers_.AddObserver(observer); | 1300 observers_.AddObserver(observer); |
| 1297 } | 1301 } |
| 1298 | 1302 |
| 1299 void RenderFrameImpl::RemoveObserver(RenderFrameObserver* observer) { | 1303 void RenderFrameImpl::RemoveObserver(RenderFrameObserver* observer) { |
| 1300 observer->RenderFrameGone(); | 1304 observer->RenderFrameGone(); |
| 1301 observers_.RemoveObserver(observer); | 1305 observers_.RemoveObserver(observer); |
| 1302 } | 1306 } |
| 1303 | 1307 |
| 1304 } // namespace content | 1308 } // namespace content |
| OLD | NEW |