| Index: Source/modules/mediastream/NavigatorMediaStream.cpp
|
| diff --git a/Source/modules/mediastream/NavigatorMediaStream.cpp b/Source/modules/mediastream/NavigatorMediaStream.cpp
|
| index 70b3054ce2ca8d69bd3240d6784e0f63aec1e35f..3429c95b84219c58ab7ae5b6b6c6ea815654774a 100644
|
| --- a/Source/modules/mediastream/NavigatorMediaStream.cpp
|
| +++ b/Source/modules/mediastream/NavigatorMediaStream.cpp
|
| @@ -47,7 +47,7 @@ NavigatorMediaStream::~NavigatorMediaStream()
|
| {
|
| }
|
|
|
| -void NavigatorMediaStream::webkitGetUserMedia(Navigator& navigator, const Dictionary& options, PassOwnPtrWillBeRawPtr<NavigatorUserMediaSuccessCallback> successCallback, PassOwnPtrWillBeRawPtr<NavigatorUserMediaErrorCallback> errorCallback, ExceptionState& exceptionState)
|
| +void NavigatorMediaStream::webkitGetUserMedia(Navigator& navigator, const Dictionary& options, NavigatorUserMediaSuccessCallback* successCallback, NavigatorUserMediaErrorCallback* errorCallback, ExceptionState& exceptionState)
|
| {
|
| if (!successCallback)
|
| return;
|
| @@ -67,7 +67,7 @@ void NavigatorMediaStream::webkitGetUserMedia(Navigator& navigator, const Dictio
|
| request->start();
|
| }
|
|
|
| -void NavigatorMediaStream::getMediaDevices(Navigator& navigator, PassOwnPtrWillBeRawPtr<MediaDeviceInfoCallback> callback, ExceptionState& exceptionState)
|
| +void NavigatorMediaStream::getMediaDevices(Navigator& navigator, MediaDeviceInfoCallback* callback, ExceptionState& exceptionState)
|
| {
|
| UserMediaController* userMedia = UserMediaController::from(navigator.frame());
|
| if (!userMedia) {
|
|
|