[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
cblu
cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:11:33 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit f57722b22149b6a3728eaf44c03a78ccc3db31f7
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed May 8 20:22:59 2002 +0000
Cleaned up mach-o plug-in support.
Changed the init method in IFPlugin to initWithPath.
* Plugins.subproj/IFPlugin.h:
* Plugins.subproj/IFPlugin.m:
(-[IFPlugin initWithPath:]):
(-[IFPlugin load]):
* Plugins.subproj/IFPluginDatabase.m:
(findPlugins):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1111 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 63dae0c..bd3769b 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2002-05-08 Chris Blumenberg <cblu at apple.com>
+
+ Cleaned up mach-o plug-in support.
+
+ Changed the init method in IFPlugin to initWithPath.
+
+ * Plugins.subproj/IFPlugin.h:
+ * Plugins.subproj/IFPlugin.m:
+ (-[IFPlugin initWithPath:]):
+ (-[IFPlugin load]):
+ * Plugins.subproj/IFPluginDatabase.m:
+ (findPlugins):
+
2002-05-08 Darin Adler <darin at apple.com>
* WebView.subproj/IFWebDataSourcePrivate.mm: (-[IFWebDataSource _setTitle:]):
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 63dae0c..bd3769b 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,16 @@
+2002-05-08 Chris Blumenberg <cblu at apple.com>
+
+ Cleaned up mach-o plug-in support.
+
+ Changed the init method in IFPlugin to initWithPath.
+
+ * Plugins.subproj/IFPlugin.h:
+ * Plugins.subproj/IFPlugin.m:
+ (-[IFPlugin initWithPath:]):
+ (-[IFPlugin load]):
+ * Plugins.subproj/IFPluginDatabase.m:
+ (findPlugins):
+
2002-05-08 Darin Adler <darin at apple.com>
* WebView.subproj/IFWebDataSourcePrivate.mm: (-[IFWebDataSource _setTitle:]):
diff --git a/WebKit/Plugins.subproj/IFPlugin.h b/WebKit/Plugins.subproj/IFPlugin.h
index cbd3ed3..0bfaad3 100644
--- a/WebKit/Plugins.subproj/IFPlugin.h
+++ b/WebKit/Plugins.subproj/IFPlugin.h
@@ -55,7 +55,7 @@
NPP_ShutdownProcPtr NPP_Shutdown;
}
-- (BOOL)initializeWithPath:(NSString *)pluginPath;
+- initWithPath:(NSString *)pluginPath;
- (void)getPluginInfoForResourceFile:(SInt16)resRef;
- (void)load;
- (void)unload;
diff --git a/WebKit/Plugins.subproj/IFPlugin.m b/WebKit/Plugins.subproj/IFPlugin.m
index bf1ddbe..29378d4 100644
--- a/WebKit/Plugins.subproj/IFPlugin.m
+++ b/WebKit/Plugins.subproj/IFPlugin.m
@@ -29,7 +29,7 @@
@implementation IFPlugin
-- (BOOL)initializeWithPath:(NSString *)pluginPath
+- initWithPath:(NSString *)pluginPath
{
NSFileManager *fileManager;
NSDictionary *fileInfo;
@@ -46,16 +46,16 @@
err = FSPathMakeRef((UInt8 *)[pluginPath cString], &fref, NULL);
if(err != noErr){
WEBKITDEBUG("IFPlugin: FSPathMakeRef failed. Error=%d\n", err);
- return FALSE;
+ return nil;
}
resRef = FSOpenResFile(&fref, fsRdPerm);
if(resRef <= noErr){
WEBKITDEBUG("IFPlugin: FSOpenResFile failed. Can't open resource file: %s, Error=%d\n", [pluginPath lossyCString], err);
- return FALSE;
+ return nil;
}
[self getPluginInfoForResourceFile:resRef];
isBundle = FALSE;
- }else return FALSE;
+ }else return nil;
}else if([[fileInfo objectForKey:@"NSFileType"] isEqualToString:@"NSFileTypeDirectory"]){ //bundle plug-in
pluginURL = CFURLCreateWithFileSystemPath(NULL, (CFStringRef)pluginPath, kCFURLPOSIXPathStyle, TRUE);
@@ -66,11 +66,11 @@
[self getPluginInfoForResourceFile:resRef];
isBundle = TRUE;
}else{
- return FALSE;
+ return nil;
}
CFRelease(pluginURL);
}else{
- return FALSE;
+ return nil;
}
filename = [pluginPath lastPathComponent];
@@ -78,7 +78,7 @@
[path retain];
[filename retain];
isLoaded = FALSE;
- return TRUE;
+ return self;
}
- (void)getPluginInfoForResourceFile:(SInt16)resRef
@@ -135,8 +135,8 @@
FSSpec spec;
FSRef fref;
mainFuncPtr pluginMainFunc;
- initializeFuncPtr NPP_Initialize = NULL;
- getEntryPointsFuncPtr NPP_GetEntryPoints = NULL;
+ initializeFuncPtr NP_Initialize = NULL;
+ getEntryPointsFuncPtr NP_GetEntryPoints = NULL;
NPError npErr;
Boolean didLoad;
NSBundle *tempBundle;
@@ -167,9 +167,9 @@
if(isCFM){
pluginMainFunc = (mainFuncPtr)CFBundleGetFunctionPointerForName(bundle, CFSTR("main") );
}else{
- NPP_Initialize = (initializeFuncPtr)CFBundleGetFunctionPointerForName(bundle, CFSTR("NPP_Initialize") );
- NPP_GetEntryPoints = (getEntryPointsFuncPtr)CFBundleGetFunctionPointerForName(bundle, CFSTR("NPP_GetEntryPoints") );
- NPP_Shutdown = (NPP_ShutdownProcPtr)CFBundleGetFunctionPointerForName(bundle, CFSTR("NPP_Shutdown") );
+ NP_Initialize = (initializeFuncPtr)CFBundleGetFunctionPointerForName(bundle, CFSTR("NP_Initialize") );
+ NP_GetEntryPoints = (getEntryPointsFuncPtr)CFBundleGetFunctionPointerForName(bundle, CFSTR("NP_GetEntryPoints") );
+ NPP_Shutdown = (NPP_ShutdownProcPtr)CFBundleGetFunctionPointerForName(bundle, CFSTR("NP_Shutdown") );
}
}else{ // single CFM file
err = FSPathMakeRef((UInt8 *)[path cString], &fref, NULL);
@@ -259,8 +259,8 @@
browserFuncs.getJavaEnv = NPN_GetJavaEnv;
browserFuncs.getJavaPeer = NPN_GetJavaPeer;
- NPP_Initialize(&browserFuncs);
- NPP_GetEntryPoints(&pluginFuncs);
+ NP_Initialize(&browserFuncs);
+ NP_GetEntryPoints(&pluginFuncs);
pluginSize = pluginFuncs.size;
pluginVersion = pluginFuncs.version;
diff --git a/WebKit/Plugins.subproj/IFPluginDatabase.m b/WebKit/Plugins.subproj/IFPluginDatabase.m
index c79532c..8b71862 100644
--- a/WebKit/Plugins.subproj/IFPluginDatabase.m
+++ b/WebKit/Plugins.subproj/IFPluginDatabase.m
@@ -167,7 +167,7 @@ NSArray *findPlugins(void)
for(i=0; i<[pluginPaths count]; i++){
plugin = [IFPlugin alloc];
- if([plugin initializeWithPath:[pluginPaths objectAtIndex:i]]){
+ if([plugin initWithPath:[pluginPaths objectAtIndex:i]]){
[plugin retain];
[pluginArray addObject:plugin];
WEBKITDEBUG("Found plugin: %s\n", [[plugin name] lossyCString]);
diff --git a/WebKit/Plugins.subproj/WebPlugin.h b/WebKit/Plugins.subproj/WebPlugin.h
index cbd3ed3..0bfaad3 100644
--- a/WebKit/Plugins.subproj/WebPlugin.h
+++ b/WebKit/Plugins.subproj/WebPlugin.h
@@ -55,7 +55,7 @@
NPP_ShutdownProcPtr NPP_Shutdown;
}
-- (BOOL)initializeWithPath:(NSString *)pluginPath;
+- initWithPath:(NSString *)pluginPath;
- (void)getPluginInfoForResourceFile:(SInt16)resRef;
- (void)load;
- (void)unload;
diff --git a/WebKit/Plugins.subproj/WebPlugin.m b/WebKit/Plugins.subproj/WebPlugin.m
index bf1ddbe..29378d4 100644
--- a/WebKit/Plugins.subproj/WebPlugin.m
+++ b/WebKit/Plugins.subproj/WebPlugin.m
@@ -29,7 +29,7 @@
@implementation IFPlugin
-- (BOOL)initializeWithPath:(NSString *)pluginPath
+- initWithPath:(NSString *)pluginPath
{
NSFileManager *fileManager;
NSDictionary *fileInfo;
@@ -46,16 +46,16 @@
err = FSPathMakeRef((UInt8 *)[pluginPath cString], &fref, NULL);
if(err != noErr){
WEBKITDEBUG("IFPlugin: FSPathMakeRef failed. Error=%d\n", err);
- return FALSE;
+ return nil;
}
resRef = FSOpenResFile(&fref, fsRdPerm);
if(resRef <= noErr){
WEBKITDEBUG("IFPlugin: FSOpenResFile failed. Can't open resource file: %s, Error=%d\n", [pluginPath lossyCString], err);
- return FALSE;
+ return nil;
}
[self getPluginInfoForResourceFile:resRef];
isBundle = FALSE;
- }else return FALSE;
+ }else return nil;
}else if([[fileInfo objectForKey:@"NSFileType"] isEqualToString:@"NSFileTypeDirectory"]){ //bundle plug-in
pluginURL = CFURLCreateWithFileSystemPath(NULL, (CFStringRef)pluginPath, kCFURLPOSIXPathStyle, TRUE);
@@ -66,11 +66,11 @@
[self getPluginInfoForResourceFile:resRef];
isBundle = TRUE;
}else{
- return FALSE;
+ return nil;
}
CFRelease(pluginURL);
}else{
- return FALSE;
+ return nil;
}
filename = [pluginPath lastPathComponent];
@@ -78,7 +78,7 @@
[path retain];
[filename retain];
isLoaded = FALSE;
- return TRUE;
+ return self;
}
- (void)getPluginInfoForResourceFile:(SInt16)resRef
@@ -135,8 +135,8 @@
FSSpec spec;
FSRef fref;
mainFuncPtr pluginMainFunc;
- initializeFuncPtr NPP_Initialize = NULL;
- getEntryPointsFuncPtr NPP_GetEntryPoints = NULL;
+ initializeFuncPtr NP_Initialize = NULL;
+ getEntryPointsFuncPtr NP_GetEntryPoints = NULL;
NPError npErr;
Boolean didLoad;
NSBundle *tempBundle;
@@ -167,9 +167,9 @@
if(isCFM){
pluginMainFunc = (mainFuncPtr)CFBundleGetFunctionPointerForName(bundle, CFSTR("main") );
}else{
- NPP_Initialize = (initializeFuncPtr)CFBundleGetFunctionPointerForName(bundle, CFSTR("NPP_Initialize") );
- NPP_GetEntryPoints = (getEntryPointsFuncPtr)CFBundleGetFunctionPointerForName(bundle, CFSTR("NPP_GetEntryPoints") );
- NPP_Shutdown = (NPP_ShutdownProcPtr)CFBundleGetFunctionPointerForName(bundle, CFSTR("NPP_Shutdown") );
+ NP_Initialize = (initializeFuncPtr)CFBundleGetFunctionPointerForName(bundle, CFSTR("NP_Initialize") );
+ NP_GetEntryPoints = (getEntryPointsFuncPtr)CFBundleGetFunctionPointerForName(bundle, CFSTR("NP_GetEntryPoints") );
+ NPP_Shutdown = (NPP_ShutdownProcPtr)CFBundleGetFunctionPointerForName(bundle, CFSTR("NP_Shutdown") );
}
}else{ // single CFM file
err = FSPathMakeRef((UInt8 *)[path cString], &fref, NULL);
@@ -259,8 +259,8 @@
browserFuncs.getJavaEnv = NPN_GetJavaEnv;
browserFuncs.getJavaPeer = NPN_GetJavaPeer;
- NPP_Initialize(&browserFuncs);
- NPP_GetEntryPoints(&pluginFuncs);
+ NP_Initialize(&browserFuncs);
+ NP_GetEntryPoints(&pluginFuncs);
pluginSize = pluginFuncs.size;
pluginVersion = pluginFuncs.version;
diff --git a/WebKit/Plugins.subproj/WebPluginDatabase.m b/WebKit/Plugins.subproj/WebPluginDatabase.m
index c79532c..8b71862 100644
--- a/WebKit/Plugins.subproj/WebPluginDatabase.m
+++ b/WebKit/Plugins.subproj/WebPluginDatabase.m
@@ -167,7 +167,7 @@ NSArray *findPlugins(void)
for(i=0; i<[pluginPaths count]; i++){
plugin = [IFPlugin alloc];
- if([plugin initializeWithPath:[pluginPaths objectAtIndex:i]]){
+ if([plugin initWithPath:[pluginPaths objectAtIndex:i]]){
[plugin retain];
[pluginArray addObject:plugin];
WEBKITDEBUG("Found plugin: %s\n", [[plugin name] lossyCString]);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list