| Index: third_party/npapi/bindings/npapi.h
|
| diff --git a/third_party/npapi/bindings/npapi.h b/third_party/npapi/bindings/npapi.h
|
| index 3d31eabff9d6fd86990158e70ff1aae790bd59ae..e7bd1cf8d682663fff5c68593df807b69e13962c 100644
|
| --- a/third_party/npapi/bindings/npapi.h
|
| +++ b/third_party/npapi/bindings/npapi.h
|
| @@ -130,7 +130,7 @@
|
| /*----------------------------------------------------------------------*/
|
|
|
| #define NP_VERSION_MAJOR 0
|
| -#define NP_VERSION_MINOR 23
|
| +#define NP_VERSION_MINOR 26
|
|
|
|
|
| /* The OS/2 version of Netscape uses RC_DATA to define the
|
| @@ -252,6 +252,11 @@ typedef struct _NPSize
|
| int32_t height;
|
| } NPSize;
|
|
|
| +typedef enum {
|
| + NPFocusNext = 0,
|
| + NPFocusPrevious = 1
|
| +} NPFocusDirection;
|
| +
|
| /* Return values for NPP_HandleEvent */
|
| #define kNPEventNotHandled 0
|
| #define kNPEventHandled 1
|
| @@ -381,7 +386,9 @@ typedef enum {
|
| NPPVpluginNativeAccessibleAtkPlugId = 19,
|
|
|
| /* Checks to see if the plug-in would like the browser to load the "src" attribute. */
|
| - NPPVpluginCancelSrcStream = 20
|
| + NPPVpluginCancelSrcStream = 20,
|
| +
|
| + NPPVSupportsAdvancedKeyHandling = 21
|
|
|
| #if defined(XP_MACOSX)
|
| /* Used for negotiating drawing models */
|
| @@ -392,7 +399,7 @@ typedef enum {
|
| , NPPVpluginCoreAnimationLayer = 1003
|
| #endif
|
|
|
| -#if defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO == 5)
|
| +#if (MOZ_PLATFORM_MAEMO == 5) || (MOZ_PLATFORM_MAEMO == 6)
|
| , NPPVpluginWindowlessLocalBool = 2002
|
| #endif
|
| } NPPVariable;
|
| @@ -422,7 +429,9 @@ typedef enum {
|
|
|
| NPNVSupportsWindowless = 17,
|
|
|
| - NPNVprivateModeBool = 18
|
| + NPNVprivateModeBool = 18,
|
| +
|
| + NPNVsupportsAdvancedKeyHandling = 21
|
|
|
| #if defined(XP_MACOSX)
|
| /* Used for negotiating drawing models */
|
| @@ -439,7 +448,7 @@ typedef enum {
|
| #endif
|
| , NPNVsupportsCocoaBool = 3001 /* TRUE if the browser supports the Cocoa event model */
|
| #endif
|
| -#if defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO == 5)
|
| +#if (MOZ_PLATFORM_MAEMO == 5) || (MOZ_PLATFORM_MAEMO == 6)
|
| , NPNVSupportsWindowlessLocal = 2002
|
| #endif
|
| } NPNVariable;
|
| @@ -773,6 +782,8 @@ enum NPEventType {
|
| #define NPVERS_HAS_URL_AND_AUTH_INFO 21
|
| #define NPVERS_HAS_PRIVATE_MODE 22
|
| #define NPVERS_MACOSX_HAS_COCOA_EVENTS 23
|
| +#define NPVERS_HAS_ADVANCED_KEY_HANDLING 25
|
| +#define NPVERS_HAS_URL_REDIRECT_HANDLING 26
|
|
|
| /*----------------------------------------------------------------------*/
|
| /* Function Prototypes */
|
| @@ -817,6 +828,9 @@ void NP_LOADDS NPP_URLNotify(NPP instance, const char* url,
|
| NPReason reason, void* notifyData);
|
| NPError NP_LOADDS NPP_GetValue(NPP instance, NPPVariable variable, void *value);
|
| NPError NP_LOADDS NPP_SetValue(NPP instance, NPNVariable variable, void *value);
|
| +NPBool NP_LOADDS NPP_GotFocus(NPP instance, NPFocusDirection direction);
|
| +void NP_LOADDS NPP_LostFocus(NPP instance);
|
| +void NP_LOADDS NPP_URLRedirectNotify(NPP instance, const char* url, int32_t status, void* notifyData);
|
|
|
| /* NPN_* functions are provided by the navigator and called by the plugin. */
|
| void NP_LOADDS NPN_Version(int* plugin_major, int* plugin_minor,
|
| @@ -876,6 +890,9 @@ uint32_t NP_LOADDS NPN_ScheduleTimer(NPP instance, uint32_t interval, NPBool
|
| void NP_LOADDS NPN_UnscheduleTimer(NPP instance, uint32_t timerID);
|
| NPError NP_LOADDS NPN_PopUpContextMenu(NPP instance, NPMenu* menu);
|
| NPBool NP_LOADDS NPN_ConvertPoint(NPP instance, double sourceX, double sourceY, NPCoordinateSpace sourceSpace, double *destX, double *destY, NPCoordinateSpace destSpace);
|
| +NPBool NP_LOADDS NPN_HandleEvent(NPP instance, void *event, NPBool handled);
|
| +NPBool NP_LOADDS NPN_UnfocusInstance(NPP instance, NPFocusDirection direction);
|
| +void NP_LOADDS NPN_URLRedirectResponse(NPP instance, void* notifyData, NPBool allow);
|
|
|
| #ifdef __cplusplus
|
| } /* end extern "C" */
|
|
|