| Index: Source/modules/mediastream/MediaDevicesRequest.h
|
| diff --git a/Source/modules/mediastream/MediaDevicesRequest.h b/Source/modules/mediastream/MediaDevicesRequest.h
|
| index f99842d6a1f2f633464d10828fffee8e71c45888..e75632aa031597c7759b06a0445d7c0548dcdb15 100644
|
| --- a/Source/modules/mediastream/MediaDevicesRequest.h
|
| +++ b/Source/modules/mediastream/MediaDevicesRequest.h
|
| @@ -29,6 +29,7 @@
|
| #include "core/dom/ActiveDOMObject.h"
|
| #include "modules/mediastream/MediaDeviceInfo.h"
|
| #include "modules/mediastream/MediaDeviceInfoCallback.h"
|
| +#include "platform/heap/Handle.h"
|
| #include "wtf/PassOwnPtr.h"
|
| #include "wtf/PassRefPtr.h"
|
| #include "wtf/RefCounted.h"
|
| @@ -40,9 +41,9 @@ class ExceptionState;
|
| class MediaStreamDescriptor;
|
| class UserMediaController;
|
|
|
| -class MediaDevicesRequest FINAL : public RefCounted<MediaDevicesRequest>, public ActiveDOMObject {
|
| +class MediaDevicesRequest FINAL : public RefCountedWillBeRefCountedGarbageCollected<MediaDevicesRequest>, public ActiveDOMObject {
|
| public:
|
| - static PassRefPtr<MediaDevicesRequest> create(ExecutionContext*, UserMediaController*, PassOwnPtr<MediaDeviceInfoCallback>, ExceptionState&);
|
| + static PassRefPtrWillBeRawPtr<MediaDevicesRequest> create(ExecutionContext*, UserMediaController*, PassOwnPtr<MediaDeviceInfoCallback>, ExceptionState&);
|
| virtual ~MediaDevicesRequest();
|
|
|
| MediaDeviceInfoCallback* callback() const { return m_callback.get(); }
|
| @@ -55,6 +56,8 @@ public:
|
| // ActiveDOMObject
|
| virtual void stop() OVERRIDE;
|
|
|
| + void trace(Visitor*) { }
|
| +
|
| private:
|
| MediaDevicesRequest(ExecutionContext*, UserMediaController*, PassOwnPtr<MediaDeviceInfoCallback>);
|
|
|
|
|