Commit c885e864 authored by cblu's avatar cblu
Browse files

- 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
parent cc49adfd
2002-10-22 Chris Blumenberg <cblu@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@apple.com>
 
* WebCoreSupport.subproj/WebJavaScriptTextInputPanel.m: Added missing import.
......
2002-10-22 Chris Blumenberg <cblu@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@apple.com>
 
* WebCoreSupport.subproj/WebJavaScriptTextInputPanel.m: Added missing import.
......
......@@ -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 @@ - (void)setPluginPointer:(NPP)pluginPointer
{
instance = pluginPointer;
WebNetscapePlugin *plugin = [(WebBaseNetscapePluginView *)instance->ndata plugin];
WebNetscapePluginPackage *plugin = [(WebBaseNetscapePluginView *)instance->ndata plugin];
NPP_NewStream = [plugin NPP_NewStream];
NPP_WriteReady = [plugin NPP_WriteReady];
......
......@@ -10,7 +10,7 @@
@class WebController;
@class WebDataSource;
@class WebFrame;
@class WebNetscapePlugin;
@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;
......
......@@ -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 @@ - (NPP)pluginPointer
return instance;
}
- (WebNetscapePlugin *)plugin
- (WebNetscapePluginPackage *)plugin
{
return plugin;
}
- (void)setPlugin:(WebNetscapePlugin *)thePlugin;
- (void)setPlugin:(WebNetscapePluginPackage *)thePlugin;
{
[plugin release];
plugin = [thePlugin retain];
......
......@@ -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 @@ - (void)setDataSource:(WebDataSource *)theDataSource
[self setMIMEType:MIME];
[self setBaseURL:[dataSource URL]];
WebNetscapePlugin *thePlugin = [[WebNetscapePluginDatabase installedPlugins] pluginForMIMEType:MIME];
WebNetscapePluginPackage *thePlugin = [[WebPluginDatabase installedPlugins] pluginForMIMEType:MIME];
if (![thePlugin load]){
return;
......
......@@ -13,7 +13,7 @@
}
- (id)initWithFrame:(NSRect)r
plugin:(WebNetscapePlugin *)plugin
plugin:(WebNetscapePluginPackage *)plugin
URL:(NSURL *)URL
baseURL:(NSURL *)baseURL
mime:(NSString *)mimeType
......
......@@ -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
......
/*
WebPluginNullEventSender.h
WebNetscapePluginNullEventSender.h
Copyright 2002, Apple, Inc. All rights reserved.
*/
......
/*
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>
......
/*
WebPlugin.h
WebNetscapePluginPackage.h
Copyright (c) 2002, Apple, Inc. All rights reserved.
*/
......@@ -7,7 +7,7 @@
#import "npapi.h"
#import <WebCore/WebCoreViewFactory.h>
@interface WebNetscapePlugin : NSObject <WebCorePluginInfo>
@interface WebNetscapePluginPackage : NSObject <WebCorePluginInfo>
{
NSMutableDictionary *MIMEToExtensions;
NSMutableDictionary *extensionToMIME;
......
/*
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);
@implementation WebNetscapePlugin
@implementation WebNetscapePluginPackage
- (SInt16)openResourceFile
{
......
......@@ -5,17 +5,17 @@
#import <Foundation/Foundation.h>
@class WebNetscapePlugin;
@class WebNetscapePluginPackage;
@interface WebNetscapePluginDatabase : NSObject
@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
......@@ -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>
@implementation WebNetscapePluginDatabase
@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 @@ - (WebNetscapePlugin *)pluginForMIMEType:(NSString *)MIME
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 @@ - (WebNetscapePlugin *)pluginForExtension:(NSString *)extension
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 @@ - (NSArray *)plugins
- (NSArray *)MIMETypes
{
NSMutableSet *MIMETypes;
WebNetscapePlugin *plugin;
WebNetscapePluginPackage *plugin;
uint i;
MIMETypes = [NSMutableSet set];
......@@ -133,10 +133,10 @@ - (NSArray *)MIMETypes
}
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]);
......
......@@ -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 @@ - (NSView *)viewForPluginWithURL:(NSURL *)pluginURL serviceType:(NSString *)serv
NSMutableDictionary *arguments;
NSString *mimeType, *extension;
NSRange r1, r2, r3;
WebNetscapePlugin *plugin;
WebNetscapePluginPackage *plugin;
uint i;
arguments = [NSMutableDictionary dictionary];
......@@ -50,10 +50,10 @@ - (NSView *)viewForPluginWithURL:(NSURL *)pluginURL serviceType:(NSString *)serv
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 @@ - (NSView *)viewForPluginWithURL:(NSURL *)pluginURL serviceType:(NSString *)serv
- (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;
}
......
......@@ -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 = {
......