content/browser/renderer_host/media/media_stream_dispatcher_host.cc - Issue 364123002: [Cross-Site Isolation] Migrate entire MediaStream verticals to be per-RenderFrame.

Unified Diff: content/browser/renderer_host/media/media_stream_dispatcher_host.cc

Issue 364123002: [Cross-Site Isolation] Migrate entire MediaStream verticals to be per-RenderFrame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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 side-by-side diff with in-line comments

Download patch

« content/browser/renderer_host/media/DEPS ('K') | « content/browser/renderer_host/media/media_stream_dispatcher_host.h ('k') | content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc » ('j') | content/browser/renderer_host/media/media_stream_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/media/media_stream_dispatcher_host.cc

diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc

index 91fad34fe5c24c96e46c293196af9bd1fd404345..327efce6e20b36ade0f6bb1328f4364832c6483e 100644

--- a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc

+++ b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc

@@ -26,7 +26,7 @@ MediaStreamDispatcherHost::MediaStreamDispatcherHost(

}

void MediaStreamDispatcherHost::StreamGenerated(

- int render_view_id,

+ int render_frame_id,

int page_request_id,

const std::string& label,

const StreamDeviceInfoArray& audio_devices,

@@ -36,12 +36,11 @@ void MediaStreamDispatcherHost::StreamGenerated(

<< ", {label = " << label << "})";

Send(new MediaStreamMsg_StreamGenerated(

- render_view_id, page_request_id, label, audio_devices,

- video_devices));

+ render_frame_id, page_request_id, label, audio_devices, video_devices));

}

void MediaStreamDispatcherHost::StreamGenerationFailed(

- int render_view_id,

+ int render_frame_id,

int page_request_id,

content::MediaStreamRequestResult result) {

DCHECK_CURRENTLY_ON(BrowserThread::IO);

@@ -50,12 +49,12 @@ void MediaStreamDispatcherHost::StreamGenerationFailed(

<< ", { result= " << result << "})";

- Send(new MediaStreamMsg_StreamGenerationFailed(render_view_id,

+ Send(new MediaStreamMsg_StreamGenerationFailed(render_frame_id,

page_request_id,

result));

}

-void MediaStreamDispatcherHost::DeviceStopped(int render_view_id,

+void MediaStreamDispatcherHost::DeviceStopped(int render_frame_id,

const std::string& label,

const StreamDeviceInfo& device) {

DCHECK_CURRENTLY_ON(BrowserThread::IO);

@@ -64,11 +63,11 @@ void MediaStreamDispatcherHost::DeviceStopped(int render_view_id,

<< "{type = " << device.device.type << "}, "

<< "{device_id = " << device.device.id << "})";

- Send(new MediaStreamMsg_DeviceStopped(render_view_id, label, device));

+ Send(new MediaStreamMsg_DeviceStopped(render_frame_id, label, device));

}

void MediaStreamDispatcherHost::DevicesEnumerated(

- int render_view_id,

+ int render_frame_id,

int page_request_id,

const std::string& label,

const StreamDeviceInfoArray& devices) {

@@ -76,12 +75,12 @@ void MediaStreamDispatcherHost::DevicesEnumerated(

DVLOG(1) << "MediaStreamDispatcherHost::DevicesEnumerated("

<< ", {page_request_id = " << page_request_id << "})";

- Send(new MediaStreamMsg_DevicesEnumerated(render_view_id, page_request_id,

+ Send(new MediaStreamMsg_DevicesEnumerated(render_frame_id, page_request_id,

devices));

}

void MediaStreamDispatcherHost::DeviceOpened(

- int render_view_id,

+ int render_frame_id,

int page_request_id,

const std::string& label,

const StreamDeviceInfo& video_device) {

@@ -90,7 +89,7 @@ void MediaStreamDispatcherHost::DeviceOpened(

<< ", {page_request_id = " << page_request_id << "})";

Send(new MediaStreamMsg_DeviceOpened(

- render_view_id, page_request_id, label, video_device));

+ render_frame_id, page_request_id, label, video_device));

}

bool MediaStreamDispatcherHost::OnMessageReceived(const IPC::Message& message) {

@@ -125,13 +124,13 @@ MediaStreamDispatcherHost::~MediaStreamDispatcherHost() {

}

void MediaStreamDispatcherHost::OnGenerateStream(

- int render_view_id,

+ int render_frame_id,

int page_request_id,

const StreamOptions& components,

const GURL& security_origin,

bool user_gesture) {

DVLOG(1) << "MediaStreamDispatcherHost::OnGenerateStream("

- << render_view_id << ", "

+ << render_frame_id << ", "

<< page_request_id << ", ["

<< " audio:" << components.audio_requested

<< " video:" << components.video_requested

@@ -143,37 +142,37 @@ void MediaStreamDispatcherHost::OnGenerateStream(

return;

media_stream_manager_->GenerateStream(

- this, render_process_id_, render_view_id, salt_callback_,

+ this, render_process_id_, render_frame_id, salt_callback_,

page_request_id, components, security_origin, user_gesture);

}

-void MediaStreamDispatcherHost::OnCancelGenerateStream(int render_view_id,

+void MediaStreamDispatcherHost::OnCancelGenerateStream(int render_frame_id,

int page_request_id) {

DVLOG(1) << "MediaStreamDispatcherHost::OnCancelGenerateStream("

- << render_view_id << ", "

+ << render_frame_id << ", "

<< page_request_id << ")";

- media_stream_manager_->CancelRequest(render_process_id_, render_view_id,

+ media_stream_manager_->CancelRequest(render_process_id_, render_frame_id,

page_request_id);

}

void MediaStreamDispatcherHost::OnStopStreamDevice(

- int render_view_id,

+ int render_frame_id,

const std::string& device_id) {

DVLOG(1) << "MediaStreamDispatcherHost::OnStopStreamDevice("

- << render_view_id << ", "

+ << render_frame_id << ", "

<< device_id << ")";

- media_stream_manager_->StopStreamDevice(render_process_id_, render_view_id,

+ media_stream_manager_->StopStreamDevice(render_process_id_, render_frame_id,

device_id);

}

void MediaStreamDispatcherHost::OnEnumerateDevices(

- int render_view_id,

+ int render_frame_id,

int page_request_id,

MediaStreamType type,

const GURL& security_origin,

bool hide_labels_if_no_access) {

DVLOG(1) << "MediaStreamDispatcherHost::OnEnumerateDevices("

- << render_view_id << ", "

+ << render_frame_id << ", "

<< page_request_id << ", "

<< type << ", "

<< security_origin.spec() << ")";

@@ -194,28 +193,28 @@ void MediaStreamDispatcherHost::OnEnumerateDevices(

}

media_stream_manager_->EnumerateDevices(

- this, render_process_id_, render_view_id, salt_callback_,

+ this, render_process_id_, render_frame_id, salt_callback_,

page_request_id, type, security_origin, have_permission);

}

void MediaStreamDispatcherHost::OnCancelEnumerateDevices(

- int render_view_id,

+ int render_frame_id,

int page_request_id) {

DVLOG(1) << "MediaStreamDispatcherHost::OnCancelEnumerateDevices("

- << render_view_id << ", "

+ << render_frame_id << ", "

<< page_request_id << ")";

- media_stream_manager_->CancelRequest(render_process_id_, render_view_id,

+ media_stream_manager_->CancelRequest(render_process_id_, render_frame_id,

page_request_id);

}

void MediaStreamDispatcherHost::OnOpenDevice(

- int render_view_id,

+ int render_frame_id,

int page_request_id,

const std::string& device_id,

MediaStreamType type,

const GURL& security_origin) {

DVLOG(1) << "MediaStreamDispatcherHost::OnOpenDevice("

- << render_view_id << ", "

+ << render_frame_id << ", "

<< page_request_id << ", device_id: "

<< device_id.c_str() << ", type: "

<< type << ", "

@@ -225,15 +224,15 @@ void MediaStreamDispatcherHost::OnOpenDevice(

return;

media_stream_manager_->OpenDevice(

- this, render_process_id_, render_view_id, salt_callback_,

+ this, render_process_id_, render_frame_id, salt_callback_,

page_request_id, device_id, type, security_origin);

}

void MediaStreamDispatcherHost::OnCloseDevice(

- int render_view_id,

+ int render_frame_id,

const std::string& label) {

DVLOG(1) << "MediaStreamDispatcherHost::OnCloseDevice("

- << render_view_id << ", "

+ << render_frame_id << ", "

<< label << ")";

media_stream_manager_->CancelRequest(label);