| Index: Source/modules/mediastream/UserMediaController.h
|
| diff --git a/Source/modules/mediastream/UserMediaController.h b/Source/modules/mediastream/UserMediaController.h
|
| index 6a45a0e08371ba2f9ecc08c8d7285329f505ca7f..c751f0fd8c45f0fe5b85a32d6cd44cbefe684eb9 100644
|
| --- a/Source/modules/mediastream/UserMediaController.h
|
| +++ b/Source/modules/mediastream/UserMediaController.h
|
| @@ -34,9 +34,10 @@ namespace WebCore {
|
| class MediaDevicesRequest;
|
| class UserMediaRequest;
|
|
|
| -class UserMediaController FINAL : public Supplement<LocalFrame> {
|
| +class UserMediaController FINAL : public NoBaseWillBeGarbageCollected<UserMediaController>, public WillBeHeapSupplement<LocalFrame> {
|
| + WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(UserMediaController);
|
| + DECLARE_EMPTY_VIRTUAL_DESTRUCTOR_WILL_BE_REMOVED(UserMediaController);
|
| public:
|
| - virtual ~UserMediaController();
|
|
|
| UserMediaClient* client() const { return m_client; }
|
|
|
| @@ -46,11 +47,11 @@ public:
|
| void requestMediaDevices(PassRefPtrWillBeRawPtr<MediaDevicesRequest>);
|
| void cancelMediaDevicesRequest(MediaDevicesRequest*);
|
|
|
| - static PassOwnPtr<UserMediaController> create(UserMediaClient*);
|
| + static PassOwnPtrWillBeRawPtr<UserMediaController> create(UserMediaClient*);
|
| static const char* supplementName();
|
| - static UserMediaController* from(LocalFrame* frame) { return static_cast<UserMediaController*>(Supplement<LocalFrame>::from(frame, supplementName())); }
|
| + static UserMediaController* from(LocalFrame* frame) { return static_cast<UserMediaController*>(WillBeHeapSupplement<LocalFrame>::from(frame, supplementName())); }
|
|
|
| - virtual void trace(Visitor* visitor) OVERRIDE { Supplement<LocalFrame>::trace(visitor); }
|
| + virtual void trace(Visitor* visitor) OVERRIDE { WillBeHeapSupplement<LocalFrame>::trace(visitor); }
|
|
|
| protected:
|
| explicit UserMediaController(UserMediaClient*);
|
|
|