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

ppapi/c/dev/pp_video_dev.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_DEV_PP_VIDEO_DEV_H_
 #define PPAPI_C_DEV_PP_VIDEO_DEV_H_
 
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_macros.h"
@@ skipping 205 matching lines @@
   // The buffer is created through PPB_Buffer API.
   // TODO(wjia): would uint8_t* be good, too?
   PP_Resource buffer;
 
   // number of bytes with real data in the buffer.
   int32_t filled_size;
 
   // Bit mask of PP_VideoFrameInfoFlag.
   uint32_t flags;
 
+  // Padding to ensure the PP_Resource is 8-byte aligned relative to the
+  // start of the struct.  This helps ensure PP_VideoFrameBuffer_Dev has
+  // consistent size and alignment across compilers.
+  int32_t padding;
+
   // Time stamp of the frame in microsecond.
   uint64_t time_stamp_us;
 };
 PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_VideoCompressedDataBuffer_Dev, 24);
 
 struct PP_VideoFrameBuffer_Dev {
   union {
     struct {
       struct {
         int32_t width;
         int32_t height;
         int32_t stride;
 
-        // Padding to ensure the PP_Resource is 8-byte aligned relative to the
-        // start of the struct.  This helps ensure PP_VideoFrameBuffer_Dev has
-        // consistent size and alignment across compilers.
-        int32_t padding;
-
         // TODO(wjia): uint8* would be better for some cases.
         PP_Resource buffer;
       } data_plane[PP_VIDEOFRAMEBUFFER_MAXNUMBERPLANES];
 
       int32_t planes;
 
       // This padding makes sure the sys_mem struct's size is a multiple of 8
       // bytes, ensuring that handle is always 8-byte aligned relative to the
       // start of the PP_VideoFrameBuffer_Dev struct.
       int32_t padding;
@@ skipping 74 matching lines @@
 struct PP_VideoDecoderConfig_Dev {
   PP_VideoConfig_Dev input_format;
   PP_VideoConfig_Dev output_format;
   PP_VideoDecodeOutputCallback_Func_Dev output_callback;
   PP_VideoDecodeInputCallback_Func_Dev input_callback;
   PP_VideoDecodeEventHandler_Func_Dev event_handler;
 };
 
 #endif  /* PPAPI_C_DEV_PP_VIDEO_DEV_H_ */