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

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

Issue 2618753002: Revert of Prefer using ContextClient over ContextLifecycleObserver (Closed)
Patch Set: 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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 86
87 // The previously reserved and accepted HTMLMediaElement is no longer 87 // The previously reserved and accepted HTMLMediaElement is no longer
88 // using this object. 88 // using this object.
89 void clearMediaElement(); 89 void clearMediaElement();
90 90
91 WebContentDecryptionModule* contentDecryptionModule(); 91 WebContentDecryptionModule* contentDecryptionModule();
92 92
93 DECLARE_VIRTUAL_TRACE(); 93 DECLARE_VIRTUAL_TRACE();
94 94
95 // ContextLifecycleObserver implementation. 95 // ContextLifecycleObserver implementation.
96 // FIXME: This class could derive from ContextLifecycleObserver
97 // again (http://crbug.com/483722).
96 void contextDestroyed() override; 98 void contextDestroyed() override;
97 99
98 // ScriptWrappable implementation. 100 // ScriptWrappable implementation.
99 bool hasPendingActivity() const final; 101 bool hasPendingActivity() const final;
100 102
101 private: 103 private:
102 MediaKeys( 104 MediaKeys(
103 ExecutionContext*, 105 ExecutionContext*,
104 const WebVector<WebEncryptedMediaSessionType>& supportedSessionTypes, 106 const WebVector<WebEncryptedMediaSessionType>& supportedSessionTypes,
105 std::unique_ptr<WebContentDecryptionModule>); 107 std::unique_ptr<WebContentDecryptionModule>);
(...skipping 19 matching lines...) Expand all
125 // object will be prevented until the setMediaKeys() completes. 127 // object will be prevented until the setMediaKeys() completes.
126 bool m_reservedForMediaElement; 128 bool m_reservedForMediaElement;
127 129
128 HeapDeque<Member<PendingAction>> m_pendingActions; 130 HeapDeque<Member<PendingAction>> m_pendingActions;
129 Timer<MediaKeys> m_timer; 131 Timer<MediaKeys> m_timer;
130 }; 132 };
131 133
132 } // namespace blink 134 } // namespace blink
133 135
134 #endif // MediaKeys_h 136 #endif // MediaKeys_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/FontFace.cpp ('k') | third_party/WebKit/Source/modules/filesystem/DOMFileSystem.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698