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

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

Issue 169293002: Oilpan: Remove GC_INFO_{DEFINE,DECLARE} macros (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fixheaptest Created 6 years, 10 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
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 // WeakPtr<MediaKeys> is used instead of having MediaKeys and MediaKeySession 57 // WeakPtr<MediaKeys> is used instead of having MediaKeys and MediaKeySession
58 // keep references to each other, and then having to inform the other object 58 // keep references to each other, and then having to inform the other object
59 // when it gets destroyed. 59 // when it gets destroyed.
60 // 60 //
61 // Because this object controls the lifetime of the ContentDecryptionModuleSessi on, 61 // Because this object controls the lifetime of the ContentDecryptionModuleSessi on,
62 // it may outlive any references to it as long as the MediaKeys object is alive. 62 // it may outlive any references to it as long as the MediaKeys object is alive.
63 // The ContentDecryptionModuleSession has the same lifetime as this object. 63 // The ContentDecryptionModuleSession has the same lifetime as this object.
64 class MediaKeySession FINAL 64 class MediaKeySession FINAL
65 : public RefCountedWillBeRefCountedGarbageCollected<MediaKeySession>, public ActiveDOMObject, public ScriptWrappable, public EventTargetWithInlineData 65 : public RefCountedWillBeRefCountedGarbageCollected<MediaKeySession>, public ActiveDOMObject, public ScriptWrappable, public EventTargetWithInlineData
66 , private ContentDecryptionModuleSessionClient { 66 , private ContentDecryptionModuleSessionClient {
67 DECLARE_GC_INFO;
68 DEFINE_EVENT_TARGET_REFCOUNTING(RefCountedWillBeRefCountedGarbageCollected<M ediaKeySession>); 67 DEFINE_EVENT_TARGET_REFCOUNTING(RefCountedWillBeRefCountedGarbageCollected<M ediaKeySession>);
69 public: 68 public:
70 static PassRefPtrWillBeRawPtr<MediaKeySession> create(ExecutionContext*, Con tentDecryptionModule*, WeakPtr<MediaKeys>); 69 static PassRefPtrWillBeRawPtr<MediaKeySession> create(ExecutionContext*, Con tentDecryptionModule*, WeakPtr<MediaKeys>);
71 virtual ~MediaKeySession(); 70 virtual ~MediaKeySession();
72 71
73 const String& keySystem() const { return m_keySystem; } 72 const String& keySystem() const { return m_keySystem; }
74 String sessionId() const; 73 String sessionId() const;
75 74
76 void setError(MediaKeyError*); 75 void setError(MediaKeyError*);
77 MediaKeyError* error() { return m_error.get(); } 76 MediaKeyError* error() { return m_error.get(); }
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 // Is the CDM finished with this session? 129 // Is the CDM finished with this session?
131 bool m_isClosed; 130 bool m_isClosed;
132 131
133 Deque<OwnPtr<PendingAction> > m_pendingActions; 132 Deque<OwnPtr<PendingAction> > m_pendingActions;
134 Timer<MediaKeySession> m_actionTimer; 133 Timer<MediaKeySession> m_actionTimer;
135 }; 134 };
136 135
137 } 136 }
138 137
139 #endif // MediaKeySession_h 138 #endif // MediaKeySession_h
OLDNEW
« no previous file with comments | « Source/modules/encoding/TextEncoder.cpp ('k') | Source/modules/encryptedmedia/MediaKeySession.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698