Index: content/renderer/media/media_stream_audio_source.cc |
diff --git a/content/renderer/media/media_stream_audio_source.cc b/content/renderer/media/media_stream_audio_source.cc |
index 069f4e3825dfc2797ed97d42b3971dfa1a91fb9d..09d77028cbd9b2450d1dfba18b7aeb1b2c79be89 100644 |
--- a/content/renderer/media/media_stream_audio_source.cc |
+++ b/content/renderer/media/media_stream_audio_source.cc |
@@ -4,14 +4,28 @@ |
#include "content/renderer/media/media_stream_audio_source.h" |
+#include "content/renderer/render_frame_impl.h" |
+#include "content/renderer/render_view_impl.h" |
+ |
namespace content { |
+namespace { |
+// TODO(miu): This is a temporary hack until the Chrome audio vertical is |
+// migrated for the Cross-Site Isolation project. |
tommi (sloooow) - chröme
2014/07/09 07:46:55
is there a bug to track these todos?
miu
2014/07/09 19:48:07
Done. crbug.com/392596
|
+int ToRenderViewId(int render_frame_id) { |
+ RenderFrameImpl* const frame = |
+ RenderFrameImpl::FromRoutingID(render_frame_id); |
+ RenderViewImpl* const view = frame ? frame->render_view() : NULL; |
+ return view ? view->GetRoutingID() : -1; |
+} |
+} // namespace |
+ |
MediaStreamAudioSource::MediaStreamAudioSource( |
- int render_view_id, |
+ int render_frame_id, |
const StreamDeviceInfo& device_info, |
const SourceStoppedCallback& stop_callback, |
PeerConnectionDependencyFactory* factory) |
- : render_view_id_(render_view_id), |
+ : render_view_id_(ToRenderViewId(render_frame_id)), |
factory_(factory) { |
SetDeviceInfo(device_info); |
SetStopCallback(stop_callback); |