[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 07:40:14 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 832ecbd3cbbe5552063c99409c6838c0e1af5710
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat May 3 00:42:39 2003 +0000
WebFoundation:
Reviewed by Richard.
- reformatted method prototypes to match AppKit style
* AuthenticationManager.subproj/NSHTTPAuthenticator.h:
* AuthenticationManager.subproj/NSURLConnectionAuthenticationChallenge.h:
* AuthenticationManager.subproj/NSURLDownloadAuthenticationChallenge.h:
* AuthenticationManager.subproj/NSURLProtectionSpace.h:
* AuthenticationManager.subproj/WebCredentialStorage.h:
* AuthenticationManager.subproj/WebKeychainCredential.h:
* CacheLoader.subproj/NSURLCache.h:
* CacheLoader.subproj/NSURLCachePrivate.h:
* CacheLoader.subproj/NSURLConnection.h:
* CacheLoader.subproj/NSURLConnectionPrivate.h:
* CacheLoader.subproj/NSURLConnectionQueue.h:
* CacheLoader.subproj/NSURLProtocol.h:
* CacheLoader.subproj/NSURLProtocolClient.h:
* CacheLoader.subproj/NSURLProtocolPrivate.h:
* CacheLoader.subproj/NSURLRequest.h:
* CacheLoader.subproj/NSURLRequestPrivate.h:
* CacheLoader.subproj/NSURLResponse.h:
* CacheLoader.subproj/NSURLResponsePrivate.h:
* CacheLoader.subproj/WebCache.h:
* CacheLoader.subproj/WebCachePrivate.h:
* CacheLoader.subproj/WebDiskCache.h:
* CacheLoader.subproj/WebNetworkSettings.h:
* CacheLoader.subproj/WebSynchronousDelegate.h:
* CookieManager.subproj/NSHTTPCookiePrivate.h:
* CookieManager.subproj/NSHTTPCookieStorage.h:
* CookieManager.subproj/NSHTTPCookieStoragePrivate.h:
* CookieManager.subproj/WebCookieStorage.h:
* CookieManager.subproj/WebCookieStorageServer.h:
* Database.subproj/WebDatabase.h:
* Database.subproj/WebFileDatabase.h:
* Misc.subproj/WebBinaryHeap.h:
* Misc.subproj/WebFileTypeMappings.h:
* Misc.subproj/WebHostNameAddressInfo.h:
* Misc.subproj/WebKeyValuePair.h:
* Misc.subproj/WebMonitor.h:
* Misc.subproj/WebMultipartForm.h:
* Misc.subproj/WebNSArrayExtras.h:
* Misc.subproj/WebNSCalendarDateExtras.h:
* Misc.subproj/WebNSDataExtras.h:
* Misc.subproj/WebNSDictionaryExtras.h:
* Misc.subproj/WebNSErrorExtras.h:
* Misc.subproj/WebNSObjectExtras.h:
* Misc.subproj/WebNSStringExtras.h:
* Misc.subproj/WebNSThreadExtras.h:
* Misc.subproj/WebNSValueExtensions.h:
* Misc.subproj/WebOrderable.h:
* Misc.subproj/WebQueue.h:
* Misc.subproj/WebReadWriteLock.h:
* Misc.subproj/WebRecursiveReadWriteLock.h:
* Misc.subproj/WebSpinLock.h:
* ProtocolHandlers.subproj/WebCFNetworkHTTPProtocol.h:
* ProtocolHandlers.subproj/WebFTPProtocol.h:
* ProtocolHandlers.subproj/WebHTTPProtocol.h:
WebCore:
Reviewed by Richard.
- reformatted method prototypes to match AppKit style
* kwq/WebCoreBridge.h:
* kwq/WebCoreDOMPrivate.h:
* kwq/WebCoreHistory.h:
* kwq/WebCoreResourceLoader.h:
* kwq/WebCoreTextRenderer.h:
* kwq/WebDOMDocument.h:
* kwq/WebDOMElement.h:
* kwq/WebDOMNode.h:
WebKit:
Reviewed by Richard.
- reformatted method prototypes to match AppKit style
- remove "Public header file" from headers that are not public
- fix header doc @method names to match actual method names
* Carbon.subproj/CarbonWindowAdapter.h:
* Carbon.subproj/HIViewAdapter.h:
* DOM.subproj/WebDOMDocument.h:
* DOM.subproj/WebDOMNode.h:
* History.subproj/WebBackForwardList.h:
* History.subproj/WebHistoryItemPrivate.h:
* History.subproj/WebHistoryPrivate.h:
* History.subproj/WebURLsWithTitles.h:
* Misc.subproj/WebIconDatabase.h:
* Misc.subproj/WebIconLoader.h:
* Misc.subproj/WebKitNSStringExtras.h:
* Misc.subproj/WebUnicode.h:
* Panels.subproj/WebPanelAuthenticationHandler.h:
* Plugins.subproj/WebBasePluginPackage.h:
* Plugins.subproj/WebNetscapePluginStream.h:
* Plugins.subproj/WebNullPluginView.h:
* Plugins.subproj/WebPluginViewFactory.h:
* WebCoreSupport.subproj/WebGlyphBuffer.h:
* WebCoreSupport.subproj/WebTextRenderer.h:
* WebCoreSupport.subproj/WebTextRendererFactory.h:
* WebView.subproj/WebBaseResourceHandleDelegate.h:
* WebView.subproj/WebControllerSets.h:
* WebView.subproj/WebDataProtocol.h:
* WebView.subproj/WebDataSource.h:
* WebView.subproj/WebDataSourcePrivate.h:
* WebView.subproj/WebDebugDOMNode.h:
* WebView.subproj/WebDocument.h:
* WebView.subproj/WebFrame.h:
* WebView.subproj/WebFramePrivate.h:
* WebView.subproj/WebFrameView.h:
* WebView.subproj/WebHTMLRepresentation.h:
* WebView.subproj/WebHTMLView.h:
* WebView.subproj/WebMainResourceClient.h:
* WebView.subproj/WebPolicyDelegate.h:
* WebView.subproj/WebPolicyDelegatePrivate.h:
* WebView.subproj/WebPreferencesPrivate.h:
* WebView.subproj/WebRenderNode.h:
* WebView.subproj/WebResourceLoadDelegate.h:
* WebView.subproj/WebUIDelegate.h:
* WebView.subproj/WebView.h:
* WebView.subproj/WebViewPrivate.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4269 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index e5b43c7..f981acb 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,20 @@
2003-05-02 Maciej Stachowiak <mjs at apple.com>
+ Reviewed by Richard.
+
+ - reformatted method prototypes to match AppKit style
+
+ * kwq/WebCoreBridge.h:
+ * kwq/WebCoreDOMPrivate.h:
+ * kwq/WebCoreHistory.h:
+ * kwq/WebCoreResourceLoader.h:
+ * kwq/WebCoreTextRenderer.h:
+ * kwq/WebDOMDocument.h:
+ * kwq/WebDOMElement.h:
+ * kwq/WebDOMNode.h:
+
+2003-05-02 Maciej Stachowiak <mjs at apple.com>
+
Reviewed by Darin.
- fixed 2936175 - MALLORY: please implement onResize
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e5b43c7..f981acb 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,20 @@
2003-05-02 Maciej Stachowiak <mjs at apple.com>
+ Reviewed by Richard.
+
+ - reformatted method prototypes to match AppKit style
+
+ * kwq/WebCoreBridge.h:
+ * kwq/WebCoreDOMPrivate.h:
+ * kwq/WebCoreHistory.h:
+ * kwq/WebCoreResourceLoader.h:
+ * kwq/WebCoreTextRenderer.h:
+ * kwq/WebDOMDocument.h:
+ * kwq/WebDOMElement.h:
+ * kwq/WebDOMNode.h:
+
+2003-05-02 Maciej Stachowiak <mjs at apple.com>
+
Reviewed by Darin.
- fixed 2936175 - MALLORY: please implement onResize
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index 5320934..176624c 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -99,7 +99,7 @@ enum FrameBorderStyle {
BOOL _drawSelectionOnly;
}
-- (void)initializeSettings: (WebCoreSettings *)settings;
+- (void)initializeSettings:(WebCoreSettings *)settings;
- (void)setRenderPart:(KHTMLRenderPart *)renderPart;
- (KHTMLRenderPart *)renderPart;
@@ -303,7 +303,7 @@ enum FrameBorderStyle {
- (int)getObjectCacheSize;
-- (BOOL)frameRequiredForMIMEType: (NSString*)mimeType;
+- (BOOL)frameRequiredForMIMEType:(NSString*)mimeType;
- (void)loadEmptyDocumentSynchronously;
diff --git a/WebCore/kwq/WebCoreDOMPrivate.h b/WebCore/kwq/WebCoreDOMPrivate.h
index 2b77c90..be0c38e 100644
--- a/WebCore/kwq/WebCoreDOMPrivate.h
+++ b/WebCore/kwq/WebCoreDOMPrivate.h
@@ -42,82 +42,82 @@ extern NSString *domStringToNSString(DOM::DOMString &aString);
extern DOM::DOMString NSStringToDOMString(NSString *aString);
@interface WebCoreDOMDocumentType (CorePrivate)
-+ (WebCoreDOMDocumentType *)documentTypeWithImpl: (DOM::DocumentTypeImpl *)impl;
++ (WebCoreDOMDocumentType *)documentTypeWithImpl:(DOM::DocumentTypeImpl *)impl;
- (DOM::DocumentTypeImpl *)documentTypeImpl;
@end
@interface WebCoreDOMImplementation (CorePrivate)
-+ (WebCoreDOMImplementation *)implementationWithImpl: (DOM::DOMImplementationImpl *)impl;
-- initWithImpl: (DOM::DOMImplementationImpl *)coreImpl;
++ (WebCoreDOMImplementation *)implementationWithImpl:(DOM::DOMImplementationImpl *)impl;
+- initWithImpl:(DOM::DOMImplementationImpl *)coreImpl;
- (DOM::DOMImplementationImpl *)DOMImplementationImpl;
@end
@interface WebCoreDOMDocument (CorePrivate)
-+ (WebCoreDOMDocument *)documentWithImpl: (DOM::DocumentImpl *)impl;
++ (WebCoreDOMDocument *)documentWithImpl:(DOM::DocumentImpl *)impl;
- (DOM::DocumentImpl *)documentImpl;
@end
@interface WebCoreDOMNamedNodeMap (CorePrivate)
-+ (WebCoreDOMNamedNodeMap *)namedNodeMapWithImpl: (DOM::NamedNodeMapImpl *)impl;
-- initWithImpl: (DOM::NamedNodeMapImpl *)coreImpl;
++ (WebCoreDOMNamedNodeMap *)namedNodeMapWithImpl:(DOM::NamedNodeMapImpl *)impl;
+- initWithImpl:(DOM::NamedNodeMapImpl *)coreImpl;
- (DOM::NamedNodeMapImpl *)impl;
@end
@interface WebCoreDOMElement (CorePrivate)
-+ (WebCoreDOMElement *)elementWithImpl: (DOM::ElementImpl *)impl;
++ (WebCoreDOMElement *)elementWithImpl:(DOM::ElementImpl *)impl;
- (DOM::ElementImpl *)elementImpl;
@end
@interface WebCoreDOMAttr (CorePrivate)
-+ (WebCoreDOMAttr *)attrWithImpl: (DOM::AttrImpl *)impl;
++ (WebCoreDOMAttr *)attrWithImpl:(DOM::AttrImpl *)impl;
- (DOM::AttrImpl *)attrImpl;
@end
@interface WebCoreDOMDocumentFragment (CorePrivate)
-+ (WebCoreDOMDocumentFragment *)documentFragmentWithImpl: (DOM::DocumentFragmentImpl *)impl;
++ (WebCoreDOMDocumentFragment *)documentFragmentWithImpl:(DOM::DocumentFragmentImpl *)impl;
- (DOM::DocumentFragmentImpl *)documentFragmentImpl;
@end
@interface WebCoreDOMCharacterData (CorePrivate)
-+ (WebCoreDOMCharacterData *)characterDataWithImpl: (DOM::CharacterDataImpl *)impl;
-- initWithImpl: (DOM::CharacterDataImpl *)coreImpl;
++ (WebCoreDOMCharacterData *)characterDataWithImpl:(DOM::CharacterDataImpl *)impl;
+- initWithImpl:(DOM::CharacterDataImpl *)coreImpl;
- (DOM::CharacterDataImpl *)impl;
@end
@interface WebCoreDOMText (CorePrivate)
-+ (WebCoreDOMText *)textWithImpl: (DOM::TextImpl *)impl;
++ (WebCoreDOMText *)textWithImpl:(DOM::TextImpl *)impl;
- (DOM::TextImpl *)textImpl;
@end
@interface WebCoreDOMComment (CorePrivate)
-+ (WebCoreDOMComment *)commentWithImpl: (DOM::CommentImpl *)impl;
++ (WebCoreDOMComment *)commentWithImpl:(DOM::CommentImpl *)impl;
- (DOM::CommentImpl *)commentImpl;
@end
@interface WebCoreDOMCDATASection (CorePrivate)
-+ (WebCoreDOMCDATASection *)CDATASectionWithImpl: (DOM::CDATASectionImpl *)impl;
++ (WebCoreDOMCDATASection *)CDATASectionWithImpl:(DOM::CDATASectionImpl *)impl;
- (DOM::CDATASectionImpl *)CDATASectionImpl;
@end
@interface WebCoreDOMProcessingInstruction (CorePrivate)
-+ (WebCoreDOMProcessingInstruction *)processingInstructionWithImpl: (DOM::ProcessingInstructionImpl *)impl;
++ (WebCoreDOMProcessingInstruction *)processingInstructionWithImpl:(DOM::ProcessingInstructionImpl *)impl;
- (DOM::ProcessingInstructionImpl *)processingInstructionImpl;
@end
@interface WebCoreDOMEntityReference (CorePrivate)
-+ (WebCoreDOMEntityReference *)entityReferenceWithImpl: (DOM::EntityReferenceImpl *)impl;
++ (WebCoreDOMEntityReference *)entityReferenceWithImpl:(DOM::EntityReferenceImpl *)impl;
- (DOM::EntityReferenceImpl *)entityReferenceImpl;
@end
@interface WebCoreDOMNode (CorePrivate)
-+ (WebCoreDOMNode *)nodeWithImpl: (DOM::NodeImpl *)impl;
-- initWithImpl: (DOM::NodeImpl *)coreImpl;
++ (WebCoreDOMNode *)nodeWithImpl:(DOM::NodeImpl *)impl;
+- initWithImpl:(DOM::NodeImpl *)coreImpl;
- (DOM::NodeImpl *)impl;
@end
@interface WebCoreDOMNodeList (CorePrivate)
-+ (WebCoreDOMNodeList *)nodeListWithImpl: (DOM::NodeListImpl *)impl;
-- initWithImpl: (DOM::NodeListImpl *)coreImpl;
++ (WebCoreDOMNodeList *)nodeListWithImpl:(DOM::NodeListImpl *)impl;
+- initWithImpl:(DOM::NodeListImpl *)coreImpl;
- (DOM::NodeListImpl *)impl;
@end
diff --git a/WebCore/kwq/WebCoreHistory.h b/WebCore/kwq/WebCoreHistory.h
index 8b43587..8550784 100644
--- a/WebCore/kwq/WebCoreHistory.h
+++ b/WebCore/kwq/WebCoreHistory.h
@@ -26,14 +26,14 @@
#import <Foundation/Foundation.h>
@protocol WebCoreHistoryProvider <NSObject>
-- (BOOL)containsItemForURLString: (NSString *)urlString;
+- (BOOL)containsItemForURLString:(NSString *)urlString;
@end
@interface WebCoreHistory : NSObject
{
}
-+ (void)setHistoryProvider: (id<WebCoreHistoryProvider>)h;
++ (void)setHistoryProvider:(id<WebCoreHistoryProvider>)h;
+ (id<WebCoreHistoryProvider>)historyProvider;
@end
diff --git a/WebCore/kwq/WebCoreResourceLoader.h b/WebCore/kwq/WebCoreResourceLoader.h
index 398af61..80f9390 100644
--- a/WebCore/kwq/WebCoreResourceLoader.h
+++ b/WebCore/kwq/WebCoreResourceLoader.h
@@ -27,7 +27,7 @@
@protocol WebCoreResourceLoader <NSObject>
-- (void)receivedResponse: response;
+- (void)receivedResponse:(id)response;
- (void)addData:(NSData *)data;
diff --git a/WebCore/kwq/WebCoreTextRenderer.h b/WebCore/kwq/WebCoreTextRenderer.h
index 2696f58..59c6854 100644
--- a/WebCore/kwq/WebCoreTextRenderer.h
+++ b/WebCore/kwq/WebCoreTextRenderer.h
@@ -38,10 +38,10 @@
- (float)xHeight;
// horizontal metrics
-- (float)floatWidthForCharacters:(const unichar *)characters stringLength:(unsigned)length fromCharacterPosition: (int)pos numberOfCharacters: (int)len withPadding: (int)padding applyRounding: (BOOL)applyRounding attemptFontSubstitution: (BOOL)attemptFontSubstitution widths: (float *)buffer letterSpacing: (int)letterSpacing wordSpacing: (int)wordSpacing fontFamilies: (NSString **)families;
+- (float)floatWidthForCharacters:(const unichar *)characters stringLength:(unsigned)length fromCharacterPosition:(int)pos numberOfCharacters:(int)len withPadding:(int)padding applyRounding:(BOOL)applyRounding attemptFontSubstitution:(BOOL)attemptFontSubstitution widths:(float *)buffer letterSpacing:(int)letterSpacing wordSpacing:(int)wordSpacing fontFamilies:(NSString **)families;
// drawing
-- (void)drawCharacters:(const UniChar *)characters stringLength:(unsigned)length fromCharacterPosition:(int)from toCharacterPosition:(int)to atPoint:(NSPoint)point withPadding: (int)padding withTextColor:(NSColor *)textColor backgroundColor:(NSColor *)backgroundColor rightToLeft: (BOOL)rtl letterSpacing: (int)letterSpacing wordSpacing: (int)wordSpacing fontFamilies: (NSString **)families;
-- (void)drawLineForCharacters:(NSPoint)point yOffset:(float)yOffset withWidth: (int)width withColor:(NSColor *)color;
+- (void)drawCharacters:(const UniChar *)characters stringLength:(unsigned)length fromCharacterPosition:(int)from toCharacterPosition:(int)to atPoint:(NSPoint)point withPadding:(int)padding withTextColor:(NSColor *)textColor backgroundColor:(NSColor *)backgroundColor rightToLeft:(BOOL)rtl letterSpacing:(int)letterSpacing wordSpacing:(int)wordSpacing fontFamilies:(NSString **)families;
+- (void)drawLineForCharacters:(NSPoint)point yOffset:(float)yOffset withWidth:(int)width withColor:(NSColor *)color;
@end
diff --git a/WebCore/kwq/WebDOMDocument.h b/WebCore/kwq/WebDOMDocument.h
index 0136afa..cf61c59 100644
--- a/WebCore/kwq/WebDOMDocument.h
+++ b/WebCore/kwq/WebDOMDocument.h
@@ -62,16 +62,16 @@
@protocol WebDOMImplementation
-- (BOOL)hasFeature: (NSString *)feature : (NSString *)version;
+- (BOOL)hasFeature:(NSString *)feature :(NSString *)version;
-- (id<WebDOMDocumentType>)createDocumentType: (NSString *)qualifiedName
+- (id<WebDOMDocumentType>)createDocumentType:(NSString *)qualifiedName
:(NSString *)publicId
:(NSString *)systemId
:(int *)exceptionCode;
-- (id<WebDOMDocument>)createDocument: (NSString *)namespaceURI
- : (NSString *)qualifiedName
- : (id<WebDOMDocumentType>)doctype;
+- (id<WebDOMDocument>)createDocument:(NSString *)namespaceURI
+ :(NSString *)qualifiedName
+ :(id<WebDOMDocumentType>)doctype;
@end
diff --git a/WebCore/kwq/WebDOMElement.h b/WebCore/kwq/WebDOMElement.h
index 2750766..8257597 100644
--- a/WebCore/kwq/WebDOMElement.h
+++ b/WebCore/kwq/WebDOMElement.h
@@ -49,11 +49,11 @@
- (NSString *)data;
-- (void)setData: (NSString *)data;
+- (void)setData:(NSString *)data;
- (unsigned long)length;
-- (NSString *)substringData: (unsigned long)offset :(unsigned long)count;
+- (NSString *)substringData:(unsigned long)offset :(unsigned long)count;
- (void)appendData:(NSString *)arg;
@@ -72,7 +72,7 @@
@protocol WebDOMText <WebDOMCharacterData>
-- (id<WebDOMText>)splitText: (unsigned long)offset;
+- (id<WebDOMText>)splitText:(unsigned long)offset;
@end
@@ -102,7 +102,7 @@
- (NSString *)tagName;
-- (NSString *)getAttribute: (NSString *)name;
+- (NSString *)getAttribute:(NSString *)name;
- (void)setAttribute:(NSString *)name :(NSString *)value;
@@ -128,7 +128,7 @@
- (id<WebDOMAttr>)setAttributeNodeNS:(id<WebDOMAttr>)newAttr;
-- (BOOL)hasAttribute: (NSString *)name;
+- (BOOL)hasAttribute:(NSString *)name;
- (BOOL)hasAttributeNS:(NSString *)namespaceURI :(NSString *)localName;
diff --git a/WebCore/kwq/WebDOMNode.h b/WebCore/kwq/WebDOMNode.h
index 1ddf401..1992f61 100644
--- a/WebCore/kwq/WebDOMNode.h
+++ b/WebCore/kwq/WebDOMNode.h
@@ -48,7 +48,7 @@ enum WebNodeType {
- (NSString *)nodeName;
- (NSString *)nodeValue;
-- (void)setNodeValue: (NSString *)string;
+- (void)setNodeValue:(NSString *)string;
- (unsigned short)nodeType;
- (id<WebDOMNode>)parentNode;
- (id<WebDOMNodeList>)childNodes;
@@ -63,12 +63,12 @@ enum WebNodeType {
- (id<WebDOMNode>)removeChild:(id<WebDOMNode>)oldChild;
- (id<WebDOMNode>)appendChild:(id<WebDOMNode>)newChild;
- (BOOL)hasChildNodes;
-- (id<WebDOMNode>)cloneNode: (BOOL) deep;
+- (id<WebDOMNode>)cloneNode:(BOOL) deep;
- (void)normalize;
-- (BOOL)isSupported:(NSString *)feature : (NSString *)version;
+- (BOOL)isSupported:(NSString *)feature :(NSString *)version;
- (NSString *)namespaceURI;
- (NSString *)prefix;
-- (void)setPrefix: (NSString *)prefix;
+- (void)setPrefix:(NSString *)prefix;
- (NSString *)localName;
- (BOOL)hasAttributes;
@@ -92,7 +92,7 @@ enum WebNodeType {
@protocol WebDOMNodeList <NSObject>
- (unsigned long)length;
-- (id<WebDOMNode>)item: (unsigned long)index;
+- (id<WebDOMNode>)item:(unsigned long)index;
@end
diff --git a/WebKit/Carbon.subproj/CarbonWindowAdapter.h b/WebKit/Carbon.subproj/CarbonWindowAdapter.h
index 951a31c..bb5dc97 100644
--- a/WebKit/Carbon.subproj/CarbonWindowAdapter.h
+++ b/WebKit/Carbon.subproj/CarbonWindowAdapter.h
@@ -11,22 +11,21 @@
#import <HIToolbox/CarbonEvents.h>
#import <HIToolbox/MacWindows.h>
- at interface CarbonWindowAdapter : NSWindow {
-
- @private
+ at interface CarbonWindowAdapter : NSWindow
+{
+ at private
// The Carbon window that's being encapsulated, and whether or not this object owns (has responsibility for disposing) it.
WindowRef _windowRef;
BOOL _windowRefIsOwned;
- BOOL _carbon;
-
+ BOOL _carbon;
+
// The UPP for the event handler that we use to deal with various Carbon events, and the event handler itself.
EventHandlerUPP _handleEventUPP;
EventHandlerRef _eventHandler;
// Yes if this object should let Carbon handle kEventWindowActivated and kEventWindowDeactivated events. No otherwise.
BOOL _passingCarbonWindowActivationEvents;
-
}
// Initializers.
diff --git a/WebKit/Carbon.subproj/HIViewAdapter.h b/WebKit/Carbon.subproj/HIViewAdapter.h
index 57d5a26..600d26e 100644
--- a/WebKit/Carbon.subproj/HIViewAdapter.h
+++ b/WebKit/Carbon.subproj/HIViewAdapter.h
@@ -3,7 +3,7 @@
// Synergy
//
// Created by Ed Voas on Mon Jan 20 2003.
-// Copyright (c) 2003 __MyCompanyName__. All rights reserved.
+// Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
//
#import <WebKit/WebKit.h>
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index f755578..878c1d5 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,55 @@
2003-05-02 Maciej Stachowiak <mjs at apple.com>
+ Reviewed by Richard.
+
+ - reformatted method prototypes to match AppKit style
+ - remove "Public header file" from headers that are not public
+ - fix header doc @method names to match actual method names
+
+ * Carbon.subproj/CarbonWindowAdapter.h:
+ * Carbon.subproj/HIViewAdapter.h:
+ * DOM.subproj/WebDOMDocument.h:
+ * DOM.subproj/WebDOMNode.h:
+ * History.subproj/WebBackForwardList.h:
+ * History.subproj/WebHistoryItemPrivate.h:
+ * History.subproj/WebHistoryPrivate.h:
+ * History.subproj/WebURLsWithTitles.h:
+ * Misc.subproj/WebIconDatabase.h:
+ * Misc.subproj/WebIconLoader.h:
+ * Misc.subproj/WebKitNSStringExtras.h:
+ * Misc.subproj/WebUnicode.h:
+ * Panels.subproj/WebPanelAuthenticationHandler.h:
+ * Plugins.subproj/WebBasePluginPackage.h:
+ * Plugins.subproj/WebNetscapePluginStream.h:
+ * Plugins.subproj/WebNullPluginView.h:
+ * Plugins.subproj/WebPluginViewFactory.h:
+ * WebCoreSupport.subproj/WebGlyphBuffer.h:
+ * WebCoreSupport.subproj/WebTextRenderer.h:
+ * WebCoreSupport.subproj/WebTextRendererFactory.h:
+ * WebView.subproj/WebBaseResourceHandleDelegate.h:
+ * WebView.subproj/WebControllerSets.h:
+ * WebView.subproj/WebDataProtocol.h:
+ * WebView.subproj/WebDataSource.h:
+ * WebView.subproj/WebDataSourcePrivate.h:
+ * WebView.subproj/WebDebugDOMNode.h:
+ * WebView.subproj/WebDocument.h:
+ * WebView.subproj/WebFrame.h:
+ * WebView.subproj/WebFramePrivate.h:
+ * WebView.subproj/WebFrameView.h:
+ * WebView.subproj/WebHTMLRepresentation.h:
+ * WebView.subproj/WebHTMLView.h:
+ * WebView.subproj/WebMainResourceClient.h:
+ * WebView.subproj/WebPolicyDelegate.h:
+ * WebView.subproj/WebPolicyDelegatePrivate.h:
+ * WebView.subproj/WebPreferencesPrivate.h:
+ * WebView.subproj/WebRenderNode.h:
+ * WebView.subproj/WebResourceLoadDelegate.h:
+ * WebView.subproj/WebUIDelegate.h:
+ * WebView.subproj/WebView.h:
+ * WebView.subproj/WebViewPrivate.h:
+
+2003-05-02 Maciej Stachowiak <mjs at apple.com>
+
Reviewed by Darin.
- fixed 2936175 - MALLORY: please implement onResize
@@ -259,6 +309,17 @@
2003-04-30 Maciej Stachowiak <mjs at apple.com>
+ Reviewed by Ken.
+
+ Minor header tweaks.
+
+ * Misc.subproj/WebDownload.h: Fix copyright notice.
+ * Panels.subproj/WebAuthenticationPanel.h: Added 2003 to copyright.
+ * WebView.subproj/WebAuthenticationChallenge.h: Fix copyright notice, add docs.
+ * WebView.subproj/WebAuthenticationChallengeInternal.h: Fix copyright notice.
+
+2003-04-30 Maciej Stachowiak <mjs at apple.com>
+
Reviewed by Darin.
Fixed imports and @class directives for WebFoundation changes.
diff --git a/WebKit/DOM.subproj/WebDOMDocument.h b/WebKit/DOM.subproj/WebDOMDocument.h
index 03767fc..14f6ad4 100644
--- a/WebKit/DOM.subproj/WebDOMDocument.h
+++ b/WebKit/DOM.subproj/WebDOMDocument.h
@@ -44,16 +44,16 @@
@protocol WebDOMImplementation
-- (BOOL)hasFeature: (NSString *)feature : (NSString *)version;
+- (BOOL)hasFeature:(NSString *)feature :(NSString *)version;
-- (id<WebDOMDocumentType>)createDocumentType: (NSString *)qualifiedName
+- (id<WebDOMDocumentType>)createDocumentType:(NSString *)qualifiedName
:(NSString *)publicId
:(NSString *)systemId
:(int *)exceptionCode;
-- (id<WebDOMDocument>)createDocument: (NSString *)namespaceURI
- : (NSString *)qualifiedName
- : (id<WebDOMDocumentType>)doctype;
+- (id<WebDOMDocument>)createDocument:(NSString *)namespaceURI
+ :(NSString *)qualifiedName
+ :(id<WebDOMDocumentType>)doctype;
@end
diff --git a/WebKit/DOM.subproj/WebDOMNode.h b/WebKit/DOM.subproj/WebDOMNode.h
index 7cc3595..21859f8 100644
--- a/WebKit/DOM.subproj/WebDOMNode.h
+++ b/WebKit/DOM.subproj/WebDOMNode.h
@@ -30,7 +30,7 @@ enum WebNodeType {
- (NSString *)nodeValue;
-- (void)setNodeValue: (NSString *)string;
+- (void)setNodeValue:(NSString *)string;
- (unsigned short)nodeType;
@@ -42,7 +42,7 @@ enum WebNodeType {
- (id<WebDOMNode>)lastChild;
-- (id<WebDOMNode>) previousSibling;
+- (id<WebDOMNode>)previousSibling;
- (id<WebDOMNode>)nextSibling;
@@ -60,17 +60,17 @@ enum WebNodeType {
- (BOOL)hasChildNodes;
-- (id<WebDOMNode>)cloneNode: (BOOL) deep;
+- (id<WebDOMNode>)cloneNode:(BOOL)deep;
- (void)normalize;
-- (BOOL)isSupported:(NSString *)feature : (NSString *)version;
+- (BOOL)isSupported:(NSString *)feature :(NSString *)version;
- (NSString *)namespaceURI;
- (NSString *)prefix;
-- (void)setPrefix: (NSString *)prefix;
+- (void)setPrefix:(NSString *)prefix;
- (NSString *)localName;
@@ -104,6 +104,6 @@ enum WebNodeType {
- (unsigned long)length;
-- (id<WebDOMNode>)item: (unsigned long)index;
+- (id<WebDOMNode>)item:(unsigned long)index;
@end
diff --git a/WebKit/History.subproj/WebBackForwardList.h b/WebKit/History.subproj/WebBackForwardList.h
index f4d2bec..c0b730c 100644
--- a/WebKit/History.subproj/WebBackForwardList.h
+++ b/WebKit/History.subproj/WebBackForwardList.h
@@ -134,18 +134,18 @@
*/
- (WebHistoryItem *)itemAtIndex:(int)index;
- /*!
- @method setPageCacheSize:
- @abstract Sets the size of the page cache.
- @param size The number of pages to allow in the page cache.
- */
-- (void)setPageCacheSize: (unsigned)size;
-
- /*!
+/*!
+ @method setPageCacheSize:
+ @abstract Sets the size of the page cache.
+ @param size The number of pages to allow in the page cache.
+*/
+- (void)setPageCacheSize:(unsigned)size;
+
+/*!
@method pageCacheSize
- @abstract Returns the number of pages that may be cached.
- @result The number of pages that may be cached.
- */
+ @abstract Returns the number of pages that may be cached.
+ @result The number of pages that may be cached.
+*/
- (unsigned)pageCacheSize;
@end
diff --git a/WebKit/History.subproj/WebHistoryItemPrivate.h b/WebKit/History.subproj/WebHistoryItemPrivate.h
index 59a2a52..d0a92f7 100644
--- a/WebKit/History.subproj/WebHistoryItemPrivate.h
+++ b/WebKit/History.subproj/WebHistoryItemPrivate.h
@@ -11,7 +11,7 @@
- (void)_retainIconInDatabase:(BOOL)retain;
+ (void)_releaseAllPendingPageCaches;
- (BOOL)hasPageCache;
-- (void)setHasPageCache: (BOOL)f;
+- (void)setHasPageCache:(BOOL)f;
- (NSMutableDictionary *)pageCache;
+ (WebHistoryItem *)entryWithURL:(NSURL *)URL;
@@ -53,7 +53,7 @@
- (WebHistoryItem *)childItemWithName:(NSString *)name;
- (WebHistoryItem *)targetItem;
-- (void)setAlwaysAttemptToUsePageCache: (BOOL)flag;
+- (void)setAlwaysAttemptToUsePageCache:(BOOL)flag;
- (BOOL)alwaysAttemptToUsePageCache;
- (NSCalendarDate *)_lastVisitedDate;
@@ -63,7 +63,7 @@
@interface WebBackForwardList (WebPrivate)
- (void)_clearPageCache;
-- (void)_setUsesPageCache: (BOOL)f;
+- (void)_setUsesPageCache:(BOOL)f;
- (BOOL)_usesPageCache;
@end
diff --git a/WebKit/History.subproj/WebHistoryPrivate.h b/WebKit/History.subproj/WebHistoryPrivate.h
index 952c980..96e1757 100644
--- a/WebKit/History.subproj/WebHistoryPrivate.h
+++ b/WebKit/History.subproj/WebHistoryPrivate.h
@@ -20,16 +20,16 @@
NSMutableArray *_entriesByDate;
}
-- (void)addItem: (WebHistoryItem *)entry;
+- (void)addItem:(WebHistoryItem *)entry;
- (void)addItems:(NSArray *)newEntries;
-- (BOOL)removeItem: (WebHistoryItem *)entry;
-- (BOOL)removeItems: (NSArray *)entries;
+- (BOOL)removeItem:(WebHistoryItem *)entry;
+- (BOOL)removeItems:(NSArray *)entries;
- (BOOL)removeAllItems;
- (NSArray *)orderedLastVisitedDays;
-- (NSArray *)orderedItemsLastVisitedOnDay: (NSCalendarDate *)calendarDate;
-- (BOOL)containsItemForURLString: (NSString *)URLString;
-- (BOOL)containsURL: (NSURL *)URL;
+- (NSArray *)orderedItemsLastVisitedOnDay:(NSCalendarDate *)calendarDate;
+- (BOOL)containsItemForURLString:(NSString *)URLString;
+- (BOOL)containsURL:(NSURL *)URL;
- (WebHistoryItem *)itemForURL:(NSURL *)URL;
- (WebHistoryItem *)itemForURLString:(NSString *)URLString;
@@ -39,13 +39,13 @@
@end
@interface WebHistory (WebPrivate)
-- (void)removeItem: (WebHistoryItem *)entry;
-- (void)addItem: (WebHistoryItem *)entry;
+- (void)removeItem:(WebHistoryItem *)entry;
+- (void)addItem:(WebHistoryItem *)entry;
- (BOOL)loadHistory;
-- initWithFile: (NSString *)file;
-- (WebHistoryItem *)addItemForURL: (NSURL *)URL;
-- (BOOL)containsItemForURLString: (NSString *)URLString;
+- initWithFile:(NSString *)file;
+- (WebHistoryItem *)addItemForURL:(NSURL *)URL;
+- (BOOL)containsItemForURLString:(NSString *)URLString;
- (WebHistoryItem *)_itemForURLString:(NSString *)URLString;
@end
diff --git a/WebKit/History.subproj/WebURLsWithTitles.h b/WebKit/History.subproj/WebURLsWithTitles.h
index 60baf35..2ac03b9 100644
--- a/WebKit/History.subproj/WebURLsWithTitles.h
+++ b/WebKit/History.subproj/WebURLsWithTitles.h
@@ -19,16 +19,16 @@
// length than URLs, empty strings will be used for all titles. If URLs is nil, this method
// returns without doing anything. You must declare an WebURLsWithTitlesPboardType data type
// for pasteboard before invoking this method, or it will return without doing anything.
-+(void)writeURLs:(NSArray *)URLs andTitles:(NSArray *)titles toPasteboard:(NSPasteboard *)pasteboard;
++ (void)writeURLs:(NSArray *)URLs andTitles:(NSArray *)titles toPasteboard:(NSPasteboard *)pasteboard;
// Reads an array of NSURLs off the pasteboard. Returns nil if pasteboard does not contain
// data of type WebURLsWithTitlesPboardType. This array consists of the URLs that correspond to
// the titles returned from titlesFromPasteboard.
-+(NSArray *)URLsFromPasteboard:(NSPasteboard *)pasteboard;
++ (NSArray *)URLsFromPasteboard:(NSPasteboard *)pasteboard;
// Reads an array of NSStrings off the pasteboard. Returns nil if pasteboard does not contain
// data of type WebURLsWithTitlesPboardType. This array consists of the titles that correspond to
// the URLs returned from URLsFromPasteboard.
-+(NSArray *)titlesFromPasteboard:(NSPasteboard *)pasteboard;
++ (NSArray *)titlesFromPasteboard:(NSPasteboard *)pasteboard;
@end
diff --git a/WebKit/Misc.subproj/WebDatabase.h b/WebKit/Misc.subproj/WebDatabase.h
index 8d6973c..189d9e3 100644
--- a/WebKit/Misc.subproj/WebDatabase.h
+++ b/WebKit/Misc.subproj/WebDatabase.h
@@ -15,33 +15,33 @@
unsigned usage;
}
--(void)setObject:(id)object forKey:(id)key;
--(void)removeObjectForKey:(id)key;
--(void)removeAllObjects;
--(id)objectForKey:(id)key;
+- (void)setObject:(id)object forKey:(id)key;
+- (void)removeObjectForKey:(id)key;
+- (void)removeAllObjects;
+- (id)objectForKey:(id)key;
@end
@interface WebDatabase (WebDatabaseCreation)
--(id)initWithPath:(NSString *)thePath;
+- (id)initWithPath:(NSString *)thePath;
@end
@interface WebDatabase (WebDatabaseManagement)
--(void)open;
--(void)close;
--(void)sync;
+- (void)open;
+- (void)close;
+- (void)sync;
--(NSString *)path;
--(BOOL)isOpen;
+- (NSString *)path;
+- (BOOL)isOpen;
--(unsigned)count;
--(unsigned)sizeLimit;
--(void)setSizeLimit:(unsigned)limit;
--(unsigned)usage;
+- (unsigned)count;
+- (unsigned)sizeLimit;
+- (void)setSizeLimit:(unsigned)limit;
+- (unsigned)usage;
@end
diff --git a/WebKit/Misc.subproj/WebFileDatabase.h b/WebKit/Misc.subproj/WebFileDatabase.h
index 1b65e6b..bb44400 100644
--- a/WebKit/Misc.subproj/WebFileDatabase.h
+++ b/WebKit/Misc.subproj/WebFileDatabase.h
@@ -18,7 +18,7 @@
NSRecursiveLock *mutex;
}
--(void)performSetObject:(id)object forKey:(id)key;
--(void)performRemoveObjectForKey:(id)key;
+- (void)performSetObject:(id)object forKey:(id)key;
+- (void)performRemoveObjectForKey:(id)key;
@end
diff --git a/WebKit/Misc.subproj/WebIconDatabase.h b/WebKit/Misc.subproj/WebIconDatabase.h
index b7441e0..e797eac 100644
--- a/WebKit/Misc.subproj/WebIconDatabase.h
+++ b/WebKit/Misc.subproj/WebIconDatabase.h
@@ -1,8 +1,6 @@
/*
WebIconDatabase.h
Copyright 2001, 2002, Apple, Inc. All rights reserved.
-
- Public header file.
*/
#import <Cocoa/Cocoa.h>
diff --git a/WebKit/Misc.subproj/WebIconLoader.h b/WebKit/Misc.subproj/WebIconLoader.h
index d726ff7..dffae9c 100644
--- a/WebKit/Misc.subproj/WebIconLoader.h
+++ b/WebKit/Misc.subproj/WebIconLoader.h
@@ -1,8 +1,6 @@
/*
WebIconLoader.h
Copyright 2002, Apple, Inc. All rights reserved.
-
- Public header file.
*/
#import <Cocoa/Cocoa.h>
@@ -21,13 +19,13 @@
@method iconLoaderWithURL:
@param URL
*/
-+ iconLoaderWithURL:(NSURL *)URL;
++ (id)iconLoaderWithURL:(NSURL *)URL;
/*!
@method initWithURL:
@param URL
*/
-- initWithURL:(NSURL *)URL;
+- (id)initWithURL:(NSURL *)URL;
/*!
@method URL
diff --git a/WebKit/Misc.subproj/WebKitNSStringExtras.h b/WebKit/Misc.subproj/WebKitNSStringExtras.h
index 4e19359..78bf762 100644
--- a/WebKit/Misc.subproj/WebKitNSStringExtras.h
+++ b/WebKit/Misc.subproj/WebKitNSStringExtras.h
@@ -9,7 +9,7 @@
@interface NSString (WebKitExtras)
-- (void)_web_drawAtPoint:(NSPoint)point font: (NSFont *)font textColor:(NSColor *)textColor;
+- (void)_web_drawAtPoint:(NSPoint)point font:(NSFont *)font textColor:(NSColor *)textColor;
- (float)_web_widthWithFont:(NSFont *)font;
diff --git a/WebKit/Misc.subproj/WebUnicode.h b/WebKit/Misc.subproj/WebUnicode.h
index f02ed9e..6b7a89d 100644
--- a/WebKit/Misc.subproj/WebUnicode.h
+++ b/WebKit/Misc.subproj/WebUnicode.h
@@ -1,8 +1,8 @@
/*
- WebUnicode.h
- Copyright 2001, 2002, Apple Computer, Inc.
+ WebUnicode.h
+ Copyright 2001, 2002, Apple Computer, Inc.
- Private header file.
+ Private header file.
*/
#ifdef __cplusplus
extern "C" {
diff --git a/WebKit/Panels.subproj/WebPanelAuthenticationHandler.h b/WebKit/Panels.subproj/WebPanelAuthenticationHandler.h
index c887a52..1e8b99d 100644
--- a/WebKit/Panels.subproj/WebPanelAuthenticationHandler.h
+++ b/WebKit/Panels.subproj/WebPanelAuthenticationHandler.h
@@ -2,7 +2,7 @@
WebPanelAuthenticationHandler.h
Copyright 2002 Apple, Inc. All rights reserved.
- */
+*/
#import <Foundation/Foundation.h>
#import <WebFoundation/NSURLCredentialStorage.h>
diff --git a/WebKit/Plugins.subproj/WebBasePluginPackage.h b/WebKit/Plugins.subproj/WebBasePluginPackage.h
index d1b4259..3ad5043 100644
--- a/WebKit/Plugins.subproj/WebBasePluginPackage.h
+++ b/WebKit/Plugins.subproj/WebBasePluginPackage.h
@@ -33,7 +33,7 @@
}
+ (WebBasePluginPackage *)pluginWithPath:(NSString *)pluginPath;
-- initWithPath:(NSString *)pluginPath;
+- (id)initWithPath:(NSString *)pluginPath;
- (BOOL)getPluginInfoFromBundleAndMIMEDictionary:(NSDictionary *)MIMETypes;
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginStream.h b/WebKit/Plugins.subproj/WebNetscapePluginStream.h
index c1e124c..c104e1c 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginStream.h
+++ b/WebKit/Plugins.subproj/WebNetscapePluginStream.h
@@ -20,9 +20,9 @@
NSURLRequest *_startingRequest;
}
-- initWithRequest:(NSURLRequest *)theRequest
- pluginPointer:(NPP)thePluginPointer
- notifyData:(void *)theNotifyData;
+- (id)initWithRequest:(NSURLRequest *)theRequest
+ pluginPointer:(NPP)thePluginPointer
+ notifyData:(void *)theNotifyData;
- (void)start;
diff --git a/WebKit/Plugins.subproj/WebNullPluginView.h b/WebKit/Plugins.subproj/WebNullPluginView.h
index 5963a8a..bb3bf40 100644
--- a/WebKit/Plugins.subproj/WebNullPluginView.h
+++ b/WebKit/Plugins.subproj/WebNullPluginView.h
@@ -13,6 +13,6 @@
NSError *error;
}
-- initWithFrame:(NSRect)frame error:(NSError *)pluginError;
+- (id)initWithFrame:(NSRect)frame error:(NSError *)pluginError;
@end
diff --git a/WebKit/Plugins.subproj/WebPluginViewFactory.h b/WebKit/Plugins.subproj/WebPluginViewFactory.h
index 01ff6bb..74d58a6 100644
--- a/WebKit/Plugins.subproj/WebPluginViewFactory.h
+++ b/WebKit/Plugins.subproj/WebPluginViewFactory.h
@@ -57,7 +57,7 @@
@abstract Returns an NSView object that conforms to the WebPlugin protocol.
@param arguments The arguments dictionary with the mentioned keys and objects.
*/
-+ (NSView<WebPlugin> *) pluginViewWithArguments:(NSDictionary *)arguments;
++ (NSView<WebPlugin> *)pluginViewWithArguments:(NSDictionary *)arguments;
@end
diff --git a/WebKit/WebCoreSupport.subproj/WebGlyphBuffer.h b/WebKit/WebCoreSupport.subproj/WebGlyphBuffer.h
index 3abe3cf..233ca38 100644
--- a/WebKit/WebCoreSupport.subproj/WebGlyphBuffer.h
+++ b/WebKit/WebCoreSupport.subproj/WebGlyphBuffer.h
@@ -17,9 +17,9 @@
CGSize *bufferedAdvances;
CGGlyph *bufferedGlyphs;
}
-- initWithFont: (NSFont *)font color: (NSColor *)color;
-- (void)addGlyphs: (CGGlyph *)newGlyphs advances: (CGSize *)newAdvances count: (int)count at: (float)startX : (float)startY;
-- (void)drawInView: (NSView *)targetView;
+- (id)initWithFont:(NSFont *)font color:(NSColor *)color;
+- (void)addGlyphs:(CGGlyph *)newGlyphs advances:(CGSize *)newAdvances count:(int)count at:(float)startX :(float)startY;
+- (void)drawInView:(NSView *)targetView;
- (void)reset;
- (NSFont *)font;
- (NSColor *)color;
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRenderer.h b/WebKit/WebCoreSupport.subproj/WebTextRenderer.h
index 51792e2..e6bf06c 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRenderer.h
+++ b/WebKit/WebCoreSupport.subproj/WebTextRenderer.h
@@ -37,8 +37,8 @@ typedef struct UnicodeGlyphMap UnicodeGlyphMap;
+ (BOOL)shouldBufferTextDrawing;
-- initWithFont:(NSFont *)font usingPrinterFont:(BOOL)usingPrinterFont;
+- (id)initWithFont:(NSFont *)font usingPrinterFont:(BOOL)usingPrinterFont;
-- (float)_floatWidthForCharacters:(const UniChar *)characters stringLength:(unsigned)stringLength fromCharacterPosition: (int)pos numberOfCharacters: (int)len withPadding: (int)padding applyRounding: (BOOL)applyRounding attemptFontSubstitution: (BOOL)attemptSubstitution widths: (float *)widthBuffer fonts: (NSFont **)fontBuffer glyphs: (CGGlyph *)glyphBuffer numGlyphs: (int *)_numGlyphs letterSpacing: (int)ls wordSpacing: (int)ws fontFamilies: (NSString **)families;
+- (float)_floatWidthForCharacters:(const UniChar *)characters stringLength:(unsigned)stringLength fromCharacterPosition:(int)pos numberOfCharacters:(int)len withPadding:(int)padding applyRounding:(BOOL)applyRounding attemptFontSubstitution:(BOOL)attemptSubstitution widths:(float *)widthBuffer fonts:(NSFont **)fontBuffer glyphs:(CGGlyph *)glyphBuffer numGlyphs:(int *)_numGlyphs letterSpacing:(int)ls wordSpacing:(int)ws fontFamilies:(NSString **)families;
@end
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.h b/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.h
index 144d365..8cfe155 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.h
+++ b/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.h
@@ -20,7 +20,6 @@
+ (void)createSharedFactory;
+ (WebTextRendererFactory *)sharedFactory;
- (NSFont *)cachedFontFromFamily:(NSString *)family traits:(NSFontTraitMask)traits size:(float)size;
-- init;
- (WebTextRenderer *)rendererWithFont:(NSFont *)font usingPrinterFont:(BOOL)usingPrinterFont;
diff --git a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.h b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.h
index c1af140..95e58f1 100644
--- a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.h
+++ b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.h
@@ -41,8 +41,8 @@
- (void)setDataSource:(WebDataSource *)d;
- (WebDataSource *)dataSource;
-- resourceLoadDelegate;
-- downloadDelegate;
+- (id)resourceLoadDelegate;
+- (id)downloadDelegate;
- (void)cancel;
- (void)cancelWithError:(NSError *)error;
@@ -52,10 +52,10 @@
- (NSError *)cancelledError;
-- (void)setIdentifier: ident;
+- (void)setIdentifier:(id)ident;
--(void)useCredential:(NSURLCredential *)credential forAuthenticationChallenge:(WebAuthenticationChallenge *)challenge;
+- (void)useCredential:(NSURLCredential *)credential forAuthenticationChallenge:(WebAuthenticationChallenge *)challenge;
--(void)continueWithoutCredentialForAuthenticationChallenge:(WebAuthenticationChallenge *)challenge;
+- (void)continueWithoutCredentialForAuthenticationChallenge:(WebAuthenticationChallenge *)challenge;
@end
diff --git a/WebKit/WebView.subproj/WebControllerSets.h b/WebKit/WebView.subproj/WebControllerSets.h
index 59a9fe7..a1f4fe0 100644
--- a/WebKit/WebView.subproj/WebControllerSets.h
+++ b/WebKit/WebView.subproj/WebControllerSets.h
@@ -9,9 +9,9 @@
@class WebView;
@interface WebViewSets : NSObject
-+(void)addWebView:(WebView *)webView toSetNamed:(NSString *)name;
-+(void)removeWebView:(WebView *)webView fromSetNamed:(NSString *)name;
-+(NSEnumerator *)webViewsInSetNamed:(NSString *)name;
++ (void)addWebView:(WebView *)webView toSetNamed:(NSString *)name;
++ (void)removeWebView:(WebView *)webView fromSetNamed:(NSString *)name;
++ (NSEnumerator *)webViewsInSetNamed:(NSString *)name;
@end
diff --git a/WebKit/WebView.subproj/WebDataProtocol.h b/WebKit/WebView.subproj/WebDataProtocol.h
index c2b2683..2426cf0 100644
--- a/WebKit/WebView.subproj/WebDataProtocol.h
+++ b/WebKit/WebView.subproj/WebDataProtocol.h
@@ -14,11 +14,11 @@
@interface WebDataProtocol : NSURLProtocol
{
}
-+(BOOL)_webIsDataProtocolURL:(NSURL *)URL;
++ (BOOL)_webIsDataProtocolURL:(NSURL *)URL;
@end
@interface NSURLRequest (WebDataRequest)
-+ (NSURL *)_webDataRequestURLForData: (NSData *)data;
++ (NSURL *)_webDataRequestURLForData:(NSData *)data;
- (NSData *)_webDataRequestData;
- (void)_webDataRequestSetData:(NSData *)data;
- (NSString *)_webDataRequestEncoding;
@@ -28,4 +28,4 @@
- (NSURL *)_webDataRequestBaseURL;
- (void)_webDataRequestSetBaseURL:(NSURL *)baseURL;
- (NSMutableURLRequest *)_webDataRequestExternalRequest;
- at end
\ No newline at end of file
+ at end
diff --git a/WebKit/WebView.subproj/WebDataSource.h b/WebKit/WebView.subproj/WebDataSource.h
index 921bbe7..9ac4ad5 100644
--- a/WebKit/WebView.subproj/WebDataSource.h
+++ b/WebKit/WebView.subproj/WebDataSource.h
@@ -73,7 +73,7 @@
@method request
@result Returns the request that was used to create this datasource.
*/
--(NSMutableURLRequest *)request;
+- (NSMutableURLRequest *)request;
/*!
@method response
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.h b/WebKit/WebView.subproj/WebDataSourcePrivate.h
index ff768fb..4bee459 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.h
@@ -120,7 +120,7 @@
- (Class)_representationClass;
- (void)_setRepresentation:(id<WebDocumentRepresentation>)representation;
- (void)_setWebView:(WebView *)webView;
-- (void)_startLoading: (NSDictionary *)pageCache;
+- (void)_startLoading:(NSDictionary *)pageCache;
- (void)_stopLoadingInternal;
- (BOOL)_isStopping;
- (void)_recursiveStopLoading;
@@ -154,7 +154,7 @@
- (WebBridge *)_bridge;
- (BOOL)_isCommitted;
-- (void)_commitIfReady: (NSDictionary *)pageCache;
+- (void)_commitIfReady:(NSDictionary *)pageCache;
- (void)_makeRepresentation;
- (void)_receivedData:(NSData *)data;
- (void)_finishedLoading;
@@ -171,7 +171,7 @@
- (BOOL)_storedInPageCache;
- (BOOL)_loadingFromPageCache;
-- (void)_addResponse: (NSURLResponse *)r;
+- (void)_addResponse:(NSURLResponse *)r;
- (NSArray *)_responses;
- (void)_stopLoadingWithError:(NSError *)error;
diff --git a/WebKit/WebView.subproj/WebDebugDOMNode.h b/WebKit/WebView.subproj/WebDebugDOMNode.h
index 6a1d615..aad908a 100644
--- a/WebKit/WebView.subproj/WebDebugDOMNode.h
+++ b/WebKit/WebView.subproj/WebDebugDOMNode.h
@@ -16,7 +16,7 @@
NSString *source;
}
-- initWithWebFrameView:(WebFrameView *)view;
+- (id)initWithWebFrameView:(WebFrameView *)view;
- (NSArray *)children;
- (NSString *)name;
diff --git a/WebKit/WebView.subproj/WebDocument.h b/WebKit/WebView.subproj/WebDocument.h
index 3b71c92..819e269 100644
--- a/WebKit/WebView.subproj/WebDocument.h
+++ b/WebKit/WebView.subproj/WebDocument.h
@@ -21,14 +21,14 @@
@abstract Called when the corresponding data source has been created.
@param dataSource The corresponding data source.
*/
-- (void)setDataSource: (WebDataSource *)dataSource;
+- (void)setDataSource:(WebDataSource *)dataSource;
/*!
@method dataSourceUpdated:
@abstract Called when the corresponding data source has received data.
@param dataSource The corresponding data source.
*/
-- (void)dataSourceUpdated: (WebDataSource *)dataSource;
+- (void)dataSourceUpdated:(WebDataSource *)dataSource;
/*!
@method setNeedsLayout:
@@ -36,7 +36,7 @@
This method should simply set a flag and call layout from drawRect if the flag is YES.
@param flag YES to cause a layout, no to not cause a layout.
*/
-- (void)setNeedsLayout: (BOOL)flag;
+- (void)setNeedsLayout:(BOOL)flag;
/*!
@method layout
@@ -67,14 +67,15 @@
*/
@protocol WebDocumentSearching <NSObject>
/*!
- @method searchFor:direction:caseSensitive:
+ @method searchFor:direction:caseSensitive:wrap:
@abstract Searches a document view for a string and highlights the string if it is found.
@param string The string to search for.
@param forward YES to search forward, NO to seach backwards.
@param caseFlag YES to for case-sensitive search, NO for case-insensitive search.
+ @param wrapFlag YES to wrap around, NO to avoid wrapping.
@result YES if found, NO if not found.
*/
-- (BOOL)searchFor: (NSString *)string direction: (BOOL)forward caseSensitive: (BOOL)caseFlag wrap: (BOOL)wrapFlag;
+- (BOOL)searchFor:(NSString *)string direction:(BOOL)forward caseSensitive:(BOOL)caseFlag wrap:(BOOL)wrapFlag;
@end
@@ -140,7 +141,7 @@
@abstract Called soon after the document representation is created.
@param dataSource The data source that is set.
*/
-- (void)setDataSource: (WebDataSource *)dataSource;
+- (void)setDataSource:(WebDataSource *)dataSource;
/*!
@method receivedData:withDataSource:
@@ -148,7 +149,7 @@
@param data The data that the data source has received.
@param dataSource The data source that has received data.
*/
-- (void)receivedData: (NSData *)data withDataSource: (WebDataSource *)dataSource;
+- (void)receivedData:(NSData *)data withDataSource:(WebDataSource *)dataSource;
/*!
@method receivedError:withDataSource:
@@ -156,14 +157,14 @@
@param error The error that the data source has received.
@param dataSource The data source that has received the error.
*/
-- (void)receivedError: (NSError *)error withDataSource: (WebDataSource *)dataSource;
+- (void)receivedError:(NSError *)error withDataSource:(WebDataSource *)dataSource;
/*!
@method finishedLoadingWithDataSource:
@abstract Called when the data source has finished loading.
@param dataSource The datasource that has finished loading.
*/
-- (void)finishedLoadingWithDataSource: (WebDataSource *)dataSource;
+- (void)finishedLoadingWithDataSource:(WebDataSource *)dataSource;
/*!
@method canProvideDocumentSource
diff --git a/WebKit/WebView.subproj/WebFrame.h b/WebKit/WebView.subproj/WebFrame.h
index 661ae4b..f5615f9 100644
--- a/WebKit/WebView.subproj/WebFrame.h
+++ b/WebKit/WebView.subproj/WebFrame.h
@@ -34,7 +34,7 @@
@param webView The WebView that manages the frame.
@result Returns an initialized WebFrame.
*/
-- (id)initWithName: (NSString *)name webFrameView: (WebFrameView *)view webView: (WebView *)webView;
+- (id)initWithName:(NSString *)name webFrameView:(WebFrameView *)view webView:(WebView *)webView;
/*!
@method name
@@ -67,7 +67,7 @@
@param encodingName The encoding of the data.
@param URL The base URL to apply to relative URLs within the document.
*/
-- (void)loadData:(NSData *)data MIMEType:(NSString *)MIMEType textEncodingName: (NSString *)encodingName baseURL:(NSURL *)URL;
+- (void)loadData:(NSData *)data MIMEType:(NSString *)MIMEType textEncodingName:(NSString *)encodingName baseURL:(NSURL *)URL;
/*!
@method loadHTMLString:baseURL:
diff --git a/WebKit/WebView.subproj/WebFramePrivate.h b/WebKit/WebView.subproj/WebFramePrivate.h
index a217d65..a958e92 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.h
+++ b/WebKit/WebView.subproj/WebFramePrivate.h
@@ -94,7 +94,7 @@ typedef enum {
- (WebFrameLoadType)loadType;
- (void)setLoadType:(WebFrameLoadType)loadType;
-- (void)setProvisionalItem: (WebHistoryItem *)item;
+- (void)setProvisionalItem:(WebHistoryItem *)item;
- (WebHistoryItem *)provisionalItem;
- (void)setPreviousItem:(WebHistoryItem *)item;
- (WebHistoryItem *)previousItem;
@@ -104,26 +104,26 @@ typedef enum {
@end
@interface WebFrame (WebPrivate)
-- (void)_setWebView: (WebView *)webView;
+- (void)_setWebView:(WebView *)webView;
- (void)_setName:(NSString *)name;
- (WebFrame *)_descendantFrameNamed:(NSString *)name;
- (void)_detachFromParent;
- (void)_closeOldDataSources;
-- (void)_setDataSource: (WebDataSource *)d;
-- (void)_transitionToCommitted: (NSDictionary *)pageCache;
+- (void)_setDataSource:(WebDataSource *)d;
+- (void)_transitionToCommitted:(NSDictionary *)pageCache;
- (void)_transitionToLayoutAcceptable;
- (WebFrameState)_state;
-- (void)_setState: (WebFrameState)newState;
-+ (void)_recursiveCheckCompleteFromFrame: (WebFrame *)fromFrame;
+- (void)_setState:(WebFrameState)newState;
++ (void)_recursiveCheckCompleteFromFrame:(WebFrame *)fromFrame;
- (void)_isLoadComplete;
- (void)_checkLoadComplete;
-- (void)_timedLayout: userInfo;
+- (void)_timedLayout:userInfo;
- (WebBridge *)_bridge;
- (void)_clearProvisionalDataSource;
-- (void)_setLoadType: (WebFrameLoadType)loadType;
+- (void)_setLoadType:(WebFrameLoadType)loadType;
- (WebFrameLoadType)_loadType;
-- (void)_addExtraFieldsToRequest:(NSMutableURLRequest *)request alwaysFromRequest: (BOOL)f;
+- (void)_addExtraFieldsToRequest:(NSMutableURLRequest *)request alwaysFromRequest:(BOOL)f;
- (void)_checkNewWindowPolicyForRequest:(NSURLRequest *)request action:(NSDictionary *)action frameName:(NSString *)frameName formState:(WebFormState *)formState andCall:(id)target withSelector:(SEL)selector;
@@ -131,7 +131,7 @@ typedef enum {
- (void)_invalidatePendingPolicyDecisionCallingDefaultAction:(BOOL)call;
-- (void)_goToItem: (WebHistoryItem *)item withLoadType: (WebFrameLoadType)type;
+- (void)_goToItem:(WebHistoryItem *)item withLoadType:(WebFrameLoadType)type;
- (void)_loadURL:(NSURL *)URL referrer:(NSString *)referrer loadType:(WebFrameLoadType)loadType target:(NSString *)target triggeringEvent:(NSEvent *)event form:(id <WebDOMElement>)form formValues:(NSDictionary *)values;
- (void)_loadURL:(NSURL *)URL intoChild:(WebFrame *)childFrame;
- (void)_postWithURL:(NSURL *)URL referrer:(NSString *)referrer target:(NSString *)target data:(NSData *)data contentType:(NSString *)contentType triggeringEvent:(NSEvent *)event form:(id <WebDOMElement>)form formValues:(NSDictionary *)values;
@@ -167,7 +167,7 @@ typedef enum {
- (void)_setJustOpenedForTargetedLink:(BOOL)justOpened;
-- (void)_setProvisionalDataSource: (WebDataSource *)d;
+- (void)_setProvisionalDataSource:(WebDataSource *)d;
+ (CFAbsoluteTime)_timeOfLastCompletedLoad;
- (BOOL)_canCachePage;
diff --git a/WebKit/WebView.subproj/WebFrameView.h b/WebKit/WebView.subproj/WebFrameView.h
index a513a20..cbed183 100644
--- a/WebKit/WebView.subproj/WebFrameView.h
+++ b/WebKit/WebView.subproj/WebFrameView.h
@@ -41,7 +41,7 @@
@abstract Sets whether the WebFrameView allows its document to be scrolled
@param flag YES to allow the document to be scrolled, NO to disallow scrolling
*/
-- (void)setAllowsScrolling: (BOOL)flag;
+- (void)setAllowsScrolling:(BOOL)flag;
/*!
@method allowsScrolling
diff --git a/WebKit/WebView.subproj/WebHTMLRepresentation.h b/WebKit/WebView.subproj/WebHTMLRepresentation.h
index b225f75..2a5e6f7 100644
--- a/WebKit/WebView.subproj/WebHTMLRepresentation.h
+++ b/WebKit/WebView.subproj/WebHTMLRepresentation.h
@@ -1,8 +1,6 @@
/*
WebHTMLRepresentation.h
Copyright 2002, Apple, Inc. All rights reserved.
-
- Public header file.
*/
#import <Foundation/Foundation.h>
@@ -38,7 +36,7 @@
@param end The node that includes the ending selection point.
@param endOffset The character offset into the text of the ending node.
*/
-- (void)setSelectionFrom:(id<WebDOMNode>)start startOffset:(int)startOffset to:(id<WebDOMNode>)end endOffset:(int) endOffset;
+- (void)setSelectionFrom:(id<WebDOMNode>)start startOffset:(int)startOffset to:(id<WebDOMNode>)end endOffset:(int)endOffset;
//- (NSAttributedString *)selectedAttributedString;
@@ -49,7 +47,7 @@
- (NSString *)reconstructedDocumentSource;
-- (NSAttributedString *)attributedStringFrom: (id<WebDOMNode>)startNode startOffset: (int)startOffset to: (id<WebDOMNode>)endNode endOffset: (int)endOffset;
+- (NSAttributedString *)attributedStringFrom:(id<WebDOMNode>)startNode startOffset:(int)startOffset to:(id<WebDOMNode>)endNode endOffset:(int)endOffset;
- (id <WebDOMElement>)elementWithName:(NSString *)name inForm:(id <WebDOMElement>)form;
- (id <WebDOMElement>)elementForView:(NSView *)view;
diff --git a/WebKit/WebView.subproj/WebHTMLView.h b/WebKit/WebView.subproj/WebHTMLView.h
index 529865e..cfcd646 100644
--- a/WebKit/WebView.subproj/WebHTMLView.h
+++ b/WebKit/WebView.subproj/WebHTMLView.h
@@ -1,8 +1,6 @@
/*
WebHTMLView.h
Copyright 2002, Apple, Inc. All rights reserved.
-
- Public header file.
*/
#import <Cocoa/Cocoa.h>
@@ -27,7 +25,7 @@
@abstract Sets flag to cause reapplication of style information.
@param flag YES to apply style information, NO to not apply style information.
*/
-- (void)setNeedsToApplyStyles: (BOOL)flag;
+- (void)setNeedsToApplyStyles:(BOOL)flag;
/*!
@method reapplyStyles
diff --git a/WebKit/WebView.subproj/WebLoader.h b/WebKit/WebView.subproj/WebLoader.h
index c1af140..95e58f1 100644
--- a/WebKit/WebView.subproj/WebLoader.h
+++ b/WebKit/WebView.subproj/WebLoader.h
@@ -41,8 +41,8 @@
- (void)setDataSource:(WebDataSource *)d;
- (WebDataSource *)dataSource;
-- resourceLoadDelegate;
-- downloadDelegate;
+- (id)resourceLoadDelegate;
+- (id)downloadDelegate;
- (void)cancel;
- (void)cancelWithError:(NSError *)error;
@@ -52,10 +52,10 @@
- (NSError *)cancelledError;
-- (void)setIdentifier: ident;
+- (void)setIdentifier:(id)ident;
--(void)useCredential:(NSURLCredential *)credential forAuthenticationChallenge:(WebAuthenticationChallenge *)challenge;
+- (void)useCredential:(NSURLCredential *)credential forAuthenticationChallenge:(WebAuthenticationChallenge *)challenge;
--(void)continueWithoutCredentialForAuthenticationChallenge:(WebAuthenticationChallenge *)challenge;
+- (void)continueWithoutCredentialForAuthenticationChallenge:(WebAuthenticationChallenge *)challenge;
@end
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.h b/WebKit/WebView.subproj/WebMainResourceClient.h
index 6a27872..bee0ecf 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.h
+++ b/WebKit/WebView.subproj/WebMainResourceClient.h
@@ -23,6 +23,6 @@
NSURLConnectionDelegateProxy *proxy;
}
-- initWithDataSource:(WebDataSource *)dataSource;
+- (id)initWithDataSource:(WebDataSource *)dataSource;
@end
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.h b/WebKit/WebView.subproj/WebMainResourceLoader.h
index 6a27872..bee0ecf 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.h
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.h
@@ -23,6 +23,6 @@
NSURLConnectionDelegateProxy *proxy;
}
-- initWithDataSource:(WebDataSource *)dataSource;
+- (id)initWithDataSource:(WebDataSource *)dataSource;
@end
diff --git a/WebKit/WebView.subproj/WebPolicyDelegate.h b/WebKit/WebView.subproj/WebPolicyDelegate.h
index d7ffc24..d8f7cd0 100644
--- a/WebKit/WebView.subproj/WebPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebPolicyDelegate.h
@@ -69,7 +69,7 @@ extern NSString *WebActionOriginalURLKey; // NSURL
result of frame targetting, then it will be created once you call
this method.
*/
--(void)use;
+- (void)use;
/*!
@method download
@abstract Download the resource instead of displaying it.
@@ -78,7 +78,7 @@ extern NSString *WebActionOriginalURLKey; // NSURL
based on content type, without having to stop and restart the
load.
*/
--(void)download;
+- (void)download;
/*!
@method ignore
@@ -89,7 +89,7 @@ extern NSString *WebActionOriginalURLKey; // NSURL
opening a new window behind the current one, opening the URL in an
external app, revealing the location in Finder if a file URL, etc.
*/
--(void)ignore;
+- (void)ignore;
@end
@@ -118,7 +118,7 @@ extern NSString *WebActionOriginalURLKey; // NSURL
@interface NSObject (WebPolicyDelegate)
/*!
- @method decidePolicyForNavigationAction:request:frame:decisionListener:
+ @method webView:decidePolicyForNavigationAction:request:frame:decisionListener:
@abstract This method is called to decide what to do with a proposed navigation.
@param actionInformation Dictionary that describes the action that triggered this navigation.
@param request The request for the proposed navigation
@@ -133,7 +133,7 @@ extern NSString *WebActionOriginalURLKey; // NSURL
decisionListener:(id<WebPolicyDecisionListener>)listener;
/*!
- @method decidePolicyForNewWindowAction:request:newFrameName:decisionListener:
+ @method webView:decidePolicyForNewWindowAction:request:newFrameName:decisionListener:
@discussion This method is called to decide what to do with an targetted nagivation that would open a new window.
@param actionInformation Dictionary that describes the action that triggered this navigation.
@param request The request for the proposed navigation
@@ -154,7 +154,7 @@ extern NSString *WebActionOriginalURLKey; // NSURL
decisionListener:(id<WebPolicyDecisionListener>)listener;
/*!
- @method decidePolicyForMIMEType:request:frame:
+ @method webView:decidePolicyForMIMEType:request:frame:
@discussion Returns the policy for content which has been partially loaded.
Sent after webView:didStartProvisionalLoadForFrame: is sent on the WebFrameLoadDelegate.
@param type MIME type for the resource.
@@ -168,7 +168,7 @@ extern NSString *WebActionOriginalURLKey; // NSURL
decisionListener:(id<WebPolicyDecisionListener>)listener;
/*!
- @method unableToImplementPolicy:error:forURL:inFrame:
+ @method webView:unableToImplementPolicy:error:forURL:inFrame:
@discussion Called when a WebPolicy could not be implemented. It is up to the client to display appropriate feedback.
@param policy The policy that could not be implemented.
@param error The error that caused the policy to not be implemented.
diff --git a/WebKit/WebView.subproj/WebPolicyDelegatePrivate.h b/WebKit/WebView.subproj/WebPolicyDelegatePrivate.h
index 475ad7c..dcea75e 100644
--- a/WebKit/WebView.subproj/WebPolicyDelegatePrivate.h
+++ b/WebKit/WebView.subproj/WebPolicyDelegatePrivate.h
@@ -22,8 +22,8 @@ typedef enum {
WebPolicyDecisionListenerPrivate *_private;
}
--(id)_initWithTarget:(id)target action:(SEL)action;
+- (id)_initWithTarget:(id)target action:(SEL)action;
--(void)_invalidate;
+- (void)_invalidate;
@end
diff --git a/WebKit/WebView.subproj/WebPreferencesPrivate.h b/WebKit/WebView.subproj/WebPreferencesPrivate.h
index dbc459f..4b8f1d8 100644
--- a/WebKit/WebView.subproj/WebPreferencesPrivate.h
+++ b/WebKit/WebView.subproj/WebPreferencesPrivate.h
@@ -1,8 +1,6 @@
/*
- WebPreferences.h
+ WebPreferencesPrivate.h
Copyright 2001, Apple, Inc. All rights reserved.
-
- Public header file.
*/
#import <WebKit/WebPreferences.h>
diff --git a/WebKit/WebView.subproj/WebRenderNode.h b/WebKit/WebView.subproj/WebRenderNode.h
index fe1d4ef..360dfd0 100644
--- a/WebKit/WebView.subproj/WebRenderNode.h
+++ b/WebKit/WebView.subproj/WebRenderNode.h
@@ -18,7 +18,7 @@
NSPoint absolutePosition;
}
-- initWithWebFrameView:(WebFrameView *)view;
+- (id)initWithWebFrameView:(WebFrameView *)view;
- (NSArray *)children;
diff --git a/WebKit/WebView.subproj/WebResourceLoadDelegate.h b/WebKit/WebView.subproj/WebResourceLoadDelegate.h
index 53e2a71..14800c3 100644
--- a/WebKit/WebView.subproj/WebResourceLoadDelegate.h
+++ b/WebKit/WebView.subproj/WebResourceLoadDelegate.h
@@ -24,7 +24,7 @@
@interface NSObject (WebResourceLoadDelegate)
/*!
- @method identifierForInitialRequest:fromDataSource:
+ @method webView:identifierForInitialRequest:fromDataSource:
@param webView The WebView sending the message.
@param request The request about to be sent.
@param dataSource The datasource that initiated the load.
@@ -36,7 +36,7 @@
@result An identifier that will be passed back to the implementor for each callback.
The identifier will be retained.
*/
-- webView:(WebView *)sender identifierForInitialRequest: (NSURLRequest *)request fromDataSource: (WebDataSource *)dataSource;
+- (id)webView:(WebView *)sender identifierForInitialRequest:(NSURLRequest *)request fromDataSource:(WebDataSource *)dataSource;
/*!
@method resource:willSendRequest:redirectResponse:fromDataSource:
@@ -52,7 +52,7 @@
@result Returns the request, which may be mutated by the implementor, although typically
will be request.
*/
--(NSURLRequest *)webView:(WebView *)sender resource:identifier willSendRequest: (NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse fromDataSource:(WebDataSource *)dataSource;
+- (NSURLRequest *)webView:(WebView *)sender resource:identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse fromDataSource:(WebDataSource *)dataSource;
/*!
@method webView:resource:didReceiveAuthenticationChallenge:fromDataSource:
@@ -73,7 +73,7 @@
- (void)webView:(WebView *)sender resource:(id)identifier didCancelAuthenticationChallenge:(WebAuthenticationChallenge *)challenge fromDataSource:(WebDataSource *)dataSource;
/*!
- @method resource:didReceiveResponse:fromDataSource:
+ @method webView:resource:didReceiveResponse:fromDataSource:
@abstract This message is sent after a response has been received for this load.
@param webView The WebView sending the message.
@param identifier An identifier that can be used to track the progress of a resource load across
@@ -85,10 +85,10 @@
should assume that each new response resets progress so far for the resource back to 0,
and should check the new response for the expected content length.
*/
--(void)webView:(WebView *)sender resource:identifier didReceiveResponse: (NSURLResponse *)response fromDataSource:(WebDataSource *)dataSource;
+- (void)webView:(WebView *)sender resource:(id)identifier didReceiveResponse:(NSURLResponse *)response fromDataSource:(WebDataSource *)dataSource;
/*!
- @method resource:didReceiveContentLength:fromDataSource:
+ @method webView:resource:didReceiveContentLength:fromDataSource:
@discussion Multiple of these messages may be sent as data arrives.
@param webView The WebView sending the message.
@param identifier An identifier that can be used to track the progress of a resource load across
@@ -96,20 +96,20 @@
@param length The amount of new data received. This is not the total amount, just the new amount received.
@param dataSource The dataSource that initiated the load.
*/
--(void)webView:(WebView *)sender resource:identifier didReceiveContentLength: (unsigned)length fromDataSource:(WebDataSource *)dataSource;
+- (void)webView:(WebView *)sender resource:(id)identifier didReceiveContentLength: (unsigned)length fromDataSource:(WebDataSource *)dataSource;
/*!
- @method resource:didFinishLoadingFromDataSource:
+ @method webView:resource:didFinishLoadingFromDataSource:
@discussion This message is sent after a load has successfully completed.
@param webView The WebView sending the message.
@param identifier An identifier that can be used to track the progress of a resource load across
multiple call backs.
@param dataSource The dataSource that initiated the load.
*/
--(void)webView:(WebView *)sender resource:identifier didFinishLoadingFromDataSource:(WebDataSource *)dataSource;
+- (void)webView:(WebView *)sender resource:(id)identifier didFinishLoadingFromDataSource:(WebDataSource *)dataSource;
/*!
- @method resource:didFailLoadingWithError:fromDataSource:
+ @method webView:resource:didFailLoadingWithError:fromDataSource:
@discussion This message is sent after a load has failed to load due to an error.
@param webView The WebView sending the message.
@param identifier An identifier that can be used to track the progress of a resource load across
@@ -117,10 +117,10 @@
@param error The error associated with this load.
@param dataSource The dataSource that initiated the load.
*/
--(void)webView:(WebView *)sender resource:identifier didFailLoadingWithError:(NSError *)error fromDataSource:(WebDataSource *)dataSource;
+- (void)webView:(WebView *)sender resource:(id)identifier didFailLoadingWithError:(NSError *)error fromDataSource:(WebDataSource *)dataSource;
/*!
- @method pluginFailedWithError:dataSource:
+ @method webView: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. In the userInfo dictionary of the error, the object for the
diff --git a/WebKit/WebView.subproj/WebUIDelegate.h b/WebKit/WebView.subproj/WebUIDelegate.h
index 9fc29d2..f8227a4 100644
--- a/WebKit/WebView.subproj/WebUIDelegate.h
+++ b/WebKit/WebView.subproj/WebUIDelegate.h
@@ -9,11 +9,11 @@
#import <WebFoundation/NSURLRequest.h>
/*!
- at enum WebMenuItemTag
- @discussion Each menu item in the default menu items array passed in
- contextMenuItemsForElement:defaultMenuItems: has its tag set to one of the WebMenuItemTags.
- When iterating through the default menu items array, use the tag to differentiate between them.
- */
+ @enum WebMenuItemTag
+ @discussion Each menu item in the default menu items array passed in
+ contextMenuItemsForElement:defaultMenuItems: has its tag set to one of the WebMenuItemTags.
+ When iterating through the default menu items array, use the tag to differentiate between them.
+*/
enum {
WebMenuItemTagOpenLinkInNewWindow=1,
@@ -132,8 +132,7 @@ enum {
hierarchy, it may be desirable to save the first responder
elsewhere, or possibly ignore this call.
*/
-- (void)webView: (WebView *)sender makeFirstResponder:(NSResponder *)responder;
-
+- (void)webView:(WebView *)sender makeFirstResponder:(NSResponder *)responder;
/*!
@method webView:setStatusText:
@@ -141,10 +140,10 @@ enum {
@param sender The WebView sending the delegate method.
@param text The status text to set
*/
-- (void)webView: (WebView *)sender setStatusText:(NSString *)text;
+- (void)webView:(WebView *)sender setStatusText:(NSString *)text;
/*!
- @method statusText
+ @method webViewStatusText
@abstract Get the currently displayed status text.
@param sender The WebView sending the delegate method.
@result The status text
@@ -162,7 +161,7 @@ enum {
this method if at least one is on.
@result YES if at least one toolbar is visible, otherwise NO.
*/
-- (BOOL)webViewAreToolbarsVisible: (WebView *)sender;
+- (BOOL)webViewAreToolbarsVisible:(WebView *)sender;
/*!
@method webView:setToolbarsVisible:
@@ -226,7 +225,7 @@ enum {
- (void)webView:(WebView *)sender setFrame:(NSRect)frame;
/*!
- @method webViewFrame
+ @method webViewFrame:
@param sender The WebView sending the delegate method.
@abstract REturn the window's frame rect
@discussion
@@ -317,5 +316,4 @@ enum {
*/
- (NSArray *)webView:(WebView *)sender contextMenuItemsForElement:(NSDictionary *)element defaultMenuItems:(NSArray *)defaultMenuItems;
-
@end
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index 80a80a7..f1ec978 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -99,14 +99,14 @@ extern NSString *WebElementLinkLabelKey; // NSString of the text within the anch
@param groupName The name of the webView set to which this webView will be added. May be nil.
@result Returns an initialized WebView.
*/
-- initWithFrame: (NSRect)frame frameName: (NSString *)frameName groupName: (NSString *)groupName;
+- (id)initWithFrame:(NSRect)frame frameName:(NSString *)frameName groupName:(NSString *)groupName;
/*!
@method setUIDelegate:
@abstract Set the WebView's WebUIDelegate.
@param delegate The WebUIDelegate to set as the delegate.
*/
-- (void)setUIDelegate: (id)delegate;
+- (void)setUIDelegate:(id)delegate;
/*!
@method UIDelegate
@@ -120,7 +120,7 @@ extern NSString *WebElementLinkLabelKey; // NSString of the text within the anch
@abstract Set the WebView's WebResourceLoadDelegate load delegate.
@param delegate The WebResourceLoadDelegate to set as the load delegate.
*/
-- (void)setResourceLoadDelegate: (id)delegate;
+- (void)setResourceLoadDelegate:(id)delegate;
/*!
@method resourceLoadDelegate
@@ -134,7 +134,7 @@ extern NSString *WebElementLinkLabelKey; // NSString of the text within the anch
@discussion The download delegate is retained by WebDownload when any downloads are in progress.
@param delegate The WebDownloadDelegate to set as the download delegate.
*/
-- (void)setDownloadDelegate: (id)delegate;
+- (void)setDownloadDelegate:(id)delegate;
/*!
@method downloadDelegate
@@ -148,7 +148,7 @@ extern NSString *WebElementLinkLabelKey; // NSString of the text within the anch
@abstract Set the WebView's WebFrameLoadDelegate delegate.
@param delegate The WebFrameLoadDelegate to set as the delegate.
*/
-- (void)setFrameLoadDelegate: (id)delegate;
+- (void)setFrameLoadDelegate:(id)delegate;
/*!
@method frameLoadDelegate
@@ -162,7 +162,7 @@ extern NSString *WebElementLinkLabelKey; // NSString of the text within the anch
@abstract Set the WebView's WebPolicyDelegate delegate.
@param delegate The WebPolicyDelegate to set as the delegate.
*/
-- (void)setPolicyDelegate: (id)delegate;
+- (void)setPolicyDelegate:(id)delegate;
/*!
@method policyDelegate
@@ -187,11 +187,11 @@ extern NSString *WebElementLinkLabelKey; // NSString of the text within the anch
- (WebBackForwardList *)backForwardList;
/*!
- @method setUseBackForwardList:
+ @method setMaintainsBackForwardList:
@abstract Enable or disable the use of a backforward list for this webView.
@param flag Turns use of the back forward list on or off
*/
-- (void)setMaintainsBackForwardList: (BOOL)flag;
+- (void)setMaintainsBackForwardList:(BOOL)flag;
/*!
@method goBack
@@ -353,7 +353,7 @@ extern NSString *WebElementLinkLabelKey; // NSString of the text within the anch
@param representationClass The WebDocumentRepresentation class to use to represent data of the given MIME type.
@param MIMEType The MIME type to represent with an object of the given class.
*/
-+ (void)registerViewClass:(Class)viewClass representationClass: (Class)representationClass forMIMEType:(NSString *)MIMEType;
++ (void)registerViewClass:(Class)viewClass representationClass:(Class)representationClass forMIMEType:(NSString *)MIMEType;
@end
diff --git a/WebKit/WebView.subproj/WebViewPrivate.h b/WebKit/WebView.subproj/WebViewPrivate.h
index 3f91ccb..e879ff0 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.h
+++ b/WebKit/WebView.subproj/WebViewPrivate.h
@@ -144,21 +144,21 @@ Could be worth adding to the API.
*/
- (void)_loadBackForwardListFromOtherView:(WebView *)otherView;
-- (void)_goToItem: (WebHistoryItem *)item withLoadType: (WebFrameLoadType)type;
+- (void)_goToItem:(WebHistoryItem *)item withLoadType:(WebFrameLoadType)type;
// May well become public
-- (void)_setFormDelegate: (id<WebFormDelegate>)delegate;
+- (void)_setFormDelegate:(id<WebFormDelegate>)delegate;
- (id<WebFormDelegate>)_formDelegate;
- (WebCoreSettings *)_settings;
-- (void)_updateWebCoreSettingsFromPreferences: (WebPreferences *)prefs;
+- (void)_updateWebCoreSettingsFromPreferences:(WebPreferences *)prefs;
-- _frameLoadDelegateForwarder;
-- _resourceLoadDelegateForwarder;
+- (id)_frameLoadDelegateForwarder;
+- (id)_resourceLoadDelegateForwarder;
- (void)_cacheResourceLoadDelegateImplementations;
- (WebResourceDelegateImplementationCache)_resourceLoadDelegateImplementations;
-- _policyDelegateForwarder;
-- _UIDelegateForwarder;
+- (id)_policyDelegateForwarder;
+- (id)_UIDelegateForwarder;
- (void)_closeWindow;
@@ -173,7 +173,7 @@ Could be worth adding to the API.
id defaultTarget;
Class templateClass;
}
-- initWithTarget: t defaultTarget: dt templateClass: (Class)aClass;
-+ safeForwarderWithTarget: t defaultTarget: dt templateClass: (Class)aClass;
+- (id)initWithTarget:(id)t defaultTarget:(id)dt templateClass:(Class)aClass;
++ (id)safeForwarderWithTarget:(id)t defaultTarget:(id)dt templateClass:(Class)aClass;
@end
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list