Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1028)

Unified Diff: Source/modules/encryptedmedia/MediaKeySession.h

Issue 257503003: Oilpan: Enable Oilpan by default in modules/encryptedmedia (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/modules/encryptedmedia/MediaKeySession.h
diff --git a/Source/modules/encryptedmedia/MediaKeySession.h b/Source/modules/encryptedmedia/MediaKeySession.h
index 50a6db1d06d5e2ca38a830cde2f515b37eabc4d3..aee59a710fbd96c5d7313d5b1ee457475a98c90e 100644
--- a/Source/modules/encryptedmedia/MediaKeySession.h
+++ b/Source/modules/encryptedmedia/MediaKeySession.h
@@ -64,12 +64,12 @@ 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 {
- REFCOUNTED_EVENT_TARGET(MediaKeySession);
+ DEFINE_EVENT_TARGET_REFCOUNTING(RefCountedGarbageCollected<MediaKeySession>);
WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(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; }
@@ -112,7 +112,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
@@ -127,7 +127,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;
« no previous file with comments | « Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp ('k') | Source/modules/encryptedmedia/MediaKeySession.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698