[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
rjw
rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:33:43 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 26de617adbc5d12d1fb1582c66bf5907e9b65382
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Aug 22 01:21:27 2002 +0000
Simple name change. Plugin -> NetscapePlugin in anticipation
of other plugin related API.
Removed vestigal WebDocumentLoading.
* Plugins.subproj/WebPlugin.h:
* Plugins.subproj/WebPlugin.m:
(-[WebNetscapePlugin load]):
* Plugins.subproj/WebPluginDatabase.h:
* Plugins.subproj/WebPluginDatabase.m:
(+[WebNetscapePluginDatabase installedPlugins]):
(-[WebNetscapePluginDatabase pluginForMimeType:]):
(-[WebNetscapePluginDatabase pluginForExtension:]):
(-[WebNetscapePluginDatabase pluginWithFilename:]):
(-[WebNetscapePluginDatabase MIMETypes]):
(-[WebNetscapePluginDatabase init]):
* Plugins.subproj/WebPluginNullEventSender.h:
* Plugins.subproj/WebPluginNullEventSender.m:
(-[WebNetscapePluginNullEventSender initWithPluginView:]):
(-[WebNetscapePluginNullEventSender sendNullEvents]):
* Plugins.subproj/WebPluginStream.h:
* Plugins.subproj/WebPluginStream.m:
(-[WebNetscapePluginStream getFunctionPointersFromPluginView:]):
(-[WebNetscapePluginStream initWithURL:pluginPointer:notifyData:attributes:]):
* Plugins.subproj/WebPluginView.h:
* Plugins.subproj/WebPluginView.m:
(-[WebNetscapePluginView initWithFrame:plugin:URL:baseURL:mime:arguments:]):
(-[WebNetscapePluginView start]):
(-[WebNetscapePluginView provisionalDataSourceChanged:]):
(-[WebNetscapePluginView loadURL:inTarget:withNotifyData:andHandleAttributes:]):
(-[WebNetscapePluginView destroyStream:reason:]):
* WebCoreSupport.subproj/WebViewFactory.m:
(-[WebViewFactory viewForPluginWithURL:serviceType:arguments:baseURL:]):
(-[WebViewFactory pluginsInfo]):
(-[WebViewFactory viewForJavaAppletWithFrame:baseURL:parameters:]):
* WebView.subproj/WebController.h:
* WebView.subproj/WebController.m:
(+[WebController canShowMIMEType:]):
* WebView.subproj/WebDocument.h:
* WebView.subproj/WebFramePrivate.h:
* WebView.subproj/WebHTMLView.m:
(-[WebHTMLView provisionalDataSourceChanged:]):
(-[WebHTMLView provisionalDataSourceCommitted:]):
(-[WebHTMLView dataSourceUpdated:]):
* WebView.subproj/WebHTMLViewPrivate.m:
(-[NSView _web_stopIfPluginView]):
* WebView.subproj/WebImageView.h:
* WebView.subproj/WebTextView.h:
* WebView.subproj/WebView.h:
* WebView.subproj/WebViewPrivate.h:
* WebView.subproj/WebViewPrivate.m:
(-[WebView _makeDocumentViewForDataSource:]):
Still need to muck with cvs server to change file names.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1896 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 2901e1d..d502c36 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,60 @@
+2002-08-21 Richard Williamson (Local) <rjw at apple.com>
+
+ Simple name change. Plugin -> NetscapePlugin in anticipation
+ of other plugin related API.
+
+ Removed vestigal WebDocumentLoading.
+
+ * Plugins.subproj/WebPlugin.h:
+ * Plugins.subproj/WebPlugin.m:
+ (-[WebNetscapePlugin load]):
+ * Plugins.subproj/WebPluginDatabase.h:
+ * Plugins.subproj/WebPluginDatabase.m:
+ (+[WebNetscapePluginDatabase installedPlugins]):
+ (-[WebNetscapePluginDatabase pluginForMimeType:]):
+ (-[WebNetscapePluginDatabase pluginForExtension:]):
+ (-[WebNetscapePluginDatabase pluginWithFilename:]):
+ (-[WebNetscapePluginDatabase MIMETypes]):
+ (-[WebNetscapePluginDatabase init]):
+ * Plugins.subproj/WebPluginNullEventSender.h:
+ * Plugins.subproj/WebPluginNullEventSender.m:
+ (-[WebNetscapePluginNullEventSender initWithPluginView:]):
+ (-[WebNetscapePluginNullEventSender sendNullEvents]):
+ * Plugins.subproj/WebPluginStream.h:
+ * Plugins.subproj/WebPluginStream.m:
+ (-[WebNetscapePluginStream getFunctionPointersFromPluginView:]):
+ (-[WebNetscapePluginStream initWithURL:pluginPointer:notifyData:attributes:]):
+ * Plugins.subproj/WebPluginView.h:
+ * Plugins.subproj/WebPluginView.m:
+ (-[WebNetscapePluginView initWithFrame:plugin:URL:baseURL:mime:arguments:]):
+ (-[WebNetscapePluginView start]):
+ (-[WebNetscapePluginView provisionalDataSourceChanged:]):
+ (-[WebNetscapePluginView loadURL:inTarget:withNotifyData:andHandleAttributes:]):
+ (-[WebNetscapePluginView destroyStream:reason:]):
+ * WebCoreSupport.subproj/WebViewFactory.m:
+ (-[WebViewFactory viewForPluginWithURL:serviceType:arguments:baseURL:]):
+ (-[WebViewFactory pluginsInfo]):
+ (-[WebViewFactory viewForJavaAppletWithFrame:baseURL:parameters:]):
+ * WebView.subproj/WebController.h:
+ * WebView.subproj/WebController.m:
+ (+[WebController canShowMIMEType:]):
+ * WebView.subproj/WebDocument.h:
+ * WebView.subproj/WebFramePrivate.h:
+ * WebView.subproj/WebHTMLView.m:
+ (-[WebHTMLView provisionalDataSourceChanged:]):
+ (-[WebHTMLView provisionalDataSourceCommitted:]):
+ (-[WebHTMLView dataSourceUpdated:]):
+ * WebView.subproj/WebHTMLViewPrivate.m:
+ (-[NSView _web_stopIfPluginView]):
+ * WebView.subproj/WebImageView.h:
+ * WebView.subproj/WebTextView.h:
+ * WebView.subproj/WebView.h:
+ * WebView.subproj/WebViewPrivate.h:
+ * WebView.subproj/WebViewPrivate.m:
+ (-[WebView _makeDocumentViewForDataSource:]):
+
+ Still need to muck with cvs server to change file names.
+
2002-08-20 David Hyatt <hyatt at apple.com>
Raising the layout delay from 0.75 to 1.00. This should be
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 2901e1d..d502c36 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,60 @@
+2002-08-21 Richard Williamson (Local) <rjw at apple.com>
+
+ Simple name change. Plugin -> NetscapePlugin in anticipation
+ of other plugin related API.
+
+ Removed vestigal WebDocumentLoading.
+
+ * Plugins.subproj/WebPlugin.h:
+ * Plugins.subproj/WebPlugin.m:
+ (-[WebNetscapePlugin load]):
+ * Plugins.subproj/WebPluginDatabase.h:
+ * Plugins.subproj/WebPluginDatabase.m:
+ (+[WebNetscapePluginDatabase installedPlugins]):
+ (-[WebNetscapePluginDatabase pluginForMimeType:]):
+ (-[WebNetscapePluginDatabase pluginForExtension:]):
+ (-[WebNetscapePluginDatabase pluginWithFilename:]):
+ (-[WebNetscapePluginDatabase MIMETypes]):
+ (-[WebNetscapePluginDatabase init]):
+ * Plugins.subproj/WebPluginNullEventSender.h:
+ * Plugins.subproj/WebPluginNullEventSender.m:
+ (-[WebNetscapePluginNullEventSender initWithPluginView:]):
+ (-[WebNetscapePluginNullEventSender sendNullEvents]):
+ * Plugins.subproj/WebPluginStream.h:
+ * Plugins.subproj/WebPluginStream.m:
+ (-[WebNetscapePluginStream getFunctionPointersFromPluginView:]):
+ (-[WebNetscapePluginStream initWithURL:pluginPointer:notifyData:attributes:]):
+ * Plugins.subproj/WebPluginView.h:
+ * Plugins.subproj/WebPluginView.m:
+ (-[WebNetscapePluginView initWithFrame:plugin:URL:baseURL:mime:arguments:]):
+ (-[WebNetscapePluginView start]):
+ (-[WebNetscapePluginView provisionalDataSourceChanged:]):
+ (-[WebNetscapePluginView loadURL:inTarget:withNotifyData:andHandleAttributes:]):
+ (-[WebNetscapePluginView destroyStream:reason:]):
+ * WebCoreSupport.subproj/WebViewFactory.m:
+ (-[WebViewFactory viewForPluginWithURL:serviceType:arguments:baseURL:]):
+ (-[WebViewFactory pluginsInfo]):
+ (-[WebViewFactory viewForJavaAppletWithFrame:baseURL:parameters:]):
+ * WebView.subproj/WebController.h:
+ * WebView.subproj/WebController.m:
+ (+[WebController canShowMIMEType:]):
+ * WebView.subproj/WebDocument.h:
+ * WebView.subproj/WebFramePrivate.h:
+ * WebView.subproj/WebHTMLView.m:
+ (-[WebHTMLView provisionalDataSourceChanged:]):
+ (-[WebHTMLView provisionalDataSourceCommitted:]):
+ (-[WebHTMLView dataSourceUpdated:]):
+ * WebView.subproj/WebHTMLViewPrivate.m:
+ (-[NSView _web_stopIfPluginView]):
+ * WebView.subproj/WebImageView.h:
+ * WebView.subproj/WebTextView.h:
+ * WebView.subproj/WebView.h:
+ * WebView.subproj/WebViewPrivate.h:
+ * WebView.subproj/WebViewPrivate.m:
+ (-[WebView _makeDocumentViewForDataSource:]):
+
+ Still need to muck with cvs server to change file names.
+
2002-08-20 David Hyatt <hyatt at apple.com>
Raising the layout delay from 0.75 to 1.00. This should be
diff --git a/WebKit/Plugins.subproj/WebPlugin.h b/WebKit/Plugins.subproj/WebPlugin.h
index 638a40a..d4b95ac 100644
--- a/WebKit/Plugins.subproj/WebPlugin.h
+++ b/WebKit/Plugins.subproj/WebPlugin.h
@@ -27,7 +27,7 @@
#import "npapi.h"
#import <WebCore/WebCoreViewFactory.h>
- at interface WebPlugin : NSObject <WebCorePluginInfo>
+ at interface WebNetscapePlugin : NSObject <WebCorePluginInfo>
{
NSMutableArray *mimeTypes;
NSString *name, *path, *filename, *pluginDescription;
diff --git a/WebKit/Plugins.subproj/WebPlugin.m b/WebKit/Plugins.subproj/WebPlugin.m
index f351ec7..fa4aeaa 100644
--- a/WebKit/Plugins.subproj/WebPlugin.m
+++ b/WebKit/Plugins.subproj/WebPlugin.m
@@ -31,7 +31,7 @@ typedef void (* TransitionVector) (void);
FunctionPointer functionPointerForTVector(TransitionVector);
TransitionVector tVectorForFunctionPointer(FunctionPointer);
- at implementation WebPlugin
+ at implementation WebNetscapePlugin
- (SInt16)_openResourceFile
{
@@ -202,17 +202,17 @@ TransitionVector tVectorForFunctionPointer(FunctionPointer);
}else{ // single CFM file
err = FSPathMakeRef((UInt8 *)[path cString], &fref, NULL);
if(err != noErr){
- WEBKITDEBUG("WebPlugin: load: FSPathMakeRef failed. Error=%d\n", err);
+ WEBKITDEBUG("WebNetscapePlugin: load: FSPathMakeRef failed. Error=%d\n", err);
return NO;
}
err = FSGetCatalogInfo(&fref, kFSCatInfoNone, NULL, NULL, &spec, NULL);
if(err != noErr){
- WEBKITDEBUG("WebPlugin: load: FSGetCatalogInfo failed. Error=%d\n", err);
+ WEBKITDEBUG("WebNetscapePlugin: load: FSGetCatalogInfo failed. Error=%d\n", err);
return NO;
}
err = GetDiskFragment(&spec, 0, kCFragGoesToEOF, nil, kPrivateCFragCopy, &connID, (Ptr *)&pluginMainFunc, nil);
if(err != noErr){
- WEBKITDEBUG("WebPlugin: load: GetDiskFragment failed. Error=%d\n", err);
+ WEBKITDEBUG("WebNetscapePlugin: load: GetDiskFragment failed. Error=%d\n", err);
return NO;
}
pluginMainFunc = (mainFuncPtr)functionPointerForTVector((TransitionVector)pluginMainFunc);
diff --git a/WebKit/Plugins.subproj/WebPluginDatabase.h b/WebKit/Plugins.subproj/WebPluginDatabase.h
index 98217d3..427659e 100644
--- a/WebKit/Plugins.subproj/WebPluginDatabase.h
+++ b/WebKit/Plugins.subproj/WebPluginDatabase.h
@@ -25,17 +25,17 @@
#import <Foundation/Foundation.h>
- at class WebPlugin;
+ at class WebNetscapePlugin;
- at interface WebPluginDatabase : NSObject
+ at interface WebNetscapePluginDatabase : NSObject
{
NSArray *plugins;
}
-+ (WebPluginDatabase *)installedPlugins;
-- (WebPlugin *)pluginForMimeType:(NSString *)mimeType;
-- (WebPlugin *)pluginForExtension:(NSString *)extension;
-- (WebPlugin *)pluginWithFilename:(NSString *)filename;
++ (WebNetscapePluginDatabase *)installedPlugins;
+- (WebNetscapePlugin *)pluginForMimeType:(NSString *)mimeType;
+- (WebNetscapePlugin *)pluginForExtension:(NSString *)extension;
+- (WebNetscapePlugin *)pluginWithFilename:(NSString *)filename;
- (NSArray *)MIMETypes;
- (NSArray *)plugins;
diff --git a/WebKit/Plugins.subproj/WebPluginDatabase.m b/WebKit/Plugins.subproj/WebPluginDatabase.m
index 46c8c56..73fb398 100644
--- a/WebKit/Plugins.subproj/WebPluginDatabase.m
+++ b/WebKit/Plugins.subproj/WebPluginDatabase.m
@@ -32,24 +32,24 @@
#import <WebKit/WebDataSource.h>
#import <WebKit/WebKitDebug.h>
- at implementation WebPluginDatabase
+ at implementation WebNetscapePluginDatabase
-static WebPluginDatabase *database = nil;
+static WebNetscapePluginDatabase *database = nil;
-+ (WebPluginDatabase *)installedPlugins
++ (WebNetscapePluginDatabase *)installedPlugins
{
if (!database) {
- database = [[WebPluginDatabase alloc] init];
+ database = [[WebNetscapePluginDatabase alloc] init];
}
return database;
}
// FIXME: Use a dictionary for this?
// The first plugin with the specified mime type is returned. We may want to tie this to the defaults so that this is configurable.
-- (WebPlugin *)pluginForMimeType:(NSString *)mimeType
+- (WebNetscapePlugin *)pluginForMimeType:(NSString *)mimeType
{
uint i, n;
- WebPlugin *plugin;
+ WebNetscapePlugin *plugin;
NSArray *mimeArray;
for(i=0; i<[plugins count]; i++){
@@ -65,10 +65,10 @@ static WebPluginDatabase *database = nil;
}
// FIXME: Use a dictionary for this?
-- (WebPlugin *)pluginForExtension:(NSString *)extension
+- (WebNetscapePlugin *)pluginForExtension:(NSString *)extension
{
uint i, n;
- WebPlugin *plugin;
+ WebNetscapePlugin *plugin;
NSArray *mimeArray;
NSRange hasExtension;
@@ -86,10 +86,10 @@ static WebPluginDatabase *database = nil;
}
// FIXME: Use a dictionary for this?
-- (WebPlugin *)pluginWithFilename:(NSString *)filename
+- (WebNetscapePlugin *)pluginWithFilename:(NSString *)filename
{
uint i;
- WebPlugin *plugin;
+ WebNetscapePlugin *plugin;
for(i=0; i<[plugins count]; i++){
plugin = [plugins objectAtIndex:i];
@@ -109,7 +109,7 @@ static WebPluginDatabase *database = nil;
- (NSArray *)MIMETypes
{
NSMutableArray *allHandledMIMETypes;
- WebPlugin *plugin;
+ WebNetscapePlugin *plugin;
NSArray *mimeArray;
uint i, n;
@@ -146,7 +146,7 @@ static NSArray *pluginLocations(void)
NSString *file;
NSMutableArray *pluginPaths, *pluginArray;
NSMutableSet *filenames;
- WebPlugin *plugin;
+ WebNetscapePlugin *plugin;
uint i, n;
self = [super init];
@@ -175,7 +175,7 @@ static NSArray *pluginLocations(void)
pluginArray = [NSMutableArray arrayWithCapacity:[pluginPaths count]];
for (i = 0; i < [pluginPaths count]; i++) {
- plugin = [[WebPlugin alloc] initWithPath:[pluginPaths objectAtIndex:i]];
+ plugin = [[WebNetscapePlugin alloc] initWithPath:[pluginPaths objectAtIndex:i]];
if (plugin) {
[pluginArray addObject:plugin];
WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "Found plugin: %s\n", [[plugin name] lossyCString]);
@@ -189,8 +189,8 @@ static NSArray *pluginLocations(void)
// register plug-in WebDocumentViews and WebDocumentRepresentations
NSArray *mimes = [self MIMETypes];
for (i = 0; i < [mimes count]; i++) {
- [WebView registerViewClass:[WebPluginView class] forMIMEType:[mimes objectAtIndex:i]];
- [WebDataSource registerRepresentationClass:[WebPluginStream class] forMIMEType:[mimes objectAtIndex:i]];
+ [WebView registerViewClass:[WebNetscapePluginView class] forMIMEType:[mimes objectAtIndex:i]];
+ [WebDataSource registerRepresentationClass:[WebNetscapePluginStream class] forMIMEType:[mimes objectAtIndex:i]];
}
return self;
diff --git a/WebKit/Plugins.subproj/WebPluginNullEventSender.h b/WebKit/Plugins.subproj/WebPluginNullEventSender.h
index 9468762..3898b1e 100644
--- a/WebKit/Plugins.subproj/WebPluginNullEventSender.h
+++ b/WebKit/Plugins.subproj/WebPluginNullEventSender.h
@@ -6,16 +6,16 @@
#import <Foundation/Foundation.h>
#import <npapi.h>
- at class WebPluginView;
+ at class WebNetscapePluginView;
- at interface WebPluginNullEventSender : NSObject{
+ at interface WebNetscapePluginNullEventSender : NSObject{
NPP instance;
NPP_HandleEventProcPtr NPP_HandleEvent;
bool shouldStop;
NSWindow *window;
}
--(id)initWithPluginView:(WebPluginView *)pluginView;
+-(id)initWithPluginView:(WebNetscapePluginView *)pluginView;
-(void)sendNullEvents;
-(void)stop;
@end
\ No newline at end of file
diff --git a/WebKit/Plugins.subproj/WebPluginNullEventSender.m b/WebKit/Plugins.subproj/WebPluginNullEventSender.m
index 199e55f..0c731e8 100644
--- a/WebKit/Plugins.subproj/WebPluginNullEventSender.m
+++ b/WebKit/Plugins.subproj/WebPluginNullEventSender.m
@@ -8,9 +8,9 @@
#import <WebKitDebug.h>
#import <WebKit/WebPluginView.h>
- at implementation WebPluginNullEventSender
+ at implementation WebNetscapePluginNullEventSender
--(id)initWithPluginView:(WebPluginView *)pluginView
+-(id)initWithPluginView:(WebNetscapePluginView *)pluginView
{
[super init];
@@ -34,7 +34,7 @@
EventRecord event;
BOOL acceptedEvent;
- [WebPluginView getCarbonEvent:&event];
+ [WebNetscapePluginView getCarbonEvent:&event];
// plug-in should not react to cursor position when not active.
if(![window isKeyWindow]){
diff --git a/WebKit/Plugins.subproj/WebPluginStream.h b/WebKit/Plugins.subproj/WebPluginStream.h
index aee28dd..c1c897d 100644
--- a/WebKit/Plugins.subproj/WebPluginStream.h
+++ b/WebKit/Plugins.subproj/WebPluginStream.h
@@ -12,9 +12,9 @@
@protocol WebDocumentRepresentation;
- at interface WebPluginStream : NSObject <WebDocumentRepresentation>
+ at interface WebNetscapePluginStream : NSObject <WebDocumentRepresentation>
{
- WebPluginView *view;
+ WebNetscapePluginView *view;
NSURL *URL;
NPP instance;
uint16 transferMode;
diff --git a/WebKit/Plugins.subproj/WebPluginStream.m b/WebKit/Plugins.subproj/WebPluginStream.m
index 4151c7a..48f7044 100644
--- a/WebKit/Plugins.subproj/WebPluginStream.m
+++ b/WebKit/Plugins.subproj/WebPluginStream.m
@@ -14,19 +14,19 @@
#import <WebFoundation/WebFoundation.h>
#import <WebFoundation/WebNSFileManagerExtras.h>
- at interface WebPluginStream (ClassInternal)
+ at interface WebNetscapePluginStream (ClassInternal)
- (void)receivedData:(NSData *)data;
- (void)receivedError:(NPError)error;
- (void)finishedLoadingWithData:(NSData *)data;
- (void)setUpGlobalsWithHandle:(WebResourceHandle *)handle;
@end
- at interface WebPluginStream (WebResourceClient) <WebResourceClient>
+ at interface WebNetscapePluginStream (WebResourceClient) <WebResourceClient>
@end
- at implementation WebPluginStream
+ at implementation WebNetscapePluginStream
-- (void) getFunctionPointersFromPluginView:(WebPluginView *)pluginView
+- (void) getFunctionPointersFromPluginView:(WebNetscapePluginView *)pluginView
{
NPP_NewStream = [pluginView NPP_NewStream];
NPP_WriteReady = [pluginView NPP_WriteReady];
@@ -65,7 +65,7 @@
if(!thePluginPointer)
return nil;
- view = [(WebPluginView *)thePluginPointer->ndata retain];
+ view = [(WebNetscapePluginView *)thePluginPointer->ndata retain];
URL = [theURL retain];
attributes = [theAttributes retain];
instance = thePluginPointer;
@@ -243,7 +243,7 @@
#pragma mark WebResourceHandle
- at implementation WebPluginStream (WebResourceClient)
+ at implementation WebNetscapePluginStream (WebResourceClient)
- (NSString *)handleWillUseUserAgent:(WebResourceHandle *)handle forURL:(NSURL *)theURL
{
diff --git a/WebKit/Plugins.subproj/WebPluginView.h b/WebKit/Plugins.subproj/WebPluginView.h
index 68adfb0..4be05d2 100644
--- a/WebKit/Plugins.subproj/WebPluginView.h
+++ b/WebKit/Plugins.subproj/WebPluginView.h
@@ -9,15 +9,15 @@
#import <Cocoa/Cocoa.h>
#import <npapi.h>
- at class WebPluginNullEventSender;
+ at class WebNetscapePluginNullEventSender;
@class WebDataSource;
- at class WebPlugin;
+ at class WebNetscapePlugin;
@class WebController;
@protocol WebDocumentView;
- at interface WebPluginView : NSView <WebDocumentView>
+ at interface WebNetscapePluginView : NSView <WebDocumentView>
{
- WebPluginNullEventSender *eventSender;
+ WebNetscapePluginNullEventSender *eventSender;
unsigned argsCount;
char **cAttributes, **cValues;
@@ -53,7 +53,7 @@
NPP_SetValueProcPtr NPP_SetValue;
}
-- (id)initWithFrame:(NSRect)r plugin:(WebPlugin *)plugin URL:(NSURL *)URL baseURL:(NSURL *)baseURL mime:(NSString *)mimeType arguments:(NSDictionary *)arguments;
+- (id)initWithFrame:(NSRect)r plugin:(WebNetscapePlugin *)plugin URL:(NSURL *)URL baseURL:(NSURL *)baseURL mime:(NSString *)mimeType arguments:(NSDictionary *)arguments;
-(void)stop;
- (WebDataSource *)webDataSource;
- (WebController *)webController;
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index 0a1c5d0..0f4f5c2 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -27,7 +27,7 @@
#import <AppKit/NSWindow_Private.h>
#import <Carbon/Carbon.h>
- at implementation WebPluginView
+ at implementation WebNetscapePluginView
#pragma mark EVENTS
@@ -337,7 +337,7 @@
#pragma mark WEB_PLUGIN_VIEW
-- (id)initWithFrame:(NSRect)r plugin:(WebPlugin *)plugin URL:(NSURL *)theURL baseURL:(NSURL *)theBaseURL mime:(NSString *)mimeType arguments:(NSDictionary *)arguments
+- (id)initWithFrame:(NSRect)r plugin:(WebNetscapePlugin *)plugin URL:(NSURL *)theURL baseURL:(NSURL *)theBaseURL mime:(NSString *)mimeType arguments:(NSDictionary *)arguments
{
[super initWithFrame:r];
@@ -501,7 +501,7 @@
{
NSNotificationCenter *notificationCenter;
NSWindow *theWindow;
- WebPluginStream *stream;
+ WebNetscapePluginStream *stream;
if(isStarted || !canRestart)
return;
@@ -546,7 +546,7 @@
webDataSource = [[webFrame dataSource] retain];
if(srcURL){
- stream = [[WebPluginStream alloc] initWithURL:srcURL pluginPointer:instance];
+ stream = [[WebNetscapePluginStream alloc] initWithURL:srcURL pluginPointer:instance];
if(stream){
[stream startLoad];
[streams addObject:stream];
@@ -554,7 +554,7 @@
}
}
- eventSender = [[WebPluginNullEventSender alloc] initWithPluginView:self];
+ eventSender = [[WebNetscapePluginNullEventSender alloc] initWithPluginView:self];
[eventSender sendNullEvents];
[self resetTrackingRect];
}
@@ -621,10 +621,10 @@
- (void)provisionalDataSourceChanged:(WebDataSource *)dataSource
{
- WebPlugin *plugin;
+ WebNetscapePlugin *plugin;
mime = [[dataSource contentType] retain];
- plugin = [[WebPluginDatabase installedPlugins] pluginForMimeType:mime];
+ plugin = [[WebNetscapePluginDatabase installedPlugins] pluginForMimeType:mime];
if(![plugin load])
return;
@@ -766,7 +766,7 @@
- (NPError) loadURL:(NSString *)URLString inTarget:(NSString *)target withNotifyData:(void *)notifyData andHandleAttributes:(NSDictionary *)attributes
{
- WebPluginStream *stream;
+ WebNetscapePluginStream *stream;
WebDataSource *dataSource;
WebFrame *frame;
NSURL *URL;
@@ -780,7 +780,7 @@
return NPERR_INVALID_URL;
if(!target){
- stream = [[WebPluginStream alloc] initWithURL:URL pluginPointer:instance notifyData:notifyData attributes:attributes];
+ stream = [[WebNetscapePluginStream alloc] initWithURL:URL pluginPointer:instance notifyData:notifyData attributes:attributes];
if(stream){
[stream startLoad];
[streams addObject:stream];
@@ -917,7 +917,7 @@
if(!stream->ndata)
return NPERR_INVALID_INSTANCE_ERROR;
- [(WebPluginStream *)stream->ndata stop];
+ [(WebNetscapePluginStream *)stream->ndata stop];
return NPERR_NO_ERROR;
}
diff --git a/WebKit/WebCoreSupport.subproj/WebViewFactory.m b/WebKit/WebCoreSupport.subproj/WebViewFactory.m
index a84be95..cbab924 100644
--- a/WebKit/WebCoreSupport.subproj/WebViewFactory.m
+++ b/WebKit/WebCoreSupport.subproj/WebViewFactory.m
@@ -31,7 +31,7 @@
NSMutableDictionary *arguments;
NSString *mimeType, *extension;
NSRange r1, r2, r3;
- WebPlugin *plugin;
+ WebNetscapePlugin *plugin;
uint i;
arguments = [NSMutableDictionary dictionary];
@@ -48,34 +48,34 @@
if ([serviceType length]) {
mimeType = serviceType;
- plugin = [[WebPluginDatabase installedPlugins] pluginForMimeType:mimeType];
+ plugin = [[WebNetscapePluginDatabase installedPlugins] pluginForMimeType:mimeType];
} else {
extension = [[pluginURL path] pathExtension];
- plugin = [[WebPluginDatabase installedPlugins] pluginForExtension:extension];
+ plugin = [[WebNetscapePluginDatabase installedPlugins] pluginForExtension:extension];
mimeType = [plugin mimeTypeForExtension:extension];
}
if (plugin == nil) {
return [[[WebNullPluginView alloc] initWithFrame:NSMakeRect(0,0,0,0) mimeType:mimeType arguments:arguments] autorelease];
}
- return [[[WebPluginView alloc] initWithFrame:NSMakeRect(0,0,0,0) plugin:plugin URL:pluginURL baseURL:baseURL mime:mimeType arguments:arguments] autorelease];
+ return [[[WebNetscapePluginView alloc] initWithFrame:NSMakeRect(0,0,0,0) plugin:plugin URL:pluginURL baseURL:baseURL mime:mimeType arguments:arguments] autorelease];
}
- (NSArray *)pluginsInfo
{
- return [[WebPluginDatabase installedPlugins] plugins];
+ return [[WebNetscapePluginDatabase installedPlugins] plugins];
}
- (NSView *)viewForJavaAppletWithFrame:(NSRect)frame baseURL:(NSURL *)baseURL parameters:(NSDictionary *)parameters
{
- WebPlugin *plugin;
+ WebNetscapePlugin *plugin;
- plugin = [[WebPluginDatabase installedPlugins] pluginForMimeType:@"application/x-java-applet"];
+ plugin = [[WebNetscapePluginDatabase installedPlugins] pluginForMimeType:@"application/x-java-applet"];
if (plugin == nil) {
return nil;
}
- return [[[WebPluginView alloc] initWithFrame:frame plugin:plugin URL:nil baseURL:baseURL mime:@"application/x-java-applet" arguments:parameters] autorelease];
+ return [[[WebNetscapePluginView alloc] initWithFrame:frame plugin:plugin URL:nil baseURL:baseURL mime:@"application/x-java-applet" arguments:parameters] autorelease];
}
@end
diff --git a/WebKit/WebView.subproj/WebController.h b/WebKit/WebView.subproj/WebController.h
index 2514f96..acc61dc 100644
--- a/WebKit/WebView.subproj/WebController.h
+++ b/WebKit/WebView.subproj/WebController.h
@@ -40,8 +40,6 @@
@class WebResourceHandle;
@class WebView;
- at protocol WebDocumentLoading;
-
/*
=============================================================================
diff --git a/WebKit/WebView.subproj/WebController.m b/WebKit/WebView.subproj/WebController.m
index 5e8bb5f..8a00a3b 100644
--- a/WebKit/WebView.subproj/WebController.m
+++ b/WebKit/WebView.subproj/WebController.m
@@ -278,7 +278,7 @@
return YES;
}else{
// Have the plug-ins register views and representations
- [WebPluginDatabase installedPlugins];
+ [WebNetscapePluginDatabase installedPlugins];
if([WebView _canShowMIMEType:MIMEType] && [WebDataSource _canShowMIMEType:MIMEType])
return YES;
}
diff --git a/WebKit/WebView.subproj/WebDocument.h b/WebKit/WebView.subproj/WebDocument.h
index 5362afd..38137c6 100644
--- a/WebKit/WebView.subproj/WebDocument.h
+++ b/WebKit/WebView.subproj/WebDocument.h
@@ -9,9 +9,9 @@
@class WebError;
@protocol WebDocumentView <NSObject>
-- (void)provisionalDataSourceChanged:(WebDataSource *)dataSource;
-- (void)provisionalDataSourceCommitted:(WebDataSource *)dataSource;
-- (void)dataSourceUpdated:(WebDataSource *)dataSource;
+- (void)provisionalDataSourceChanged: (WebDataSource *)dataSource;
+- (void)provisionalDataSourceCommitted: (WebDataSource *)dataSource;
+- (void)dataSourceUpdated: (WebDataSource *)dataSource;
- (void)layout;
@end
@@ -28,14 +28,14 @@
@protocol WebDocumentTextEncoding <NSObject>
- (CFStringEncoding)textEncoding;
-- (void)setTextEncoding:(CFStringEncoding)encoding;
+- (void)setTextEncoding: (CFStringEncoding)encoding;
- (void)setDefaultTextEncoding;
- (BOOL)usingDefaultTextEncoding;
@end
@protocol WebDocumentRepresentation <NSObject>
-- (void)setDataSource:(WebDataSource *)dataSource;
-- (void)receivedData:(NSData *)data withDataSource:(WebDataSource *)dataSource;
-- (void)receivedError:(WebError *)error withDataSource:(WebDataSource *)dataSource;
-- (void)finishedLoadingWithDataSource:(WebDataSource *)dataSource;
+- (void)setDataSource: (WebDataSource *)dataSource;
+- (void)receivedData: (NSData *)data withDataSource: (WebDataSource *)dataSource;
+- (void)receivedError: (WebError *)error withDataSource: (WebDataSource *)dataSource;
+- (void)finishedLoadingWithDataSource: (WebDataSource *)dataSource;
@end
diff --git a/WebKit/WebView.subproj/WebFramePrivate.h b/WebKit/WebView.subproj/WebFramePrivate.h
index 987d923..10a0d9b 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.h
+++ b/WebKit/WebView.subproj/WebFramePrivate.h
@@ -13,8 +13,6 @@
@class WebHistoryItem;
@class WebView;
- at protocol WebDocumentLoading;
-
typedef enum {
WebFrameStateProvisional,
diff --git a/WebKit/WebView.subproj/WebFrameView.h b/WebKit/WebView.subproj/WebFrameView.h
index 54092d3..bb43dd8 100644
--- a/WebKit/WebView.subproj/WebFrameView.h
+++ b/WebKit/WebView.subproj/WebFrameView.h
@@ -14,7 +14,7 @@
@class WebDataSource;
@class WebController;
@class WebViewPrivate;
- at protocol WebDocumentLoading;
+
@protocol WebDocumentView;
@interface WebView : NSView
@@ -37,7 +37,7 @@
- (BOOL)allowsScrolling;
// Extends the views that WebKit supports
-// The view must conform to the WebDocumentLoading protocol
+// The view must conform to the WebDocumentView protocol
+ (void)registerViewClass:(Class)viewClass forMIMEType:(NSString *)MIMEType;
@end
diff --git a/WebKit/WebView.subproj/WebFrameViewInternal.h b/WebKit/WebView.subproj/WebFrameViewInternal.h
index 328fed5..a5b9b14 100644
--- a/WebKit/WebView.subproj/WebFrameViewInternal.h
+++ b/WebKit/WebView.subproj/WebFrameViewInternal.h
@@ -28,7 +28,7 @@
@end
@interface WebView (WebPrivate)
-- (void)_setDocumentView:(id <WebDocumentLoading>)view;
+- (void)_setDocumentView:(id <WebDocumentView>)view;
- (void)_makeDocumentViewForDataSource:(WebDataSource *)dataSource;
- (void)_setController:(WebController *)controller;
- (WebController *)_controller;
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.h b/WebKit/WebView.subproj/WebFrameViewPrivate.h
index 328fed5..a5b9b14 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.h
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.h
@@ -28,7 +28,7 @@
@end
@interface WebView (WebPrivate)
-- (void)_setDocumentView:(id <WebDocumentLoading>)view;
+- (void)_setDocumentView:(id <WebDocumentView>)view;
- (void)_makeDocumentViewForDataSource:(WebDataSource *)dataSource;
- (void)_setController:(WebController *)controller;
- (WebController *)_controller;
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.m b/WebKit/WebView.subproj/WebFrameViewPrivate.m
index 427d228..9c1de15 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.m
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.m
@@ -71,7 +71,7 @@
{
Class viewClass = [[[self class] _viewTypes] _web_objectForMIMEType:[dataSource contentType]];
id documentView = viewClass ? [[viewClass alloc] init] : nil;
- [self _setDocumentView:(id<WebDocumentLoading>)documentView];
+ [self _setDocumentView:(id<WebDocumentView>)documentView];
[documentView release];
[[self documentView] provisionalDataSourceChanged:dataSource];
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 5a143f2..5d6fbb7 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -159,24 +159,6 @@
[super viewDidMoveToWindow];
}
-// This method is typically called by the view's controller when the data source is changed.
-- (void)provisionalDataSourceChanged:(WebDataSource *)dataSource
-{
- [[dataSource _bridge]
- createKHTMLViewWithNSView:self
- marginWidth:[[[dataSource webFrame] webView] _marginWidth]
- marginHeight:[[[dataSource webFrame] webView] _marginHeight]];
-}
-
-- (void)provisionalDataSourceCommitted:(WebDataSource *)dataSource
-{
- [[self _bridge] installInFrame:[[self _web_parentWebView] frameScrollView]];
-}
-
-- (void)dataSourceUpdated:(WebDataSource *)dataSource
-{
-}
-
- (void)reapplyStyles
{
if (!_private->needsToApplyStyles) {
@@ -604,4 +586,28 @@
return YES;
}
+//------------------------------------------------------------------------------------
+// WebDocumentView protocol
+//------------------------------------------------------------------------------------
+- (void)provisionalDataSourceChanged:(WebDataSource *)dataSource
+{
+ [[dataSource _bridge]
+ createKHTMLViewWithNSView:self
+ marginWidth:[[[dataSource webFrame] webView] _marginWidth]
+ marginHeight:[[[dataSource webFrame] webView] _marginHeight]];
+}
+
+
+- (void)provisionalDataSourceCommitted:(WebDataSource *)dataSource
+{
+ [[self _bridge] installInFrame:[[self _web_parentWebView] frameScrollView]];
+}
+
+- (void)dataSourceUpdated:(WebDataSource *)dataSource
+{
+}
+
+
+
+
@end
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.m b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
index f955387..3ddb48e 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.m
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
@@ -27,8 +27,8 @@
@implementation NSView (WebHTMLViewPrivate)
- (void)_web_stopIfPluginView
{
- if ([self isKindOfClass:[WebPluginView class]]) {
- WebPluginView *pluginView = (WebPluginView *)self;
+ if ([self isKindOfClass:[WebNetscapePluginView class]]) {
+ WebNetscapePluginView *pluginView = (WebNetscapePluginView *)self;
[pluginView stop];
}
}
diff --git a/WebKit/WebView.subproj/WebImageView.h b/WebKit/WebView.subproj/WebImageView.h
index e559f69..c09be66 100644
--- a/WebKit/WebView.subproj/WebImageView.h
+++ b/WebKit/WebView.subproj/WebImageView.h
@@ -6,10 +6,10 @@
#import <Cocoa/Cocoa.h>
@class WebImageRepresentation;
- at protocol WebDocumentLoading;
+ at protocol WebDocumentView;
@protocol WebDocumentDragSettings;
- at interface WebImageView : NSView <WebDocumentLoading, WebDocumentDragSettings>
+ at interface WebImageView : NSView <WebDocumentView, WebDocumentDragSettings>
{
WebImageRepresentation *representation;
BOOL canDragFrom;
diff --git a/WebKit/WebView.subproj/WebTextView.h b/WebKit/WebView.subproj/WebTextView.h
index e520a3f..d1e9857 100644
--- a/WebKit/WebView.subproj/WebTextView.h
+++ b/WebKit/WebView.subproj/WebTextView.h
@@ -6,10 +6,10 @@
#import <Cocoa/Cocoa.h>
#import "WebSearchableTextView.h"
- at protocol WebDocumentLoading;
+ at protocol WebDocumentView;
@protocol WebDocumentDragSettings;
- at interface WebTextView : WebSearchableTextView <WebDocumentLoading, WebDocumentDragSettings>
+ at interface WebTextView : WebSearchableTextView <WebDocumentView, WebDocumentDragSettings>
{
BOOL canDragFrom;
BOOL canDragTo;
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index 2514f96..acc61dc 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -40,8 +40,6 @@
@class WebResourceHandle;
@class WebView;
- at protocol WebDocumentLoading;
-
/*
=============================================================================
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index 5e8bb5f..8a00a3b 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -278,7 +278,7 @@
return YES;
}else{
// Have the plug-ins register views and representations
- [WebPluginDatabase installedPlugins];
+ [WebNetscapePluginDatabase installedPlugins];
if([WebView _canShowMIMEType:MIMEType] && [WebDataSource _canShowMIMEType:MIMEType])
return YES;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list