Bug 674240: Update NPAPI headers to npapi-sdk r12. r=bgirard

dom/plugins/base/npapi.h

@@ -366,7 +366,7 @@ typedef enum {
   /* Checks to see if the plug-in would like the browser to load the "src" attribute. */
   NPPVpluginCancelSrcStream = 20,
 
-  NPPVSupportsAdvancedKeyHandling = 21,
+  NPPVsupportsAdvancedKeyHandling = 21,
 
   NPPVpluginUsesDOMForCursorBool = 22
 
@@ -429,6 +429,8 @@ typedef enum {
   , NPNVsupportsCocoaBool = 3001 /* TRUE if the browser supports the Cocoa event model */
   , NPNVsupportsUpdatedCocoaTextInputBool = 3002 /* TRUE if the browser supports the updated
                                                     Cocoa text input specification. */
+  , NPNVsupportsCompositingCoreAnimationPluginsBool = 74656 /* TRUE if the browser supports
+                                                               CA model compositing */
 #endif
 #if (MOZ_PLATFORM_MAEMO == 5) || (MOZ_PLATFORM_MAEMO == 6)
   , NPNVSupportsWindowlessLocal = 2002
@@ -787,7 +789,7 @@ extern "C" {
 /* NPP_* functions are provided by the plugin and called by the navigator. */
 
 #if defined(XP_UNIX)
-char* NPP_GetMIMEDescription(void);
+const char* NPP_GetMIMEDescription(void);
 #endif
 
 NPError NP_LOADDS NPP_New(NPMIMEType pluginType, NPP instance,

dom/plugins/base/npfunctions.h

@@ -282,8 +282,8 @@ typedef NPError (*NP_InitializeFunc)(NPNetscapeFuncs*);
 NPError OSCALL      NP_Initialize(NPNetscapeFuncs* bFuncs);
 typedef NPError     (*NP_ShutdownFunc)(void);
 NPError OSCALL      NP_Shutdown(void);
-typedef char*   (*NP_GetMIMEDescriptionFunc)(void);
+typedef const char* (*NP_GetMIMEDescriptionFunc)(void);
-char*           NP_GetMIMEDescription(void);
+const char*         NP_GetMIMEDescription(void);
 #ifdef __cplusplus
 }
 #endif
@@ -299,8 +299,8 @@ extern "C" {
 #endif
 typedef char*          (*NP_GetPluginVersionFunc)(void);
 NP_EXPORT(char*)       NP_GetPluginVersion(void);
-typedef char*      (*NP_GetMIMEDescriptionFunc)(void);
+typedef const char*    (*NP_GetMIMEDescriptionFunc)(void);
-NP_EXPORT(char*)   NP_GetMIMEDescription(void);
+NP_EXPORT(const char*) NP_GetMIMEDescription(void);
 #ifdef XP_MACOSX
 typedef NPError        (*NP_InitializeFunc)(NPNetscapeFuncs*);
 NP_EXPORT(NPError)     NP_Initialize(NPNetscapeFuncs* bFuncs);

dom/plugins/base/npruntime.h

@@ -167,14 +167,14 @@ NP_END_MACRO
 #define STRINGZ_TO_NPVARIANT(_val, _v)                                        \
 NP_BEGIN_MACRO                                                                \
     (_v).type = NPVariantType_String;                                         \
-    NPString str = { _val, uint32_t(strlen(_val)) };                          \
+    NPString str = { _val, (uint32_t)(strlen(_val)) };                        \
     (_v).value.stringValue = str;                                             \
 NP_END_MACRO
 
 #define STRINGN_TO_NPVARIANT(_val, _len, _v)                                  \
 NP_BEGIN_MACRO                                                                \
     (_v).type = NPVariantType_String;                                         \
-    NPString str = { _val, uint32_t(_len) };                                  \
+    NPString str = { _val, (uint32_t)(_len) };                                \
     (_v).value.stringValue = str;                                             \
 NP_END_MACRO
 

dom/plugins/test/testplugin/nptest.cpp

@@ -569,9 +569,9 @@ NP_GetPluginVersion()
 static char sMimeDescription[] = "application/x-test:tst:Test mimetype";
 
 #if defined(XP_UNIX)
-NP_EXPORT(char*) NP_GetMIMEDescription()
+NP_EXPORT(const char*) NP_GetMIMEDescription()
 #elif defined(XP_WIN) || defined(XP_OS2)
-char* NP_GetMIMEDescription()
+const char* NP_GetMIMEDescription()
 #endif
 {
   return sMimeDescription;