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

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, 8 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 a361b686d84efb5c8d73dc9239dbaa4b681e4dfa..0c0753e2e6a00d2dc7a998ddd5fa945ae6b0a7b8 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;

Powered by Google App Engine
This is Rietveld 408576698