[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:20 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit fc12d658f98d05386bf8ae7e0a82841caa3a483b
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Apr 5 23:13:24 2002 +0000
* Plugins.subproj/IFNullPluginView.h: Added.
* Plugins.subproj/IFNullPluginView.mm: Added.
(-[IFNullPluginView initWithFrame:mimeType:arguments:]), (-[IFNullPlug$
findSuperview:]), (-[IFNullPluginView drawRect:]):
* Resources/nullplugin.tiff: Added.
* WebKit.pbproj/project.pbxproj:
* src/kwq/WCPluginWidget.h:
* src/kwq/WCPluginWidget.mm: (WCSetIFNullPluginMakeFunc),
(WCPluginWidget::WCPluginWidget), (WCIFPluginMakeFunction),
(WCIFNullPluginMakeFunction):
An IFNullPluginView is now created when no plug-in for a requested
mime type is found. IFNullPluginView displays a null plug-in icon
and will eventually report this error to the WebController.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@978 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index d3b5f10..73a7b95 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,14 @@
+2002-04-05 Chris Blumenberg <cblu at apple.com>
+
+ * src/kwq/WCPluginWidget.h:
+ * src/kwq/WCPluginWidget.mm: (WCSetIFNullPluginMakeFunc),
+ (WCPluginWidget::WCPluginWidget), (WCIFPluginMakeFunction),
+ (WCIFNullPluginMakeFunction):
+
+ An IFNullPluginView is now created when no plug-in for a requested
+ mime type is found. IFNullPluginView displays a null plug-in icon
+ and will eventually report this error to the WebController.
+
2002-04-05 Richard Williamson <rjw at apple.com>
Hacks to support:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index d3b5f10..73a7b95 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2002-04-05 Chris Blumenberg <cblu at apple.com>
+
+ * src/kwq/WCPluginWidget.h:
+ * src/kwq/WCPluginWidget.mm: (WCSetIFNullPluginMakeFunc),
+ (WCPluginWidget::WCPluginWidget), (WCIFPluginMakeFunction),
+ (WCIFNullPluginMakeFunction):
+
+ An IFNullPluginView is now created when no plug-in for a requested
+ mime type is found. IFNullPluginView displays a null plug-in icon
+ and will eventually report this error to the WebController.
+
2002-04-05 Richard Williamson <rjw at apple.com>
Hacks to support:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d3b5f10..73a7b95 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2002-04-05 Chris Blumenberg <cblu at apple.com>
+
+ * src/kwq/WCPluginWidget.h:
+ * src/kwq/WCPluginWidget.mm: (WCSetIFNullPluginMakeFunc),
+ (WCPluginWidget::WCPluginWidget), (WCIFPluginMakeFunction),
+ (WCIFNullPluginMakeFunction):
+
+ An IFNullPluginView is now created when no plug-in for a requested
+ mime type is found. IFNullPluginView displays a null plug-in icon
+ and will eventually report this error to the WebController.
+
2002-04-05 Richard Williamson <rjw at apple.com>
Hacks to support:
diff --git a/WebCore/kwq/WCPluginWidget.h b/WebCore/kwq/WCPluginWidget.h
index f5a8eee..dad8df5 100644
--- a/WebCore/kwq/WCPluginWidget.h
+++ b/WebCore/kwq/WCPluginWidget.h
@@ -36,6 +36,9 @@
typedef id (*WCIFPluginMakeFunc)(NSRect rect, WCPlugin *plugin, NSString *url, NSString *mimeType, NSDictionary *arguments, uint16 mode);
void WCSetIFPluginMakeFunc(WCIFPluginMakeFunc func);
+
+typedef id (*WCIFNullPluginMakeFunc)(NSRect rect, NSString *mimeType, NSDictionary *arguments);
+void WCSetIFNullPluginMakeFunc(WCIFNullPluginMakeFunc func);
// class WCPluginWidget ===============================================================
@@ -68,5 +71,6 @@ private:
}; // class WCPluginWidget ============================================================
void * WCIFPluginMakeFunction();
+void * WCIFNullPluginMakeFunction();
#endif
diff --git a/WebCore/kwq/WCPluginWidget.mm b/WebCore/kwq/WCPluginWidget.mm
index 9a02d91..e040c0e 100644
--- a/WebCore/kwq/WCPluginWidget.mm
+++ b/WebCore/kwq/WCPluginWidget.mm
@@ -33,7 +33,6 @@
- initWithFrame: (NSRect) r plugin: (WCPlugin *)plug url: (NSString *)location mime:(NSString *)mime arguments:(NSDictionary *)arguments mode:(uint16)mode;
@end
-
static WCIFPluginMakeFunc WCIFPluginMake = NULL;
void WCSetIFPluginMakeFunc(WCIFPluginMakeFunc func)
@@ -41,11 +40,23 @@ void WCSetIFPluginMakeFunc(WCIFPluginMakeFunc func)
WCIFPluginMake = func;
}
+ at interface IFNullPluginView : NSObject
+- initWithFrame: (NSRect) r mimeType:(NSString *)mime arguments:(NSDictionary *)arguments;
+ at end
+
+static WCIFNullPluginMakeFunc WCIFNullPluginMake = NULL;
+
+void WCSetIFNullPluginMakeFunc(WCIFNullPluginMakeFunc func)
+{
+ WCIFNullPluginMake = func;
+}
+
+
WCPluginWidget::WCPluginWidget(const QString &url, const QString &serviceType, const QStringList &args)
{
NSMutableDictionary *arguments;
- NSString *arg, *mimeType, *URL;
+ NSString *arg, *mime=nil, *URL;
NSRange r1, r2, r3;
WCPlugin *plugin;
uint i;
@@ -66,18 +77,18 @@ WCPluginWidget::WCPluginWidget(const QString &url, const QString &serviceType, c
if(serviceType.isNull()){
plugin = [[WCPluginDatabase installedPlugins] getPluginForExtension:[URL pathExtension]];
if(plugin != nil){
- mimeType = [plugin mimeTypeForURL:URL];
+ mime = [plugin mimeTypeForURL:URL];
}
}else{
plugin = [[WCPluginDatabase installedPlugins] getPluginForMimeType:QSTRING_TO_NSSTRING(serviceType)];
- mimeType = QSTRING_TO_NSSTRING(serviceType);
+ mime = QSTRING_TO_NSSTRING(serviceType);
}
+
if(plugin == nil){
- //FIXME: Error dialog should be shown here
- printf("Could not find plugin for mime: %s or URL: %s\n", serviceType.latin1(), url.latin1());
- return;
+ setView(WCIFNullPluginMake(NSMakeRect(0,0,0,0), mime, arguments));
+ }else{
+ setView(WCIFPluginMake(NSMakeRect(0,0,0,0), plugin, URL, mime, arguments, NP_EMBED));
}
- setView(WCIFPluginMake(NSMakeRect(0,0,0,0), plugin, URL, mimeType, arguments, NP_EMBED));
}
WCPluginWidget::~WCPluginWidget()
@@ -90,5 +101,10 @@ void * WCIFPluginMakeFunction()
return WCIFPluginMake;
}
+void * WCIFNullPluginMakeFunction()
+{
+ return WCIFPluginMake;
+}
+
diff --git a/WebCore/src/kwq/WCPluginWidget.h b/WebCore/src/kwq/WCPluginWidget.h
index f5a8eee..dad8df5 100644
--- a/WebCore/src/kwq/WCPluginWidget.h
+++ b/WebCore/src/kwq/WCPluginWidget.h
@@ -36,6 +36,9 @@
typedef id (*WCIFPluginMakeFunc)(NSRect rect, WCPlugin *plugin, NSString *url, NSString *mimeType, NSDictionary *arguments, uint16 mode);
void WCSetIFPluginMakeFunc(WCIFPluginMakeFunc func);
+
+typedef id (*WCIFNullPluginMakeFunc)(NSRect rect, NSString *mimeType, NSDictionary *arguments);
+void WCSetIFNullPluginMakeFunc(WCIFNullPluginMakeFunc func);
// class WCPluginWidget ===============================================================
@@ -68,5 +71,6 @@ private:
}; // class WCPluginWidget ============================================================
void * WCIFPluginMakeFunction();
+void * WCIFNullPluginMakeFunction();
#endif
diff --git a/WebCore/src/kwq/WCPluginWidget.mm b/WebCore/src/kwq/WCPluginWidget.mm
index 9a02d91..e040c0e 100644
--- a/WebCore/src/kwq/WCPluginWidget.mm
+++ b/WebCore/src/kwq/WCPluginWidget.mm
@@ -33,7 +33,6 @@
- initWithFrame: (NSRect) r plugin: (WCPlugin *)plug url: (NSString *)location mime:(NSString *)mime arguments:(NSDictionary *)arguments mode:(uint16)mode;
@end
-
static WCIFPluginMakeFunc WCIFPluginMake = NULL;
void WCSetIFPluginMakeFunc(WCIFPluginMakeFunc func)
@@ -41,11 +40,23 @@ void WCSetIFPluginMakeFunc(WCIFPluginMakeFunc func)
WCIFPluginMake = func;
}
+ at interface IFNullPluginView : NSObject
+- initWithFrame: (NSRect) r mimeType:(NSString *)mime arguments:(NSDictionary *)arguments;
+ at end
+
+static WCIFNullPluginMakeFunc WCIFNullPluginMake = NULL;
+
+void WCSetIFNullPluginMakeFunc(WCIFNullPluginMakeFunc func)
+{
+ WCIFNullPluginMake = func;
+}
+
+
WCPluginWidget::WCPluginWidget(const QString &url, const QString &serviceType, const QStringList &args)
{
NSMutableDictionary *arguments;
- NSString *arg, *mimeType, *URL;
+ NSString *arg, *mime=nil, *URL;
NSRange r1, r2, r3;
WCPlugin *plugin;
uint i;
@@ -66,18 +77,18 @@ WCPluginWidget::WCPluginWidget(const QString &url, const QString &serviceType, c
if(serviceType.isNull()){
plugin = [[WCPluginDatabase installedPlugins] getPluginForExtension:[URL pathExtension]];
if(plugin != nil){
- mimeType = [plugin mimeTypeForURL:URL];
+ mime = [plugin mimeTypeForURL:URL];
}
}else{
plugin = [[WCPluginDatabase installedPlugins] getPluginForMimeType:QSTRING_TO_NSSTRING(serviceType)];
- mimeType = QSTRING_TO_NSSTRING(serviceType);
+ mime = QSTRING_TO_NSSTRING(serviceType);
}
+
if(plugin == nil){
- //FIXME: Error dialog should be shown here
- printf("Could not find plugin for mime: %s or URL: %s\n", serviceType.latin1(), url.latin1());
- return;
+ setView(WCIFNullPluginMake(NSMakeRect(0,0,0,0), mime, arguments));
+ }else{
+ setView(WCIFPluginMake(NSMakeRect(0,0,0,0), plugin, URL, mime, arguments, NP_EMBED));
}
- setView(WCIFPluginMake(NSMakeRect(0,0,0,0), plugin, URL, mimeType, arguments, NP_EMBED));
}
WCPluginWidget::~WCPluginWidget()
@@ -90,5 +101,10 @@ void * WCIFPluginMakeFunction()
return WCIFPluginMake;
}
+void * WCIFNullPluginMakeFunction()
+{
+ return WCIFPluginMake;
+}
+
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 248155c..68d2e80 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2002-04-05 Chris Blumenberg <cblu at apple.com>
+
+ * Plugins.subproj/IFNullPluginView.h: Added.
+ * Plugins.subproj/IFNullPluginView.mm: Added.
+ (-[IFNullPluginView initWithFrame:mimeType:arguments:]), (-[IFNullPluginView
+ findSuperview:]), (-[IFNullPluginView drawRect:]):
+ * Resources/nullplugin.tiff: Added.
+ * WebKit.pbproj/project.pbxproj:
+
+ An IFNullPluginView is now created when no plug-in for a requested
+ mime type is found. IFNullPluginView displays a null plug-in icon
+ and will eventually report this error to the WebController.
+
2002-04-05 Richard Williamson <rjw at apple.com>
Back out some changes to lazily dealloc frame.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 248155c..68d2e80 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,16 @@
+2002-04-05 Chris Blumenberg <cblu at apple.com>
+
+ * Plugins.subproj/IFNullPluginView.h: Added.
+ * Plugins.subproj/IFNullPluginView.mm: Added.
+ (-[IFNullPluginView initWithFrame:mimeType:arguments:]), (-[IFNullPluginView
+ findSuperview:]), (-[IFNullPluginView drawRect:]):
+ * Resources/nullplugin.tiff: Added.
+ * WebKit.pbproj/project.pbxproj:
+
+ An IFNullPluginView is now created when no plug-in for a requested
+ mime type is found. IFNullPluginView displays a null plug-in icon
+ and will eventually report this error to the WebController.
+
2002-04-05 Richard Williamson <rjw at apple.com>
Back out some changes to lazily dealloc frame.
diff --git a/WebKit/Plugins.subproj/IFNullPluginView.h b/WebKit/Plugins.subproj/IFNullPluginView.h
new file mode 100644
index 0000000..5e26819
--- /dev/null
+++ b/WebKit/Plugins.subproj/IFNullPluginView.h
@@ -0,0 +1,19 @@
+//
+// IFNullPluginView.h
+// WebKit
+//
+// Created by Chris Blumenberg on Fri Apr 05 2002.
+// Copyright (c) 2002 __MyCompanyName__. All rights reserved.
+//
+
+#import <AppKit/AppKit.h>
+
+
+ at interface IFNullPluginView : NSImageView {
+
+ BOOL errorSent;
+}
+
+- initWithFrame:(NSRect)frame mimeType:(NSString *)mime arguments:(NSDictionary *)arguments;
+
+ at end
diff --git a/WebKit/Plugins.subproj/IFNullPluginView.mm b/WebKit/Plugins.subproj/IFNullPluginView.mm
new file mode 100644
index 0000000..00e2f00
--- /dev/null
+++ b/WebKit/Plugins.subproj/IFNullPluginView.mm
@@ -0,0 +1,65 @@
+//
+// IFNullPluginView.mm
+// WebKit
+//
+// Created by Chris Blumenberg on Fri Apr 05 2002.
+// Copyright (c) 2002 __MyCompanyName__. All rights reserved.
+//
+
+#import "IFNullPluginView.h"
+#import "WCPluginWidget.h"
+
+ at implementation IFNullPluginView
+
+/*
+static id IFNullPluginMake(NSRect rect, NSString *mimeType, NSDictionary *arguments)
+{
+ return [[[IFNullPluginView alloc] initWithFrame:rect mimeType:mimeType arguments:arguments] autorelease];
+}
+
++(void) load
+{
+ WCSetIFNullPluginMakeFunc(IFNullPluginMake);
+}
+*/
+
+- initWithFrame:(NSRect)frame mimeType:(NSString *)mime arguments:(NSDictionary *)arguments{
+ NSBundle *bundle;
+ NSString *imagePath;
+
+ self = [super initWithFrame:frame];
+ if (self) {
+ // Set the view's image to the null plugin icon
+ bundle = [NSBundle bundleWithIdentifier:@"com.apple.webkit"];
+ imagePath = [bundle pathForResource:@"nullplugin" ofType:@"tiff"];
+ [self setImage:[[NSImage alloc] initWithContentsOfFile:imagePath]];
+ errorSent = false;
+ }
+ return self;
+}
+
+- (NSView *) findSuperview:(NSString *) viewName
+{
+ NSView *view;
+
+ view = self;
+ while(view){
+ view = [view superview];
+ if([[view className] isEqualToString:viewName]){
+ return view;
+ }
+ }
+ return nil;
+}
+
+- (void)drawRect:(NSRect)rect {
+ [super drawRect:rect];
+ if(!errorSent){
+ //webView = [self findSuperview:@"IFWebView"];
+ //webController = [webView controller];
+ }
+}
+
+
+
+ at end
diff --git a/WebKit/Plugins.subproj/WebNullPluginView.h b/WebKit/Plugins.subproj/WebNullPluginView.h
new file mode 100644
index 0000000..5e26819
--- /dev/null
+++ b/WebKit/Plugins.subproj/WebNullPluginView.h
@@ -0,0 +1,19 @@
+//
+// IFNullPluginView.h
+// WebKit
+//
+// Created by Chris Blumenberg on Fri Apr 05 2002.
+// Copyright (c) 2002 __MyCompanyName__. All rights reserved.
+//
+
+#import <AppKit/AppKit.h>
+
+
+ at interface IFNullPluginView : NSImageView {
+
+ BOOL errorSent;
+}
+
+- initWithFrame:(NSRect)frame mimeType:(NSString *)mime arguments:(NSDictionary *)arguments;
+
+ at end
diff --git a/WebKit/Plugins.subproj/WebNullPluginView.m b/WebKit/Plugins.subproj/WebNullPluginView.m
new file mode 100644
index 0000000..00e2f00
--- /dev/null
+++ b/WebKit/Plugins.subproj/WebNullPluginView.m
@@ -0,0 +1,65 @@
+//
+// IFNullPluginView.mm
+// WebKit
+//
+// Created by Chris Blumenberg on Fri Apr 05 2002.
+// Copyright (c) 2002 __MyCompanyName__. All rights reserved.
+//
+
+#import "IFNullPluginView.h"
+#import "WCPluginWidget.h"
+
+ at implementation IFNullPluginView
+
+/*
+static id IFNullPluginMake(NSRect rect, NSString *mimeType, NSDictionary *arguments)
+{
+ return [[[IFNullPluginView alloc] initWithFrame:rect mimeType:mimeType arguments:arguments] autorelease];
+}
+
++(void) load
+{
+ WCSetIFNullPluginMakeFunc(IFNullPluginMake);
+}
+*/
+
+- initWithFrame:(NSRect)frame mimeType:(NSString *)mime arguments:(NSDictionary *)arguments{
+ NSBundle *bundle;
+ NSString *imagePath;
+
+ self = [super initWithFrame:frame];
+ if (self) {
+ // Set the view's image to the null plugin icon
+ bundle = [NSBundle bundleWithIdentifier:@"com.apple.webkit"];
+ imagePath = [bundle pathForResource:@"nullplugin" ofType:@"tiff"];
+ [self setImage:[[NSImage alloc] initWithContentsOfFile:imagePath]];
+ errorSent = false;
+ }
+ return self;
+}
+
+- (NSView *) findSuperview:(NSString *) viewName
+{
+ NSView *view;
+
+ view = self;
+ while(view){
+ view = [view superview];
+ if([[view className] isEqualToString:viewName]){
+ return view;
+ }
+ }
+ return nil;
+}
+
+- (void)drawRect:(NSRect)rect {
+ [super drawRect:rect];
+ if(!errorSent){
+ //webView = [self findSuperview:@"IFWebView"];
+ //webController = [webView controller];
+ }
+}
+
+
+
+ at end
diff --git a/WebKit/Resources/nullplugin.tiff b/WebKit/Resources/nullplugin.tiff
new file mode 100644
index 0000000..8ae51ff
Binary files /dev/null and b/WebKit/Resources/nullplugin.tiff differ
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index da0c61e..cb890f3 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 36;
+ objectVersion = 38;
objects = {
014CEA440018CDF011CA2923 = {
buildRules = (
@@ -213,6 +213,7 @@
F58BAB3B025036CA01C1A526,
9CAE9D080252A4130ECA16EA,
F59EAE400253C7EE018635CA,
+ F5883BE2025E5E9D01000102,
);
isa = PBXHeadersBuildPhase;
};
@@ -225,6 +226,7 @@
F515C2B90238249C01C1A525,
F5B67131023EDF8901C1A525,
25B2A7C5025D0A880ECA149E,
+ F5883BDF025E5C6A01000102,
);
isa = PBXResourcesBuildPhase;
};
@@ -255,6 +257,7 @@
F5F084C0024BDCA701CA1520,
F58BAB390250363E01C1A526,
F59EAE420253C8DE018635CA,
+ F5883BE3025E5E9D01000102,
);
isa = PBXSourcesBuildPhase;
};
@@ -284,6 +287,7 @@
089C1666FE841158C02AAC07,
35F3577401986B740ACA1520,
F5B67130023EDF8901C1A525,
+ F5883BDE025E5C6A01000102,
25B2A7C4025D0A880ECA149E,
);
isa = PBXGroup;
@@ -1114,6 +1118,42 @@
settings = {
};
};
+ F5883BDE025E5C6A01000102 = {
+ isa = PBXFileReference;
+ name = nullplugin.tiff;
+ path = Resources/nullplugin.tiff;
+ refType = 4;
+ };
+ F5883BDF025E5C6A01000102 = {
+ fileRef = F5883BDE025E5C6A01000102;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F5883BE0025E5E9D01000102 = {
+ isa = PBXFileReference;
+ name = IFNullPluginView.h;
+ path = Plugins.subproj/IFNullPluginView.h;
+ refType = 4;
+ };
+ F5883BE1025E5E9D01000102 = {
+ isa = PBXFileReference;
+ name = IFNullPluginView.mm;
+ path = Plugins.subproj/IFNullPluginView.mm;
+ refType = 4;
+ };
+ F5883BE2025E5E9D01000102 = {
+ fileRef = F5883BE0025E5E9D01000102;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F5883BE3025E5E9D01000102 = {
+ fileRef = F5883BE1025E5E9D01000102;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
F58BAB380250363E01C1A526 = {
isa = PBXFileReference;
name = IFLoadProgress.mm;
@@ -1284,6 +1324,8 @@
children = (
F5EBC45502134BC301CA1520,
F5EBC45602134BC301CA1520,
+ F5883BE0025E5E9D01000102,
+ F5883BE1025E5E9D01000102,
);
isa = PBXGroup;
name = Plugins;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list