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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/common/media/media_stream_options.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/speech/speech_recognition_manager_impl.cc ('K') | « content/common/media/media_stream_messages.h ('k') | content/public/browser/media_observer.h » ('j') | content/renderer/media/media_stream_audio_source.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/media/media_stream_options.cc

diff --git a/content/common/media/media_stream_options.cc b/content/common/media/media_stream_options.cc

index c727b63718cd3b3ff6e6a2152ab9e5caa80fafa0..83add2a42de11266a7732f9d94809f88be23c5cf 100644

--- a/content/common/media/media_stream_options.cc

+++ b/content/common/media/media_stream_options.cc

@@ -42,13 +42,13 @@ bool GetFirstConstraintByName(const StreamOptions::Constraints& mandatory,

std::string* value,

bool* is_mandatory) {

if (GetFirstConstraintByName(mandatory, name, value)) {

- if (is_mandatory)

- *is_mandatory = true;

- return true;

- }

if (is_mandatory)

- *is_mandatory = false;

- return GetFirstConstraintByName(optional, name, value);

+ *is_mandatory = true;

+ return true;

+ }

+ if (is_mandatory)

+ *is_mandatory = false;

+ return GetFirstConstraintByName(optional, name, value);

}

} // namespace