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

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

Issue 2375133002: Move MessagePort implementation from android_webview to content (Closed)
Patch Set: 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 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 #include "content/renderer/pepper/plugin_module.h" 209 #include "content/renderer/pepper/plugin_module.h"
210 #endif 210 #endif
211 211
212 #if defined(ENABLE_WEBRTC) 212 #if defined(ENABLE_WEBRTC)
213 #include "content/renderer/media/rtc_peer_connection_handler.h" 213 #include "content/renderer/media/rtc_peer_connection_handler.h"
214 #endif 214 #endif
215 215
216 #if defined(OS_ANDROID) 216 #if defined(OS_ANDROID)
217 #include <cpu-features.h> 217 #include <cpu-features.h>
218 218
219 #include "content/renderer/android/app_web_message_port_client.h"
219 #include "content/renderer/java/gin_java_bridge_dispatcher.h" 220 #include "content/renderer/java/gin_java_bridge_dispatcher.h"
220 #include "content/renderer/media/android/renderer_media_player_manager.h" 221 #include "content/renderer/media/android/renderer_media_player_manager.h"
221 #include "content/renderer/media/android/renderer_media_session_manager.h" 222 #include "content/renderer/media/android/renderer_media_session_manager.h"
222 #include "content/renderer/media/android/renderer_surface_view_manager.h" 223 #include "content/renderer/media/android/renderer_surface_view_manager.h"
223 #include "content/renderer/media/android/stream_texture_factory.h" 224 #include "content/renderer/media/android/stream_texture_factory.h"
224 #include "content/renderer/media/android/webmediaplayer_android.h" 225 #include "content/renderer/media/android/webmediaplayer_android.h"
225 #include "content/renderer/media/android/webmediasession_android.h" 226 #include "content/renderer/media/android/webmediasession_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
(...skipping 969 matching lines...) Expand 10 before | Expand all | Expand 10 after
1198 // when |this| is deleted. 1199 // when |this| is deleted.
1199 devtools_agent_ = new DevToolsAgent(this); 1200 devtools_agent_ = new DevToolsAgent(this);
1200 } 1201 }
1201 1202
1202 RegisterMojoInterfaces(); 1203 RegisterMojoInterfaces();
1203 1204
1204 // We delay calling this until we have the WebFrame so that any observer or 1205 // We delay calling this until we have the WebFrame so that any observer or
1205 // embedder can call GetWebFrame on any RenderFrame. 1206 // embedder can call GetWebFrame on any RenderFrame.
1206 GetContentClient()->renderer()->RenderFrameCreated(this); 1207 GetContentClient()->renderer()->RenderFrameCreated(this);
1207 1208
1209 #if defined(OS_ANDROID)
1210 new AppWebMessagePortClient(this);
1211 #endif
1212
1208 RenderThreadImpl* render_thread = RenderThreadImpl::current(); 1213 RenderThreadImpl* render_thread = RenderThreadImpl::current();
1209 // render_thread may be NULL in tests. 1214 // render_thread may be NULL in tests.
1210 InputHandlerManager* input_handler_manager = 1215 InputHandlerManager* input_handler_manager =
1211 render_thread ? render_thread->input_handler_manager() : nullptr; 1216 render_thread ? render_thread->input_handler_manager() : nullptr;
1212 if (input_handler_manager) { 1217 if (input_handler_manager) {
1213 DCHECK(render_view_->HasAddedInputHandler()); 1218 DCHECK(render_view_->HasAddedInputHandler());
1214 input_handler_manager->RegisterRoutingID(GetRoutingID()); 1219 input_handler_manager->RegisterRoutingID(GetRoutingID());
1215 } 1220 }
1216 } 1221 }
1217 1222
(...skipping 5213 matching lines...) Expand 10 before | Expand all | Expand 10 after
6431 // event target. Potentially a Pepper plugin will receive the event. 6436 // event target. Potentially a Pepper plugin will receive the event.
6432 // In order to tell whether a plugin gets the last mouse event and which it 6437 // In order to tell whether a plugin gets the last mouse event and which it
6433 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6438 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6434 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6439 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6435 // |pepper_last_mouse_event_target_|. 6440 // |pepper_last_mouse_event_target_|.
6436 pepper_last_mouse_event_target_ = nullptr; 6441 pepper_last_mouse_event_target_ = nullptr;
6437 #endif 6442 #endif
6438 } 6443 }
6439 6444
6440 } // namespace content 6445 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698