OLD | NEW |
---|---|
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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
57 public: | 57 public: |
58 static PassRefPtr<MediaKeySession> create(ExecutionContext*, ContentDecrypti onModule*, MediaKeys*); | 58 static PassRefPtr<MediaKeySession> create(ExecutionContext*, ContentDecrypti onModule*, MediaKeys*); |
59 ~MediaKeySession(); | 59 ~MediaKeySession(); |
60 | 60 |
61 const String& keySystem() const { return m_keySystem; } | 61 const String& keySystem() const { return m_keySystem; } |
62 String sessionId() const; | 62 String sessionId() const; |
63 | 63 |
64 void setError(MediaKeyError*); | 64 void setError(MediaKeyError*); |
65 MediaKeyError* error() { return m_error.get(); } | 65 MediaKeyError* error() { return m_error.get(); } |
66 | 66 |
67 void generateKeyRequest(const String& mimeType, Uint8Array* initData); | 67 void initializeNewSession(const String& mimeType, Uint8Array* initData); |
68 void update(Uint8Array* key, ExceptionState&); | 68 void update(Uint8Array* key, ExceptionState&); |
69 void close(); | 69 void release(); |
70 | 70 |
71 void enqueueEvent(PassRefPtr<Event>); | 71 void enqueueEvent(PassRefPtr<Event>); |
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 keyRequestTimerFired(Timer<MediaKeySession>*); | 82 void initializeNewSessionTimerFired(Timer<MediaKeySession>*); |
83 void addKeyTimerFired(Timer<MediaKeySession>*); | 83 void addKeyTimerFired(Timer<MediaKeySession>*); |
84 | 84 |
85 // ContentDecryptionModuleSessionClient | 85 // ContentDecryptionModuleSessionClient |
86 virtual void keyAdded() OVERRIDE; | 86 virtual void keyAdded() OVERRIDE; |
87 virtual void keyError(MediaKeyErrorCode, unsigned long systemCode) OVERRIDE; | 87 virtual void keyError(MediaKeyErrorCode, unsigned long systemCode) OVERRIDE; |
88 virtual void keyMessage(const unsigned char* message, size_t messageLength, const KURL& destinationURL) OVERRIDE; | 88 virtual void keyMessage(const unsigned char* message, size_t messageLength, const KURL& destinationURL) OVERRIDE; |
89 | 89 |
90 String m_keySystem; | 90 String m_keySystem; |
91 RefPtr<MediaKeyError> m_error; | 91 RefPtr<MediaKeyError> m_error; |
92 OwnPtr<GenericEventQueue> m_asyncEventQueue; | 92 OwnPtr<GenericEventQueue> m_asyncEventQueue; |
93 OwnPtr<ContentDecryptionModuleSession> m_session; | 93 OwnPtr<ContentDecryptionModuleSession> m_session; |
94 // Used to remove the reference from the parent MediaKeys when close()'d. | 94 // Used to remove the reference from the parent MediaKeys when close()'d. |
95 MediaKeys* m_keys; | 95 MediaKeys* m_keys; |
96 | 96 |
97 struct PendingKeyRequest { | 97 struct InitializeNewSessionData { |
98 PendingKeyRequest(const String& mimeType, Uint8Array* initData) : mimeTy pe(mimeType), initData(initData) { } | 98 InitializeNewSessionData(const String& mimeType, Uint8Array* initData) : mimeType(mimeType), initData(initData) { } |
ddorwin
2014/01/09 01:35:31
Is '*' correct? (I don't know.)
Also, if this Ref
xhwang
2014/01/09 02:32:17
Added FIXME.
| |
99 String mimeType; | 99 String mimeType; |
100 RefPtr<Uint8Array> initData; | 100 RefPtr<Uint8Array> initData; |
101 }; | 101 }; |
102 Deque<PendingKeyRequest> m_pendingKeyRequests; | 102 Deque<InitializeNewSessionData> m_pendingInitializeNewSessionData; |
ddorwin
2014/01/09 01:35:31
We don't actually need a queue because this can on
xhwang
2014/01/09 02:32:17
Done.
| |
103 Timer<MediaKeySession> m_keyRequestTimer; | 103 Timer<MediaKeySession> m_initializeNewSessionTimer; |
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 |
OLD | NEW |