Fix npapi so that drawing models users can compile properly. Need NPPV version of NPNVpluginDrawingModel. Original patch by Shane Caraveo. API compat patch for WebKit is WebKit bug 15946, WebKit patch by Josh committed. b=403418 r=josh sr=jst

git-svn-id: svn://10.0.0.236/trunk@239352 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/modules/plugin/base/public/npapi.h

@@ -37,7 +37,7 @@
 
 
 /*
- *  npapi.h $Revision: 3.47 $
+ *  npapi.h $Revision: 3.48 $
  *  Netscape client plug-in API spec
  */
 
@@ -412,6 +412,10 @@ typedef enum {
    * in Mozilla 1.8b2 (NPAPI minor version 15).
    */
   NPPVformValue = 16
+#ifdef XP_MACOSX
+  /* Used for negotiating drawing models */
+  , NPPVpluginDrawingModel = 1000
+#endif
 } NPPVariable;
 
 /*

mozilla/modules/plugin/base/src/ns4xPlugin.cpp

@@ -2117,7 +2117,7 @@ _setvalue(NPP npp, NPPVariable variable, void *result)
     }
       
 #ifdef XP_MACOSX
-    case NPNVpluginDrawingModel: {
+    case NPPVpluginDrawingModel: {
       if (inst) {
         int dModelValue = (int)result;
         inst->SetDrawingModel((NPDrawingModel)dModelValue);