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

Side by Side Diff: content/renderer/media/crypto/render_cdm_factory.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: Fix DCHECK types. 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 CONTENT_RENDERER_MEDIA_CRYPTO_RENDER_CDM_FACTORY_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_CRYPTO_RENDER_CDM_FACTORY_H_
6 #define CONTENT_RENDERER_MEDIA_CRYPTO_RENDER_CDM_FACTORY_H_ 6 #define CONTENT_RENDERER_MEDIA_CRYPTO_RENDER_CDM_FACTORY_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 19 matching lines...) Expand all
30 #elif defined(ENABLE_BROWSER_CDMS) 30 #elif defined(ENABLE_BROWSER_CDMS)
31 explicit RenderCdmFactory(RendererCdmManager* manager); 31 explicit RenderCdmFactory(RendererCdmManager* manager);
32 #else 32 #else
33 RenderCdmFactory(); 33 RenderCdmFactory();
34 #endif // defined(ENABLE_PEPPER_CDMS) 34 #endif // defined(ENABLE_PEPPER_CDMS)
35 35
36 ~RenderCdmFactory() override; 36 ~RenderCdmFactory() override;
37 37
38 scoped_ptr<media::MediaKeys> Create( 38 scoped_ptr<media::MediaKeys> Create(
39 const std::string& key_system, 39 const std::string& key_system,
40 bool allow_distinctive_identifier,
41 bool allow_persistent_state,
40 const GURL& security_origin, 42 const GURL& security_origin,
41 const media::SessionMessageCB& session_message_cb, 43 const media::SessionMessageCB& session_message_cb,
42 const media::SessionClosedCB& session_closed_cb, 44 const media::SessionClosedCB& session_closed_cb,
43 const media::SessionErrorCB& session_error_cb, 45 const media::SessionErrorCB& session_error_cb,
44 const media::SessionKeysChangeCB& session_keys_change_cb, 46 const media::SessionKeysChangeCB& session_keys_change_cb,
45 const media::SessionExpirationUpdateCB& session_expiration_update_cb) 47 const media::SessionExpirationUpdateCB& session_expiration_update_cb)
46 override; 48 override;
47 49
48 private: 50 private:
49 #if defined(ENABLE_PEPPER_CDMS) 51 #if defined(ENABLE_PEPPER_CDMS)
50 CreatePepperCdmCB create_pepper_cdm_cb_; 52 CreatePepperCdmCB create_pepper_cdm_cb_;
51 #elif defined(ENABLE_BROWSER_CDMS) 53 #elif defined(ENABLE_BROWSER_CDMS)
52 // The |manager_| is a per render frame object owned by RenderFrameImpl. 54 // The |manager_| is a per render frame object owned by RenderFrameImpl.
53 RendererCdmManager* manager_; 55 RendererCdmManager* manager_;
54 #endif 56 #endif
55 57
56 DISALLOW_COPY_AND_ASSIGN(RenderCdmFactory); 58 DISALLOW_COPY_AND_ASSIGN(RenderCdmFactory);
57 }; 59 };
58 60
59 } // namespace content 61 } // namespace content
60 62
61 #endif // CONTENT_RENDERER_MEDIA_CRYPTO_RENDER_CDM_FACTORY_H_ 63 #endif // CONTENT_RENDERER_MEDIA_CRYPTO_RENDER_CDM_FACTORY_H_
OLDNEW
« no previous file with comments | « content/renderer/media/crypto/ppapi_decryptor.cc ('k') | content/renderer/media/crypto/render_cdm_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698