Index: third_party/npapi/bindings/npfunctions.h |
diff --git a/third_party/npapi/bindings/npfunctions.h b/third_party/npapi/bindings/npfunctions.h |
index 05cf6a72aa8b1ef343a5f0f6e8ee5adda55e1bb4..b479672b2145fda600df9e9b69fe464f995b1229 100644 |
--- a/third_party/npapi/bindings/npfunctions.h |
+++ b/third_party/npapi/bindings/npfunctions.h |
@@ -48,8 +48,8 @@ |
#include "npapi.h" |
#include "npruntime.h" |
-typedef void (* NP_LOADDS NPP_InitializeProcPtr)(); |
-typedef void (* NP_LOADDS NPP_ShutdownProcPtr)(); |
+typedef void (* NP_LOADDS NPP_InitializeProcPtr)(void); |
+typedef void (* NP_LOADDS NPP_ShutdownProcPtr)(void); |
typedef NPError (* NP_LOADDS NPP_NewProcPtr)(NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, char* argn[], char* argv[], NPSavedData* saved); |
typedef NPError (* NP_LOADDS NPP_DestroyProcPtr)(NPP instance, NPSavedData** save); |
typedef NPError (* NP_LOADDS NPP_SetWindowProcPtr)(NPP instance, NPWindow* window); |
@@ -65,6 +65,9 @@ typedef void (* NP_LOADDS NPP_URLNotifyProcPtr)(NPP instance, const char |
by the plugin on the way out. The browser is responsible for releasing. */ |
typedef NPError (* NP_LOADDS NPP_GetValueProcPtr)(NPP instance, NPPVariable variable, void *ret_value); |
typedef NPError (* NP_LOADDS NPP_SetValueProcPtr)(NPP instance, NPNVariable variable, void *value); |
+typedef NPBool (* NP_LOADDS NPP_GotFocusPtr)(NPP instance, NPFocusDirection direction); |
+typedef void (* NP_LOADDS NPP_LostFocusPtr)(NPP instance); |
+typedef void (* NP_LOADDS NPP_URLRedirectNotifyPtr)(NPP instance, const char* url, int32_t status, void* notifyData); |
typedef NPError (*NPN_GetValueProcPtr)(NPP instance, NPNVariable variable, void *ret_value); |
typedef NPError (*NPN_SetValueProcPtr)(NPP instance, NPPVariable variable, void *value); |
@@ -84,7 +87,7 @@ typedef void* (*NPN_MemAllocProcPtr)(uint32_t size); |
typedef void (*NPN_MemFreeProcPtr)(void* ptr); |
typedef uint32_t (*NPN_MemFlushProcPtr)(uint32_t size); |
typedef void (*NPN_ReloadPluginsProcPtr)(NPBool reloadPages); |
-typedef void* (*NPN_GetJavaEnvProcPtr)(); |
+typedef void* (*NPN_GetJavaEnvProcPtr)(void); |
typedef void* (*NPN_GetJavaPeerProcPtr)(NPP instance); |
typedef void (*NPN_InvalidateRectProcPtr)(NPP instance, NPRect *rect); |
typedef void (*NPN_InvalidateRegionProcPtr)(NPP instance, NPRegion region); |
@@ -120,6 +123,9 @@ typedef uint32_t (*NPN_ScheduleTimerPtr)(NPP instance, uint32_t interval, NP |
typedef void (*NPN_UnscheduleTimerPtr)(NPP instance, uint32_t timerID); |
typedef NPError (*NPN_PopUpContextMenuPtr)(NPP instance, NPMenu* menu); |
typedef NPBool (*NPN_ConvertPointPtr)(NPP instance, double sourceX, double sourceY, NPCoordinateSpace sourceSpace, double *destX, double *destY, NPCoordinateSpace destSpace); |
+typedef NPBool (*NPN_HandleEventPtr)(NPP instance, void *event, NPBool handled); |
+typedef NPBool (*NPN_UnfocusInstancePtr)(NPP instance, NPFocusDirection direction); |
+typedef void (*NPN_URLRedirectResponsePtr)(NPP instance, void* notifyData, NPBool allow); |
typedef struct _NPPluginFuncs { |
uint16_t size; |
@@ -138,6 +144,9 @@ typedef struct _NPPluginFuncs { |
void* javaClass; |
NPP_GetValueProcPtr getvalue; |
NPP_SetValueProcPtr setvalue; |
+ NPP_GotFocusPtr gotfocus; |
+ NPP_LostFocusPtr lostfocus; |
+ NPP_URLRedirectNotifyPtr urlredirectnotify; |
} NPPluginFuncs; |
typedef struct _NPNetscapeFuncs { |
@@ -195,6 +204,9 @@ typedef struct _NPNetscapeFuncs { |
NPN_UnscheduleTimerPtr unscheduletimer; |
NPN_PopUpContextMenuPtr popupcontextmenu; |
NPN_ConvertPointPtr convertpoint; |
+ NPN_HandleEventPtr handleevent; |
+ NPN_UnfocusInstancePtr unfocusinstance; |
+ NPN_URLRedirectResponsePtr urlredirectresponse; |
} NPNetscapeFuncs; |
#ifdef XP_MACOSX |
@@ -218,7 +230,7 @@ typedef struct _BPSupportedMIMETypes |
} BPSupportedMIMETypes; |
OSErr BP_GetSupportedMIMETypes(BPSupportedMIMETypes *mimeInfo, UInt32 flags); |
#define NP_GETMIMEDESCRIPTION_NAME "NP_GetMIMEDescription" |
-typedef const char* (*NP_GetMIMEDescriptionProcPtr)(); |
+typedef const char* (*NP_GetMIMEDescriptionProcPtr)(void); |
typedef OSErr (*BP_GetSupportedMIMETypesProcPtr)(BPSupportedMIMETypes*, UInt32); |
#endif |