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

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

Issue 48273013: Move MediaPlayer, IntSizeHash to platform/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: move MediaPlayer and friends to platform/graphics/media Created 7 years, 1 month 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 11 matching lines...) Expand all
22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
23 * THE POSSIBILITY OF SUCH DAMAGE. 23 * THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #ifndef MediaKeySession_h 26 #ifndef MediaKeySession_h
27 #define MediaKeySession_h 27 #define MediaKeySession_h
28 28
29 #include "bindings/v8/ScriptWrappable.h" 29 #include "bindings/v8/ScriptWrappable.h"
30 #include "core/dom/ContextLifecycleObserver.h" 30 #include "core/dom/ContextLifecycleObserver.h"
31 #include "core/events/EventTarget.h" 31 #include "core/events/EventTarget.h"
32 #include "core/platform/graphics/ContentDecryptionModuleSession.h"
33 #include "platform/Timer.h" 32 #include "platform/Timer.h"
33 #include "platform/graphics/media/ContentDecryptionModuleSession.h"
34 #include "wtf/Deque.h" 34 #include "wtf/Deque.h"
35 #include "wtf/PassRefPtr.h" 35 #include "wtf/PassRefPtr.h"
36 #include "wtf/RefCounted.h" 36 #include "wtf/RefCounted.h"
37 #include "wtf/Uint8Array.h" 37 #include "wtf/Uint8Array.h"
38 #include "wtf/text/WTFString.h" 38 #include "wtf/text/WTFString.h"
39 39
40 namespace WebCore { 40 namespace WebCore {
41 41
42 class ContentDecryptionModule; 42 class ContentDecryptionModule;
43 class ContentDecryptionModuleSession; 43 class ContentDecryptionModuleSession;
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 Deque<PendingKeyRequest> m_pendingKeyRequests; 102 Deque<PendingKeyRequest> m_pendingKeyRequests;
103 Timer<MediaKeySession> m_keyRequestTimer; 103 Timer<MediaKeySession> m_keyRequestTimer;
104 104
105 Deque<RefPtr<Uint8Array> > m_pendingKeys; 105 Deque<RefPtr<Uint8Array> > m_pendingKeys;
106 Timer<MediaKeySession> m_addKeyTimer; 106 Timer<MediaKeySession> m_addKeyTimer;
107 }; 107 };
108 108
109 } 109 }
110 110
111 #endif // MediaKeySession_h 111 #endif // MediaKeySession_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698