| Index: Source/modules/mediastream/NavigatorMediaStream.cpp
|
| diff --git a/Source/modules/mediastream/NavigatorMediaStream.cpp b/Source/modules/mediastream/NavigatorMediaStream.cpp
|
| index 09a6cfbd09fde4558bb6e4c5d7557ba159ff9a46..8f0a9241b6a8f7daae67184816b2ff4524e0f2b1 100644
|
| --- a/Source/modules/mediastream/NavigatorMediaStream.cpp
|
| +++ b/Source/modules/mediastream/NavigatorMediaStream.cpp
|
| @@ -24,7 +24,6 @@
|
| #include "modules/mediastream/NavigatorMediaStream.h"
|
|
|
| #include "bindings/v8/Dictionary.h"
|
| -#include "bindings/v8/ExceptionState.h"
|
| #include "core/dom/Document.h"
|
| #include "core/dom/ExceptionCode.h"
|
| #include "core/page/Frame.h"
|
| @@ -45,20 +44,20 @@ NavigatorMediaStream::~NavigatorMediaStream()
|
| {
|
| }
|
|
|
| -void NavigatorMediaStream::webkitGetUserMedia(Navigator* navigator, const Dictionary& options, PassRefPtr<NavigatorUserMediaSuccessCallback> successCallback, PassRefPtr<NavigatorUserMediaErrorCallback> errorCallback, ExceptionState& es)
|
| +void NavigatorMediaStream::webkitGetUserMedia(Navigator* navigator, const Dictionary& options, PassRefPtr<NavigatorUserMediaSuccessCallback> successCallback, PassRefPtr<NavigatorUserMediaErrorCallback> errorCallback, ExceptionCode& ec)
|
| {
|
| if (!successCallback)
|
| return;
|
|
|
| UserMediaController* userMedia = UserMediaController::from(navigator->frame() ? navigator->frame()->page() : 0);
|
| if (!userMedia) {
|
| - es.throwDOMException(NotSupportedError);
|
| + ec = NotSupportedError;
|
| return;
|
| }
|
|
|
| - RefPtr<UserMediaRequest> request = UserMediaRequest::create(navigator->frame()->document(), userMedia, options, successCallback, errorCallback, es);
|
| + RefPtr<UserMediaRequest> request = UserMediaRequest::create(navigator->frame()->document(), userMedia, options, successCallback, errorCallback, ec);
|
| if (!request) {
|
| - es.throwDOMException(NotSupportedError);
|
| + ec = NotSupportedError;
|
| return;
|
| }
|
|
|
|
|