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

BUG= http://code.google.com/p/nativeclient/issues/detail?id=933
TEST=It compiles can run the nacl ppapi srpc test

Review URL: http://codereview.chromium.org/6041001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69602 0039d316-1c4b-4281-b951-d872f2087c98

49 files changed, 66 insertions, 59 deletions

diff --git a/DEPS b/DEPS
index ea7a84a..ed57fc6 100644
--- a/DEPS
+++ b/DEPS
@@ -8,7 +8,7 @@ vars = {
   "skia_revision": "636",
   "chromium_git": "http://git.chromium.org/git",
   "swig_revision": "69281",
-  "nacl_revision": "3764",
+  "nacl_revision": "4001",
   "libjingle_revision": "50",
   "libvpx_revision": "65287",
   "ffmpeg_revision": "67548",
diff --git a/ppapi/c/dev/pp_video_dev.h b/ppapi/c/dev/pp_video_dev.h
index 6f67c1e..adef7be 100644
--- a/ppapi/c/dev/pp_video_dev.h
+++ b/ppapi/c/dev/pp_video_dev.h
@@ -223,11 +223,6 @@ 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;
 };
@@ -241,6 +236,11 @@ 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];
diff --git a/ppapi/c/dev/ppb_audio_config_dev.h b/ppapi/c/dev/ppb_audio_config_dev.h
index 411ad76..07c7824 100644
--- a/ppapi/c/dev/ppb_audio_config_dev.h
+++ b/ppapi/c/dev/ppb_audio_config_dev.h
@@ -11,7 +11,7 @@
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_stdint.h"
 
-#define PPB_AUDIO_CONFIG_DEV_INTERFACE "PPB_AudioConfig(Dev);0.4"
+#define PPB_AUDIO_CONFIG_DEV_INTERFACE "PPB_AudioConfig(Dev);0.3"
 
 enum {
   PP_AUDIOMINSAMPLEFRAMECOUNT = 64,
diff --git a/ppapi/c/dev/ppb_audio_dev.h b/ppapi/c/dev/ppb_audio_dev.h
index f298302..667371c 100644
--- a/ppapi/c/dev/ppb_audio_dev.h
+++ b/ppapi/c/dev/ppb_audio_dev.h
@@ -11,7 +11,7 @@
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_stdint.h"
 
-#define PPB_AUDIO_DEV_INTERFACE "PPB_Audio(Dev);0.4"
+#define PPB_AUDIO_DEV_INTERFACE "PPB_Audio(Dev);0.3"
 
 // Callback function type for SetCallback.
 typedef void (*PPB_Audio_Callback)(void* sample_buffer,
diff --git a/ppapi/c/dev/ppb_audio_trusted_dev.h b/ppapi/c/dev/ppb_audio_trusted_dev.h
index 0bada36..aab83fe 100644
--- a/ppapi/c/dev/ppb_audio_trusted_dev.h
+++ b/ppapi/c/dev/ppb_audio_trusted_dev.h
@@ -9,7 +9,7 @@
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_resource.h"
 
-#define PPB_AUDIO_TRUSTED_DEV_INTERFACE "PPB_AudioTrusted(Dev);0.3"
+#define PPB_AUDIO_TRUSTED_DEV_INTERFACE "PPB_AudioTrusted(Dev);0.2"
 
 /**
  * This interface is to be used by proxy implementations.  All
diff --git a/ppapi/c/dev/ppb_buffer_dev.h b/ppapi/c/dev/ppb_buffer_dev.h
index c750190..9906967 100644
--- a/ppapi/c/dev/ppb_buffer_dev.h
+++ b/ppapi/c/dev/ppb_buffer_dev.h
@@ -10,7 +10,7 @@
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_stdint.h"
 
-#define PPB_BUFFER_DEV_INTERFACE "PPB_Buffer(Dev);0.4"
+#define PPB_BUFFER_DEV_INTERFACE "PPB_Buffer(Dev);0.3"
 
 struct PPB_Buffer_Dev {
   // Allocates a buffer of the given size in bytes. The return value will have
diff --git a/ppapi/c/dev/ppb_char_set_dev.h b/ppapi/c/dev/ppb_char_set_dev.h
index 03cfa87a..ac1ad96 100644
--- a/ppapi/c/dev/ppb_char_set_dev.h
+++ b/ppapi/c/dev/ppb_char_set_dev.h
@@ -10,7 +10,7 @@
 #include "ppapi/c/pp_stdint.h"
 #include "ppapi/c/pp_var.h"
 
-#define PPB_CHAR_SET_DEV_INTERFACE "PPB_CharSet(Dev);0.4"
+#define PPB_CHAR_SET_DEV_INTERFACE "PPB_CharSet(Dev);0.3"
 
 // Specifies the error behavior for the character set conversion functions.
 // This will affect two cases: where the input is not encoded correctly, and
diff --git a/ppapi/c/dev/ppb_cursor_control_dev.h b/ppapi/c/dev/ppb_cursor_control_dev.h
index c515af7..45b37e2 100644
--- a/ppapi/c/dev/ppb_cursor_control_dev.h
+++ b/ppapi/c/dev/ppb_cursor_control_dev.h
@@ -11,7 +11,7 @@
 #include "ppapi/c/pp_point.h"
 #include "ppapi/c/pp_resource.h"
 
-#define PPB_CURSOR_CONTROL_DEV_INTERFACE "PPB_CursorControl(Dev);0.3"
+#define PPB_CURSOR_CONTROL_DEV_INTERFACE "PPB_CursorControl(Dev);0.2"
 
 struct PPB_CursorControl_Dev {
   // Set a cursor.  If "type" is PP_CURSOR_TYPE_CUSTOM, then "custom_image"
diff --git a/ppapi/c/dev/ppb_directory_reader_dev.h b/ppapi/c/dev/ppb_directory_reader_dev.h
index 74a92ef..8dc0f6a 100644
--- a/ppapi/c/dev/ppb_directory_reader_dev.h
+++ b/ppapi/c/dev/ppb_directory_reader_dev.h
@@ -16,10 +16,17 @@ struct PP_CompletionCallback;
 struct PP_DirectoryEntry_Dev {
   PP_Resource file_ref;
   PP_FileType_Dev file_type;
+
+  /** Ensure that this struct is 16-bytes wide by padding the end.  Because
+   *  PP_Resource is an 8-byte type, some compilers align this struct on 8-byte
+   *  boundaries and pad it to 16 bytes even without @a padding.  This makes its
+   *  size consistent across compilers.
+   */
+  int32_t padding;
 };
-PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_DirectoryEntry_Dev, 8);
+PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_DirectoryEntry_Dev, 16);
 
-#define PPB_DIRECTORYREADER_DEV_INTERFACE "PPB_DirectoryReader(Dev);0.4"
+#define PPB_DIRECTORYREADER_DEV_INTERFACE "PPB_DirectoryReader(Dev);0.3"
 
 struct PPB_DirectoryReader_Dev {
   // Creates a DirectoryReader for the given directory.  Upon success, the
diff --git a/ppapi/c/dev/ppb_file_chooser_dev.h b/ppapi/c/dev/ppb_file_chooser_dev.h
index e807f38..b63a930 100644
--- a/ppapi/c/dev/ppb_file_chooser_dev.h
+++ b/ppapi/c/dev/ppb_file_chooser_dev.h
@@ -30,7 +30,7 @@ struct PP_FileChooserOptions_Dev {
   const char* accept_mime_types;
 };
 
-#define PPB_FILECHOOSER_DEV_INTERFACE "PPB_FileChooser(Dev);0.3"
+#define PPB_FILECHOOSER_DEV_INTERFACE "PPB_FileChooser(Dev);0.2"
 
 struct PPB_FileChooser_Dev {
   // Creates a file chooser dialog with the specified options.  The chooser is
diff --git a/ppapi/c/dev/ppb_file_io_dev.h b/ppapi/c/dev/ppb_file_io_dev.h
index 64f47c0..1264599 100644
--- a/ppapi/c/dev/ppb_file_io_dev.h
+++ b/ppapi/c/dev/ppb_file_io_dev.h
@@ -39,7 +39,7 @@ typedef enum {
 } PP_FileOpenFlags_Dev;
 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_FileOpenFlags_Dev, 4);
 
-#define PPB_FILEIO_DEV_INTERFACE "PPB_FileIO(Dev);0.3"
+#define PPB_FILEIO_DEV_INTERFACE "PPB_FileIO(Dev);0.2"
 
 // Use this interface to operate on a regular file (PP_FileType_Regular).
 struct PPB_FileIO_Dev {
diff --git a/ppapi/c/dev/ppb_file_io_trusted_dev.h b/ppapi/c/dev/ppb_file_io_trusted_dev.h
index ef6715b..f4915fa 100644
--- a/ppapi/c/dev/ppb_file_io_trusted_dev.h
+++ b/ppapi/c/dev/ppb_file_io_trusted_dev.h
@@ -10,7 +10,7 @@
 
 struct PP_CompletionCallback;
 
-#define PPB_FILEIOTRUSTED_DEV_INTERFACE "PPB_FileIOTrusted(Dev);0.2"
+#define PPB_FILEIOTRUSTED_DEV_INTERFACE "PPB_FileIOTrusted(Dev);0.1"
 
 // Available only to trusted implementations.
 struct PPB_FileIOTrusted_Dev {
diff --git a/ppapi/c/dev/ppb_file_ref_dev.h b/ppapi/c/dev/ppb_file_ref_dev.h
index e56fa1c..210ddbd 100644
--- a/ppapi/c/dev/ppb_file_ref_dev.h
+++ b/ppapi/c/dev/ppb_file_ref_dev.h
@@ -11,7 +11,7 @@
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_var.h"
 
-#define PPB_FILEREF_DEV_INTERFACE "PPB_FileRef(Dev);0.5"
+#define PPB_FILEREF_DEV_INTERFACE "PPB_FileRef(Dev);0.4"
 
 // A FileRef is a "weak pointer" to a file in a file system.  It contains a
 // PP_FileSystemType identifier and a file path string.
diff --git a/ppapi/c/dev/ppb_file_system_dev.h b/ppapi/c/dev/ppb_file_system_dev.h
index 2a8dbf3..9f93a1a 100644
--- a/ppapi/c/dev/ppb_file_system_dev.h
+++ b/ppapi/c/dev/ppb_file_system_dev.h
@@ -13,7 +13,7 @@
 
 struct PP_CompletionCallback;
 
-#define PPB_FILESYSTEM_DEV_INTERFACE "PPB_FileSystem(Dev);0.3"
+#define PPB_FILESYSTEM_DEV_INTERFACE "PPB_FileSystem(Dev);0.2"
 
 struct PPB_FileSystem_Dev {
   // Creates a weak pointer to the filesystem of the given type.
diff --git a/ppapi/c/dev/ppb_find_dev.h b/ppapi/c/dev/ppb_find_dev.h
index 972c3d8..b74416e 100644
--- a/ppapi/c/dev/ppb_find_dev.h
+++ b/ppapi/c/dev/ppb_find_dev.h
@@ -9,7 +9,7 @@
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_stdint.h"
 
-#define PPB_FIND_DEV_INTERFACE "PPB_Find(Dev);0.3"
+#define PPB_FIND_DEV_INTERFACE "PPB_Find(Dev);0.2"
 
 struct PPB_Find_Dev {
   // Updates the number of find results for the current search term.  If
diff --git a/ppapi/c/dev/ppb_font_dev.h b/ppapi/c/dev/ppb_font_dev.h
index 747cb7c..8056d95 100644
--- a/ppapi/c/dev/ppb_font_dev.h
+++ b/ppapi/c/dev/ppb_font_dev.h
@@ -12,7 +12,7 @@
 #include "ppapi/c/pp_stdint.h"
 #include "ppapi/c/pp_var.h"
 
-#define PPB_FONT_DEV_INTERFACE "PPB_Font(Dev);0.5"
+#define PPB_FONT_DEV_INTERFACE "PPB_Font(Dev);0.4"
 
 struct PP_Point;
 struct PP_Rect;
diff --git a/ppapi/c/dev/ppb_fullscreen_dev.h b/ppapi/c/dev/ppb_fullscreen_dev.h
index 22b19df..3166eb9 100644
--- a/ppapi/c/dev/ppb_fullscreen_dev.h
+++ b/ppapi/c/dev/ppb_fullscreen_dev.h
@@ -9,7 +9,7 @@
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_stdint.h"
 
-#define PPB_FULLSCREEN_DEV_INTERFACE "PPB_Fullscreen(Dev);0.3"
+#define PPB_FULLSCREEN_DEV_INTERFACE "PPB_Fullscreen(Dev);0.2"
 
 // Use this interface to change a plugin instance to fullscreen mode.
 struct PPB_Fullscreen_Dev {
diff --git a/ppapi/c/dev/ppb_graphics_3d_dev.h b/ppapi/c/dev/ppb_graphics_3d_dev.h
index 7bd739b..27793c1 100644
--- a/ppapi/c/dev/ppb_graphics_3d_dev.h
+++ b/ppapi/c/dev/ppb_graphics_3d_dev.h
@@ -25,7 +25,7 @@
 // // Shutdown.
 // core->ReleaseResource(context);
 
-#define PPB_GRAPHICS_3D_DEV_INTERFACE "PPB_Graphics3D(Dev);0.3"
+#define PPB_GRAPHICS_3D_DEV_INTERFACE "PPB_Graphics3D(Dev);0.2"
 
 // These are the same error codes as used by EGL.
 enum {
diff --git a/ppapi/c/dev/ppb_scrollbar_dev.h b/ppapi/c/dev/ppb_scrollbar_dev.h
index 4166840..25cf0e7 100644
--- a/ppapi/c/dev/ppb_scrollbar_dev.h
+++ b/ppapi/c/dev/ppb_scrollbar_dev.h
@@ -21,7 +21,7 @@ typedef enum {
 } PP_ScrollBy_Dev;
 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_ScrollBy_Dev, 4);
 
-#define PPB_SCROLLBAR_DEV_INTERFACE "PPB_Scrollbar(Dev);0.3"
+#define PPB_SCROLLBAR_DEV_INTERFACE "PPB_Scrollbar(Dev);0.2"
 
 // The interface for a scrollbar.  A scrollbar is a widget, so the functions
 // in PPB_Widget can also be used with scrollbar objects.
diff --git a/ppapi/c/dev/ppb_testing_dev.h b/ppapi/c/dev/ppb_testing_dev.h
index fa193569..5606ca6 100644
--- a/ppapi/c/dev/ppb_testing_dev.h
+++ b/ppapi/c/dev/ppb_testing_dev.h
@@ -12,7 +12,7 @@
 
 struct PP_Point;
 
-#define PPB_TESTING_DEV_INTERFACE "PPB_Testing(Dev);0.4"
+#define PPB_TESTING_DEV_INTERFACE "PPB_Testing(Dev);0.3"
 
 // This interface contains functions used for unit testing. Do not use in
 // production code. They are not guaranteed to be available in normal plugin
diff --git a/ppapi/c/dev/ppb_transport_dev.h b/ppapi/c/dev/ppb_transport_dev.h
index ee4fcaf..33dbf57 100644
--- a/ppapi/c/dev/ppb_transport_dev.h
+++ b/ppapi/c/dev/ppb_transport_dev.h
@@ -13,7 +13,7 @@
 #include "ppapi/c/pp_stdint.h"
 #include "ppapi/c/pp_var.h"
 
-#define PPB_TRANSPORT_DEV_INTERFACE "PPB_Transport;0.4"
+#define PPB_TRANSPORT_DEV_INTERFACE "PPB_Transport;0.3"
 
 struct PPB_Transport_Dev {
   // Creates a new transport object with the specified name
diff --git a/ppapi/c/dev/ppb_url_util_dev.h b/ppapi/c/dev/ppb_url_util_dev.h
index 394ad87..49bcc18 100644
--- a/ppapi/c/dev/ppb_url_util_dev.h
+++ b/ppapi/c/dev/ppb_url_util_dev.h
@@ -11,7 +11,7 @@
 #include "ppapi/c/pp_stdint.h"
 #include "ppapi/c/pp_var.h"
 
-#define PPB_URLUTIL_DEV_INTERFACE "PPB_UrlUtil(Dev);0.4"
+#define PPB_URLUTIL_DEV_INTERFACE "PPB_UrlUtil(Dev);0.3"
 
 // A component specifies the range of the part of the URL. The begin specifies
 // the index into the string of the first character of that component. The len
diff --git a/ppapi/c/dev/ppb_var_deprecated.h b/ppapi/c/dev/ppb_var_deprecated.h
index 6dba7a0..e71ba9f 100644
--- a/ppapi/c/dev/ppb_var_deprecated.h
+++ b/ppapi/c/dev/ppb_var_deprecated.h
@@ -12,7 +12,7 @@
 
 struct PPP_Class_Deprecated;
 
-#define PPB_VAR_DEPRECATED_INTERFACE "PPB_Var(Deprecated);0.3"
+#define PPB_VAR_DEPRECATED_INTERFACE "PPB_Var(Deprecated);0.2"
 
 /**
  * @file
diff --git a/ppapi/c/dev/ppb_video_decoder_dev.h b/ppapi/c/dev/ppb_video_decoder_dev.h
index 1e93780..975e68b 100644
--- a/ppapi/c/dev/ppb_video_decoder_dev.h
+++ b/ppapi/c/dev/ppb_video_decoder_dev.h
@@ -12,7 +12,7 @@
 #include "ppapi/c/pp_stdint.h"
 #include "ppapi/c/pp_completion_callback.h"
 
-#define PPB_VIDEODECODER_DEV_INTERFACE "PPB_VideoDecoder(Dev);0.4"
+#define PPB_VIDEODECODER_DEV_INTERFACE "PPB_VideoDecoder(Dev);0.3"
 
 struct PPB_VideoDecoder_Dev {
   // Queries capability of the decoder for |codec|.
diff --git a/ppapi/c/dev/ppb_zoom_dev.h b/ppapi/c/dev/ppb_zoom_dev.h
index c44e8c5..e6046e1 100644
--- a/ppapi/c/dev/ppb_zoom_dev.h
+++ b/ppapi/c/dev/ppb_zoom_dev.h
@@ -8,7 +8,7 @@
 #include "ppapi/c/pp_instance.h"
 
 // Zoom interface should only apply to those full-page "plugin-document".
-#define PPB_ZOOM_DEV_INTERFACE "PPB_Zoom(Dev);0.2"
+#define PPB_ZOOM_DEV_INTERFACE "PPB_Zoom(Dev);0.1"
 
 struct PPB_Zoom_Dev {
   // Informs the browser about the new zoom factor for the plugin (see
diff --git a/ppapi/c/dev/ppp_cursor_control_dev.h b/ppapi/c/dev/ppp_cursor_control_dev.h
index 81a1a88..b9403f4 100644
--- a/ppapi/c/dev/ppp_cursor_control_dev.h
+++ b/ppapi/c/dev/ppp_cursor_control_dev.h
@@ -7,7 +7,7 @@
 
 #include "ppapi/c/pp_instance.h"
 
-#define PPP_CURSOR_CONTROL_DEV_INTERFACE "PPP_CursorControl(Dev);0.2"
+#define PPP_CURSOR_CONTROL_DEV_INTERFACE "PPP_CursorControl(Dev);0.1"
 
 struct PPP_CursorControl_Dev {
   // Called when the instance looses the cursor lock, e.g. because the user
diff --git a/ppapi/c/dev/ppp_find_dev.h b/ppapi/c/dev/ppp_find_dev.h
index 02c6a15..c20f699 100644
--- a/ppapi/c/dev/ppp_find_dev.h
+++ b/ppapi/c/dev/ppp_find_dev.h
@@ -8,7 +8,7 @@
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_instance.h"
 
-#define PPP_FIND_DEV_INTERFACE "PPP_Find(Dev);0.3"
+#define PPP_FIND_DEV_INTERFACE "PPP_Find(Dev);0.2"
 
 struct PPP_Find_Dev {
   // Finds the given UTF-8 text starting at the current selection. The number of
diff --git a/ppapi/c/dev/ppp_graphics_3d_dev.h b/ppapi/c/dev/ppp_graphics_3d_dev.h
index ac1de8d..2dc4402 100644
--- a/ppapi/c/dev/ppp_graphics_3d_dev.h
+++ b/ppapi/c/dev/ppp_graphics_3d_dev.h
@@ -7,7 +7,7 @@
 
 #include "ppapi/c/pp_instance.h"
 
-#define PPP_GRAPHICS_3D_DEV_INTERFACE "PPP_Graphics_3D(Dev);0.2"
+#define PPP_GRAPHICS_3D_DEV_INTERFACE "PPP_Graphics_3D(Dev);0.1"
 
 struct PPP_Graphics3D_Dev {
   // Called when the OpenGL ES window is invalidated and needs to be repainted.
diff --git a/ppapi/c/dev/ppp_printing_dev.h b/ppapi/c/dev/ppp_printing_dev.h
index dce201b..00b5e6b 100644
--- a/ppapi/c/dev/ppp_printing_dev.h
+++ b/ppapi/c/dev/ppp_printing_dev.h
@@ -46,7 +46,7 @@ struct PP_PrintPageNumberRange_Dev {
 PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_PrintPageNumberRange_Dev, 8);
 
 // Interface for the plugin to implement printing.
-#define PPP_PRINTING_DEV_INTERFACE "PPP_Printing(Dev);0.3"
+#define PPP_PRINTING_DEV_INTERFACE "PPP_Printing(Dev);0.2"
 
 struct PPP_Printing_Dev {
   // Returns array of supported print output formats. The array is allocated
diff --git a/ppapi/c/dev/ppp_scrollbar_dev.h b/ppapi/c/dev/ppp_scrollbar_dev.h
index ba39bd6..b032a2a 100644
--- a/ppapi/c/dev/ppp_scrollbar_dev.h
+++ b/ppapi/c/dev/ppp_scrollbar_dev.h
@@ -10,7 +10,7 @@
 #include "ppapi/c/pp_stdint.h"
 
 // Interface for the plugin to implement when using a scrollbar widget.
-#define PPP_SCROLLBAR_DEV_INTERFACE "PPP_Scrollbar(Dev);0.2"
+#define PPP_SCROLLBAR_DEV_INTERFACE "PPP_Scrollbar(Dev);0.1"
 
 struct PPP_Scrollbar_Dev {
   // Informs the instance that the scrollbar's value has changed.
diff --git a/ppapi/c/dev/ppp_selection_dev.h b/ppapi/c/dev/ppp_selection_dev.h
index d2f3f1a..834b4ed 100644
--- a/ppapi/c/dev/ppp_selection_dev.h
+++ b/ppapi/c/dev/ppp_selection_dev.h
@@ -9,7 +9,7 @@
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_var.h"
 
-#define PPP_SELECTION_DEV_INTERFACE "PPP_Selection(Dev);0.3"
+#define PPP_SELECTION_DEV_INTERFACE "PPP_Selection(Dev);0.2"
 
 struct PPP_Selection_Dev {
   /**
diff --git a/ppapi/c/dev/ppp_widget_dev.h b/ppapi/c/dev/ppp_widget_dev.h
index 27c7794..26a4847 100644
--- a/ppapi/c/dev/ppp_widget_dev.h
+++ b/ppapi/c/dev/ppp_widget_dev.h
@@ -10,7 +10,7 @@
 #include "ppapi/c/pp_rect.h"
 
 // Interface for the plugin to implement when using a widget.
-#define PPP_WIDGET_DEV_INTERFACE "PPP_Widget(Dev);0.2"
+#define PPP_WIDGET_DEV_INTERFACE "PPP_Widget(Dev);0.1"
 
 struct PPP_Widget_Dev {
   // Informs the instance that the given rectangle needs to be repainted.
diff --git a/ppapi/c/dev/ppp_zoom_dev.h b/ppapi/c/dev/ppp_zoom_dev.h
index c7dd849..90c8be9 100644
--- a/ppapi/c/dev/ppp_zoom_dev.h
+++ b/ppapi/c/dev/ppp_zoom_dev.h
@@ -9,7 +9,7 @@
 #include "ppapi/c/pp_instance.h"
 
 // Zoom interface should only apply to those full-page "plugin-document".
-#define PPP_ZOOM_DEV_INTERFACE "PPP_Zoom(Dev);0.3"
+#define PPP_ZOOM_DEV_INTERFACE "PPP_Zoom(Dev);0.2"
 
 struct PPP_Zoom_Dev {
   // Instruct plug-in to zoom according to the given factor and whether the zoom
diff --git a/ppapi/c/pp_instance.h b/ppapi/c/pp_instance.h
index 788000b..f061ceb 100644
--- a/ppapi/c/pp_instance.h
+++ b/ppapi/c/pp_instance.h
@@ -24,8 +24,8 @@
  * is guaranteed never to be 0, so a plugin can initialize it to 0 to
  * indicate a "NULL handle."
  */
-typedef int32_t PP_Instance;
-PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_Instance, 4);
+typedef int64_t PP_Instance;
+PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_Instance, 8);
 
 /**
  * @}
diff --git a/ppapi/c/pp_module.h b/ppapi/c/pp_module.h
index 420f51d..f62337b 100644
--- a/ppapi/c/pp_module.h
+++ b/ppapi/c/pp_module.h
@@ -21,8 +21,8 @@
  * handle assigned by the browser to the plugin. It is guaranteed never to be
  * 0, so a plugin can initialize it to 0 to indicate a "NULL handle."
  */
-typedef int32_t PP_Module;
-PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_Module, 4);
+typedef int64_t PP_Module;
+PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_Module, 8);
 
 /**
  * @}
diff --git a/ppapi/c/pp_resource.h b/ppapi/c/pp_resource.h
index e81780e..c3d1aca 100644
--- a/ppapi/c/pp_resource.h
+++ b/ppapi/c/pp_resource.h
@@ -30,8 +30,8 @@
  * it to 0 to indicate a "NULL handle." Some interfaces may return a NULL
  * resource to indicate failure.
  */
-typedef int32_t PP_Resource;
-PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_Resource, 4);
+typedef int64_t PP_Resource;
+PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_Resource, 8);
 
 /**
  * @}
diff --git a/ppapi/c/ppb_class.h b/ppapi/c/ppb_class.h
index bd0d8ef..0cb249c 100644
--- a/ppapi/c/ppb_class.h
+++ b/ppapi/c/ppb_class.h
@@ -11,7 +11,7 @@
 #include "ppapi/c/pp_var.h"
 #include "ppapi/c/ppb_var.h"
 
-#define PPB_CLASS_INTERFACE "PPB_Class;0.4"
+#define PPB_CLASS_INTERFACE "PPB_Class;0.3"
 
 /**
  * @file
diff --git a/ppapi/c/ppb_core.h b/ppapi/c/ppb_core.h
index b26e25f..471322a 100644
--- a/ppapi/c/ppb_core.h
+++ b/ppapi/c/ppb_core.h
@@ -13,7 +13,7 @@
 
 struct PP_CompletionCallback;
 
-#define PPB_CORE_INTERFACE "PPB_Core;0.3"
+#define PPB_CORE_INTERFACE "PPB_Core;0.2"
 
 /**
  * @file
diff --git a/ppapi/c/ppb_graphics_2d.h b/ppapi/c/ppb_graphics_2d.h
index d5b7ad0..8f152d33 100644
--- a/ppapi/c/ppb_graphics_2d.h
+++ b/ppapi/c/ppb_graphics_2d.h
@@ -15,7 +15,7 @@ struct PP_Point;
 struct PP_Rect;
 struct PP_Size;
 
-#define PPB_GRAPHICS_2D_INTERFACE "PPB_Graphics2D;0.3"
+#define PPB_GRAPHICS_2D_INTERFACE "PPB_Graphics2D;0.2"
 
 /**
  * @file
diff --git a/ppapi/c/ppb_image_data.h b/ppapi/c/ppb_image_data.h
index cb852b6..ce9356f 100644
--- a/ppapi/c/ppb_image_data.h
+++ b/ppapi/c/ppb_image_data.h
@@ -30,7 +30,7 @@ struct PP_ImageDataDesc {
 };
 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
diff --git a/ppapi/c/ppb_instance.h b/ppapi/c/ppb_instance.h
index 6a3588f..f7f137f 100644
--- a/ppapi/c/ppb_instance.h
+++ b/ppapi/c/ppb_instance.h
@@ -10,7 +10,7 @@
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_var.h"
 
-#define PPB_INSTANCE_INTERFACE "PPB_Instance;0.4"
+#define PPB_INSTANCE_INTERFACE "PPB_Instance;0.3"
 
 /**
  * @file
diff --git a/ppapi/c/ppb_url_loader.h b/ppapi/c/ppb_url_loader.h
index 2386470..7d039d6 100644
--- a/ppapi/c/ppb_url_loader.h
+++ b/ppapi/c/ppb_url_loader.h
@@ -12,7 +12,7 @@
 
 struct PP_CompletionCallback;
 
-#define PPB_URLLOADER_INTERFACE "PPB_URLLoader;0.1"
+#define PPB_URLLOADER_INTERFACE "PPB_URLLoader;1"
 
 // The interface for loading URLs.
 //
diff --git a/ppapi/c/ppb_url_request_info.h b/ppapi/c/ppb_url_request_info.h
index 0282313..5a8c1f2 100644
--- a/ppapi/c/ppb_url_request_info.h
+++ b/ppapi/c/ppb_url_request_info.h
@@ -35,7 +35,7 @@ typedef enum {
 } PP_URLRequestProperty;
 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_URLRequestProperty, 4);
 
-#define PPB_URLREQUESTINFO_INTERFACE "PPB_URLRequestInfo;0.1"
+#define PPB_URLREQUESTINFO_INTERFACE "PPB_URLRequestInfo;1.1"
 
 struct PPB_URLRequestInfo {
   // Create a new URLRequestInfo object.  Returns 0 if the module is invalid.
diff --git a/ppapi/c/ppb_url_response_info.h b/ppapi/c/ppb_url_response_info.h
index f64e598..e9cec29 100644
--- a/ppapi/c/ppb_url_response_info.h
+++ b/ppapi/c/ppb_url_response_info.h
@@ -20,7 +20,7 @@ typedef enum {
 } PP_URLResponseProperty;
 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_URLResponseProperty, 4);
 
-#define PPB_URLRESPONSEINFO_INTERFACE "PPB_URLResponseInfo;0.1"
+#define PPB_URLRESPONSEINFO_INTERFACE "PPB_URLResponseInfo;1.1"
 
 struct PPB_URLResponseInfo {
   // Returns PP_TRUE if the given resource is an URLResponseInfo. Returns
diff --git a/ppapi/c/ppb_var.h b/ppapi/c/ppb_var.h
index 0041b73..a4a1f25 100644
--- a/ppapi/c/ppb_var.h
+++ b/ppapi/c/ppb_var.h
@@ -13,7 +13,7 @@
 #include "ppapi/c/pp_stdint.h"
 #include "ppapi/c/pp_var.h"
 
-#define PPB_VAR_INTERFACE "PPB_Var;0.4"
+#define PPB_VAR_INTERFACE "PPB_Var;0.3"
 
 /**
  * @file
diff --git a/ppapi/c/trusted/ppb_image_data_trusted.h b/ppapi/c/trusted/ppb_image_data_trusted.h
index 9d2f3a7..bbc944d 100644
--- a/ppapi/c/trusted/ppb_image_data_trusted.h
+++ b/ppapi/c/trusted/ppb_image_data_trusted.h
@@ -8,7 +8,7 @@
 #include "ppapi/c/pp_stdint.h"
 #include "ppapi/c/pp_resource.h"
 
-#define PPB_IMAGEDATA_TRUSTED_INTERFACE "PPB_ImageDataTrusted;0.4"
+#define PPB_IMAGEDATA_TRUSTED_INTERFACE "PPB_ImageDataTrusted;0.3"
 
 struct PPB_ImageDataTrusted {
   /**
diff --git a/ppapi/c/trusted/ppb_url_loader_trusted.h b/ppapi/c/trusted/ppb_url_loader_trusted.h
index a9b15cf..4e027f9 100644
--- a/ppapi/c/trusted/ppb_url_loader_trusted.h
+++ b/ppapi/c/trusted/ppb_url_loader_trusted.h
@@ -9,7 +9,7 @@
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_stdint.h"
 
-#define PPB_URLLOADERTRUSTED_INTERFACE "PPB_URLLoaderTrusted;0.3"
+#define PPB_URLLOADERTRUSTED_INTERFACE "PPB_URLLoaderTrusted;0.2"
 
 // Callback that indicates the status of the download and upload for the
 // given URLLoader resource.
diff --git a/ppapi/tests/arch_dependent_sizes_32.h b/ppapi/tests/arch_dependent_sizes_32.h
index fb18237..971279c 100644
--- a/ppapi/tests/arch_dependent_sizes_32.h
+++ b/ppapi/tests/arch_dependent_sizes_32.h
@@ -25,7 +25,7 @@ PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_ClassProperty, 20);
 PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_CompletionCallback, 8);
 PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_FileChooserOptions_Dev, 8);
 PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_VideoDecoderConfig_Dev, 20);
-PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_VideoFrameBuffer_Dev, 80);
-PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_VideoUncompressedDataBuffer_Dev, 104);
+PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_VideoFrameBuffer_Dev, 112);
+PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_VideoUncompressedDataBuffer_Dev, 136);
 
 #endif  /* PPAPI_TESTS_ARCH_DEPENDENT_SIZES_32_H_ */
diff --git a/ppapi/tests/arch_dependent_sizes_64.h b/ppapi/tests/arch_dependent_sizes_64.h
index 3a63ab2..e70b420 100644
--- a/ppapi/tests/arch_dependent_sizes_64.h
+++ b/ppapi/tests/arch_dependent_sizes_64.h
@@ -25,7 +25,7 @@ PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_ClassProperty, 40);
 PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_CompletionCallback, 16);
 PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_FileChooserOptions_Dev, 16);
 PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_VideoDecoderConfig_Dev, 40);
-PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_VideoFrameBuffer_Dev, 88);
-PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_VideoUncompressedDataBuffer_Dev, 120);
+PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_VideoFrameBuffer_Dev, 120);
+PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_VideoUncompressedDataBuffer_Dev, 152);
 
 #endif  /* PPAPI_TESTS_ARCH_DEPENDENT_SIZES_64_H_ */