[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
rjw
rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:40:07 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 7c3a184d314788f523396d2a26366c6698cbf951
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Sep 18 23:58:38 2002 +0000
Added documentation keywords to header.
Create seperate files for the protocols
that were defined in WebController.h.
Made -[WebController createFrameNamed:for:inParent:allowsScrolling:]):
private.
* Plugins.subproj/WebPluginView.m:
* WebCoreSupport.subproj/WebBridge.m:
* WebKit.pbproj/project.pbxproj:
* WebView.subproj/WebContextMenuHandler.h: Added.
* WebView.subproj/WebController.h:
* WebView.subproj/WebController.m:
* WebView.subproj/WebControllerPrivate.h:
* WebView.subproj/WebControllerPrivate.m:
* WebView.subproj/WebDefaultContextMenuHandler.m:
* WebView.subproj/WebFrame.m:
* WebView.subproj/WebHTMLView.m:
* WebView.subproj/WebHTMLViewPrivate.m:
* WebView.subproj/WebMainResourceClient.m:
* WebView.subproj/WebResourceProgressHandler.h: Added.
* WebView.subproj/WebView.m:
* WebView.subproj/WebWindowContext.h: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2092 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ba44697..7478c4c 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,28 @@
+2002-09-18 Richard Williamson <rjw at apple.com>
+
+ Added documentation keywords to header.
+ Create seperate files for the protocols
+ that were defined in WebController.h.
+ Made -[WebController createFrameNamed:for:inParent:allowsScrolling:]):
+ private.
+
+ * Plugins.subproj/WebPluginView.m:
+ * WebCoreSupport.subproj/WebBridge.m:
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/WebContextMenuHandler.h: Added.
+ * WebView.subproj/WebController.h:
+ * WebView.subproj/WebController.m:
+ * WebView.subproj/WebControllerPrivate.h:
+ * WebView.subproj/WebControllerPrivate.m:
+ * WebView.subproj/WebDefaultContextMenuHandler.m:
+ * WebView.subproj/WebFrame.m:
+ * WebView.subproj/WebHTMLView.m:
+ * WebView.subproj/WebHTMLViewPrivate.m:
+ * WebView.subproj/WebMainResourceClient.m:
+ * WebView.subproj/WebResourceProgressHandler.h: Added.
+ * WebView.subproj/WebView.m:
+ * WebView.subproj/WebWindowContext.h: Added.
+
2002-09-18 Richard Williamson <rjw at apple.com>
Added documentation keywords to header.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index ba44697..7478c4c 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,28 @@
+2002-09-18 Richard Williamson <rjw at apple.com>
+
+ Added documentation keywords to header.
+ Create seperate files for the protocols
+ that were defined in WebController.h.
+ Made -[WebController createFrameNamed:for:inParent:allowsScrolling:]):
+ private.
+
+ * Plugins.subproj/WebPluginView.m:
+ * WebCoreSupport.subproj/WebBridge.m:
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/WebContextMenuHandler.h: Added.
+ * WebView.subproj/WebController.h:
+ * WebView.subproj/WebController.m:
+ * WebView.subproj/WebControllerPrivate.h:
+ * WebView.subproj/WebControllerPrivate.m:
+ * WebView.subproj/WebDefaultContextMenuHandler.m:
+ * WebView.subproj/WebFrame.m:
+ * WebView.subproj/WebHTMLView.m:
+ * WebView.subproj/WebHTMLViewPrivate.m:
+ * WebView.subproj/WebMainResourceClient.m:
+ * WebView.subproj/WebResourceProgressHandler.h: Added.
+ * WebView.subproj/WebView.m:
+ * WebView.subproj/WebWindowContext.h: Added.
+
2002-09-18 Richard Williamson <rjw at apple.com>
Added documentation keywords to header.
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index eac8621..bf3070f 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -1,24 +1,25 @@
/*
- WebPluginView.mm
+ WebPluginView.mm
Copyright 2002, Apple, Inc. All rights reserved.
*/
#define USE_CARBON 1
-#import <WebKit/WebPluginView.h>
#import <WebKit/WebController.h>
#import <WebKit/WebControllerPrivate.h>
+#import <WebKit/WebDataSource.h>
#import <WebKit/WebFrame.h>
#import <WebKit/WebFramePrivate.h>
-#import <WebKit/WebDataSource.h>
-#import <WebKit/WebView.h>
+#import <WebKit/WebKitLogging.h>
+#import <WebKit/WebNullPluginView.h>
+#import <WebKit/WebNSViewExtras.h>
#import <WebKit/WebPluginDatabase.h>
#import <WebKit/WebPluginStream.h>
#import <WebKit/WebPluginNullEventSender.h>
-#import <WebKit/WebNullPluginView.h>
+#import <WebKit/WebPluginView.h>
#import <WebKit/WebPlugin.h>
-#import <WebKit/WebNSViewExtras.h>
-#import <WebKit/WebKitLogging.h>
+#import <WebKit/WebView.h>
+#import <WebKit/WebWindowContext.h>
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebError.h>
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 7fc1a85..41f2956 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -16,6 +16,7 @@
#import <WebKit/WebLoadProgress.h>
#import <WebKit/WebSubresourceClient.h>
#import <WebKit/WebViewPrivate.h>
+#import <WebKit/WebWindowContext.h>
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebError.h>
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 5af8bc9..7fbd658 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -72,6 +72,7 @@
F58C8A07025BD3BC018635CA,
F531DDFF02F0C36F018635CA,
);
+ hasScannedForEncodings = 1;
isa = PBXProject;
knownRegions = (
English,
@@ -271,6 +272,9 @@
931A72D303265920008635CE,
93AEB17F032C1735008635CE,
6523FAD1032DA06B005EFCFF,
+ 5130FC36033940B400CA2ACD,
+ 5130FC380339411F00CA2ACD,
+ 5130FC3A033946E600CA2ACD,
);
isa = PBXHeadersBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -1097,6 +1101,58 @@
//392
//393
//394
+//510
+//511
+//512
+//513
+//514
+ 5130FC35033940B400CA2ACD = {
+ fileEncoding = 4;
+ isa = PBXFileReference;
+ path = WebWindowContext.h;
+ refType = 4;
+ };
+ 5130FC36033940B400CA2ACD = {
+ fileRef = 5130FC35033940B400CA2ACD;
+ isa = PBXBuildFile;
+ settings = {
+ ATTRIBUTES = (
+ Public,
+ );
+ };
+ };
+ 5130FC370339411F00CA2ACD = {
+ fileEncoding = 4;
+ isa = PBXFileReference;
+ path = WebResourceProgressHandler.h;
+ refType = 4;
+ };
+ 5130FC380339411F00CA2ACD = {
+ fileRef = 5130FC370339411F00CA2ACD;
+ isa = PBXBuildFile;
+ settings = {
+ ATTRIBUTES = (
+ Public,
+ );
+ };
+ };
+ 5130FC39033946E600CA2ACD = {
+ fileEncoding = 4;
+ isa = PBXFileReference;
+ path = WebContextMenuHandler.h;
+ refType = 4;
+ };
+ 5130FC3A033946E600CA2ACD = {
+ fileRef = 5130FC39033946E600CA2ACD;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+//510
+//511
+//512
+//513
+//514
//650
//651
//652
@@ -1226,6 +1282,9 @@
354F25FF02EF441D0ACA2ACA,
6523FACF032DA06B005EFCFF,
6523FAD0032DA06B005EFCFF,
+ 5130FC35033940B400CA2ACD,
+ 5130FC370339411F00CA2ACD,
+ 5130FC39033946E600CA2ACD,
);
isa = PBXGroup;
name = WebView;
diff --git a/WebKit/WebView.subproj/WebContextMenuDelegate.h b/WebKit/WebView.subproj/WebContextMenuDelegate.h
new file mode 100644
index 0000000..bcb7e26
--- /dev/null
+++ b/WebKit/WebView.subproj/WebContextMenuDelegate.h
@@ -0,0 +1,35 @@
+/*
+ WebContextMenuHandler.h
+ Copyright 2001, 2002, Apple Computer, Inc.
+
+ Public header file.
+*/
+
+// These strings are keys into the element dictionary provided in
+// contextMenuItemsForElement.
+extern NSString *WebContextMenuElementLinkURLKey;
+extern NSString *WebContextMenuElementLinkLabelKey;
+extern NSString *WebContextMenuElementImageURLKey;
+extern NSString *WebContextMenuElementStringKey;
+extern NSString *WebContextMenuElementImageKey;
+extern NSString *WebContextMenuElementFrameKey;
+
+/*!
+ @protcol WebContextMenuHandler
+ @discussion WebContextMenuHandler determine what context menu items are visible over
+ a clicked element.
+*/
+
+ at protocol WebContextMenuHandler <NSObject>
+
+/*!
+ @method contextMenuItemsForElement:defaultMenuItems:
+ @discussion Returns the array of NSMenuItems that will be displayed in the context menu
+ for the dictionary representation of the clicked element.
+*/
+- (NSArray *)contextMenuItemsForElement: (NSDictionary *)element defaultMenuItems: (NSArray *)menuItems;
+
+ at end
+
+
+
diff --git a/WebKit/WebView.subproj/WebContextMenuHandler.h b/WebKit/WebView.subproj/WebContextMenuHandler.h
new file mode 100644
index 0000000..bcb7e26
--- /dev/null
+++ b/WebKit/WebView.subproj/WebContextMenuHandler.h
@@ -0,0 +1,35 @@
+/*
+ WebContextMenuHandler.h
+ Copyright 2001, 2002, Apple Computer, Inc.
+
+ Public header file.
+*/
+
+// These strings are keys into the element dictionary provided in
+// contextMenuItemsForElement.
+extern NSString *WebContextMenuElementLinkURLKey;
+extern NSString *WebContextMenuElementLinkLabelKey;
+extern NSString *WebContextMenuElementImageURLKey;
+extern NSString *WebContextMenuElementStringKey;
+extern NSString *WebContextMenuElementImageKey;
+extern NSString *WebContextMenuElementFrameKey;
+
+/*!
+ @protcol WebContextMenuHandler
+ @discussion WebContextMenuHandler determine what context menu items are visible over
+ a clicked element.
+*/
+
+ at protocol WebContextMenuHandler <NSObject>
+
+/*!
+ @method contextMenuItemsForElement:defaultMenuItems:
+ @discussion Returns the array of NSMenuItems that will be displayed in the context menu
+ for the dictionary representation of the clicked element.
+*/
+- (NSArray *)contextMenuItemsForElement: (NSDictionary *)element defaultMenuItems: (NSArray *)menuItems;
+
+ at end
+
+
+
diff --git a/WebKit/WebView.subproj/WebController.h b/WebKit/WebView.subproj/WebController.h
index 7bd1d24..36ff73b 100644
--- a/WebKit/WebView.subproj/WebController.h
+++ b/WebKit/WebView.subproj/WebController.h
@@ -11,24 +11,6 @@
#import <WebKit/WebLocationChangeHandler.h>
#import <WebKit/WebControllerPolicyHandler.h>
-/*
- =============================================================================
-
- WebController manages the interaction between WebView(s) and WebDataSource(s).
-
- The WebController implements required behavior. WebView and WebDataSource
- cannot function without a controller.
-
- It it expected that alternate implementations of WebController will be written for
- alternate views of the web pages described by WebDataSources. For example, a web
- crawler may implement a WebController with no corresponding view.
-
- WebController may be subclassed to modify the behavior of the standard
- WebView and WebDataSource.
-
- =============================================================================
-*/
-
@class WebBackForwardList;
@class WebController;
@class WebControllerPrivate;
@@ -40,199 +22,267 @@
@class WebResourceHandle;
@class WebView;
-/*
- =============================================================================
-
- Implementors of this protocol will receive messages indicating
- data has been received.
-
- The methods in this protocol will be called even if the data source
- is initialized with something other than a URL.
-
- =============================================================================
-*/
-
- at protocol WebResourceProgressHandler <NSObject>
-
-/*
- A new chunk of data has been received. This could be a partial load
- of a URL. It may be useful to do incremental layout, although
- typically for non-base URLs this should be done after a URL (i.e. image)
- has been completely downloaded.
-*/
-- (void)receivedProgress: (WebLoadProgress *)progress forResourceHandle: (WebResourceHandle *)resourceHandle fromDataSource: (WebDataSource *)dataSource complete: (BOOL)isComplete;
-
-- (void)receivedError: (WebError *)error forResourceHandle: (WebResourceHandle *)resourceHandle partialProgress: (WebLoadProgress *)progress fromDataSource: (WebDataSource *)dataSource;
-
- at end
-
-
-/*
- =============================================================================
-
- A class that implements WebWindowContext provides window-related methods
- that may be used by Javascript, plugins and other aspects of web pages.
-
- =============================================================================
-*/
- at protocol WebWindowContext <NSObject>
-
-- (WebController *)openNewWindowWithURL:(NSURL *)URL referrer:(NSString *)referrer;
-
-- (void)setStatusText:(NSString *)text;
-- (NSString *)statusText;
+ at protocol WebWindowContext;
+ at protocol WebResourceProgressHandler;
+ at protocol WebContextMenuHandler;
-- (BOOL)areToolbarsVisible;
-- (void)setToolbarsVisible:(BOOL)visible;
-- (BOOL)isStatusBarVisible;
-- (void)setStatusBarVisible:(BOOL)visible;
-
-// Even though a caller could set the frame directly using the NSWindow,
-// this method is provided so implementors of this protocol can do special
-// things on programmatic move/resize, like avoiding autosaving of the size.
-- (void)setFrame:(NSRect)frame;
-
-- (NSWindow *)window;
-
- at end
-
-
-/*
- =============================================================================
- WebContextMenuHandler determine what context menu items are visible over
- a clicked element.
- =============================================================================
+/*!
+ @class WebController
+ WebController manages the interaction between WebViews and WebDataSources.
+ WebView and WebDataSource cannot function without a controller.
*/
-
-// These strings are keys into the element dictionary provided in
-// contextMenuItemsForElement.
-extern NSString *WebContextMenuElementLinkURLKey;
-extern NSString *WebContextMenuElementLinkLabelKey;
-extern NSString *WebContextMenuElementImageURLKey;
-extern NSString *WebContextMenuElementStringKey;
-extern NSString *WebContextMenuElementImageKey;
-extern NSString *WebContextMenuElementFrameKey;
-
- at protocol WebContextMenuHandler <NSObject>
-// Returns the array of NSMenuItems that will be displayed in the context menu
-// for the dictionary representation of the clicked element.
-- (NSArray *)contextMenuItemsForElement: (NSDictionary *)element defaultMenuItems: (NSArray *)menuItems;
- at end
-
-
-
-/*
- =============================================================================
-
- WebController implements all the behavior that ties together WebView
- and WebDataSource. See each inherited protocol for a more complete
- description.
-
- =============================================================================
-*/
-
@interface WebController : NSObject
{
@private
WebControllerPrivate *_private;
}
-// Calls designated initializer with nil arguments.
+/*!
+ @method
+*/
++ (WebURLPolicy *)defaultURLPolicyForURL: (NSURL *)URL;
+
+/*!
+ @method canShowMIMEType:
+ @param MIMEType
+*/
++ (BOOL)canShowMIMEType:(NSString *)MIMEType;
+
+/*!
+ @method canShowFile:
+ @param path
+*/
++ (BOOL)canShowFile:(NSString *)path;
+
+/*!
+ @method init
+ @abstract Calls designated initializer with nil arguments.
+*/
- init;
-// Designated initializer.
+/*!
+ @method initWithView:provisionalDataSource:controllerSetName:
+ @abstract Designated initializer.
+ @param view
+ @param dataSource
+ @param name
+*/
- initWithView: (WebView *)view provisionalDataSource: (WebDataSource *)dataSource controllerSetName: (NSString *)name;
+/*!
+ @method setWindowContext:
+ @param context
+*/
- (void)setWindowContext: (id<WebWindowContext>)context;
+
+/*!
+ @method windowContext
+*/
- (id<WebWindowContext>)windowContext;
+/*!
+ @method setResourceProgressHandler:
+ @param handler
+*/
- (void)setResourceProgressHandler: (id<WebResourceProgressHandler>)handler;
+
+/*!
+ @method resourceProgressHandler
+*/
- (id<WebResourceProgressHandler>)resourceProgressHandler;
+/*!
+ @method setDownloadProgressHandler:
+ @param handler
+*/
- (void)setDownloadProgressHandler: (id<WebResourceProgressHandler>)handler;
+
+/*!
+ @method downloadProgressHandler
+*/
- (id<WebResourceProgressHandler>)downloadProgressHandler;
+/*!
+ @method setContextMenuHandler:
+ @param handler
+*/
- (void)setContextMenuHandler: (id<WebContextMenuHandler>)handler;
+
+/*!
+ @method contextMenuHandler
+*/
- (id<WebContextMenuHandler>)contextMenuHandler;
+/*!
+ @method setLocationChangeHandler:
+ @param handler
+*/
- (void)setLocationChangeHandler:(id <WebLocationChangeHandler>)handler;
+
+/*!
+ @method locationChangeHandler
+*/
- (id <WebLocationChangeHandler>)locationChangeHandler;
+/*!
+ @method setPolicyHandler:
+ @param handler
+*/
- (void)setPolicyHandler: (id<WebControllerPolicyHandler>)handler;
-- (id<WebControllerPolicyHandler>)policyHandler;
-
-+ (WebURLPolicy *)defaultURLPolicyForURL: (NSURL *)URL;
-// FIXME: Should this method be private?
-// Called when a data source needs to create a frame. This method encapsulates the
-// specifics of creating and initializing a view of the appropriate class.
-- (WebFrame *)createFrameNamed: (NSString *)fname for: (WebDataSource *)child inParent: (WebDataSource *)parent allowsScrolling: (BOOL)allowsScrolling;
+/*!
+ @method policyHandler
+*/
+- (id<WebControllerPolicyHandler>)policyHandler;
-// Look for a frame named name, recursively.
+/*!
+ @method frameNamed:
+ Look for a frame named name, recursively.
+ @param name
+*/
- (WebFrame *)frameNamed: (NSString *)name;
-// Return the top level frame. Note that even document that are not framesets will have a
-// mainFrame.
+/*!
+ @method mainFrame
+ Return the top level frame. Note that even document that are not framesets will have a
+ mainFrame.
+*/
- (WebFrame *)mainFrame;
-// Return the frame associated with the data source. Traverses the
-// frame tree to find the data source.
+/*!
+ @method frameForDataSource:
+ Return the frame associated with the data source. Traverses the
+ frame tree to find the data source.
+ @param dataSource
+*/
- (WebFrame *)frameForDataSource: (WebDataSource *)dataSource;
-// Return the frame associated with the view. Traverses the
-// frame tree to find the view.
+/*!
+ @method frameForView:
+ Return the frame associated with the view. Traverses the
+ frame tree to find the view.
+ @param aView
+*/
- (WebFrame *)frameForView: (WebView *)aView;
-// API to manage animated images.
+/*!
+ @method stopAnimatedImages
+*/
- (void)stopAnimatedImages;
+
+/*!
+ @method startAnimatedImages
+*/
- (void)startAnimatedImages;
+/*!
+ @method stopAnimatedImageLooping
+*/
- (void)stopAnimatedImageLooping;
-- (void)startAnimatedImageLooping;
-+ (BOOL)canShowMIMEType:(NSString *)MIMEType;
-+ (BOOL)canShowFile:(NSString *)path;
+/*!
+ @method startAnimatedImageLooping
+*/
+- (void)startAnimatedImageLooping;
+/*!
+ @method backForwardList
+*/
- (WebBackForwardList *)backForwardList;
+/*!
+ @method setUseBackForwardList:
+ @param flag turns use of the back forward list on or off
+*/
- (void)setUseBackForwardList: (BOOL)flag;
+
+/*!
+ @method useBackForwardList
+*/
- (BOOL)useBackForwardList;
+
+/*!
+ @method goBack
+*/
- (BOOL)goBack;
+
+/*!
+ @method goForward
+*/
- (BOOL)goForward;
+/*!
+ @method setTextSizeMultiplier:
+ @param multiplier
+*/
- (void)setTextSizeMultiplier:(float)multiplier; // 1.0 is normal size
+
+/*!
+ @method textSizeMultiplier
+*/
- (float)textSizeMultiplier;
-// Set the application name. This name will be used in user-agent strings
-// that are chosen for best results in rendering web pages.
+/*!
+ @method setApplicationNameForUserAgent:
+ Set the application name. This name will be used in user-agent strings
+ that are chosen for best results in rendering web pages.
+ @param applicationName the application name
+*/
- (void)setApplicationNameForUserAgent:(NSString *)applicationName;
- (NSString *)applicationNameForUserAgent;
-// Set the user agent explicitly. Setting the user-agent string to nil means
-// that WebKit should construct the best possible user-agent string for each URL
-// for best results rendering web pages. Setting it to any string means
-// that WebKit should use that user-agent string for all purposes until it is set
-// back to nil.
+/*!
+ @method setUserAgent:
+ Set the user agent explicitly. Setting the user-agent string to nil means
+ that WebKit should construct the best possible user-agent string for each URL
+ for best results rendering web pages. Setting it to any string means
+ that WebKit should use that user-agent string for all purposes until it is set
+ back to nil.
+ @param userAgentString the user agent description
+*/
- (void)setUserAgent:(NSString *)userAgentString;
- (NSString *)userAgent;
-// Get the appropriate user-agent string for a particular URL.
+/*!
+ @method userAgentForURL:
+ @abstract Get the appropriate user-agent string for a particular URL.
+ @param URL
+*/
- (NSString *)userAgentForURL:(NSURL *)URL;
-// Find out if the current web page supports text encodings.
+/*!
+ @method supportsTextEncoding
+ @abstract Find out if the current web page supports text encodings.
+*/
- (BOOL)supportsTextEncoding;
-// Make the page display with a different text encoding; stops any load in progress.
-// The text encoding passed in overrides the normal text encoding smarts including
-// what's specified in a web page's header or HTTP response.
-// The text encoding automatically goes back to the default when the top level frame
-// changes to a new location.
+/*!
+ @method setCustomTextEncoding:
+ @discussion Make the page display with a different text encoding; stops any load in progress.
+ The text encoding passed in overrides the normal text encoding smarts including
+ what's specified in a web page's header or HTTP response.
+ The text encoding automatically goes back to the default when the top level frame
+ changes to a new location.
+ @param encoding
+*/
- (void)setCustomTextEncoding:(CFStringEncoding)encoding;
+
+/*!
+ @method resetTextEncoding
+*/
- (void)resetTextEncoding;
-// Find out the current state. It's an error to call customTextEncoding if hasCustomTextEncoding is NO.
+/*!
+ @method hasCustomTextEncoding
+ @abstract Determine whether or not a custom text encoding is in use.
+ @discussion It's an error to call customTextEncoding if hasCustomTextEncoding is NO.
+*/
- (BOOL)hasCustomTextEncoding;
+
+/*!
+ @method customTextEncoding
+*/
- (CFStringEncoding)customTextEncoding;
@end
diff --git a/WebKit/WebView.subproj/WebController.m b/WebKit/WebView.subproj/WebController.m
index e9999c2..59e0cc3 100644
--- a/WebKit/WebView.subproj/WebController.m
+++ b/WebKit/WebView.subproj/WebController.m
@@ -6,6 +6,7 @@
#import <WebKit/WebController.h>
#import <WebKit/WebBackForwardList.h>
+#import <WebKit/WebContextMenuHandler.h>
#import <WebKit/WebController.h>
#import <WebKit/WebControllerSets.h>
#import <WebKit/WebControllerPolicyHandler.h>
@@ -21,7 +22,9 @@
#import <WebKit/WebKitErrors.h>
#import <WebKit/WebKitStatisticsPrivate.h>
#import <WebKit/WebPluginDatabase.h>
+#import <WebKit/WebResourceProgressHandler.h>
#import <WebKit/WebViewPrivate.h>
+#import <WebKit/WebWindowContext.h>
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebResourceHandle.h>
@@ -71,30 +74,6 @@ NSString * WebContextMenuElementFrameKey = @"WebContextFrame";
}
-- (WebFrame *)createFrameNamed: (NSString *)fname for: (WebDataSource *)childDataSource inParent: (WebDataSource *)parentDataSource allowsScrolling: (BOOL)allowsScrolling
-{
- WebView *childView;
- WebFrame *newFrame;
-
- childView = [[WebView alloc] initWithFrame: NSMakeRect(0,0,0,0)];
-
- newFrame = [[WebFrame alloc] initWithName: fname webView: childView provisionalDataSource: childDataSource controller: self];
-
- [parentDataSource addFrame: newFrame];
-
- [newFrame release];
-
- [childView _setController: self];
- [childDataSource _setController: self];
-
- [childView setAllowsScrolling: allowsScrolling];
-
- [childView release];
-
- return newFrame;
-}
-
-
- (void)setWindowContext:(id <WebWindowContext>)context
{
[context retain];
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.h b/WebKit/WebView.subproj/WebControllerPrivate.h
index 9b0f314..19bd657 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.h
+++ b/WebKit/WebView.subproj/WebControllerPrivate.h
@@ -38,7 +38,14 @@
}
@end
- at interface WebController (WebPrivate);
+ at interface WebController (WebPrivate)
+
+/*
+ Called when a data source needs to create a frame. This method encapsulates the
+ specifics of creating and initializing a view of the appropriate class.
+*/
+- (WebFrame *)createFrameNamed: (NSString *)fname for: (WebDataSource *)child inParent: (WebDataSource *)parent allowsScrolling: (BOOL)allowsScrolling;
+
- (id<WebContextMenuHandler>)_defaultContextMenuHandler;
- (void)_receivedProgress: (WebLoadProgress *)progress forResourceHandle: (WebResourceHandle *)resourceHandle fromDataSource: (WebDataSource *)dataSource complete:(BOOL)isComplete;
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.m b/WebKit/WebView.subproj/WebControllerPrivate.m
index 90a35ba..b7543ae 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.m
+++ b/WebKit/WebView.subproj/WebControllerPrivate.m
@@ -4,6 +4,7 @@
*/
#import <WebKit/WebBackForwardList.h>
+#import <WebKit/WebContextMenuHandler.h>
#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebControllerPolicyHandlerPrivate.h>
#import <WebKit/WebDataSourcePrivate.h>
@@ -11,8 +12,10 @@
#import <WebKit/WebFramePrivate.h>
#import <WebKit/WebLoadProgress.h>
#import <WebKit/WebPreferencesPrivate.h>
+#import <WebKit/WebResourceProgressHandler.h>
#import <WebKit/WebStandardPanelsPrivate.h>
#import <WebKit/WebViewPrivate.h>
+#import <WebKit/WebWindowContext.h>
#import <WebFoundation/WebAssertions.h>
@@ -82,6 +85,30 @@
@implementation WebController (WebPrivate)
+- (WebFrame *)createFrameNamed: (NSString *)fname for: (WebDataSource *)childDataSource inParent: (WebDataSource *)parentDataSource allowsScrolling: (BOOL)allowsScrolling
+{
+ WebView *childView;
+ WebFrame *newFrame;
+
+ childView = [[WebView alloc] initWithFrame: NSMakeRect(0,0,0,0)];
+
+ newFrame = [[WebFrame alloc] initWithName: fname webView: childView provisionalDataSource: childDataSource controller: self];
+
+ [parentDataSource addFrame: newFrame];
+
+ [newFrame release];
+
+ [childView _setController: self];
+ [childDataSource _setController: self];
+
+ [childView setAllowsScrolling: allowsScrolling];
+
+ [childView release];
+
+ return newFrame;
+}
+
+
- (id<WebContextMenuHandler>)_defaultContextMenuHandler
{
return _private->defaultContextMenuHandler;
diff --git a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
index d7cd421..39eb187 100644
--- a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
@@ -5,13 +5,15 @@
*/
+#import <WebKit/WebContextMenuHandler.h>
#import <WebKit/WebController.h>
+#import <WebKit/WebControllerPolicyHandler.h>
+#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebDataSource.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebDefaultContextMenuHandler.h>
-#import <WebKit/WebControllerPolicyHandler.h>
-#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebFrame.h>
+#import <WebKit/WebWindowContext.h>
@implementation WebDefaultContextMenuHandler
diff --git a/WebKit/WebView.subproj/WebDefaultContextMenuHandler.m b/WebKit/WebView.subproj/WebDefaultContextMenuHandler.m
index d7cd421..39eb187 100644
--- a/WebKit/WebView.subproj/WebDefaultContextMenuHandler.m
+++ b/WebKit/WebView.subproj/WebDefaultContextMenuHandler.m
@@ -5,13 +5,15 @@
*/
+#import <WebKit/WebContextMenuHandler.h>
#import <WebKit/WebController.h>
+#import <WebKit/WebControllerPolicyHandler.h>
+#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebDataSource.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebDefaultContextMenuHandler.h>
-#import <WebKit/WebControllerPolicyHandler.h>
-#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebFrame.h>
+#import <WebKit/WebWindowContext.h>
@implementation WebDefaultContextMenuHandler
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index d2d853e..93d3fdf 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -1,15 +1,15 @@
/*
WebFrame.m
- Copyright (c) 2001, Apple, Inc. All rights reserved.
+ Copyright (c) 2001, Apple, Inc. All rights reserved.
*/
#import <WebKit/WebFrame.h>
#import <Cocoa/Cocoa.h>
-#import <WebKit/WebController.h>
#import <WebKit/WebBackForwardList.h>
#import <WebKit/WebBridge.h>
+#import <WebKit/WebController.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebFramePrivate.h>
#import <WebKit/WebHistoryItem.h>
@@ -19,6 +19,7 @@
#import <WebKit/WebKitLogging.h>
#import <WebKit/WebLocationChangeHandler.h>
#import <WebKit/WebViewPrivate.h>
+#import <WebKit/WebWindowContext.h>
#import <WebFoundation/WebFoundation.h>
#import <WebFoundation/WebNSURLExtras.h>
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index d36f244..f2c3d81 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -4,23 +4,24 @@
#import <WebKit/WebView.h>
-#import <WebKit/WebDocument.h>
-#import <WebKit/WebDynamicScrollBarsView.h>
-#import <WebKit/WebHTMLView.h>
-#import <WebKit/WebImageView.h>
-#import <WebKit/WebTextView.h>
-#import <WebKit/WebViewPrivate.h>
+#import <WebKit/WebCookieAdapter.h>
#import <WebKit/WebController.h>
-#import <WebKit/WebViewFactory.h>
#import <WebKit/WebDataSource.h>
+#import <WebKit/WebDocument.h>
+#import <WebKit/WebDynamicScrollBarsView.h>
#import <WebKit/WebFrame.h>
-#import <WebKit/WebKitErrors.h>
-#import <WebKit/WebTextRendererFactory.h>
+#import <WebKit/WebHTMLView.h>
#import <WebKit/WebImageRenderer.h>
#import <WebKit/WebImageRendererFactory.h>
-#import <WebKit/WebCookieAdapter.h>
+#import <WebKit/WebImageView.h>
+#import <WebKit/WebKitErrors.h>
#import <WebKit/WebKitStatisticsPrivate.h>
#import <WebKit/WebNSViewExtras.h>
+#import <WebKit/WebTextRendererFactory.h>
+#import <WebKit/WebTextView.h>
+#import <WebKit/WebViewPrivate.h>
+#import <WebKit/WebViewFactory.h>
+#import <WebKit/WebWindowContext.h>
#import <WebFoundation/WebNSDictionaryExtras.h>
#import <WebFoundation/WebNSURLExtras.h>
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 2f9f91a..f923f6a 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -6,6 +6,7 @@
#import <WebKit/WebHTMLView.h>
#import <WebKit/WebBridge.h>
+#import <WebKit/WebContextMenuHandler.h>
#import <WebKit/WebController.h>
#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebDataSourcePrivate.h>
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.m b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
index 7d75ff9..1dce93b 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.m
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
@@ -9,15 +9,18 @@
#import <WebKit/WebHTMLViewPrivate.h>
#import <AppKit/NSResponder_Private.h>
-#import <WebKit/WebImageRenderer.h>
-#import <WebKit/WebNSViewExtras.h>
-#import <WebKit/WebPluginView.h>
+
+#import <WebKit/WebBridge.h>
+#import <WebKit/WebContextMenuHandler.h>
#import <WebKit/WebController.h>
#import <WebKit/WebControllerPrivate.h>
-#import <WebKit/WebBridge.h>
+#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebFramePrivate.h>
+#import <WebKit/WebImageRenderer.h>
+#import <WebKit/WebNSViewExtras.h>
+#import <WebKit/WebPluginView.h>
#import <WebKit/WebViewPrivate.h>
-#import <WebKit/WebDataSourcePrivate.h>
+#import <WebKit/WebWindowContext.h>
@interface NSView (WebHTMLViewPrivate)
- (void)_web_stopIfPluginView;
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 2c0e3c5..1bf5e6c 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -3,20 +3,21 @@
Copyright (c) 2001, 2002, Apple Computer, Inc. All rights reserved.
*/
-#import <WebKit/WebDocument.h>
-#import <WebKit/WebDownloadHandler.h>
-#import <WebKit/WebLoadProgress.h>
-#import <WebKit/WebLocationChangeHandler.h>
-#import <WebKit/WebMainResourceClient.h>
+#import <WebKit/WebBridge.h>
#import <WebKit/WebController.h>
#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebDataSource.h>
#import <WebKit/WebDataSourcePrivate.h>
+#import <WebKit/WebDocument.h>
+#import <WebKit/WebDownloadHandler.h>
#import <WebKit/WebFrame.h>
#import <WebKit/WebFramePrivate.h>
-#import <WebKit/WebView.h>
-#import <WebKit/WebBridge.h>
#import <WebKit/WebKitLogging.h>
+#import <WebKit/WebLoadProgress.h>
+#import <WebKit/WebLocationChangeHandler.h>
+#import <WebKit/WebMainResourceClient.h>
+#import <WebKit/WebResourceProgressHandler.h>
+#import <WebKit/WebView.h>
#import <WebFoundation/WebError.h>
#import <WebFoundation/WebFileTypeMappings.h>
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 2c0e3c5..1bf5e6c 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -3,20 +3,21 @@
Copyright (c) 2001, 2002, Apple Computer, Inc. All rights reserved.
*/
-#import <WebKit/WebDocument.h>
-#import <WebKit/WebDownloadHandler.h>
-#import <WebKit/WebLoadProgress.h>
-#import <WebKit/WebLocationChangeHandler.h>
-#import <WebKit/WebMainResourceClient.h>
+#import <WebKit/WebBridge.h>
#import <WebKit/WebController.h>
#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebDataSource.h>
#import <WebKit/WebDataSourcePrivate.h>
+#import <WebKit/WebDocument.h>
+#import <WebKit/WebDownloadHandler.h>
#import <WebKit/WebFrame.h>
#import <WebKit/WebFramePrivate.h>
-#import <WebKit/WebView.h>
-#import <WebKit/WebBridge.h>
#import <WebKit/WebKitLogging.h>
+#import <WebKit/WebLoadProgress.h>
+#import <WebKit/WebLocationChangeHandler.h>
+#import <WebKit/WebMainResourceClient.h>
+#import <WebKit/WebResourceProgressHandler.h>
+#import <WebKit/WebView.h>
#import <WebFoundation/WebError.h>
#import <WebFoundation/WebFileTypeMappings.h>
diff --git a/WebKit/WebView.subproj/WebResourceLoadDelegate.h b/WebKit/WebView.subproj/WebResourceLoadDelegate.h
new file mode 100644
index 0000000..ee95e9d
--- /dev/null
+++ b/WebKit/WebView.subproj/WebResourceLoadDelegate.h
@@ -0,0 +1,41 @@
+/*
+ WebResourceProgressHandler.h
+ Copyright 2001, 2002, Apple Computer, Inc.
+
+ Public header file.
+*/
+
+ at class WebResourceHandle;
+
+/*!
+ @protocol WebResourceProgressHandler
+ @discussion Implementors of this protocol will receive messages indicating
+ data has been received for resources loaded by a data source.
+*/
+ at protocol WebResourceProgressHandler <NSObject>
+
+/*!
+ @method receivedProgress:forResourceHandle:fromDataSource:complete:
+ @discussion A new chunk of data has been received. This could be a partial load
+ of a URL. It may be useful to do incremental layout, although
+ typically for non-base URLs this should be done after a URL (i.e. image)
+ has been completely downloaded.
+ @param progress
+ @param resourceHandle
+ @param dataSource
+ @param isComplete
+*/
+- (void)receivedProgress: (WebLoadProgress *)progress forResourceHandle: (WebResourceHandle *)resourceHandle fromDataSource: (WebDataSource *)dataSource complete: (BOOL)isComplete;
+
+/*!
+ @method receivedError:forResourceHandle:partialProgress:fromDataSource:
+ @param error
+ @param resourceHandle
+ @param progress
+ @param dataSource
+*/
+- (void)receivedError: (WebError *)error forResourceHandle: (WebResourceHandle *)resourceHandle partialProgress: (WebLoadProgress *)progress fromDataSource: (WebDataSource *)dataSource;
+
+ at end
+
+
diff --git a/WebKit/WebView.subproj/WebResourceProgressDelegate.h b/WebKit/WebView.subproj/WebResourceProgressDelegate.h
new file mode 100644
index 0000000..ee95e9d
--- /dev/null
+++ b/WebKit/WebView.subproj/WebResourceProgressDelegate.h
@@ -0,0 +1,41 @@
+/*
+ WebResourceProgressHandler.h
+ Copyright 2001, 2002, Apple Computer, Inc.
+
+ Public header file.
+*/
+
+ at class WebResourceHandle;
+
+/*!
+ @protocol WebResourceProgressHandler
+ @discussion Implementors of this protocol will receive messages indicating
+ data has been received for resources loaded by a data source.
+*/
+ at protocol WebResourceProgressHandler <NSObject>
+
+/*!
+ @method receivedProgress:forResourceHandle:fromDataSource:complete:
+ @discussion A new chunk of data has been received. This could be a partial load
+ of a URL. It may be useful to do incremental layout, although
+ typically for non-base URLs this should be done after a URL (i.e. image)
+ has been completely downloaded.
+ @param progress
+ @param resourceHandle
+ @param dataSource
+ @param isComplete
+*/
+- (void)receivedProgress: (WebLoadProgress *)progress forResourceHandle: (WebResourceHandle *)resourceHandle fromDataSource: (WebDataSource *)dataSource complete: (BOOL)isComplete;
+
+/*!
+ @method receivedError:forResourceHandle:partialProgress:fromDataSource:
+ @param error
+ @param resourceHandle
+ @param progress
+ @param dataSource
+*/
+- (void)receivedError: (WebError *)error forResourceHandle: (WebResourceHandle *)resourceHandle partialProgress: (WebLoadProgress *)progress fromDataSource: (WebDataSource *)dataSource;
+
+ at end
+
+
diff --git a/WebKit/WebView.subproj/WebResourceProgressHandler.h b/WebKit/WebView.subproj/WebResourceProgressHandler.h
new file mode 100644
index 0000000..ee95e9d
--- /dev/null
+++ b/WebKit/WebView.subproj/WebResourceProgressHandler.h
@@ -0,0 +1,41 @@
+/*
+ WebResourceProgressHandler.h
+ Copyright 2001, 2002, Apple Computer, Inc.
+
+ Public header file.
+*/
+
+ at class WebResourceHandle;
+
+/*!
+ @protocol WebResourceProgressHandler
+ @discussion Implementors of this protocol will receive messages indicating
+ data has been received for resources loaded by a data source.
+*/
+ at protocol WebResourceProgressHandler <NSObject>
+
+/*!
+ @method receivedProgress:forResourceHandle:fromDataSource:complete:
+ @discussion A new chunk of data has been received. This could be a partial load
+ of a URL. It may be useful to do incremental layout, although
+ typically for non-base URLs this should be done after a URL (i.e. image)
+ has been completely downloaded.
+ @param progress
+ @param resourceHandle
+ @param dataSource
+ @param isComplete
+*/
+- (void)receivedProgress: (WebLoadProgress *)progress forResourceHandle: (WebResourceHandle *)resourceHandle fromDataSource: (WebDataSource *)dataSource complete: (BOOL)isComplete;
+
+/*!
+ @method receivedError:forResourceHandle:partialProgress:fromDataSource:
+ @param error
+ @param resourceHandle
+ @param progress
+ @param dataSource
+*/
+- (void)receivedError: (WebError *)error forResourceHandle: (WebResourceHandle *)resourceHandle partialProgress: (WebLoadProgress *)progress fromDataSource: (WebDataSource *)dataSource;
+
+ at end
+
+
diff --git a/WebKit/WebView.subproj/WebUIDelegate.h b/WebKit/WebView.subproj/WebUIDelegate.h
new file mode 100644
index 0000000..a9e8c27
--- /dev/null
+++ b/WebKit/WebView.subproj/WebUIDelegate.h
@@ -0,0 +1,74 @@
+/*
+ WebWindowContext.h
+ Copyright 2001, 2002, Apple Computer, Inc.
+
+ Public header file.
+*/
+
+#import <Cocoa/Cocoa.h>
+
+ at class WebController;
+
+/*!
+ @protocol WebWindowContext
+ @discussion A class that implements WebWindowContext provides window-related methods
+ that may be used by Javascript, plugins and other aspects of web pages.
+*/
+ at protocol WebWindowContext <NSObject>
+/*!
+ @method openNewWindowWithURL:referrer:
+ @param URL
+ @param referrer
+*/
+- (WebController *)openNewWindowWithURL:(NSURL *)URL referrer:(NSString *)referrer;
+
+/*!
+ @method setStatusText:
+ @param text
+*/
+- (void)setStatusText:(NSString *)text;
+
+/*!
+ @method statusText
+*/
+- (NSString *)statusText;
+
+/*!
+ @method areToolbarsVisible
+*/
+- (BOOL)areToolbarsVisible;
+
+/*!
+ @method setToolbarsVisible:
+ @param visible
+*/
+- (void)setToolbarsVisible:(BOOL)visible;
+
+/*!
+ @method isStatusBarVisible
+*/
+- (BOOL)isStatusBarVisible;
+
+/*!
+ @method setStatusBarVisible:
+ @param visible
+*/
+- (void)setStatusBarVisible:(BOOL)visible;
+
+/*!
+ @method setFrame:
+ @discussion Even though a caller could set the frame directly using the NSWindow,
+ this method is provided so implementors of this protocol can do special
+ things on programmatic move/resize, like avoiding autosaving of the size.
+ @param frame
+*/
+- (void)setFrame:(NSRect)frame;
+
+/*!
+ @method window
+*/
+- (NSWindow *)window;
+
+ at end
+
+
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index 7bd1d24..36ff73b 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -11,24 +11,6 @@
#import <WebKit/WebLocationChangeHandler.h>
#import <WebKit/WebControllerPolicyHandler.h>
-/*
- =============================================================================
-
- WebController manages the interaction between WebView(s) and WebDataSource(s).
-
- The WebController implements required behavior. WebView and WebDataSource
- cannot function without a controller.
-
- It it expected that alternate implementations of WebController will be written for
- alternate views of the web pages described by WebDataSources. For example, a web
- crawler may implement a WebController with no corresponding view.
-
- WebController may be subclassed to modify the behavior of the standard
- WebView and WebDataSource.
-
- =============================================================================
-*/
-
@class WebBackForwardList;
@class WebController;
@class WebControllerPrivate;
@@ -40,199 +22,267 @@
@class WebResourceHandle;
@class WebView;
-/*
- =============================================================================
-
- Implementors of this protocol will receive messages indicating
- data has been received.
-
- The methods in this protocol will be called even if the data source
- is initialized with something other than a URL.
-
- =============================================================================
-*/
-
- at protocol WebResourceProgressHandler <NSObject>
-
-/*
- A new chunk of data has been received. This could be a partial load
- of a URL. It may be useful to do incremental layout, although
- typically for non-base URLs this should be done after a URL (i.e. image)
- has been completely downloaded.
-*/
-- (void)receivedProgress: (WebLoadProgress *)progress forResourceHandle: (WebResourceHandle *)resourceHandle fromDataSource: (WebDataSource *)dataSource complete: (BOOL)isComplete;
-
-- (void)receivedError: (WebError *)error forResourceHandle: (WebResourceHandle *)resourceHandle partialProgress: (WebLoadProgress *)progress fromDataSource: (WebDataSource *)dataSource;
-
- at end
-
-
-/*
- =============================================================================
-
- A class that implements WebWindowContext provides window-related methods
- that may be used by Javascript, plugins and other aspects of web pages.
-
- =============================================================================
-*/
- at protocol WebWindowContext <NSObject>
-
-- (WebController *)openNewWindowWithURL:(NSURL *)URL referrer:(NSString *)referrer;
-
-- (void)setStatusText:(NSString *)text;
-- (NSString *)statusText;
+ at protocol WebWindowContext;
+ at protocol WebResourceProgressHandler;
+ at protocol WebContextMenuHandler;
-- (BOOL)areToolbarsVisible;
-- (void)setToolbarsVisible:(BOOL)visible;
-- (BOOL)isStatusBarVisible;
-- (void)setStatusBarVisible:(BOOL)visible;
-
-// Even though a caller could set the frame directly using the NSWindow,
-// this method is provided so implementors of this protocol can do special
-// things on programmatic move/resize, like avoiding autosaving of the size.
-- (void)setFrame:(NSRect)frame;
-
-- (NSWindow *)window;
-
- at end
-
-
-/*
- =============================================================================
- WebContextMenuHandler determine what context menu items are visible over
- a clicked element.
- =============================================================================
+/*!
+ @class WebController
+ WebController manages the interaction between WebViews and WebDataSources.
+ WebView and WebDataSource cannot function without a controller.
*/
-
-// These strings are keys into the element dictionary provided in
-// contextMenuItemsForElement.
-extern NSString *WebContextMenuElementLinkURLKey;
-extern NSString *WebContextMenuElementLinkLabelKey;
-extern NSString *WebContextMenuElementImageURLKey;
-extern NSString *WebContextMenuElementStringKey;
-extern NSString *WebContextMenuElementImageKey;
-extern NSString *WebContextMenuElementFrameKey;
-
- at protocol WebContextMenuHandler <NSObject>
-// Returns the array of NSMenuItems that will be displayed in the context menu
-// for the dictionary representation of the clicked element.
-- (NSArray *)contextMenuItemsForElement: (NSDictionary *)element defaultMenuItems: (NSArray *)menuItems;
- at end
-
-
-
-/*
- =============================================================================
-
- WebController implements all the behavior that ties together WebView
- and WebDataSource. See each inherited protocol for a more complete
- description.
-
- =============================================================================
-*/
-
@interface WebController : NSObject
{
@private
WebControllerPrivate *_private;
}
-// Calls designated initializer with nil arguments.
+/*!
+ @method
+*/
++ (WebURLPolicy *)defaultURLPolicyForURL: (NSURL *)URL;
+
+/*!
+ @method canShowMIMEType:
+ @param MIMEType
+*/
++ (BOOL)canShowMIMEType:(NSString *)MIMEType;
+
+/*!
+ @method canShowFile:
+ @param path
+*/
++ (BOOL)canShowFile:(NSString *)path;
+
+/*!
+ @method init
+ @abstract Calls designated initializer with nil arguments.
+*/
- init;
-// Designated initializer.
+/*!
+ @method initWithView:provisionalDataSource:controllerSetName:
+ @abstract Designated initializer.
+ @param view
+ @param dataSource
+ @param name
+*/
- initWithView: (WebView *)view provisionalDataSource: (WebDataSource *)dataSource controllerSetName: (NSString *)name;
+/*!
+ @method setWindowContext:
+ @param context
+*/
- (void)setWindowContext: (id<WebWindowContext>)context;
+
+/*!
+ @method windowContext
+*/
- (id<WebWindowContext>)windowContext;
+/*!
+ @method setResourceProgressHandler:
+ @param handler
+*/
- (void)setResourceProgressHandler: (id<WebResourceProgressHandler>)handler;
+
+/*!
+ @method resourceProgressHandler
+*/
- (id<WebResourceProgressHandler>)resourceProgressHandler;
+/*!
+ @method setDownloadProgressHandler:
+ @param handler
+*/
- (void)setDownloadProgressHandler: (id<WebResourceProgressHandler>)handler;
+
+/*!
+ @method downloadProgressHandler
+*/
- (id<WebResourceProgressHandler>)downloadProgressHandler;
+/*!
+ @method setContextMenuHandler:
+ @param handler
+*/
- (void)setContextMenuHandler: (id<WebContextMenuHandler>)handler;
+
+/*!
+ @method contextMenuHandler
+*/
- (id<WebContextMenuHandler>)contextMenuHandler;
+/*!
+ @method setLocationChangeHandler:
+ @param handler
+*/
- (void)setLocationChangeHandler:(id <WebLocationChangeHandler>)handler;
+
+/*!
+ @method locationChangeHandler
+*/
- (id <WebLocationChangeHandler>)locationChangeHandler;
+/*!
+ @method setPolicyHandler:
+ @param handler
+*/
- (void)setPolicyHandler: (id<WebControllerPolicyHandler>)handler;
-- (id<WebControllerPolicyHandler>)policyHandler;
-
-+ (WebURLPolicy *)defaultURLPolicyForURL: (NSURL *)URL;
-// FIXME: Should this method be private?
-// Called when a data source needs to create a frame. This method encapsulates the
-// specifics of creating and initializing a view of the appropriate class.
-- (WebFrame *)createFrameNamed: (NSString *)fname for: (WebDataSource *)child inParent: (WebDataSource *)parent allowsScrolling: (BOOL)allowsScrolling;
+/*!
+ @method policyHandler
+*/
+- (id<WebControllerPolicyHandler>)policyHandler;
-// Look for a frame named name, recursively.
+/*!
+ @method frameNamed:
+ Look for a frame named name, recursively.
+ @param name
+*/
- (WebFrame *)frameNamed: (NSString *)name;
-// Return the top level frame. Note that even document that are not framesets will have a
-// mainFrame.
+/*!
+ @method mainFrame
+ Return the top level frame. Note that even document that are not framesets will have a
+ mainFrame.
+*/
- (WebFrame *)mainFrame;
-// Return the frame associated with the data source. Traverses the
-// frame tree to find the data source.
+/*!
+ @method frameForDataSource:
+ Return the frame associated with the data source. Traverses the
+ frame tree to find the data source.
+ @param dataSource
+*/
- (WebFrame *)frameForDataSource: (WebDataSource *)dataSource;
-// Return the frame associated with the view. Traverses the
-// frame tree to find the view.
+/*!
+ @method frameForView:
+ Return the frame associated with the view. Traverses the
+ frame tree to find the view.
+ @param aView
+*/
- (WebFrame *)frameForView: (WebView *)aView;
-// API to manage animated images.
+/*!
+ @method stopAnimatedImages
+*/
- (void)stopAnimatedImages;
+
+/*!
+ @method startAnimatedImages
+*/
- (void)startAnimatedImages;
+/*!
+ @method stopAnimatedImageLooping
+*/
- (void)stopAnimatedImageLooping;
-- (void)startAnimatedImageLooping;
-+ (BOOL)canShowMIMEType:(NSString *)MIMEType;
-+ (BOOL)canShowFile:(NSString *)path;
+/*!
+ @method startAnimatedImageLooping
+*/
+- (void)startAnimatedImageLooping;
+/*!
+ @method backForwardList
+*/
- (WebBackForwardList *)backForwardList;
+/*!
+ @method setUseBackForwardList:
+ @param flag turns use of the back forward list on or off
+*/
- (void)setUseBackForwardList: (BOOL)flag;
+
+/*!
+ @method useBackForwardList
+*/
- (BOOL)useBackForwardList;
+
+/*!
+ @method goBack
+*/
- (BOOL)goBack;
+
+/*!
+ @method goForward
+*/
- (BOOL)goForward;
+/*!
+ @method setTextSizeMultiplier:
+ @param multiplier
+*/
- (void)setTextSizeMultiplier:(float)multiplier; // 1.0 is normal size
+
+/*!
+ @method textSizeMultiplier
+*/
- (float)textSizeMultiplier;
-// Set the application name. This name will be used in user-agent strings
-// that are chosen for best results in rendering web pages.
+/*!
+ @method setApplicationNameForUserAgent:
+ Set the application name. This name will be used in user-agent strings
+ that are chosen for best results in rendering web pages.
+ @param applicationName the application name
+*/
- (void)setApplicationNameForUserAgent:(NSString *)applicationName;
- (NSString *)applicationNameForUserAgent;
-// Set the user agent explicitly. Setting the user-agent string to nil means
-// that WebKit should construct the best possible user-agent string for each URL
-// for best results rendering web pages. Setting it to any string means
-// that WebKit should use that user-agent string for all purposes until it is set
-// back to nil.
+/*!
+ @method setUserAgent:
+ Set the user agent explicitly. Setting the user-agent string to nil means
+ that WebKit should construct the best possible user-agent string for each URL
+ for best results rendering web pages. Setting it to any string means
+ that WebKit should use that user-agent string for all purposes until it is set
+ back to nil.
+ @param userAgentString the user agent description
+*/
- (void)setUserAgent:(NSString *)userAgentString;
- (NSString *)userAgent;
-// Get the appropriate user-agent string for a particular URL.
+/*!
+ @method userAgentForURL:
+ @abstract Get the appropriate user-agent string for a particular URL.
+ @param URL
+*/
- (NSString *)userAgentForURL:(NSURL *)URL;
-// Find out if the current web page supports text encodings.
+/*!
+ @method supportsTextEncoding
+ @abstract Find out if the current web page supports text encodings.
+*/
- (BOOL)supportsTextEncoding;
-// Make the page display with a different text encoding; stops any load in progress.
-// The text encoding passed in overrides the normal text encoding smarts including
-// what's specified in a web page's header or HTTP response.
-// The text encoding automatically goes back to the default when the top level frame
-// changes to a new location.
+/*!
+ @method setCustomTextEncoding:
+ @discussion Make the page display with a different text encoding; stops any load in progress.
+ The text encoding passed in overrides the normal text encoding smarts including
+ what's specified in a web page's header or HTTP response.
+ The text encoding automatically goes back to the default when the top level frame
+ changes to a new location.
+ @param encoding
+*/
- (void)setCustomTextEncoding:(CFStringEncoding)encoding;
+
+/*!
+ @method resetTextEncoding
+*/
- (void)resetTextEncoding;
-// Find out the current state. It's an error to call customTextEncoding if hasCustomTextEncoding is NO.
+/*!
+ @method hasCustomTextEncoding
+ @abstract Determine whether or not a custom text encoding is in use.
+ @discussion It's an error to call customTextEncoding if hasCustomTextEncoding is NO.
+*/
- (BOOL)hasCustomTextEncoding;
+
+/*!
+ @method customTextEncoding
+*/
- (CFStringEncoding)customTextEncoding;
@end
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index e9999c2..59e0cc3 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -6,6 +6,7 @@
#import <WebKit/WebController.h>
#import <WebKit/WebBackForwardList.h>
+#import <WebKit/WebContextMenuHandler.h>
#import <WebKit/WebController.h>
#import <WebKit/WebControllerSets.h>
#import <WebKit/WebControllerPolicyHandler.h>
@@ -21,7 +22,9 @@
#import <WebKit/WebKitErrors.h>
#import <WebKit/WebKitStatisticsPrivate.h>
#import <WebKit/WebPluginDatabase.h>
+#import <WebKit/WebResourceProgressHandler.h>
#import <WebKit/WebViewPrivate.h>
+#import <WebKit/WebWindowContext.h>
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebResourceHandle.h>
@@ -71,30 +74,6 @@ NSString * WebContextMenuElementFrameKey = @"WebContextFrame";
}
-- (WebFrame *)createFrameNamed: (NSString *)fname for: (WebDataSource *)childDataSource inParent: (WebDataSource *)parentDataSource allowsScrolling: (BOOL)allowsScrolling
-{
- WebView *childView;
- WebFrame *newFrame;
-
- childView = [[WebView alloc] initWithFrame: NSMakeRect(0,0,0,0)];
-
- newFrame = [[WebFrame alloc] initWithName: fname webView: childView provisionalDataSource: childDataSource controller: self];
-
- [parentDataSource addFrame: newFrame];
-
- [newFrame release];
-
- [childView _setController: self];
- [childDataSource _setController: self];
-
- [childView setAllowsScrolling: allowsScrolling];
-
- [childView release];
-
- return newFrame;
-}
-
-
- (void)setWindowContext:(id <WebWindowContext>)context
{
[context retain];
diff --git a/WebKit/WebView.subproj/WebViewPrivate.h b/WebKit/WebView.subproj/WebViewPrivate.h
index 9b0f314..19bd657 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.h
+++ b/WebKit/WebView.subproj/WebViewPrivate.h
@@ -38,7 +38,14 @@
}
@end
- at interface WebController (WebPrivate);
+ at interface WebController (WebPrivate)
+
+/*
+ Called when a data source needs to create a frame. This method encapsulates the
+ specifics of creating and initializing a view of the appropriate class.
+*/
+- (WebFrame *)createFrameNamed: (NSString *)fname for: (WebDataSource *)child inParent: (WebDataSource *)parent allowsScrolling: (BOOL)allowsScrolling;
+
- (id<WebContextMenuHandler>)_defaultContextMenuHandler;
- (void)_receivedProgress: (WebLoadProgress *)progress forResourceHandle: (WebResourceHandle *)resourceHandle fromDataSource: (WebDataSource *)dataSource complete:(BOOL)isComplete;
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index 90a35ba..b7543ae 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -4,6 +4,7 @@
*/
#import <WebKit/WebBackForwardList.h>
+#import <WebKit/WebContextMenuHandler.h>
#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebControllerPolicyHandlerPrivate.h>
#import <WebKit/WebDataSourcePrivate.h>
@@ -11,8 +12,10 @@
#import <WebKit/WebFramePrivate.h>
#import <WebKit/WebLoadProgress.h>
#import <WebKit/WebPreferencesPrivate.h>
+#import <WebKit/WebResourceProgressHandler.h>
#import <WebKit/WebStandardPanelsPrivate.h>
#import <WebKit/WebViewPrivate.h>
+#import <WebKit/WebWindowContext.h>
#import <WebFoundation/WebAssertions.h>
@@ -82,6 +85,30 @@
@implementation WebController (WebPrivate)
+- (WebFrame *)createFrameNamed: (NSString *)fname for: (WebDataSource *)childDataSource inParent: (WebDataSource *)parentDataSource allowsScrolling: (BOOL)allowsScrolling
+{
+ WebView *childView;
+ WebFrame *newFrame;
+
+ childView = [[WebView alloc] initWithFrame: NSMakeRect(0,0,0,0)];
+
+ newFrame = [[WebFrame alloc] initWithName: fname webView: childView provisionalDataSource: childDataSource controller: self];
+
+ [parentDataSource addFrame: newFrame];
+
+ [newFrame release];
+
+ [childView _setController: self];
+ [childDataSource _setController: self];
+
+ [childView setAllowsScrolling: allowsScrolling];
+
+ [childView release];
+
+ return newFrame;
+}
+
+
- (id<WebContextMenuHandler>)_defaultContextMenuHandler
{
return _private->defaultContextMenuHandler;
diff --git a/WebKit/WebView.subproj/WebWindowContext.h b/WebKit/WebView.subproj/WebWindowContext.h
new file mode 100644
index 0000000..a9e8c27
--- /dev/null
+++ b/WebKit/WebView.subproj/WebWindowContext.h
@@ -0,0 +1,74 @@
+/*
+ WebWindowContext.h
+ Copyright 2001, 2002, Apple Computer, Inc.
+
+ Public header file.
+*/
+
+#import <Cocoa/Cocoa.h>
+
+ at class WebController;
+
+/*!
+ @protocol WebWindowContext
+ @discussion A class that implements WebWindowContext provides window-related methods
+ that may be used by Javascript, plugins and other aspects of web pages.
+*/
+ at protocol WebWindowContext <NSObject>
+/*!
+ @method openNewWindowWithURL:referrer:
+ @param URL
+ @param referrer
+*/
+- (WebController *)openNewWindowWithURL:(NSURL *)URL referrer:(NSString *)referrer;
+
+/*!
+ @method setStatusText:
+ @param text
+*/
+- (void)setStatusText:(NSString *)text;
+
+/*!
+ @method statusText
+*/
+- (NSString *)statusText;
+
+/*!
+ @method areToolbarsVisible
+*/
+- (BOOL)areToolbarsVisible;
+
+/*!
+ @method setToolbarsVisible:
+ @param visible
+*/
+- (void)setToolbarsVisible:(BOOL)visible;
+
+/*!
+ @method isStatusBarVisible
+*/
+- (BOOL)isStatusBarVisible;
+
+/*!
+ @method setStatusBarVisible:
+ @param visible
+*/
+- (void)setStatusBarVisible:(BOOL)visible;
+
+/*!
+ @method setFrame:
+ @discussion Even though a caller could set the frame directly using the NSWindow,
+ this method is provided so implementors of this protocol can do special
+ things on programmatic move/resize, like avoiding autosaving of the size.
+ @param frame
+*/
+- (void)setFrame:(NSRect)frame;
+
+/*!
+ @method window
+*/
+- (NSWindow *)window;
+
+ at end
+
+
diff --git a/WebKit/WebView.subproj/WebWindowOperationsDelegate.h b/WebKit/WebView.subproj/WebWindowOperationsDelegate.h
new file mode 100644
index 0000000..a9e8c27
--- /dev/null
+++ b/WebKit/WebView.subproj/WebWindowOperationsDelegate.h
@@ -0,0 +1,74 @@
+/*
+ WebWindowContext.h
+ Copyright 2001, 2002, Apple Computer, Inc.
+
+ Public header file.
+*/
+
+#import <Cocoa/Cocoa.h>
+
+ at class WebController;
+
+/*!
+ @protocol WebWindowContext
+ @discussion A class that implements WebWindowContext provides window-related methods
+ that may be used by Javascript, plugins and other aspects of web pages.
+*/
+ at protocol WebWindowContext <NSObject>
+/*!
+ @method openNewWindowWithURL:referrer:
+ @param URL
+ @param referrer
+*/
+- (WebController *)openNewWindowWithURL:(NSURL *)URL referrer:(NSString *)referrer;
+
+/*!
+ @method setStatusText:
+ @param text
+*/
+- (void)setStatusText:(NSString *)text;
+
+/*!
+ @method statusText
+*/
+- (NSString *)statusText;
+
+/*!
+ @method areToolbarsVisible
+*/
+- (BOOL)areToolbarsVisible;
+
+/*!
+ @method setToolbarsVisible:
+ @param visible
+*/
+- (void)setToolbarsVisible:(BOOL)visible;
+
+/*!
+ @method isStatusBarVisible
+*/
+- (BOOL)isStatusBarVisible;
+
+/*!
+ @method setStatusBarVisible:
+ @param visible
+*/
+- (void)setStatusBarVisible:(BOOL)visible;
+
+/*!
+ @method setFrame:
+ @discussion Even though a caller could set the frame directly using the NSWindow,
+ this method is provided so implementors of this protocol can do special
+ things on programmatic move/resize, like avoiding autosaving of the size.
+ @param frame
+*/
+- (void)setFrame:(NSRect)frame;
+
+/*!
+ @method window
+*/
+- (NSWindow *)window;
+
+ at end
+
+
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list