Merge "Fix range checking for PP_CdmKeyStatus"

ppapi/api/private/pp_content_decryptor.idl

 /* Copyright (c) 2012 The Chromium Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 /**
  * The <code>PP_DecryptTrackingInfo</code> struct contains necessary information
  * that can be used to associate the decrypted block with a decrypt request
  * and/or an input block.
  */
@@ skipping 384 matching lines @@
    */
   uint32_t request_id;
 };
 
 /**
  * <code>PP_DecryptorStreamType</code> contains stream type constants.
  */
 [assert_size(4)]
 enum PP_DecryptorStreamType {
   PP_DECRYPTORSTREAMTYPE_AUDIO = 0,
-  PP_DECRYPTORSTREAMTYPE_VIDEO = 1
+  PP_DECRYPTORSTREAMTYPE_VIDEO = 1,
+  PP_DECRYPTORSTREAMTYPE_MAX = PP_DECRYPTORSTREAMTYPE_VIDEO
 };
 
 /**
  * <code>PP_SessionType</code> contains session type constants.
  */
 [assert_size(4)]
 enum PP_SessionType {
   PP_SESSIONTYPE_TEMPORARY = 0,
   PP_SESSIONTYPE_PERSISTENT_LICENSE = 1,
-  PP_SESSIONTYPE_PERSISTENT_RELEASE = 2
+  PP_SESSIONTYPE_PERSISTENT_RELEASE = 2,
+  PP_SESSIONTYPE_MAX = PP_SESSIONTYPE_PERSISTENT_RELEASE
 };
 
 /**
  * <code>PP_InitDataType</code> contains Initialization Data Type constants.
  */
 [assert_size(4)]
 enum PP_InitDataType {
   PP_INITDATATYPE_CENC = 0,
   PP_INITDATATYPE_KEYIDS = 1,
-  PP_INITDATATYPE_WEBM = 2
+  PP_INITDATATYPE_WEBM = 2,
+  PP_INITDATATYPE_MAX = PP_INITDATATYPE_WEBM
 };
 
 /**
  * <code>PP_CdmExceptionCode</code> contains exception code constants.
  */
 [assert_size(4)]
 enum PP_CdmExceptionCode {
   PP_CDMEXCEPTIONCODE_NOTSUPPORTEDERROR = 1,
   PP_CDMEXCEPTIONCODE_INVALIDSTATEERROR = 2,
   PP_CDMEXCEPTIONCODE_INVALIDACCESSERROR = 3,
   PP_CDMEXCEPTIONCODE_QUOTAEXCEEDEDERROR = 4,
   PP_CDMEXCEPTIONCODE_UNKNOWNERROR = 5,
   PP_CDMEXCEPTIONCODE_CLIENTERROR = 6,
-  PP_CDMEXCEPTIONCODE_OUTPUTERROR = 7
+  PP_CDMEXCEPTIONCODE_OUTPUTERROR = 7,
+  PP_CDMEXCEPTIONCODE_MAX = PP_CDMEXCEPTIONCODE_OUTPUTERROR
 };
 
 /**
  * <code>PP_CdmMessageType</code> contains message type constants.
  */
 [assert_size(4)]
 enum PP_CdmMessageType {
   PP_CDMMESSAGETYPE_LICENSE_REQUEST = 0,
   PP_CDMMESSAGETYPE_LICENSE_RENEWAL = 1,
-  PP_CDMMESSAGETYPE_LICENSE_RELEASE = 2
+  PP_CDMMESSAGETYPE_LICENSE_RELEASE = 2,
+  PP_CDMMESSAGETYPE_MAX = PP_CDMMESSAGETYPE_LICENSE_RELEASE
 };
 
 /**
  * <code>PP_CdmKeyStatus</code> contains key status constants.
  */
 [assert_size(4)]
 enum PP_CdmKeyStatus {
   PP_CDMKEYSTATUS_USABLE = 0,
   PP_CDMKEYSTATUS_INVALID = 1,
   PP_CDMKEYSTATUS_EXPIRED = 2,
   PP_CDMKEYSTATUS_OUTPUTRESTRICTED = 3,
   PP_CDMKEYSTATUS_OUTPUTDOWNSCALED = 4,
   PP_CDMKEYSTATUS_STATUSPENDING = 5,
-  PP_CDMKEYSTATUS_RELEASED = 6
+  PP_CDMKEYSTATUS_RELEASED = 6,
+  PP_CDMKEYSTATUS_MAX = PP_CDMKEYSTATUS_RELEASED
 };
 
 /**
  * The <code>PP_KeyInformation</code> struct contains information about a
  * key used for decryption.
  */
 [assert_size(524)]
 struct PP_KeyInformation {
   /**
    * Key ID.
    */
   uint8_t[512] key_id;
   uint32_t key_id_size;
 
   /**
    * Status of this key.
    */
   PP_CdmKeyStatus key_status;
 
   /**
    * Optional error code for keys that are not usable.
    */
   uint32_t system_code;
 };