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
===================================================================
--- ppapi/c/dev/pp_video_dev.h	(revision 69504)
+++ ppapi/c/dev/pp_video_dev.h	(working copy)
@@ -223,11 +223,6 @@
   // 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;
 };
@@ -241,6 +236,11 @@
         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];