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

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

Issue 2629593004: Disambiguate LifecycleObserver::contextDestroyed (Closed)
Patch Set: temp Created 3 years, 11 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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 ScriptPromise remove(ScriptState*); 93 ScriptPromise remove(ScriptState*);
94 94
95 // EventTarget 95 // EventTarget
96 const AtomicString& interfaceName() const override; 96 const AtomicString& interfaceName() const override;
97 ExecutionContext* getExecutionContext() const override; 97 ExecutionContext* getExecutionContext() const override;
98 98
99 // ScriptWrappable 99 // ScriptWrappable
100 bool hasPendingActivity() const final; 100 bool hasPendingActivity() const final;
101 101
102 // ContextLifecycleObserver 102 // ContextLifecycleObserver
103 void contextDestroyed() override; 103 void contextDestroyed(ExecutionContext*) override;
104 104
105 DECLARE_VIRTUAL_TRACE(); 105 DECLARE_VIRTUAL_TRACE();
106 106
107 private: 107 private:
108 class PendingAction; 108 class PendingAction;
109 friend class NewSessionResultPromise; 109 friend class NewSessionResultPromise;
110 friend class LoadSessionResultPromise; 110 friend class LoadSessionResultPromise;
111 111
112 MediaKeySession(ScriptState*, MediaKeys*, WebEncryptedMediaSessionType); 112 MediaKeySession(ScriptState*, MediaKeys*, WebEncryptedMediaSessionType);
113 void dispose(); 113 void dispose();
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 ClosedPromise; 158 ClosedPromise;
159 Member<ClosedPromise> m_closedPromise; 159 Member<ClosedPromise> m_closedPromise;
160 160
161 HeapDeque<Member<PendingAction>> m_pendingActions; 161 HeapDeque<Member<PendingAction>> m_pendingActions;
162 Timer<MediaKeySession> m_actionTimer; 162 Timer<MediaKeySession> m_actionTimer;
163 }; 163 };
164 164
165 } // namespace blink 165 } // namespace blink
166 166
167 #endif // MediaKeySession_h 167 #endif // MediaKeySession_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698