| Index: third_party/WebKit/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h
|
| diff --git a/third_party/WebKit/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h b/third_party/WebKit/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h
|
| index 7d4682a0163fccd3de9412f4a24b41856b9368b0..6cf20ebe833d949924df2e459a5c3ba59a570b90 100644
|
| --- a/third_party/WebKit/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h
|
| +++ b/third_party/WebKit/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h
|
| @@ -24,9 +24,8 @@ class ScriptState;
|
| class WebContentDecryptionModule;
|
| class WebMediaPlayer;
|
|
|
| -class MODULES_EXPORT HTMLMediaElementEncryptedMedia final : public NoBaseWillBeGarbageCollectedFinalized<HTMLMediaElementEncryptedMedia>, public WillBeHeapSupplement<HTMLMediaElement>, public WebMediaPlayerEncryptedMediaClient {
|
| - WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(HTMLMediaElementEncryptedMedia);
|
| - USING_FAST_MALLOC_WILL_BE_REMOVED(HTMLMediaElementEncryptedMedia);
|
| +class MODULES_EXPORT HTMLMediaElementEncryptedMedia final : public GarbageCollectedFinalized<HTMLMediaElementEncryptedMedia>, public HeapSupplement<HTMLMediaElement>, public WebMediaPlayerEncryptedMediaClient {
|
| + USING_GARBAGE_COLLECTED_MIXIN(HTMLMediaElementEncryptedMedia);
|
| public:
|
| static MediaKeys* mediaKeys(HTMLMediaElement&);
|
| static ScriptPromise setMediaKeys(ScriptState*, HTMLMediaElement&, MediaKeys*);
|
| @@ -51,10 +50,10 @@ private:
|
| HTMLMediaElementEncryptedMedia(HTMLMediaElement&);
|
|
|
| // EventTarget
|
| - bool setAttributeEventListener(const AtomicString& eventType, PassRefPtrWillBeRawPtr<EventListener>);
|
| + bool setAttributeEventListener(const AtomicString& eventType, RawPtr<EventListener>);
|
| EventListener* getAttributeEventListener(const AtomicString& eventType);
|
|
|
| - RawPtrWillBeMember<HTMLMediaElement> m_mediaElement;
|
| + Member<HTMLMediaElement> m_mediaElement;
|
|
|
| // Internal values specified by the EME spec:
|
| // http://w3c.github.io/encrypted-media/#idl-def-HTMLMediaElement
|
| @@ -64,7 +63,7 @@ private:
|
| bool m_isWaitingForKey;
|
| bool m_isAttachingMediaKeys;
|
|
|
| - PersistentWillBeMember<MediaKeys> m_mediaKeys;
|
| + Member<MediaKeys> m_mediaKeys;
|
| };
|
|
|
| } // namespace blink
|
|
|