Make Pepper NPN variable return a pointer to an allocated...

third_party/npapi/bindings/npapi.h

 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
  * Software distributed under the License is distributed on an "AS IS" basis,
  * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
@@ skipping 26 matching lines @@
 
 /*
  *  Netscape client plug-in API spec
  */
 
 
 #ifndef _NPAPI_H_
 #define _NPAPI_H_
 
 
-// BEGIN GOOGLE MODIFICATIONS
+/* BEGIN GOOGLE MODIFICATIONS */
 
 #include "base/basictypes.h"
 
-// END GOOGLE MODIFICATIONS
+/* END GOOGLE MODIFICATIONS */
 
 #ifdef INCLUDE_JAVA
 #include "jri.h"                /* Java Runtime Interface */
 #else
 #define jref    void *
 #define JRIEnv  void
 #endif
 
 #ifdef _WIN32
 #    ifndef XP_WIN
 #        define XP_WIN 1
 #    endif /* XP_WIN */
 #endif /* _WIN32 */
 
-// BEGIN GOOGLE MODIFICATIONS
-// On Linux and Mac, be sure to set Mozilla-specific macros.
+/* BEGIN GOOGLE MODIFICATIONS */
+/* On Linux and Mac, be sure to set Mozilla-specific macros. */
 #if defined(OS_LINUX) || defined(OS_FREEBSD)
 #define XP_UNIX 1
 #define MOZ_X11 1
 #endif
-// END GOOGLE MODIFICATIONS
+/* END GOOGLE MODIFICATIONS */
 
 #ifdef __MWERKS__
 #    define _declspec __declspec
 #    ifdef macintosh
 #        ifndef XP_MAC
 #            define XP_MAC 1
 #        endif /* XP_MAC */
 #    endif /* macintosh */
 #    ifdef __INTEL__
 #        undef NULL
@@ skipping 27 matching lines @@
 #ifdef XP_MACOSX
 #include <ApplicationServices/ApplicationServices.h>
 #include <OpenGL/OpenGL.h>
 #ifndef NP_NO_CARBON
 #include <Carbon/Carbon.h>
 #endif
 #endif
 
 #if defined(XP_UNIX) 
 #       include <stdio.h>
-// BEGIN GOOGLE MODIFICATIONS
+/* BEGIN GOOGLE MODIFICATIONS */
 #if 0
-// END GOOGLE MODIFICATIONS
+/* END GOOGLE MODIFICATIONS */
 #       if defined(MOZ_X11)
 #               include <X11/Xlib.h>
 #               include <X11/Xutil.h>
 #       endif
-// BEGIN GOOGLE MODIFICATIONS
+/* BEGIN GOOGLE MODIFICATIONS */
 #endif
-// END GOOGLE MODIFICATIONS
+/* END GOOGLE MODIFICATIONS */
 #endif
 
 #ifdef XP_WIN
 #include <windows.h>
 #endif
 
 /*----------------------------------------------------------------------*/
 /*             Plugin Version Constants                                 */
 /*----------------------------------------------------------------------*/
 
 #define NP_VERSION_MAJOR 0
-// BEGIN GOOGLE MODIFICATIONS
-#define NP_VERSION_MINOR 23 // maximum version currently supported by Chromium
-// END GOOGLE MODIFICATIONS
+/* BEGIN GOOGLE MODIFICATIONS */
+#define NP_VERSION_MINOR 23 /* maximum version currently supported by Chromium */
+/* END GOOGLE MODIFICATIONS */
 
 
 /*----------------------------------------------------------------------*/
 /*             Definition of Basic Types                                */
 /*----------------------------------------------------------------------*/
 
 /* QNX sets the _INT16 and friends defines, but does not typedef the types */
 #ifdef __QNXNTO__
 #undef _UINT16
 #undef _INT16
@@ skipping 126 matching lines @@
 enum {
   NP_SETWINDOW = 1,
   NP_PRINT
 };
 
 typedef struct
 {
   int32 type;
 } NPAnyCallbackStruct;
 
-// BEGIN GOOGLE MODIFICATIONS
+/* BEGIN GOOGLE MODIFICATIONS */
 typedef struct _NPSetWindowCallbackStruct NPSetWindowCallbackStruct;
-// END GOOGLE MODIFICATIONS
+/* END GOOGLE MODIFICATIONS */
 
 typedef struct
 {
   int32 type;
   FILE* fp;
 } NPPrintCallbackStruct;
 
 #endif /* XP_UNIX */
 
 
@@ skipping 133 matching lines @@
   , NPNVsupportsCarbonBool = 3000 /* TRUE if the browser supports the Carbon event model */
 #endif
   , NPNVsupportsCocoaBool = 3001 /* TRUE if the browser supports the Cocoa event model */
 #endif
 #ifdef PEPPER_APIS_ENABLED
   /*
    * Note: these APIs have not been ratified by Mozilla, et al.
    * Until they are, they need to be distinct values from other enum
    * elements here.
    */
-  , NPNVInitializeRenderContextFunc = 4000 /* A pointer to the InitializeRenderContext function */
-  , NPNVFlushRenderContextFunc = 4001 /* A pointer to the FlushRenderContext function */
+  , NPNVPepperExtensions = 4000  /* A pointer to an NPPepperExtensions structure */
 #endif
 } NPNVariable;
 
 typedef enum {
   NPNURLVCookie = 501,
   NPNURLVProxy
 } NPNURLVariable;
 
-// BEGIN GOOGLE MODIFICATIONS
+/* BEGIN GOOGLE MODIFICATIONS */
 /*
  * The type of Tookkit the widgets use
  */
 typedef enum {
   NPNVGtk12 = 1,
   NPNVGtk2
 } NPNToolkitType;
-// END GOOGLE MODIFICATIONS
+/* END GOOGLE MODIFICATIONS */
 
 /*
  * The type of a NPWindow - it specifies the type of the data structure
  * returned in the window field.
  */
 typedef enum {
   NPWindowTypeWindow = 1,
   NPWindowTypeDrawable
 } NPWindowType;
 
@@ skipping 118 matching lines @@
 {
   uint16 mode;               /* NP_FULL or NP_EMBED */
   union
   {
     NPFullPrint fullPrint;   /* if mode is NP_FULL */
     NPEmbedPrint embedPrint; /* if mode is NP_EMBED */
   } print;
 } NPPrint;
 
 #ifdef XP_MACOSX
-// BEGIN GOOGLE MODIFICATIONS
+/* BEGIN GOOGLE MODIFICATIONS */
 typedef struct _NPNSMenu NPNSMenu;
-// END GOOGLE MODIFICATIONS
+/* END GOOGLE MODIFICATIONS */
 typedef NPNSMenu NPMenu;
 #else
 typedef void * NPMenu;
 #endif
 
 typedef enum {
   NPCoordinateSpacePlugin = 1,
   NPCoordinateSpaceWindow,
   NPCoordinateSpaceFlippedWindow,
   NPCoordinateSpaceScreen,
   NPCoordinateSpaceFlippedScreen
 } NPCoordinateSpace;
 
 #if !defined(PEPPER_APIS_ENABLED)
 #if defined(XP_MAC) || defined(XP_MACOSX)
 
 #ifndef NP_NO_CARBON
 typedef EventRecord    NPEvent;
 #endif
 
 #elif defined(XP_WIN)
 typedef struct _NPEvent
 {
   uint16 event;
   uint32 wParam;
   uint32 lParam;
 } NPEvent;
 #elif defined (XP_UNIX) && defined(MOZ_X11)
-// BEGIN GOOGLE MODIFICATIONS
+/* BEGIN GOOGLE MODIFICATIONS */
 typedef union _XEvent XEvent;
-// END GOOGLE MODIFICATIONS
+/* END GOOGLE MODIFICATIONS */
 typedef XEvent NPEvent;
 #else
 typedef void*                   NPEvent;
 #endif /* XP_MACOSX */
 
 #if defined(XP_MAC)
 typedef RgnHandle NPRegion;
 #elif defined(XP_MACOSX)
 /* 
  * NPRegion's type depends on the drawing model specified by the plugin (see NPNVpluginDrawingModel).
  * NPQDRegion represents a QuickDraw RgnHandle and is used with the QuickDraw drawing model.
  * NPCGRegion repesents a graphical region when using any other drawing model.
  */
 typedef void *NPRegion;
 #ifndef NP_NO_QUICKDRAW
 typedef RgnHandle NPQDRegion;
 #endif
 typedef CGPathRef NPCGRegion;
 #elif defined(XP_WIN)
 typedef HRGN NPRegion;
 #elif defined(XP_UNIX)
-// BEGIN GOOGLE MODIFICATIONS   
+/* BEGIN GOOGLE MODIFICATIONS */
 typedef struct _XRegion *Region;        
-// END GOOGLE MODIFICATIONS
+/* END GOOGLE MODIFICATIONS */
 typedef Region NPRegion;
 #else
 typedef void *NPRegion;
 #endif /* XP_MAC */
 
 #ifdef XP_MACOSX
 
 /* 
  * NP_CGContext is the type of the NPWindow's 'window' when the plugin specifies NPDrawingModelCoreGraphics
  * as its drawing model.
  */
 
 typedef struct NP_CGContext
 {
   CGContextRef context;
 #ifdef NP_NO_CARBON
   NPNSWindow *window;
 #else
-  void *window; // Can be either an NSWindow or a WindowRef depending on the event model
+  void *window; /* Can be either an NSWindow or a WindowRef depending on the event model */
 #endif
 } NP_CGContext;
 
 /* 
  * NP_GLContext is the type of the NPWindow's 'window' when the plugin specifies NPDrawingModelOpenGL as its
  * drawing model.
  */
 
 typedef struct NP_GLContext
 {
   CGLContextObj context;
 #ifdef NP_NO_CARBON
   NPNSWindow *window;
 #else
-  void *window; // Can be either an NSWindow or a WindowRef depending on the event model
+  void *window; /* Can be either an NSWindow or a WindowRef depending on the event model */
 #endif
 } NP_GLContext;
 
 #endif /* XP_MACOSX */
 
 #if defined(XP_MAC) || defined(XP_MACOSX)
 
 /*
  *  Mac-specific structures and definitions.
  */
@@ skipping 15 matching lines @@
   CGrafPtr     port;        /* Grafport */
   int32        portx;        /* position inside the topmost window */
   int32        porty;
 } NP_Port;
 
 #endif /* NP_NO_QUICKDRAW */
 
 /*
  *  Non-standard event types that can be passed to HandleEvent
  */
-// BEGIN GOOGLE MODIFICATIONS
+/* BEGIN GOOGLE MODIFICATIONS */
 enum NPEventType {
   NPEventType_GetFocusEvent = (osEvt + 16),
   NPEventType_LoseFocusEvent,
   NPEventType_AdjustCursorEvent,
   NPEventType_MenuCommandEvent,
   NPEventType_ClippingChangedEvent,
   NPEventType_ScrollingBeginsEvent = 1000,
   NPEventType_ScrollingEndsEvent
 };
 
 #ifdef OBSOLETE
 #define getFocusEvent     (osEvt + 16)
 #define loseFocusEvent    (osEvt + 17)
 #define adjustCursorEvent (osEvt + 18)
 #endif
-// END GOOGLE MODIFICATIONS
+/* END GOOGLE MODIFICATIONS */
 
 #endif /* XP_MACOSX */
 
 /* Stub typedefs for interfaces requiring Pepper types. */
 typedef int NPRenderType;
 typedef struct _NPRenderContext NPRenderContext;
+typedef struct _NPPepperExtensions NPPepperExtensions;
 
-#else  // defined(PEPPER_APIS_ENABLED)
+#else  /* defined(PEPPER_APIS_ENABLED) */
 typedef enum {
   NPMouseButton_None    = -1,
   NPMouseButton_Left    = 0,
   NPMouseButton_Middle  = 1,
   NPMouseButton_Right   = 2,
 } NPMouseButtons;
 
 typedef enum {
   NPEventType_Undefined   = -1,
   NPEventType_MouseDown   = 0,
@@ skipping 51 matching lines @@
   float deltaX;
   float deltaY;
   float wheelTicksX;
   float wheelTicksY;
   uint32 scrollByPage;
 } NPMouseWheelEvent;
 
 typedef struct _NPDeviceEvent {
   uint32 device_uid;
   uint32 subtype;
-  // uint8 generic[0];
+  /* uint8 generic[0]; */
 } NPDeviceEvent;
 
 typedef struct _NPMinimizeEvent {
   int32 value;
 } NPMinimizeEvent;
 
 typedef struct _NPFocusEvent {
   int32 value;
 } NPFocusEvent;
 
@@ skipping 39 matching lines @@
 typedef void (*NPFlushRenderContextCallbackPtr)(NPRenderContext* context,
                                                                                                 NPError err,
                                                 void* userData);
 typedef NPError (*NPInitializeRenderContextPtr)(NPP instance,
                                                 NPRenderType type,
                                                 NPRenderContext* context);
 typedef NPError (*NPFlushRenderContextPtr)(NPP instance,
                                            NPRenderContext* context,
                                            NPFlushRenderContextCallbackPtr callback,
                                            void* userData);
-#endif  // defined(PEPPER_APIS_ENABLED)
+typedef NPError (*NPDestroyRenderContextPtr)(NPP instance,
+                                             NPRenderContext* context);
+
+typedef struct _NPPepperExtensions
+{
+  /* Renderer extensions */
+  NPInitializeRenderContextPtr initializeRender;
+  NPFlushRenderContextPtr flushRender;
+  NPDestroyRenderContextPtr destroyRender;
+  /* Shared memory extensions */
+} NPPepperExtensions;
+
+#endif  /* defined(PEPPER_APIS_ENABLED) */
 
 /*
  * Values for mode passed to NPP_New:
  */
 #define NP_EMBED 1
 #define NP_FULL  2
 
 /*
  * Values for stream type passed to NPP_NewStream:
  */
@@ skipping 168 matching lines @@
 uint32      NPN_ScheduleTimer(NPP instance, uint32 interval, NPBool repeat, void (*timerFunc)(NPP npp, uint32 timerID));
 void        NPN_UnscheduleTimer(NPP instance, uint32 timerID);
 NPError     NPN_PopUpContextMenu(NPP instance, NPMenu* menu);
 NPBool      NPN_ConvertPoint(NPP instance, double sourceX, double sourceY, NPCoordinateSpace sourceSpace, double *destX, double *destY, NPCoordinateSpace destSpace);
 
 #ifdef __cplusplus
 }  /* end extern "C" */
 #endif
 
 #endif /* _NPAPI_H_ */