Removed NPN wrappers since these no longer need to be defined to make the QT plug...

	since 3828925 has been fixed.

        Reviewed by john.

        * Plugins.subproj/WebNetscapePluginPackage.m:
        (-[WebNetscapePluginPackage load]): use under-bar symbols since non-under-bar wrappers have been removed
        * Plugins.subproj/npapi.m: removed NPN wrappers
        * WebKit.exp: removed symbols

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

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d7b86d24e747d832ed964b7a87ed216aae9d4a8d..0a579dca22e103a882c40c86a68378d9f148bafa 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2004-12-08  Chris Blumenberg  <cblu@apple.com>
+
+       Removed NPN wrappers since these no longer need to be defined to make the QT plug-in work
+       since 3828925 has been fixed.
+
+        Reviewed by john.
+
+        * Plugins.subproj/WebNetscapePluginPackage.m:
+        (-[WebNetscapePluginPackage load]): use under-bar symbols since non-under-bar wrappers have been removed
+        * Plugins.subproj/npapi.m: removed NPN wrappers
+        * WebKit.exp: removed symbols
+
 2004-12-08  Ken Kocienda  <kocienda@apple.com>
 
         Reviewed by Darin

diff --git a/WebKit/Plugins.subproj/WebNetscapePluginPackage.m b/WebKit/Plugins.subproj/WebNetscapePluginPackage.m
index 9a49523c6564c1953ad50d9fc60ec7b436992ba6..9963341310970f2846dcb074db1dc0698f86262b 100644 (file)
--- a/WebKit/Plugins.subproj/WebNetscapePluginPackage.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginPackage.m
@@ -8,6 +8,8 @@
 #import <WebKit/WebKitLogging.h>
 #import <WebKit/WebKitNSStringExtras.h>
 
+#import <JavaScriptCore/npruntime_impl.h>
+
 #import <CoreFoundation/CFBundlePriv.h>
 
 #import <Foundation/NSPrivateDecls.h>
@@ -446,22 +448,22 @@ static TransitionVector tVectorForFunctionPointer(FunctionPointer);
         browserFuncs.getJavaEnv = (NPN_GetJavaEnvProcPtr)tVectorForFunctionPointer((FunctionPointer)NPN_GetJavaEnv);
         browserFuncs.getJavaPeer = (NPN_GetJavaPeerProcPtr)tVectorForFunctionPointer((FunctionPointer)NPN_GetJavaPeer);
 
-        browserFuncs.releasevariantvalue = (NPN_ReleaseVariantValueProcPtr)tVectorForFunctionPointer((FunctionPointer)NPN_ReleaseVariantValue);
-        browserFuncs.getstringidentifier = (NPN_GetStringIdentifierProcPtr)tVectorForFunctionPointer((FunctionPointer)NPN_GetStringIdentifier);
-        browserFuncs.getstringidentifiers = (NPN_GetStringIdentifiersProcPtr)tVectorForFunctionPointer((FunctionPointer)NPN_GetStringIdentifiers);
-        browserFuncs.getintidentifier = (NPN_GetIntIdentifierProcPtr)tVectorForFunctionPointer((FunctionPointer)NPN_GetIntIdentifier);
-        browserFuncs.identifierisstring = (NPN_IdentifierIsStringProcPtr)tVectorForFunctionPointer((FunctionPointer)NPN_IdentifierIsString);
-        browserFuncs.utf8fromidentifier = (NPN_UTF8FromIdentifierProcPtr)tVectorForFunctionPointer((FunctionPointer)NPN_UTF8FromIdentifier);
-        browserFuncs.createobject = (NPN_CreateObjectProcPtr)tVectorForFunctionPointer((FunctionPointer)NPN_CreateObject);
-        browserFuncs.retainobject = (NPN_RetainObjectProcPtr)tVectorForFunctionPointer((FunctionPointer)NPN_RetainObject);
-        browserFuncs.releaseobject = (NPN_ReleaseObjectProcPtr)tVectorForFunctionPointer((FunctionPointer)NPN_ReleaseObject);
-        browserFuncs.invoke = (NPN_InvokeProcPtr)tVectorForFunctionPointer((FunctionPointer)NPN_Invoke);
-        browserFuncs.invokeDefault = (NPN_InvokeDefaultProcPtr)tVectorForFunctionPointer((FunctionPointer)NPN_InvokeDefault);
-        browserFuncs.evaluate = (NPN_EvaluateProcPtr)tVectorForFunctionPointer((FunctionPointer)NPN_Evaluate);
-        browserFuncs.getproperty = (NPN_GetPropertyProcPtr)tVectorForFunctionPointer((FunctionPointer)NPN_GetProperty);
-        browserFuncs.setproperty = (NPN_SetPropertyProcPtr)tVectorForFunctionPointer((FunctionPointer)NPN_SetProperty);
-        browserFuncs.removeproperty = (NPN_RemovePropertyProcPtr)tVectorForFunctionPointer((FunctionPointer)NPN_RemoveProperty);
-        browserFuncs.setexception = (NPN_SetExceptionProcPtr)tVectorForFunctionPointer((FunctionPointer)NPN_SetException);
+        browserFuncs.releasevariantvalue = (NPN_ReleaseVariantValueProcPtr)tVectorForFunctionPointer((FunctionPointer)_NPN_ReleaseVariantValue);
+        browserFuncs.getstringidentifier = (NPN_GetStringIdentifierProcPtr)tVectorForFunctionPointer((FunctionPointer)_NPN_GetStringIdentifier);
+        browserFuncs.getstringidentifiers = (NPN_GetStringIdentifiersProcPtr)tVectorForFunctionPointer((FunctionPointer)_NPN_GetStringIdentifiers);
+        browserFuncs.getintidentifier = (NPN_GetIntIdentifierProcPtr)tVectorForFunctionPointer((FunctionPointer)_NPN_GetIntIdentifier);
+        browserFuncs.identifierisstring = (NPN_IdentifierIsStringProcPtr)tVectorForFunctionPointer((FunctionPointer)_NPN_IdentifierIsString);
+        browserFuncs.utf8fromidentifier = (NPN_UTF8FromIdentifierProcPtr)tVectorForFunctionPointer((FunctionPointer)_NPN_UTF8FromIdentifier);
+        browserFuncs.createobject = (NPN_CreateObjectProcPtr)tVectorForFunctionPointer((FunctionPointer)_NPN_CreateObject);
+        browserFuncs.retainobject = (NPN_RetainObjectProcPtr)tVectorForFunctionPointer((FunctionPointer)_NPN_RetainObject);
+        browserFuncs.releaseobject = (NPN_ReleaseObjectProcPtr)tVectorForFunctionPointer((FunctionPointer)_NPN_ReleaseObject);
+        browserFuncs.invoke = (NPN_InvokeProcPtr)tVectorForFunctionPointer((FunctionPointer)_NPN_Invoke);
+        browserFuncs.invokeDefault = (NPN_InvokeDefaultProcPtr)tVectorForFunctionPointer((FunctionPointer)_NPN_InvokeDefault);
+        browserFuncs.evaluate = (NPN_EvaluateProcPtr)tVectorForFunctionPointer((FunctionPointer)_NPN_Evaluate);
+        browserFuncs.getproperty = (NPN_GetPropertyProcPtr)tVectorForFunctionPointer((FunctionPointer)_NPN_GetProperty);
+        browserFuncs.setproperty = (NPN_SetPropertyProcPtr)tVectorForFunctionPointer((FunctionPointer)_NPN_SetProperty);
+        browserFuncs.removeproperty = (NPN_RemovePropertyProcPtr)tVectorForFunctionPointer((FunctionPointer)_NPN_RemoveProperty);
+        browserFuncs.setexception = (NPN_SetExceptionProcPtr)tVectorForFunctionPointer((FunctionPointer)_NPN_SetException);
 
 #if !LOG_DISABLED
         CFAbsoluteTime mainStart = CFAbsoluteTimeGetCurrent();
@@ -541,22 +543,22 @@ static TransitionVector tVectorForFunctionPointer(FunctionPointer);
         browserFuncs.getJavaEnv = NPN_GetJavaEnv;
         browserFuncs.getJavaPeer = NPN_GetJavaPeer;
 
-        browserFuncs.releasevariantvalue = NPN_ReleaseVariantValue;
-        browserFuncs.getstringidentifier = NPN_GetStringIdentifier;
-        browserFuncs.getstringidentifiers = NPN_GetStringIdentifiers;
-        browserFuncs.getintidentifier = NPN_GetIntIdentifier;
-        browserFuncs.identifierisstring = NPN_IdentifierIsString;
-        browserFuncs.utf8fromidentifier = NPN_UTF8FromIdentifier;
-        browserFuncs.createobject = NPN_CreateObject;
-        browserFuncs.retainobject = NPN_RetainObject;
-        browserFuncs.releaseobject = NPN_ReleaseObject;
-        browserFuncs.invoke = NPN_Invoke;
-        browserFuncs.invokeDefault = NPN_InvokeDefault;
-        browserFuncs.evaluate = NPN_Evaluate;
-        browserFuncs.getproperty = NPN_GetProperty;
-        browserFuncs.setproperty = NPN_SetProperty;
-        browserFuncs.removeproperty = NPN_RemoveProperty;
-        browserFuncs.setexception = NPN_SetException;
+        browserFuncs.releasevariantvalue = _NPN_ReleaseVariantValue;
+        browserFuncs.getstringidentifier = _NPN_GetStringIdentifier;
+        browserFuncs.getstringidentifiers = _NPN_GetStringIdentifiers;
+        browserFuncs.getintidentifier = _NPN_GetIntIdentifier;
+        browserFuncs.identifierisstring = _NPN_IdentifierIsString;
+        browserFuncs.utf8fromidentifier = _NPN_UTF8FromIdentifier;
+        browserFuncs.createobject = _NPN_CreateObject;
+        browserFuncs.retainobject = _NPN_RetainObject;
+        browserFuncs.releaseobject = _NPN_ReleaseObject;
+        browserFuncs.invoke = _NPN_Invoke;
+        browserFuncs.invokeDefault = _NPN_InvokeDefault;
+        browserFuncs.evaluate = _NPN_Evaluate;
+        browserFuncs.getproperty = _NPN_GetProperty;
+        browserFuncs.setproperty = _NPN_SetProperty;
+        browserFuncs.removeproperty = _NPN_RemoveProperty;
+        browserFuncs.setexception = _NPN_SetException;
 
 #if !LOG_DISABLED
         CFAbsoluteTime initializeStart = CFAbsoluteTimeGetCurrent();

diff --git a/WebKit/Plugins.subproj/npapi.m b/WebKit/Plugins.subproj/npapi.m
index c114b22e9576d0af4f4becbf1ee60feaf306ea9f..cf5ec04f03bc61b306e89f7d5cdd71a308f0e95d 100644 (file)
--- a/WebKit/Plugins.subproj/npapi.m
+++ b/WebKit/Plugins.subproj/npapi.m
@@ -8,8 +8,6 @@
 #import <WebKit/WebBaseNetscapePluginViewPrivate.h>
 #import <WebKit/WebKitLogging.h>
 
-#import <JavaScriptCore/npruntime_impl.h>
-
 WebBaseNetscapePluginView *pluginViewForInstance(NPP instance);
 
 // general plug-in to browser functions
@@ -140,105 +138,3 @@ void* NPN_GetJavaPeer(NPP instance)
     LOG(Plugins, "NPN_GetJavaPeer");
     return NULL;
 }
-
-void NPN_ReleaseVariantValue(NPVariant *variant)
-{
-    _NPN_ReleaseVariantValue(variant);
-}
-
-NPIdentifier NPN_GetStringIdentifier(const NPUTF8 *name)
-{
-    return _NPN_GetStringIdentifier(name);
-}
-
-void NPN_GetStringIdentifiers(const NPUTF8 **names, int32_t nameCount, NPIdentifier *identifiers)
-{
-    _NPN_GetStringIdentifiers(names, nameCount, identifiers);
-}
-
-NPIdentifier NPN_GetIntIdentifier(int32_t intid)
-{
-    return _NPN_GetIntIdentifier(intid);
-}
-
-bool NPN_IdentifierIsString(NPIdentifier identifier)
-{
-    return _NPN_IdentifierIsString(identifier);
-}
-
-NPUTF8 *NPN_UTF8FromIdentifier(NPIdentifier identifier)
-{
-    return _NPN_UTF8FromIdentifier(identifier);
-}
-
-int32_t NPN_IntFromIdentifier(NPIdentifier identifier)
-{
-    return _NPN_IntFromIdentifier(identifier);
-}
-
-NPObject *NPN_CreateObject(NPP npp, NPClass *aClass)
-{
-    return _NPN_CreateObject(npp, aClass);
-}
-
-NPObject *NPN_RetainObject(NPObject *obj)
-{
-    return _NPN_RetainObject(obj);
-}
-
-void NPN_ReleaseObject(NPObject *obj)
-{
-    _NPN_ReleaseObject(obj);
-}
-
-bool NPN_Invoke(NPP npp, NPObject *npobj, NPIdentifier methodName, const NPVariant *args, uint32_t argCount, NPVariant *result)
-{
-    return _NPN_Invoke(npp, npobj, methodName, args, argCount, result);
-}
-
-bool NPN_InvokeDefault(NPP npp, NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result)
-{
-    return _NPN_InvokeDefault(npp, npobj, args, argCount, result);
-}
-
-bool NPN_Evaluate(NPP npp, NPObject *npobj, NPString *script, NPVariant *result)
-{
-    return _NPN_Evaluate(npp, npobj, script, result);
-}
-
-bool NPN_GetProperty(NPP npp, NPObject *npobj, NPIdentifier propertyName, NPVariant *result)
-{
-    return _NPN_GetProperty(npp, npobj,  propertyName, result);
-}
-
-bool NPN_SetProperty(NPP npp, NPObject *npobj, NPIdentifier propertyName, const NPVariant *value)
-{
-    return _NPN_SetProperty(npp, npobj, propertyName, value);
-}
-
-bool NPN_RemoveProperty(NPP npp, NPObject *npobj, NPIdentifier propertyName)
-{
-    return _NPN_RemoveProperty(npp, npobj, propertyName);
-}
-
-bool NPN_HasProperty(NPP npp, NPObject *npobj, NPIdentifier propertyName)
-{
-    return _NPN_HasProperty(npp, npobj, propertyName);
-}
-
-bool NPN_HasMethod(NPP npp, NPObject *npobj, NPIdentifier methodName)
-{
-    return _NPN_HasMethod(npp, npobj, methodName);
-}
-
-void NPN_SetException(NPObject *obj, NPString *message)
-{
-    _NPN_SetException(obj, message);
-}
-
-bool NPN_Call(NPP npp, NPObject *npobj, NPIdentifier methodName, const NPVariant *args, uint32_t argCount, NPVariant *result);
-
-bool NPN_Call(NPP npp, NPObject *npobj, NPIdentifier methodName, const NPVariant *args, uint32_t argCount, NPVariant *result)
-{
-    return _NPN_Invoke(npp, npobj, methodName, args, argCount, result);
-}

diff --git a/WebKit/WebKit.exp b/WebKit/WebKit.exp
index b241e886fde245da20626587c6ccc637c41d5188..5727b22e7f6d98764c925cee8a2f3a6942f26914 100644 (file)
--- a/WebKit/WebKit.exp
+++ b/WebKit/WebKit.exp
@@ -94,25 +94,3 @@ _HIWebViewGetWebView
 _HIWebViewCreate
 _WebConvertNSImageToCGImageRef
 _WebInitForCarbon
-
-## FIXME: These symbols are here so that the QT plug-in can use them. They should not be using them directly.
-_NPN_ReleaseVariantValue
-_NPN_GetStringIdentifier
-_NPN_GetStringIdentifiers
-_NPN_GetIntIdentifier
-_NPN_IdentifierIsString
-_NPN_UTF8FromIdentifier
-_NPN_IntFromIdentifier
-_NPN_CreateObject
-_NPN_RetainObject
-_NPN_ReleaseObject
-_NPN_Invoke
-_NPN_InvokeDefault
-_NPN_Evaluate
-_NPN_GetProperty
-_NPN_SetProperty
-_NPN_RemoveProperty
-_NPN_HasProperty
-_NPN_HasMethod
-_NPN_SetException
-_NPN_Call