JavaScriptCore:

        Reviewed by Darin.

        - http://bugs.webkit.org/show_bug.cgi?id=15946
          add NPPValue NPPVpluginDrawingModel (Mozilla bug 403418 compat)

        * bindings/npapi.h:

WebKit/mac:

        Reviewed by Darin.

        - http://bugs.webkit.org/show_bug.cgi?id=15946
          add NPPValue NPPVpluginDrawingModel (Mozilla bug 403418 compat)

        * Plugins/WebBaseNetscapePluginView.mm:
        (-[WebBaseNetscapePluginView setVariable:value:]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@27745 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index f756bc6dfce6c608dbf4d7c3fbc863c98f8cee68..7eb293a7cde3e89b42e47d75209860e8bf38156e 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2007-11-12  Josh Aas  <joshmoz@gmail.com>
+
+        Reviewed by Darin.
+
+        - http://bugs.webkit.org/show_bug.cgi?id=15946
+          add NPPValue NPPVpluginDrawingModel (Mozilla bug 403418 compat)
+
+        * bindings/npapi.h:
+
 2007-11-12  Darin Adler  <darin@apple.com>
 
         Reviewed by Sam.

diff --git a/JavaScriptCore/bindings/npapi.h b/JavaScriptCore/bindings/npapi.h
index 9505f35621a7af48056f57dc78421fc964d1eeee..ddbd4ec23c3b413c8d69dc47cec099511d1f3eae 100644 (file)
--- a/JavaScriptCore/bindings/npapi.h
+++ b/JavaScriptCore/bindings/npapi.h
@@ -330,7 +330,11 @@ typedef enum {
      * form submission if the plugin is part of a form. Use
      * NPN_MemAlloc() to allocate memory for the string data.
      */
-    NPPVformValue = 16    /* Not implemented in WebKit */
+    NPPVformValue = 16,    /* Not implemented in WebKit */
+#ifdef XP_MACOSX
+    /* Used for negotiating drawing models */
+    NPPVpluginDrawingModel = 1000
+#endif
 } NPPVariable;
 
 /*

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 1b40105e400d63f2600b1891aa6c04ba251aa103..e862106bc98955d5750dc04f194feb517b2a8a9c 100644 (file)
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,13 @@
+2007-11-12  Josh Aas  <joshmoz@gmail.com>
+
+        Reviewed by Darin.
+
+        - http://bugs.webkit.org/show_bug.cgi?id=15946
+          add NPPValue NPPVpluginDrawingModel (Mozilla bug 403418 compat)
+
+        * Plugins/WebBaseNetscapePluginView.mm:
+        (-[WebBaseNetscapePluginView setVariable:value:]):
+
 2007-11-12  Alexey Proskuryakov  <ap@webkit.org>
 
         Reviewed by Darin.

diff --git a/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm b/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm
index fc9e1a91e159090f7b921ef6fb68345809ef20bc..c61133250d7e4c1a0d1f2f5a8e2a7c85fe3889a4 100644 (file)
--- a/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm
+++ b/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm
@@ -2561,7 +2561,7 @@ static OSStatus TSMEventHandler(EventHandlerCallRef inHandlerRef, EventRef inEve
             return NPERR_NO_ERROR;
         }
         
-        case NPNVpluginDrawingModel:
+        case NPPVpluginDrawingModel:
         {
             // Can only set drawing model inside NPP_New()
             if (self != [[self class] currentPluginView])