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

ppapi/c/dev/pp_video_dev.h

Index: ppapi/c/dev/pp_video_dev.h
diff --git a/ppapi/c/dev/pp_video_dev.h b/ppapi/c/dev/pp_video_dev.h
index 85fe3a69639c81d8087bfce8328ad31b5d1920b8..0699994c147ca391693d6c66aadf9477919afb90 100644
--- a/ppapi/c/dev/pp_video_dev.h
+++ b/ppapi/c/dev/pp_video_dev.h
@@ -223,6 +223,11 @@ struct PP_VideoCompressedDataBuffer_Dev {
   // 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;
 };
@@ -236,11 +241,6 @@ struct PP_VideoFrameBuffer_Dev {
         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];