Index: Source/modules/encryptedmedia/MediaKeySession.h |
diff --git a/Source/modules/encryptedmedia/MediaKeySession.h b/Source/modules/encryptedmedia/MediaKeySession.h |
index 8881515e22b94db9737b737c24d08bbec9d7589d..cfdc654516f56f6cec284d9f01c00b91f4f7eb80 100644 |
--- a/Source/modules/encryptedmedia/MediaKeySession.h |
+++ b/Source/modules/encryptedmedia/MediaKeySession.h |
@@ -64,11 +64,11 @@ class MediaKeys; |
// it may outlive any JavaScript references as long as the MediaKeys object is alive. |
// The WebContentDecryptionModuleSession has the same lifetime as this object. |
class MediaKeySession FINAL |
- : public RefCountedWillBeRefCountedGarbageCollected<MediaKeySession>, public ActiveDOMObject, public ScriptWrappable, public EventTargetWithInlineData |
+ : public RefCountedGarbageCollected<MediaKeySession>, public ActiveDOMObject, public ScriptWrappable, public EventTargetWithInlineData |
, private blink::WebContentDecryptionModuleSession::Client { |
- DEFINE_EVENT_TARGET_REFCOUNTING(RefCountedWillBeRefCountedGarbageCollected<MediaKeySession>); |
+ DEFINE_EVENT_TARGET_REFCOUNTING(RefCountedGarbageCollected<MediaKeySession>); |
public: |
- static PassRefPtrWillBeRawPtr<MediaKeySession> create(ExecutionContext*, blink::WebContentDecryptionModule*, WeakPtrWillBeRawPtr<MediaKeys>); |
+ static MediaKeySession* create(ExecutionContext*, blink::WebContentDecryptionModule*, MediaKeys*); |
virtual ~MediaKeySession(); |
const String& keySystem() const { return m_keySystem; } |
@@ -111,7 +111,7 @@ private: |
PendingAction(Type, PassRefPtr<Uint8Array> data); |
}; |
- MediaKeySession(ExecutionContext*, blink::WebContentDecryptionModule*, WeakPtrWillBeRawPtr<MediaKeys>); |
+ MediaKeySession(ExecutionContext*, blink::WebContentDecryptionModule*, MediaKeys*); |
void actionTimerFired(Timer<MediaKeySession>*); |
// blink::WebContentDecryptionModuleSession::Client |
@@ -126,7 +126,7 @@ private: |
OwnPtr<blink::WebContentDecryptionModuleSession> m_session; |
// Used to determine if MediaKeys is still active. |
- WeakPtrWillBeWeakMember<MediaKeys> m_keys; |
+ WeakMember<MediaKeys> m_keys; |
// Is the CDM finished with this session? |
bool m_isClosed; |