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

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

Issue 132823005: Schedule session initialization in MediaKeys. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@rename_close_gkr
Patch Set: Initial patch set. Created 6 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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 72
73 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeyadded); 73 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeyadded);
74 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeyerror); 74 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeyerror);
75 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeymessage); 75 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeymessage);
76 76
77 virtual const AtomicString& interfaceName() const OVERRIDE; 77 virtual const AtomicString& interfaceName() const OVERRIDE;
78 virtual ExecutionContext* executionContext() const OVERRIDE; 78 virtual ExecutionContext* executionContext() const OVERRIDE;
79 79
80 private: 80 private:
81 MediaKeySession(ExecutionContext*, ContentDecryptionModule*, MediaKeys*); 81 MediaKeySession(ExecutionContext*, ContentDecryptionModule*, MediaKeys*);
82 void initializeNewSessionTimerFired(Timer<MediaKeySession>*);
83 void updateTimerFired(Timer<MediaKeySession>*); 82 void updateTimerFired(Timer<MediaKeySession>*);
84 83
85 // ContentDecryptionModuleSessionClient 84 // ContentDecryptionModuleSessionClient
86 virtual void keyAdded() OVERRIDE; 85 virtual void keyAdded() OVERRIDE;
87 virtual void keyError(MediaKeyErrorCode, unsigned long systemCode) OVERRIDE; 86 virtual void keyError(MediaKeyErrorCode, unsigned long systemCode) OVERRIDE;
88 virtual void keyMessage(const unsigned char* message, size_t messageLength, const KURL& destinationURL) OVERRIDE; 87 virtual void keyMessage(const unsigned char* message, size_t messageLength, const KURL& destinationURL) OVERRIDE;
89 88
90 String m_keySystem; 89 String m_keySystem;
91 RefPtr<MediaKeyError> m_error; 90 RefPtr<MediaKeyError> m_error;
92 OwnPtr<GenericEventQueue> m_asyncEventQueue; 91 OwnPtr<GenericEventQueue> m_asyncEventQueue;
93 OwnPtr<ContentDecryptionModuleSession> m_session; 92 OwnPtr<ContentDecryptionModuleSession> m_session;
94 // Used to remove the reference from the parent MediaKeys when close()'d. 93 // Used to remove the reference from the parent MediaKeys when close()'d.
95 MediaKeys* m_keys; 94 MediaKeys* m_keys;
96 95
97 // FIXME: Check whether |initData| can be changed by JS. Maybe we should not pass it as a pointer.
98 // FIXME: Move the queue and timer to MediaKeys.
99 struct InitializeNewSessionData {
100 InitializeNewSessionData(const String& mimeType, Uint8Array* initData) : mimeType(mimeType), initData(initData) { }
101 String mimeType;
102 RefPtr<Uint8Array> initData;
103 };
104 Deque<InitializeNewSessionData> m_pendingInitializeNewSessionData;
105 Timer<MediaKeySession> m_initializeNewSessionTimer;
106
107 Deque<RefPtr<Uint8Array> > m_pendingKeys; 96 Deque<RefPtr<Uint8Array> > m_pendingKeys;
108 Timer<MediaKeySession> m_updateTimer; 97 Timer<MediaKeySession> m_updateTimer;
109 }; 98 };
110 99
111 } 100 }
112 101
113 #endif // MediaKeySession_h 102 #endif // MediaKeySession_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698