[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:52:21 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit c885e864bc240085597ccb5447eb355cfc42409b
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 22 21:40:49 2002 +0000
- Moved things around to make room for new plug-in API.
- Renamed WebNetscapePlugin to WebNetscapePluginPackage.
- Renamed WebNetscapePluginDatabase to WebPluginDatabase.
* Plugins.subproj/WebBaseNetscapePluginStream.m:
(-[WebBaseNetscapePluginStream setPluginPointer:]):
* Plugins.subproj/WebBaseNetscapePluginView.h:
* Plugins.subproj/WebBaseNetscapePluginView.m:
(-[WebBaseNetscapePluginView plugin]):
* Plugins.subproj/WebNetscapePluginDocumentView.m:
(-[WebNetscapePluginDocumentView setDataSource:]):
* Plugins.subproj/WebNetscapePluginEmbeddedView.h:
* Plugins.subproj/WebNetscapePluginEmbeddedView.m:
(-[WebNetscapePluginEmbeddedView initWithFrame:plugin:URL:baseURL:mime:arguments:]):
* Plugins.subproj/WebNetscapePluginNullEventSender.h: Added.
* Plugins.subproj/WebNetscapePluginNullEventSender.m: Added.
(-[WebNetscapePluginNullEventSender initWithPluginView:]):
(-[WebNetscapePluginNullEventSender dealloc]):
(-[WebNetscapePluginNullEventSender sendNullEvents]):
(-[WebNetscapePluginNullEventSender stop]):
* Plugins.subproj/WebNetscapePluginPackage.h: Added.
* Plugins.subproj/WebNetscapePluginPackage.m: Added.
(-[WebNetscapePluginPackage openResourceFile]):
(-[WebNetscapePluginPackage closeResourceFile:]):
(-[WebNetscapePluginPackage stringForStringListID:andIndex:]):
(-[WebNetscapePluginPackage getPluginInfo]):
(-[WebNetscapePluginPackage stringByResolvingSymlinksAndAliasesInPath:]):
(-[WebNetscapePluginPackage initWithPath:]):
(-[WebNetscapePluginPackage load]):
(-[WebNetscapePluginPackage unload]):
(-[WebNetscapePluginPackage NPP_SetWindow]):
(-[WebNetscapePluginPackage NPP_New]):
(-[WebNetscapePluginPackage NPP_Destroy]):
(-[WebNetscapePluginPackage NPP_NewStream]):
(-[WebNetscapePluginPackage NPP_StreamAsFile]):
(-[WebNetscapePluginPackage NPP_DestroyStream]):
(-[WebNetscapePluginPackage NPP_WriteReady]):
(-[WebNetscapePluginPackage NPP_Write]):
(-[WebNetscapePluginPackage NPP_HandleEvent]):
(-[WebNetscapePluginPackage NPP_URLNotify]):
(-[WebNetscapePluginPackage NPP_GetValue]):
(-[WebNetscapePluginPackage NPP_SetValue]):
(-[WebNetscapePluginPackage NPP_Print]):
(-[WebNetscapePluginPackage MIMEToExtensionsDictionary]):
(-[WebNetscapePluginPackage extensionToMIMEDictionary]):
(-[WebNetscapePluginPackage MIMEToDescriptionDictionary]):
(-[WebNetscapePluginPackage name]):
(-[WebNetscapePluginPackage filename]):
(-[WebNetscapePluginPackage path]):
(-[WebNetscapePluginPackage isLoaded]):
(-[WebNetscapePluginPackage pluginDescription]):
(-[WebNetscapePluginPackage description]):
(functionPointerForTVector):
(tVectorForFunctionPointer):
* Plugins.subproj/WebPlugin.h: Removed.
* Plugins.subproj/WebPlugin.m: Removed.
* Plugins.subproj/WebPluginDatabase.h:
* Plugins.subproj/WebPluginDatabase.m:
(+[WebPluginDatabase installedPlugins]):
(-[WebPluginDatabase pluginForMIMEType:]):
(-[WebPluginDatabase pluginForExtension:]):
(-[WebPluginDatabase pluginForFilename:]):
(-[WebPluginDatabase MIMETypes]):
(-[WebPluginDatabase init]):
* Plugins.subproj/WebPluginNullEventSender.h: Removed.
* Plugins.subproj/WebPluginNullEventSender.m: Removed.
* WebCoreSupport.subproj/WebViewFactory.m:
(-[WebViewFactory viewForPluginWithURL:serviceType:arguments:baseURL:]):
(-[WebViewFactory pluginsInfo]):
(-[WebViewFactory viewForJavaAppletWithFrame:baseURL:parameters:]):
* WebKit.pbproj/project.pbxproj:
* WebView.subproj/WebController.m:
(+[WebController canShowMIMEType:]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2414 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 4c94fc1..1151cab 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,79 @@
+2002-10-22 Chris Blumenberg <cblu at apple.com>
+
+ - Moved things around to make room for new plug-in API.
+ - Renamed WebNetscapePlugin to WebNetscapePluginPackage.
+ - Renamed WebNetscapePluginDatabase to WebPluginDatabase.
+
+ * Plugins.subproj/WebBaseNetscapePluginStream.m:
+ (-[WebBaseNetscapePluginStream setPluginPointer:]):
+ * Plugins.subproj/WebBaseNetscapePluginView.h:
+ * Plugins.subproj/WebBaseNetscapePluginView.m:
+ (-[WebBaseNetscapePluginView plugin]):
+ * Plugins.subproj/WebNetscapePluginDocumentView.m:
+ (-[WebNetscapePluginDocumentView setDataSource:]):
+ * Plugins.subproj/WebNetscapePluginEmbeddedView.h:
+ * Plugins.subproj/WebNetscapePluginEmbeddedView.m:
+ (-[WebNetscapePluginEmbeddedView initWithFrame:plugin:URL:baseURL:mime:arguments:]):
+ * Plugins.subproj/WebNetscapePluginNullEventSender.h: Added.
+ * Plugins.subproj/WebNetscapePluginNullEventSender.m: Added.
+ (-[WebNetscapePluginNullEventSender initWithPluginView:]):
+ (-[WebNetscapePluginNullEventSender dealloc]):
+ (-[WebNetscapePluginNullEventSender sendNullEvents]):
+ (-[WebNetscapePluginNullEventSender stop]):
+ * Plugins.subproj/WebNetscapePluginPackage.h: Added.
+ * Plugins.subproj/WebNetscapePluginPackage.m: Added.
+ (-[WebNetscapePluginPackage openResourceFile]):
+ (-[WebNetscapePluginPackage closeResourceFile:]):
+ (-[WebNetscapePluginPackage stringForStringListID:andIndex:]):
+ (-[WebNetscapePluginPackage getPluginInfo]):
+ (-[WebNetscapePluginPackage stringByResolvingSymlinksAndAliasesInPath:]):
+ (-[WebNetscapePluginPackage initWithPath:]):
+ (-[WebNetscapePluginPackage load]):
+ (-[WebNetscapePluginPackage unload]):
+ (-[WebNetscapePluginPackage NPP_SetWindow]):
+ (-[WebNetscapePluginPackage NPP_New]):
+ (-[WebNetscapePluginPackage NPP_Destroy]):
+ (-[WebNetscapePluginPackage NPP_NewStream]):
+ (-[WebNetscapePluginPackage NPP_StreamAsFile]):
+ (-[WebNetscapePluginPackage NPP_DestroyStream]):
+ (-[WebNetscapePluginPackage NPP_WriteReady]):
+ (-[WebNetscapePluginPackage NPP_Write]):
+ (-[WebNetscapePluginPackage NPP_HandleEvent]):
+ (-[WebNetscapePluginPackage NPP_URLNotify]):
+ (-[WebNetscapePluginPackage NPP_GetValue]):
+ (-[WebNetscapePluginPackage NPP_SetValue]):
+ (-[WebNetscapePluginPackage NPP_Print]):
+ (-[WebNetscapePluginPackage MIMEToExtensionsDictionary]):
+ (-[WebNetscapePluginPackage extensionToMIMEDictionary]):
+ (-[WebNetscapePluginPackage MIMEToDescriptionDictionary]):
+ (-[WebNetscapePluginPackage name]):
+ (-[WebNetscapePluginPackage filename]):
+ (-[WebNetscapePluginPackage path]):
+ (-[WebNetscapePluginPackage isLoaded]):
+ (-[WebNetscapePluginPackage pluginDescription]):
+ (-[WebNetscapePluginPackage description]):
+ (functionPointerForTVector):
+ (tVectorForFunctionPointer):
+ * Plugins.subproj/WebPlugin.h: Removed.
+ * Plugins.subproj/WebPlugin.m: Removed.
+ * Plugins.subproj/WebPluginDatabase.h:
+ * Plugins.subproj/WebPluginDatabase.m:
+ (+[WebPluginDatabase installedPlugins]):
+ (-[WebPluginDatabase pluginForMIMEType:]):
+ (-[WebPluginDatabase pluginForExtension:]):
+ (-[WebPluginDatabase pluginForFilename:]):
+ (-[WebPluginDatabase MIMETypes]):
+ (-[WebPluginDatabase init]):
+ * Plugins.subproj/WebPluginNullEventSender.h: Removed.
+ * Plugins.subproj/WebPluginNullEventSender.m: Removed.
+ * WebCoreSupport.subproj/WebViewFactory.m:
+ (-[WebViewFactory viewForPluginWithURL:serviceType:arguments:baseURL:]):
+ (-[WebViewFactory pluginsInfo]):
+ (-[WebViewFactory viewForJavaAppletWithFrame:baseURL:parameters:]):
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/WebController.m:
+ (+[WebController canShowMIMEType:]):
+
2002-10-22 Darin Adler <darin at apple.com>
* WebCoreSupport.subproj/WebJavaScriptTextInputPanel.m: Added missing import.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 4c94fc1..1151cab 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,79 @@
+2002-10-22 Chris Blumenberg <cblu at apple.com>
+
+ - Moved things around to make room for new plug-in API.
+ - Renamed WebNetscapePlugin to WebNetscapePluginPackage.
+ - Renamed WebNetscapePluginDatabase to WebPluginDatabase.
+
+ * Plugins.subproj/WebBaseNetscapePluginStream.m:
+ (-[WebBaseNetscapePluginStream setPluginPointer:]):
+ * Plugins.subproj/WebBaseNetscapePluginView.h:
+ * Plugins.subproj/WebBaseNetscapePluginView.m:
+ (-[WebBaseNetscapePluginView plugin]):
+ * Plugins.subproj/WebNetscapePluginDocumentView.m:
+ (-[WebNetscapePluginDocumentView setDataSource:]):
+ * Plugins.subproj/WebNetscapePluginEmbeddedView.h:
+ * Plugins.subproj/WebNetscapePluginEmbeddedView.m:
+ (-[WebNetscapePluginEmbeddedView initWithFrame:plugin:URL:baseURL:mime:arguments:]):
+ * Plugins.subproj/WebNetscapePluginNullEventSender.h: Added.
+ * Plugins.subproj/WebNetscapePluginNullEventSender.m: Added.
+ (-[WebNetscapePluginNullEventSender initWithPluginView:]):
+ (-[WebNetscapePluginNullEventSender dealloc]):
+ (-[WebNetscapePluginNullEventSender sendNullEvents]):
+ (-[WebNetscapePluginNullEventSender stop]):
+ * Plugins.subproj/WebNetscapePluginPackage.h: Added.
+ * Plugins.subproj/WebNetscapePluginPackage.m: Added.
+ (-[WebNetscapePluginPackage openResourceFile]):
+ (-[WebNetscapePluginPackage closeResourceFile:]):
+ (-[WebNetscapePluginPackage stringForStringListID:andIndex:]):
+ (-[WebNetscapePluginPackage getPluginInfo]):
+ (-[WebNetscapePluginPackage stringByResolvingSymlinksAndAliasesInPath:]):
+ (-[WebNetscapePluginPackage initWithPath:]):
+ (-[WebNetscapePluginPackage load]):
+ (-[WebNetscapePluginPackage unload]):
+ (-[WebNetscapePluginPackage NPP_SetWindow]):
+ (-[WebNetscapePluginPackage NPP_New]):
+ (-[WebNetscapePluginPackage NPP_Destroy]):
+ (-[WebNetscapePluginPackage NPP_NewStream]):
+ (-[WebNetscapePluginPackage NPP_StreamAsFile]):
+ (-[WebNetscapePluginPackage NPP_DestroyStream]):
+ (-[WebNetscapePluginPackage NPP_WriteReady]):
+ (-[WebNetscapePluginPackage NPP_Write]):
+ (-[WebNetscapePluginPackage NPP_HandleEvent]):
+ (-[WebNetscapePluginPackage NPP_URLNotify]):
+ (-[WebNetscapePluginPackage NPP_GetValue]):
+ (-[WebNetscapePluginPackage NPP_SetValue]):
+ (-[WebNetscapePluginPackage NPP_Print]):
+ (-[WebNetscapePluginPackage MIMEToExtensionsDictionary]):
+ (-[WebNetscapePluginPackage extensionToMIMEDictionary]):
+ (-[WebNetscapePluginPackage MIMEToDescriptionDictionary]):
+ (-[WebNetscapePluginPackage name]):
+ (-[WebNetscapePluginPackage filename]):
+ (-[WebNetscapePluginPackage path]):
+ (-[WebNetscapePluginPackage isLoaded]):
+ (-[WebNetscapePluginPackage pluginDescription]):
+ (-[WebNetscapePluginPackage description]):
+ (functionPointerForTVector):
+ (tVectorForFunctionPointer):
+ * Plugins.subproj/WebPlugin.h: Removed.
+ * Plugins.subproj/WebPlugin.m: Removed.
+ * Plugins.subproj/WebPluginDatabase.h:
+ * Plugins.subproj/WebPluginDatabase.m:
+ (+[WebPluginDatabase installedPlugins]):
+ (-[WebPluginDatabase pluginForMIMEType:]):
+ (-[WebPluginDatabase pluginForExtension:]):
+ (-[WebPluginDatabase pluginForFilename:]):
+ (-[WebPluginDatabase MIMETypes]):
+ (-[WebPluginDatabase init]):
+ * Plugins.subproj/WebPluginNullEventSender.h: Removed.
+ * Plugins.subproj/WebPluginNullEventSender.m: Removed.
+ * WebCoreSupport.subproj/WebViewFactory.m:
+ (-[WebViewFactory viewForPluginWithURL:serviceType:arguments:baseURL:]):
+ (-[WebViewFactory pluginsInfo]):
+ (-[WebViewFactory viewForJavaAppletWithFrame:baseURL:parameters:]):
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/WebController.m:
+ (+[WebController canShowMIMEType:]):
+
2002-10-22 Darin Adler <darin at apple.com>
* WebCoreSupport.subproj/WebJavaScriptTextInputPanel.m: Added missing import.
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.m
index b6a0d9f..7d4732a 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.m
@@ -6,7 +6,7 @@
#import <WebKit/WebBaseNetscapePluginStream.h>
#import <WebKit/WebBaseNetscapePluginView.h>
#import <WebKit/WebKitLogging.h>
-#import <WebKit/WebPlugin.h>
+#import <WebKit/WebNetscapePluginPackage.h>
#import <WebFoundation/WebFoundation.h>
#import <WebFoundation/WebNSFileManagerExtras.h>
@@ -28,7 +28,7 @@
{
instance = pluginPointer;
- WebNetscapePlugin *plugin = [(WebBaseNetscapePluginView *)instance->ndata plugin];
+ WebNetscapePluginPackage *plugin = [(WebBaseNetscapePluginView *)instance->ndata plugin];
NPP_NewStream = [plugin NPP_NewStream];
NPP_WriteReady = [plugin NPP_WriteReady];
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.h b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.h
index ea01d91..084ffa7 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.h
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.h
@@ -10,7 +10,7 @@
@class WebController;
@class WebDataSource;
@class WebFrame;
- at class WebNetscapePlugin;
+ at class WebNetscapePluginPackage;
@class WebNetscapePluginNullEventSender;
@@ -18,7 +18,7 @@
{
WebNetscapePluginNullEventSender *eventSender;
- WebNetscapePlugin *plugin;
+ WebNetscapePluginPackage *plugin;
int mode;
@@ -71,8 +71,8 @@
- (void)setUpWindowAndPort;
-- (WebNetscapePlugin *)plugin;
-- (void)setPlugin:(WebNetscapePlugin *)thePlugin;
+- (WebNetscapePluginPackage *)plugin;
+- (void)setPlugin:(WebNetscapePluginPackage *)thePlugin;
- (void)setMIMEType:(NSString *)theMIMEType;
- (void)setBaseURL:(NSURL *)theBaseURL;
- (void)setArguments:(NSDictionary *)theArguments;
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
index 7b546d7..20af36e 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
@@ -4,19 +4,17 @@
*/
#import <WebKit/WebBaseNetscapePluginView.h>
-
#import <WebKit/WebController.h>
#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebDataSource.h>
#import <WebKit/WebFrame.h>
#import <WebKit/WebFramePrivate.h>
#import <WebKit/WebKitLogging.h>
+#import <WebKit/WebNetscapePluginStream.h>
+#import <WebKit/WebNetscapePluginNullEventSender.h>
#import <WebKit/WebNullPluginView.h>
#import <WebKit/WebNSViewExtras.h>
-
-#import <WebKit/WebNetscapePluginStream.h>
-#import <WebKit/WebPluginNullEventSender.h>
-#import <WebKit/WebPlugin.h>
+#import <WebKit/WebNetscapePluginPackage.h>
#import <WebKit/WebView.h>
#import <WebKit/WebWindowOperationsDelegate.h>
@@ -514,12 +512,12 @@
return instance;
}
-- (WebNetscapePlugin *)plugin
+- (WebNetscapePluginPackage *)plugin
{
return plugin;
}
-- (void)setPlugin:(WebNetscapePlugin *)thePlugin;
+- (void)setPlugin:(WebNetscapePluginPackage *)thePlugin;
{
[plugin release];
plugin = [thePlugin retain];
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m b/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m
index da4eed0..90ce911 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m
@@ -9,7 +9,7 @@
#import <WebKit/WebFrame.h>
#import <WebKit/WebNetscapePluginDocumentView.h>
#import <WebKit/WebNSViewExtras.h>
-#import <WebKit/WebPlugin.h>
+#import <WebKit/WebNetscapePluginPackage.h>
#import <WebKit/WebPluginDatabase.h>
#import <WebKit/WebView.h>
@@ -60,7 +60,7 @@
[self setMIMEType:MIME];
[self setBaseURL:[dataSource URL]];
- WebNetscapePlugin *thePlugin = [[WebNetscapePluginDatabase installedPlugins] pluginForMIMEType:MIME];
+ WebNetscapePluginPackage *thePlugin = [[WebPluginDatabase installedPlugins] pluginForMIMEType:MIME];
if (![thePlugin load]){
return;
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.h b/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.h
index 9a23341..ca86869 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.h
+++ b/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.h
@@ -13,7 +13,7 @@
}
- (id)initWithFrame:(NSRect)r
- plugin:(WebNetscapePlugin *)plugin
+ plugin:(WebNetscapePluginPackage *)plugin
URL:(NSURL *)URL
baseURL:(NSURL *)baseURL
mime:(NSString *)mimeType
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.m b/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.m
index 4832eef..2554849 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.m
@@ -9,7 +9,7 @@
#import <WebKit/WebController.h>
#import <WebKit/WebFrame.h>
#import <WebKit/WebNSViewExtras.h>
-#import <WebKit/WebPlugin.h>
+#import <WebKit/WebNetscapePluginPackage.h>
#import <WebKit/WebView.h>
#import <WebFoundation/WebResourceRequest.h>
@@ -17,7 +17,7 @@
@implementation WebNetscapePluginEmbeddedView
- (id)initWithFrame:(NSRect)frame
- plugin:(WebNetscapePlugin *)thePlugin
+ plugin:(WebNetscapePluginPackage *)thePlugin
URL:(NSURL *)theURL
baseURL:(NSURL *)theBaseURL
mime:(NSString *)mimeType
diff --git a/WebKit/Plugins.subproj/WebPluginNullEventSender.h b/WebKit/Plugins.subproj/WebNetscapePluginNullEventSender.h
similarity index 88%
rename from WebKit/Plugins.subproj/WebPluginNullEventSender.h
rename to WebKit/Plugins.subproj/WebNetscapePluginNullEventSender.h
index 3409713..0990087 100644
--- a/WebKit/Plugins.subproj/WebPluginNullEventSender.h
+++ b/WebKit/Plugins.subproj/WebNetscapePluginNullEventSender.h
@@ -1,5 +1,5 @@
/*
- WebPluginNullEventSender.h
+ WebNetscapePluginNullEventSender.h
Copyright 2002, Apple, Inc. All rights reserved.
*/
diff --git a/WebKit/Plugins.subproj/WebPluginNullEventSender.m b/WebKit/Plugins.subproj/WebNetscapePluginNullEventSender.m
similarity index 93%
rename from WebKit/Plugins.subproj/WebPluginNullEventSender.m
rename to WebKit/Plugins.subproj/WebNetscapePluginNullEventSender.m
index d62b4e1..72633cb 100644
--- a/WebKit/Plugins.subproj/WebPluginNullEventSender.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginNullEventSender.m
@@ -1,11 +1,11 @@
/*
- WebPluginNullEventSender.m
+ WebNetscapePluginNullEventSender.m
Copyright 2002, Apple, Inc. All rights reserved.
*/
#import <WebKit/WebBaseNetscapePluginView.h>
#import <WebKit/WebKitLogging.h>
-#import <WebKit/WebPluginNullEventSender.h>
+#import <WebKit/WebNetscapePluginNullEventSender.h>
#import <WebFoundation/WebAssertions.h>
diff --git a/WebKit/Plugins.subproj/WebPlugin.h b/WebKit/Plugins.subproj/WebNetscapePluginPackage.h
similarity index 94%
rename from WebKit/Plugins.subproj/WebPlugin.h
rename to WebKit/Plugins.subproj/WebNetscapePluginPackage.h
index 01c6437..60690ec 100644
--- a/WebKit/Plugins.subproj/WebPlugin.h
+++ b/WebKit/Plugins.subproj/WebNetscapePluginPackage.h
@@ -1,5 +1,5 @@
/*
- WebPlugin.h
+ WebNetscapePluginPackage.h
Copyright (c) 2002, Apple, Inc. All rights reserved.
*/
@@ -7,7 +7,7 @@
#import "npapi.h"
#import <WebCore/WebCoreViewFactory.h>
- at interface WebNetscapePlugin : NSObject <WebCorePluginInfo>
+ at interface WebNetscapePluginPackage : NSObject <WebCorePluginInfo>
{
NSMutableDictionary *MIMEToExtensions;
NSMutableDictionary *extensionToMIME;
diff --git a/WebKit/Plugins.subproj/WebPlugin.m b/WebKit/Plugins.subproj/WebNetscapePluginPackage.m
similarity index 99%
rename from WebKit/Plugins.subproj/WebPlugin.m
rename to WebKit/Plugins.subproj/WebNetscapePluginPackage.m
index 26e5b3b..62eb3d1 100644
--- a/WebKit/Plugins.subproj/WebPlugin.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginPackage.m
@@ -1,18 +1,17 @@
/*
- WebPlugin.m
+ WebNetscapePluginPackage.m
Copyright (c) 2002, Apple, Inc. All rights reserved.
*/
-#import "WebPlugin.h"
-
#import <WebKit/WebKitLogging.h>
+#import <WebKit/WebNetscapePluginPackage.h>
typedef void (* FunctionPointer) (void);
typedef void (* TransitionVector) (void);
FunctionPointer functionPointerForTVector(TransitionVector);
TransitionVector tVectorForFunctionPointer(FunctionPointer);
- at implementation WebNetscapePlugin
+ at implementation WebNetscapePluginPackage
- (SInt16)openResourceFile
{
diff --git a/WebKit/Plugins.subproj/WebPluginDatabase.h b/WebKit/Plugins.subproj/WebPluginDatabase.h
index 8082840..ea31419 100644
--- a/WebKit/Plugins.subproj/WebPluginDatabase.h
+++ b/WebKit/Plugins.subproj/WebPluginDatabase.h
@@ -5,17 +5,17 @@
#import <Foundation/Foundation.h>
- at class WebNetscapePlugin;
+ at class WebNetscapePluginPackage;
- at interface WebNetscapePluginDatabase : NSObject
+ at interface WebPluginDatabase : NSObject
{
NSArray *plugins;
}
-+ (WebNetscapePluginDatabase *)installedPlugins;
-- (WebNetscapePlugin *)pluginForMIMEType:(NSString *)mimeType;
-- (WebNetscapePlugin *)pluginForExtension:(NSString *)extension;
-- (WebNetscapePlugin *)pluginForFilename:(NSString *)filename;
++ (WebPluginDatabase *)installedPlugins;
+- (WebNetscapePluginPackage *)pluginForMIMEType:(NSString *)mimeType;
+- (WebNetscapePluginPackage *)pluginForExtension:(NSString *)extension;
+- (WebNetscapePluginPackage *)pluginForFilename:(NSString *)filename;
- (NSArray *)plugins;
@end
diff --git a/WebKit/Plugins.subproj/WebPluginDatabase.m b/WebKit/Plugins.subproj/WebPluginDatabase.m
index 3e62a3e..d2143a1 100644
--- a/WebKit/Plugins.subproj/WebPluginDatabase.m
+++ b/WebKit/Plugins.subproj/WebPluginDatabase.m
@@ -6,29 +6,29 @@
#import <WebKit/WebDataSource.h>
#import <WebKit/WebKitLogging.h>
#import <WebKit/WebNetscapePluginDocumentView.h>
-#import <WebKit/WebPlugin.h>
+#import <WebKit/WebNetscapePluginPackage.h>
#import <WebKit/WebPluginDatabase.h>
#import <WebKit/WebNetscapePluginRepresentation.h>
#import <WebKit/WebView.h>
#import <WebKit/WebViewPrivate.h>
- at implementation WebNetscapePluginDatabase
+ at implementation WebPluginDatabase
-static WebNetscapePluginDatabase *database = nil;
+static WebPluginDatabase *database = nil;
-+ (WebNetscapePluginDatabase *)installedPlugins
++ (WebPluginDatabase *)installedPlugins
{
if (!database) {
- database = [[WebNetscapePluginDatabase alloc] init];
+ database = [[WebPluginDatabase alloc] init];
}
return database;
}
// The first plugin with the specified mime type is returned.
-- (WebNetscapePlugin *)pluginForMIMEType:(NSString *)MIME
+- (WebNetscapePluginPackage *)pluginForMIMEType:(NSString *)MIME
{
- WebNetscapePlugin *plugin;
+ WebNetscapePluginPackage *plugin;
uint i;
for(i=0; i<[plugins count]; i++){
@@ -40,9 +40,9 @@ static WebNetscapePluginDatabase *database = nil;
return nil;
}
-- (WebNetscapePlugin *)pluginForExtension:(NSString *)extension
+- (WebNetscapePluginPackage *)pluginForExtension:(NSString *)extension
{
- WebNetscapePlugin *plugin;
+ WebNetscapePluginPackage *plugin;
uint i;
for(i=0; i<[plugins count]; i++){
@@ -54,10 +54,10 @@ static WebNetscapePluginDatabase *database = nil;
return nil;
}
-- (WebNetscapePlugin *)pluginForFilename:(NSString *)filename
+- (WebNetscapePluginPackage *)pluginForFilename:(NSString *)filename
{
uint i;
- WebNetscapePlugin *plugin;
+ WebNetscapePluginPackage *plugin;
for(i=0; i<[plugins count]; i++){
plugin = [plugins objectAtIndex:i];
@@ -76,7 +76,7 @@ static WebNetscapePluginDatabase *database = nil;
- (NSArray *)MIMETypes
{
NSMutableSet *MIMETypes;
- WebNetscapePlugin *plugin;
+ WebNetscapePluginPackage *plugin;
uint i;
MIMETypes = [NSMutableSet set];
@@ -133,10 +133,10 @@ static NSArray *pluginLocations(void)
}
NSMutableArray *pluginArray = [NSMutableArray arrayWithCapacity:[pluginPaths count]];
- WebNetscapePlugin *plugin;
+ WebNetscapePluginPackage *plugin;
for (i = 0; i < [pluginPaths count]; i++) {
- plugin = [[WebNetscapePlugin alloc] initWithPath:[pluginPaths objectAtIndex:i]];
+ plugin = [[WebNetscapePluginPackage alloc] initWithPath:[pluginPaths objectAtIndex:i]];
if (plugin) {
[pluginArray addObject:plugin];
LOG(Plugins, "Found plugin: %s", [[plugin name] lossyCString]);
diff --git a/WebKit/WebCoreSupport.subproj/WebViewFactory.m b/WebKit/WebCoreSupport.subproj/WebViewFactory.m
index 9c72acb..2732a87 100644
--- a/WebKit/WebCoreSupport.subproj/WebViewFactory.m
+++ b/WebKit/WebCoreSupport.subproj/WebViewFactory.m
@@ -11,7 +11,7 @@
#import <WebKit/WebJavaScriptTextInputPanel.h>
#import <WebKit/WebNetscapePluginEmbeddedView.h>
#import <WebKit/WebNullPluginView.h>
-#import <WebKit/WebPlugin.h>
+#import <WebKit/WebNetscapePluginPackage.h>
#import <WebKit/WebPluginDatabase.h>
#import <WebKit/WebViewFactory.h>
@@ -33,7 +33,7 @@
NSMutableDictionary *arguments;
NSString *mimeType, *extension;
NSRange r1, r2, r3;
- WebNetscapePlugin *plugin;
+ WebNetscapePluginPackage *plugin;
uint i;
arguments = [NSMutableDictionary dictionary];
@@ -50,10 +50,10 @@
if ([serviceType length]) {
mimeType = serviceType;
- plugin = [[WebNetscapePluginDatabase installedPlugins] pluginForMIMEType:mimeType];
+ plugin = [[WebPluginDatabase installedPlugins] pluginForMIMEType:mimeType];
} else {
extension = [[pluginURL path] pathExtension];
- plugin = [[WebNetscapePluginDatabase installedPlugins] pluginForExtension:extension];
+ plugin = [[WebPluginDatabase installedPlugins] pluginForExtension:extension];
mimeType = [[plugin extensionToMIMEDictionary] objectForKey:extension];
}
@@ -70,14 +70,14 @@
- (NSArray *)pluginsInfo
{
- return [[WebNetscapePluginDatabase installedPlugins] plugins];
+ return [[WebPluginDatabase installedPlugins] plugins];
}
- (NSView *)viewForJavaAppletWithFrame:(NSRect)frame baseURL:(NSURL *)baseURL parameters:(NSDictionary *)parameters
{
- WebNetscapePlugin *plugin;
+ WebNetscapePluginPackage *plugin;
- plugin = [[WebNetscapePluginDatabase installedPlugins] pluginForMIMEType:@"application/x-java-applet"];
+ plugin = [[WebPluginDatabase installedPlugins] pluginForMIMEType:@"application/x-java-applet"];
if (plugin == nil) {
return nil;
}
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index d7b9dfb..73a720a 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -1393,6 +1393,39 @@
//842
//843
//844
+ 848DFF410365F6FB00CA2ACA = {
+ children = (
+ F5F717220288493C018635CA,
+ F5F717230288493C018635CA,
+ F5A672B90263866E01000102,
+ F5A672BA0263866E01000102,
+ F5EBC45502134BC301CA1520,
+ 931A72D203265920008635CE,
+ F5EBC45602134BC301CA1520,
+ 84D4BFFB0348EF9D00CA2ACA,
+ 84D4BFFC0348EF9D00CA2ACA,
+ 84D4BFF70348EF7600CA2ACA,
+ 84D4BFF80348EF7600CA2ACA,
+ F5A672B70263866E01000102,
+ F5A672B80263866E01000102,
+ F5F7171E0288493C018635CA,
+ F5F7171F0288493C018635CA,
+ 83402EF6035A588900BE770A,
+ 83402EF7035A588900BE770A,
+ 83402EFA035A58D100BE770A,
+ 83402EFB035A58D100BE770A,
+ );
+ isa = PBXGroup;
+ name = "Netscape Plug-ins";
+ refType = 4;
+ };
+ 848DFF430365F71500CA2ACA = {
+ children = (
+ );
+ isa = PBXGroup;
+ name = "WebKit Plug-ins";
+ refType = 4;
+ };
84D4BFF70348EF7600CA2ACA = {
fileEncoding = 4;
isa = PBXFileReference;
@@ -2565,13 +2598,13 @@
F5A672B70263866E01000102 = {
fileEncoding = 4;
isa = PBXFileReference;
- path = WebPluginNullEventSender.h;
+ path = WebNetscapePluginNullEventSender.h;
refType = 4;
};
F5A672B80263866E01000102 = {
fileEncoding = 4;
isa = PBXFileReference;
- path = WebPluginNullEventSender.m;
+ path = WebNetscapePluginNullEventSender.m;
refType = 4;
};
F5A672B90263866E01000102 = {
@@ -2906,27 +2939,10 @@
};
F5EBC45202134BB601CA1520 = {
children = (
- F5F717220288493C018635CA,
- F5F717230288493C018635CA,
- F5A672B90263866E01000102,
- F5A672BA0263866E01000102,
- F5EBC45502134BC301CA1520,
- 931A72D203265920008635CE,
- F5EBC45602134BC301CA1520,
- 84D4BFFB0348EF9D00CA2ACA,
- 84D4BFFC0348EF9D00CA2ACA,
- 84D4BFF70348EF7600CA2ACA,
- 84D4BFF80348EF7600CA2ACA,
- 83402EF6035A588900BE770A,
- 83402EF7035A588900BE770A,
- 83402EFA035A58D100BE770A,
- 83402EFB035A58D100BE770A,
+ 848DFF410365F6FB00CA2ACA,
+ 848DFF430365F71500CA2ACA,
F5883BE0025E5E9D01000102,
F5883BE1025E5E9D01000102,
- F5A672B70263866E01000102,
- F5A672B80263866E01000102,
- F5F7171E0288493C018635CA,
- F5F7171F0288493C018635CA,
F5F717200288493C018635CA,
F5F717210288493C018635CA,
);
@@ -2962,13 +2978,13 @@
F5F7171E0288493C018635CA = {
fileEncoding = 4;
isa = PBXFileReference;
- path = WebPlugin.h;
+ path = WebNetscapePluginPackage.h;
refType = 4;
};
F5F7171F0288493C018635CA = {
fileEncoding = 4;
isa = PBXFileReference;
- path = WebPlugin.m;
+ path = WebNetscapePluginPackage.m;
refType = 4;
};
F5F717200288493C018635CA = {
diff --git a/WebKit/WebView.subproj/WebController.m b/WebKit/WebView.subproj/WebController.m
index b157f49..9774d5d 100644
--- a/WebKit/WebView.subproj/WebController.m
+++ b/WebKit/WebView.subproj/WebController.m
@@ -237,7 +237,7 @@ NSString *WebElementFrameKey = @"WebElementFrame";
return YES;
}else{
// Have the plug-ins register views and representations
- [WebNetscapePluginDatabase installedPlugins];
+ [WebPluginDatabase installedPlugins];
if([WebView _canShowMIMEType:MIMEType] && [WebDataSource _canShowMIMEType:MIMEType])
return YES;
}
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index b157f49..9774d5d 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -237,7 +237,7 @@ NSString *WebElementFrameKey = @"WebElementFrame";
return YES;
}else{
// Have the plug-ins register views and representations
- [WebNetscapePluginDatabase installedPlugins];
+ [WebPluginDatabase installedPlugins];
if([WebView _canShowMIMEType:MIMEType] && [WebDataSource _canShowMIMEType:MIMEType])
return YES;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list