| Index: Source/modules/mediastream/UserMediaRequest.cpp
|
| diff --git a/Source/modules/mediastream/UserMediaRequest.cpp b/Source/modules/mediastream/UserMediaRequest.cpp
|
| index 452168ed904e42cdf088d69420f4077918f7c632..f04e667b02c2ed5f9bba8635c7ec3b55b8644bb9 100644
|
| --- a/Source/modules/mediastream/UserMediaRequest.cpp
|
| +++ b/Source/modules/mediastream/UserMediaRequest.cpp
|
| @@ -45,6 +45,8 @@
|
|
|
| namespace WebCore {
|
|
|
| +DEFINE_GC_INFO(UserMediaRequest);
|
| +
|
| static blink::WebMediaConstraints parseOptions(const Dictionary& options, const String& mediaType, ExceptionState& exceptionState)
|
| {
|
| blink::WebMediaConstraints constraints;
|
| @@ -63,7 +65,7 @@ static blink::WebMediaConstraints parseOptions(const Dictionary& options, const
|
| return constraints;
|
| }
|
|
|
| -PassRefPtr<UserMediaRequest> UserMediaRequest::create(ExecutionContext* context, UserMediaController* controller, const Dictionary& options, PassOwnPtr<NavigatorUserMediaSuccessCallback> successCallback, PassOwnPtr<NavigatorUserMediaErrorCallback> errorCallback, ExceptionState& exceptionState)
|
| +PassRefPtrWillBeRawPtr<UserMediaRequest> UserMediaRequest::create(ExecutionContext* context, UserMediaController* controller, const Dictionary& options, PassOwnPtr<NavigatorUserMediaSuccessCallback> successCallback, PassOwnPtr<NavigatorUserMediaErrorCallback> errorCallback, ExceptionState& exceptionState)
|
| {
|
| blink::WebMediaConstraints audio = parseOptions(options, "audio", exceptionState);
|
| if (exceptionState.hadException())
|
| @@ -76,7 +78,7 @@ PassRefPtr<UserMediaRequest> UserMediaRequest::create(ExecutionContext* context,
|
| if (audio.isNull() && video.isNull())
|
| return 0;
|
|
|
| - return adoptRef(new UserMediaRequest(context, controller, audio, video, successCallback, errorCallback));
|
| + return adoptRefWillBeNoop(new UserMediaRequest(context, controller, audio, video, successCallback, errorCallback));
|
| }
|
|
|
| UserMediaRequest::UserMediaRequest(ExecutionContext* context, UserMediaController* controller, blink::WebMediaConstraints audio, blink::WebMediaConstraints video, PassOwnPtr<NavigatorUserMediaSuccessCallback> successCallback, PassOwnPtr<NavigatorUserMediaErrorCallback> errorCallback)
|
| @@ -133,7 +135,7 @@ void UserMediaRequest::succeed(PassRefPtr<MediaStreamDescriptor> streamDescripto
|
| if (!executionContext())
|
| return;
|
|
|
| - RefPtr<MediaStream> stream = MediaStream::create(executionContext(), streamDescriptor);
|
| + RefPtrWillBeRawPtr<MediaStream> stream = MediaStream::create(executionContext(), streamDescriptor);
|
|
|
| MediaStreamTrackVector audioTracks = stream->getAudioTracks();
|
| for (MediaStreamTrackVector::iterator iter = audioTracks.begin(); iter != audioTracks.end(); ++iter) {
|
| @@ -154,7 +156,7 @@ void UserMediaRequest::fail(const String& description)
|
| return;
|
|
|
| if (m_errorCallback) {
|
| - RefPtr<NavigatorUserMediaError> error = NavigatorUserMediaError::create(NavigatorUserMediaError::NamePermissionDenied, description, String());
|
| + RefPtrWillBeRawPtr<NavigatorUserMediaError> error = NavigatorUserMediaError::create(NavigatorUserMediaError::NamePermissionDenied, description, String());
|
| m_errorCallback->handleEvent(error.get());
|
| }
|
| }
|
| @@ -166,14 +168,14 @@ void UserMediaRequest::failConstraint(const String& constraintName, const String
|
| return;
|
|
|
| if (m_errorCallback) {
|
| - RefPtr<NavigatorUserMediaError> error = NavigatorUserMediaError::create(NavigatorUserMediaError::NameConstraintNotSatisfied, description, constraintName);
|
| + RefPtrWillBeRawPtr<NavigatorUserMediaError> error = NavigatorUserMediaError::create(NavigatorUserMediaError::NameConstraintNotSatisfied, description, constraintName);
|
| m_errorCallback->handleEvent(error.get());
|
| }
|
| }
|
|
|
| void UserMediaRequest::contextDestroyed()
|
| {
|
| - RefPtr<UserMediaRequest> protect(this);
|
| + RefPtrWillBeRawPtr<UserMediaRequest> protect(this);
|
|
|
| if (m_controller) {
|
| m_controller->cancelUserMediaRequest(this);
|
|
|