| Index: ppapi/c/ppp_instance.h
|
| diff --git a/ppapi/c/ppp_instance.h b/ppapi/c/ppp_instance.h
|
| index 52ad9cb258170e1842d69fbbd2837a94375bb526..3fd82638c2c8e9727be5be47da3d1bff276eacde 100644
|
| --- a/ppapi/c/ppp_instance.h
|
| +++ b/ppapi/c/ppp_instance.h
|
| @@ -11,16 +11,9 @@
|
| #include "ppapi/c/pp_resource.h"
|
|
|
| struct PP_InputEvent;
|
| -struct PP_Var;
|
|
|
| -#define PPP_INSTANCE_INTERFACE_0_4 "PPP_Instance;0.4"
|
| #define PPP_INSTANCE_INTERFACE_0_5 "PPP_Instance;0.5"
|
| -#ifdef PPAPI_INSTANCE_REMOVE_SCRIPTING
|
| #define PPP_INSTANCE_INTERFACE PPP_INSTANCE_INTERFACE_0_5
|
| -#else
|
| -#define PPP_INSTANCE_INTERFACE PPP_INSTANCE_INTERFACE_0_4
|
| -#endif
|
| -
|
|
|
| /**
|
| * @file
|
| @@ -40,11 +33,7 @@ struct PP_Var;
|
| * events.
|
| */
|
|
|
| -#ifdef PPAPI_INSTANCE_REMOVE_SCRIPTING
|
| struct PPP_Instance {
|
| -#else
|
| -struct PPP_Instance_0_5 {
|
| -#endif
|
| /**
|
| * DidCreate() is a creation handler that is called when a new instance is
|
| * created. This function is called for each instantiation on the page,
|
| @@ -231,35 +220,11 @@ struct PPP_Instance_0_5 {
|
| PP_Bool (*HandleDocumentLoad)(PP_Instance instance, PP_Resource url_loader);
|
| };
|
|
|
| -#ifdef PPAPI_INSTANCE_REMOVE_SCRIPTING
|
| -struct PPP_Instance_0_4 {
|
| -#else
|
| -struct PPP_Instance {
|
| -#endif
|
| - PP_Bool (*DidCreate)(PP_Instance instance,
|
| - uint32_t argc,
|
| - const char* argn[],
|
| - const char* argv[]);
|
| - void (*DidDestroy)(PP_Instance instance);
|
| - void (*DidChangeView)(PP_Instance instance,
|
| - const struct PP_Rect* position,
|
| - const struct PP_Rect* clip);
|
| - void (*DidChangeFocus)(PP_Instance instance, PP_Bool has_focus);
|
| - PP_Bool (*HandleInputEvent)(PP_Instance instance,
|
| - const struct PP_InputEvent* event);
|
| - PP_Bool (*HandleDocumentLoad)(PP_Instance instance, PP_Resource url_loader);
|
| - struct PP_Var (*GetInstanceObject)(PP_Instance instance);
|
| -};
|
| -
|
| /**
|
| * @}
|
| */
|
|
|
| -#ifdef PPAPI_INSTANCE_REMOVE_SCRIPTING
|
| typedef struct PPP_Instance PPP_Instance_0_5;
|
| -#else
|
| -typedef struct PPP_Instance PPP_Instance_0_4;
|
| -#endif
|
|
|
| #endif /* PPAPI_C_PPP_INSTANCE_H_ */
|
|
|
|
|