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: ppapi/c/private/pp_content_decryptor.h

Issue 1005213002: Add missing CdmKeyInformation enum values (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rename enum for Windows 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
« no previous file with comments | « ppapi/api/private/pp_content_decryptor.idl ('k') | ppapi/proxy/ppapi_messages.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 (c) 2012 The Chromium Authors. All rights reserved. 1 /* Copyright (c) 2012 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 5
6 /* From private/pp_content_decryptor.idl modified Wed Jan 7 18:40:14 2015. */ 6 /* From private/pp_content_decryptor.idl modified Fri Mar 13 14:53:18 2015. */
7 7
8 #ifndef PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_ 8 #ifndef PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_
9 #define PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_ 9 #define PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_
10 10
11 #include "ppapi/c/pp_macros.h" 11 #include "ppapi/c/pp_macros.h"
12 #include "ppapi/c/pp_stdint.h" 12 #include "ppapi/c/pp_stdint.h"
13 13
14 /** 14 /**
15 * @file 15 * @file
16 * The <code>PP_DecryptTrackingInfo</code> struct contains necessary information 16 * The <code>PP_DecryptTrackingInfo</code> struct contains necessary information
(...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after
484 } PP_CdmMessageType; 484 } PP_CdmMessageType;
485 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_CdmMessageType, 4); 485 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_CdmMessageType, 4);
486 486
487 /** 487 /**
488 * <code>PP_CdmKeyStatus</code> contains key status constants. 488 * <code>PP_CdmKeyStatus</code> contains key status constants.
489 */ 489 */
490 typedef enum { 490 typedef enum {
491 PP_CDMKEYSTATUS_USABLE = 0, 491 PP_CDMKEYSTATUS_USABLE = 0,
492 PP_CDMKEYSTATUS_INVALID = 1, 492 PP_CDMKEYSTATUS_INVALID = 1,
493 PP_CDMKEYSTATUS_EXPIRED = 2, 493 PP_CDMKEYSTATUS_EXPIRED = 2,
494 PP_CDMKEYSTATUS_OUTPUTNOTALLOWED = 3 494 PP_CDMKEYSTATUS_OUTPUTNOTALLOWED = 3,
495 PP_CDMKEYSTATUS_OUTPUTDOWNSCALED = 4,
496 PP_CDMKEYSTATUS_STATUSPENDING = 5
495 } PP_CdmKeyStatus; 497 } PP_CdmKeyStatus;
496 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_CdmKeyStatus, 4); 498 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_CdmKeyStatus, 4);
497 /** 499 /**
498 * @} 500 * @}
499 */ 501 */
500 502
501 /** 503 /**
502 * @addtogroup Structs 504 * @addtogroup Structs
503 * @{ 505 * @{
504 */ 506 */
(...skipping 16 matching lines...) Expand all
521 */ 523 */
522 uint32_t system_code; 524 uint32_t system_code;
523 }; 525 };
524 PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_KeyInformation, 524); 526 PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_KeyInformation, 524);
525 /** 527 /**
526 * @} 528 * @}
527 */ 529 */
528 530
529 #endif /* PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_ */ 531 #endif /* PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_ */
530 532
OLDNEW
« no previous file with comments | « ppapi/api/private/pp_content_decryptor.idl ('k') | ppapi/proxy/ppapi_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698