| Index: Source/modules/mediastream/MediaDeviceInfo.h
|
| diff --git a/Source/modules/mediastream/MediaDeviceInfo.h b/Source/modules/mediastream/MediaDeviceInfo.h
|
| index 36546208886c6071e8369def3b46bc0ab96a6240..64903434136d161f4b962287d76d9d29bdb3e9ac 100644
|
| --- a/Source/modules/mediastream/MediaDeviceInfo.h
|
| +++ b/Source/modules/mediastream/MediaDeviceInfo.h
|
| @@ -26,6 +26,7 @@
|
| #ifndef MediaDeviceInfo_h
|
| #define MediaDeviceInfo_h
|
|
|
| +#include "platform/heap/Handle.h"
|
| #include "public/platform/WebMediaDeviceInfo.h"
|
| #include "wtf/PassRefPtr.h"
|
| #include "wtf/RefCounted.h"
|
| @@ -33,22 +34,24 @@
|
|
|
| namespace WebCore {
|
|
|
| -class MediaDeviceInfo : public RefCounted<MediaDeviceInfo> {
|
| +class MediaDeviceInfo FINAL : public RefCountedWillBeGarbageCollectedFinalized<MediaDeviceInfo> {
|
| public:
|
| - static PassRefPtr<MediaDeviceInfo> create(const blink::WebMediaDeviceInfo&);
|
| + static PassRefPtrWillBeRawPtr<MediaDeviceInfo> create(const blink::WebMediaDeviceInfo&);
|
|
|
| String deviceId() const;
|
| String kind() const;
|
| String label() const;
|
| String groupId() const;
|
|
|
| + void trace(Visitor*) { }
|
| +
|
| private:
|
| explicit MediaDeviceInfo(const blink::WebMediaDeviceInfo&);
|
|
|
| blink::WebMediaDeviceInfo m_webMediaDeviceInfo;
|
| };
|
|
|
| -typedef Vector<RefPtr<MediaDeviceInfo> > MediaDeviceInfoVector;
|
| +typedef WillBeHeapVector<RefPtrWillBeMember<MediaDeviceInfo> > MediaDeviceInfoVector;
|
|
|
| } // namespace WebCore
|
|
|
|
|