[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:38:30 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 477ce5736a8c6ce89a14f33e3cdb2650687858a2
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Apr 24 23:18:15 2003 +0000
WebKit:
Removed WebPluginError and instead added fields to the userInfo of NSError for plug-in specific errors.
Reviewed by rjw.
* Misc.subproj/WebKitErrors.h:
* Misc.subproj/WebKitErrors.m:
(+[NSError _webKitErrorWithCode:failingURL:]):
(-[NSError _initWithPluginErrorCode:contentURLString:pluginPageURLString:pluginName:MIMEType:]):
* Misc.subproj/WebKitErrorsPrivate.h:
* Plugins.subproj/WebNetscapePluginDocumentView.m:
(-[WebNetscapePluginDocumentView setDataSource:]):
* Plugins.subproj/WebNullPluginView.h:
* Plugins.subproj/WebNullPluginView.m:
* Plugins.subproj/WebPlugInError.h: Removed.
* Plugins.subproj/WebPlugInError.m: Removed.
* Plugins.subproj/WebPluginErrorPrivate.h: Removed.
* WebCoreSupport.subproj/WebBridge.m:
(-[WebBridge viewForPluginWithURLString:attributes:baseURLString:MIMEType:]):
(-[WebBridge viewForJavaAppletWithFrame:attributes:baseURLString:]):
* WebKit.exp:
* WebKit.pbproj/project.pbxproj:
* WebView.subproj/WebDefaultResourceLoadDelegate.m:
(-[WebDefaultResourceLoadDelegate webView:plugInFailedWithError:dataSource:]):
* WebView.subproj/WebResourceLoadDelegate.h:
WebBrowser:
Updated WebBrowser to not use WebPlugInError.
Reviewed by rjw.
* LoadProgressMonitor.m:
(-[LoadProgressMonitor webView:plugInFailedWithError:dataSource:]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4177 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index c374242..29ab15b 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,30 @@
+2003-04-24 Chris Blumenberg <cblu at apple.com>
+
+ Removed WebPluginError and instead added fields to the userInfo of NSError for plug-in specific errors.
+
+ Reviewed by rjw.
+
+ * Misc.subproj/WebKitErrors.h:
+ * Misc.subproj/WebKitErrors.m:
+ (+[NSError _webKitErrorWithCode:failingURL:]):
+ (-[NSError _initWithPluginErrorCode:contentURLString:pluginPageURLString:pluginName:MIMEType:]):
+ * Misc.subproj/WebKitErrorsPrivate.h:
+ * Plugins.subproj/WebNetscapePluginDocumentView.m:
+ (-[WebNetscapePluginDocumentView setDataSource:]):
+ * Plugins.subproj/WebNullPluginView.h:
+ * Plugins.subproj/WebNullPluginView.m:
+ * Plugins.subproj/WebPlugInError.h: Removed.
+ * Plugins.subproj/WebPlugInError.m: Removed.
+ * Plugins.subproj/WebPluginErrorPrivate.h: Removed.
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge viewForPluginWithURLString:attributes:baseURLString:MIMEType:]):
+ (-[WebBridge viewForJavaAppletWithFrame:attributes:baseURLString:]):
+ * WebKit.exp:
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/WebDefaultResourceLoadDelegate.m:
+ (-[WebDefaultResourceLoadDelegate webView:plugInFailedWithError:dataSource:]):
+ * WebView.subproj/WebResourceLoadDelegate.h:
+
2003-04-24 Darin Adler <darin at apple.com>
Reviewed by Chris.
diff --git a/WebKit/Misc.subproj/WebKitErrors.h b/WebKit/Misc.subproj/WebKitErrors.h
index 429079e..1ecc6b3 100644
--- a/WebKit/Misc.subproj/WebKitErrors.h
+++ b/WebKit/Misc.subproj/WebKitErrors.h
@@ -7,6 +7,10 @@
extern NSString *WebKitErrorDomain;
+extern NSString * const WebKitErrorMIMETypeKey;
+extern NSString * const WebKitErrorPlugInNameKey;
+extern NSString * const WebKitErrorPlugInPageURLStringKey;
+
/*!
@enum
@description Download and file I/O errors
diff --git a/WebKit/Misc.subproj/WebKitErrors.m b/WebKit/Misc.subproj/WebKitErrors.m
index 2986c26..b708977 100644
--- a/WebKit/Misc.subproj/WebKitErrors.m
+++ b/WebKit/Misc.subproj/WebKitErrors.m
@@ -16,6 +16,10 @@
NSString *WebKitErrorDomain = @"WebKitErrorDomain";
+NSString * const WebKitErrorMIMETypeKey = @"WebKitErrorMIMETypeKey";
+NSString * const WebKitErrorPlugInNameKey = @"WebKitErrorPlugInNameKey";
+NSString * const WebKitErrorPlugInPageURLStringKey = @"WebKitErrorPlugInPageURLStringKey";
+
// Download and file I/O errors
#define WebKitErrorDescriptionCannotCreateFile UI_STRING("Cannot create file", "WebKitErrorCannotCreateFile description")
#define WebKitErrorDescriptionCannotOpenFile UI_STRING("Cannot open file", "WebKitErrorCannotOpenFile description")
@@ -57,6 +61,34 @@ static void registerErrors(void);
return [self _web_errorWithDomain:WebKitErrorDomain code:code failingURL:URL];
}
+- (id)_initWithPluginErrorCode:(int)code
+ contentURLString:(NSString *)contentURLString
+ pluginPageURLString:(NSString *)pluginPageURLString
+ pluginName:(NSString *)pluginName
+ MIMEType:(NSString *)MIMEType
+{
+ NSMutableDictionary *userInfo = [[NSMutableDictionary alloc] init];
+ if (contentURLString) {
+ [userInfo setObject:contentURLString forKey:NSErrorFailingURLKey];
+ }
+ if (pluginPageURLString) {
+ [userInfo setObject:pluginPageURLString forKey:WebKitErrorPlugInPageURLStringKey];
+ }
+ if (pluginName) {
+ [userInfo setObject:pluginName forKey:WebKitErrorPlugInNameKey];
+ }
+ if (MIMEType) {
+ [userInfo setObject:MIMEType forKey:WebKitErrorMIMETypeKey];
+ }
+
+ NSDictionary *userInfoCopy = [userInfo count] > 0 ? [[NSDictionary alloc] initWithDictionary:userInfo] : nil;
+ [userInfo release];
+ NSError *error = [self initWithDomain:WebKitErrorDomain code:code userInfo:userInfoCopy];
+ [userInfoCopy release];
+
+ return error;
+}
+
@end
diff --git a/WebKit/Misc.subproj/WebKitErrorsPrivate.h b/WebKit/Misc.subproj/WebKitErrorsPrivate.h
index 35cdda1..9c6e31b 100644
--- a/WebKit/Misc.subproj/WebKitErrorsPrivate.h
+++ b/WebKit/Misc.subproj/WebKitErrorsPrivate.h
@@ -13,5 +13,11 @@
@interface NSError (WebKitExtras)
+ (NSError *)_webKitErrorWithCode:(int)code failingURL:(NSString *)URL;
+
+- (id)_initWithPluginErrorCode:(int)code
+ contentURLString:(NSString *)contentURL
+ pluginPageURLString:(NSString *)pluginPageURL
+ pluginName:(NSString *)pluginName
+ MIMEType:(NSString *)MIMEType;
@end
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m b/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m
index 9cfeea2..d01bfb8 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m
@@ -7,13 +7,12 @@
#import <WebKit/WebDocument.h>
#import <WebKit/WebFrame.h>
#import <WebKit/WebFrameView.h>
-#import <WebKit/WebKitErrors.h>
+#import <WebKit/WebKitErrorsPrivate.h>
#import <WebKit/WebNetscapePluginDocumentView.h>
#import <WebKit/WebNetscapePluginRepresentation.h>
#import <WebKit/WebNSViewExtras.h>
#import <WebKit/WebNetscapePluginPackage.h>
#import <WebKit/WebPluginDatabase.h>
-#import <WebKit/WebPluginErrorPrivate.h>
#import <WebKit/WebResourceLoadDelegate.h>
#import <WebKit/WebViewPrivate.h>
@@ -81,15 +80,16 @@
if (![thePlugin load]){
// FIXME: It would be nice to stop the load here.
- WebPlugInError *error = [WebPlugInError pluginErrorWithCode:WebKitErrorCannotLoadPlugin
- contentURL:[[[theDataSource request] URL] absoluteString]
- pluginPageURL:nil
- pluginName:[thePlugin name]
- MIMEType:MIME];
+ NSError *error = [[NSError alloc] _initWithPluginErrorCode:WebKitErrorCannotLoadPlugin
+ contentURLString:[[[theDataSource request] URL] absoluteString]
+ pluginPageURLString:nil
+ pluginName:[thePlugin name]
+ MIMEType:MIME];
WebView *webView = [[theDataSource webFrame] webView];
[[webView _resourceLoadDelegateForwarder] webView:webView
plugInFailedWithError:error
dataSource:theDataSource];
+ [error release];
return;
}
diff --git a/WebKit/Plugins.subproj/WebNullPluginView.h b/WebKit/Plugins.subproj/WebNullPluginView.h
index 7a4b9e8..5963a8a 100644
--- a/WebKit/Plugins.subproj/WebNullPluginView.h
+++ b/WebKit/Plugins.subproj/WebNullPluginView.h
@@ -5,14 +5,14 @@
#import <AppKit/AppKit.h>
- at class WebPlugInError;
+ at class NSError;
@interface WebNullPluginView : NSImageView
{
BOOL didSendError;
- WebPlugInError *error;
+ NSError *error;
}
-- initWithFrame:(NSRect)frame error:(WebPlugInError *)pluginError;
+- initWithFrame:(NSRect)frame error:(NSError *)pluginError;
@end
diff --git a/WebKit/Plugins.subproj/WebNullPluginView.m b/WebKit/Plugins.subproj/WebNullPluginView.m
index b61fd9d..6cf5dcf 100644
--- a/WebKit/Plugins.subproj/WebNullPluginView.m
+++ b/WebKit/Plugins.subproj/WebNullPluginView.m
@@ -18,7 +18,7 @@ static NSImage *image = nil;
@implementation WebNullPluginView
-- initWithFrame:(NSRect)frame error:(WebPlugInError *)pluginError;
+- initWithFrame:(NSRect)frame error:(NSError *)pluginError;
{
self = [super initWithFrame:frame];
if (self) {
diff --git a/WebKit/Plugins.subproj/WebPlugInError.h b/WebKit/Plugins.subproj/WebPlugInError.h
deleted file mode 100644
index 77bb447..0000000
--- a/WebKit/Plugins.subproj/WebPlugInError.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- WebPlugInError.h
- Copyright 2002, Apple, Inc. All rights reserved.
-
- Public header file.
- */
-
-#import <Foundation/Foundation.h>
-
-#if !defined(MAC_OS_X_VERSION_10_3) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3)
-#import <WebFoundation/NSError.h>
-#endif
-
- at class WebPlugInErrorPrivate;
-
-/*!
- @class WebPlugInError
- @discussion WebPlugInError is a subclass of NSError that is specific to plug-in related errors.
-*/
- at interface WebPlugInError : NSError
-{
- at private
- WebPlugInErrorPrivate *_private;
-}
-
-/*!
- @method contentURL
- @result The URL of the data that caused the error
-*/
-- (NSString *)contentURLString;
-
-/*!
- @method plugInPageURL
- @result Description forthcoming
-*/
-- (NSString *)plugInPageURLString;
-
-/*!
- @method pluInName
- @result The name of plugin that experienced the error
-*/
-- (NSString *)plugInName;
-
-/*!
- @method MIMEType
- @result The MIME type of the data that caused the error
-*/
-- (NSString *)MIMEType;
-
- at end
diff --git a/WebKit/Plugins.subproj/WebPlugInError.m b/WebKit/Plugins.subproj/WebPlugInError.m
deleted file mode 100644
index 704ec36..0000000
--- a/WebKit/Plugins.subproj/WebPlugInError.m
+++ /dev/null
@@ -1,103 +0,0 @@
-//
-// WebPlugInError.m
-// WebKit
-//
-// Created by Chris Blumenberg on Fri Nov 01 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import <WebKit/WebKitErrors.h>
-#import <WebKit/WebPlugInErrorPrivate.h>
-
-#import <WebFoundation/WebNSErrorExtras.h>
-
- at interface WebPlugInErrorPrivate : NSObject
-{
- at public
- NSString *contentURL;
- NSString *pluginPageURL;
- NSString *MIMEType;
- NSString *pluginName;
-}
-
- at end
-
- at implementation WebPlugInErrorPrivate
-
-- (void)dealloc
-{
- [contentURL release];
- [pluginPageURL release];
- [pluginName release];
- [MIMEType release];
- [super dealloc];
-}
-
- at end
-
- at implementation WebPlugInError
-
-- (void)dealloc
-{
- [_private release];
- [super dealloc];
-}
-
-- (NSString *)contentURLString;
-{
- return _private->contentURL;
-}
-
-- (NSString *)plugInPageURLString
-{
- return _private->pluginPageURL;
-}
-
-- (NSString *)plugInName
-{
- return _private->pluginName;
-}
-
-- (NSString *)MIMEType
-{
- return _private->MIMEType;
-}
-
- at end
-
- at implementation WebPlugInError (WebPrivate)
-
-+ (WebPlugInError *)pluginErrorWithCode:(int)code
- contentURL:(NSString *)contentURL
- pluginPageURL:(NSString *)pluginPageURL
- pluginName:(NSString *)pluginName
- MIMEType:(NSString *)MIMEType;
-{
- WebPlugInError *error = [[WebPlugInError alloc] initWithErrorWithCode:code
- contentURL:contentURL
- pluginPageURL:pluginPageURL
- pluginName:pluginName
- MIMEType:MIMEType];
- return [error autorelease];
-}
-
-- initWithErrorWithCode:(int)code
- contentURL:(NSString *)contentURL
- pluginPageURL:(NSString *)pluginPageURL
- pluginName:(NSString *)pluginName
- MIMEType:(NSString *)MIMEType;
-{
- [super _web_initWithDomain:WebKitErrorDomain code:code failingURL:contentURL];
-
- _private = [[WebPlugInErrorPrivate alloc] init];
- _private->contentURL = [contentURL retain];
- _private->pluginPageURL = [pluginPageURL retain];
- _private->pluginName = [pluginName retain];
- _private->MIMEType = [MIMEType retain];
-
- return self;
-}
-
- at end
-
-
diff --git a/WebKit/Plugins.subproj/WebPluginErrorPrivate.h b/WebKit/Plugins.subproj/WebPluginErrorPrivate.h
deleted file mode 100644
index 48afe94..0000000
--- a/WebKit/Plugins.subproj/WebPluginErrorPrivate.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * WebPluginErrorPrivate.h
- * WebKit
- *
- * Created by Chris Blumenberg on Wed Feb 05 2003.
- * Copyright (c) 2003 Apple Computer. All rights reserved.
- *
- */
-
-#import <WebKit/WebPlugInError.h>
-
- at interface WebPlugInError (WebPrivate)
-
-+ (WebPlugInError *)pluginErrorWithCode:(int)code
- contentURL:(NSString *)contentURL
- pluginPageURL:(NSString *)URL
- pluginName:(NSString *)pluginName
- MIMEType:(NSString *)MIMEType;
-
-- initWithErrorWithCode:(int)code
- contentURL:(NSString *)contentURL
- pluginPageURL:(NSString *)pluginPageURL
- pluginName:(NSString *)pluginName
- MIMEType:(NSString *)MIMEType;
-
- at end
\ No newline at end of file
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 73afa7d..d4e5c0b 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -20,7 +20,7 @@
#import <WebKit/WebHTMLRepresentationPrivate.h>
#import <WebKit/WebHTMLViewPrivate.h>
#import <WebKit/WebJavaScriptTextInputPanel.h>
-#import <WebKit/WebKitErrors.h>
+#import <WebKit/WebKitErrorsPrivate.h>
#import <WebKit/WebKitLogging.h>
#import <WebKit/WebKitStatisticsPrivate.h>
#import <WebKit/WebLocationChangeDelegate.h>
@@ -30,7 +30,6 @@
#import <WebKit/WebPlugin.h>
#import <WebKit/WebPluginController.h>
#import <WebKit/WebPluginDatabase.h>
-#import <WebKit/WebPluginErrorPrivate.h>
#import <WebKit/WebPluginPackage.h>
#import <WebKit/WebPluginViewFactory.h>
#import <WebKit/WebNetscapePluginDocumentView.h>
@@ -667,13 +666,13 @@
}
if (errorCode) {
- WebPlugInError *error = [WebPlugInError pluginErrorWithCode:errorCode
- contentURL:URLString
- pluginPageURL:[attributes objectForKey:@"pluginspage"]
- pluginName:[pluginPackage name]
- MIMEType:MIMEType];
-
+ NSError *error = [[NSError alloc] _initWithPluginErrorCode:errorCode
+ contentURLString:URLString
+ pluginPageURLString:[attributes objectForKey:@"pluginspage"]
+ pluginName:[pluginPackage name]
+ MIMEType:MIMEType];
view = [[[WebNullPluginView alloc] initWithFrame:NSZeroRect error:error] autorelease];
+ [error release];
}
ASSERT(view);
@@ -732,12 +731,13 @@
}
if (!view) {
- WebPlugInError *error = [WebPlugInError pluginErrorWithCode:WebKitErrorJavaUnavailable
- contentURL:nil
- pluginPageURL:nil
- pluginName:[pluginPackage name]
- MIMEType:MIMEType];
+ NSError *error = [[NSError alloc] _initWithPluginErrorCode:WebKitErrorJavaUnavailable
+ contentURLString:nil
+ pluginPageURLString:nil
+ pluginName:[pluginPackage name]
+ MIMEType:MIMEType];
view = [[[WebNullPluginView alloc] initWithFrame:theFrame error:error] autorelease];
+ [error release];
}
ASSERT(view);
diff --git a/WebKit/WebKit.exp b/WebKit/WebKit.exp
index f80e446..18a3139 100644
--- a/WebKit/WebKit.exp
+++ b/WebKit/WebKit.exp
@@ -53,6 +53,9 @@ _WebIconLargeSize
_WebIconMediumSize
_WebIconNotificationUserInfoURLKey
_WebIconSmallSize
+_WebKitErrorMIMETypeKey
+_WebKitErrorPlugInNameKey
+_WebKitErrorPlugInPageURLStringKey
_WebURLNamePboardType
_WebURLPboardType
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 86bfaa2..16883a8 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -286,7 +286,6 @@
516F297003A6C45A00CA2D3A,
832B2D1603B10990009CF105,
84A992C403CE696800CA2ACA,
- 8466AEDE03F1F82100CA2ACA,
8324709A03F32305003026AC,
2D36FD5F03F78F9E00A80166,
F7EBEEAF03F9DBA103CA0DE6,
@@ -305,7 +304,6 @@
51A8B57F0428353A00CA2D3A,
51443F9D0429392B00CA2D3A,
51443F9F0429392B00CA2D3A,
- 5110F7530432AC0800CA2D3A,
70ECD6CE043B727400A80181,
);
isa = PBXHeadersBuildPhase;
@@ -424,7 +422,6 @@
51A8B57C042834F700CA2D3A,
51A8B5800428353A00CA2D3A,
51443F9E0429392B00CA2D3A,
- 5110F7540432AC0800CA2D3A,
70ECD6CF043B727400A80181,
);
isa = PBXSourcesBuildPhase;
@@ -1062,33 +1059,6 @@
//512
//513
//514
- 5110F7510432AC0800CA2D3A = {
- fileEncoding = 30;
- isa = PBXFileReference;
- path = WebPlugInError.h;
- refType = 4;
- };
- 5110F7520432AC0800CA2D3A = {
- fileEncoding = 30;
- isa = PBXFileReference;
- path = WebPlugInError.m;
- refType = 4;
- };
- 5110F7530432AC0800CA2D3A = {
- fileRef = 5110F7510432AC0800CA2D3A;
- isa = PBXBuildFile;
- settings = {
- ATTRIBUTES = (
- Public,
- );
- };
- };
- 5110F7540432AC0800CA2D3A = {
- fileRef = 5110F7520432AC0800CA2D3A;
- isa = PBXBuildFile;
- settings = {
- };
- };
511D5553033FD51000CA2ACD = {
fileEncoding = 4;
isa = PBXFileReference;
@@ -2003,18 +1973,6 @@
//842
//843
//844
- 8466AEDD03F1F82100CA2ACA = {
- fileEncoding = 4;
- isa = PBXFileReference;
- path = WebPluginErrorPrivate.h;
- refType = 4;
- };
- 8466AEDE03F1F82100CA2ACA = {
- fileRef = 8466AEDD03F1F82100CA2ACA;
- isa = PBXBuildFile;
- settings = {
- };
- };
8467275C0367158500CA2ACA = {
fileEncoding = 30;
isa = PBXFileReference;
@@ -3526,9 +3484,6 @@
F5883BE1025E5E9D01000102,
F5F717200288493C018635CA,
F5F717210288493C018635CA,
- 8466AEDD03F1F82100CA2ACA,
- 5110F7510432AC0800CA2D3A,
- 5110F7520432AC0800CA2D3A,
);
isa = PBXGroup;
name = Plugins;
diff --git a/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m b/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m
index 36e8eef..6f7aa03 100644
--- a/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m
@@ -54,7 +54,7 @@ static WebDefaultResourceLoadDelegate *sharedDelegate = nil;
{
}
-- (void)webView: (WebView *)wv plugInFailedWithError:(WebPlugInError *)error dataSource:(WebDataSource *)dataSource
+- (void)webView: (WebView *)wv plugInFailedWithError:(NSError *)error dataSource:(WebDataSource *)dataSource
{
}
diff --git a/WebKit/WebView.subproj/WebResourceLoadDelegate.h b/WebKit/WebView.subproj/WebResourceLoadDelegate.h
index db081c4..05674bc 100644
--- a/WebKit/WebView.subproj/WebResourceLoadDelegate.h
+++ b/WebKit/WebView.subproj/WebResourceLoadDelegate.h
@@ -6,7 +6,6 @@
*/
@class WebView;
@class WebDataSource;
- at class WebPlugInError;
@class NSURLResponse;
@class NSURLRequest;
@@ -105,10 +104,15 @@
@method pluginFailedWithError:dataSource:
@discussion Called when a plug-in is not found, fails to load or is not available for some reason.
@param webView The WebView sending the message.
- @param error The plug-in error.
+ @param error The plug-in error. In the userInfo dictionary of the error, the object for the
+ NSErrorFailingURLKey key is a URL string of the SRC attribute, the object for the WebKitErrorPlugInNameKey
+ key is a string of the plug-in's name, the object for the WebKitErrorPlugInPageURLStringKey key is a URL string
+ of the PLUGINSPAGE attribute and the object for the WebKitErrorMIMETypeKey key is a string of the TYPE attribute.
+ Some, none or all of the mentioned attributes can be present in the userInfo. The error returns nil for userInfo
+ when none are present.
@param dataSource The dataSource that contains the plug-in.
*/
-- (void)webView:(WebView *)sender plugInFailedWithError:(WebPlugInError *)error dataSource:(WebDataSource *)dataSource;
+- (void)webView:(WebView *)sender plugInFailedWithError:(NSError *)error dataSource:(WebDataSource *)dataSource;
@end
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list