Integrate NaCl Head - Revert 69309 to restore 64b handles in PPAPI...

ppapi/c/ppb_image_data.h

 // Copyright (c) 2010 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.
 
 #ifndef PPAPI_C_PPB_IMAGE_DATA_H_
 #define PPAPI_C_PPB_IMAGE_DATA_H_
 
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_macros.h"
 #include "ppapi/c/pp_module.h"
@@ skipping 12 matching lines @@
 
   // Size of the bitmap in pixels.
   struct PP_Size size;
 
   // The row width in bytes. This may be different than width * 4 since there
   // may be padding at the end of the lines.
   int32_t stride;
 };
 PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_ImageDataDesc, 16);
 
-#define PPB_IMAGEDATA_INTERFACE "PPB_ImageData;0.3"
+#define PPB_IMAGEDATA_INTERFACE "PPB_ImageData;0.2"
 
 /**
  * @file
  * Defines the API ...
  *
  * @addtogroup PPB
  * @{
  */
 
 struct PPB_ImageData {
@@ skipping 50 matching lines @@
   void* (*Map)(PP_Resource image_data);
 
   void (*Unmap)(PP_Resource image_data);
 };
 
 /**
  * @}
  * End addtogroup PPB
  */
 #endif  // PPAPI_C_PPB_IMAGE_DATA_H_