WebKit merge 41660:41709 (WebKit side)....

third_party/WebKit/WebCore/bridge/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 333 matching lines @@
     NPPVpluginPrivateModeBool = 19,
     
     /* Checks to see if the plug-in would like the browser to load the "src" attribute. */
     NPPVpluginCancelSrcStream = 20,
 
 #ifdef XP_MACOSX
     /* Used for negotiating drawing models */
     NPPVpluginDrawingModel = 1000,
     /* Used for negotiating event models */
     NPPVpluginEventModel = 1001,
-    /* The plug-in text input vtable */
-    NPPVpluginTextInputFuncs = 1002,
     /* In the NPDrawingModelCoreAnimation drawing model, the browser asks the plug-in for a Core Animation layer. */
     NPPVpluginCoreAnimationLayer = 1003
 #endif
 } NPPVariable;
 
 /*
  * List of variable names for which NPN_GetValue is implemented by Mozilla
  */
 typedef enum {
     NPNVxDisplay = 1,
@@ skipping 28 matching lines @@
 #endif
     , NPNVsupportsCoreGraphicsBool = 2001 /* TRUE if the browser supports the CoreGraphics drawing model */
     , NPNVsupportsOpenGLBool = 2002 /* TRUE if the browser supports the OpenGL drawing model (CGL on Mac) */
     , NPNVsupportsCoreAnimationBool = 2003 /* TRUE if the browser supports the CoreAnimation drawing model */
 
 #ifndef NP_NO_CARBON
     , NPNVsupportsCarbonBool = 3000 /* TRUE if the browser supports the Carbon event model */
 #endif
     , NPNVsupportsCocoaBool = 3001 /* TRUE if the browser supports the Cocoa event model */
     
-    , NPNVbrowserTextInputFuncs = 1002 /* The browser text input vtable */
 #endif /* XP_MACOSX */
 } NPNVariable;
 
 typedef enum {
    NPNURLVCookie = 501,
    NPNURLVProxy
 } NPNURLVariable;
 
 /*
  * The type of a NPWindow - it specifies the type of the data structure
@@ skipping 37 matching lines @@
     NPCocoaEventMouseMoved,
     NPCocoaEventMouseEntered,
     NPCocoaEventMouseExited,
     NPCocoaEventMouseDragged,
     NPCocoaEventKeyDown,
     NPCocoaEventKeyUp,
     NPCocoaEventFlagsChanged,
     NPCocoaEventFocusChanged,
     NPCocoaEventWindowFocusChanged,
     NPCocoaEventScrollWheel,
+    NPCocoaEventTextInput
 } NPCocoaEventType;
 
 typedef struct _NPNSString NPNSString;
 typedef struct _NPNSWindow NPNSWindow;
 typedef struct _NPNSMenu NPNSMenu;
 
 typedef struct _NPCocoaEvent {
     NPCocoaEventType type;
     uint32 version;
     
@@ skipping 16 matching lines @@
             uint16 keyCode;
         } key;
         struct {
             double x;
             double y;
             double width;
             double height;
         } draw;
         struct {
             NPBool hasFocus;
-        } focus;        
+        } focus;
+        struct {
+            NPNSString *text;
+        } text;
     } data;
 } NPCocoaEvent;
 
 #endif
 
 typedef struct _NPWindow
 {
     void*    window;     /* Platform specific window handle */
     int32    x;            /* Position of top left corner relative */
     int32    y;            /*    to a netscape page.                    */
@@ skipping 326 matching lines @@
 void        NPN_PluginThreadAsyncCall(NPP instance, void (*func) (void *), void *userData);
 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);
 
 #ifdef __cplusplus
 }  /* end extern "C" */
 #endif
 
 #endif /* _NPAPI_H_ */