Update PPAPI IDL generator to define versioned structs, and unversioned typedef.

For interface Foo with versions A and B, structs will be defined for Foo_A and Foo_B, and a typedef generated from Foo_B to Foo.  Versioning of IDL structs remains unchanged.

(Follow-up to discussion on CL 8931019)

*** This change breaks compatibility with C code that makes use of unversioned-named interface structs. :( ***

We need to define a versioned-named struct for each interface's current version.  We could:

1.  Carry on defining the current struct unversioned and typedef a versioned name for it.
    The versioned type for the interface would be a typedef for the latest version and a struct for later versions, causing calling C code that uses it to break when a new version is added.

2.  Define structs for all versions, and a separate unversioned struct.
    This would lose type equivalence between the versioned and unversioned copies of the latest interface specification, and lead to needless duplication, especially for one-version interfaces.

3.  Do this CL.  We break some C code once, by change the unversioned type from struct to typedef, but we avoid these headaches in future.  C++ code shouldn't be affected.

*** Contents of this CL, including notes on to-dos:

This change requires updating thunk-getters to be defined using versioned names, so that the interface structs can be forward declared; the thunk-getters now have versioned names and return values.

Changing the thunk-getter naming requires updating unit-tests to call the versioned names.  It also requires some interface headers not generated from IDL to be manually updated to the new scheme (PPB_CharSet_Dev, PPB_Crypto_Dev, PPB_DirectoryReader_Dev, PPB_LayerCompositor_Dev, PPB_Graphics3D, PPB_Flash_Menu, PPB_Instance_Private, PPP_Pdf, PPB_Flash_NetConnector, PPB_GLESChromiumTextureMapping_Dev and PPB_Graphics3D_Trusted).

The proxy GetInfo() calls are updated to use versioned interface macros and thunks.  Similarly, most PPBs added in interface_list.cc are now added using versioned interface macros and thunk getters.  Ditto PluginModule, and some of PluginInstance.  Some implementations (e.g. PPB_CharSet_Dev) needed updating to use versioned thunk getters to fetch interfaces to use.

The VideoDecoder interface size checks are for 32-bit are updated not to expect structs.

It was necessary to replace forward declarations of interface structs with includes, and remove "struct" prefixes where unversioned names were used.  In most cases the affected code should really be updated to cope with versions.

PPP_Pdf has become PPP_Pdf_1.  Other versionless structs that should be updated for consistenct include PPB_UMA_Private, PPB_GPU_Blacklist_Private, PPB_Proxy_Private, PPP_PDF, PPB_OpenGLES2, PPB_Flash_File_FileRef and PPB_Flash_File_ModuleLocal.  Also PPP_Class_Deprecated, PPP_CursorControl_Dev, PPP_Find_Dev, PPP_NetworkState_Dev, PPP_Scrollbar_Dev, PPP_Selection_Dev, PPP_VideoCapture_Dev, PPP_Graphics3D and PPP_Instance_Private.

The Graphics2D and GLES2 examples now use unversioned interface type names without "struct" prefix.  It's not clear whether examples should use versioned names, to show best practice, or unversioned.

The typedef hack in PPP_Instance IDL is gone.  Yay.

BUG=107398,108379
TEST=All Pepper and NaCl tests should continue to pass on Chromium bots.  NaCl SDK examples build correctly.

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

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

84 files changed, 394 insertions, 241 deletions

diff --git a/ppapi/c/dev/pp_video_capture_dev.h b/ppapi/c/dev/pp_video_capture_dev.h
index c7b4c40..cb1bb8a 100644
--- a/ppapi/c/dev/pp_video_capture_dev.h
+++ b/ppapi/c/dev/pp_video_capture_dev.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From dev/pp_video_capture_dev.idl modified Fri Nov 11 20:19:26 2011. */
+/* From dev/pp_video_capture_dev.idl modified Mon Nov 14 10:36:01 2011. */
 
 #ifndef PPAPI_C_DEV_PP_VIDEO_CAPTURE_DEV_H_
 #define PPAPI_C_DEV_PP_VIDEO_CAPTURE_DEV_H_
diff --git a/ppapi/c/dev/pp_video_dev.h b/ppapi/c/dev/pp_video_dev.h
index 2342d0e..d13c3e2 100644
--- a/ppapi/c/dev/pp_video_dev.h
+++ b/ppapi/c/dev/pp_video_dev.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From dev/pp_video_dev.idl modified Wed Nov 23 13:51:18 2011. */
+/* From dev/pp_video_dev.idl modified Wed Dec 14 18:08:00 2011. */
 
 #ifndef PPAPI_C_DEV_PP_VIDEO_DEV_H_
 #define PPAPI_C_DEV_PP_VIDEO_DEV_H_
diff --git a/ppapi/c/dev/ppb_audio_input_dev.h b/ppapi/c/dev/ppb_audio_input_dev.h
index 73d9bc5..671f51e 100644
--- a/ppapi/c/dev/ppb_audio_input_dev.h
+++ b/ppapi/c/dev/ppb_audio_input_dev.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From dev/ppb_audio_input_dev.idl modified Wed Nov 23 09:26:09 2011. */
+/* From dev/ppb_audio_input_dev.idl modified Mon Nov 28 22:30:37 2011. */
 
 #ifndef PPAPI_C_DEV_PPB_AUDIO_INPUT_DEV_H_
 #define PPAPI_C_DEV_PPB_AUDIO_INPUT_DEV_H_
@@ -48,7 +48,7 @@ typedef void (*PPB_AudioInput_Callback)(const void* sample_buffer,
  * The <code>PPB_AudioInput_Dev</code> interface contains pointers to several
  * functions for handling audio input resources.
  */
-struct PPB_AudioInput_Dev {
+struct PPB_AudioInput_Dev_0_1 {
   /**
    * Create is a pointer to a function that creates an audio input resource.
    * No sound will be captured until StartCapture() is called.
@@ -104,6 +104,8 @@ struct PPB_AudioInput_Dev {
    */
   PP_Bool (*StopCapture)(PP_Resource audio_input);
 };
+
+typedef struct PPB_AudioInput_Dev_0_1 PPB_AudioInput_Dev;
 /**
  * @}
  */
diff --git a/ppapi/c/dev/ppb_buffer_dev.h b/ppapi/c/dev/ppb_buffer_dev.h
index 785fc3a..5e05f05 100644
--- a/ppapi/c/dev/ppb_buffer_dev.h
+++ b/ppapi/c/dev/ppb_buffer_dev.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From dev/ppb_buffer_dev.idl modified Fri Aug 26 13:58:06 2011. */
+/* From dev/ppb_buffer_dev.idl modified Wed Oct  5 14:06:02 2011. */
 
 #ifndef PPAPI_C_DEV_PPB_BUFFER_DEV_H_
 #define PPAPI_C_DEV_PPB_BUFFER_DEV_H_
@@ -27,7 +27,7 @@
  * @addtogroup Interfaces
  * @{
  */
-struct PPB_Buffer_Dev {
+struct PPB_Buffer_Dev_0_4 {
   /**
    * Allocates a buffer of the given size in bytes. The return value will have
    * a non-zero ID on success, or zero on failure. Failure means the module
@@ -54,6 +54,8 @@ struct PPB_Buffer_Dev {
    */
   void (*Unmap)(PP_Resource resource);
 };
+
+typedef struct PPB_Buffer_Dev_0_4 PPB_Buffer_Dev;
 /**
  * @}
  */
diff --git a/ppapi/c/dev/ppb_char_set_dev.h b/ppapi/c/dev/ppb_char_set_dev.h
index 26c3b2e..36ab825 100644
--- a/ppapi/c/dev/ppb_char_set_dev.h
+++ b/ppapi/c/dev/ppb_char_set_dev.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
@@ -35,7 +35,7 @@ enum PP_CharSet_ConversionError {
 };
 PP_COMPILE_ASSERT_ENUM_SIZE_IN_BYTES(PP_CharSet_ConversionError, 4);
 
-struct PPB_CharSet_Dev {
+struct PPB_CharSet_Dev_0_4 {
   // Converts the UTF-16 string pointed to in |*utf16| to an 8-bit string in the
   // specified code page. |utf16_len| is measured in UTF-16 units, not bytes.
   // This value may not be NULL.
@@ -80,5 +80,6 @@ struct PPB_CharSet_Dev {
   struct PP_Var (*GetDefaultCharSet)(PP_Instance instance);
 };
 
-#endif  /* PPAPI_C_DEV_PPB_CHAR_SET_DEV_H_ */
+typedef struct PPB_CharSet_Dev_0_4 PPB_CharSet_Dev;
 
+#endif  /* PPAPI_C_DEV_PPB_CHAR_SET_DEV_H_ */
diff --git a/ppapi/c/dev/ppb_console_dev.h b/ppapi/c/dev/ppb_console_dev.h
index 5f30527..68e697e 100644
--- a/ppapi/c/dev/ppb_console_dev.h
+++ b/ppapi/c/dev/ppb_console_dev.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From dev/ppb_console_dev.idl modified Fri Nov 11 20:17:52 2011. */
+/* From dev/ppb_console_dev.idl modified Mon Nov 14 10:36:01 2011. */
 
 #ifndef PPAPI_C_DEV_PPB_CONSOLE_DEV_H_
 #define PPAPI_C_DEV_PPB_CONSOLE_DEV_H_
@@ -42,7 +42,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_LogLevel_Dev, 4);
  * @addtogroup Interfaces
  * @{
  */
-struct PPB_Console_Dev {
+struct PPB_Console_Dev_0_1 {
   /**
    * Logs the given message to the JavaScript console associated with the
    * given plugin instance with the given logging level. The name of the plugin
@@ -65,6 +65,8 @@ struct PPB_Console_Dev {
                         struct PP_Var source,
                         struct PP_Var value);
 };
+
+typedef struct PPB_Console_Dev_0_1 PPB_Console_Dev;
 /**
  * @}
  */
diff --git a/ppapi/c/dev/ppb_crypto_dev.h b/ppapi/c/dev/ppb_crypto_dev.h
index 27ef6ac9..732d3dc 100644
--- a/ppapi/c/dev/ppb_crypto_dev.h
+++ b/ppapi/c/dev/ppb_crypto_dev.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
@@ -11,7 +11,7 @@
 #define PPB_CRYPTO_DEV_INTERFACE_0_1 "PPB_Crypto(Dev);0.1"
 #define PPB_CRYPTO_DEV_INTERFACE PPB_CRYPTO_DEV_INTERFACE_0_1
 
-struct PPB_Crypto_Dev {
+struct PPB_Crypto_Dev_0_1 {
   /**
    * Fills the given buffer with random bytes. This is potentially slow so only
    * request the amount of data you need.
@@ -19,4 +19,6 @@ struct PPB_Crypto_Dev {
   void (*GetRandomBytes)(char* buffer, uint32_t num_bytes);
 };
 
+typedef struct PPB_Crypto_Dev_0_1 PPB_Crypto_Dev;
+
 #endif
diff --git a/ppapi/c/dev/ppb_cursor_control_dev.h b/ppapi/c/dev/ppb_cursor_control_dev.h
index 4bb3b80..262d5cf 100644
--- a/ppapi/c/dev/ppb_cursor_control_dev.h
+++ b/ppapi/c/dev/ppb_cursor_control_dev.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From dev/ppb_cursor_control_dev.idl modified Thu Nov 17 14:24:28 2011. */
+/* From dev/ppb_cursor_control_dev.idl modified Fri Nov 18 15:58:00 2011. */
 
 #ifndef PPAPI_C_DEV_PPB_CURSOR_CONTROL_DEV_H_
 #define PPAPI_C_DEV_PPB_CURSOR_CONTROL_DEV_H_
@@ -30,7 +30,7 @@
  * @addtogroup Interfaces
  * @{
  */
-struct PPB_CursorControl_Dev {
+struct PPB_CursorControl_Dev_0_4 {
   /**
    * Set a cursor.  If "type" is PP_CURSORTYPE_CUSTOM, then "custom_image"
    * must be an ImageData resource containing the cursor and "hot_spot" must
@@ -75,6 +75,8 @@ struct PPB_CursorControl_Dev {
    */
   PP_Bool (*CanLockCursor)(PP_Instance instance);
 };
+
+typedef struct PPB_CursorControl_Dev_0_4 PPB_CursorControl_Dev;
 /**
  * @}
  */
diff --git a/ppapi/c/dev/ppb_directory_reader_dev.h b/ppapi/c/dev/ppb_directory_reader_dev.h
index 2a49ee9..78e3c17 100644
--- a/ppapi/c/dev/ppb_directory_reader_dev.h
+++ b/ppapi/c/dev/ppb_directory_reader_dev.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
@@ -22,7 +22,7 @@ PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_DirectoryEntry_Dev, 8);
 #define PPB_DIRECTORYREADER_DEV_INTERFACE_0_5 "PPB_DirectoryReader(Dev);0.5"
 #define PPB_DIRECTORYREADER_DEV_INTERFACE PPB_DIRECTORYREADER_DEV_INTERFACE_0_5
 
-struct PPB_DirectoryReader_Dev {
+struct PPB_DirectoryReader_Dev_0_5 {
   // Creates a DirectoryReader for the given directory.  Upon success, the
   // corresponding directory is classified as "in use" by the resulting
   // DirectoryReader object until such time as the DirectoryReader object is
@@ -55,4 +55,6 @@ struct PPB_DirectoryReader_Dev {
                           struct PP_CompletionCallback callback);
 };
 
+typedef struct PPB_DirectoryReader_Dev_0_5 PPB_DirectoryReader_Dev;
+
 #endif  /* PPAPI_C_DEV_PPB_DIRECTORY_READER_DEV_H_ */
diff --git a/ppapi/c/dev/ppb_file_chooser_dev.h b/ppapi/c/dev/ppb_file_chooser_dev.h
index a2f575d..a2ef7ce 100644
--- a/ppapi/c/dev/ppb_file_chooser_dev.h
+++ b/ppapi/c/dev/ppb_file_chooser_dev.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From dev/ppb_file_chooser_dev.idl modified Fri Nov 11 20:18:10 2011. */
+/* From dev/ppb_file_chooser_dev.idl modified Mon Nov 14 10:36:01 2011. */
 
 #ifndef PPAPI_C_DEV_PPB_FILE_CHOOSER_DEV_H_
 #define PPAPI_C_DEV_PPB_FILE_CHOOSER_DEV_H_
@@ -52,7 +52,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_FileChooserMode_Dev, 4);
  * @addtogroup Interfaces
  * @{
  */
-struct PPB_FileChooser_Dev {
+struct PPB_FileChooser_Dev_0_5 {
   /**
    * This function creates a file chooser dialog resource.  The chooser is
    * associated with a particular instance, so that it may be positioned on the
@@ -115,6 +115,8 @@ struct PPB_FileChooser_Dev {
    */
   PP_Resource (*GetNextChosenFile)(PP_Resource chooser);
 };
+
+typedef struct PPB_FileChooser_Dev_0_5 PPB_FileChooser_Dev;
 /**
  * @}
  */
diff --git a/ppapi/c/dev/ppb_find_dev.h b/ppapi/c/dev/ppb_find_dev.h
index 4cefc9c..203425d 100644
--- a/ppapi/c/dev/ppb_find_dev.h
+++ b/ppapi/c/dev/ppb_find_dev.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From dev/ppb_find_dev.idl modified Tue Oct  4 08:34:10 2011. */
+/* From dev/ppb_find_dev.idl modified Wed Oct  5 14:06:02 2011. */
 
 #ifndef PPAPI_C_DEV_PPB_FIND_DEV_H_
 #define PPAPI_C_DEV_PPB_FIND_DEV_H_
@@ -26,7 +26,7 @@
  * @addtogroup Interfaces
  * @{
  */
-struct PPB_Find_Dev {
+struct PPB_Find_Dev_0_3 {
   /**
    * Updates the number of find results for the current search term.  If
    * there are no matches 0 should be passed in.  Only when the plugin has
@@ -41,6 +41,8 @@ struct PPB_Find_Dev {
    */
   void (*SelectedFindResultChanged)(PP_Instance instance, int32_t index);
 };
+
+typedef struct PPB_Find_Dev_0_3 PPB_Find_Dev;
 /**
  * @}
  */
diff --git a/ppapi/c/dev/ppb_font_dev.h b/ppapi/c/dev/ppb_font_dev.h
index da5b4c4..6ba36a6 100644
--- a/ppapi/c/dev/ppb_font_dev.h
+++ b/ppapi/c/dev/ppb_font_dev.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From dev/ppb_font_dev.idl modified Wed Oct  5 19:40:26 2011. */
+/* From dev/ppb_font_dev.idl modified Tue Oct 11 10:01:39 2011. */
 
 #ifndef PPAPI_C_DEV_PPB_FONT_DEV_H_
 #define PPAPI_C_DEV_PPB_FONT_DEV_H_
@@ -158,7 +158,7 @@ PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_TextRun_Dev, 24);
  * @addtogroup Interfaces
  * @{
  */
-struct PPB_Font_Dev {
+struct PPB_Font_Dev_0_6 {
   /**
    * Returns a list of all available font families on the system. You can use
    * this list to decide whether to Create() a font.
@@ -252,6 +252,8 @@ struct PPB_Font_Dev {
                                      const struct PP_TextRun_Dev* text,
                                      uint32_t char_offset);
 };
+
+typedef struct PPB_Font_Dev_0_6 PPB_Font_Dev;
 /**
  * @}
  */
diff --git a/ppapi/c/dev/ppb_fullscreen_dev.h b/ppapi/c/dev/ppb_fullscreen_dev.h
index 519b19a..ac718c3 100644
--- a/ppapi/c/dev/ppb_fullscreen_dev.h
+++ b/ppapi/c/dev/ppb_fullscreen_dev.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From dev/ppb_fullscreen_dev.idl modified Fri Oct 14 05:00:39 2011. */
+/* From dev/ppb_fullscreen_dev.idl modified Fri Oct 14 14:57:50 2011. */
 
 #ifndef PPAPI_C_DEV_PPB_FULLSCREEN_DEV_H_
 #define PPAPI_C_DEV_PPB_FULLSCREEN_DEV_H_
@@ -27,7 +27,7 @@
  * @addtogroup Interfaces
  * @{
  */
-struct PPB_Fullscreen_Dev {
+struct PPB_Fullscreen_Dev_0_5 {
   /**
    * Checks whether the plugin instance is currently in fullscreen mode.
    */
@@ -52,6 +52,8 @@ struct PPB_Fullscreen_Dev {
    */
   PP_Bool (*GetScreenSize)(PP_Instance instance, struct PP_Size* size);
 };
+
+typedef struct PPB_Fullscreen_Dev_0_5 PPB_Fullscreen_Dev;
 /**
  * @}
  */
diff --git a/ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h b/ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h
index 616f661..8ad0093 100644
--- a/ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h
+++ b/ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -13,7 +13,7 @@
 #define PPB_GLES_CHROMIUM_TEXTURE_MAPPING_DEV_INTERFACE \
     PPB_GLES_CHROMIUM_TEXTURE_MAPPING_DEV_INTERFACE_0_1
 
-struct PPB_GLESChromiumTextureMapping_Dev {
+struct PPB_GLESChromiumTextureMapping_Dev_0_1 {
   // Maps the sub-image of a texture. 'level', 'xoffset', 'yoffset', 'width',
   // 'height', 'format' and 'type' correspond to the similarly named parameters
   // of TexSubImage2D, and define the sub-image region, as well as the format of
@@ -41,4 +41,7 @@ struct PPB_GLESChromiumTextureMapping_Dev {
   void (*UnmapTexSubImage2DCHROMIUM)(PP_Resource context, const void* mem);
 };
 
+typedef struct PPB_GLESChromiumTextureMapping_Dev_0_1
+    PPB_GLESChromiumTextureMapping_Dev;
+
 #endif  // PPAPI_C_DEV_PPB_GLES_CHROMIUM_TEXTURE_MAPPING_DEV_H_
diff --git a/ppapi/c/dev/ppb_ime_input_event_dev.h b/ppapi/c/dev/ppb_ime_input_event_dev.h
index 519a301..cb1af78 100644
--- a/ppapi/c/dev/ppb_ime_input_event_dev.h
+++ b/ppapi/c/dev/ppb_ime_input_event_dev.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From dev/ppb_ime_input_event_dev.idl modified Wed Sep 21 12:31:56 2011. */
+/* From dev/ppb_ime_input_event_dev.idl modified Wed Oct  5 14:06:02 2011. */
 
 #ifndef PPAPI_C_DEV_PPB_IME_INPUT_EVENT_DEV_H_
 #define PPAPI_C_DEV_PPB_IME_INPUT_EVENT_DEV_H_
@@ -27,7 +27,7 @@
  * @addtogroup Interfaces
  * @{
  */
-struct PPB_IMEInputEvent_Dev {
+struct PPB_IMEInputEvent_Dev_0_1 {
   /**
    * IsIMEInputEvent() determines if a resource is an IME event.
    *
@@ -100,6 +100,8 @@ struct PPB_IMEInputEvent_Dev {
    */
   void (*GetSelection)(PP_Resource ime_event, uint32_t* start, uint32_t* end);
 };
+
+typedef struct PPB_IMEInputEvent_Dev_0_1 PPB_IMEInputEvent_Dev;
 /**
  * @}
  */
diff --git a/ppapi/c/dev/ppb_layer_compositor_dev.h b/ppapi/c/dev/ppb_layer_compositor_dev.h
index 1d3ee37..a42737c 100644
--- a/ppapi/c/dev/ppb_layer_compositor_dev.h
+++ b/ppapi/c/dev/ppb_layer_compositor_dev.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
@@ -23,7 +23,7 @@
 //
 // This also allows each layer to be updated seperately to avoid excessive
 // compositing.
-struct PPB_LayerCompositor_Dev {
+struct PPB_LayerCompositor_Dev_0_2 {
   // Creates a video layer.
   PP_Resource (*Create)(PP_Instance instance);
 
@@ -75,4 +75,6 @@ struct PPB_LayerCompositor_Dev {
                          struct PP_CompletionCallback callback);
 };
 
+typedef struct PPB_LayerCompositor_Dev_0_2 PPB_LayerCompositor_Dev;
+
 #endif  /* PPAPI_C_DEV_PPB_LAYER_COMPOSITOR_DEV_H_ */
diff --git a/ppapi/c/dev/ppb_memory_dev.h b/ppapi/c/dev/ppb_memory_dev.h
index 56d6bc5..b25a9d1 100644
--- a/ppapi/c/dev/ppb_memory_dev.h
+++ b/ppapi/c/dev/ppb_memory_dev.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From dev/ppb_memory_dev.idl modified Thu Nov 17 09:45:57 2011. */
+/* From dev/ppb_memory_dev.idl modified Fri Nov 18 15:58:00 2011. */
 
 #ifndef PPAPI_C_DEV_PPB_MEMORY_DEV_H_
 #define PPAPI_C_DEV_PPB_MEMORY_DEV_H_
@@ -30,7 +30,7 @@
  * management.
  *
  */
-struct PPB_Memory_Dev {
+struct PPB_Memory_Dev_0_1 {
   /**
    * MemAlloc is a pointer to a function that allocate memory.
    *
@@ -47,6 +47,8 @@ struct PPB_Memory_Dev {
    */
   void (*MemFree)(void* ptr);
 };
+
+typedef struct PPB_Memory_Dev_0_1 PPB_Memory_Dev;
 /**
  * @}
  */
diff --git a/ppapi/c/dev/ppb_scrollbar_dev.h b/ppapi/c/dev/ppb_scrollbar_dev.h
index 4187900..860f372 100644
--- a/ppapi/c/dev/ppb_scrollbar_dev.h
+++ b/ppapi/c/dev/ppb_scrollbar_dev.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From dev/ppb_scrollbar_dev.idl modified Tue Oct  4 08:53:30 2011. */
+/* From dev/ppb_scrollbar_dev.idl modified Wed Oct  5 14:06:02 2011. */
 
 #ifndef PPAPI_C_DEV_PPB_SCROLLBAR_DEV_H_
 #define PPAPI_C_DEV_PPB_SCROLLBAR_DEV_H_
@@ -49,7 +49,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_ScrollBy_Dev, 4);
  * The interface for a scrollbar.  A scrollbar is a widget, so the functions
  * in PPB_Widget can also be used with scrollbar objects.
  */
-struct PPB_Scrollbar_Dev {
+struct PPB_Scrollbar_Dev_0_5 {
   /**
    * Create a new scrollbar.  Returns 0 if the instance is invalid.
    */
@@ -96,6 +96,8 @@ struct PPB_Scrollbar_Dev {
                    PP_ScrollBy_Dev unit,
                    int32_t multiplier);
 };
+
+typedef struct PPB_Scrollbar_Dev_0_5 PPB_Scrollbar_Dev;
 /**
  * @}
  */
diff --git a/ppapi/c/dev/ppb_testing_dev.h b/ppapi/c/dev/ppb_testing_dev.h
index e52eeb2..b0cb80e 100644
--- a/ppapi/c/dev/ppb_testing_dev.h
+++ b/ppapi/c/dev/ppb_testing_dev.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From dev/ppb_testing_dev.idl modified Fri Dec 16 16:08:07 2011. */
+/* From dev/ppb_testing_dev.idl modified Thu Dec 22 11:02:53 2011. */
 
 #ifndef PPAPI_C_DEV_PPB_TESTING_DEV_H_
 #define PPAPI_C_DEV_PPB_TESTING_DEV_H_
@@ -35,7 +35,7 @@
  * @addtogroup Interfaces
  * @{
  */
-struct PPB_Testing_Dev {
+struct PPB_Testing_Dev_0_91 {
   /**
    * Reads the bitmap data out of the backing store for the given
    * DeviceContext2D and into the given image. If the data was successfully
@@ -136,6 +136,8 @@ struct PPB_Testing_Dev {
   uint32_t (*GetLiveVars)(struct PP_Var live_vars[], uint32_t array_size);
 };
 
+typedef struct PPB_Testing_Dev_0_91 PPB_Testing_Dev;
+
 struct PPB_Testing_Dev_0_7 {
   PP_Bool (*ReadImageData)(PP_Resource device_context_2d,
                            PP_Resource image,
diff --git a/ppapi/c/dev/ppb_text_input_dev.h b/ppapi/c/dev/ppb_text_input_dev.h
index 3eca1a3..286ec34 100644
--- a/ppapi/c/dev/ppb_text_input_dev.h
+++ b/ppapi/c/dev/ppb_text_input_dev.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From dev/ppb_text_input_dev.idl modified Tue Sep 27 14:34:33 2011. */
+/* From dev/ppb_text_input_dev.idl modified Wed Oct  5 14:06:02 2011. */
 
 #ifndef PPAPI_C_DEV_PPB_TEXT_INPUT_DEV_H_
 #define PPAPI_C_DEV_PPB_TEXT_INPUT_DEV_H_
@@ -66,7 +66,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_TextInput_Type, 4);
  * to the browser about the text input status of plugins, and functions for
  * controlling input method editors (IMEs).
  */
-struct PPB_TextInput_Dev {
+struct PPB_TextInput_Dev_0_1 {
   /**
    * Informs the browser about the current text input mode of the plugin.
    * Typical use of this information in the browser is to properly
@@ -88,6 +88,8 @@ struct PPB_TextInput_Dev {
    */
   void (*CancelCompositionText)(PP_Instance instance);
 };
+
+typedef struct PPB_TextInput_Dev_0_1 PPB_TextInput_Dev;
 /**
  * @}
  */
diff --git a/ppapi/c/dev/ppb_transport_dev.h b/ppapi/c/dev/ppb_transport_dev.h
index 8363f49..47c4f3c 100644
--- a/ppapi/c/dev/ppb_transport_dev.h
+++ b/ppapi/c/dev/ppb_transport_dev.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From dev/ppb_transport_dev.idl modified Tue Oct  4 15:52:58 2011. */
+/* From dev/ppb_transport_dev.idl modified Wed Oct  5 14:06:02 2011. */
 
 #ifndef PPAPI_C_DEV_PPB_TRANSPORT_DEV_H_
 #define PPAPI_C_DEV_PPB_TRANSPORT_DEV_H_
@@ -111,7 +111,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_TransportRelayMode, 4);
  * connect type, protocol
  * RTT
  */
-struct PPB_Transport_Dev {
+struct PPB_Transport_Dev_0_7 {
   /**
    * Creates a new transport object with the specified name using the
    * specified protocol.
@@ -176,6 +176,8 @@ struct PPB_Transport_Dev {
    */
   int32_t (*Close)(PP_Resource transport);
 };
+
+typedef struct PPB_Transport_Dev_0_7 PPB_Transport_Dev;
 /**
  * @}
  */
diff --git a/ppapi/c/dev/ppb_url_util_dev.h b/ppapi/c/dev/ppb_url_util_dev.h
index 26bddf1..78e3b0a 100644
--- a/ppapi/c/dev/ppb_url_util_dev.h
+++ b/ppapi/c/dev/ppb_url_util_dev.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From dev/ppb_url_util_dev.idl modified Wed Dec  7 17:25:52 2011. */
+/* From dev/ppb_url_util_dev.idl modified Fri Dec 16 17:34:59 2011. */
 
 #ifndef PPAPI_C_DEV_PPB_URL_UTIL_DEV_H_
 #define PPAPI_C_DEV_PPB_URL_UTIL_DEV_H_
@@ -77,7 +77,7 @@ PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_URLComponents_Dev, 64);
  * except for the reference fragment (stuff after the '#') which will be
  * encoded as UTF-8.
  */
-struct PPB_URLUtil_Dev {
+struct PPB_URLUtil_Dev_0_6 {
   /*
    * Canonicalizes the given URL string according to the rules of the host
    * browser. If the URL is invalid or the var is not a string, this will
@@ -164,6 +164,8 @@ struct PPB_URLUtil_Dev {
       PP_Instance instance,
       struct PP_URLComponents_Dev* components);
 };
+
+typedef struct PPB_URLUtil_Dev_0_6 PPB_URLUtil_Dev;
 /**
  * @}
  */
diff --git a/ppapi/c/dev/ppb_var_array_buffer_dev.h b/ppapi/c/dev/ppb_var_array_buffer_dev.h
index 49d9e6a..e4daf90 100644
--- a/ppapi/c/dev/ppb_var_array_buffer_dev.h
+++ b/ppapi/c/dev/ppb_var_array_buffer_dev.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From dev/ppb_var_array_buffer_dev.idl modified Fri Dec  2 16:17:08 2011. */
+/* From dev/ppb_var_array_buffer_dev.idl modified Wed Dec 14 18:08:00 2011. */
 
 #ifndef PPAPI_C_DEV_PPB_VAR_ARRAY_BUFFER_DEV_H_
 #define PPAPI_C_DEV_PPB_VAR_ARRAY_BUFFER_DEV_H_
@@ -34,7 +34,7 @@
  * these Vars are not part of the embedding page's DOM, and can only be shared
  * with JavaScript via pp::Instance's PostMessage and HandleMessage functions.
  */
-struct PPB_VarArrayBuffer_Dev {
+struct PPB_VarArrayBuffer_Dev_0_1 {
   /**
    * Create a zero-initialized VarArrayBuffer.
    *
@@ -59,6 +59,8 @@ struct PPB_VarArrayBuffer_Dev {
    */
   void* (*Map)(struct PP_Var array);
 };
+
+typedef struct PPB_VarArrayBuffer_Dev_0_1 PPB_VarArrayBuffer_Dev;
 /**
  * @}
  */
diff --git a/ppapi/c/dev/ppb_video_capture_dev.h b/ppapi/c/dev/ppb_video_capture_dev.h
index 6c3beb3..396879c 100644
--- a/ppapi/c/dev/ppb_video_capture_dev.h
+++ b/ppapi/c/dev/ppb_video_capture_dev.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From dev/ppb_video_capture_dev.idl modified Wed Oct  5 09:11:07 2011. */
+/* From dev/ppb_video_capture_dev.idl modified Tue Oct 11 10:01:39 2011. */
 
 #ifndef PPAPI_C_DEV_PPB_VIDEO_CAPTURE_DEV_H_
 #define PPAPI_C_DEV_PPB_VIDEO_CAPTURE_DEV_H_
@@ -53,7 +53,7 @@
  * 4:2:0, one byte per pixel, tightly packed (width x height Y values, then
  * width/2 x height/2 U values, then width/2 x height/2 V values).
  */
-struct PPB_VideoCapture_Dev {
+struct PPB_VideoCapture_Dev_0_1 {
   /**
    * Creates a new VideoCapture.
    */
@@ -97,6 +97,8 @@ struct PPB_VideoCapture_Dev {
    */
   int32_t (*StopCapture)(PP_Resource video_capture);
 };
+
+typedef struct PPB_VideoCapture_Dev_0_1 PPB_VideoCapture_Dev;
 /**
  * @}
  */
diff --git a/ppapi/c/dev/ppb_video_decoder_dev.h b/ppapi/c/dev/ppb_video_decoder_dev.h
index 6e16bb3..fa57fd4 100644
--- a/ppapi/c/dev/ppb_video_decoder_dev.h
+++ b/ppapi/c/dev/ppb_video_decoder_dev.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From dev/ppb_video_decoder_dev.idl modified Tue Nov 29 11:27:39 2011. */
+/* From dev/ppb_video_decoder_dev.idl modified Wed Dec 14 18:08:00 2011. */
 
 #ifndef PPAPI_C_DEV_PPB_VIDEO_DECODER_DEV_H_
 #define PPAPI_C_DEV_PPB_VIDEO_DECODER_DEV_H_
@@ -49,7 +49,7 @@
  * See PPP_VideoDecoder_Dev for the notifications the decoder may send the
  * plugin.
  */
-struct PPB_VideoDecoder_Dev {
+struct PPB_VideoDecoder_Dev_0_16 {
   /**
    * Creates & initializes a video decoder.
    *
@@ -157,6 +157,8 @@ struct PPB_VideoDecoder_Dev {
    */
   void (*Destroy)(PP_Resource video_decoder);
 };
+
+typedef struct PPB_VideoDecoder_Dev_0_16 PPB_VideoDecoder_Dev;
 /**
  * @}
  */
diff --git a/ppapi/c/dev/ppb_video_layer_dev.h b/ppapi/c/dev/ppb_video_layer_dev.h
index b78ea7e..54798a3 100644
--- a/ppapi/c/dev/ppb_video_layer_dev.h
+++ b/ppapi/c/dev/ppb_video_layer_dev.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From dev/ppb_video_layer_dev.idl modified Tue Nov 29 11:43:36 2011. */
+/* From dev/ppb_video_layer_dev.idl modified Wed Dec 14 18:08:00 2011. */
 
 #ifndef PPAPI_C_DEV_PPB_VIDEO_LAYER_DEV_H_
 #define PPAPI_C_DEV_PPB_VIDEO_LAYER_DEV_H_
@@ -83,7 +83,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_VideoLayerMode_Dev, 4);
  * In this mode the content of the video layer is updated by a hardware video
  * decoder.
  */
-struct PPB_VideoLayer_Dev {
+struct PPB_VideoLayer_Dev_0_1 {
   /**
    * Creates a video layer.
    */
@@ -153,6 +153,8 @@ struct PPB_VideoLayer_Dev {
                            uint32_t no_of_planes,
                            const void* planes[]);
 };
+
+typedef struct PPB_VideoLayer_Dev_0_1 PPB_VideoLayer_Dev;
 /**
  * @}
  */
diff --git a/ppapi/c/dev/ppb_websocket_dev.h b/ppapi/c/dev/ppb_websocket_dev.h
index 34bad3b..8cb9ebb 100644
--- a/ppapi/c/dev/ppb_websocket_dev.h
+++ b/ppapi/c/dev/ppb_websocket_dev.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From dev/ppb_websocket_dev.idl modified Fri Dec 16 14:25:06 2011. */
+/* From dev/ppb_websocket_dev.idl modified Mon Dec 19 19:44:12 2011. */
 
 #ifndef PPAPI_C_DEV_PPB_WEBSOCKET_DEV_H_
 #define PPAPI_C_DEV_PPB_WEBSOCKET_DEV_H_
@@ -84,7 +84,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_WebSocketMessageType_Dev, 4);
  * @addtogroup Interfaces
  * @{
  */
-struct PPB_WebSocket_Dev {
+struct PPB_WebSocket_Dev_0_1 {
   /**
    * Create() creates a WebSocket instance.
    *
@@ -322,6 +322,8 @@ struct PPB_WebSocket_Dev {
    */
   struct PP_Var (*GetURL)(PP_Resource web_socket);
 };
+
+typedef struct PPB_WebSocket_Dev_0_1 PPB_WebSocket_Dev;
 /**
  * @}
  */
diff --git a/ppapi/c/dev/ppb_widget_dev.h b/ppapi/c/dev/ppb_widget_dev.h
index 003bace..3c72934 100644
--- a/ppapi/c/dev/ppb_widget_dev.h
+++ b/ppapi/c/dev/ppb_widget_dev.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From dev/ppb_widget_dev.idl modified Fri Aug 26 15:18:14 2011. */
+/* From dev/ppb_widget_dev.idl modified Wed Oct  5 14:06:02 2011. */
 
 #ifndef PPAPI_C_DEV_PPB_WIDGET_DEV_H_
 #define PPAPI_C_DEV_PPB_WIDGET_DEV_H_
@@ -32,7 +32,7 @@
 /**
  * The interface for reusing browser widgets.
  */
-struct PPB_Widget_Dev {
+struct PPB_Widget_Dev_0_3 {
   /**
    * Returns PP_TRUE if the given resource is a Widget. Returns PP_FALSE if the
    * resource is invalid or some type other than an Widget.
@@ -59,6 +59,8 @@ struct PPB_Widget_Dev {
    */
   void (*SetLocation)(PP_Resource widget, const struct PP_Rect* location);
 };
+
+typedef struct PPB_Widget_Dev_0_3 PPB_Widget_Dev;
 /**
  * @}
  */
diff --git a/ppapi/c/dev/ppb_zoom_dev.h b/ppapi/c/dev/ppb_zoom_dev.h
index 299e7e7..f80ec12 100644
--- a/ppapi/c/dev/ppb_zoom_dev.h
+++ b/ppapi/c/dev/ppb_zoom_dev.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From dev/ppb_zoom_dev.idl modified Fri Aug 26 15:06:04 2011. */
+/* From dev/ppb_zoom_dev.idl modified Wed Oct  5 14:06:02 2011. */
 
 #ifndef PPAPI_C_DEV_PPB_ZOOM_DEV_H_
 #define PPAPI_C_DEV_PPB_ZOOM_DEV_H_
@@ -28,7 +28,7 @@
 /**
  * Zoom interface should only apply to those full-page "plugin-document".
  */
-struct PPB_Zoom_Dev {
+struct PPB_Zoom_Dev_0_2 {
   /**
    * Informs the browser about the new zoom factor for the plugin (see
    * ppp_zoom_dev.h for a description of zoom factor). The plugin should only
@@ -44,6 +44,8 @@ struct PPB_Zoom_Dev {
                             double minimum_factor,
                             double maximium_factor);
 };
+
+typedef struct PPB_Zoom_Dev_0_2 PPB_Zoom_Dev;
 /**
  * @}
  */
diff --git a/ppapi/c/dev/ppp_printing_dev.h b/ppapi/c/dev/ppp_printing_dev.h
index d709b67..2e198a3 100644
--- a/ppapi/c/dev/ppp_printing_dev.h
+++ b/ppapi/c/dev/ppp_printing_dev.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From dev/ppp_printing_dev.idl modified Thu Nov 17 13:26:05 2011. */
+/* From dev/ppp_printing_dev.idl modified Fri Nov 18 15:58:00 2011. */
 
 #ifndef PPAPI_C_DEV_PPP_PRINTING_DEV_H_
 #define PPAPI_C_DEV_PPP_PRINTING_DEV_H_
@@ -80,7 +80,7 @@ PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_PrintPageNumberRange_Dev, 8);
  * @addtogroup Interfaces
  * @{
  */
-struct PPP_Printing_Dev {
+struct PPP_Printing_Dev_0_5 {
   /**
    *  Returns a bit field representing the supported print output formats.  For
    *  example, if only Raster and PostScript are supported,
@@ -115,6 +115,8 @@ struct PPP_Printing_Dev {
    */
   PP_Bool (*IsScalingDisabled)(PP_Instance instance);
 };
+
+typedef struct PPP_Printing_Dev_0_5 PPP_Printing_Dev;
 /**
  * @}
  */
diff --git a/ppapi/c/dev/ppp_video_decoder_dev.h b/ppapi/c/dev/ppp_video_decoder_dev.h
index e3d1d41..8ad59f0 100644
--- a/ppapi/c/dev/ppp_video_decoder_dev.h
+++ b/ppapi/c/dev/ppp_video_decoder_dev.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From dev/ppp_video_decoder_dev.idl modified Wed Oct  5 15:59:17 2011. */
+/* From dev/ppp_video_decoder_dev.idl modified Tue Oct 11 10:01:39 2011. */
 
 #ifndef PPAPI_C_DEV_PPP_VIDEO_DECODER_DEV_H_
 #define PPAPI_C_DEV_PPP_VIDEO_DECODER_DEV_H_
@@ -35,7 +35,7 @@
  *
  * See PPB_VideoDecoder_Dev for general usage tips.
  */
-struct PPP_VideoDecoder_Dev {
+struct PPP_VideoDecoder_Dev_0_9 {
   /**
    * Callback function to provide buffers for the decoded output pictures. If
    * succeeds plugin must provide buffers through AssignPictureBuffers function
@@ -102,6 +102,8 @@ struct PPP_VideoDecoder_Dev {
                       PP_Resource decoder,
                       PP_VideoDecodeError_Dev error);
 };
+
+typedef struct PPP_VideoDecoder_Dev_0_9 PPP_VideoDecoder_Dev;
 /**
  * @}
  */
diff --git a/ppapi/c/dev/ppp_widget_dev.h b/ppapi/c/dev/ppp_widget_dev.h
index d1fd778..883bc1e 100644
--- a/ppapi/c/dev/ppp_widget_dev.h
+++ b/ppapi/c/dev/ppp_widget_dev.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From dev/ppp_widget_dev.idl modified Fri Aug 26 17:59:12 2011. */
+/* From dev/ppp_widget_dev.idl modified Wed Oct  5 14:06:02 2011. */
 
 #ifndef PPAPI_C_DEV_PPP_WIDGET_DEV_H_
 #define PPAPI_C_DEV_PPP_WIDGET_DEV_H_
@@ -32,7 +32,7 @@
 /**
  * The interface for reusing browser widgets.
  */
-struct PPP_Widget_Dev {
+struct PPP_Widget_Dev_0_2 {
   /**
    * Informs the instance that the given rectangle needs to be repainted.
    */
@@ -40,6 +40,8 @@ struct PPP_Widget_Dev {
                      PP_Resource widget,
                      const struct PP_Rect* dirty_rect);
 };
+
+typedef struct PPP_Widget_Dev_0_2 PPP_Widget_Dev;
 /**
  * @}
  */
diff --git a/ppapi/c/dev/ppp_zoom_dev.h b/ppapi/c/dev/ppp_zoom_dev.h
index fabf2a6..d70fcdd 100644
--- a/ppapi/c/dev/ppp_zoom_dev.h
+++ b/ppapi/c/dev/ppp_zoom_dev.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From dev/ppp_zoom_dev.idl modified Fri Aug 26 15:42:06 2011. */
+/* From dev/ppp_zoom_dev.idl modified Wed Oct  5 14:06:02 2011. */
 
 #ifndef PPAPI_C_DEV_PPP_ZOOM_DEV_H_
 #define PPAPI_C_DEV_PPP_ZOOM_DEV_H_
@@ -29,7 +29,7 @@
 /**
  * Zoom interface should only apply to those full-page "plugin-document".
  */
-struct PPP_Zoom_Dev {
+struct PPP_Zoom_Dev_0_3 {
   /**
    * Instruct plug-in to zoom according to the given factor and whether the zoom
    * only applies to text only.  The scale factor is the percentage divided by
@@ -37,6 +37,8 @@ struct PPP_Zoom_Dev {
    */
   void (*Zoom)(PP_Instance instance, double factor, PP_Bool text_only);
 };
+
+typedef struct PPP_Zoom_Dev_0_3 PPP_Zoom_Dev;
 /**
  * @}
  */
diff --git a/ppapi/c/pp_completion_callback.h b/ppapi/c/pp_completion_callback.h
index d91d75d..911302f 100644
--- a/ppapi/c/pp_completion_callback.h
+++ b/ppapi/c/pp_completion_callback.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From pp_completion_callback.idl modified Thu Aug 11 14:45:09 2011. */
+/* From pp_completion_callback.idl modified Wed Oct  5 14:06:02 2011. */
 
 #ifndef PPAPI_C_PP_COMPLETION_CALLBACK_H_
 #define PPAPI_C_PP_COMPLETION_CALLBACK_H_
diff --git a/ppapi/c/pp_file_info.h b/ppapi/c/pp_file_info.h
index 0b8353d..2f0261b 100644
--- a/ppapi/c/pp_file_info.h
+++ b/ppapi/c/pp_file_info.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From pp_file_info.idl modified Fri Nov 11 19:56:09 2011. */
+/* From pp_file_info.idl modified Mon Nov 14 10:36:01 2011. */
 
 #ifndef PPAPI_C_PP_FILE_INFO_H_
 #define PPAPI_C_PP_FILE_INFO_H_
diff --git a/ppapi/c/pp_input_event.h b/ppapi/c/pp_input_event.h
index 351560a..ce81b90 100644
--- a/ppapi/c/pp_input_event.h
+++ b/ppapi/c/pp_input_event.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From pp_input_event.idl modified Thu Aug 11 14:47:50 2011. */
+/* From pp_input_event.idl modified Wed Oct  5 14:06:02 2011. */
 
 #ifndef PPAPI_C_PP_INPUT_EVENT_H_
 #define PPAPI_C_PP_INPUT_EVENT_H_
diff --git a/ppapi/c/pp_point.h b/ppapi/c/pp_point.h
index b0380f2..39dcda9 100644
--- a/ppapi/c/pp_point.h
+++ b/ppapi/c/pp_point.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From pp_point.idl modified Wed Aug 10 14:06:40 2011. */
+/* From pp_point.idl modified Wed Oct  5 14:06:02 2011. */
 
 #ifndef PPAPI_C_PP_POINT_H_
 #define PPAPI_C_PP_POINT_H_
diff --git a/ppapi/c/pp_rect.h b/ppapi/c/pp_rect.h
index 7aa42c1..38825c3 100644
--- a/ppapi/c/pp_rect.h
+++ b/ppapi/c/pp_rect.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From pp_rect.idl modified Sat Jul 16 16:50:26 2011. */
+/* From pp_rect.idl modified Wed Oct  5 14:06:02 2011. */
 
 #ifndef PPAPI_C_PP_RECT_H_
 #define PPAPI_C_PP_RECT_H_
diff --git a/ppapi/c/pp_size.h b/ppapi/c/pp_size.h
index a1d2a01..117369c 100644
--- a/ppapi/c/pp_size.h
+++ b/ppapi/c/pp_size.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From pp_size.idl modified Sat Jul 16 16:50:26 2011. */
+/* From pp_size.idl modified Wed Oct  5 14:06:02 2011. */
 
 #ifndef PPAPI_C_PP_SIZE_H_
 #define PPAPI_C_PP_SIZE_H_
diff --git a/ppapi/c/pp_var.h b/ppapi/c/pp_var.h
index 2b388f6..d67b9b6 100644
--- a/ppapi/c/pp_var.h
+++ b/ppapi/c/pp_var.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From pp_var.idl modified Fri Dec  2 16:45:08 2011. */
+/* From pp_var.idl modified Wed Dec 14 18:08:00 2011. */
 
 #ifndef PPAPI_C_PP_VAR_H_
 #define PPAPI_C_PP_VAR_H_
diff --git a/ppapi/c/ppb_audio.h b/ppapi/c/ppb_audio.h
index 237687b..2600d9e 100644
--- a/ppapi/c/ppb_audio.h
+++ b/ppapi/c/ppb_audio.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From ppb_audio.idl modified Mon Aug 29 10:11:34 2011. */
+/* From ppb_audio.idl modified Wed Oct  5 14:06:02 2011. */
 
 #ifndef PPAPI_C_PPB_AUDIO_H_
 #define PPAPI_C_PPB_AUDIO_H_
@@ -78,7 +78,7 @@ typedef void (*PPB_Audio_Callback)(void* sample_buffer,
  * ...audio_callback() will now be periodically invoked on a separate thread...
  * </code>
  */
-struct PPB_Audio {
+struct PPB_Audio_1_0 {
   /**
    * Create() creates an audio resource. No sound will be heard until
    * StartPlayback() is called. The callback is called with the buffer address
@@ -156,6 +156,8 @@ struct PPB_Audio {
    */
   PP_Bool (*StopPlayback)(PP_Resource audio);
 };
+
+typedef struct PPB_Audio_1_0 PPB_Audio;
 /**
  * @}
  */
diff --git a/ppapi/c/ppb_audio_config.h b/ppapi/c/ppb_audio_config.h
index 8c2157a..777eed4 100644
--- a/ppapi/c/ppb_audio_config.h
+++ b/ppapi/c/ppb_audio_config.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From ppb_audio_config.idl modified Mon Aug 29 10:11:34 2011. */
+/* From ppb_audio_config.idl modified Wed Oct  5 14:06:02 2011. */
 
 #ifndef PPAPI_C_PPB_AUDIO_CONFIG_H_
 #define PPAPI_C_PPB_AUDIO_CONFIG_H_
@@ -68,7 +68,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_AudioSampleRate, 4);
  * <a href="/chrome/nativeclient/docs/audio.html">Pepper
  * Audio API</a> for information on using this interface.
  */
-struct PPB_AudioConfig {
+struct PPB_AudioConfig_1_0 {
   /**
    * CreateStereo16bit() creates a 16 bit audio configuration resource. The
    * <code>sample_frame_count</code> should be the result of calling
@@ -168,6 +168,8 @@ struct PPB_AudioConfig {
    */
   uint32_t (*GetSampleFrameCount)(PP_Resource config);
 };
+
+typedef struct PPB_AudioConfig_1_0 PPB_AudioConfig;
 /**
  * @}
  */
diff --git a/ppapi/c/ppb_core.h b/ppapi/c/ppb_core.h
index 0de8485..2bbbcb1 100644
--- a/ppapi/c/ppb_core.h
+++ b/ppapi/c/ppb_core.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From ppb_core.idl modified Tue Aug 23 11:13:37 2011. */
+/* From ppb_core.idl modified Wed Oct  5 14:06:02 2011. */
 
 #ifndef PPAPI_C_PPB_CORE_H_
 #define PPAPI_C_PPB_CORE_H_
@@ -35,7 +35,7 @@
  * to memory management, time, and threads on the browser.
  *
  */
-struct PPB_Core {
+struct PPB_Core_1_0 {
   /**
    *
    * AddRefResource() adds a reference to a resource.
@@ -109,6 +109,8 @@ struct PPB_Core {
    */
   PP_Bool (*IsMainThread)();
 };
+
+typedef struct PPB_Core_1_0 PPB_Core;
 /**
  * @}
  */
diff --git a/ppapi/c/ppb_file_io.h b/ppapi/c/ppb_file_io.h
index aa028b1..b67c41e 100644
--- a/ppapi/c/ppb_file_io.h
+++ b/ppapi/c/ppb_file_io.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From ppb_file_io.idl modified Thu Dec  1 10:47:02 2011. */
+/* From ppb_file_io.idl modified Wed Dec 14 18:08:00 2011. */
 
 #ifndef PPAPI_C_PPB_FILE_IO_H_
 #define PPAPI_C_PPB_FILE_IO_H_
@@ -73,7 +73,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_FileOpenFlags, 4);
  * The <code>PPB_FileIO</code> struct is used to operate on a regular file
  * (PP_FileType_Regular).
  */
-struct PPB_FileIO {
+struct PPB_FileIO_1_0 {
   /**
    * Create() creates a new FileIO object.
    *
@@ -253,6 +253,8 @@ struct PPB_FileIO {
    */
   void (*Close)(PP_Resource file_io);
 };
+
+typedef struct PPB_FileIO_1_0 PPB_FileIO;
 /**
  * @}
  */
diff --git a/ppapi/c/ppb_file_ref.h b/ppapi/c/ppb_file_ref.h
index da07f32..d359a7b 100644
--- a/ppapi/c/ppb_file_ref.h
+++ b/ppapi/c/ppb_file_ref.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From ppb_file_ref.idl modified Wed Aug 24 20:52:42 2011. */
+/* From ppb_file_ref.idl modified Wed Oct  5 14:06:02 2011. */
 
 #ifndef PPAPI_C_PPB_FILE_REF_H_
 #define PPAPI_C_PPB_FILE_REF_H_
@@ -36,7 +36,7 @@
  * a file system.  This struct contains a <code>PP_FileSystemType</code>
  * identifier and a file path string.
  */
-struct PPB_FileRef {
+struct PPB_FileRef_1_0 {
   /**
    * Create() creates a weak pointer to a file in the given file system. File
    * paths are POSIX style.
@@ -178,6 +178,8 @@ struct PPB_FileRef {
                     PP_Resource new_file_ref,
                     struct PP_CompletionCallback callback);
 };
+
+typedef struct PPB_FileRef_1_0 PPB_FileRef;
 /**
  * @}
  */
diff --git a/ppapi/c/ppb_file_system.h b/ppapi/c/ppb_file_system.h
index 82beea3..2f2c919 100644
--- a/ppapi/c/ppb_file_system.h
+++ b/ppapi/c/ppb_file_system.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From ppb_file_system.idl modified Mon Aug 29 10:11:34 2011. */
+/* From ppb_file_system.idl modified Wed Oct  5 14:06:02 2011. */
 
 #ifndef PPAPI_C_PPB_FILE_SYSTEM_H_
 #define PPAPI_C_PPB_FILE_SYSTEM_H_
@@ -33,7 +33,7 @@
  * The <code>PPB_FileSystem</code> struct identifies the file system type
  * associated with a file.
  */
-struct PPB_FileSystem {
+struct PPB_FileSystem_1_0 {
   /** Create() creates a file system object of the given type.
    *
    * @param[in] instance A <code>PP_Instance</code> identifying the instance
@@ -87,6 +87,8 @@ struct PPB_FileSystem {
    */
   PP_FileSystemType (*GetType)(PP_Resource file_system);
 };
+
+typedef struct PPB_FileSystem_1_0 PPB_FileSystem;
 /**
  * @}
  */
diff --git a/ppapi/c/ppb_fullscreen.h b/ppapi/c/ppb_fullscreen.h
index 72ff98d..7f22f6b 100644
--- a/ppapi/c/ppb_fullscreen.h
+++ b/ppapi/c/ppb_fullscreen.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From ppb_fullscreen.idl modified Wed Dec 21 11:00:23 2011. */
+/* From ppb_fullscreen.idl modified Wed Dec 21 19:08:34 2011. */
 
 #ifndef PPAPI_C_PPB_FULLSCREEN_H_
 #define PPAPI_C_PPB_FULLSCREEN_H_
@@ -33,7 +33,7 @@
  * This interface provides a way of checking the current screen mode and
  * toggling fullscreen mode.
  */
-struct PPB_Fullscreen {
+struct PPB_Fullscreen_1_0 {
   /**
    * IsFullscreen() checks whether the module instance is currently in
    * fullscreen mode.
@@ -81,6 +81,8 @@ struct PPB_Fullscreen {
    */
   PP_Bool (*GetScreenSize)(PP_Instance instance, struct PP_Size* size);
 };
+
+typedef struct PPB_Fullscreen_1_0 PPB_Fullscreen;
 /**
  * @}
  */
diff --git a/ppapi/c/ppb_graphics_2d.h b/ppapi/c/ppb_graphics_2d.h
index bbacf22..a7b553d 100644
--- a/ppapi/c/ppb_graphics_2d.h
+++ b/ppapi/c/ppb_graphics_2d.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From ppb_graphics_2d.idl modified Wed Aug 24 20:51:38 2011. */
+/* From ppb_graphics_2d.idl modified Wed Oct  5 14:06:02 2011. */
 
 #ifndef PPAPI_C_PPB_GRAPHICS_2D_H_
 #define PPAPI_C_PPB_GRAPHICS_2D_H_
@@ -35,7 +35,7 @@
 /**
  * <code>PPB_Graphics2D</code> defines the interface for a 2D graphics context.
  */
-struct PPB_Graphics2D {
+struct PPB_Graphics2D_1_0 {
   /**
    * Create() creates a 2D graphics context. The returned graphics context will
    * not be bound to the module instance on creation (call BindGraphics() on
@@ -256,6 +256,8 @@ struct PPB_Graphics2D {
   int32_t (*Flush)(PP_Resource graphics_2d,
                    struct PP_CompletionCallback callback);
 };
+
+typedef struct PPB_Graphics2D_1_0 PPB_Graphics2D;
 /**
  * @}
  */
diff --git a/ppapi/c/ppb_graphics_3d.h b/ppapi/c/ppb_graphics_3d.h
index 6415318..9e8ae099 100644
--- a/ppapi/c/ppb_graphics_3d.h
+++ b/ppapi/c/ppb_graphics_3d.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
@@ -32,7 +32,7 @@
 #define PPB_GRAPHICS_3D_INTERFACE_1_0 "PPB_Graphics3D;1.0"
 #define PPB_GRAPHICS_3D_INTERFACE PPB_GRAPHICS_3D_INTERFACE_1_0
 
-struct PPB_Graphics3D {
+struct PPB_Graphics3D_1_0 {
   /**
    * Retrieves the maximum supported value for the given attribute.
    *
@@ -218,4 +218,6 @@ struct PPB_Graphics3D {
                          struct PP_CompletionCallback callback);
 };
 
+typedef struct PPB_Graphics3D_1_0 PPB_Graphics3D;
+
 #endif  /* PPAPI_C_PPB_GRAPHICS_3D_H_ */
diff --git a/ppapi/c/ppb_image_data.h b/ppapi/c/ppb_image_data.h
index 982e29d..3e903b2 100644
--- a/ppapi/c/ppb_image_data.h
+++ b/ppapi/c/ppb_image_data.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From ppb_image_data.idl modified Tue Nov  8 15:46:54 2011. */
+/* From ppb_image_data.idl modified Wed Dec 21 19:08:34 2011. */
 
 #ifndef PPAPI_C_PPB_IMAGE_DATA_H_
 #define PPAPI_C_PPB_IMAGE_DATA_H_
@@ -105,7 +105,7 @@ PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_ImageDataDesc, 16);
  * The <code>PPB_ImageData</code> interface contains pointers to several
  * functions for determining the browser's treatment of image data.
  */
-struct PPB_ImageData {
+struct PPB_ImageData_1_0 {
   /**
    * GetNativeImageDataFormat() returns the browser's preferred format for
    * image data. The browser uses this format internally for painting. Other
@@ -195,6 +195,8 @@ struct PPB_ImageData {
    */
   void (*Unmap)(PP_Resource image_data);
 };
+
+typedef struct PPB_ImageData_1_0 PPB_ImageData;
 /**
  * @}
  */
diff --git a/ppapi/c/ppb_input_event.h b/ppapi/c/ppb_input_event.h
index af6ad1f..7d94861 100644
--- a/ppapi/c/ppb_input_event.h
+++ b/ppapi/c/ppb_input_event.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From ppb_input_event.idl modified Wed Nov  2 09:59:40 2011. */
+/* From ppb_input_event.idl modified Mon Nov 14 10:36:01 2011. */
 
 #ifndef PPAPI_C_PPB_INPUT_EVENT_H_
 #define PPAPI_C_PPB_INPUT_EVENT_H_
@@ -248,7 +248,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_InputEvent_Class, 4);
  * The <code>PPB_InputEvent</code> interface contains pointers to several
  * functions related to generic input events on the browser.
  */
-struct PPB_InputEvent {
+struct PPB_InputEvent_1_0 {
   /**
    * RequestInputEvent() requests that input events corresponding to the given
    * input events are delivered to the instance.
@@ -408,11 +408,13 @@ struct PPB_InputEvent {
   uint32_t (*GetModifiers)(PP_Resource event);
 };
 
+typedef struct PPB_InputEvent_1_0 PPB_InputEvent;
+
 /**
  * The <code>PPB_MouseInputEvent</code> interface contains pointers to several
  * functions related to mouse input events.
  */
-struct PPB_MouseInputEvent {
+struct PPB_MouseInputEvent_1_1 {
   /**
    * Create() creates a mouse input event with the given parameters. Normally
    * you will get a mouse event passed through the
@@ -507,6 +509,8 @@ struct PPB_MouseInputEvent {
   struct PP_Point (*GetMovement)(PP_Resource mouse_event);
 };
 
+typedef struct PPB_MouseInputEvent_1_1 PPB_MouseInputEvent;
+
 struct PPB_MouseInputEvent_1_0 {
   PP_Resource (*Create)(PP_Instance instance,
                         PP_InputEvent_Type type,
@@ -525,7 +529,7 @@ struct PPB_MouseInputEvent_1_0 {
  * The <code>PPB_WheelIputEvent</code> interface contains pointers to several
  * functions related to wheel input events.
  */
-struct PPB_WheelInputEvent {
+struct PPB_WheelInputEvent_1_0 {
   /**
    * Create() creates a wheel input event with the given parameters. Normally
    * you will get a wheel event passed through the
@@ -629,11 +633,13 @@ struct PPB_WheelInputEvent {
   PP_Bool (*GetScrollByPage)(PP_Resource wheel_event);
 };
 
+typedef struct PPB_WheelInputEvent_1_0 PPB_WheelInputEvent;
+
 /**
  * The <code>PPB_KeyboardInputEvent</code> interface contains pointers to
  * several functions related to keyboard input events.
  */
-struct PPB_KeyboardInputEvent {
+struct PPB_KeyboardInputEvent_1_0 {
   /**
    * Creates a keyboard input event with the given parameters. Normally you
    * will get a keyboard event passed through the HandleInputEvent and will not
@@ -698,6 +704,8 @@ struct PPB_KeyboardInputEvent {
    */
   struct PP_Var (*GetCharacterText)(PP_Resource character_event);
 };
+
+typedef struct PPB_KeyboardInputEvent_1_0 PPB_KeyboardInputEvent;
 /**
  * @}
  */
diff --git a/ppapi/c/ppb_instance.h b/ppapi/c/ppb_instance.h
index 6ad4687..4043396 100644
--- a/ppapi/c/ppb_instance.h
+++ b/ppapi/c/ppb_instance.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From ppb_instance.idl modified Tue Aug 23 11:25:50 2011. */
+/* From ppb_instance.idl modified Wed Oct  5 14:06:02 2011. */
 
 #ifndef PPAPI_C_PPB_INSTANCE_H_
 #define PPAPI_C_PPB_INSTANCE_H_
@@ -35,7 +35,7 @@
  * The PPB_Instance interface contains pointers to functions
  * related to the module instance on a web page.
  */
-struct PPB_Instance {
+struct PPB_Instance_1_0 {
   /**
    * BindGraphics() binds the given graphics as the current display surface.
    * The contents of this device is what will be displayed in the instance's
@@ -79,6 +79,8 @@ struct PPB_Instance {
   PP_Bool (*IsFullFrame)(PP_Instance instance);
 };
 
+typedef struct PPB_Instance_1_0 PPB_Instance;
+
 struct PPB_Instance_0_5 {
   struct PP_Var (*GetWindowObject)(PP_Instance instance);
   struct PP_Var (*GetOwnerElementObject)(PP_Instance instance);
diff --git a/ppapi/c/ppb_messaging.h b/ppapi/c/ppb_messaging.h
index f12311c..5393f50 100644
--- a/ppapi/c/ppb_messaging.h
+++ b/ppapi/c/ppb_messaging.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From ppb_messaging.idl modified Mon Aug 29 10:11:34 2011. */
+/* From ppb_messaging.idl modified Wed Oct  5 14:06:02 2011. */
 
 #ifndef PPAPI_C_PPB_MESSAGING_H_
 #define PPAPI_C_PPB_MESSAGING_H_
@@ -34,7 +34,7 @@
  * and is related to sending messages to JavaScript message event listeners on
  * the DOM element associated with specific module instance.
  */
-struct PPB_Messaging {
+struct PPB_Messaging_1_0 {
   /**
    * PostMessage() asynchronously invokes any listeners for message events on
    * the DOM element for the given module instance. A call to PostMessage()
@@ -93,6 +93,8 @@ struct PPB_Messaging {
    */
   void (*PostMessage)(PP_Instance instance, struct PP_Var message);
 };
+
+typedef struct PPB_Messaging_1_0 PPB_Messaging;
 /**
  * @}
  */
diff --git a/ppapi/c/ppb_mouse_lock.h b/ppapi/c/ppb_mouse_lock.h
index b04e7a0..d75325e 100644
--- a/ppapi/c/ppb_mouse_lock.h
+++ b/ppapi/c/ppb_mouse_lock.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From ppb_mouse_lock.idl modified Mon Nov 28 10:59:14 2011. */
+/* From ppb_mouse_lock.idl modified Wed Dec 21 19:08:34 2011. */
 
 #ifndef PPAPI_C_PPB_MOUSE_LOCK_H_
 #define PPAPI_C_PPB_MOUSE_LOCK_H_
@@ -34,7 +34,7 @@
  * useful for certain classes of applications, especially first-person
  * perspective 3D applications and 3D modeling software.
  */
-struct PPB_MouseLock {
+struct PPB_MouseLock_1_0 {
   /**
    * LockMouse() requests the mouse to be locked. The browser will permit mouse
    * lock only while the tab is in fullscreen mode.
@@ -73,6 +73,8 @@ struct PPB_MouseLock {
    */
   void (*UnlockMouse)(PP_Instance instance);
 };
+
+typedef struct PPB_MouseLock_1_0 PPB_MouseLock;
 /**
  * @}
  */
diff --git a/ppapi/c/ppb_url_loader.h b/ppapi/c/ppb_url_loader.h
index 1ee7080..c19cc9d4 100644
--- a/ppapi/c/ppb_url_loader.h
+++ b/ppapi/c/ppb_url_loader.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From ppb_url_loader.idl modified Mon Aug 29 10:11:34 2011. */
+/* From ppb_url_loader.idl modified Wed Oct  5 14:06:02 2011. */
 
 #ifndef PPAPI_C_PPB_URL_LOADER_H_
 #define PPAPI_C_PPB_URL_LOADER_H_
@@ -48,7 +48,7 @@
  * - Then, access the downloaded file using the GetBodyAsFileRef() function of
  * the <code>URLResponseInfo</code> returned in step #4.
  */
-struct PPB_URLLoader {
+struct PPB_URLLoader_1_0 {
   /**
    * Create() creates a new <code>URLLoader</code> object. The
    * <code>URLLoader</code> is associated with a particular instance, so that
@@ -216,6 +216,8 @@ struct PPB_URLLoader {
    */
   void (*Close)(PP_Resource loader);
 };
+
+typedef struct PPB_URLLoader_1_0 PPB_URLLoader;
 /**
  * @}
  */
diff --git a/ppapi/c/ppb_url_request_info.h b/ppapi/c/ppb_url_request_info.h
index d1e9519..fceda5c 100644
--- a/ppapi/c/ppb_url_request_info.h
+++ b/ppapi/c/ppb_url_request_info.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From ppb_url_request_info.idl modified Fri Nov 11 19:53:07 2011. */
+/* From ppb_url_request_info.idl modified Mon Nov 14 10:36:01 2011. */
 
 #ifndef PPAPI_C_PPB_URL_REQUEST_INFO_H_
 #define PPAPI_C_PPB_URL_REQUEST_INFO_H_
@@ -162,7 +162,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_URLRequestProperty, 4);
  * <code>PPB_URLLoader</code>. Refer to <code>PPB_URLLoader</code> for further
  * information.
  */
-struct PPB_URLRequestInfo {
+struct PPB_URLRequestInfo_1_0 {
   /**
    * Create() creates a new <code>URLRequestInfo</code> object.
    *
@@ -247,6 +247,8 @@ struct PPB_URLRequestInfo {
                               int64_t number_of_bytes,
                               PP_Time expected_last_modified_time);
 };
+
+typedef struct PPB_URLRequestInfo_1_0 PPB_URLRequestInfo;
 /**
  * @}
  */
diff --git a/ppapi/c/ppb_url_response_info.h b/ppapi/c/ppb_url_response_info.h
index 399a13c6..5143ed5 100644
--- a/ppapi/c/ppb_url_response_info.h
+++ b/ppapi/c/ppb_url_response_info.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From ppb_url_response_info.idl modified Fri Nov 11 19:54:33 2011. */
+/* From ppb_url_response_info.idl modified Mon Nov 14 10:36:01 2011. */
 
 #ifndef PPAPI_C_PPB_URL_RESPONSE_INFO_H_
 #define PPAPI_C_PPB_URL_RESPONSE_INFO_H_
@@ -96,7 +96,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_URLResponseProperty, 4);
  * examining URL responses. Refer to <code>PPB_URLLoader</code> for further
  * information.
  */
-struct PPB_URLResponseInfo {
+struct PPB_URLResponseInfo_1_0 {
   /**
    * IsURLResponseInfo() determines if a response is a
    * <code>URLResponseInfo</code>.
@@ -139,6 +139,8 @@ struct PPB_URLResponseInfo {
    */
   PP_Resource (*GetBodyAsFileRef)(PP_Resource response);
 };
+
+typedef struct PPB_URLResponseInfo_1_0 PPB_URLResponseInfo;
 /**
  * @}
  */
diff --git a/ppapi/c/ppb_var.h b/ppapi/c/ppb_var.h
index 3e6e481..523622d 100644
--- a/ppapi/c/ppb_var.h
+++ b/ppapi/c/ppb_var.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From ppb_var.idl modified Tue Dec  6 11:26:58 2011. */
+/* From ppb_var.idl modified Wed Dec 14 18:08:00 2011. */
 
 #ifndef PPAPI_C_PPB_VAR_H_
 #define PPAPI_C_PPB_VAR_H_
@@ -31,7 +31,7 @@
 /**
  * PPB_Var API
  */
-struct PPB_Var {
+struct PPB_Var_1_1 {
   /**
    * AddRef() adds a reference to the given var. If this is not a refcounted
    * object, this function will do nothing so you can always call it no matter
@@ -95,6 +95,8 @@ struct PPB_Var {
   const char* (*VarToUtf8)(struct PP_Var var, uint32_t* len);
 };
 
+typedef struct PPB_Var_1_1 PPB_Var;
+
 struct PPB_Var_1_0 {
   void (*AddRef)(struct PP_Var var);
   void (*Release)(struct PP_Var var);
diff --git a/ppapi/c/ppb_view.h b/ppapi/c/ppb_view.h
index 5c7f5db..9ea7a7b 100644
--- a/ppapi/c/ppb_view.h
+++ b/ppapi/c/ppb_view.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From ppb_view.idl modified Thu Dec 15 10:22:28 2011. */
+/* From ppb_view.idl modified Wed Jan  4 04:40:12 2012. */
 
 #ifndef PPAPI_C_PPB_VIEW_H_
 #define PPAPI_C_PPB_VIEW_H_
@@ -37,7 +37,7 @@
  * <code>PPB_View</code> objects so you will receive new view information via
  * <code>PPP_Instance.DidChangeView</code>.
  */
-struct PPB_View {
+struct PPB_View_1_0 {
   /**
    * <code>IsView()</code> determines if the given resource is a valid
    * <code>PPB_View</code> resource. Note that <code>PPB_ViewChanged</code>
@@ -146,6 +146,8 @@ struct PPB_View {
    */
   PP_Bool (*GetClipRect)(PP_Resource resource, struct PP_Rect* clip);
 };
+
+typedef struct PPB_View_1_0 PPB_View;
 /**
  * @}
  */
diff --git a/ppapi/c/ppp_input_event.h b/ppapi/c/ppp_input_event.h
index 4f07106..76c32b2 100644
--- a/ppapi/c/ppp_input_event.h
+++ b/ppapi/c/ppp_input_event.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From ppp_input_event.idl modified Thu Dec 15 12:44:27 2011. */
+/* From ppp_input_event.idl modified Mon Dec 19 19:44:12 2011. */
 
 #ifndef PPAPI_C_PPP_INPUT_EVENT_H_
 #define PPAPI_C_PPP_INPUT_EVENT_H_
@@ -27,7 +27,7 @@
  * @addtogroup Interfaces
  * @{
  */
-struct PPP_InputEvent {
+struct PPP_InputEvent_0_1 {
   /**
    * Function for receiving input events from the browser.
    *
@@ -74,6 +74,8 @@ struct PPP_InputEvent {
    */
   PP_Bool (*HandleInputEvent)(PP_Instance instance, PP_Resource input_event);
 };
+
+typedef struct PPP_InputEvent_0_1 PPP_InputEvent;
 /**
  * @}
  */
diff --git a/ppapi/c/ppp_instance.h b/ppapi/c/ppp_instance.h
index 64766e6..61af440 100644
--- a/ppapi/c/ppp_instance.h
+++ b/ppapi/c/ppp_instance.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From ppp_instance.idl modified Thu Dec 15 10:30:21 2011. */
+/* From ppp_instance.idl modified Wed Jan  4 06:11:56 2012. */
 
 #ifndef PPAPI_C_PPP_INSTANCE_H_
 #define PPAPI_C_PPP_INSTANCE_H_
@@ -39,7 +39,7 @@
  * to handle events such as change of focus or input events (keyboard/mouse)
  * events.
  */
-struct PPP_Instance {
+struct PPP_Instance_1_1 {
   /**
    * DidCreate() is a creation handler that is called when a new instance is
    * created. This function is called for each instantiation on the page,
@@ -166,6 +166,8 @@ struct PPP_Instance {
   PP_Bool (*HandleDocumentLoad)(PP_Instance instance, PP_Resource url_loader);
 };
 
+typedef struct PPP_Instance_1_1 PPP_Instance;
+
 struct PPP_Instance_1_0 {
   PP_Bool (*DidCreate)(PP_Instance instance,
                        uint32_t argc,
@@ -182,8 +184,5 @@ struct PPP_Instance_1_0 {
  * @}
  */
 
-
-typedef struct PPP_Instance PPP_Instance_1_1;
-
 #endif  /* PPAPI_C_PPP_INSTANCE_H_ */
 
diff --git a/ppapi/c/ppp_messaging.h b/ppapi/c/ppp_messaging.h
index 58f46e7..85ed658 100644
--- a/ppapi/c/ppp_messaging.h
+++ b/ppapi/c/ppp_messaging.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From ppp_messaging.idl modified Mon Aug 29 10:11:34 2011. */
+/* From ppp_messaging.idl modified Wed Oct  5 14:06:02 2011. */
 
 #ifndef PPAPI_C_PPP_MESSAGING_H_
 #define PPAPI_C_PPP_MESSAGING_H_
@@ -35,7 +35,7 @@
  * that you must implement to handle postMessage events on the associated
  * DOM element.
  */
-struct PPP_Messaging {
+struct PPP_Messaging_1_0 {
   /**
    * HandleMessage() is a function that the browser calls when PostMessage()
    * is invoked on the DOM element for the module instance in JavaScript. Note
@@ -70,6 +70,8 @@ struct PPP_Messaging {
    */
   void (*HandleMessage)(PP_Instance instance, struct PP_Var message);
 };
+
+typedef struct PPP_Messaging_1_0 PPP_Messaging;
 /**
  * @}
  */
diff --git a/ppapi/c/ppp_mouse_lock.h b/ppapi/c/ppp_mouse_lock.h
index 376835a..4c9b2f2 100644
--- a/ppapi/c/ppp_mouse_lock.h
+++ b/ppapi/c/ppp_mouse_lock.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From ppp_mouse_lock.idl modified Wed Nov  9 12:07:33 2011. */
+/* From ppp_mouse_lock.idl modified Wed Dec 21 19:08:34 2011. */
 
 #ifndef PPAPI_C_PPP_MOUSE_LOCK_H_
 #define PPAPI_C_PPP_MOUSE_LOCK_H_
@@ -31,7 +31,7 @@
  * The <code>PPP_MouseLock</code> interface contains a function that you must
  * implement to receive mouse lock events from the browser.
  */
-struct PPP_MouseLock {
+struct PPP_MouseLock_1_0 {
   /**
    * MouseLockLost() is called when the instance loses the mouse lock, such as
    * when the user presses the ESC key.
@@ -41,6 +41,8 @@ struct PPP_MouseLock {
    */
   void (*MouseLockLost)(PP_Instance instance);
 };
+
+typedef struct PPP_MouseLock_1_0 PPP_MouseLock;
 /**
  * @}
  */
diff --git a/ppapi/c/private/ppb_file_ref_private.h b/ppapi/c/private/ppb_file_ref_private.h
index 43c1cfe..3f5c463 100644
--- a/ppapi/c/private/ppb_file_ref_private.h
+++ b/ppapi/c/private/ppb_file_ref_private.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From private/ppb_file_ref_private.idl modified Mon Dec 12 14:04:17 2011. */
+/* From private/ppb_file_ref_private.idl modified Fri Dec 16 17:34:59 2011. */
 
 #ifndef PPAPI_C_PRIVATE_PPB_FILE_REF_PRIVATE_H_
 #define PPAPI_C_PRIVATE_PPB_FILE_REF_PRIVATE_H_
@@ -27,7 +27,7 @@
  * @{
  */
 /* PPB_FileRefPrivate interface */
-struct PPB_FileRefPrivate {
+struct PPB_FileRefPrivate_0_1 {
   /**
    * GetAbsolutePath() returns the absolute path of the file.
    *
@@ -38,6 +38,8 @@ struct PPB_FileRefPrivate {
    */
   struct PP_Var (*GetAbsolutePath)(PP_Resource file_ref);
 };
+
+typedef struct PPB_FileRefPrivate_0_1 PPB_FileRefPrivate;
 /**
  * @}
  */
diff --git a/ppapi/c/private/ppb_flash.h b/ppapi/c/private/ppb_flash.h
index d63b791..d638694 100644
--- a/ppapi/c/private/ppb_flash.h
+++ b/ppapi/c/private/ppb_flash.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From private/ppb_flash.idl modified Thu Dec 15 10:30:29 2011. */
+/* From private/ppb_flash.idl modified Mon Dec 19 19:43:03 2011. */
 
 #ifndef PPAPI_C_PRIVATE_PPB_FLASH_H_
 #define PPAPI_C_PRIVATE_PPB_FLASH_H_
@@ -38,7 +38,7 @@
  * The <code>PPB_Flash</code> interface contains pointers to various functions
  * that are only needed to support Pepper Flash.
  */
-struct PPB_Flash {
+struct PPB_Flash_12_0 {
   /**
    * Sets or clears the rendering hint that the given plugin instance is always
    * on top of page content. Somewhat more optimized painting can be used in
@@ -108,6 +108,8 @@ struct PPB_Flash {
    */
   void (*PreloadFontWin)(const void* logfontw);
 };
+
+typedef struct PPB_Flash_12_0 PPB_Flash;
 /**
  * @}
  */
diff --git a/ppapi/c/private/ppb_flash_clipboard.h b/ppapi/c/private/ppb_flash_clipboard.h
index c328525..7b84a27 100644
--- a/ppapi/c/private/ppb_flash_clipboard.h
+++ b/ppapi/c/private/ppb_flash_clipboard.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From private/ppb_flash_clipboard.idl modified Wed Nov 23 12:39:42 2011. */
+/* From private/ppb_flash_clipboard.idl modified Wed Dec 14 18:08:00 2011. */
 
 #ifndef PPAPI_C_PRIVATE_PPB_FLASH_CLIPBOARD_H_
 #define PPAPI_C_PRIVATE_PPB_FLASH_CLIPBOARD_H_
@@ -72,7 +72,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_Flash_Clipboard_Format, 4);
  *
  * TODO(viettrungluu): Support more formats (e.g., HTML)....
  */
-struct PPB_Flash_Clipboard {
+struct PPB_Flash_Clipboard_3_0 {
   /**
    * Checks whether a given data format is available from the given clipboard.
    * Returns true if the given format is available from the given clipboard.
@@ -94,6 +94,8 @@ struct PPB_Flash_Clipboard {
                             PP_Flash_Clipboard_Type clipboard_type,
                             struct PP_Var text);
 };
+
+typedef struct PPB_Flash_Clipboard_3_0 PPB_Flash_Clipboard;
 /**
  * @}
  */
diff --git a/ppapi/c/private/ppb_flash_fullscreen.h b/ppapi/c/private/ppb_flash_fullscreen.h
index 6f84af8..b21a731 100644
--- a/ppapi/c/private/ppb_flash_fullscreen.h
+++ b/ppapi/c/private/ppb_flash_fullscreen.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From private/ppb_flash_fullscreen.idl modified Tue Nov 29 11:39:26 2011. */
+/* From private/ppb_flash_fullscreen.idl modified Wed Dec 14 18:08:00 2011. */
 
 #ifndef PPAPI_C_PRIVATE_PPB_FLASH_FULLSCREEN_H_
 #define PPAPI_C_PRIVATE_PPB_FLASH_FULLSCREEN_H_
@@ -27,7 +27,7 @@
  * @addtogroup Interfaces
  * @{
  */
-struct PPB_FlashFullscreen {
+struct PPB_FlashFullscreen_0_1 {
   /**
    * Checks whether the plugin instance is currently in fullscreen mode.
    */
@@ -54,6 +54,8 @@ struct PPB_FlashFullscreen {
    */
   PP_Bool (*GetScreenSize)(PP_Instance instance, struct PP_Size* size);
 };
+
+typedef struct PPB_FlashFullscreen_0_1 PPB_FlashFullscreen;
 /**
  * @}
  */
diff --git a/ppapi/c/private/ppb_flash_menu.h b/ppapi/c/private/ppb_flash_menu.h
index d7cbf4d..fbdaa12 100644
--- a/ppapi/c/private/ppb_flash_menu.h
+++ b/ppapi/c/private/ppb_flash_menu.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -10,7 +10,8 @@
 #include "ppapi/c/pp_point.h"
 #include "ppapi/c/pp_resource.h"
 
-#define PPB_FLASH_MENU_INTERFACE "PPB_Flash_Menu;0.2"
+#define PPB_FLASH_MENU_INTERFACE_0_2 "PPB_Flash_Menu;0.2"
+#define PPB_FLASH_MENU_INTERFACE PPB_FLASH_MENU_INTERFACE_0_2
 
 struct PP_CompletionCallback;
 
@@ -37,7 +38,7 @@ struct PP_Flash_Menu {
   struct PP_Flash_MenuItem* items;
 };
 
-struct PPB_Flash_Menu {
+struct PPB_Flash_Menu_0_2 {
   PP_Resource (*Create)(PP_Instance instance_id,
                         const struct PP_Flash_Menu* menu_data);
   PP_Bool (*IsFlashMenu)(PP_Resource resource_id);
@@ -52,4 +53,6 @@ struct PPB_Flash_Menu {
                   struct PP_CompletionCallback callback);
 };
 
+typedef struct PPB_Flash_Menu_0_2 PPB_Flash_Menu;
+
 #endif  // PPAPI_C_PRIVATE_PPB_FLASH_MENU_H_
diff --git a/ppapi/c/private/ppb_flash_net_connector.h b/ppapi/c/private/ppb_flash_net_connector.h
index 675f5be..012acc1 100644
--- a/ppapi/c/private/ppb_flash_net_connector.h
+++ b/ppapi/c/private/ppb_flash_net_connector.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -15,7 +15,7 @@
 
 #define PPB_FLASH_NETCONNECTOR_INTERFACE "PPB_Flash_NetConnector;0.2"
 
-struct PPB_Flash_NetConnector {
+struct PPB_Flash_NetConnector_0_2 {
   PP_Resource (*Create)(PP_Instance instance_id);
   PP_Bool (*IsFlashNetConnector)(PP_Resource resource_id);
 
@@ -40,4 +40,6 @@ struct PPB_Flash_NetConnector {
                                struct PP_CompletionCallback callback);
 };
 
+typedef struct PPB_Flash_NetConnector_0_2 PPB_Flash_NetConnector;
+
 #endif  // PPAPI_C_PRIVATE_PPB_FLASH_NET_CONNECTOR_H_
diff --git a/ppapi/c/private/ppb_flash_tcp_socket.h b/ppapi/c/private/ppb_flash_tcp_socket.h
index 2a6bc19..ee1d620 100644
--- a/ppapi/c/private/ppb_flash_tcp_socket.h
+++ b/ppapi/c/private/ppb_flash_tcp_socket.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From private/ppb_flash_tcp_socket.idl modified Wed Nov  9 12:53:35 2011. */
+/* From private/ppb_flash_tcp_socket.idl modified Thu Nov 10 10:21:43 2011. */
 
 #ifndef PPAPI_C_PRIVATE_PPB_FLASH_TCP_SOCKET_H_
 #define PPAPI_C_PRIVATE_PPB_FLASH_TCP_SOCKET_H_
@@ -33,7 +33,7 @@
  * The <code>PPB_Flash_TCPSocket</code> interface provides TCP socket
  * operations.
  */
-struct PPB_Flash_TCPSocket {
+struct PPB_Flash_TCPSocket_0_2 {
   /**
    * Allocates a TCP socket resource.
    */
@@ -121,6 +121,8 @@ struct PPB_Flash_TCPSocket {
    */
   void (*Disconnect)(PP_Resource tcp_socket);
 };
+
+typedef struct PPB_Flash_TCPSocket_0_2 PPB_Flash_TCPSocket;
 /**
  * @}
  */
diff --git a/ppapi/c/private/ppb_flash_udp_socket.h b/ppapi/c/private/ppb_flash_udp_socket.h
index 504e1b6..b6d0415 100644
--- a/ppapi/c/private/ppb_flash_udp_socket.h
+++ b/ppapi/c/private/ppb_flash_udp_socket.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From private/ppb_flash_udp_socket.idl modified Wed Nov  9 12:53:35 2011. */
+/* From private/ppb_flash_udp_socket.idl modified Thu Nov 10 10:21:43 2011. */
 
 #ifndef PPAPI_C_PRIVATE_PPB_FLASH_UDP_SOCKET_H_
 #define PPAPI_C_PRIVATE_PPB_FLASH_UDP_SOCKET_H_
@@ -29,7 +29,7 @@
  * @addtogroup Interfaces
  * @{
  */
-struct PPB_Flash_UDPSocket {
+struct PPB_Flash_UDPSocket_0_1 {
   /**
    * Creates a UDP socket resource.
    */
@@ -68,6 +68,8 @@ struct PPB_Flash_UDPSocket {
   /* Cancels all pending reads and writes, and closes the socket. */
   void (*Close)(PP_Resource udp_socket);
 };
+
+typedef struct PPB_Flash_UDPSocket_0_1 PPB_Flash_UDPSocket;
 /**
  * @}
  */
diff --git a/ppapi/c/private/ppb_instance_private.h b/ppapi/c/private/ppb_instance_private.h
index 730d909..c3b319db 100644
--- a/ppapi/c/private/ppb_instance_private.h
+++ b/ppapi/c/private/ppb_instance_private.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
@@ -8,7 +8,8 @@
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_var.h"
 
-#define PPB_INSTANCE_PRIVATE_INTERFACE "PPB_Instance_Private;0.1"
+#define PPB_INSTANCE_PRIVATE_INTERFACE_0_1 "PPB_Instance_Private;0.1"
+#define PPB_INSTANCE_PRIVATE_INTERFACE PPB_INSTANCE_PRIVATE_INTERFACE_0_1
 
 /**
  * @file
@@ -25,7 +26,7 @@
  * trusted plugin instances.
  *
  */
-struct PPB_Instance_Private {
+struct PPB_Instance_Private_0_1 {
   /**
    * GetWindowObject is a pointer to a function that determines
    * the DOM window containing this module instance.
@@ -66,9 +67,10 @@ struct PPB_Instance_Private {
                                  struct PP_Var script,
                                  struct PP_Var* exception);
 };
+
+typedef struct PPB_Instance_Private_0_1 PPB_Instance_Private;
 /**
  * @}
  */
 
 #endif  /* PPAPI_C_PRIVATE_PPB_INSTANCE_PRIVATE_H_ */
-
diff --git a/ppapi/c/private/ppb_net_address_private.h b/ppapi/c/private/ppb_net_address_private.h
index 465cbd3..949cc1c 100644
--- a/ppapi/c/private/ppb_net_address_private.h
+++ b/ppapi/c/private/ppb_net_address_private.h
@@ -4,7 +4,7 @@
  */
 
 /* From private/ppb_net_address_private.idl,
- *   modified Wed Jan  4 09:10:03 2012.
+ *   modified Wed Jan  4 11:09:00 2012.
  */
 
 #ifndef PPAPI_C_PRIVATE_PPB_NET_ADDRESS_PRIVATE_H_
@@ -49,7 +49,7 @@ PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_NetAddress_Private, 132);
  * The <code>PPB_NetAddress_Private</code> interface provides operations on
  * network addresses.
  */
-struct PPB_NetAddress_Private {
+struct PPB_NetAddress_Private_0_1 {
   /**
    * Returns PP_TRUE if the two addresses are equal (host and port).
    */
@@ -79,6 +79,8 @@ struct PPB_NetAddress_Private {
    */
   void (*GetAnyAddress)(PP_Bool is_ipv6, struct PP_NetAddress_Private* addr);
 };
+
+typedef struct PPB_NetAddress_Private_0_1 PPB_NetAddress_Private;
 /**
  * @}
  */
diff --git a/ppapi/c/private/ppb_tcp_socket_private.h b/ppapi/c/private/ppb_tcp_socket_private.h
index 1515698..7cdf591 100644
--- a/ppapi/c/private/ppb_tcp_socket_private.h
+++ b/ppapi/c/private/ppb_tcp_socket_private.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From private/ppb_tcp_socket_private.idl modified Wed Nov  9 12:53:35 2011. */
+/* From private/ppb_tcp_socket_private.idl modified Wed Nov 16 15:27:20 2011. */
 
 #ifndef PPAPI_C_PRIVATE_PPB_TCP_SOCKET_PRIVATE_H_
 #define PPAPI_C_PRIVATE_PPB_TCP_SOCKET_PRIVATE_H_
@@ -33,7 +33,7 @@
  * The <code>PPB_TCPSocket_Private</code> interface provides TCP socket
  * operations.
  */
-struct PPB_TCPSocket_Private {
+struct PPB_TCPSocket_Private_0_3 {
   /**
    * Allocates a TCP socket resource.
    */
@@ -121,6 +121,8 @@ struct PPB_TCPSocket_Private {
    */
   void (*Disconnect)(PP_Resource tcp_socket);
 };
+
+typedef struct PPB_TCPSocket_Private_0_3 PPB_TCPSocket_Private;
 /**
  * @}
  */
diff --git a/ppapi/c/private/ppb_udp_socket_private.h b/ppapi/c/private/ppb_udp_socket_private.h
index 9e6cd48..78722e0 100644
--- a/ppapi/c/private/ppb_udp_socket_private.h
+++ b/ppapi/c/private/ppb_udp_socket_private.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From private/ppb_udp_socket_private.idl modified Wed Nov  9 12:53:35 2011. */
+/* From private/ppb_udp_socket_private.idl modified Wed Nov 16 15:27:20 2011. */
 
 #ifndef PPAPI_C_PRIVATE_PPB_UDP_SOCKET_PRIVATE_H_
 #define PPAPI_C_PRIVATE_PPB_UDP_SOCKET_PRIVATE_H_
@@ -29,7 +29,7 @@
  * @addtogroup Interfaces
  * @{
  */
-struct PPB_UDPSocket_Private {
+struct PPB_UDPSocket_Private_0_2 {
   /**
    * Creates a UDP socket resource.
    */
@@ -68,6 +68,8 @@ struct PPB_UDPSocket_Private {
   /* Cancels all pending reads and writes, and closes the socket. */
   void (*Close)(PP_Resource udp_socket);
 };
+
+typedef struct PPB_UDPSocket_Private_0_2 PPB_UDPSocket_Private;
 /**
  * @}
  */
diff --git a/ppapi/c/trusted/ppb_audio_input_trusted_dev.h b/ppapi/c/trusted/ppb_audio_input_trusted_dev.h
index 9b26938..3d558ea 100644
--- a/ppapi/c/trusted/ppb_audio_input_trusted_dev.h
+++ b/ppapi/c/trusted/ppb_audio_input_trusted_dev.h
@@ -4,7 +4,7 @@
  */
 
 /* From trusted/ppb_audio_input_trusted_dev.idl,
- *   modified Wed Jan  4 09:11:42 2012.
+ *   modified Wed Jan  4 11:09:00 2012.
  */
 
 #ifndef PPAPI_C_TRUSTED_PPB_AUDIO_INPUT_TRUSTED_DEV_H_
@@ -37,7 +37,7 @@
  * resource; most of the PPB_AudioInput interface is also usable on this
  * resource.
  */
-struct PPB_AudioInputTrusted_Dev {
+struct PPB_AudioInputTrusted_Dev_0_1 {
   /** Returns an audio input resource. */
   PP_Resource (*CreateTrusted)(PP_Instance instance);
   /**
@@ -62,6 +62,8 @@ struct PPB_AudioInputTrusted_Dev {
                              int* shm_handle,
                              uint32_t* shm_size);
 };
+
+typedef struct PPB_AudioInputTrusted_Dev_0_1 PPB_AudioInputTrusted_Dev;
 /**
  * @}
  */
diff --git a/ppapi/c/trusted/ppb_audio_trusted.h b/ppapi/c/trusted/ppb_audio_trusted.h
index 152a850..72416df 100644
--- a/ppapi/c/trusted/ppb_audio_trusted.h
+++ b/ppapi/c/trusted/ppb_audio_trusted.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From trusted/ppb_audio_trusted.idl modified Sat Jul 16 16:51:03 2011. */
+/* From trusted/ppb_audio_trusted.idl modified Wed Oct  5 14:06:02 2011. */
 
 #ifndef PPAPI_C_TRUSTED_PPB_AUDIO_TRUSTED_H_
 #define PPAPI_C_TRUSTED_PPB_AUDIO_TRUSTED_H_
@@ -33,7 +33,7 @@
  * resource returned is an Audio resource; most of the PPB_Audio
  * interface is also usable on this resource.
  */
-struct PPB_AudioTrusted {
+struct PPB_AudioTrusted_0_6 {
   /** Returns an audio resource. */
   PP_Resource (*CreateTrusted)(PP_Instance instance);
   /**
@@ -59,6 +59,8 @@ struct PPB_AudioTrusted {
                              int* shm_handle,
                              uint32_t* shm_size);
 };
+
+typedef struct PPB_AudioTrusted_0_6 PPB_AudioTrusted;
 /**
  * @}
  */
diff --git a/ppapi/c/trusted/ppb_broker_trusted.h b/ppapi/c/trusted/ppb_broker_trusted.h
index 9acd9cd..44b6118 100644
--- a/ppapi/c/trusted/ppb_broker_trusted.h
+++ b/ppapi/c/trusted/ppb_broker_trusted.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From trusted/ppb_broker_trusted.idl modified Sat Jul 16 16:51:03 2011. */
+/* From trusted/ppb_broker_trusted.idl modified Wed Oct  5 14:06:02 2011. */
 
 #ifndef PPAPI_C_TRUSTED_PPB_BROKER_TRUSTED_H_
 #define PPAPI_C_TRUSTED_PPB_BROKER_TRUSTED_H_
@@ -40,7 +40,7 @@
  * handle is closed. The handle should be closed before the resource is
  * released.
  */
-struct PPB_BrokerTrusted {
+struct PPB_BrokerTrusted_0_2 {
   /**
    * Returns a trusted broker resource.
    */
@@ -75,6 +75,8 @@ struct PPB_BrokerTrusted {
    */
   int32_t (*GetHandle)(PP_Resource broker, int32_t* handle);
 };
+
+typedef struct PPB_BrokerTrusted_0_2 PPB_BrokerTrusted;
 /**
  * @}
  */
diff --git a/ppapi/c/trusted/ppb_buffer_trusted.h b/ppapi/c/trusted/ppb_buffer_trusted.h
index b81f8d6..b24f340 100644
--- a/ppapi/c/trusted/ppb_buffer_trusted.h
+++ b/ppapi/c/trusted/ppb_buffer_trusted.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From trusted/ppb_buffer_trusted.idl modified Fri Jul 15 13:34:45 2011. */
+/* From trusted/ppb_buffer_trusted.idl modified Wed Oct  5 14:06:02 2011. */
 
 #ifndef PPAPI_C_TRUSTED_PPB_BUFFER_TRUSTED_H_
 #define PPAPI_C_TRUSTED_PPB_BUFFER_TRUSTED_H_
@@ -25,7 +25,7 @@
  * @addtogroup Interfaces
  * @{
  */
-struct PPB_BufferTrusted {
+struct PPB_BufferTrusted_0_1 {
   /**
    * Returns the internal shared memory pointer associated with the given
    * Buffer resource.  Used for proxying.  Returns PP_OK on success, or
@@ -35,6 +35,8 @@ struct PPB_BufferTrusted {
    */
   int32_t (*GetSharedMemory)(PP_Resource buffer, int* handle);
 };
+
+typedef struct PPB_BufferTrusted_0_1 PPB_BufferTrusted;
 /**
  * @}
  */
diff --git a/ppapi/c/trusted/ppb_file_chooser_trusted.h b/ppapi/c/trusted/ppb_file_chooser_trusted.h
index 8c3c933..85187a7 100644
--- a/ppapi/c/trusted/ppb_file_chooser_trusted.h
+++ b/ppapi/c/trusted/ppb_file_chooser_trusted.h
@@ -4,7 +4,7 @@
  */
 
 /* From trusted/ppb_file_chooser_trusted.idl,
- *   modified Wed Jan  4 09:12:36 2012.
+ *   modified Wed Jan  4 11:09:00 2012.
  */
 
 #ifndef PPAPI_C_TRUSTED_PPB_FILE_CHOOSER_TRUSTED_H_
@@ -30,7 +30,7 @@
  * @addtogroup Interfaces
  * @{
  */
-struct PPB_FileChooserTrusted {
+struct PPB_FileChooserTrusted_0_5 {
   /**
    * This function displays a previously created file chooser resource as a
    * dialog box, prompting the user to choose a file or files to open, or a
@@ -54,6 +54,8 @@ struct PPB_FileChooserTrusted {
                                     struct PP_Var suggested_file_name,
                                     struct PP_CompletionCallback callback);
 };
+
+typedef struct PPB_FileChooserTrusted_0_5 PPB_FileChooserTrusted;
 /**
  * @}
  */
diff --git a/ppapi/c/trusted/ppb_file_io_trusted.h b/ppapi/c/trusted/ppb_file_io_trusted.h
index 877c157..53953fbd 100644
--- a/ppapi/c/trusted/ppb_file_io_trusted.h
+++ b/ppapi/c/trusted/ppb_file_io_trusted.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From trusted/ppb_file_io_trusted.idl modified Mon Jul 18 10:45:10 2011. */
+/* From trusted/ppb_file_io_trusted.idl modified Wed Oct  5 14:06:02 2011. */
 
 #ifndef PPAPI_C_TRUSTED_PPB_FILE_IO_TRUSTED_H_
 #define PPAPI_C_TRUSTED_PPB_FILE_IO_TRUSTED_H_
@@ -28,7 +28,7 @@
  * @{
  */
 /* Available only to trusted implementations. */
-struct PPB_FileIOTrusted {
+struct PPB_FileIOTrusted_0_4 {
   /**
    * Returns a file descriptor corresponding to the given FileIO object. On
    * Windows, returns a HANDLE; on all other platforms, returns a POSIX file
@@ -61,6 +61,8 @@ struct PPB_FileIOTrusted {
                            int64_t length,
                            struct PP_CompletionCallback callback);
 };
+
+typedef struct PPB_FileIOTrusted_0_4 PPB_FileIOTrusted;
 /**
  * @}
  */
diff --git a/ppapi/c/trusted/ppb_graphics_3d_trusted.h b/ppapi/c/trusted/ppb_graphics_3d_trusted.h
index 353b6dd..099ffdc 100644
--- a/ppapi/c/trusted/ppb_graphics_3d_trusted.h
+++ b/ppapi/c/trusted/ppb_graphics_3d_trusted.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -51,7 +51,7 @@ struct PP_Graphics3DTrustedState {
   uint32_t generation;
 };
 
-struct PPB_Graphics3DTrusted {
+struct PPB_Graphics3DTrusted_1_0 {
   // Creates a raw Graphics3D resource. A raw Graphics3D is intended to be used
   // with the trusted interface, through the command buffer (for proxying).
   PP_Resource (*CreateRaw)(PP_Instance instance_id,
@@ -99,5 +99,6 @@ struct PPB_Graphics3DTrusted {
                                                     int32_t last_known_get);
 };
 
-#endif  // PPAPI_C_TRUSTED_PPB_GRAPHICS_3D_TRUSTED_H_
+typedef struct PPB_Graphics3DTrusted_1_0 PPB_Graphics3DTrusted;
 
+#endif  // PPAPI_C_TRUSTED_PPB_GRAPHICS_3D_TRUSTED_H_
diff --git a/ppapi/c/trusted/ppb_image_data_trusted.h b/ppapi/c/trusted/ppb_image_data_trusted.h
index 824fb9e..c6b266c 100644
--- a/ppapi/c/trusted/ppb_image_data_trusted.h
+++ b/ppapi/c/trusted/ppb_image_data_trusted.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From trusted/ppb_image_data_trusted.idl modified Sat Jul 16 16:51:03 2011. */
+/* From trusted/ppb_image_data_trusted.idl modified Wed Oct  5 14:06:02 2011. */
 
 #ifndef PPAPI_C_TRUSTED_PPB_IMAGE_DATA_TRUSTED_H_
 #define PPAPI_C_TRUSTED_PPB_IMAGE_DATA_TRUSTED_H_
@@ -26,7 +26,7 @@
  * @{
  */
 /** Trusted interface */
-struct PPB_ImageDataTrusted {
+struct PPB_ImageDataTrusted_0_4 {
   /**
    * Returns the internal shared memory pointer associated with the given
    * ImageData resource. Used for proxying. Returns PP_OK on success, or
@@ -38,6 +38,8 @@ struct PPB_ImageDataTrusted {
                              int* handle,
                              uint32_t* byte_count);
 };
+
+typedef struct PPB_ImageDataTrusted_0_4 PPB_ImageDataTrusted;
 /**
  * @}
  */
diff --git a/ppapi/c/trusted/ppb_url_loader_trusted.h b/ppapi/c/trusted/ppb_url_loader_trusted.h
index 8d1a248..71b21b36 100644
--- a/ppapi/c/trusted/ppb_url_loader_trusted.h
+++ b/ppapi/c/trusted/ppb_url_loader_trusted.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2012 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.
  */
 
-/* From trusted/ppb_url_loader_trusted.idl modified Sat Jul 16 16:51:03 2011. */
+/* From trusted/ppb_url_loader_trusted.idl modified Wed Oct  5 14:06:02 2011. */
 
 #ifndef PPAPI_C_TRUSTED_PPB_URL_LOADER_TRUSTED_H_
 #define PPAPI_C_TRUSTED_PPB_URL_LOADER_TRUSTED_H_
@@ -45,7 +45,7 @@ typedef void (*PP_URLLoaderTrusted_StatusCallback)(
  * @{
  */
 /* Available only to trusted implementations. */
-struct PPB_URLLoaderTrusted {
+struct PPB_URLLoaderTrusted_0_3 {
   /**
    * Grant this URLLoader the capability to make unrestricted cross-origin
    * requests.
@@ -67,6 +67,8 @@ struct PPB_URLLoaderTrusted {
   void (*RegisterStatusCallback)(PP_Resource loader,
                                  PP_URLLoaderTrusted_StatusCallback cb);
 };
+
+typedef struct PPB_URLLoaderTrusted_0_3 PPB_URLLoaderTrusted;
 /**
  * @}
  */