Remove PPB_Instance 0.5

This wasn't even implemented by the browser any more.

BUG=

Review URL: https://codereview.chromium.org/11475038

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

3 files changed, 1 insertions, 68 deletions

diff --git a/ppapi/api/ppb_instance.idl b/ppapi/api/ppb_instance.idl
index 2eb34600d..de20dee 100644
--- a/ppapi/api/ppb_instance.idl
+++ b/ppapi/api/ppb_instance.idl
@@ -10,7 +10,6 @@
  */
 
 label Chrome {
-  M13 = 0.5,
   M14 = 1.0
  };
 
@@ -19,14 +18,6 @@ label Chrome {
  * related to the module instance on a web page.
  */
 interface PPB_Instance {
-  /** Deprecated in 1.0 */
-  [deprecate=1.0]
-  PP_Var GetWindowObject([in] PP_Instance instance);
-
-  /** Deprecated in 1.0 */
-  [deprecate=1.0]
-  PP_Var GetOwnerElementObject([in] PP_Instance instance);
-
   /**
    * BindGraphics() binds the given graphics as the current display surface.
    * The contents of this device is what will be displayed in the instance's
@@ -72,11 +63,5 @@ interface PPB_Instance {
    */
   PP_Bool IsFullFrame(
       [in] PP_Instance instance);
-
-  /** Deprecated in 0.5 */
-  [deprecate=0.5]
-  PP_Var ExecuteScript([in] PP_Instance instance,
-                       [in] PP_Var script,
-                       [out] PP_Var exception);
 };
 
diff --git a/ppapi/c/ppb_instance.h b/ppapi/c/ppb_instance.h
index 4043396..7087256 100644
--- a/ppapi/c/ppb_instance.h
+++ b/ppapi/c/ppb_instance.h
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-/* From ppb_instance.idl modified Wed Oct  5 14:06:02 2011. */
+/* From ppb_instance.idl modified Fri Dec 07 12:57:46 2012. */
 
 #ifndef PPAPI_C_PPB_INSTANCE_H_
 #define PPAPI_C_PPB_INSTANCE_H_
@@ -13,9 +13,7 @@
 #include "ppapi/c/pp_macros.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_stdint.h"
-#include "ppapi/c/pp_var.h"
 
-#define PPB_INSTANCE_INTERFACE_0_5 "PPB_Instance;0.5"
 #define PPB_INSTANCE_INTERFACE_1_0 "PPB_Instance;1.0"
 #define PPB_INSTANCE_INTERFACE PPB_INSTANCE_INTERFACE_1_0
 
@@ -80,13 +78,6 @@ struct PPB_Instance_1_0 {
 };
 
 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);
-  PP_Bool (*BindGraphics)(PP_Instance instance, PP_Resource device);
-  PP_Bool (*IsFullFrame)(PP_Instance instance);
-};
 /**
  * @}
  */
diff --git a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
index 5443705..6d3e61d 100644
--- a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
+++ b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
@@ -137,7 +137,6 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_MouseInputEvent_1_1;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_WheelInputEvent_1_0;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_KeyboardInputEvent_1_0;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_TouchInputEvent_1_0;
-static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Instance_0_5;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Instance_1_0;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_MessageLoop_1_0;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Messaging_1_0;
@@ -809,34 +808,6 @@ struct PP_TouchPoint Pnacl_M13_PPB_TouchInputEvent_GetTouchById(PP_Resource reso
 
 /* End wrapper methods for PPB_TouchInputEvent_1_0 */
 
-/* Begin wrapper methods for PPB_Instance_0_5 */
-
-static __attribute__((pnaclcall))
-struct PP_Var Pnacl_M13_PPB_Instance_GetWindowObject(PP_Instance instance) {
-  const struct PPB_Instance_0_5 *iface = Pnacl_WrapperInfo_PPB_Instance_0_5.real_iface;
-  return iface->GetWindowObject(instance);
-}
-
-static __attribute__((pnaclcall))
-struct PP_Var Pnacl_M13_PPB_Instance_GetOwnerElementObject(PP_Instance instance) {
-  const struct PPB_Instance_0_5 *iface = Pnacl_WrapperInfo_PPB_Instance_0_5.real_iface;
-  return iface->GetOwnerElementObject(instance);
-}
-
-static __attribute__((pnaclcall))
-PP_Bool Pnacl_M13_PPB_Instance_BindGraphics(PP_Instance instance, PP_Resource device) {
-  const struct PPB_Instance_0_5 *iface = Pnacl_WrapperInfo_PPB_Instance_0_5.real_iface;
-  return iface->BindGraphics(instance, device);
-}
-
-static __attribute__((pnaclcall))
-PP_Bool Pnacl_M13_PPB_Instance_IsFullFrame(PP_Instance instance) {
-  const struct PPB_Instance_0_5 *iface = Pnacl_WrapperInfo_PPB_Instance_0_5.real_iface;
-  return iface->IsFullFrame(instance);
-}
-
-/* End wrapper methods for PPB_Instance_0_5 */
-
 /* Not generating wrapper methods for PPB_Instance_1_0 */
 
 /* Begin wrapper methods for PPB_MessageLoop_1_0 */
@@ -3661,13 +3632,6 @@ struct PPB_TouchInputEvent_1_0 Pnacl_Wrappers_PPB_TouchInputEvent_1_0 = {
     .GetTouchById = (struct PP_TouchPoint (*)(PP_Resource resource, PP_TouchListType list, uint32_t touch_id))&Pnacl_M13_PPB_TouchInputEvent_GetTouchById
 };
 
-struct PPB_Instance_0_5 Pnacl_Wrappers_PPB_Instance_0_5 = {
-    .GetWindowObject = (struct PP_Var (*)(PP_Instance instance))&Pnacl_M13_PPB_Instance_GetWindowObject,
-    .GetOwnerElementObject = (struct PP_Var (*)(PP_Instance instance))&Pnacl_M13_PPB_Instance_GetOwnerElementObject,
-    .BindGraphics = (PP_Bool (*)(PP_Instance instance, PP_Resource device))&Pnacl_M13_PPB_Instance_BindGraphics,
-    .IsFullFrame = (PP_Bool (*)(PP_Instance instance))&Pnacl_M13_PPB_Instance_IsFullFrame
-};
-
 /* Not generating wrapper interface for PPB_Instance_1_0 */
 
 struct PPB_MessageLoop_1_0 Pnacl_Wrappers_PPB_MessageLoop_1_0 = {
@@ -4465,12 +4429,6 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_TouchInputEvent_1_0 = {
   .real_iface = NULL
 };
 
-static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Instance_0_5 = {
-  .iface_macro = PPB_INSTANCE_INTERFACE_0_5,
-  .wrapped_iface = (void *) &Pnacl_Wrappers_PPB_Instance_0_5,
-  .real_iface = NULL
-};
-
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Instance_1_0 = {
   .iface_macro = PPB_INSTANCE_INTERFACE_1_0,
   .wrapped_iface = NULL /* Still need slot for real_iface */,
@@ -5181,7 +5139,6 @@ static struct __PnaclWrapperInfo *s_ppb_wrappers[] = {
   &Pnacl_WrapperInfo_PPB_WheelInputEvent_1_0,
   &Pnacl_WrapperInfo_PPB_KeyboardInputEvent_1_0,
   &Pnacl_WrapperInfo_PPB_TouchInputEvent_1_0,
-  &Pnacl_WrapperInfo_PPB_Instance_0_5,
   &Pnacl_WrapperInfo_PPB_Instance_1_0,
   &Pnacl_WrapperInfo_PPB_MessageLoop_1_0,
   &Pnacl_WrapperInfo_PPB_Messaging_1_0,