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

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

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more stddef Created 5 years 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.h ('k') | media/cdm/cenc_utils.h » ('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>
9
8 #include <string> 10 #include <string>
9 11
10 #include "base/macros.h" 12 #include "base/macros.h"
11 #include "media/cdm/api/content_decryption_module.h" 13 #include "media/cdm/api/content_decryption_module.h"
12 #include "media/cdm/supported_cdm_versions.h" 14 #include "media/cdm/supported_cdm_versions.h"
13 15
14 #if defined(USE_PPAPI_CDM_ADAPTER) 16 #if defined(USE_PPAPI_CDM_ADAPTER)
15 // 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.
16 #include "ppapi/cpp/logging.h" 18 #include "ppapi/cpp/logging.h"
17 #define PLATFORM_DCHECK PP_DCHECK 19 #define PLATFORM_DCHECK PP_DCHECK
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 // Also update supported_cdm_versions.h. 319 // Also update supported_cdm_versions.h.
318 static_assert(cdm::ContentDecryptionModule::kVersion == 320 static_assert(cdm::ContentDecryptionModule::kVersion ==
319 cdm::ContentDecryptionModule_8::kVersion, 321 cdm::ContentDecryptionModule_8::kVersion,
320 "ensure cdm wrapper templates have old version support"); 322 "ensure cdm wrapper templates have old version support");
321 323
322 } // namespace media 324 } // namespace media
323 325
324 #undef PLATFORM_DCHECK 326 #undef PLATFORM_DCHECK
325 327
326 #endif // MEDIA_CDM_CDM_WRAPPER_H_ 328 #endif // MEDIA_CDM_CDM_WRAPPER_H_
OLDNEW
« no previous file with comments | « media/cdm/cdm_helpers.h ('k') | media/cdm/cenc_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698