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

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

Issue 2890753003: Introduce AudioIPCFactory. (Closed)
Patch Set: Dale's comments. Created 3 years, 6 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 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 #include "content/renderer/history_entry.h" 110 #include "content/renderer/history_entry.h"
111 #include "content/renderer/history_serialization.h" 111 #include "content/renderer/history_serialization.h"
112 #include "content/renderer/image_downloader/image_downloader_impl.h" 112 #include "content/renderer/image_downloader/image_downloader_impl.h"
113 #include "content/renderer/ime_event_guard.h" 113 #include "content/renderer/ime_event_guard.h"
114 #include "content/renderer/input/frame_input_handler_impl.h" 114 #include "content/renderer/input/frame_input_handler_impl.h"
115 #include "content/renderer/input/input_handler_manager.h" 115 #include "content/renderer/input/input_handler_manager.h"
116 #include "content/renderer/installedapp/related_apps_fetcher.h" 116 #include "content/renderer/installedapp/related_apps_fetcher.h"
117 #include "content/renderer/internal_document_state_data.h" 117 #include "content/renderer/internal_document_state_data.h"
118 #include "content/renderer/manifest/manifest_manager.h" 118 #include "content/renderer/manifest/manifest_manager.h"
119 #include "content/renderer/media/audio_device_factory.h" 119 #include "content/renderer/media/audio_device_factory.h"
120 #include "content/renderer/media/audio_ipc_factory.h"
120 #include "content/renderer/media/media_devices_listener_impl.h" 121 #include "content/renderer/media/media_devices_listener_impl.h"
121 #include "content/renderer/media/media_permission_dispatcher.h" 122 #include "content/renderer/media/media_permission_dispatcher.h"
122 #include "content/renderer/media/media_stream_dispatcher.h" 123 #include "content/renderer/media/media_stream_dispatcher.h"
123 #include "content/renderer/media/user_media_client_impl.h" 124 #include "content/renderer/media/user_media_client_impl.h"
124 #include "content/renderer/mojo/blink_connector_js_wrapper.h" 125 #include "content/renderer/mojo/blink_connector_js_wrapper.h"
125 #include "content/renderer/mojo/blink_interface_registry_impl.h" 126 #include "content/renderer/mojo/blink_interface_registry_impl.h"
126 #include "content/renderer/mojo/interface_provider_js_wrapper.h" 127 #include "content/renderer/mojo/interface_provider_js_wrapper.h"
127 #include "content/renderer/mojo_bindings_controller.h" 128 #include "content/renderer/mojo_bindings_controller.h"
128 #include "content/renderer/navigation_state_impl.h" 129 #include "content/renderer/navigation_state_impl.h"
129 #include "content/renderer/pepper/pepper_audio_controller.h" 130 #include "content/renderer/pepper/pepper_audio_controller.h"
(...skipping 1090 matching lines...) Expand 10 before | Expand all | Expand 10 after
1220 1221
1221 base::trace_event::TraceLog::GetInstance()->RemoveProcessLabel(routing_id_); 1222 base::trace_event::TraceLog::GetInstance()->RemoveProcessLabel(routing_id_);
1222 1223
1223 // Unregister from InputHandlerManager. render_thread may be NULL in tests. 1224 // Unregister from InputHandlerManager. render_thread may be NULL in tests.
1224 RenderThreadImpl* render_thread = RenderThreadImpl::current(); 1225 RenderThreadImpl* render_thread = RenderThreadImpl::current();
1225 InputHandlerManager* input_handler_manager = 1226 InputHandlerManager* input_handler_manager =
1226 render_thread ? render_thread->input_handler_manager() : nullptr; 1227 render_thread ? render_thread->input_handler_manager() : nullptr;
1227 if (input_handler_manager) 1228 if (input_handler_manager)
1228 input_handler_manager->UnregisterRoutingID(GetRoutingID()); 1229 input_handler_manager->UnregisterRoutingID(GetRoutingID());
1229 1230
1231 if (auto* factory = AudioIPCFactory::get())
1232 factory->MaybeDeregisterRemoteFactory(GetRoutingID());
1233
1230 if (is_main_frame_) { 1234 if (is_main_frame_) {
1231 // Ensure the RenderView doesn't point to this object, once it is destroyed. 1235 // Ensure the RenderView doesn't point to this object, once it is destroyed.
1232 // TODO(nasko): Add a check that the |main_render_frame_| of |render_view_| 1236 // TODO(nasko): Add a check that the |main_render_frame_| of |render_view_|
1233 // is |this|, once the object is no longer leaked. 1237 // is |this|, once the object is no longer leaked.
1234 // See https://crbug.com/464764. 1238 // See https://crbug.com/464764.
1235 render_view_->main_render_frame_ = nullptr; 1239 render_view_->main_render_frame_ = nullptr;
1236 } 1240 }
1237 1241
1238 render_view_->UnregisterRenderFrame(this); 1242 render_view_->UnregisterRenderFrame(this);
1239 g_routing_id_frame_map.Get().erase(routing_id_); 1243 g_routing_id_frame_map.Get().erase(routing_id_);
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
1293 RenderThreadImpl* render_thread = RenderThreadImpl::current(); 1297 RenderThreadImpl* render_thread = RenderThreadImpl::current();
1294 // render_thread may be NULL in tests. 1298 // render_thread may be NULL in tests.
1295 InputHandlerManager* input_handler_manager = 1299 InputHandlerManager* input_handler_manager =
1296 render_thread ? render_thread->input_handler_manager() : nullptr; 1300 render_thread ? render_thread->input_handler_manager() : nullptr;
1297 if (input_handler_manager) { 1301 if (input_handler_manager) {
1298 DCHECK(render_view_->HasAddedInputHandler()); 1302 DCHECK(render_view_->HasAddedInputHandler());
1299 input_handler_manager->RegisterAssociatedRenderFrameRoutingID( 1303 input_handler_manager->RegisterAssociatedRenderFrameRoutingID(
1300 GetRoutingID(), render_view_->GetRoutingID()); 1304 GetRoutingID(), render_view_->GetRoutingID());
1301 } 1305 }
1302 1306
1307 // AudioIPCFactory may be null in tests.
1308 if (auto* factory = AudioIPCFactory::get())
1309 factory->MaybeRegisterRemoteFactory(GetRoutingID(), GetRemoteInterfaces());
1310
1303 const base::CommandLine& command_line = 1311 const base::CommandLine& command_line =
1304 *base::CommandLine::ForCurrentProcess(); 1312 *base::CommandLine::ForCurrentProcess();
1305 if (command_line.HasSwitch(switches::kDomAutomationController)) 1313 if (command_line.HasSwitch(switches::kDomAutomationController))
1306 enabled_bindings_ |= BINDINGS_POLICY_DOM_AUTOMATION; 1314 enabled_bindings_ |= BINDINGS_POLICY_DOM_AUTOMATION;
1307 if (command_line.HasSwitch(switches::kStatsCollectionController)) 1315 if (command_line.HasSwitch(switches::kStatsCollectionController))
1308 enabled_bindings_ |= BINDINGS_POLICY_STATS_COLLECTION; 1316 enabled_bindings_ |= BINDINGS_POLICY_STATS_COLLECTION;
1309 } 1317 }
1310 1318
1311 void RenderFrameImpl::InitializeBlameContext(RenderFrameImpl* parent_frame) { 1319 void RenderFrameImpl::InitializeBlameContext(RenderFrameImpl* parent_frame) {
1312 DCHECK(!blame_context_); 1320 DCHECK(!blame_context_);
(...skipping 5456 matching lines...) Expand 10 before | Expand all | Expand 10 after
6769 policy(info.default_policy), 6777 policy(info.default_policy),
6770 replaces_current_history_item(info.replaces_current_history_item), 6778 replaces_current_history_item(info.replaces_current_history_item),
6771 history_navigation_in_new_child_frame( 6779 history_navigation_in_new_child_frame(
6772 info.is_history_navigation_in_new_child_frame), 6780 info.is_history_navigation_in_new_child_frame),
6773 client_redirect(info.is_client_redirect), 6781 client_redirect(info.is_client_redirect),
6774 cache_disabled(info.is_cache_disabled), 6782 cache_disabled(info.is_cache_disabled),
6775 form(info.form), 6783 form(info.form),
6776 source_location(info.source_location) {} 6784 source_location(info.source_location) {}
6777 6785
6778 } // namespace content 6786 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/pepper/pepper_platform_audio_output_dev.cc ('k') | content/renderer/render_thread_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698