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

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

Issue 2890753003: Introduce AudioIPCFactory. (Closed)
Patch Set: Rollback to PS1, fix includes. 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 1085 matching lines...) Expand 10 before | Expand all | Expand 10 after
1215 1216
1216 base::trace_event::TraceLog::GetInstance()->RemoveProcessLabel(routing_id_); 1217 base::trace_event::TraceLog::GetInstance()->RemoveProcessLabel(routing_id_);
1217 1218
1218 // Unregister from InputHandlerManager. render_thread may be NULL in tests. 1219 // Unregister from InputHandlerManager. render_thread may be NULL in tests.
1219 RenderThreadImpl* render_thread = RenderThreadImpl::current(); 1220 RenderThreadImpl* render_thread = RenderThreadImpl::current();
1220 InputHandlerManager* input_handler_manager = 1221 InputHandlerManager* input_handler_manager =
1221 render_thread ? render_thread->input_handler_manager() : nullptr; 1222 render_thread ? render_thread->input_handler_manager() : nullptr;
1222 if (input_handler_manager) 1223 if (input_handler_manager)
1223 input_handler_manager->UnregisterRoutingID(GetRoutingID()); 1224 input_handler_manager->UnregisterRoutingID(GetRoutingID());
1224 1225
1226 if (AudioIPCFactory::get())
DaleCurtis 2017/05/31 20:48:09 If you like, you can write this as: if (auto* fac
Max Morin 2017/06/01 13:58:43 Done.
1227 AudioIPCFactory::get()->MaybeDeregisterRemoteFactory(GetRoutingID());
1228
1225 if (is_main_frame_) { 1229 if (is_main_frame_) {
1226 // Ensure the RenderView doesn't point to this object, once it is destroyed. 1230 // Ensure the RenderView doesn't point to this object, once it is destroyed.
1227 // TODO(nasko): Add a check that the |main_render_frame_| of |render_view_| 1231 // TODO(nasko): Add a check that the |main_render_frame_| of |render_view_|
1228 // is |this|, once the object is no longer leaked. 1232 // is |this|, once the object is no longer leaked.
1229 // See https://crbug.com/464764. 1233 // See https://crbug.com/464764.
1230 render_view_->main_render_frame_ = nullptr; 1234 render_view_->main_render_frame_ = nullptr;
1231 } 1235 }
1232 1236
1233 render_view_->UnregisterRenderFrame(this); 1237 render_view_->UnregisterRenderFrame(this);
1234 g_routing_id_frame_map.Get().erase(routing_id_); 1238 g_routing_id_frame_map.Get().erase(routing_id_);
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
1288 RenderThreadImpl* render_thread = RenderThreadImpl::current(); 1292 RenderThreadImpl* render_thread = RenderThreadImpl::current();
1289 // render_thread may be NULL in tests. 1293 // render_thread may be NULL in tests.
1290 InputHandlerManager* input_handler_manager = 1294 InputHandlerManager* input_handler_manager =
1291 render_thread ? render_thread->input_handler_manager() : nullptr; 1295 render_thread ? render_thread->input_handler_manager() : nullptr;
1292 if (input_handler_manager) { 1296 if (input_handler_manager) {
1293 DCHECK(render_view_->HasAddedInputHandler()); 1297 DCHECK(render_view_->HasAddedInputHandler());
1294 input_handler_manager->RegisterAssociatedRenderFrameRoutingID( 1298 input_handler_manager->RegisterAssociatedRenderFrameRoutingID(
1295 GetRoutingID(), render_view_->GetRoutingID()); 1299 GetRoutingID(), render_view_->GetRoutingID());
1296 } 1300 }
1297 1301
1302 // AudioIPCFactory may be null in tests.
1303 if (AudioIPCFactory::get()) {
1304 AudioIPCFactory::get()->MaybeRegisterRemoteFactory(GetRoutingID(),
1305 GetRemoteInterfaces());
1306 }
1307
1298 const base::CommandLine& command_line = 1308 const base::CommandLine& command_line =
1299 *base::CommandLine::ForCurrentProcess(); 1309 *base::CommandLine::ForCurrentProcess();
1300 if (command_line.HasSwitch(switches::kDomAutomationController)) 1310 if (command_line.HasSwitch(switches::kDomAutomationController))
1301 enabled_bindings_ |= BINDINGS_POLICY_DOM_AUTOMATION; 1311 enabled_bindings_ |= BINDINGS_POLICY_DOM_AUTOMATION;
1302 if (command_line.HasSwitch(switches::kStatsCollectionController)) 1312 if (command_line.HasSwitch(switches::kStatsCollectionController))
1303 enabled_bindings_ |= BINDINGS_POLICY_STATS_COLLECTION; 1313 enabled_bindings_ |= BINDINGS_POLICY_STATS_COLLECTION;
1304 } 1314 }
1305 1315
1306 void RenderFrameImpl::InitializeBlameContext(RenderFrameImpl* parent_frame) { 1316 void RenderFrameImpl::InitializeBlameContext(RenderFrameImpl* parent_frame) {
1307 DCHECK(!blame_context_); 1317 DCHECK(!blame_context_);
(...skipping 5456 matching lines...) Expand 10 before | Expand all | Expand 10 after
6764 policy(info.default_policy), 6774 policy(info.default_policy),
6765 replaces_current_history_item(info.replaces_current_history_item), 6775 replaces_current_history_item(info.replaces_current_history_item),
6766 history_navigation_in_new_child_frame( 6776 history_navigation_in_new_child_frame(
6767 info.is_history_navigation_in_new_child_frame), 6777 info.is_history_navigation_in_new_child_frame),
6768 client_redirect(info.is_client_redirect), 6778 client_redirect(info.is_client_redirect),
6769 cache_disabled(info.is_cache_disabled), 6779 cache_disabled(info.is_cache_disabled),
6770 form(info.form), 6780 form(info.form),
6771 source_location(info.source_location) {} 6781 source_location(info.source_location) {}
6772 6782
6773 } // namespace content 6783 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698