[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
mjs
mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:53:20 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 6124f27a058c8c8a3b93b2c8f9161a40a0d37321
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Dec 14 23:06:45 2001 +0000
Minor cleanups, mostly for naming consistency.
* WebView.subproj/WKWebController.h:
(WKSimpleAuthenticationRequest) name field `url', not `uri'.
(-[WKWebDataSourceErrorHandler receivedError:forDataSource:]):
renamed from `error:inDataSource:' so that it's a verb phrase.
* WebView.subproj/WKWebDataSource.h:
(-[WKWebDataSource initWithURL:]): Rename `inputUrl' argument to
`inputURL'.
(-[WKWebDataSource initWithLoader:]): Change argument type from
`WKURILoader' to `WKLoader'.
(-[WKWebDataSource wasRedirected]): Renamed from `isRedirected',
the past tense seems more appropriate here.
(-[WKWebDataSource setJavaEnabled:]): Add missing semicolon.
(-[WKWebDataSource pluginsEnabled:]): renamed from `pluginEnabled'
for consistency with `setPluginsEnabled:'.
* WebView.subproj/WKWebView.h:
(-[WKWebView fontSizes]): renamed from `fontSize' for sonsistency
with `setFontSizes:'.
(-[WKWebView setContextMenusEnabled]): renamed from
'setEnableContextMenus:' for consistency with
`contextMenusenabled'.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@503 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 25328a7..33a0c03 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,32 @@
2001-12-14 Maciej Stachowiak <mjs at apple.com>
+ Minor cleanups, mostly for naming consistency.
+
+ * WebView.subproj/WKWebController.h:
+ (WKSimpleAuthenticationRequest) name field `url', not `uri'.
+ (-[WKWebDataSourceErrorHandler receivedError:forDataSource:]):
+ renamed from `error:inDataSource:' so that it's a verb phrase.
+
+ * WebView.subproj/WKWebDataSource.h:
+ (-[WKWebDataSource initWithURL:]): Rename `inputUrl' argument to
+ `inputURL'.
+ (-[WKWebDataSource initWithLoader:]): Change argument type from
+ `WKURILoader' to `WKLoader'.
+ (-[WKWebDataSource wasRedirected]): Renamed from `isRedirected',
+ the past tense seems more appropriate here.
+ (-[WKWebDataSource setJavaEnabled:]): Add missing semicolon.
+ (-[WKWebDataSource pluginsEnabled:]): renamed from `pluginEnabled'
+ for consistency with `setPluginsEnabled:'.
+
+ * WebView.subproj/WKWebView.h:
+ (-[WKWebView fontSizes]): renamed from `fontSize' for sonsistency
+ with `setFontSizes:'.
+ (-[WKWebView setContextMenusEnabled]): renamed from
+ 'setEnableContextMenus:' for consistency with
+ `contextMenusenabled'.
+
+2001-12-14 Maciej Stachowiak <mjs at apple.com>
+
After discussion with Don, Removed all methods relating to
resolved URLs, since browsers don't actually treat aliases
specially.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 25328a7..33a0c03 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,32 @@
2001-12-14 Maciej Stachowiak <mjs at apple.com>
+ Minor cleanups, mostly for naming consistency.
+
+ * WebView.subproj/WKWebController.h:
+ (WKSimpleAuthenticationRequest) name field `url', not `uri'.
+ (-[WKWebDataSourceErrorHandler receivedError:forDataSource:]):
+ renamed from `error:inDataSource:' so that it's a verb phrase.
+
+ * WebView.subproj/WKWebDataSource.h:
+ (-[WKWebDataSource initWithURL:]): Rename `inputUrl' argument to
+ `inputURL'.
+ (-[WKWebDataSource initWithLoader:]): Change argument type from
+ `WKURILoader' to `WKLoader'.
+ (-[WKWebDataSource wasRedirected]): Renamed from `isRedirected',
+ the past tense seems more appropriate here.
+ (-[WKWebDataSource setJavaEnabled:]): Add missing semicolon.
+ (-[WKWebDataSource pluginsEnabled:]): renamed from `pluginEnabled'
+ for consistency with `setPluginsEnabled:'.
+
+ * WebView.subproj/WKWebView.h:
+ (-[WKWebView fontSizes]): renamed from `fontSize' for sonsistency
+ with `setFontSizes:'.
+ (-[WKWebView setContextMenusEnabled]): renamed from
+ 'setEnableContextMenus:' for consistency with
+ `contextMenusenabled'.
+
+2001-12-14 Maciej Stachowiak <mjs at apple.com>
+
After discussion with Don, Removed all methods relating to
resolved URLs, since browsers don't actually treat aliases
specially.
diff --git a/WebKit/WebView.subproj/IFWebController.h b/WebKit/WebView.subproj/IFWebController.h
index b87b438..a0b66e5 100644
--- a/WebKit/WebView.subproj/IFWebController.h
+++ b/WebKit/WebView.subproj/IFWebController.h
@@ -272,7 +272,7 @@ struct WKSimpleAuthenticationResult {
/* should this be an interface instead? */
struct WKSimpleAuthenticationRequest {
- NSURL *uri; // nil if for something non-URI based
+ NSURL *url; // nil if for something non-URI based
NSString *domain; // http authentication domain or some representation of
// auth domain for non-URI-based locations; otherwise nil.
NSString *username; // username, if already provided, otherwise nil
@@ -300,7 +300,7 @@ struct WKSimpleAuthenticationRequest {
*/
@protocol WKWebDataSourceErrorHandler
-- error: (WKError *)error inDataSource: (WKWebDataSource *)dataSource;
+- receivedError: (WKError *)error forDataSource: (WKWebDataSource *)dataSource;
@end
diff --git a/WebKit/WebView.subproj/IFWebDataSource.h b/WebKit/WebView.subproj/IFWebDataSource.h
index 72315d1..29d1726 100644
--- a/WebKit/WebView.subproj/IFWebDataSource.h
+++ b/WebKit/WebView.subproj/IFWebDataSource.h
@@ -56,7 +56,9 @@
Removed all mentions of resolved URLs, because browsers don't
actuall treat DNS aliases specially.
-
+
+ Minor naming changes.
+
============================================================================= */
#ifdef READY_FOR_PRIMETIME
@@ -69,13 +71,13 @@
// Returns nil if object cannot be initialized due to a malformed URL (RFC 1808).
-- initWithURL: (NSURL *)inputUrl;
+- initWithURL: (NSURL *)inputURL;
- initWithData: (NSData *)data;
- initWithString: (NSString *)string;
// Ken, need some help with one.
-- initWithLoader: (WKURILoader *)loader;
+- initWithLoader: (WKLoader *)loader;
// Returns nil if this data source represents the main document. Otherwise
@@ -133,7 +135,7 @@
// Returns true if the inputURL has been redirected by the server,
// i.e. inputURL != finalURL.
-- (BOOL)isRedirected;
+- (BOOL)wasRedirected;
// Start actually getting (if initialized with a URL) and parsing data. If the data source
// is still performing a previous load it will be stopped.
@@ -212,7 +214,7 @@
- (BOOL)jScriptEnabled;
// Java preferences
-- (void)setJavaEnabled: (BOOL)flag
+- (void)setJavaEnabled: (BOOL)flag;
- (BOOL)javaEnabled;
// Document refreshes allowed
@@ -221,7 +223,7 @@
// Plugins
- (void)setPluginsEnabled: (BOOL)flag;
-- (BOOL)pluginEnabled;
+- (BOOL)pluginsEnabled;
// Should images be loaded.
- (void)setAutoloadImages: (BOOL)flag;
diff --git a/WebKit/WebView.subproj/IFWebView.h b/WebKit/WebView.subproj/IFWebView.h
index 5261bba..788de59 100644
--- a/WebKit/WebView.subproj/IFWebView.h
+++ b/WebKit/WebView.subproj/IFWebView.h
@@ -99,7 +99,7 @@
// Font API
- (void)setFontSizes: (NSArray *)sizes;
-- (NSArray *)fontSize;
+- (NSArray *)fontSizes;
- (void)resetFontSizes;
- (void)setStandardFont: (NSSFont *)font;
- (NSFont *)standardFont;
@@ -117,7 +117,7 @@
// Returns an array of built-in context menu items for this node.
// Generally called by WKContextMenuHandlers from contextMenuItemsForNode:
- (NSArray *)defaultContextMenuItemsForNode: (WKDOMNode *);
-- (void)setEnableContextMenus: (BOOL)flag;
+- (void)setContextMenusEnabled: (BOOL)flag;
- (BOOL)contextMenusEnabled;
diff --git a/WebKit/WebView.subproj/WKWebController.h b/WebKit/WebView.subproj/WKWebController.h
index b87b438..a0b66e5 100644
--- a/WebKit/WebView.subproj/WKWebController.h
+++ b/WebKit/WebView.subproj/WKWebController.h
@@ -272,7 +272,7 @@ struct WKSimpleAuthenticationResult {
/* should this be an interface instead? */
struct WKSimpleAuthenticationRequest {
- NSURL *uri; // nil if for something non-URI based
+ NSURL *url; // nil if for something non-URI based
NSString *domain; // http authentication domain or some representation of
// auth domain for non-URI-based locations; otherwise nil.
NSString *username; // username, if already provided, otherwise nil
@@ -300,7 +300,7 @@ struct WKSimpleAuthenticationRequest {
*/
@protocol WKWebDataSourceErrorHandler
-- error: (WKError *)error inDataSource: (WKWebDataSource *)dataSource;
+- receivedError: (WKError *)error forDataSource: (WKWebDataSource *)dataSource;
@end
diff --git a/WebKit/WebView.subproj/WKWebDataSource.h b/WebKit/WebView.subproj/WKWebDataSource.h
index 72315d1..29d1726 100644
--- a/WebKit/WebView.subproj/WKWebDataSource.h
+++ b/WebKit/WebView.subproj/WKWebDataSource.h
@@ -56,7 +56,9 @@
Removed all mentions of resolved URLs, because browsers don't
actuall treat DNS aliases specially.
-
+
+ Minor naming changes.
+
============================================================================= */
#ifdef READY_FOR_PRIMETIME
@@ -69,13 +71,13 @@
// Returns nil if object cannot be initialized due to a malformed URL (RFC 1808).
-- initWithURL: (NSURL *)inputUrl;
+- initWithURL: (NSURL *)inputURL;
- initWithData: (NSData *)data;
- initWithString: (NSString *)string;
// Ken, need some help with one.
-- initWithLoader: (WKURILoader *)loader;
+- initWithLoader: (WKLoader *)loader;
// Returns nil if this data source represents the main document. Otherwise
@@ -133,7 +135,7 @@
// Returns true if the inputURL has been redirected by the server,
// i.e. inputURL != finalURL.
-- (BOOL)isRedirected;
+- (BOOL)wasRedirected;
// Start actually getting (if initialized with a URL) and parsing data. If the data source
// is still performing a previous load it will be stopped.
@@ -212,7 +214,7 @@
- (BOOL)jScriptEnabled;
// Java preferences
-- (void)setJavaEnabled: (BOOL)flag
+- (void)setJavaEnabled: (BOOL)flag;
- (BOOL)javaEnabled;
// Document refreshes allowed
@@ -221,7 +223,7 @@
// Plugins
- (void)setPluginsEnabled: (BOOL)flag;
-- (BOOL)pluginEnabled;
+- (BOOL)pluginsEnabled;
// Should images be loaded.
- (void)setAutoloadImages: (BOOL)flag;
diff --git a/WebKit/WebView.subproj/WKWebView.h b/WebKit/WebView.subproj/WKWebView.h
index 5261bba..788de59 100644
--- a/WebKit/WebView.subproj/WKWebView.h
+++ b/WebKit/WebView.subproj/WKWebView.h
@@ -99,7 +99,7 @@
// Font API
- (void)setFontSizes: (NSArray *)sizes;
-- (NSArray *)fontSize;
+- (NSArray *)fontSizes;
- (void)resetFontSizes;
- (void)setStandardFont: (NSSFont *)font;
- (NSFont *)standardFont;
@@ -117,7 +117,7 @@
// Returns an array of built-in context menu items for this node.
// Generally called by WKContextMenuHandlers from contextMenuItemsForNode:
- (NSArray *)defaultContextMenuItemsForNode: (WKDOMNode *);
-- (void)setEnableContextMenus: (BOOL)flag;
+- (void)setContextMenusEnabled: (BOOL)flag;
- (BOOL)contextMenusEnabled;
diff --git a/WebKit/WebView.subproj/WebController.h b/WebKit/WebView.subproj/WebController.h
index b87b438..a0b66e5 100644
--- a/WebKit/WebView.subproj/WebController.h
+++ b/WebKit/WebView.subproj/WebController.h
@@ -272,7 +272,7 @@ struct WKSimpleAuthenticationResult {
/* should this be an interface instead? */
struct WKSimpleAuthenticationRequest {
- NSURL *uri; // nil if for something non-URI based
+ NSURL *url; // nil if for something non-URI based
NSString *domain; // http authentication domain or some representation of
// auth domain for non-URI-based locations; otherwise nil.
NSString *username; // username, if already provided, otherwise nil
@@ -300,7 +300,7 @@ struct WKSimpleAuthenticationRequest {
*/
@protocol WKWebDataSourceErrorHandler
-- error: (WKError *)error inDataSource: (WKWebDataSource *)dataSource;
+- receivedError: (WKError *)error forDataSource: (WKWebDataSource *)dataSource;
@end
diff --git a/WebKit/WebView.subproj/WebDataSource.h b/WebKit/WebView.subproj/WebDataSource.h
index 72315d1..29d1726 100644
--- a/WebKit/WebView.subproj/WebDataSource.h
+++ b/WebKit/WebView.subproj/WebDataSource.h
@@ -56,7 +56,9 @@
Removed all mentions of resolved URLs, because browsers don't
actuall treat DNS aliases specially.
-
+
+ Minor naming changes.
+
============================================================================= */
#ifdef READY_FOR_PRIMETIME
@@ -69,13 +71,13 @@
// Returns nil if object cannot be initialized due to a malformed URL (RFC 1808).
-- initWithURL: (NSURL *)inputUrl;
+- initWithURL: (NSURL *)inputURL;
- initWithData: (NSData *)data;
- initWithString: (NSString *)string;
// Ken, need some help with one.
-- initWithLoader: (WKURILoader *)loader;
+- initWithLoader: (WKLoader *)loader;
// Returns nil if this data source represents the main document. Otherwise
@@ -133,7 +135,7 @@
// Returns true if the inputURL has been redirected by the server,
// i.e. inputURL != finalURL.
-- (BOOL)isRedirected;
+- (BOOL)wasRedirected;
// Start actually getting (if initialized with a URL) and parsing data. If the data source
// is still performing a previous load it will be stopped.
@@ -212,7 +214,7 @@
- (BOOL)jScriptEnabled;
// Java preferences
-- (void)setJavaEnabled: (BOOL)flag
+- (void)setJavaEnabled: (BOOL)flag;
- (BOOL)javaEnabled;
// Document refreshes allowed
@@ -221,7 +223,7 @@
// Plugins
- (void)setPluginsEnabled: (BOOL)flag;
-- (BOOL)pluginEnabled;
+- (BOOL)pluginsEnabled;
// Should images be loaded.
- (void)setAutoloadImages: (BOOL)flag;
diff --git a/WebKit/WebView.subproj/WebFrameView.h b/WebKit/WebView.subproj/WebFrameView.h
index 5261bba..788de59 100644
--- a/WebKit/WebView.subproj/WebFrameView.h
+++ b/WebKit/WebView.subproj/WebFrameView.h
@@ -99,7 +99,7 @@
// Font API
- (void)setFontSizes: (NSArray *)sizes;
-- (NSArray *)fontSize;
+- (NSArray *)fontSizes;
- (void)resetFontSizes;
- (void)setStandardFont: (NSSFont *)font;
- (NSFont *)standardFont;
@@ -117,7 +117,7 @@
// Returns an array of built-in context menu items for this node.
// Generally called by WKContextMenuHandlers from contextMenuItemsForNode:
- (NSArray *)defaultContextMenuItemsForNode: (WKDOMNode *);
-- (void)setEnableContextMenus: (BOOL)flag;
+- (void)setContextMenusEnabled: (BOOL)flag;
- (BOOL)contextMenusEnabled;
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index b87b438..a0b66e5 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -272,7 +272,7 @@ struct WKSimpleAuthenticationResult {
/* should this be an interface instead? */
struct WKSimpleAuthenticationRequest {
- NSURL *uri; // nil if for something non-URI based
+ NSURL *url; // nil if for something non-URI based
NSString *domain; // http authentication domain or some representation of
// auth domain for non-URI-based locations; otherwise nil.
NSString *username; // username, if already provided, otherwise nil
@@ -300,7 +300,7 @@ struct WKSimpleAuthenticationRequest {
*/
@protocol WKWebDataSourceErrorHandler
-- error: (WKError *)error inDataSource: (WKWebDataSource *)dataSource;
+- receivedError: (WKError *)error forDataSource: (WKWebDataSource *)dataSource;
@end
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list