| Index: Source/modules/mediastream/UserMediaRequest.h
|
| diff --git a/Source/modules/mediastream/UserMediaRequest.h b/Source/modules/mediastream/UserMediaRequest.h
|
| index 3523ae5b4a372e497cddccab43c69c14b34ce779..8ad62dd47441378b368ce41397747fe5050745c0 100644
|
| --- a/Source/modules/mediastream/UserMediaRequest.h
|
| +++ b/Source/modules/mediastream/UserMediaRequest.h
|
| @@ -51,7 +51,7 @@ class UserMediaController;
|
|
|
| class UserMediaRequest : public RefCounted<UserMediaRequest>, public ContextLifecycleObserver {
|
| public:
|
| - static PassRefPtr<UserMediaRequest> create(ExecutionContext*, UserMediaController*, const Dictionary& options, PassRefPtr<NavigatorUserMediaSuccessCallback>, PassRefPtr<NavigatorUserMediaErrorCallback>, ExceptionState&);
|
| + static PassRefPtr<UserMediaRequest> create(ExecutionContext*, UserMediaController*, const Dictionary& options, PassOwnPtr<NavigatorUserMediaSuccessCallback>, PassOwnPtr<NavigatorUserMediaErrorCallback>, ExceptionState&);
|
| ~UserMediaRequest();
|
|
|
| NavigatorUserMediaSuccessCallback* successCallback() const { return m_successCallback.get(); }
|
| @@ -73,15 +73,15 @@ public:
|
| virtual void contextDestroyed();
|
|
|
| private:
|
| - UserMediaRequest(ExecutionContext*, UserMediaController*, PassRefPtr<MediaConstraintsImpl> audio, PassRefPtr<MediaConstraintsImpl> video, PassRefPtr<NavigatorUserMediaSuccessCallback>, PassRefPtr<NavigatorUserMediaErrorCallback>);
|
| + UserMediaRequest(ExecutionContext*, UserMediaController*, PassRefPtr<MediaConstraintsImpl> audio, PassRefPtr<MediaConstraintsImpl> video, PassOwnPtr<NavigatorUserMediaSuccessCallback>, PassOwnPtr<NavigatorUserMediaErrorCallback>);
|
|
|
| RefPtr<MediaConstraintsImpl> m_audio;
|
| RefPtr<MediaConstraintsImpl> m_video;
|
|
|
| UserMediaController* m_controller;
|
|
|
| - RefPtr<NavigatorUserMediaSuccessCallback> m_successCallback;
|
| - RefPtr<NavigatorUserMediaErrorCallback> m_errorCallback;
|
| + OwnPtr<NavigatorUserMediaSuccessCallback> m_successCallback;
|
| + OwnPtr<NavigatorUserMediaErrorCallback> m_errorCallback;
|
| };
|
|
|
| } // namespace WebCore
|
|
|