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

Side by Side Diff: Source/modules/encryptedmedia/MediaKeySession.h

Issue 329853004: Remove RefCountedGarbageCollected from EventTarget objects (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/css/FontFaceSet.h ('k') | Source/modules/encryptedmedia/MediaKeySession.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Apple Inc. All rights reserved. 2 * Copyright (C) 2013 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 // is open. 57 // is open.
58 // 58 //
59 // WeakPtr<MediaKeys> is used instead of having MediaKeys and MediaKeySession 59 // WeakPtr<MediaKeys> is used instead of having MediaKeys and MediaKeySession
60 // keep references to each other, and then having to inform the other object 60 // keep references to each other, and then having to inform the other object
61 // when it gets destroyed. 61 // when it gets destroyed.
62 // 62 //
63 // Because this object controls the lifetime of the WebContentDecryptionModuleSe ssion, 63 // Because this object controls the lifetime of the WebContentDecryptionModuleSe ssion,
64 // it may outlive any JavaScript references as long as the MediaKeys object is a live. 64 // it may outlive any JavaScript references as long as the MediaKeys object is a live.
65 // The WebContentDecryptionModuleSession has the same lifetime as this object. 65 // The WebContentDecryptionModuleSession has the same lifetime as this object.
66 class MediaKeySession FINAL 66 class MediaKeySession FINAL
67 : public RefCountedGarbageCollected<MediaKeySession>, public ActiveDOMObject , public ScriptWrappable, public EventTargetWithInlineData 67 : public RefCountedGarbageCollectedWillBeGarbageCollectedFinalized<MediaKeyS ession>, public ActiveDOMObject, public ScriptWrappable, public EventTargetWithI nlineData
68 , private blink::WebContentDecryptionModuleSession::Client { 68 , private blink::WebContentDecryptionModuleSession::Client {
69 DEFINE_EVENT_TARGET_REFCOUNTING(RefCountedGarbageCollected<MediaKeySession>) ; 69 DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(RefCountedGarbageCollected<M ediaKeySession>);
70 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaKeySession); 70 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaKeySession);
71 public: 71 public:
72 static MediaKeySession* create(ExecutionContext*, blink::WebContentDecryptio nModule*, MediaKeys*); 72 static MediaKeySession* create(ExecutionContext*, blink::WebContentDecryptio nModule*, MediaKeys*);
73 virtual ~MediaKeySession(); 73 virtual ~MediaKeySession();
74 74
75 const String& keySystem() const { return m_keySystem; } 75 const String& keySystem() const { return m_keySystem; }
76 String sessionId() const; 76 String sessionId() const;
77 77
78 void setError(MediaKeyError*); 78 void setError(MediaKeyError*);
79 MediaKeyError* error() { return m_error.get(); } 79 MediaKeyError* error() { return m_error.get(); }
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 // Is the CDM finished with this session? 132 // Is the CDM finished with this session?
133 bool m_isClosed; 133 bool m_isClosed;
134 134
135 Deque<OwnPtr<PendingAction> > m_pendingActions; 135 Deque<OwnPtr<PendingAction> > m_pendingActions;
136 Timer<MediaKeySession> m_actionTimer; 136 Timer<MediaKeySession> m_actionTimer;
137 }; 137 };
138 138
139 } 139 }
140 140
141 #endif // MediaKeySession_h 141 #endif // MediaKeySession_h
OLDNEW
« no previous file with comments | « Source/core/css/FontFaceSet.h ('k') | Source/modules/encryptedmedia/MediaKeySession.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698