Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(143)

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 2375133002: Move MessagePort implementation from android_webview to content (Closed)
Patch Set: added ifdef Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 #include "content/renderer/pepper/plugin_module.h" 211 #include "content/renderer/pepper/plugin_module.h"
212 #endif 212 #endif
213 213
214 #if defined(ENABLE_WEBRTC) 214 #if defined(ENABLE_WEBRTC)
215 #include "content/renderer/media/rtc_peer_connection_handler.h" 215 #include "content/renderer/media/rtc_peer_connection_handler.h"
216 #endif 216 #endif
217 217
218 #if defined(OS_ANDROID) 218 #if defined(OS_ANDROID)
219 #include <cpu-features.h> 219 #include <cpu-features.h>
220 220
221 #include "content/renderer/android/app_web_message_port_client.h"
221 #include "content/renderer/java/gin_java_bridge_dispatcher.h" 222 #include "content/renderer/java/gin_java_bridge_dispatcher.h"
222 #include "content/renderer/media/android/renderer_media_player_manager.h" 223 #include "content/renderer/media/android/renderer_media_player_manager.h"
223 #include "content/renderer/media/android/renderer_surface_view_manager.h" 224 #include "content/renderer/media/android/renderer_surface_view_manager.h"
224 #include "content/renderer/media/android/stream_texture_factory.h" 225 #include "content/renderer/media/android/stream_texture_factory.h"
225 #include "content/renderer/media/android/webmediaplayer_android.h" 226 #include "content/renderer/media/android/webmediaplayer_android.h"
226 #include "media/base/android/media_codec_util.h" 227 #include "media/base/android/media_codec_util.h"
227 #include "third_party/WebKit/public/platform/WebFloatPoint.h" 228 #include "third_party/WebKit/public/platform/WebFloatPoint.h"
228 #endif 229 #endif
229 230
230 #if defined(ENABLE_PEPPER_CDMS) 231 #if defined(ENABLE_PEPPER_CDMS)
(...skipping 988 matching lines...) Expand 10 before | Expand all | Expand 10 after
1219 // when |this| is deleted. 1220 // when |this| is deleted.
1220 devtools_agent_ = new DevToolsAgent(this); 1221 devtools_agent_ = new DevToolsAgent(this);
1221 } 1222 }
1222 1223
1223 RegisterMojoInterfaces(); 1224 RegisterMojoInterfaces();
1224 1225
1225 // We delay calling this until we have the WebFrame so that any observer or 1226 // We delay calling this until we have the WebFrame so that any observer or
1226 // embedder can call GetWebFrame on any RenderFrame. 1227 // embedder can call GetWebFrame on any RenderFrame.
1227 GetContentClient()->renderer()->RenderFrameCreated(this); 1228 GetContentClient()->renderer()->RenderFrameCreated(this);
1228 1229
1230 #if defined(OS_ANDROID)
1231 new AppWebMessagePortClient(this);
1232 #endif
1233
1229 RenderThreadImpl* render_thread = RenderThreadImpl::current(); 1234 RenderThreadImpl* render_thread = RenderThreadImpl::current();
1230 // render_thread may be NULL in tests. 1235 // render_thread may be NULL in tests.
1231 InputHandlerManager* input_handler_manager = 1236 InputHandlerManager* input_handler_manager =
1232 render_thread ? render_thread->input_handler_manager() : nullptr; 1237 render_thread ? render_thread->input_handler_manager() : nullptr;
1233 if (input_handler_manager) { 1238 if (input_handler_manager) {
1234 DCHECK(render_view_->HasAddedInputHandler()); 1239 DCHECK(render_view_->HasAddedInputHandler());
1235 input_handler_manager->RegisterRoutingID(GetRoutingID()); 1240 input_handler_manager->RegisterRoutingID(GetRoutingID());
1236 } 1241 }
1237 } 1242 }
1238 1243
(...skipping 5252 matching lines...) Expand 10 before | Expand all | Expand 10 after
6491 // event target. Potentially a Pepper plugin will receive the event. 6496 // event target. Potentially a Pepper plugin will receive the event.
6492 // In order to tell whether a plugin gets the last mouse event and which it 6497 // In order to tell whether a plugin gets the last mouse event and which it
6493 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6498 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6494 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6499 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6495 // |pepper_last_mouse_event_target_|. 6500 // |pepper_last_mouse_event_target_|.
6496 pepper_last_mouse_event_target_ = nullptr; 6501 pepper_last_mouse_event_target_ = nullptr;
6497 #endif 6502 #endif
6498 } 6503 }
6499 6504
6500 } // namespace content 6505 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698