[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:03:45 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 29f24cff7992efaf485a992fee8306d3bbc8c141
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Apr 8 18:51:02 2002 +0000
* Plugins.subproj/IFNullPluginView.h:
* Plugins.subproj/IFNullPluginView.mm: (-[IFNullPluginView
initWithFrame:mimeType:arguments:]), (-[IFNullPluginView drawRect:]):
* WebView.subproj/IFBaseWebController.mm: (-[IFBaseWebController
pluginNotFoundForMIMEType:pluginPageURL:]):
* WebView.subproj/IFWebController.h:
Added pluginNotFoundForMIMEType: pluginPageURL: to WebKit. This gets called
by IFNullPluginView when a plug-in for a certain mime type is requested but
not installed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@982 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 2f0e5bf..d0c2f45 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2002-04-08 Chris Blumenberg <cblu at apple.com>
+
+ * Plugins.subproj/IFNullPluginView.h:
+ * Plugins.subproj/IFNullPluginView.mm: (-[IFNullPluginView
+ initWithFrame:mimeType:arguments:]), (-[IFNullPluginView drawRect:]):
+ * WebView.subproj/IFBaseWebController.mm: (-[IFBaseWebController
+ pluginNotFoundForMIMEType:pluginPageURL:]):
+ * WebView.subproj/IFWebController.h:
+
+ Added pluginNotFoundForMIMEType: pluginPageURL: to WebKit. This gets called
+ by IFNullPluginView when a plug-in for a certain mime type is requested but
+ not installed.
+
2002-04-08 Richard Williamson <rjw at apple.com>
Added frameForView:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 2f0e5bf..d0c2f45 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,16 @@
+2002-04-08 Chris Blumenberg <cblu at apple.com>
+
+ * Plugins.subproj/IFNullPluginView.h:
+ * Plugins.subproj/IFNullPluginView.mm: (-[IFNullPluginView
+ initWithFrame:mimeType:arguments:]), (-[IFNullPluginView drawRect:]):
+ * WebView.subproj/IFBaseWebController.mm: (-[IFBaseWebController
+ pluginNotFoundForMIMEType:pluginPageURL:]):
+ * WebView.subproj/IFWebController.h:
+
+ Added pluginNotFoundForMIMEType: pluginPageURL: to WebKit. This gets called
+ by IFNullPluginView when a plug-in for a certain mime type is requested but
+ not installed.
+
2002-04-08 Richard Williamson <rjw at apple.com>
Added frameForView:
diff --git a/WebKit/Plugins.subproj/IFNullPluginView.h b/WebKit/Plugins.subproj/IFNullPluginView.h
index 5e26819..2a2dada 100644
--- a/WebKit/Plugins.subproj/IFNullPluginView.h
+++ b/WebKit/Plugins.subproj/IFNullPluginView.h
@@ -12,6 +12,8 @@
@interface IFNullPluginView : NSImageView {
BOOL errorSent;
+ NSString *mimeType;
+ NSURL *pluginPage;
}
- initWithFrame:(NSRect)frame mimeType:(NSString *)mime arguments:(NSDictionary *)arguments;
diff --git a/WebKit/Plugins.subproj/IFNullPluginView.mm b/WebKit/Plugins.subproj/IFNullPluginView.mm
index af7c3a2..0768018 100644
--- a/WebKit/Plugins.subproj/IFNullPluginView.mm
+++ b/WebKit/Plugins.subproj/IFNullPluginView.mm
@@ -8,6 +8,8 @@
#import "IFNullPluginView.h"
#import "WCPluginWidget.h"
+#import "IFWebView.h"
+#import "IFBaseWebController.h"
@implementation IFNullPluginView
@@ -23,7 +25,7 @@ static id IFNullPluginMake(NSRect rect, NSString *mimeType, NSDictionary *argume
- initWithFrame:(NSRect)frame mimeType:(NSString *)mime arguments:(NSDictionary *)arguments{
NSBundle *bundle;
- NSString *imagePath;
+ NSString *imagePath, *pluginPageString;
self = [super initWithFrame:frame];
if (self) {
@@ -31,6 +33,13 @@ static id IFNullPluginMake(NSRect rect, NSString *mimeType, NSDictionary *argume
bundle = [NSBundle bundleWithIdentifier:@"com.apple.webkit"];
imagePath = [bundle pathForResource:@"nullplugin" ofType:@"tiff"];
[self setImage:[[NSImage alloc] initWithContentsOfFile:imagePath]];
+
+ pluginPageString = [arguments objectForKey:@"pluginspage"];
+ if(pluginPageString)
+ pluginPage = [[NSURL URLWithString:pluginPageString] retain];
+ if(mime)
+ mimeType = [mime retain];
+
errorSent = false;
}
return self;
@@ -51,10 +60,15 @@ static id IFNullPluginMake(NSRect rect, NSString *mimeType, NSDictionary *argume
}
- (void)drawRect:(NSRect)rect {
+ IFWebView *webView;
+ IFBaseWebController *webController;
+
[super drawRect:rect];
if(!errorSent){
- //webView = [self findSuperview:@"IFWebView"];
- //webController = [webView controller];
+ webView = [self findSuperview:@"IFWebView"];
+ webController = [webView controller];
+ [webController pluginNotFoundForMIMEType:mimeType pluginPageURL:pluginPage];
+ errorSent = TRUE;
}
}
diff --git a/WebKit/Plugins.subproj/WebNullPluginView.h b/WebKit/Plugins.subproj/WebNullPluginView.h
index 5e26819..2a2dada 100644
--- a/WebKit/Plugins.subproj/WebNullPluginView.h
+++ b/WebKit/Plugins.subproj/WebNullPluginView.h
@@ -12,6 +12,8 @@
@interface IFNullPluginView : NSImageView {
BOOL errorSent;
+ NSString *mimeType;
+ NSURL *pluginPage;
}
- initWithFrame:(NSRect)frame mimeType:(NSString *)mime arguments:(NSDictionary *)arguments;
diff --git a/WebKit/Plugins.subproj/WebNullPluginView.m b/WebKit/Plugins.subproj/WebNullPluginView.m
index af7c3a2..0768018 100644
--- a/WebKit/Plugins.subproj/WebNullPluginView.m
+++ b/WebKit/Plugins.subproj/WebNullPluginView.m
@@ -8,6 +8,8 @@
#import "IFNullPluginView.h"
#import "WCPluginWidget.h"
+#import "IFWebView.h"
+#import "IFBaseWebController.h"
@implementation IFNullPluginView
@@ -23,7 +25,7 @@ static id IFNullPluginMake(NSRect rect, NSString *mimeType, NSDictionary *argume
- initWithFrame:(NSRect)frame mimeType:(NSString *)mime arguments:(NSDictionary *)arguments{
NSBundle *bundle;
- NSString *imagePath;
+ NSString *imagePath, *pluginPageString;
self = [super initWithFrame:frame];
if (self) {
@@ -31,6 +33,13 @@ static id IFNullPluginMake(NSRect rect, NSString *mimeType, NSDictionary *argume
bundle = [NSBundle bundleWithIdentifier:@"com.apple.webkit"];
imagePath = [bundle pathForResource:@"nullplugin" ofType:@"tiff"];
[self setImage:[[NSImage alloc] initWithContentsOfFile:imagePath]];
+
+ pluginPageString = [arguments objectForKey:@"pluginspage"];
+ if(pluginPageString)
+ pluginPage = [[NSURL URLWithString:pluginPageString] retain];
+ if(mime)
+ mimeType = [mime retain];
+
errorSent = false;
}
return self;
@@ -51,10 +60,15 @@ static id IFNullPluginMake(NSRect rect, NSString *mimeType, NSDictionary *argume
}
- (void)drawRect:(NSRect)rect {
+ IFWebView *webView;
+ IFBaseWebController *webController;
+
[super drawRect:rect];
if(!errorSent){
- //webView = [self findSuperview:@"IFWebView"];
- //webController = [webView controller];
+ webView = [self findSuperview:@"IFWebView"];
+ webController = [webView controller];
+ [webController pluginNotFoundForMIMEType:mimeType pluginPageURL:pluginPage];
+ errorSent = TRUE;
}
}
diff --git a/WebKit/WebView.subproj/IFBaseWebController.mm b/WebKit/WebView.subproj/IFBaseWebController.mm
index 8c86c25..e96d2e6 100644
--- a/WebKit/WebView.subproj/IFBaseWebController.mm
+++ b/WebKit/WebView.subproj/IFBaseWebController.mm
@@ -295,5 +295,9 @@
return data->mainFrame;
}
+- (void)pluginNotFoundForMIMEType:(NSString *)mime pluginPageURL:(NSURL *)url
+{
+ // Do nothing. Subclasses typically override this method.
+}
@end
diff --git a/WebKit/WebView.subproj/IFWebController.h b/WebKit/WebView.subproj/IFWebController.h
index 75fc4d6..e0ef50c 100644
--- a/WebKit/WebView.subproj/IFWebController.h
+++ b/WebKit/WebView.subproj/IFWebController.h
@@ -142,6 +142,8 @@
// an IFWebView.
- (IFWebFrame *)frameForView: (NSView *)aView;
+// Called when a plug-in for a certain mime type is not installed
+- (void)pluginNotFoundForMIMEType:(NSString *)mime pluginPageURL:(NSURL *)url;
@end
diff --git a/WebKit/WebView.subproj/WebController.h b/WebKit/WebView.subproj/WebController.h
index 75fc4d6..e0ef50c 100644
--- a/WebKit/WebView.subproj/WebController.h
+++ b/WebKit/WebView.subproj/WebController.h
@@ -142,6 +142,8 @@
// an IFWebView.
- (IFWebFrame *)frameForView: (NSView *)aView;
+// Called when a plug-in for a certain mime type is not installed
+- (void)pluginNotFoundForMIMEType:(NSString *)mime pluginPageURL:(NSURL *)url;
@end
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index 75fc4d6..e0ef50c 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -142,6 +142,8 @@
// an IFWebView.
- (IFWebFrame *)frameForView: (NSView *)aView;
+// Called when a plug-in for a certain mime type is not installed
+- (void)pluginNotFoundForMIMEType:(NSString *)mime pluginPageURL:(NSURL *)url;
@end
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list