Revert 92302 - First pass at revving stable pepper interfaces to 1.0.

Missing PPB_Core (pending removal of MemAlloc/MemFree) and new input event interfaces, in case we want to change them in the next ~week.

BUG=84519
TEST=ppapi tests

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

TBR=dmichael@chromium.org
Review URL: http://codereview.chromium.org/7342032

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

19 files changed, 24 insertions, 53 deletions

diff --git a/ppapi/c/ppb_audio.h b/ppapi/c/ppb_audio.h
index 564a2b0..1ee4fbf 100644
--- a/ppapi/c/ppb_audio.h
+++ b/ppapi/c/ppb_audio.h
@@ -11,8 +11,7 @@
 #include "ppapi/c/pp_stdint.h"
 
 #define PPB_AUDIO_INTERFACE_0_6 "PPB_Audio;0.6"
-#define PPB_AUDIO_INTERFACE_1_0 "PPB_Audio;1.0"
-#define PPB_AUDIO_INTERFACE PPB_AUDIO_INTERFACE_1_0
+#define PPB_AUDIO_INTERFACE PPB_AUDIO_INTERFACE_0_6
 
 /**
  * @file
diff --git a/ppapi/c/ppb_audio_config.h b/ppapi/c/ppb_audio_config.h
index 71d486d..033ac3c 100644
--- a/ppapi/c/ppb_audio_config.h
+++ b/ppapi/c/ppb_audio_config.h
@@ -12,8 +12,7 @@
 #include "ppapi/c/pp_stdint.h"
 
 #define PPB_AUDIO_CONFIG_INTERFACE_0_5 "PPB_AudioConfig;0.5"
-#define PPB_AUDIO_CONFIG_INTERFACE_1_0 "PPB_AudioConfig;1.0"
-#define PPB_AUDIO_CONFIG_INTERFACE PPB_AUDIO_CONFIG_INTERFACE_1_0
+#define PPB_AUDIO_CONFIG_INTERFACE PPB_AUDIO_CONFIG_INTERFACE_0_5
 
 /**
  * @file
diff --git a/ppapi/c/ppb_file_io.h b/ppapi/c/ppb_file_io.h
index 7f8b130..364e14d 100644
--- a/ppapi/c/ppb_file_io.h
+++ b/ppapi/c/ppb_file_io.h
@@ -64,8 +64,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_FileOpenFlags, 4);
  */
 
 #define PPB_FILEIO_INTERFACE_0_5 "PPB_FileIO;0.5"
-#define PPB_FILEIO_INTERFACE_1_0 "PPB_FileIO;1.0"
-#define PPB_FILEIO_INTERFACE PPB_FILEIO_INTERFACE_1_0
+#define PPB_FILEIO_INTERFACE PPB_FILEIO_INTERFACE_0_5
 
 /**
  * @addtogroup Interfaces
diff --git a/ppapi/c/ppb_file_ref.h b/ppapi/c/ppb_file_ref.h
index e204c28..2702d35 100644
--- a/ppapi/c/ppb_file_ref.h
+++ b/ppapi/c/ppb_file_ref.h
@@ -20,8 +20,7 @@
 struct PP_CompletionCallback;
 
 #define PPB_FILEREF_INTERFACE_0_9 "PPB_FileRef;0.9"
-#define PPB_FILEREF_INTERFACE_1_0 "PPB_FileRef;1.0"
-#define PPB_FILEREF_INTERFACE PPB_FILEREF_INTERFACE_1_0
+#define PPB_FILEREF_INTERFACE PPB_FILEREF_INTERFACE_0_9
 
 /**
  * @addtogroup Structs
diff --git a/ppapi/c/ppb_file_system.h b/ppapi/c/ppb_file_system.h
index 59b3d51..47e26a1 100644
--- a/ppapi/c/ppb_file_system.h
+++ b/ppapi/c/ppb_file_system.h
@@ -20,8 +20,7 @@
 struct PP_CompletionCallback;
 
 #define PPB_FILESYSTEM_INTERFACE_0_7 "PPB_FileSystem;0.7"
-#define PPB_FILESYSTEM_INTERFACE_1_0 "PPB_FileSystem;1.0"
-#define PPB_FILESYSTEM_INTERFACE PPB_FILESYSTEM_INTERFACE_1_0
+#define PPB_FILESYSTEM_INTERFACE PPB_FILESYSTEM_INTERFACE_0_7
 
 /**
  * @addtogroup Structs
diff --git a/ppapi/c/ppb_graphics_2d.h b/ppapi/c/ppb_graphics_2d.h
index 6020b050..1fc33da 100644
--- a/ppapi/c/ppb_graphics_2d.h
+++ b/ppapi/c/ppb_graphics_2d.h
@@ -17,8 +17,7 @@ struct PP_Rect;
 struct PP_Size;
 
 #define PPB_GRAPHICS_2D_INTERFACE_0_4 "PPB_Graphics2D;0.4"
-#define PPB_GRAPHICS_2D_INTERFACE_1_0 "PPB_Graphics2D;1.0"
-#define PPB_GRAPHICS_2D_INTERFACE PPB_GRAPHICS_2D_INTERFACE_1_0
+#define PPB_GRAPHICS_2D_INTERFACE PPB_GRAPHICS_2D_INTERFACE_0_4
 
 /**
  * @file
diff --git a/ppapi/c/ppb_image_data.h b/ppapi/c/ppb_image_data.h
index c63148b..d7c8c82 100644
--- a/ppapi/c/ppb_image_data.h
+++ b/ppapi/c/ppb_image_data.h
@@ -97,8 +97,7 @@ PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_ImageDataDesc, 16);
  */
 
 #define PPB_IMAGEDATA_INTERFACE_0_3 "PPB_ImageData;0.3"
-#define PPB_IMAGEDATA_INTERFACE_1_0 "PPB_ImageData;1.0"
-#define PPB_IMAGEDATA_INTERFACE PPB_IMAGEDATA_INTERFACE_1_0
+#define PPB_IMAGEDATA_INTERFACE PPB_IMAGEDATA_INTERFACE_0_3
 
 /**
  * @addtogroup Interfaces
diff --git a/ppapi/c/ppb_instance.h b/ppapi/c/ppb_instance.h
index dbda74d6..1e49ee8 100644
--- a/ppapi/c/ppb_instance.h
+++ b/ppapi/c/ppb_instance.h
@@ -12,9 +12,8 @@
 
 #define PPB_INSTANCE_INTERFACE_0_4 "PPB_Instance;0.4"
 #define PPB_INSTANCE_INTERFACE_0_5 "PPB_Instance;0.5"
-#define PPB_INSTANCE_INTERFACE_1_0 "PPB_Instance;1.0"
 #ifdef PPAPI_INSTANCE_REMOVE_SCRIPTING
-#define PPB_INSTANCE_INTERFACE PPB_INSTANCE_INTERFACE_1_0
+#define PPB_INSTANCE_INTERFACE PPB_INSTANCE_INTERFACE_0_5
 #else
 #define PPB_INSTANCE_INTERFACE PPB_INSTANCE_INTERFACE_0_4
 #endif
@@ -38,7 +37,7 @@
 #ifdef PPAPI_INSTANCE_REMOVE_SCRIPTING
 struct PPB_Instance {
 #else
-struct PPB_Instance_1_0 {
+struct PPB_Instance_0_5 {
 #endif
   /**
    * BindGraphics() binds the given graphics as the current drawing surface.
@@ -101,7 +100,7 @@ struct PPB_Instance {
 };
 
 #ifdef PPAPI_INSTANCE_REMOVE_SCRIPTING
-typedef struct PPB_Instance PPB_Instance_1_0;
+typedef struct PPB_Instance PPB_Instance_0_5;
 #else
 typedef struct PPB_Instance PPB_Instance_0_4;
 #endif
diff --git a/ppapi/c/ppb_messaging.h b/ppapi/c/ppb_messaging.h
index b5b729b..5312323 100644
--- a/ppapi/c/ppb_messaging.h
+++ b/ppapi/c/ppb_messaging.h
@@ -9,8 +9,7 @@
 #include "ppapi/c/pp_var.h"
 
 #define PPB_MESSAGING_INTERFACE_0_1 "PPB_Messaging;0.1"
-#define PPB_MESSAGING_INTERFACE_1_0 "PPB_Messaging;1.0"
-#define PPB_MESSAGING_INTERFACE PPB_MESSAGING_INTERFACE_1_0
+#define PPB_MESSAGING_INTERFACE PPB_MESSAGING_INTERFACE_0_1
 
 /**
  * @file
diff --git a/ppapi/c/ppb_url_loader.h b/ppapi/c/ppb_url_loader.h
index 3949f20..0ce27c0 100644
--- a/ppapi/c/ppb_url_loader.h
+++ b/ppapi/c/ppb_url_loader.h
@@ -12,8 +12,7 @@
 #include "ppapi/c/pp_stdint.h"
 
 #define PPB_URLLOADER_INTERFACE_0_2 "PPB_URLLoader;0.2"
-#define PPB_URLLOADER_INTERFACE_1_0 "PPB_URLLoader;1.0"
-#define PPB_URLLOADER_INTERFACE PPB_URLLOADER_INTERFACE_1_0
+#define PPB_URLLOADER_INTERFACE PPB_URLLOADER_INTERFACE_0_2
 
 /**
  * @file
diff --git a/ppapi/c/ppb_url_request_info.h b/ppapi/c/ppb_url_request_info.h
index 83f17c1..820dd57 100644
--- a/ppapi/c/ppb_url_request_info.h
+++ b/ppapi/c/ppb_url_request_info.h
@@ -158,8 +158,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_URLRequestProperty, 4);
  */
 
 #define PPB_URLREQUESTINFO_INTERFACE_0_2 "PPB_URLRequestInfo;0.2"
-#define PPB_URLREQUESTINFO_INTERFACE_1_0 "PPB_URLRequestInfo;1.0"
-#define PPB_URLREQUESTINFO_INTERFACE PPB_URLREQUESTINFO_INTERFACE_1_0
+#define PPB_URLREQUESTINFO_INTERFACE PPB_URLREQUESTINFO_INTERFACE_0_2
 
 /**
  *
diff --git a/ppapi/c/ppb_url_response_info.h b/ppapi/c/ppb_url_response_info.h
index 93051d4..3894471 100644
--- a/ppapi/c/ppb_url_response_info.h
+++ b/ppapi/c/ppb_url_response_info.h
@@ -87,8 +87,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_URLResponseProperty, 4);
  */
 
 #define PPB_URLRESPONSEINFO_INTERFACE_0_1 "PPB_URLResponseInfo;0.1"
-#define PPB_URLRESPONSEINFO_INTERFACE_1_0 "PPB_URLResponseInfo;1.0"
-#define PPB_URLRESPONSEINFO_INTERFACE PPB_URLRESPONSEINFO_INTERFACE_1_0
+#define PPB_URLRESPONSEINFO_INTERFACE PPB_URLRESPONSEINFO_INTERFACE_0_1
 
 /**
  *
diff --git a/ppapi/c/ppb_var.h b/ppapi/c/ppb_var.h
index ecd7514..d22b5ce 100644
--- a/ppapi/c/ppb_var.h
+++ b/ppapi/c/ppb_var.h
@@ -12,8 +12,7 @@
 #include "ppapi/c/pp_var.h"
 
 #define PPB_VAR_INTERFACE_0_5 "PPB_Var;0.5"
-#define PPB_VAR_INTERFACE_1_0 "PPB_Var;1.0"
-#define PPB_VAR_INTERFACE PPB_VAR_INTERFACE_1_0
+#define PPB_VAR_INTERFACE PPB_VAR_INTERFACE_0_5
 
 /**
  * @file
diff --git a/ppapi/c/ppp_messaging.h b/ppapi/c/ppp_messaging.h
index c36ed96..29a7976 100644
--- a/ppapi/c/ppp_messaging.h
+++ b/ppapi/c/ppp_messaging.h
@@ -9,9 +9,7 @@
 
 struct PP_Var;
 
-#define PPP_MESSAGING_INTERFACE_0_1 "PPP_Messaging;0.1"
-#define PPP_MESSAGING_INTERFACE_1_0 "PPP_Messaging;1.0"
-#define PPP_MESSAGING_INTERFACE PPP_MESSAGING_INTERFACE_1_0
+#define PPP_MESSAGING_INTERFACE "PPP_Messaging;0.1"
 
 /**
  * @file
diff --git a/ppapi/proxy/dispatcher.cc b/ppapi/proxy/dispatcher.cc
index e9b57c3..ad32beb 100644
--- a/ppapi/proxy/dispatcher.cc
+++ b/ppapi/proxy/dispatcher.cc
@@ -141,7 +141,6 @@ InterfaceList::InterfaceList() {
   AddPPB(PPB_InputEvent_Proxy::GetInfo());
   AddPPB(PPB_Instance_Proxy::GetInfo0_4());
   AddPPB(PPB_Instance_Proxy::GetInfo0_5());
-  AddPPB(PPB_Instance_Proxy::GetInfo1_0());
   AddPPB(PPB_Instance_Proxy::GetInfoFullscreen());
   AddPPB(PPB_Instance_Proxy::GetInfoMessaging());
   AddPPB(PPB_Instance_Proxy::GetInfoPrivate());
diff --git a/ppapi/proxy/ppb_instance_proxy.cc b/ppapi/proxy/ppb_instance_proxy.cc
index 5a6158a..7c3827f 100644
--- a/ppapi/proxy/ppb_instance_proxy.cc
+++ b/ppapi/proxy/ppb_instance_proxy.cc
@@ -51,7 +51,7 @@ const InterfaceProxy::Info* PPB_Instance_Proxy::GetInfo0_4() {
   static const Info info = {
     ppapi::thunk::GetPPB_Instance_0_4_Thunk(),
     PPB_INSTANCE_INTERFACE_0_4,
-    INTERFACE_ID_NONE,  // 1_0 is the canonical one.
+    INTERFACE_ID_NONE,  // 0_5 is the canonical one.
     false,
     &CreateInstanceProxy,
   };
@@ -61,20 +61,8 @@ const InterfaceProxy::Info* PPB_Instance_Proxy::GetInfo0_4() {
 // static
 const InterfaceProxy::Info* PPB_Instance_Proxy::GetInfo0_5() {
   static const Info info = {
-    ppapi::thunk::GetPPB_Instance_1_0_Thunk(),
+    ppapi::thunk::GetPPB_Instance_0_5_Thunk(),
     PPB_INSTANCE_INTERFACE_0_5,
-    INTERFACE_ID_NONE,  // 1_0 is the canonical one.
-    false,
-    &CreateInstanceProxy,
-  };
-  return &info;
-}
-
-// static
-const InterfaceProxy::Info* PPB_Instance_Proxy::GetInfo1_0() {
-  static const Info info = {
-    ppapi::thunk::GetPPB_Instance_1_0_Thunk(),
-    PPB_INSTANCE_INTERFACE_1_0,
     INTERFACE_ID_PPB_INSTANCE,
     false,
     &CreateInstanceProxy,
diff --git a/ppapi/proxy/ppb_instance_proxy.h b/ppapi/proxy/ppb_instance_proxy.h
index 9d045fb..d4de0a4 100644
--- a/ppapi/proxy/ppb_instance_proxy.h
+++ b/ppapi/proxy/ppb_instance_proxy.h
@@ -31,7 +31,6 @@ class PPB_Instance_Proxy : public InterfaceProxy,
 
   static const Info* GetInfo0_4();
   static const Info* GetInfo0_5();
-  static const Info* GetInfo1_0();
   static const Info* GetInfoMessaging();
   static const Info* GetInfoPrivate();
   static const Info* GetInfoFullscreen();
diff --git a/ppapi/thunk/ppb_instance_thunk.cc b/ppapi/thunk/ppb_instance_thunk.cc
index 3d7ef60..025e3e0 100644
--- a/ppapi/thunk/ppb_instance_thunk.cc
+++ b/ppapi/thunk/ppb_instance_thunk.cc
@@ -49,7 +49,7 @@ PP_Var ExecuteScript(PP_Instance instance,
   return enter.functions()->ExecuteScript(instance, script, exception);
 }
 
-const PPB_Instance_1_0 g_ppb_instance_1_0_thunk = {
+const PPB_Instance_0_5 g_ppb_instance_0_5_thunk = {
   &BindGraphics,
   &IsFullFrame
 };
@@ -73,8 +73,8 @@ const PPB_Instance_Private g_ppb_instance_private_thunk = {
 const PPB_Instance_0_4* GetPPB_Instance_0_4_Thunk() {
   return &g_ppb_instance_0_4_thunk;
 }
-const PPB_Instance_1_0* GetPPB_Instance_1_0_Thunk() {
-  return &g_ppb_instance_1_0_thunk;
+const PPB_Instance_0_5* GetPPB_Instance_0_5_Thunk() {
+  return &g_ppb_instance_0_5_thunk;
 }
 const PPB_Instance_Private* GetPPB_Instance_Private_Thunk() {
   return &g_ppb_instance_private_thunk;
diff --git a/ppapi/thunk/thunk.h b/ppapi/thunk/thunk.h
index e03a8e1..b02b920 100644
--- a/ppapi/thunk/thunk.h
+++ b/ppapi/thunk/thunk.h
@@ -54,9 +54,9 @@ struct PPB_Zoom_Dev;
 
 #ifdef PPAPI_INSTANCE_REMOVE_SCRIPTING
 struct PPB_Instance_0_4;
-typedef PPB_Instance PPB_Instance_1_0;
+typedef PPB_Instance PPB_Instance_0_5;
 #else
-struct PPB_Instance_1_0;
+struct PPB_Instance_0_5;
 typedef PPB_Instance PPB_Instance_0_4;
 #endif
 
@@ -93,7 +93,7 @@ const PPB_InputEvent* GetPPB_InputEvent_Thunk();
 const PPB_ImageData* GetPPB_ImageData_Thunk();
 const PPB_ImageDataTrusted* GetPPB_ImageDataTrusted_Thunk();
 const PPB_Instance_0_4* GetPPB_Instance_0_4_Thunk();
-const PPB_Instance_1_0* GetPPB_Instance_1_0_Thunk();
+const PPB_Instance_0_5* GetPPB_Instance_0_5_Thunk();
 const PPB_Instance_Private* GetPPB_Instance_Private_Thunk();
 const PPB_KeyboardInputEvent* GetPPB_KeyboardInputEvent_Thunk();
 const PPB_LayerCompositor_Dev* GetPPB_LayerCompositor_Thunk();