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

Side by Side Diff: content/renderer/media/webcontentdecryptionmodulesession_impl.h

Issue 265993002: Add Promises for EME (Chromium side) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: One more trybot issue Created 6 years, 6 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 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_RENDERER_MEDIA_WEBCONTENTDECRYPTIONMODULESESSION_IMPL_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_WEBCONTENTDECRYPTIONMODULESESSION_IMPL_H_
6 #define CONTENT_RENDERER_MEDIA_WEBCONTENTDECRYPTIONMODULESESSION_IMPL_H_ 6 #define CONTENT_RENDERER_MEDIA_WEBCONTENTDECRYPTIONMODULESESSION_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/callback.h" 12 #include "base/callback.h"
13 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
14 #include "base/memory/weak_ptr.h"
14 #include "media/base/media_keys.h" 15 #include "media/base/media_keys.h"
15 #include "third_party/WebKit/public/platform/WebContentDecryptionModuleSession.h " 16 #include "third_party/WebKit/public/platform/WebContentDecryptionModuleSession.h "
16 #include "third_party/WebKit/public/platform/WebString.h" 17 #include "third_party/WebKit/public/platform/WebString.h"
17 18
18 namespace media { 19 namespace media {
19 class MediaKeys; 20 class MediaKeys;
20 } 21 }
21 22
22 namespace content { 23 namespace content {
23 class CdmSessionAdapter; 24 class CdmSessionAdapter;
24 25
25 class WebContentDecryptionModuleSessionImpl 26 class WebContentDecryptionModuleSessionImpl
26 : public blink::WebContentDecryptionModuleSession { 27 : public blink::WebContentDecryptionModuleSession {
27 public: 28 public:
28 WebContentDecryptionModuleSessionImpl( 29 WebContentDecryptionModuleSessionImpl(
29 uint32 session_id,
30 Client* client, 30 Client* client,
31 const scoped_refptr<CdmSessionAdapter>& adapter); 31 const scoped_refptr<CdmSessionAdapter>& adapter);
32 virtual ~WebContentDecryptionModuleSessionImpl(); 32 virtual ~WebContentDecryptionModuleSessionImpl();
33 33
34 // blink::WebContentDecryptionModuleSession implementation. 34 // blink::WebContentDecryptionModuleSession implementation.
35 virtual blink::WebString sessionId() const; 35 virtual blink::WebString sessionId() const;
36 virtual void initializeNewSession(const blink::WebString& mime_type, 36 virtual void initializeNewSession(const blink::WebString& mime_type,
37 const uint8* init_data, 37 const uint8* init_data,
38 size_t init_data_length); 38 size_t init_data_length);
39 virtual void update(const uint8* response, size_t response_length); 39 virtual void update(const uint8* response, size_t response_length);
40 virtual void release(); 40 virtual void release();
41 41
42 // Callbacks. 42 // Callbacks.
43 void OnSessionCreated(const std::string& web_session_id);
44 void OnSessionMessage(const std::vector<uint8>& message, 43 void OnSessionMessage(const std::vector<uint8>& message,
45 const GURL& destination_url); 44 const GURL& destination_url);
46 void OnSessionReady(); 45 void OnSessionReady();
47 void OnSessionClosed(); 46 void OnSessionClosed();
48 void OnSessionError(media::MediaKeys::KeyError error_code, 47 void OnSessionError(media::MediaKeys::Exception exception_code,
49 uint32 system_code); 48 uint32 system_code,
49 const std::string& error_message);
50 50
51 private: 51 private:
52 void SessionCreated(const std::string& web_session_id);
53
52 scoped_refptr<CdmSessionAdapter> adapter_; 54 scoped_refptr<CdmSessionAdapter> adapter_;
53 55
54 // Non-owned pointer. 56 // Non-owned pointer.
55 Client* client_; 57 Client* client_;
56 58
57 // Web session ID is the app visible ID for this session generated by the CDM. 59 // Web session ID is the app visible ID for this session generated by the CDM.
58 // This value is not set until the CDM calls OnSessionCreated(). 60 // This value is not set until the CDM resolves the initializeNewSession()
59 blink::WebString web_session_id_; 61 // promise.
62 std::string web_session_id_;
60 63
61 // Session ID is used to uniquely track this object so that CDM callbacks 64 // Since promises will live until they are fired, use a weak reference when
62 // can get routed to the correct object. 65 // creating a promise in case this class disappears before the promise
63 const uint32 session_id_; 66 // actually fires.
67 base::WeakPtrFactory<WebContentDecryptionModuleSessionImpl> weak_ptr_factory_;
64 68
65 DISALLOW_COPY_AND_ASSIGN(WebContentDecryptionModuleSessionImpl); 69 DISALLOW_COPY_AND_ASSIGN(WebContentDecryptionModuleSessionImpl);
66 }; 70 };
67 71
68 } // namespace content 72 } // namespace content
69 73
70 #endif // CONTENT_RENDERER_MEDIA_WEBCONTENTDECRYPTIONMODULESESSION_IMPL_H_ 74 #endif // CONTENT_RENDERER_MEDIA_WEBCONTENTDECRYPTIONMODULESESSION_IMPL_H_
OLDNEW
« no previous file with comments | « content/renderer/media/crypto/proxy_media_keys.cc ('k') | content/renderer/media/webcontentdecryptionmodulesession_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698