| Index: third_party/WebKit/Source/modules/encryptedmedia/MediaKeysController.h
|
| diff --git a/third_party/WebKit/Source/modules/encryptedmedia/MediaKeysController.h b/third_party/WebKit/Source/modules/encryptedmedia/MediaKeysController.h
|
| index 08aa35da16b5e1dbfd164d91a36dc7ffc8504553..eebb3832fac7721bdeed9bee4fac88f28e35bb85 100644
|
| --- a/third_party/WebKit/Source/modules/encryptedmedia/MediaKeysController.h
|
| +++ b/third_party/WebKit/Source/modules/encryptedmedia/MediaKeysController.h
|
| @@ -14,16 +14,15 @@ class ExecutionContext;
|
| class MediaKeysClient;
|
| class WebEncryptedMediaClient;
|
|
|
| -class MODULES_EXPORT MediaKeysController final : public NoBaseWillBeGarbageCollected<MediaKeysController>, public WillBeHeapSupplement<Page> {
|
| - WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaKeysController);
|
| - USING_FAST_MALLOC_WILL_BE_REMOVED(MediaKeysController);
|
| +class MODULES_EXPORT MediaKeysController final : public GarbageCollected<MediaKeysController>, public HeapSupplement<Page> {
|
| + USING_GARBAGE_COLLECTED_MIXIN(MediaKeysController);
|
| public:
|
| WebEncryptedMediaClient* encryptedMediaClient(ExecutionContext*);
|
|
|
| static void provideMediaKeysTo(Page&, MediaKeysClient*);
|
| - static MediaKeysController* from(Page* page) { return static_cast<MediaKeysController*>(WillBeHeapSupplement<Page>::from(page, supplementName())); }
|
| + static MediaKeysController* from(Page* page) { return static_cast<MediaKeysController*>(HeapSupplement<Page>::from(page, supplementName())); }
|
|
|
| - DEFINE_INLINE_VIRTUAL_TRACE() { WillBeHeapSupplement<Page>::trace(visitor); }
|
| + DEFINE_INLINE_VIRTUAL_TRACE() { HeapSupplement<Page>::trace(visitor); }
|
|
|
| private:
|
| explicit MediaKeysController(MediaKeysClient*);
|
|
|