| Index: Source/modules/encryptedmedia/MediaKeysController.h
|
| diff --git a/Source/modules/encryptedmedia/MediaKeysController.h b/Source/modules/encryptedmedia/MediaKeysController.h
|
| index ab0f2a18eee4eb65e5362929f844aa0e8f272968..ccf0f7560099eb7bec4102f68da6a99de3157d99 100644
|
| --- a/Source/modules/encryptedmedia/MediaKeysController.h
|
| +++ b/Source/modules/encryptedmedia/MediaKeysController.h
|
| @@ -20,17 +20,19 @@ class MediaKeysClient;
|
| class MediaKeysController FINAL : public NoBaseWillBeGarbageCollected<MediaKeysController>, public WillBeHeapSupplement<Page> {
|
| WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaKeysController);
|
| public:
|
| + virtual ~MediaKeysController();
|
| +
|
| PassOwnPtr<blink::WebContentDecryptionModule> createContentDecryptionModule(ExecutionContext*, const String& keySystem);
|
|
|
| - static void provideMediaKeysTo(Page&, MediaKeysClient*);
|
| + static void provideMediaKeysTo(Page&, PassOwnPtr<MediaKeysClient>);
|
| static MediaKeysController* from(Page* page) { return static_cast<MediaKeysController*>(WillBeHeapSupplement<Page>::from(page, supplementName())); }
|
|
|
| virtual void trace(Visitor* visitor) OVERRIDE { WillBeHeapSupplement<Page>::trace(visitor); }
|
|
|
| private:
|
| - explicit MediaKeysController(MediaKeysClient*);
|
| + explicit MediaKeysController(PassOwnPtr<MediaKeysClient>);
|
| static const char* supplementName();
|
| - MediaKeysClient* m_client;
|
| + OwnPtr<MediaKeysClient> m_client;
|
| };
|
|
|
| } // namespace WebCore
|
|
|