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

Side by Side Diff: media/cdm/cdm_wrapper.h

Issue 2363283002: Use 'local-exec' for threadlocal_heap_ in tcmalloc. (Closed)
Patch Set: Try static_library for cast_graphics Created 3 years, 11 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
« no previous file with comments | « media/cdm/cdm_helpers.cc ('k') | media/cdm/ppapi/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_CDM_CDM_WRAPPER_H_ 5 #ifndef MEDIA_CDM_CDM_WRAPPER_H_
6 #define MEDIA_CDM_CDM_WRAPPER_H_ 6 #define MEDIA_CDM_CDM_WRAPPER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <string> 10 #include <string>
11 11
12 #include "base/macros.h" 12 #include "base/macros.h" // nogncheck
13 #include "media/cdm/api/content_decryption_module.h" 13 #include "media/cdm/api/content_decryption_module.h"
14 #include "media/cdm/supported_cdm_versions.h" 14 #include "media/cdm/supported_cdm_versions.h"
15 15
16 #if defined(USE_PPAPI_CDM_ADAPTER) 16 #if defined(USE_PPAPI_CDM_ADAPTER)
17 // When building the ppapi adapter do not include any non-trivial base/ headers. 17 // When building the ppapi adapter do not include any non-trivial base/ headers.
18 #include "ppapi/cpp/logging.h" // nogncheck 18 #include "ppapi/cpp/logging.h" // nogncheck
19 #define PLATFORM_DCHECK PP_DCHECK 19 #define PLATFORM_DCHECK PP_DCHECK
20 #else 20 #else
21 #include "base/logging.h" 21 #include "base/logging.h" // nogncheck
22 #define PLATFORM_DCHECK DCHECK 22 #define PLATFORM_DCHECK DCHECK
23 #endif 23 #endif
24 24
25 namespace media { 25 namespace media {
26 26
27 // Returns a pointer to the requested CDM upon success. 27 // Returns a pointer to the requested CDM upon success.
28 // Returns NULL if an error occurs or the requested |cdm_interface_version| or 28 // Returns NULL if an error occurs or the requested |cdm_interface_version| or
29 // |key_system| is not supported or another error occurs. 29 // |key_system| is not supported or another error occurs.
30 // The caller should cast the returned pointer to the type matching 30 // The caller should cast the returned pointer to the type matching
31 // |cdm_interface_version|. 31 // |cdm_interface_version|.
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 // Also update supported_cdm_versions.h. 281 // Also update supported_cdm_versions.h.
282 static_assert(cdm::ContentDecryptionModule::kVersion == 282 static_assert(cdm::ContentDecryptionModule::kVersion ==
283 cdm::ContentDecryptionModule_8::kVersion, 283 cdm::ContentDecryptionModule_8::kVersion,
284 "ensure cdm wrapper templates have old version support"); 284 "ensure cdm wrapper templates have old version support");
285 285
286 } // namespace media 286 } // namespace media
287 287
288 #undef PLATFORM_DCHECK 288 #undef PLATFORM_DCHECK
289 289
290 #endif // MEDIA_CDM_CDM_WRAPPER_H_ 290 #endif // MEDIA_CDM_CDM_WRAPPER_H_
OLDNEW
« no previous file with comments | « media/cdm/cdm_helpers.cc ('k') | media/cdm/ppapi/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698