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

Side by Side Diff: media/blink/webcontentdecryptionmodule_impl.h

Issue 985113003: Block platform verification and file IO in the CDM adapter if the CDM configuration disallows them. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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 MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULE_IMPL_H_ 5 #ifndef MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULE_IMPL_H_
6 #define MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULE_IMPL_H_ 6 #define MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULE_IMPL_H_
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/strings/string16.h" 10 #include "base/strings/string16.h"
(...skipping 11 matching lines...) Expand all
22 namespace media { 22 namespace media {
23 23
24 class CdmContext; 24 class CdmContext;
25 class CdmFactory; 25 class CdmFactory;
26 class CdmSessionAdapter; 26 class CdmSessionAdapter;
27 class WebContentDecryptionModuleSessionImpl; 27 class WebContentDecryptionModuleSessionImpl;
28 28
29 class MEDIA_EXPORT WebContentDecryptionModuleImpl 29 class MEDIA_EXPORT WebContentDecryptionModuleImpl
30 : public blink::WebContentDecryptionModule { 30 : public blink::WebContentDecryptionModule {
31 public: 31 public:
32 static void Create(CdmFactory* cdm_factory, 32 static void Create(CdmFactory* cdm_factory,
ddorwin 2015/03/06 21:42:54 Why is this non-const param first?
sandersd (OOO until July 31) 2015/03/06 22:36:58 Presumably for symmetry with CdmSessionAdapter::In
33 const base::string16& key_system,
34 bool allow_distinctive_identifier,
35 bool allow_persistent_state,
33 const blink::WebSecurityOrigin& security_origin, 36 const blink::WebSecurityOrigin& security_origin,
34 const base::string16& key_system,
35 blink::WebContentDecryptionModuleResult result); 37 blink::WebContentDecryptionModuleResult result);
36 38
37 virtual ~WebContentDecryptionModuleImpl(); 39 virtual ~WebContentDecryptionModuleImpl();
38 40
39 // blink::WebContentDecryptionModule implementation. 41 // blink::WebContentDecryptionModule implementation.
40 virtual blink::WebContentDecryptionModuleSession* createSession(); 42 virtual blink::WebContentDecryptionModuleSession* createSession();
41 43
42 virtual void setServerCertificate( 44 virtual void setServerCertificate(
43 const uint8* server_certificate, 45 const uint8* server_certificate,
44 size_t server_certificate_length, 46 size_t server_certificate_length,
(...skipping 15 matching lines...) Expand all
60 62
61 // Allow typecasting from blink type as this is the only implementation. 63 // Allow typecasting from blink type as this is the only implementation.
62 inline WebContentDecryptionModuleImpl* ToWebContentDecryptionModuleImpl( 64 inline WebContentDecryptionModuleImpl* ToWebContentDecryptionModuleImpl(
63 blink::WebContentDecryptionModule* cdm) { 65 blink::WebContentDecryptionModule* cdm) {
64 return static_cast<WebContentDecryptionModuleImpl*>(cdm); 66 return static_cast<WebContentDecryptionModuleImpl*>(cdm);
65 } 67 }
66 68
67 } // namespace media 69 } // namespace media
68 70
69 #endif // MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULE_IMPL_H_ 71 #endif // MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698