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

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

Issue 353163002: [Android] Switch to Gin Java Bridge implementation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed AwSettingsTest#testBlockNetworkLoadsWithAudio Created 6 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeCoercionTest.java ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 #include "content/renderer/child_frame_compositing_helper.h" 52 #include "content/renderer/child_frame_compositing_helper.h"
53 #include "content/renderer/context_menu_params_builder.h" 53 #include "content/renderer/context_menu_params_builder.h"
54 #include "content/renderer/devtools/devtools_agent.h" 54 #include "content/renderer/devtools/devtools_agent.h"
55 #include "content/renderer/dom_automation_controller.h" 55 #include "content/renderer/dom_automation_controller.h"
56 #include "content/renderer/geolocation_dispatcher.h" 56 #include "content/renderer/geolocation_dispatcher.h"
57 #include "content/renderer/history_controller.h" 57 #include "content/renderer/history_controller.h"
58 #include "content/renderer/history_serialization.h" 58 #include "content/renderer/history_serialization.h"
59 #include "content/renderer/image_loading_helper.h" 59 #include "content/renderer/image_loading_helper.h"
60 #include "content/renderer/ime_event_guard.h" 60 #include "content/renderer/ime_event_guard.h"
61 #include "content/renderer/internal_document_state_data.h" 61 #include "content/renderer/internal_document_state_data.h"
62 #include "content/renderer/java/java_bridge_dispatcher.h"
63 #include "content/renderer/media/audio_renderer_mixer_manager.h" 62 #include "content/renderer/media/audio_renderer_mixer_manager.h"
64 #include "content/renderer/media/media_stream_dispatcher.h" 63 #include "content/renderer/media/media_stream_dispatcher.h"
65 #include "content/renderer/media/media_stream_impl.h" 64 #include "content/renderer/media/media_stream_impl.h"
66 #include "content/renderer/media/media_stream_renderer_factory.h" 65 #include "content/renderer/media/media_stream_renderer_factory.h"
67 #include "content/renderer/media/midi_dispatcher.h" 66 #include "content/renderer/media/midi_dispatcher.h"
68 #include "content/renderer/media/render_media_log.h" 67 #include "content/renderer/media/render_media_log.h"
69 #include "content/renderer/media/webcontentdecryptionmodule_impl.h" 68 #include "content/renderer/media/webcontentdecryptionmodule_impl.h"
70 #include "content/renderer/media/webmediaplayer_impl.h" 69 #include "content/renderer/media/webmediaplayer_impl.h"
71 #include "content/renderer/media/webmediaplayer_ms.h" 70 #include "content/renderer/media/webmediaplayer_ms.h"
72 #include "content/renderer/media/webmediaplayer_params.h" 71 #include "content/renderer/media/webmediaplayer_params.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 121
123 #if defined(ENABLE_WEBRTC) 122 #if defined(ENABLE_WEBRTC)
124 #include "content/renderer/media/rtc_peer_connection_handler.h" 123 #include "content/renderer/media/rtc_peer_connection_handler.h"
125 #endif 124 #endif
126 125
127 #if defined(OS_ANDROID) 126 #if defined(OS_ANDROID)
128 #include <cpu-features.h> 127 #include <cpu-features.h>
129 128
130 #include "content/common/gpu/client/context_provider_command_buffer.h" 129 #include "content/common/gpu/client/context_provider_command_buffer.h"
131 #include "content/renderer/android/synchronous_compositor_factory.h" 130 #include "content/renderer/android/synchronous_compositor_factory.h"
131 #include "content/renderer/java/gin_java_bridge_dispatcher.h"
132 #include "content/renderer/media/android/renderer_media_player_manager.h" 132 #include "content/renderer/media/android/renderer_media_player_manager.h"
133 #include "content/renderer/media/android/stream_texture_factory_impl.h" 133 #include "content/renderer/media/android/stream_texture_factory_impl.h"
134 #include "content/renderer/media/android/webmediaplayer_android.h" 134 #include "content/renderer/media/android/webmediaplayer_android.h"
135 #endif 135 #endif
136 136
137 #if defined(ENABLE_BROWSER_CDMS) 137 #if defined(ENABLE_BROWSER_CDMS)
138 #include "content/renderer/media/crypto/renderer_cdm_manager.h" 138 #include "content/renderer/media/crypto/renderer_cdm_manager.h"
139 #endif 139 #endif
140 140
141 using blink::WebContextMenuData; 141 using blink::WebContextMenuData;
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
412 weak_factory_(this) { 412 weak_factory_(this) {
413 std::pair<RoutingIDFrameMap::iterator, bool> result = 413 std::pair<RoutingIDFrameMap::iterator, bool> result =
414 g_routing_id_frame_map.Get().insert(std::make_pair(routing_id_, this)); 414 g_routing_id_frame_map.Get().insert(std::make_pair(routing_id_, this));
415 CHECK(result.second) << "Inserting a duplicate item."; 415 CHECK(result.second) << "Inserting a duplicate item.";
416 416
417 RenderThread::Get()->AddRoute(routing_id_, this); 417 RenderThread::Get()->AddRoute(routing_id_, this);
418 418
419 render_view_->RegisterRenderFrame(this); 419 render_view_->RegisterRenderFrame(this);
420 420
421 #if defined(OS_ANDROID) 421 #if defined(OS_ANDROID)
422 new JavaBridgeDispatcher(this); 422 new GinJavaBridgeDispatcher(this);
423 #endif 423 #endif
424 424
425 #if defined(ENABLE_NOTIFICATIONS) 425 #if defined(ENABLE_NOTIFICATIONS)
426 notification_provider_ = new NotificationProvider(this); 426 notification_provider_ = new NotificationProvider(this);
427 #endif 427 #endif
428 } 428 }
429 429
430 RenderFrameImpl::~RenderFrameImpl() { 430 RenderFrameImpl::~RenderFrameImpl() {
431 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, RenderFrameGone()); 431 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, RenderFrameGone());
432 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, OnDestruct()); 432 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, OnDestruct());
(...skipping 3138 matching lines...) Expand 10 before | Expand all | Expand 10 after
3571 3571
3572 #if defined(ENABLE_BROWSER_CDMS) 3572 #if defined(ENABLE_BROWSER_CDMS)
3573 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 3573 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
3574 if (!cdm_manager_) 3574 if (!cdm_manager_)
3575 cdm_manager_ = new RendererCdmManager(this); 3575 cdm_manager_ = new RendererCdmManager(this);
3576 return cdm_manager_; 3576 return cdm_manager_;
3577 } 3577 }
3578 #endif // defined(ENABLE_BROWSER_CDMS) 3578 #endif // defined(ENABLE_BROWSER_CDMS)
3579 3579
3580 } // namespace content 3580 } // namespace content
OLDNEW
« no previous file with comments | « content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeCoercionTest.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698