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

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

Issue 2366253002: Remove ActiveDOMObject::stop() (Closed)
Patch Set: temp Created 4 years, 2 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
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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 ScriptPromise remove(ScriptState*); 94 ScriptPromise remove(ScriptState*);
95 95
96 // EventTarget 96 // EventTarget
97 const AtomicString& interfaceName() const override; 97 const AtomicString& interfaceName() const override;
98 ExecutionContext* getExecutionContext() const override; 98 ExecutionContext* getExecutionContext() const override;
99 99
100 // ScriptWrappable 100 // ScriptWrappable
101 bool hasPendingActivity() const final; 101 bool hasPendingActivity() const final;
102 102
103 // ActiveDOMObject 103 // ActiveDOMObject
104 void stop() override; 104 void contextDestroyed() override;
105 105
106 DECLARE_VIRTUAL_TRACE(); 106 DECLARE_VIRTUAL_TRACE();
107 107
108 private: 108 private:
109 class PendingAction; 109 class PendingAction;
110 friend class NewSessionResultPromise; 110 friend class NewSessionResultPromise;
111 friend class LoadSessionResultPromise; 111 friend class LoadSessionResultPromise;
112 112
113 MediaKeySession(ScriptState*, MediaKeys*, WebEncryptedMediaSessionType); 113 MediaKeySession(ScriptState*, MediaKeys*, WebEncryptedMediaSessionType);
114 void dispose(); 114 void dispose();
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 ClosedPromise; 153 ClosedPromise;
154 Member<ClosedPromise> m_closedPromise; 154 Member<ClosedPromise> m_closedPromise;
155 155
156 HeapDeque<Member<PendingAction>> m_pendingActions; 156 HeapDeque<Member<PendingAction>> m_pendingActions;
157 Timer<MediaKeySession> m_actionTimer; 157 Timer<MediaKeySession> m_actionTimer;
158 }; 158 };
159 159
160 } // namespace blink 160 } // namespace blink
161 161
162 #endif // MediaKeySession_h 162 #endif // MediaKeySession_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698