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

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

Issue 557723003: Implement Chromium side of MediaKeys.isTypeSupported(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More requested changes. 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> 8 #include <string>
9 9
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 26 matching lines...) Expand all
37 public: 37 public:
38 static WebContentDecryptionModuleImpl* Create( 38 static WebContentDecryptionModuleImpl* Create(
39 #if defined(ENABLE_PEPPER_CDMS) 39 #if defined(ENABLE_PEPPER_CDMS)
40 blink::WebLocalFrame* frame, 40 blink::WebLocalFrame* frame,
41 #elif defined(ENABLE_BROWSER_CDMS) 41 #elif defined(ENABLE_BROWSER_CDMS)
42 RendererCdmManager* manager, 42 RendererCdmManager* manager,
43 #endif 43 #endif
44 const blink::WebSecurityOrigin& security_origin, 44 const blink::WebSecurityOrigin& security_origin,
45 const base::string16& key_system); 45 const base::string16& key_system);
46 46
47 static blink::WebContentDecryptionModule::KeySystemSupportedResult
48 IsKeySystemSupported(const blink::WebString& key_system,
49 const blink::WebString& init_data_type,
50 const blink::WebString& container,
51 const blink::WebString& codecs,
52 const blink::WebString& capability);
53
47 virtual ~WebContentDecryptionModuleImpl(); 54 virtual ~WebContentDecryptionModuleImpl();
48 55
49 // Returns the Decryptor associated with this CDM. May be NULL if no 56 // Returns the Decryptor associated with this CDM. May be NULL if no
50 // Decryptor associated with the MediaKeys object. 57 // Decryptor associated with the MediaKeys object.
51 // TODO(jrummell): Figure out lifetimes, as WMPI may still use the decryptor 58 // TODO(jrummell): Figure out lifetimes, as WMPI may still use the decryptor
52 // after WebContentDecryptionModule is freed. http://crbug.com/330324 59 // after WebContentDecryptionModule is freed. http://crbug.com/330324
53 media::Decryptor* GetDecryptor(); 60 media::Decryptor* GetDecryptor();
54 61
55 #if defined(ENABLE_BROWSER_CDMS) 62 #if defined(ENABLE_BROWSER_CDMS)
56 // Returns the CDM ID associated with this object. May be kInvalidCdmId if no 63 // Returns the CDM ID associated with this object. May be kInvalidCdmId if no
(...skipping 18 matching lines...) Expand all
75 82
76 // Allow typecasting from blink type as this is the only implementation. 83 // Allow typecasting from blink type as this is the only implementation.
77 inline WebContentDecryptionModuleImpl* ToWebContentDecryptionModuleImpl( 84 inline WebContentDecryptionModuleImpl* ToWebContentDecryptionModuleImpl(
78 blink::WebContentDecryptionModule* cdm) { 85 blink::WebContentDecryptionModule* cdm) {
79 return static_cast<WebContentDecryptionModuleImpl*>(cdm); 86 return static_cast<WebContentDecryptionModuleImpl*>(cdm);
80 } 87 }
81 88
82 } // namespace content 89 } // namespace content
83 90
84 #endif // CONTENT_RENDERER_MEDIA_WEBCONTENTDECRYPTIONMODULE_IMPL_H_ 91 #endif // CONTENT_RENDERER_MEDIA_WEBCONTENTDECRYPTIONMODULE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698