WebKit merge 40722:40785 (part 1)

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 90 matching lines @@
 
 #ifdef XP_WIN
     #include <windows.h>
 #endif
 
 /*----------------------------------------------------------------------*/
 /*             Plugin Version Constants                                 */
 /*----------------------------------------------------------------------*/
 
 #define NP_VERSION_MAJOR 0
-#define NP_VERSION_MINOR 23
+#define NP_VERSION_MINOR 24
 
 /*----------------------------------------------------------------------*/
 /*             Definition of Basic Types                                */
 /*----------------------------------------------------------------------*/
 
 #ifndef _UINT16
 #define _UINT16
 typedef unsigned short uint16;
 #endif
 
@@ skipping 214 matching lines @@
 
     NPPVpluginUrlRequestsDisplayedBool = 17, /* Not implemented in WebKit */
 
     /* Checks if the plugin is interested in receiving the http body of
      * failed http requests (http status != 200).
      */
     NPPVpluginWantsAllNetworkStreams = 18,
 
     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
@@ skipping 374 matching lines @@
 #define NPVERS_HAS_NPRUNTIME_SCRIPTING    14
 #define NPVERS_HAS_FORM_VALUES            15  /* Not implemented in WebKit; see bug 13061 */
 #define NPVERS_HAS_POPUPS_ENABLED_STATE   16  /* Not implemented in WebKit */
 #define NPVERS_HAS_RESPONSE_HEADERS       17
 #define NPVERS_HAS_NPOBJECT_ENUM          18
 #define NPVERS_HAS_PLUGIN_THREAD_ASYNC_CALL 19
 #define NPVERS_HAS_ALL_NETWORK_STREAMS    20
 #define NPVERS_HAS_URL_AND_AUTH_INFO      21
 #define NPVERS_HAS_PRIVATE_MODE           22
 #define NPVERS_MACOSX_HAS_EVENT_MODELS    23
-
+#define NPVERS_HAS_CANCEL_SRC_STREAM      24
 
 /*----------------------------------------------------------------------*/
 /*             Function Prototypes                */
 /*----------------------------------------------------------------------*/
 
 #if defined(_WINDOWS) && !defined(WIN32)
 #define NP_LOADDS  _loadds
 #else
 #define NP_LOADDS
 #endif
@@ skipping 81 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_ */