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

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

Issue 642583003: Implement unprefixed EME APIs that match the latest draft (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebase Created 6 years, 2 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
« no previous file with comments | « no previous file | Source/modules/encryptedmedia/MediaKeySession.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 MediaKeySession(ScriptState*, MediaKeys*, const String& sessionType); 101 MediaKeySession(ScriptState*, MediaKeys*, const String& sessionType);
102 102
103 void actionTimerFired(Timer<MediaKeySession>*); 103 void actionTimerFired(Timer<MediaKeySession>*);
104 104
105 // WebContentDecryptionModuleSession::Client 105 // WebContentDecryptionModuleSession::Client
106 virtual void message(const unsigned char* message, size_t messageLength, con st WebURL& destinationURL) override; 106 virtual void message(const unsigned char* message, size_t messageLength, con st WebURL& destinationURL) override;
107 virtual void ready() override; 107 virtual void ready() override;
108 virtual void close() override; 108 virtual void close() override;
109 virtual void error(MediaKeyErrorCode, unsigned long systemCode) override; 109 virtual void error(MediaKeyErrorCode, unsigned long systemCode) override;
110 virtual void error(WebContentDecryptionModuleException, unsigned long system Code, const WebString& errorMessage) override; 110 virtual void error(WebContentDecryptionModuleException, unsigned long system Code, const WebString& errorMessage) override;
111 virtual void expirationChanged(double updatedExpiryTimeInMS) override;
111 112
112 ScriptPromise generateRequestInternal(ScriptState*, const String& initDataTy pe, PassRefPtr<ArrayBuffer> initData); 113 ScriptPromise generateRequestInternal(ScriptState*, const String& initDataTy pe, PassRefPtr<ArrayBuffer> initData);
113 ScriptPromise updateInternal(ScriptState*, PassRefPtr<ArrayBuffer> response) ; 114 ScriptPromise updateInternal(ScriptState*, PassRefPtr<ArrayBuffer> response) ;
114 115
115 // Called by NewSessionResult when the new sesison has been created. 116 // Called by NewSessionResult when the new sesison has been created.
116 void finishGenerateRequest(); 117 void finishGenerateRequest();
117 118
118 String m_keySystem; 119 String m_keySystem;
119 RefPtrWillBeMember<MediaKeyError> m_error; 120 RefPtrWillBeMember<MediaKeyError> m_error;
120 OwnPtrWillBeMember<GenericEventQueue> m_asyncEventQueue; 121 OwnPtrWillBeMember<GenericEventQueue> m_asyncEventQueue;
(...skipping 14 matching lines...) Expand all
135 typedef ScriptPromiseProperty<Member<MediaKeySession>, V8UndefinedType, RefP trWillBeMember<DOMException> > ClosedPromise; 136 typedef ScriptPromiseProperty<Member<MediaKeySession>, V8UndefinedType, RefP trWillBeMember<DOMException> > ClosedPromise;
136 Member<ClosedPromise> m_closedPromise; 137 Member<ClosedPromise> m_closedPromise;
137 138
138 HeapDeque<Member<PendingAction> > m_pendingActions; 139 HeapDeque<Member<PendingAction> > m_pendingActions;
139 Timer<MediaKeySession> m_actionTimer; 140 Timer<MediaKeySession> m_actionTimer;
140 }; 141 };
141 142
142 } // namespace blink 143 } // namespace blink
143 144
144 #endif // MediaKeySession_h 145 #endif // MediaKeySession_h
OLDNEW
« no previous file with comments | « no previous file | Source/modules/encryptedmedia/MediaKeySession.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698