[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 07:09:39 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit af69d0e5368fa6e52588aea1fa44894796718edb
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Nov 27 01:18:24 2002 +0000
WebKit:
Fixed: 3090834 - Launch WMP (Window Media Player) when encountering WMP content
Added contentURL to WebPluginError.
* Plugins.subproj/WebNetscapePluginDocumentView.m:
(-[WebNetscapePluginDocumentView setDataSource:]):
* Plugins.subproj/WebNetscapePluginPackage.m:
(-[WebNetscapePluginPackage initWithPath:]):
* Plugins.subproj/WebNullPluginView.m:
(-[WebNullPluginView viewDidMoveToWindow]):
* Plugins.subproj/WebPluginError.h:
* Plugins.subproj/WebPluginError.m:
(-[WebPluginErrorPrivate dealloc]):
(-[WebPluginError dealloc]):
* WebCoreSupport.subproj/WebBridge.m:
(-[WebBridge viewForPluginWithURL:attributes:baseURL:MIMEType:]):
(-[WebBridge viewForJavaAppletWithFrame:attributes:baseURL:]):
WebBrowser:
Fixed: 3090834 - Launch WMP (Window Media Player) when encountering WMP content
* BrowserNSWorkspaceExtras.h:
* BrowserNSWorkspaceExtras.m:
(-[NSWorkspace pathForApplicationOfFileAtPath:]): fixed leak
(-[NSWorkspace pathForApplicationForMIMEType:]): added
* English.lproj/Localizable.strings:
* LoadProgressMonitor.m:
(-[LoadProgressMonitor launchApplicationSheetEnded:returnCode:contextInfo:]): launch WMP
(-[LoadProgressMonitor pluginErrorSheetEnded:returnCode:contextInfo:]): renamed
(-[LoadProgressMonitor pluginFailedWithError:dataSource:]): check for WMP content
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2887 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 19fa042..e40ba03 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,23 @@
+2002-11-26 Chris Blumenberg <cblu at apple.com>
+
+ Fixed: 3090834 - Launch WMP (Window Media Player) when encountering WMP content
+
+ Added contentURL to WebPluginError.
+
+ * Plugins.subproj/WebNetscapePluginDocumentView.m:
+ (-[WebNetscapePluginDocumentView setDataSource:]):
+ * Plugins.subproj/WebNetscapePluginPackage.m:
+ (-[WebNetscapePluginPackage initWithPath:]):
+ * Plugins.subproj/WebNullPluginView.m:
+ (-[WebNullPluginView viewDidMoveToWindow]):
+ * Plugins.subproj/WebPluginError.h:
+ * Plugins.subproj/WebPluginError.m:
+ (-[WebPluginErrorPrivate dealloc]):
+ (-[WebPluginError dealloc]):
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge viewForPluginWithURL:attributes:baseURL:MIMEType:]):
+ (-[WebBridge viewForJavaAppletWithFrame:attributes:baseURL:]):
+
=== Alexander-34 ===
2002-11-26 Richard Williamson <rjw at apple.com>
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 19fa042..e40ba03 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,23 @@
+2002-11-26 Chris Blumenberg <cblu at apple.com>
+
+ Fixed: 3090834 - Launch WMP (Window Media Player) when encountering WMP content
+
+ Added contentURL to WebPluginError.
+
+ * Plugins.subproj/WebNetscapePluginDocumentView.m:
+ (-[WebNetscapePluginDocumentView setDataSource:]):
+ * Plugins.subproj/WebNetscapePluginPackage.m:
+ (-[WebNetscapePluginPackage initWithPath:]):
+ * Plugins.subproj/WebNullPluginView.m:
+ (-[WebNullPluginView viewDidMoveToWindow]):
+ * Plugins.subproj/WebPluginError.h:
+ * Plugins.subproj/WebPluginError.m:
+ (-[WebPluginErrorPrivate dealloc]):
+ (-[WebPluginError dealloc]):
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge viewForPluginWithURL:attributes:baseURL:MIMEType:]):
+ (-[WebBridge viewForJavaAppletWithFrame:attributes:baseURL:]):
+
=== Alexander-34 ===
2002-11-26 Richard Williamson <rjw at apple.com>
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m b/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m
index 313b564..6809f59 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m
@@ -70,7 +70,7 @@
// FIXME: It would be nice to stop the load here.
WebPluginError *error = [WebPluginError pluginErrorWithCode:WebErrorCannotLoadPlugin
- URL:[theDataSource URL]
+ contentURL:[theDataSource URL]
pluginPageURL:nil
pluginName:[thePlugin name]
MIMEType:MIME];
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginPackage.m b/WebKit/Plugins.subproj/WebNetscapePluginPackage.m
index 53b12af..cfd5207 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginPackage.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginPackage.m
@@ -183,7 +183,7 @@ static TransitionVector tVectorForFunctionPointer(FunctionPointer);
}
#endif
- if (type != FOUR_CHAR_CODE('BRPL') && type != FOUR_CHAR_CODE('IEPL')) {
+ if (type != FOUR_CHAR_CODE('BRPL')) {
[self release];
return nil;
}
diff --git a/WebKit/Plugins.subproj/WebNullPluginView.m b/WebKit/Plugins.subproj/WebNullPluginView.m
index 7a67e59..2200c0c 100644
--- a/WebKit/Plugins.subproj/WebNullPluginView.m
+++ b/WebKit/Plugins.subproj/WebNullPluginView.m
@@ -44,7 +44,7 @@ static NSImage *image = nil;
- (void)viewDidMoveToWindow
{
- if(!didSendError && _window){
+ if(!didSendError && _window && error){
didSendError = YES;
WebView *view = (WebView *)[self _web_superviewOfClass:[WebView class]];
WebController *controller = [view controller];
diff --git a/WebKit/Plugins.subproj/WebPlugInError.h b/WebKit/Plugins.subproj/WebPlugInError.h
index 7e1dc70..0f5ba25 100644
--- a/WebKit/Plugins.subproj/WebPlugInError.h
+++ b/WebKit/Plugins.subproj/WebPlugInError.h
@@ -19,17 +19,18 @@
}
+ (WebPluginError *)pluginErrorWithCode:(int)code
- URL:(NSURL *)URL
+ contentURL:(NSURL *)contentURL
pluginPageURL:(NSURL *)URL
pluginName:(NSString *)pluginName
MIMEType:(NSString *)MIMEType;
- initWithErrorWithCode:(int)code
- URL:(NSURL *)URL
+ contentURL:(NSURL *)contentURL
pluginPageURL:(NSURL *)pluginPageURL
pluginName:(NSString *)pluginName
MIMEType:(NSString *)MIMEType;
+- (NSURL *)contentURL;
- (NSURL *)pluginPageURL;
- (NSString *)pluginName;
- (NSString *)MIMEType;
diff --git a/WebKit/Plugins.subproj/WebPlugInError.m b/WebKit/Plugins.subproj/WebPlugInError.m
index 7c9483e..16d764f 100644
--- a/WebKit/Plugins.subproj/WebPlugInError.m
+++ b/WebKit/Plugins.subproj/WebPlugInError.m
@@ -13,8 +13,9 @@
@interface WebPluginErrorPrivate : NSObject
{
@public
- NSString *MIMEType;
+ NSURL *contentURL;
NSURL *pluginPageURL;
+ NSString *MIMEType;
NSString *pluginName;
}
@@ -24,9 +25,10 @@
- (void)dealloc
{
- [MIMEType release];
+ [contentURL release];
[pluginPageURL release];
[pluginName release];
+ [MIMEType release];
[super dealloc];
}
@@ -35,13 +37,13 @@
@implementation WebPluginError
+ (WebPluginError *)pluginErrorWithCode:(int)code
- URL:(NSURL *)URL
+ contentURL:(NSURL *)contentURL
pluginPageURL:(NSURL *)pluginPageURL
pluginName:(NSString *)pluginName
MIMEType:(NSString *)MIMEType;
{
WebPluginError *error = [[WebPluginError alloc] initWithErrorWithCode:code
- URL:URL
+ contentURL:contentURL
pluginPageURL:pluginPageURL
pluginName:pluginName
MIMEType:MIMEType];
@@ -49,14 +51,15 @@
}
- initWithErrorWithCode:(int)code
- URL:(NSURL *)URL
+ contentURL:(NSURL *)contentURL
pluginPageURL:(NSURL *)pluginPageURL
pluginName:(NSString *)pluginName
MIMEType:(NSString *)MIMEType;
{
- [super initWithErrorCode:code inDomain:WebErrorDomainWebKit failingURL:[URL absoluteString]];
+ [super initWithErrorCode:code inDomain:WebErrorDomainWebKit failingURL:[contentURL absoluteString]];
_private = [[WebPluginErrorPrivate alloc] init];
+ _private->contentURL = [contentURL retain];
_private->pluginPageURL = [pluginPageURL retain];
_private->pluginName = [pluginName retain];
_private->MIMEType = [MIMEType retain];
@@ -70,6 +73,11 @@
[super dealloc];
}
+- (NSURL *)contentURL;
+{
+ return _private->contentURL;
+}
+
- (NSURL *)pluginPageURL
{
return _private->pluginPageURL;
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index a500840..207559b 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -464,7 +464,7 @@
}
WebPluginError *error = [WebPluginError pluginErrorWithCode:errorCode
- URL:[NSURL _web_URLWithString:URL]
+ contentURL:[NSURL _web_URLWithString:URL]
pluginPageURL:pluginPageURL
pluginName:[pluginPackage name]
MIMEType:MIMEType];
@@ -511,7 +511,7 @@
if(!view){
WebPluginError *error = [WebPluginError pluginErrorWithCode:WebErrorJavaUnavailable
- URL:nil
+ contentURL:nil
pluginPageURL:nil
pluginName:[pluginPackage name]
MIMEType:MIMEType];
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list