| Index: third_party/WebKit/Source/modules/mediastream/UserMediaRequest.cpp
|
| diff --git a/third_party/WebKit/Source/modules/mediastream/UserMediaRequest.cpp b/third_party/WebKit/Source/modules/mediastream/UserMediaRequest.cpp
|
| index d8419394bfd418f06d0fb8bf9f9269b6bd7ebdf6..431292761e54f521d3325d25187fbdbbbe38a5ab 100644
|
| --- a/third_party/WebKit/Source/modules/mediastream/UserMediaRequest.cpp
|
| +++ b/third_party/WebKit/Source/modules/mediastream/UserMediaRequest.cpp
|
| @@ -48,7 +48,7 @@
|
|
|
| namespace blink {
|
|
|
| -static WebMediaConstraints parseOptions(const BooleanOrMediaTrackConstraintSet& options, MediaErrorState& errorState)
|
| +static WebMediaConstraints parseOptions(ExecutionContext* context, const BooleanOrMediaTrackConstraintSet& options, MediaErrorState& errorState)
|
| {
|
| WebMediaConstraints constraints;
|
|
|
| @@ -56,7 +56,7 @@ static WebMediaConstraints parseOptions(const BooleanOrMediaTrackConstraintSet&
|
| if (options.isNull()) {
|
| // Do nothing.
|
| } else if (options.isMediaTrackConstraintSet()) {
|
| - constraints = MediaConstraintsImpl::create(options.getAsMediaTrackConstraintSet(), errorState);
|
| + constraints = MediaConstraintsImpl::create(context, options.getAsMediaTrackConstraintSet(), errorState);
|
| } else {
|
| ASSERT(options.isBoolean());
|
| if (options.getAsBoolean()) {
|
| @@ -69,11 +69,11 @@ static WebMediaConstraints parseOptions(const BooleanOrMediaTrackConstraintSet&
|
|
|
| UserMediaRequest* UserMediaRequest::create(ExecutionContext* context, UserMediaController* controller, const MediaStreamConstraints& options, NavigatorUserMediaSuccessCallback* successCallback, NavigatorUserMediaErrorCallback* errorCallback, MediaErrorState& errorState)
|
| {
|
| - WebMediaConstraints audio = parseOptions(options.audio(), errorState);
|
| + WebMediaConstraints audio = parseOptions(context, options.audio(), errorState);
|
| if (errorState.hadException())
|
| return nullptr;
|
|
|
| - WebMediaConstraints video = parseOptions(options.video(), errorState);
|
| + WebMediaConstraints video = parseOptions(context, options.video(), errorState);
|
| if (errorState.hadException())
|
| return nullptr;
|
|
|
|
|