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

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

Issue 660673002: Introduce CdmFactory interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_result_promise
Patch Set: Pass CdmFactory by pointer. 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
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_WEBCONTENTDECRYPTIONMODULE_IMPL_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_WEBCONTENTDECRYPTIONMODULE_IMPL_H_
6 #define CONTENT_RENDERER_MEDIA_WEBCONTENTDECRYPTIONMODULE_IMPL_H_ 6 #define CONTENT_RENDERER_MEDIA_WEBCONTENTDECRYPTIONMODULE_IMPL_H_
7 7
8 #include <string>
9
10 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
11 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
12 #include "base/strings/string16.h" 10 #include "base/strings/string16.h"
13 #include "third_party/WebKit/public/platform/WebContentDecryptionModule.h" 11 #include "third_party/WebKit/public/platform/WebContentDecryptionModule.h"
12 #include "third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h"
14 13
15 namespace blink { 14 namespace blink {
16 #if defined(ENABLE_PEPPER_CDMS) 15 #if defined(ENABLE_PEPPER_CDMS)
17 class WebLocalFrame; 16 class WebLocalFrame;
18 #endif 17 #endif
19 class WebSecurityOrigin; 18 class WebSecurityOrigin;
20 } 19 }
21 20
22 namespace media { 21 namespace media {
22 class CdmFactory;
23 class Decryptor; 23 class Decryptor;
24 class MediaKeys; 24 class MediaKeys;
25 } 25 }
26 26
27 namespace content { 27 namespace content {
28 28
29 class CdmSessionAdapter; 29 class CdmSessionAdapter;
30 #if defined(ENABLE_BROWSER_CDMS)
31 class RendererCdmManager;
32 #endif
33 class WebContentDecryptionModuleSessionImpl; 30 class WebContentDecryptionModuleSessionImpl;
34 31
35 class WebContentDecryptionModuleImpl 32 class WebContentDecryptionModuleImpl
36 : public blink::WebContentDecryptionModule { 33 : public blink::WebContentDecryptionModule {
37 public: 34 public:
38 static WebContentDecryptionModuleImpl* Create( 35 static WebContentDecryptionModuleImpl* Create(
39 #if defined(ENABLE_PEPPER_CDMS) 36 media::CdmFactory* cdm_factory,
40 blink::WebLocalFrame* frame,
41 #elif defined(ENABLE_BROWSER_CDMS)
42 RendererCdmManager* manager,
43 #endif
44 const blink::WebSecurityOrigin& security_origin, 37 const blink::WebSecurityOrigin& security_origin,
45 const base::string16& key_system); 38 const base::string16& key_system);
46 39
47 virtual ~WebContentDecryptionModuleImpl(); 40 virtual ~WebContentDecryptionModuleImpl();
48 41
49 // Returns the Decryptor associated with this CDM. May be NULL if no 42 // Returns the Decryptor associated with this CDM. May be NULL if no
50 // Decryptor associated with the MediaKeys object. 43 // Decryptor associated with the MediaKeys object.
51 // TODO(jrummell): Figure out lifetimes, as WMPI may still use the decryptor 44 // TODO(jrummell): Figure out lifetimes, as WMPI may still use the decryptor
52 // after WebContentDecryptionModule is freed. http://crbug.com/330324 45 // after WebContentDecryptionModule is freed. http://crbug.com/330324
53 media::Decryptor* GetDecryptor(); 46 media::Decryptor* GetDecryptor();
(...skipping 26 matching lines...) Expand all
80 73
81 // Allow typecasting from blink type as this is the only implementation. 74 // Allow typecasting from blink type as this is the only implementation.
82 inline WebContentDecryptionModuleImpl* ToWebContentDecryptionModuleImpl( 75 inline WebContentDecryptionModuleImpl* ToWebContentDecryptionModuleImpl(
83 blink::WebContentDecryptionModule* cdm) { 76 blink::WebContentDecryptionModule* cdm) {
84 return static_cast<WebContentDecryptionModuleImpl*>(cdm); 77 return static_cast<WebContentDecryptionModuleImpl*>(cdm);
85 } 78 }
86 79
87 } // namespace content 80 } // namespace content
88 81
89 #endif // CONTENT_RENDERER_MEDIA_WEBCONTENTDECRYPTIONMODULE_IMPL_H_ 82 #endif // CONTENT_RENDERER_MEDIA_WEBCONTENTDECRYPTIONMODULE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698