Chromium Code Reviews| Index: Source/modules/encryptedmedia/MediaKeySession.h |
| diff --git a/Source/modules/encryptedmedia/MediaKeySession.h b/Source/modules/encryptedmedia/MediaKeySession.h |
| index 6a5451dc332d140cec780a04292a5fa8d7e48183..b43ee8a1aec1bb9fad45c7d49882458bc8dbef5a 100644 |
| --- a/Source/modules/encryptedmedia/MediaKeySession.h |
| +++ b/Source/modules/encryptedmedia/MediaKeySession.h |
| @@ -29,6 +29,7 @@ |
| #include "bindings/v8/ScriptWrappable.h" |
| #include "core/dom/ContextLifecycleObserver.h" |
| #include "core/events/EventTarget.h" |
| +#include "heap/Handle.h" |
| #include "platform/Timer.h" |
| #include "platform/drm/ContentDecryptionModuleSession.h" |
| #include "wtf/Deque.h" |
| @@ -51,11 +52,12 @@ class MediaKeys; |
| // it may outlive any references to it as long as the MediaKeys object is alive. |
| // The ContentDecryptionModuleSession has the same lifetime as this object. |
| class MediaKeySession FINAL |
| - : public RefCounted<MediaKeySession>, public ScriptWrappable, public EventTargetWithInlineData, public ContextLifecycleObserver |
| + : public RefCountedWillBeGarbageCollectedFinalized<MediaKeySession>, public ScriptWrappable, public EventTargetWithInlineData, public ContextLifecycleObserver |
|
Mads Ager (chromium)
2014/02/06 12:28:47
I don't think you can move this to GarbageCollecte
|
| , private ContentDecryptionModuleSessionClient { |
| + DECLARE_GC_INFO; |
| REFCOUNTED_EVENT_TARGET(MediaKeySession); |
|
haraken
2014/02/06 12:08:40
This doesn't compile with the following error:
..
|
| public: |
| - static PassRefPtr<MediaKeySession> create(ExecutionContext*, ContentDecryptionModule*, MediaKeys*); |
| + static PassRefPtrWillBeRawPtr<MediaKeySession> create(ExecutionContext*, ContentDecryptionModule*, MediaKeys*); |
| virtual ~MediaKeySession(); |
| const String& keySystem() const { return m_keySystem; } |
| @@ -73,6 +75,8 @@ public: |
| virtual const AtomicString& interfaceName() const OVERRIDE; |
| virtual ExecutionContext* executionContext() const OVERRIDE; |
| + void trace(Visitor*) { } |
| + |
| private: |
| MediaKeySession(ExecutionContext*, ContentDecryptionModule*, MediaKeys*); |
| void updateTimerFired(Timer<MediaKeySession>*); |