[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 5b192465f3074e409532bbfd766ec27fa62a7e7c
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jul 19 22:32:15 2004 +0000

            Fixed 3721917.  The RealPlayer plugin doesn't support the new
            NPPVpluginScriptableNPObject variable passed to NPP_GetValue and
            incorrectly returns NPERR_NO_ERROR.  We interpret this to the
            mean the variable has been set.  The variable has not been set
            and will consequently be uninitialized.
    
            Reviewed by NOBODY (OOPS!).
    
            * Plugins.subproj/WebBaseNetscapePluginView.m:
            (-[WebBaseNetscapePluginView pluginScriptableObject]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@7054 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 385c4ca..e0c36b5 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2004-07-12  Richard Williamson   <rjw at apple.com>
+
+        Fixed 3721917.  The RealPlayer plugin doesn't support the new 
+        NPPVpluginScriptableNPObject variable passed to NPP_GetValue and
+        incorrectly returns NPERR_NO_ERROR.  We interpret this to the
+        mean the variable has been set.  The variable has not been set 
+        and will consequently be uninitialized.
+
+        Reviewed by NOBODY (OOPS!).
+
+        * Plugins.subproj/WebBaseNetscapePluginView.m:
+        (-[WebBaseNetscapePluginView pluginScriptableObject]):
+
 2004-07-19  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by Richard
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
index c07b4dc..af3eb34 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
@@ -1267,7 +1267,7 @@ static OSStatus TSMEventHandler(EventHandlerCallRef inHandlerRef, EventRef inEve
 - (void *)pluginScriptableObject
 {
     if (NPP_GetValue) {
-        void *value;
+        void *value = 0;
         NPError npErr = NPP_GetValue (instance, NPPVpluginScriptableNPObject, (void *)&value);
         if (npErr == NPERR_NO_ERROR) {
             return value;
diff --git a/WebKit/Plugins.subproj/npruntime.h b/WebKit/Plugins.subproj/npruntime.h
index 9cc7a08..461f3f0 100644
--- a/WebKit/Plugins.subproj/npruntime.h
+++ b/WebKit/Plugins.subproj/npruntime.h
@@ -171,7 +171,11 @@ void NPN_InitializeVariantWithVariant (NPVariant *destination, const NPVariant *
 	NPVariant (with type NPVariantUndefinedType)          Undefined
 	NPVariant (with type NPVariantNullType)               Null
 	NPArray                                               Array (restricted)
+<<<<<<< npruntime.h
+	NPObject                                               Object or (NPObject wrapper)
+=======
 	NObject                                               Object or (NPObject wrapper)
+>>>>>>> 1.18
 
 */
 

-- 
WebKit Debian packaging