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

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

Issue 2265873003: binding: Moves hasPendingActivity from ActiveScriptWrappable to ScriptWrappable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed review comments. Created 4 years, 4 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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 WebContentDecryptionModule* contentDecryptionModule(); 81 WebContentDecryptionModule* contentDecryptionModule();
82 82
83 DECLARE_VIRTUAL_TRACE(); 83 DECLARE_VIRTUAL_TRACE();
84 84
85 // ActiveDOMObject implementation. 85 // ActiveDOMObject implementation.
86 // FIXME: This class could derive from ContextLifecycleObserver 86 // FIXME: This class could derive from ContextLifecycleObserver
87 // again (http://crbug.com/483722). 87 // again (http://crbug.com/483722).
88 void contextDestroyed() override; 88 void contextDestroyed() override;
89 void stop() override; 89 void stop() override;
90 90
91 // ActiveScriptWrappable implementation. 91 // ScriptWrappable implementation.
92 bool hasPendingActivity() const final; 92 bool hasPendingActivity() const final;
93 93
94 private: 94 private:
95 MediaKeys(ExecutionContext*, const WebVector<WebEncryptedMediaSessionType>& supportedSessionTypes, std::unique_ptr<WebContentDecryptionModule>); 95 MediaKeys(ExecutionContext*, const WebVector<WebEncryptedMediaSessionType>& supportedSessionTypes, std::unique_ptr<WebContentDecryptionModule>);
96 class PendingAction; 96 class PendingAction;
97 97
98 bool sessionTypeSupported(WebEncryptedMediaSessionType); 98 bool sessionTypeSupported(WebEncryptedMediaSessionType);
99 void timerFired(TimerBase*); 99 void timerFired(TimerBase*);
100 100
101 const WebVector<WebEncryptedMediaSessionType> m_supportedSessionTypes; 101 const WebVector<WebEncryptedMediaSessionType> m_supportedSessionTypes;
(...skipping 13 matching lines...) Expand all
115 // object will be prevented until the setMediaKeys() completes. 115 // object will be prevented until the setMediaKeys() completes.
116 bool m_reservedForMediaElement; 116 bool m_reservedForMediaElement;
117 117
118 HeapDeque<Member<PendingAction>> m_pendingActions; 118 HeapDeque<Member<PendingAction>> m_pendingActions;
119 Timer<MediaKeys> m_timer; 119 Timer<MediaKeys> m_timer;
120 }; 120 };
121 121
122 } // namespace blink 122 } // namespace blink
123 123
124 #endif // MediaKeys_h 124 #endif // MediaKeys_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.h ('k') | third_party/WebKit/Source/modules/fetch/Body.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698