[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:43:24 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 3ca88877d79ea3d0f2656b906d9ee548479b86ac
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Sep 24 00:02:13 2002 +0000
WebContextMenuHandler becomes WebContextMenuDelegate
WebControllerPolicyHandler becomes WebControllerPolicyDelegate
WebLocationChangeHandler becomes WebLocationChangeDelegate
WebResourceProgressHandler becomes WebResourceProgressDelegate
WebWindowContext becomes WebWindowOperationsDelegate
* Misc.subproj/WebDownloadHandler.m:
* Plugins.subproj/WebNullPluginView.m:
(-[WebNullPluginView drawRect:]):
* Plugins.subproj/WebPluginView.m:
(-[WebNetscapePluginView loadRequest:inTarget:withNotifyData:]):
(-[WebNetscapePluginView status:]):
* WebCoreSupport.subproj/WebBridge.m:
(-[WebBridge openNewWindowWithURL:referrer:frameName:]):
(-[WebBridge areToolbarsVisible]):
(-[WebBridge setToolbarsVisible:]):
(-[WebBridge isStatusBarVisible]):
(-[WebBridge setStatusBarVisible:]):
(-[WebBridge setWindowFrame:]):
(-[WebBridge window]):
(-[WebBridge setStatusText:]):
(-[WebBridge reportClientRedirectTo:delay:fireDate:]):
(-[WebBridge reportClientRedirectCancelled]):
* WebKit.exp:
* WebKit.pbproj/project.pbxproj:
* WebView.subproj/WebContextMenuDelegate.h:
* WebView.subproj/WebContextMenuHandler.h: Removed.
* WebView.subproj/WebController.h:
* WebView.subproj/WebController.m:
(-[WebController setWindowOperationsDelegate:]):
(-[WebController windowOperationsDelegate]):
(-[WebController setResourceProgressDelegate:]):
(-[WebController resourceProgressDelegate]):
(-[WebController setDownloadProgressDelegate:]):
(-[WebController downloadProgressDelegate]):
(-[WebController setContextMenuDelegate:]):
(-[WebController contextMenuDelegate]):
(-[WebController setPolicyDelegate:]):
(-[WebController policyDelegate]):
(-[WebController setLocationChangeDelegate:]):
(-[WebController locationChangeDelegate]):
* WebView.subproj/WebControllerPolicyDelegate.m: Added.
(-[WebPolicyPrivate dealloc]):
(-[WebPolicy _setPolicyAction:]):
(-[WebPolicy policyAction]):
(-[WebPolicy path]):
(-[WebPolicy URL]):
(-[WebPolicy _setPath:]):
(-[WebPolicy dealloc]):
(+[WebURLPolicy webPolicyWithURLAction:]):
(+[WebFileURLPolicy webPolicyWithFileAction:]):
(+[WebContentPolicy webPolicyWithContentAction:andPath:]):
* WebView.subproj/WebControllerPolicyDelegatePrivate.h:
* WebView.subproj/WebControllerPolicyHandler.h: Removed.
* WebView.subproj/WebControllerPolicyHandler.m: Removed.
* WebView.subproj/WebControllerPolicyHandlerPrivate.h: Removed.
* WebView.subproj/WebControllerPrivate.h:
* WebView.subproj/WebControllerPrivate.m:
(-[WebControllerPrivate init]):
(-[WebControllerPrivate dealloc]):
(-[WebController _defaultContextMenuDelegate]):
(-[WebController _receivedProgress:forResourceHandle:fromDataSource:complete:]):
(-[WebController _mainReceivedProgress:forResourceHandle:fromDataSource:complete:]):
(-[WebController _receivedError:forResourceHandle:partialProgress:fromDataSource:]):
(-[WebController _mainReceivedError:forResourceHandle:partialProgress:fromDataSource:]):
* WebView.subproj/WebDataSourcePrivate.m:
(-[WebDataSource _startLoading]):
(-[WebDataSource _setTitle:]):
(-[WebDataSource _setURL:]):
(-[WebDataSource _loadIcon]):
* WebView.subproj/WebDefaultContextMenuDelegate.h:
* WebView.subproj/WebDefaultContextMenuDelegate.m:
(-[WebDefaultContextMenuDelegate openNewWindowWithURL:referrer:]):
(-[WebDefaultContextMenuDelegate downloadURL:]):
* WebView.subproj/WebDefaultContextMenuHandler.h: Removed.
* WebView.subproj/WebDefaultContextMenuHandler.m: Removed.
* WebView.subproj/WebDefaultPolicyDelegate.h:
* WebView.subproj/WebDefaultPolicyDelegate.m:
* WebView.subproj/WebDefaultPolicyHandler.h: Removed.
* WebView.subproj/WebDefaultPolicyHandler.m: Removed.
* WebView.subproj/WebDocument.h:
* WebView.subproj/WebFrame.m:
(-[WebFrame setProvisionalDataSource:]):
(-[WebFrame frameNamed:]):
* WebView.subproj/WebFramePrivate.m:
(-[WebFrame _timedLayout:]):
(-[WebFrame _transitionToCommitted]):
(-[WebFrame _isLoadComplete]):
(-[WebFrame handleUnimplementablePolicy:errorCode:forURL:]):
(-[WebFrame _shouldShowURL:]):
* WebView.subproj/WebHTMLView.m:
(-[WebHTMLView menuForEvent:]):
* WebView.subproj/WebHTMLViewPrivate.m:
(-[WebHTMLView _continueAfterClickPolicyForEvent:]):
* WebView.subproj/WebImageView.m:
(-[WebImageView setNeedsLayout:]):
* WebView.subproj/WebLocationChangeDelegate.h:
* WebView.subproj/WebLocationChangeDelegate.m:
* WebView.subproj/WebLocationChangeHandler.h: Removed.
* WebView.subproj/WebLocationChangeHandler.m: Removed.
* WebView.subproj/WebMainResourceClient.h:
* WebView.subproj/WebMainResourceClient.m:
(-[WebMainResourceClient dealloc]):
(-[WebMainResourceClient receivedProgressWithHandle:complete:]):
(-[WebMainResourceClient receivedError:forHandle:]):
(-[WebMainResourceClient handleDidReceiveData:data:]):
* WebView.subproj/WebResourceProgressDelegate.h:
* WebView.subproj/WebResourceProgressHandler.h: Removed.
* WebView.subproj/WebView.m:
(-[WebView window]):
* WebView.subproj/WebWindowContext.h: Removed.
* WebView.subproj/WebWindowOperationsDelegate.h:
WebContextMenuHandler becomes WebContextMenuDelegate
WebControllerPolicyHandler becomes WebControllerPolicyDelegate
WebLocationChangeHandler becomes WebLocationChangeDelegate
WebResourceProgressHandler becomes WebResourceProgressDelegate
WebWindowContext becomes WebWindowOperationsDelegate
* BrowserDocument.h:
* BrowserDocument.m:
(-[BrowserDocument init]):
(-[BrowserDocument dealloc]):
(-[BrowserDocument close]):
* BrowserWebController.h:
* BrowserWebController.m:
(-[BrowserWebController setFrame:]):
* ContextMenuHandler.h:
* ContextMenuHandler.m:
(-[ContextMenuHandler contextMenuItemsForElement:defaultMenuItems:]):
* DownloadMonitor.h:
* LocationChangeHandler.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2131 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 83b0db1..9ba3ef7 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,118 @@
+2002-09-23 Richard Williamson <rjw at apple.com>
+
+ WebContextMenuHandler becomes WebContextMenuDelegate
+ WebControllerPolicyHandler becomes WebControllerPolicyDelegate
+ WebLocationChangeHandler becomes WebLocationChangeDelegate
+ WebResourceProgressHandler becomes WebResourceProgressDelegate
+ WebWindowContext becomes WebWindowOperationsDelegate
+
+ * Misc.subproj/WebDownloadHandler.m:
+ * Plugins.subproj/WebNullPluginView.m:
+ (-[WebNullPluginView drawRect:]):
+ * Plugins.subproj/WebPluginView.m:
+ (-[WebNetscapePluginView loadRequest:inTarget:withNotifyData:]):
+ (-[WebNetscapePluginView status:]):
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge openNewWindowWithURL:referrer:frameName:]):
+ (-[WebBridge areToolbarsVisible]):
+ (-[WebBridge setToolbarsVisible:]):
+ (-[WebBridge isStatusBarVisible]):
+ (-[WebBridge setStatusBarVisible:]):
+ (-[WebBridge setWindowFrame:]):
+ (-[WebBridge window]):
+ (-[WebBridge setStatusText:]):
+ (-[WebBridge reportClientRedirectTo:delay:fireDate:]):
+ (-[WebBridge reportClientRedirectCancelled]):
+ * WebKit.exp:
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/WebContextMenuDelegate.h:
+ * WebView.subproj/WebContextMenuHandler.h: Removed.
+ * WebView.subproj/WebController.h:
+ * WebView.subproj/WebController.m:
+ (-[WebController setWindowOperationsDelegate:]):
+ (-[WebController windowOperationsDelegate]):
+ (-[WebController setResourceProgressDelegate:]):
+ (-[WebController resourceProgressDelegate]):
+ (-[WebController setDownloadProgressDelegate:]):
+ (-[WebController downloadProgressDelegate]):
+ (-[WebController setContextMenuDelegate:]):
+ (-[WebController contextMenuDelegate]):
+ (-[WebController setPolicyDelegate:]):
+ (-[WebController policyDelegate]):
+ (-[WebController setLocationChangeDelegate:]):
+ (-[WebController locationChangeDelegate]):
+ * WebView.subproj/WebControllerPolicyDelegate.m: Added.
+ (-[WebPolicyPrivate dealloc]):
+ (-[WebPolicy _setPolicyAction:]):
+ (-[WebPolicy policyAction]):
+ (-[WebPolicy path]):
+ (-[WebPolicy URL]):
+ (-[WebPolicy _setPath:]):
+ (-[WebPolicy dealloc]):
+ (+[WebURLPolicy webPolicyWithURLAction:]):
+ (+[WebFileURLPolicy webPolicyWithFileAction:]):
+ (+[WebContentPolicy webPolicyWithContentAction:andPath:]):
+ * WebView.subproj/WebControllerPolicyDelegatePrivate.h:
+ * WebView.subproj/WebControllerPolicyHandler.h: Removed.
+ * WebView.subproj/WebControllerPolicyHandler.m: Removed.
+ * WebView.subproj/WebControllerPolicyHandlerPrivate.h: Removed.
+ * WebView.subproj/WebControllerPrivate.h:
+ * WebView.subproj/WebControllerPrivate.m:
+ (-[WebControllerPrivate init]):
+ (-[WebControllerPrivate dealloc]):
+ (-[WebController _defaultContextMenuDelegate]):
+ (-[WebController _receivedProgress:forResourceHandle:fromDataSource:complete:]):
+ (-[WebController _mainReceivedProgress:forResourceHandle:fromDataSource:complete:]):
+ (-[WebController _receivedError:forResourceHandle:partialProgress:fromDataSource:]):
+ (-[WebController _mainReceivedError:forResourceHandle:partialProgress:fromDataSource:]):
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSource _startLoading]):
+ (-[WebDataSource _setTitle:]):
+ (-[WebDataSource _setURL:]):
+ (-[WebDataSource _loadIcon]):
+ * WebView.subproj/WebDefaultContextMenuDelegate.h:
+ * WebView.subproj/WebDefaultContextMenuDelegate.m:
+ (-[WebDefaultContextMenuDelegate openNewWindowWithURL:referrer:]):
+ (-[WebDefaultContextMenuDelegate downloadURL:]):
+ * WebView.subproj/WebDefaultContextMenuHandler.h: Removed.
+ * WebView.subproj/WebDefaultContextMenuHandler.m: Removed.
+ * WebView.subproj/WebDefaultPolicyDelegate.h:
+ * WebView.subproj/WebDefaultPolicyDelegate.m:
+ * WebView.subproj/WebDefaultPolicyHandler.h: Removed.
+ * WebView.subproj/WebDefaultPolicyHandler.m: Removed.
+ * WebView.subproj/WebDocument.h:
+ * WebView.subproj/WebFrame.m:
+ (-[WebFrame setProvisionalDataSource:]):
+ (-[WebFrame frameNamed:]):
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFrame _timedLayout:]):
+ (-[WebFrame _transitionToCommitted]):
+ (-[WebFrame _isLoadComplete]):
+ (-[WebFrame handleUnimplementablePolicy:errorCode:forURL:]):
+ (-[WebFrame _shouldShowURL:]):
+ * WebView.subproj/WebHTMLView.m:
+ (-[WebHTMLView menuForEvent:]):
+ * WebView.subproj/WebHTMLViewPrivate.m:
+ (-[WebHTMLView _continueAfterClickPolicyForEvent:]):
+ * WebView.subproj/WebImageView.m:
+ (-[WebImageView setNeedsLayout:]):
+ * WebView.subproj/WebLocationChangeDelegate.h:
+ * WebView.subproj/WebLocationChangeDelegate.m:
+ * WebView.subproj/WebLocationChangeHandler.h: Removed.
+ * WebView.subproj/WebLocationChangeHandler.m: Removed.
+ * WebView.subproj/WebMainResourceClient.h:
+ * WebView.subproj/WebMainResourceClient.m:
+ (-[WebMainResourceClient dealloc]):
+ (-[WebMainResourceClient receivedProgressWithHandle:complete:]):
+ (-[WebMainResourceClient receivedError:forHandle:]):
+ (-[WebMainResourceClient handleDidReceiveData:data:]):
+ * WebView.subproj/WebResourceProgressDelegate.h:
+ * WebView.subproj/WebResourceProgressHandler.h: Removed.
+ * WebView.subproj/WebView.m:
+ (-[WebView window]):
+ * WebView.subproj/WebWindowContext.h: Removed.
+ * WebView.subproj/WebWindowOperationsDelegate.h:
+
2002-09-23 Darin Adler <darin at apple.com>
- fixed 3052543 -- iframes don't work with z-index
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 83b0db1..9ba3ef7 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,118 @@
+2002-09-23 Richard Williamson <rjw at apple.com>
+
+ WebContextMenuHandler becomes WebContextMenuDelegate
+ WebControllerPolicyHandler becomes WebControllerPolicyDelegate
+ WebLocationChangeHandler becomes WebLocationChangeDelegate
+ WebResourceProgressHandler becomes WebResourceProgressDelegate
+ WebWindowContext becomes WebWindowOperationsDelegate
+
+ * Misc.subproj/WebDownloadHandler.m:
+ * Plugins.subproj/WebNullPluginView.m:
+ (-[WebNullPluginView drawRect:]):
+ * Plugins.subproj/WebPluginView.m:
+ (-[WebNetscapePluginView loadRequest:inTarget:withNotifyData:]):
+ (-[WebNetscapePluginView status:]):
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge openNewWindowWithURL:referrer:frameName:]):
+ (-[WebBridge areToolbarsVisible]):
+ (-[WebBridge setToolbarsVisible:]):
+ (-[WebBridge isStatusBarVisible]):
+ (-[WebBridge setStatusBarVisible:]):
+ (-[WebBridge setWindowFrame:]):
+ (-[WebBridge window]):
+ (-[WebBridge setStatusText:]):
+ (-[WebBridge reportClientRedirectTo:delay:fireDate:]):
+ (-[WebBridge reportClientRedirectCancelled]):
+ * WebKit.exp:
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/WebContextMenuDelegate.h:
+ * WebView.subproj/WebContextMenuHandler.h: Removed.
+ * WebView.subproj/WebController.h:
+ * WebView.subproj/WebController.m:
+ (-[WebController setWindowOperationsDelegate:]):
+ (-[WebController windowOperationsDelegate]):
+ (-[WebController setResourceProgressDelegate:]):
+ (-[WebController resourceProgressDelegate]):
+ (-[WebController setDownloadProgressDelegate:]):
+ (-[WebController downloadProgressDelegate]):
+ (-[WebController setContextMenuDelegate:]):
+ (-[WebController contextMenuDelegate]):
+ (-[WebController setPolicyDelegate:]):
+ (-[WebController policyDelegate]):
+ (-[WebController setLocationChangeDelegate:]):
+ (-[WebController locationChangeDelegate]):
+ * WebView.subproj/WebControllerPolicyDelegate.m: Added.
+ (-[WebPolicyPrivate dealloc]):
+ (-[WebPolicy _setPolicyAction:]):
+ (-[WebPolicy policyAction]):
+ (-[WebPolicy path]):
+ (-[WebPolicy URL]):
+ (-[WebPolicy _setPath:]):
+ (-[WebPolicy dealloc]):
+ (+[WebURLPolicy webPolicyWithURLAction:]):
+ (+[WebFileURLPolicy webPolicyWithFileAction:]):
+ (+[WebContentPolicy webPolicyWithContentAction:andPath:]):
+ * WebView.subproj/WebControllerPolicyDelegatePrivate.h:
+ * WebView.subproj/WebControllerPolicyHandler.h: Removed.
+ * WebView.subproj/WebControllerPolicyHandler.m: Removed.
+ * WebView.subproj/WebControllerPolicyHandlerPrivate.h: Removed.
+ * WebView.subproj/WebControllerPrivate.h:
+ * WebView.subproj/WebControllerPrivate.m:
+ (-[WebControllerPrivate init]):
+ (-[WebControllerPrivate dealloc]):
+ (-[WebController _defaultContextMenuDelegate]):
+ (-[WebController _receivedProgress:forResourceHandle:fromDataSource:complete:]):
+ (-[WebController _mainReceivedProgress:forResourceHandle:fromDataSource:complete:]):
+ (-[WebController _receivedError:forResourceHandle:partialProgress:fromDataSource:]):
+ (-[WebController _mainReceivedError:forResourceHandle:partialProgress:fromDataSource:]):
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSource _startLoading]):
+ (-[WebDataSource _setTitle:]):
+ (-[WebDataSource _setURL:]):
+ (-[WebDataSource _loadIcon]):
+ * WebView.subproj/WebDefaultContextMenuDelegate.h:
+ * WebView.subproj/WebDefaultContextMenuDelegate.m:
+ (-[WebDefaultContextMenuDelegate openNewWindowWithURL:referrer:]):
+ (-[WebDefaultContextMenuDelegate downloadURL:]):
+ * WebView.subproj/WebDefaultContextMenuHandler.h: Removed.
+ * WebView.subproj/WebDefaultContextMenuHandler.m: Removed.
+ * WebView.subproj/WebDefaultPolicyDelegate.h:
+ * WebView.subproj/WebDefaultPolicyDelegate.m:
+ * WebView.subproj/WebDefaultPolicyHandler.h: Removed.
+ * WebView.subproj/WebDefaultPolicyHandler.m: Removed.
+ * WebView.subproj/WebDocument.h:
+ * WebView.subproj/WebFrame.m:
+ (-[WebFrame setProvisionalDataSource:]):
+ (-[WebFrame frameNamed:]):
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFrame _timedLayout:]):
+ (-[WebFrame _transitionToCommitted]):
+ (-[WebFrame _isLoadComplete]):
+ (-[WebFrame handleUnimplementablePolicy:errorCode:forURL:]):
+ (-[WebFrame _shouldShowURL:]):
+ * WebView.subproj/WebHTMLView.m:
+ (-[WebHTMLView menuForEvent:]):
+ * WebView.subproj/WebHTMLViewPrivate.m:
+ (-[WebHTMLView _continueAfterClickPolicyForEvent:]):
+ * WebView.subproj/WebImageView.m:
+ (-[WebImageView setNeedsLayout:]):
+ * WebView.subproj/WebLocationChangeDelegate.h:
+ * WebView.subproj/WebLocationChangeDelegate.m:
+ * WebView.subproj/WebLocationChangeHandler.h: Removed.
+ * WebView.subproj/WebLocationChangeHandler.m: Removed.
+ * WebView.subproj/WebMainResourceClient.h:
+ * WebView.subproj/WebMainResourceClient.m:
+ (-[WebMainResourceClient dealloc]):
+ (-[WebMainResourceClient receivedProgressWithHandle:complete:]):
+ (-[WebMainResourceClient receivedError:forHandle:]):
+ (-[WebMainResourceClient handleDidReceiveData:data:]):
+ * WebView.subproj/WebResourceProgressDelegate.h:
+ * WebView.subproj/WebResourceProgressHandler.h: Removed.
+ * WebView.subproj/WebView.m:
+ (-[WebView window]):
+ * WebView.subproj/WebWindowContext.h: Removed.
+ * WebView.subproj/WebWindowOperationsDelegate.h:
+
2002-09-23 Darin Adler <darin at apple.com>
- fixed 3052543 -- iframes don't work with z-index
diff --git a/WebKit/Misc.subproj/WebDownloadHandler.m b/WebKit/Misc.subproj/WebDownloadHandler.m
index 9a5daeb..55a9c04 100644
--- a/WebKit/Misc.subproj/WebDownloadHandler.m
+++ b/WebKit/Misc.subproj/WebDownloadHandler.m
@@ -6,7 +6,7 @@
// Copyright (c) 2002 Apple Computer, Inc.
//
-#import <WebKit/WebControllerPolicyHandlerPrivate.h>
+#import <WebKit/WebControllerPolicyDelegatePrivate.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebDownloadHandler.h>
#import <WebKit/WebKitErrors.h>
diff --git a/WebKit/Plugins.subproj/WebNullPluginView.m b/WebKit/Plugins.subproj/WebNullPluginView.m
index edcb599..62c8fa0 100644
--- a/WebKit/Plugins.subproj/WebNullPluginView.m
+++ b/WebKit/Plugins.subproj/WebNullPluginView.m
@@ -56,7 +56,7 @@ static NSImage *image = nil;
errorSent = YES;
webView = (WebView *)[self _web_superviewOfClass:[WebView class]];
webController = [webView controller];
- [[webController policyHandler] pluginNotFoundForMIMEType:mimeType pluginPageURL:pluginPage];
+ [[webController policyDelegate] pluginNotFoundForMIMEType:mimeType pluginPageURL:pluginPage];
}
}
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index bf3070f..1e1d835 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -19,7 +19,7 @@
#import <WebKit/WebPluginView.h>
#import <WebKit/WebPlugin.h>
#import <WebKit/WebView.h>
-#import <WebKit/WebWindowContext.h>
+#import <WebKit/WebWindowOperationsDelegate.h>
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebError.h>
@@ -880,7 +880,7 @@
frame = [webFrame frameNamed:target];
if(!frame){
// FIXME: Why is it OK to just discard all the attributes in this case?
- [[webController windowContext] openNewWindowWithURL:URL referrer:nil];
+ [[webController windowOperationsDelegate] openNewWindowWithURL:URL referrer:nil];
// FIXME: Need to send NPP_URLNotify at the right time.
// FIXME: Need to name new frame
if(notifyData)
@@ -1037,7 +1037,7 @@
{
LOG(Plugins, "NPN_Status: %s", message);
if(webController){
- [[webController windowContext] setStatusText:[NSString stringWithCString:message]];
+ [[webController windowOperationsDelegate] setStatusText:[NSString stringWithCString:message]];
}
}
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 3bc9b63..aa981db 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -16,7 +16,7 @@
#import <WebKit/WebLoadProgress.h>
#import <WebKit/WebSubresourceClient.h>
#import <WebKit/WebViewPrivate.h>
-#import <WebKit/WebWindowContext.h>
+#import <WebKit/WebWindowOperationsDelegate.h>
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebError.h>
@@ -68,7 +68,7 @@
{
ASSERT(frame != nil);
- WebController *newController = [[[frame controller] windowContext] openNewWindowWithURL:URL referrer:referrer];
+ WebController *newController = [[[frame controller] windowOperationsDelegate] openNewWindowWithURL:URL referrer:referrer];
[newController _setTopLevelFrameName:name];
WebFrame *newFrame = [newController mainFrame];
return [newFrame _bridge];
@@ -77,13 +77,13 @@
- (BOOL)areToolbarsVisible
{
ASSERT(frame != nil);
- return [[[frame controller] windowContext] areToolbarsVisible];
+ return [[[frame controller] windowOperationsDelegate] areToolbarsVisible];
}
- (void)setToolbarsVisible:(BOOL)visible
{
ASSERT(frame != nil);
- [[[frame controller] windowContext] setToolbarsVisible:visible];
+ [[[frame controller] windowOperationsDelegate] setToolbarsVisible:visible];
}
- (BOOL)areScrollbarsVisible
@@ -101,25 +101,25 @@
- (BOOL)isStatusBarVisible
{
ASSERT(frame != nil);
- return [[[frame controller] windowContext] isStatusBarVisible];
+ return [[[frame controller] windowOperationsDelegate] isStatusBarVisible];
}
- (void)setStatusBarVisible:(BOOL)visible
{
ASSERT(frame != nil);
- [[[frame controller] windowContext] setStatusBarVisible:visible];
+ [[[frame controller] windowOperationsDelegate] setStatusBarVisible:visible];
}
- (void)setWindowFrame:(NSRect)frameRect
{
ASSERT(frame != nil);
- [[[frame controller] windowContext] setFrame:frameRect];
+ [[[frame controller] windowOperationsDelegate] setFrame:frameRect];
}
- (NSWindow *)window
{
ASSERT(frame != nil);
- return [[[frame controller] windowContext] window];
+ return [[[frame controller] windowOperationsDelegate] window];
}
- (void)setTitle:(NSString *)title
@@ -130,7 +130,7 @@
- (void)setStatusText:(NSString *)status
{
ASSERT(frame != nil);
- [[[frame controller] windowContext] setStatusText:status];
+ [[[frame controller] windowOperationsDelegate] setStatusText:status];
}
- (WebCoreBridge *)mainFrame
@@ -181,12 +181,12 @@
- (void)reportClientRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date
{
- [[[frame controller] locationChangeHandler] clientRedirectTo:URL delay:seconds fireDate:date forFrame:frame];
+ [[[frame controller] locationChangeDelegate] clientRedirectTo:URL delay:seconds fireDate:date forFrame:frame];
}
- (void)reportClientRedirectCancelled
{
- [[[frame controller] locationChangeHandler] clientRedirectCancelledForFrame:frame];
+ [[[frame controller] locationChangeDelegate] clientRedirectCancelledForFrame:frame];
}
- (void)setFrame:(WebFrame *)webFrame
diff --git a/WebKit/WebKit.exp b/WebKit/WebKit.exp
index 788c111..795376b 100644
--- a/WebKit/WebKit.exp
+++ b/WebKit/WebKit.exp
@@ -6,8 +6,8 @@
.objc_class_name_WebCoreStatistics
.objc_class_name_WebDOMNode
.objc_class_name_WebDataSource
-.objc_class_name_WebDefaultContextMenuHandler
-.objc_class_name_WebDefaultPolicyHandler
+.objc_class_name_WebDefaultContextMenuDelegate
+.objc_class_name_WebDefaultPolicyDelegate
.objc_class_name_WebFileURLPolicy
.objc_class_name_WebFrame
.objc_class_name_WebHTMLView
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 6bbd1c5..b764dc2 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -217,7 +217,6 @@
F5883BE2025E5E9D01000102,
F5A672BB0263866E01000102,
F5A672BD0263866E01000102,
- F567433F026B5B7B01A80181,
F5065221027F557E01C1A526,
F5065222027F557E01C1A526,
F5065224027F557E01C1A526,
@@ -256,14 +255,10 @@
F5A55DC802BAA2E8018635CC,
F5E0E10A02BC45F8018635CA,
F5488CF602CB04EE01FF6274,
- F5927D4B02D253C401CA2DBB,
F5927D4F02D26C5E01CA2DBB,
F53444D002E87CBA018635CA,
F53444D302E87D4B018635CA,
F5934C8A02E894F50197FBCF,
- F649E40602EE0D1901CA2ACD,
- 354F260002EF441D0ACA2ACA,
- 3519E9EF02F0DF570ACA2ACA,
F5E7B24703025CE801A80180,
F501251D0302EA04018635CE,
F560BEBE030DAF4401C1A526,
@@ -272,10 +267,15 @@
931A72D303265920008635CE,
93AEB17F032C1735008635CE,
6523FAD1032DA06B005EFCFF,
- 5130FC36033940B400CA2ACD,
- 5130FC380339411F00CA2ACD,
- 5130FC3A033946E600CA2ACD,
ED2B2476033A2DA800C1A526,
+ 5152FAD6033FC43400CA2ACD,
+ 5152FADA033FC44A00CA2ACD,
+ 5152FADC033FC44A00CA2ACD,
+ 5152FAE1033FC50400CA2ACD,
+ 5152FAE3033FC50400CA2ACD,
+ 5152FAE7033FC52200CA2ACD,
+ 5152FAEA033FC53500CA2ACD,
+ 511D5554033FD51000CA2ACD,
);
isa = PBXHeadersBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -352,10 +352,6 @@
F5488CF702CB04EE01FF6274,
F53444D102E87CBA018635CA,
F5934C8B02E894F50197FBCF,
- F649E40702EE0D1901CA2ACD,
- 354F260102EF441D0ACA2ACA,
- 35E371B502F0BAC60ACA2ACA,
- F505C20C02FB4F18018635CE,
F5F732D302FF4D4F01A80180,
F5E7B24803025CE801A80180,
F501251E0302EA04018635CE,
@@ -364,6 +360,10 @@
93AEB180032C1735008635CE,
6523FAD2032DA06B005EFCFF,
ED2B2477033A2DA800C1A526,
+ 5152FADB033FC44A00CA2ACD,
+ 5152FAE2033FC50400CA2ACD,
+ 5152FAE4033FC50400CA2ACD,
+ 5152FAE8033FC52200CA2ACD,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -706,57 +706,6 @@
);
};
};
- 3519E9EE02F0DF570ACA2ACA = {
- fileEncoding = 30;
- isa = PBXFileReference;
- path = WebControllerPolicyHandlerPrivate.h;
- refType = 4;
- };
- 3519E9EF02F0DF570ACA2ACA = {
- fileRef = 3519E9EE02F0DF570ACA2ACA;
- isa = PBXBuildFile;
- settings = {
- };
- };
- 354F25FE02EF441D0ACA2ACA = {
- fileEncoding = 30;
- isa = PBXFileReference;
- path = WebDefaultContextMenuHandler.h;
- refType = 4;
- };
- 354F25FF02EF441D0ACA2ACA = {
- fileEncoding = 30;
- isa = PBXFileReference;
- path = WebDefaultContextMenuHandler.m;
- refType = 4;
- };
- 354F260002EF441D0ACA2ACA = {
- fileRef = 354F25FE02EF441D0ACA2ACA;
- isa = PBXBuildFile;
- settings = {
- ATTRIBUTES = (
- Public,
- );
- };
- };
- 354F260102EF441D0ACA2ACA = {
- fileRef = 354F25FF02EF441D0ACA2ACA;
- isa = PBXBuildFile;
- settings = {
- };
- };
- 35E371B402F0BAC60ACA2ACA = {
- fileEncoding = 30;
- isa = PBXFileReference;
- path = WebControllerPolicyHandler.m;
- refType = 4;
- };
- 35E371B502F0BAC60ACA2ACA = {
- fileRef = 35E371B402F0BAC60ACA2ACA;
- isa = PBXBuildFile;
- settings = {
- };
- };
35F3577E0198AAB80ACA1520 = {
children = (
35F3577F0198AAB80ACA1520,
@@ -1114,14 +1063,15 @@
//512
//513
//514
- 5130FC35033940B400CA2ACD = {
- fileEncoding = 4;
+ 511D5553033FD51000CA2ACD = {
+ fileEncoding = 30;
isa = PBXFileReference;
- path = WebWindowContext.h;
- refType = 4;
+ name = WebWindowOperationsDelegate.h;
+ path = WebView.subproj/WebWindowOperationsDelegate.h;
+ refType = 2;
};
- 5130FC36033940B400CA2ACD = {
- fileRef = 5130FC35033940B400CA2ACD;
+ 511D5554033FD51000CA2ACD = {
+ fileRef = 511D5553033FD51000CA2ACD;
isa = PBXBuildFile;
settings = {
ATTRIBUTES = (
@@ -1129,14 +1079,15 @@
);
};
};
- 5130FC370339411F00CA2ACD = {
- fileEncoding = 4;
+ 5152FAD5033FC43400CA2ACD = {
+ fileEncoding = 30;
isa = PBXFileReference;
- path = WebResourceProgressHandler.h;
- refType = 4;
+ name = WebContextMenuDelegate.h;
+ path = WebView.subproj/WebContextMenuDelegate.h;
+ refType = 2;
};
- 5130FC380339411F00CA2ACD = {
- fileRef = 5130FC370339411F00CA2ACD;
+ 5152FAD6033FC43400CA2ACD = {
+ fileRef = 5152FAD5033FC43400CA2ACD;
isa = PBXBuildFile;
settings = {
ATTRIBUTES = (
@@ -1144,14 +1095,144 @@
);
};
};
- 5130FC39033946E600CA2ACD = {
- fileEncoding = 4;
+ 5152FAD7033FC44A00CA2ACD = {
+ fileEncoding = 30;
isa = PBXFileReference;
- path = WebContextMenuHandler.h;
- refType = 4;
+ name = WebControllerPolicyDelegate.h;
+ path = WebView.subproj/WebControllerPolicyDelegate.h;
+ refType = 2;
+ };
+ 5152FAD8033FC44A00CA2ACD = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ name = WebControllerPolicyDelegate.m;
+ path = WebView.subproj/WebControllerPolicyDelegate.m;
+ refType = 2;
+ };
+ 5152FAD9033FC44A00CA2ACD = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ name = WebControllerPolicyDelegatePrivate.h;
+ path = WebView.subproj/WebControllerPolicyDelegatePrivate.h;
+ refType = 2;
+ };
+ 5152FADA033FC44A00CA2ACD = {
+ fileRef = 5152FAD7033FC44A00CA2ACD;
+ isa = PBXBuildFile;
+ settings = {
+ ATTRIBUTES = (
+ Public,
+ );
+ };
+ };
+ 5152FADB033FC44A00CA2ACD = {
+ fileRef = 5152FAD8033FC44A00CA2ACD;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 5152FADC033FC44A00CA2ACD = {
+ fileRef = 5152FAD9033FC44A00CA2ACD;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 5152FADD033FC50400CA2ACD = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ name = WebDefaultContextMenuDelegate.h;
+ path = WebView.subproj/WebDefaultContextMenuDelegate.h;
+ refType = 2;
+ };
+ 5152FADE033FC50400CA2ACD = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ name = WebDefaultContextMenuDelegate.m;
+ path = WebView.subproj/WebDefaultContextMenuDelegate.m;
+ refType = 2;
};
- 5130FC3A033946E600CA2ACD = {
- fileRef = 5130FC39033946E600CA2ACD;
+ 5152FADF033FC50400CA2ACD = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ name = WebDefaultPolicyDelegate.h;
+ path = WebView.subproj/WebDefaultPolicyDelegate.h;
+ refType = 2;
+ };
+ 5152FAE0033FC50400CA2ACD = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ name = WebDefaultPolicyDelegate.m;
+ path = WebView.subproj/WebDefaultPolicyDelegate.m;
+ refType = 2;
+ };
+ 5152FAE1033FC50400CA2ACD = {
+ fileRef = 5152FADD033FC50400CA2ACD;
+ isa = PBXBuildFile;
+ settings = {
+ ATTRIBUTES = (
+ Public,
+ );
+ };
+ };
+ 5152FAE2033FC50400CA2ACD = {
+ fileRef = 5152FADE033FC50400CA2ACD;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 5152FAE3033FC50400CA2ACD = {
+ fileRef = 5152FADF033FC50400CA2ACD;
+ isa = PBXBuildFile;
+ settings = {
+ ATTRIBUTES = (
+ Public,
+ );
+ };
+ };
+ 5152FAE4033FC50400CA2ACD = {
+ fileRef = 5152FAE0033FC50400CA2ACD;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 5152FAE5033FC52200CA2ACD = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ name = WebLocationChangeDelegate.h;
+ path = WebView.subproj/WebLocationChangeDelegate.h;
+ refType = 2;
+ };
+ 5152FAE6033FC52200CA2ACD = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ name = WebLocationChangeDelegate.m;
+ path = WebView.subproj/WebLocationChangeDelegate.m;
+ refType = 2;
+ };
+ 5152FAE7033FC52200CA2ACD = {
+ fileRef = 5152FAE5033FC52200CA2ACD;
+ isa = PBXBuildFile;
+ settings = {
+ ATTRIBUTES = (
+ Public,
+ );
+ };
+ };
+ 5152FAE8033FC52200CA2ACD = {
+ fileRef = 5152FAE6033FC52200CA2ACD;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 5152FAE9033FC53500CA2ACD = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ name = WebResourceProgressDelegate.h;
+ path = WebView.subproj/WebResourceProgressDelegate.h;
+ refType = 2;
+ };
+ 5152FAEA033FC53500CA2ACD = {
+ fileRef = 5152FAE9033FC53500CA2ACD;
isa = PBXBuildFile;
settings = {
ATTRIBUTES = (
@@ -1256,6 +1337,7 @@
//9C4
9C7CABBB0190A37C0ECA16EA = {
children = (
+ 5152FAD5033FC43400CA2ACD,
F52CA6BD02DF9D0F018635CA,
F52CA6BE02DF9D49018635CA,
F52CA6BF02DF9D4D018635CA,
@@ -1264,8 +1346,6 @@
3944606C020F50ED0ECA1767,
F58BAB3A025036CA01C1A526,
F58BAB380250363E01C1A526,
- F567433E026B5B7B01A80181,
- F505C20B02FB4F18018635CE,
F5D538E802441F2601A80181,
F5D538EC02441FDD01A80181,
3944606E020F50ED0ECA1767,
@@ -1273,9 +1353,6 @@
F5AEBB3D024A527601C1A526,
3944606F020F50ED0ECA1767,
39446064020F50ED0ECA1767,
- F5927D4A02D253C401CA2DBB,
- 3519E9EE02F0DF570ACA2ACA,
- 35E371B402F0BAC60ACA2ACA,
39446065020F50ED0ECA1767,
39446066020F50ED0ECA1767,
39446070020F50ED0ECA1767,
@@ -1290,15 +1367,19 @@
F5143A370221DCCE01A80181,
9CF0E249021361B00ECA16EA,
9CF0E24A021361B00ECA16EA,
- F649E40402EE0D1901CA2ACD,
- F649E40502EE0D1901CA2ACD,
- 354F25FE02EF441D0ACA2ACA,
- 354F25FF02EF441D0ACA2ACA,
6523FACF032DA06B005EFCFF,
6523FAD0032DA06B005EFCFF,
- 5130FC35033940B400CA2ACD,
- 5130FC370339411F00CA2ACD,
- 5130FC39033946E600CA2ACD,
+ 5152FAD7033FC44A00CA2ACD,
+ 5152FAD8033FC44A00CA2ACD,
+ 5152FAD9033FC44A00CA2ACD,
+ 5152FADD033FC50400CA2ACD,
+ 5152FADE033FC50400CA2ACD,
+ 5152FADF033FC50400CA2ACD,
+ 5152FAE0033FC50400CA2ACD,
+ 5152FAE5033FC52200CA2ACD,
+ 5152FAE6033FC52200CA2ACD,
+ 5152FAE9033FC53500CA2ACD,
+ 511D5553033FD51000CA2ACD,
);
isa = PBXGroup;
name = WebView;
@@ -1466,18 +1547,6 @@
settings = {
};
};
- F505C20B02FB4F18018635CE = {
- fileEncoding = 30;
- isa = PBXFileReference;
- path = WebLocationChangeHandler.m;
- refType = 4;
- };
- F505C20C02FB4F18018635CE = {
- fileRef = F505C20B02FB4F18018635CE;
- isa = PBXBuildFile;
- settings = {
- };
- };
F5065217027F555001C1A526 = {
children = (
F5065218027F557E01C1A526,
@@ -1899,21 +1968,6 @@
settings = {
};
};
- F567433E026B5B7B01A80181 = {
- fileEncoding = 30;
- isa = PBXFileReference;
- path = WebLocationChangeHandler.h;
- refType = 4;
- };
- F567433F026B5B7B01A80181 = {
- fileRef = F567433E026B5B7B01A80181;
- isa = PBXBuildFile;
- settings = {
- ATTRIBUTES = (
- Public,
- );
- };
- };
F5883BDE025E5C6A01000102 = {
isa = PBXFileReference;
name = nullplugin.tiff;
@@ -1993,21 +2047,6 @@
isa = PBXBuildStyle;
name = Mixed;
};
- F5927D4A02D253C401CA2DBB = {
- fileEncoding = 30;
- isa = PBXFileReference;
- path = WebControllerPolicyHandler.h;
- refType = 4;
- };
- F5927D4B02D253C401CA2DBB = {
- fileRef = F5927D4A02D253C401CA2DBB;
- isa = PBXBuildFile;
- settings = {
- ATTRIBUTES = (
- Public,
- );
- };
- };
F5927D4E02D26C5E01CA2DBB = {
fileEncoding = 30;
isa = PBXFileReference;
@@ -2730,40 +2769,6 @@
//F52
//F53
//F54
-//F60
-//F61
-//F62
-//F63
-//F64
- F649E40402EE0D1901CA2ACD = {
- fileEncoding = 30;
- isa = PBXFileReference;
- path = WebDefaultPolicyHandler.h;
- refType = 4;
- };
- F649E40502EE0D1901CA2ACD = {
- fileEncoding = 30;
- isa = PBXFileReference;
- path = WebDefaultPolicyHandler.m;
- refType = 4;
- };
- F649E40602EE0D1901CA2ACD = {
- fileRef = F649E40402EE0D1901CA2ACD;
- isa = PBXBuildFile;
- settings = {
- };
- };
- F649E40702EE0D1901CA2ACD = {
- fileRef = F649E40502EE0D1901CA2ACD;
- isa = PBXBuildFile;
- settings = {
- };
- };
-//F60
-//F61
-//F62
-//F63
-//F64
//F80
//F81
//F82
diff --git a/WebKit/WebView.subproj/WebContextMenuDelegate.h b/WebKit/WebView.subproj/WebContextMenuDelegate.h
index d8ea6bb..ffe4874 100644
--- a/WebKit/WebView.subproj/WebContextMenuDelegate.h
+++ b/WebKit/WebView.subproj/WebContextMenuDelegate.h
@@ -1,5 +1,5 @@
/*
- WebContextMenuHandler.h
+ WebContextMenuDelegate.h
Copyright 2001, 2002, Apple Computer, Inc.
Public header file.
@@ -20,7 +20,7 @@ extern NSString *WebContextMenuElementFrameKey;
a clicked element.
*/
- at protocol WebContextMenuHandler <NSObject>
+ at protocol WebContextMenuDelegate <NSObject>
/*!
@method contextMenuItemsForElement:defaultMenuItems:
diff --git a/WebKit/WebView.subproj/WebContextMenuHandler.h b/WebKit/WebView.subproj/WebContextMenuHandler.h
deleted file mode 100644
index d8ea6bb..0000000
--- a/WebKit/WebView.subproj/WebContextMenuHandler.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- 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;
-
-/*!
- @protocol 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 36ff73b..aa303b1 100644
--- a/WebKit/WebView.subproj/WebController.h
+++ b/WebKit/WebView.subproj/WebController.h
@@ -8,8 +8,8 @@
#import <Cocoa/Cocoa.h>
#import <Foundation/Foundation.h>
-#import <WebKit/WebLocationChangeHandler.h>
-#import <WebKit/WebControllerPolicyHandler.h>
+#import <WebKit/WebLocationChangeDelegate.h>
+#import <WebKit/WebControllerPolicyDelegate.h>
@class WebBackForwardList;
@class WebController;
@@ -22,9 +22,9 @@
@class WebResourceHandle;
@class WebView;
- at protocol WebWindowContext;
- at protocol WebResourceProgressHandler;
- at protocol WebContextMenuHandler;
+ at protocol WebWindowOperationsDelegate;
+ at protocol WebResourceProgressDelegate;
+ at protocol WebContextMenuDelegate;
/*!
@@ -71,70 +71,70 @@
- initWithView: (WebView *)view provisionalDataSource: (WebDataSource *)dataSource controllerSetName: (NSString *)name;
/*!
- @method setWindowContext:
- @param context
+ @method setWindowOperationsDelegate:
+ @param delegate
*/
-- (void)setWindowContext: (id<WebWindowContext>)context;
+- (void)setWindowOperationsDelegate: (id<WebWindowOperationsDelegate>)delegate;
/*!
- @method windowContext
+ @method windowOperationsDelegate
*/
-- (id<WebWindowContext>)windowContext;
+- (id<WebWindowOperationsDelegate>)windowOperationsDelegate;
/*!
- @method setResourceProgressHandler:
- @param handler
+ @method setResourceProgressDelegate:
+ @param delegate
*/
-- (void)setResourceProgressHandler: (id<WebResourceProgressHandler>)handler;
+- (void)setResourceProgressDelegate: (id<WebResourceProgressDelegate>)delegate;
/*!
- @method resourceProgressHandler
+ @method resourceProgressDelegate
*/
-- (id<WebResourceProgressHandler>)resourceProgressHandler;
+- (id<WebResourceProgressDelegate>)resourceProgressDelegate;
/*!
- @method setDownloadProgressHandler:
- @param handler
+ @method setDownloadProgressDelegate:
+ @param delegate
*/
-- (void)setDownloadProgressHandler: (id<WebResourceProgressHandler>)handler;
+- (void)setDownloadProgressDelegate: (id<WebResourceProgressDelegate>)delegate;
/*!
- @method downloadProgressHandler
+ @method downloadProgressDelegate
*/
-- (id<WebResourceProgressHandler>)downloadProgressHandler;
+- (id<WebResourceProgressDelegate>)downloadProgressDelegate;
/*!
- @method setContextMenuHandler:
- @param handler
+ @method setContextMenuDelegate:
+ @param delegate
*/
-- (void)setContextMenuHandler: (id<WebContextMenuHandler>)handler;
+- (void)setContextMenuDelegate: (id<WebContextMenuDelegate>)delegate;
/*!
- @method contextMenuHandler
+ @method contextMenuDelegate
*/
-- (id<WebContextMenuHandler>)contextMenuHandler;
+- (id<WebContextMenuDelegate>)contextMenuDelegate;
/*!
- @method setLocationChangeHandler:
- @param handler
+ @method setLocationChangeDelegate:
+ @param delegate
*/
-- (void)setLocationChangeHandler:(id <WebLocationChangeHandler>)handler;
+- (void)setLocationChangeDelegate:(id <WebLocationChangeDelegate>)delegate;
/*!
- @method locationChangeHandler
+ @method locationChangeDelegate
*/
-- (id <WebLocationChangeHandler>)locationChangeHandler;
+- (id <WebLocationChangeDelegate>)locationChangeDelegate;
/*!
- @method setPolicyHandler:
- @param handler
+ @method setPolicyDelegate:
+ @param delegate
*/
-- (void)setPolicyHandler: (id<WebControllerPolicyHandler>)handler;
+- (void)setPolicyDelegate: (id<WebControllerPolicyDelegate>)delegate;
/*!
- @method policyHandler
+ @method policyDelegate
*/
-- (id<WebControllerPolicyHandler>)policyHandler;
+- (id<WebControllerPolicyDelegate>)policyDelegate;
/*!
@method frameNamed:
diff --git a/WebKit/WebView.subproj/WebController.m b/WebKit/WebView.subproj/WebController.m
index 59e0cc3..747370c 100644
--- a/WebKit/WebView.subproj/WebController.m
+++ b/WebKit/WebView.subproj/WebController.m
@@ -6,13 +6,13 @@
#import <WebKit/WebController.h>
#import <WebKit/WebBackForwardList.h>
-#import <WebKit/WebContextMenuHandler.h>
+#import <WebKit/WebContextMenuDelegate.h>
#import <WebKit/WebController.h>
#import <WebKit/WebControllerSets.h>
-#import <WebKit/WebControllerPolicyHandler.h>
+#import <WebKit/WebControllerPolicyDelegate.h>
#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebDataSourcePrivate.h>
-#import <WebKit/WebDefaultPolicyHandler.h>
+#import <WebKit/WebDefaultPolicyDelegate.h>
#import <WebKit/WebDocument.h>
#import <WebKit/WebDynamicScrollBarsView.h>
#import <WebKit/WebException.h>
@@ -22,9 +22,9 @@
#import <WebKit/WebKitErrors.h>
#import <WebKit/WebKitStatisticsPrivate.h>
#import <WebKit/WebPluginDatabase.h>
-#import <WebKit/WebResourceProgressHandler.h>
+#import <WebKit/WebResourceProgressDelegate.h>
#import <WebKit/WebViewPrivate.h>
-#import <WebKit/WebWindowContext.h>
+#import <WebKit/WebWindowOperationsDelegate.h>
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebResourceHandle.h>
@@ -74,80 +74,69 @@ NSString * WebContextMenuElementFrameKey = @"WebContextFrame";
}
-- (void)setWindowContext:(id <WebWindowContext>)context
+- (void)setWindowOperationsDelegate:(id <WebWindowOperationsDelegate>)delegate
{
- [context retain];
- [_private->windowContext release];
- _private->windowContext = context;
+ _private->windowContext = delegate;
}
-- (id <WebWindowContext>)windowContext
+- (id <WebWindowOperationsDelegate>)windowOperationsDelegate
{
return _private->windowContext;
}
-- (void)setResourceProgressHandler: (id <WebResourceProgressHandler>)handler
+- (void)setResourceProgressDelegate: (id <WebResourceProgressDelegate>)delegate
{
- [handler retain];
- [_private->resourceProgressHandler release];
- _private->resourceProgressHandler = handler;
+ _private->resourceProgressDelegate = delegate;
}
-- (id<WebResourceProgressHandler>)resourceProgressHandler
+- (id<WebResourceProgressDelegate>)resourceProgressDelegate
{
- return _private->resourceProgressHandler;
+ return _private->resourceProgressDelegate;
}
-- (void)setDownloadProgressHandler: (id<WebResourceProgressHandler>)handler
+- (void)setDownloadProgressDelegate: (id<WebResourceProgressDelegate>)delegate
{
- [handler retain];
- [_private->downloadProgressHandler release];
- _private->downloadProgressHandler = handler;
+ _private->downloadProgressDelegate = delegate;
}
-- (id<WebResourceProgressHandler>)downloadProgressHandler
+- (id<WebResourceProgressDelegate>)downloadProgressDelegate
{
- return _private->downloadProgressHandler;
+ return _private->downloadProgressDelegate;
}
-- (void)setContextMenuHandler: (id<WebContextMenuHandler>)handler
+- (void)setContextMenuDelegate: (id<WebContextMenuDelegate>)delegate
{
- [handler retain];
- [_private->contextMenuHandler release];
- _private->contextMenuHandler = handler;
+ _private->contextMenuDelegate = delegate;
}
-- (id<WebContextMenuHandler>)contextMenuHandler
+- (id<WebContextMenuDelegate>)contextMenuDelegate
{
- return _private->contextMenuHandler;
+ return _private->contextMenuDelegate;
}
-- (void)setPolicyHandler:(id <WebControllerPolicyHandler>)handler
+- (void)setPolicyDelegate:(id <WebControllerPolicyDelegate>)delegate
{
- [handler retain];
- [_private->policyHandler release];
- _private->policyHandler = handler;
+ _private->policyDelegate = delegate;
}
-- (id<WebControllerPolicyHandler>)policyHandler
+- (id<WebControllerPolicyDelegate>)policyDelegate
{
- if (!_private->policyHandler)
- _private->policyHandler = [[WebDefaultPolicyHandler alloc] initWithWebController: self];
- return _private->policyHandler;
+ if (!_private->policyDelegate)
+ _private->policyDelegate = [[WebDefaultPolicyDelegate alloc] initWithWebController: self];
+ return _private->policyDelegate;
}
-- (void)setLocationChangeHandler:(id <WebLocationChangeHandler>)handler
+- (void)setLocationChangeDelegate:(id <WebLocationChangeDelegate>)delegate
{
- [_private->locationChangeHandler autorelease];
- _private->locationChangeHandler = [handler retain];
+ _private->locationChangeDelegate = delegate;
}
-- (id <WebLocationChangeHandler>)locationChangeHandler
+- (id <WebLocationChangeDelegate>)locationChangeDelegate
{
- return _private->locationChangeHandler;
+ return _private->locationChangeDelegate;
}
- (WebFrame *)_frameForDataSource: (WebDataSource *)dataSource fromFrame: (WebFrame *)frame
diff --git a/WebKit/WebView.subproj/WebControllerPolicyHandler.m b/WebKit/WebView.subproj/WebControllerPolicyDelegate.m
similarity index 89%
copy from WebKit/WebView.subproj/WebControllerPolicyHandler.m
copy to WebKit/WebView.subproj/WebControllerPolicyDelegate.m
index 8e409fb..16175e3 100644
--- a/WebKit/WebView.subproj/WebControllerPolicyHandler.m
+++ b/WebKit/WebView.subproj/WebControllerPolicyDelegate.m
@@ -1,12 +1,9 @@
-//
-// WebControllerPolicyHandler.m
-// WebKit
-//
-// Created by Christopher Blumenberg on Thu Jul 25 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import <WebKit/WebControllerPolicyHandler.h>
+/*
+ WebControllerPolicyDelegate.m
+ Copyright 2002, Apple, Inc. All rights reserved.
+*/
+
+#import <WebKit/WebControllerPolicyDelegate.h>
@interface WebPolicyPrivate : NSObject
{
diff --git a/WebKit/WebView.subproj/WebControllerPolicyDelegatePrivate.h b/WebKit/WebView.subproj/WebControllerPolicyDelegatePrivate.h
index e3ddc65..c8609b9 100644
--- a/WebKit/WebView.subproj/WebControllerPolicyDelegatePrivate.h
+++ b/WebKit/WebView.subproj/WebControllerPolicyDelegatePrivate.h
@@ -1,15 +1,11 @@
/*
- * WebControllerPolicyHandlerPrivate.h
- * WebKit
- *
- * Created by Chris Blumenberg on Thu Jul 25 2002.
- * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
- *
- */
+ WebControllerPolicyDelegatePrivate.h
+ Copyright 2002, Apple, Inc. All rights reserved.
+*/
#import <Cocoa/Cocoa.h>
-#import <WebKit/WebControllerPolicyHandler.h>
+#import <WebKit/WebControllerPolicyDelegate.h>
@interface WebPolicy (WebPrivate)
diff --git a/WebKit/WebView.subproj/WebControllerPolicyHandler.h b/WebKit/WebView.subproj/WebControllerPolicyHandler.h
deleted file mode 100644
index 49aee67..0000000
--- a/WebKit/WebView.subproj/WebControllerPolicyHandler.h
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- WebControllerPolicyHandler.h
- Copyright 2002, Apple, Inc. All rights reserved.
-
- Public header file.
-*/
-
-#import <Cocoa/Cocoa.h>
-
- at class WebPolicyPrivate;
- at class WebFrame;
- at class WebError;
-
-/*!
- @enum WebPolicyAction
- @constant WebPolicyNone
- @constant WebPolicyUse
- @constant WebPolicyRevealInFinder
- @constant WebPolicySave
- @constant WebPolicyOpenURL
- @constant WebPolicySaveAndOpen
- @constant WebPolicyOpenNewWindow
- @constant WebPolicyIgnore
-*/
-typedef enum {
- WebPolicyNone,
- WebPolicyUse,
- WebPolicyRevealInFinder,
- WebPolicySave,
- WebPolicyOpenURL,
- WebPolicySaveAndOpen,
- WebPolicyOpenNewWindow,
- WebPolicyIgnore
-} WebPolicyAction;
-
-/*!
- @enum WebURLAction
- @constant WebURLPolicyUseContentPolicy,
- @constant WebURLPolicyOpenExternally,
- @constant WebURLPolicyIgnore
-*/
-typedef enum {
- WebURLPolicyUseContentPolicy = WebPolicyUse,
- WebURLPolicyOpenExternally = WebPolicyOpenURL,
- WebURLPolicyIgnore = WebPolicyIgnore
-} WebURLAction;
-
-/*!
- @enum WebFileAction
- @constant WebFileURLPolicyUseContentPolicy,
- @constant WebFileURLPolicyOpenExternally,
- @constant WebFileURLPolicyRevealInFinder,
- @constant WebFileURLPolicyIgnore
-*/
-typedef enum {
- WebFileURLPolicyUseContentPolicy = WebPolicyUse,
- WebFileURLPolicyOpenExternally = WebPolicyOpenURL,
- WebFileURLPolicyRevealInFinder = WebPolicyRevealInFinder,
- WebFileURLPolicyIgnore = WebPolicyIgnore
-} WebFileAction;
-
-/*!
- @enum WebContentAction
- @constant WebContentPolicyNone,
- @constant WebContentPolicyShow,
- @constant WebContentPolicySave,
- @constant WebContentPolicySaveAndOpenExternally,
- @constant WebContentPolicyIgnore
-*/
-typedef enum {
- WebContentPolicyNone = WebPolicyNone,
- WebContentPolicyShow = WebPolicyUse,
- WebContentPolicySave = WebPolicySave,
- WebContentPolicySaveAndOpenExternally = WebPolicySaveAndOpen,
- WebContentPolicyIgnore = WebPolicyIgnore
-} WebContentAction;
-
-/*!
- @enum WebClickAction
- @constant WebClickPolicyShow,
- @constant WebClickPolicyOpenNewWindow,
- @constant WebClickPolicySave,
- @constant WebClickPolicySaveAndOpenExternally,
- @constant WebClickPolicyIgnore
-*/
-typedef enum {
- WebClickPolicyShow = WebPolicyUse,
- WebClickPolicyOpenNewWindow = WebPolicyOpenNewWindow,
- WebClickPolicySave = WebPolicySave,
- WebClickPolicySaveAndOpenExternally = WebPolicySaveAndOpen,
- WebClickPolicyIgnore = WebPolicyIgnore
-} WebClickAction;
-
-
-/*!
- @class WebPolicy
-*/
- at interface WebPolicy : NSObject
-{
- at private
- WebPolicyPrivate *_private;
-}
-
-/*!
- @method policyAction
-*/
-- (WebPolicyAction)policyAction;
-
-/*!
- @method path
-*/
-- (NSString *)path;
-
-/*!
- @method URL
-*/
-- (NSURL *)URL;
- at end
-
-
-/*!
- @class WebURLPolicy
-*/
- at interface WebURLPolicy : WebPolicy
-/*!
- @method webPolicyWithURLAction:
- @param action
-*/
-+ webPolicyWithURLAction: (WebURLAction)action;
- at end
-
-
-/*!
- @class WebFileURLPolicy
-*/
- at interface WebFileURLPolicy : WebPolicy
-/*!
- @method webPolicyWithFileAction:
- @param action
-*/
-+ webPolicyWithFileAction: (WebFileAction)action;
- at end
-
-
-/*!
- @class WebContentPolicy
-*/
- at interface WebContentPolicy : WebPolicy
-/*!
- @method webPolicyWithContentAction:andPath:
- @param action
- @param thePath
-*/
-+ webPolicyWithContentAction: (WebContentAction)action andPath: (NSString *)thePath;
- at end
-
-
-/*!
- @class WebClickPolicy
-*/
- at interface WebClickPolicy : WebPolicy
-/*!
- @method webPolicyWithClickAction:andPath:
- @param action
- @param thePath
-*/
-+ webPolicyWithClickAction: (WebClickAction)action URL:(NSURL *)URL andPath: (NSString *)thePath;
- at end
-
-
-/*!
- @protocol WebControllerPolicyHandler
-*/
- at protocol WebControllerPolicyHandler <NSObject>
-
-/*!
- @method URLPolicyForURL:inFrame:
- @discussion URLPolicyForURL: is used to determine what to do BEFORE a URL is loaded, i.e.
- before it is clicked or loaded via a URL bar. Clients can choose to handle the
- URL normally, hand the URL off to launch services, or
- ignore the URL. The default implementation could return +defaultURLPolicyForURL:.
- @param URL
- @param frame
-*/
-- (WebURLPolicy *)URLPolicyForURL:(NSURL *)URL inFrame:(WebFrame *)frame;
-
-/*!
- @method contentPolicyForMIMEType:URL:inFrame:
- @discussion Sent after locationChangeStarted.
- Implementations typically call haveContentPolicy:forLocationChangeHandler: on WebController
- after determining the appropriate policy, perhaps by presenting a non-blocking dialog to the user.
- @param type
- @param URL
- @param frame
-*/
-- (WebContentPolicy *)contentPolicyForMIMEType: (NSString *)type URL:(NSURL *)URL inFrame:(WebFrame *)frame;
-
-/*!
- @method fileURLPolicyForMIMEType:inFrame:isDirectory:
- @discussion Called when the response to URLPolicyForURL is WebURLPolicyUseContentPolicy and the URL is
- a file URL. This allows clients to special-case WebKit's behavior for file URLs.
- @param type
- @param frame
- @param isDirectory
-*/
-- (WebFileURLPolicy *)fileURLPolicyForMIMEType: (NSString *)type inFrame:(WebFrame *)frame isDirectory: (BOOL)isDirectory;
-
-/*!
- @method clickPolicyForElement:button:modifierMask:
- @param elementInformation
- @param eventType
- @param eventMask
-*/
-- (WebClickPolicy *)clickPolicyForElement: (NSDictionary *)elementInformation button: (NSEventType)eventType modifierMask: (unsigned int)eventMask;
-
-/*!
- @method 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
- @param error
- @param frame
-*/
-- (void)unableToImplementPolicy:(WebPolicy *)policy error:(WebError *)error forURL:(NSURL *)URL inFrame:(WebFrame *)frame;
-
-/*!
- @method pluginNotFoundForMIMEType:pluginPageURL:
- @discussion Called when a plug-in for a certain mime type is not installed
- @param mime
- @param URL
-*/
-- (void)pluginNotFoundForMIMEType:(NSString *)mime pluginPageURL:(NSURL *)URL;
-
- at end
\ No newline at end of file
diff --git a/WebKit/WebView.subproj/WebControllerPolicyHandlerPrivate.h b/WebKit/WebView.subproj/WebControllerPolicyHandlerPrivate.h
deleted file mode 100644
index e3ddc65..0000000
--- a/WebKit/WebView.subproj/WebControllerPolicyHandlerPrivate.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * WebControllerPolicyHandlerPrivate.h
- * WebKit
- *
- * Created by Chris Blumenberg on Thu Jul 25 2002.
- * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
- *
- */
-
-#import <Cocoa/Cocoa.h>
-
-#import <WebKit/WebControllerPolicyHandler.h>
-
- at interface WebPolicy (WebPrivate)
-
-- (void)_setPolicyAction:(WebPolicyAction)policyAction;
-- (void)_setPath:(NSString *)path;
-
- at end
\ No newline at end of file
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.h b/WebKit/WebView.subproj/WebControllerPrivate.h
index 19bd657..132d3fe 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.h
+++ b/WebKit/WebView.subproj/WebControllerPrivate.h
@@ -14,13 +14,13 @@
@public
WebFrame *mainFrame;
- id<WebWindowContext> windowContext;
- id<WebResourceProgressHandler> resourceProgressHandler;
- id<WebResourceProgressHandler> downloadProgressHandler;
- id<WebContextMenuHandler> contextMenuHandler;
- id<WebContextMenuHandler> defaultContextMenuHandler;
- id<WebControllerPolicyHandler> policyHandler;
- id<WebLocationChangeHandler> locationChangeHandler;
+ id<WebWindowOperationsDelegate> windowContext;
+ id<WebResourceProgressDelegate> resourceProgressDelegate;
+ id<WebResourceProgressDelegate> downloadProgressDelegate;
+ id<WebContextMenuDelegate> contextMenuDelegate;
+ id<WebContextMenuDelegate> defaultContextMenuDelegate;
+ id<WebControllerPolicyDelegate> policyDelegate;
+ id<WebLocationChangeDelegate> locationChangeDelegate;
WebBackForwardList *backForwardList;
BOOL useBackForwardList;
@@ -47,7 +47,7 @@
- (WebFrame *)createFrameNamed: (NSString *)fname for: (WebDataSource *)child inParent: (WebDataSource *)parent allowsScrolling: (BOOL)allowsScrolling;
-- (id<WebContextMenuHandler>)_defaultContextMenuHandler;
+- (id<WebContextMenuDelegate>)_defaultContextMenuDelegate;
- (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;
- (void)_mainReceivedProgress: (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 b7543ae..e3ab36b 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.m
+++ b/WebKit/WebView.subproj/WebControllerPrivate.m
@@ -4,18 +4,18 @@
*/
#import <WebKit/WebBackForwardList.h>
-#import <WebKit/WebContextMenuHandler.h>
+#import <WebKit/WebContextMenuDelegate.h>
#import <WebKit/WebControllerPrivate.h>
-#import <WebKit/WebControllerPolicyHandlerPrivate.h>
+#import <WebKit/WebControllerPolicyDelegatePrivate.h>
#import <WebKit/WebDataSourcePrivate.h>
-#import <WebKit/WebDefaultContextMenuHandler.h>
+#import <WebKit/WebDefaultContextMenuDelegate.h>
#import <WebKit/WebFramePrivate.h>
#import <WebKit/WebLoadProgress.h>
#import <WebKit/WebPreferencesPrivate.h>
-#import <WebKit/WebResourceProgressHandler.h>
+#import <WebKit/WebResourceProgressDelegate.h>
#import <WebKit/WebStandardPanelsPrivate.h>
#import <WebKit/WebViewPrivate.h>
-#import <WebKit/WebWindowContext.h>
+#import <WebKit/WebWindowOperationsDelegate.h>
#import <WebFoundation/WebAssertions.h>
@@ -30,7 +30,7 @@
- init
{
backForwardList = [[WebBackForwardList alloc] init];
- defaultContextMenuHandler = [[WebDefaultContextMenuHandler alloc] init];
+ defaultContextMenuDelegate = [[WebDefaultContextMenuDelegate alloc] init];
textSizeMultiplier = 1;
userAgentLock = [[NSLock alloc] init];
return self;
@@ -62,13 +62,6 @@
[mainFrame reset];
[mainFrame release];
- [windowContext release];
- [resourceProgressHandler release];
- [downloadProgressHandler release];
- [contextMenuHandler release];
- [defaultContextMenuHandler release];
- [policyHandler release];
- [locationChangeHandler release];
[backForwardList release];
[applicationNameForUserAgent release];
[userAgentOverride release];
@@ -109,9 +102,9 @@
}
-- (id<WebContextMenuHandler>)_defaultContextMenuHandler
+- (id<WebContextMenuDelegate>)_defaultContextMenuDelegate
{
- return _private->defaultContextMenuHandler;
+ return _private->defaultContextMenuDelegate;
}
- (void)_receivedProgress:(WebLoadProgress *)progress forResourceHandle:(WebResourceHandle *)resourceHandle fromDataSource:(WebDataSource *)dataSource complete:(BOOL)isComplete
@@ -120,7 +113,7 @@
ASSERT(dataSource != nil);
- [[self resourceProgressHandler] receivedProgress: progress forResourceHandle: resourceHandle
+ [[self resourceProgressDelegate] receivedProgress: progress forResourceHandle: resourceHandle
fromDataSource: dataSource complete:isComplete];
// This resource has completed, so check if the load is complete for all frames.
@@ -138,7 +131,7 @@
ASSERT(dataSource != nil);
- [[self resourceProgressHandler] receivedProgress: progress forResourceHandle: resourceHandle
+ [[self resourceProgressDelegate] receivedProgress: progress forResourceHandle: resourceHandle
fromDataSource: dataSource complete:isComplete];
// The frame may be nil if a previously cancelled load is still making progress callbacks.
@@ -168,7 +161,7 @@
{
WebFrame *frame = [dataSource webFrame];
- [[self resourceProgressHandler] receivedError: error forResourceHandle: resourceHandle partialProgress: progress fromDataSource: dataSource];
+ [[self resourceProgressDelegate] receivedError: error forResourceHandle: resourceHandle partialProgress: progress fromDataSource: dataSource];
NSString *resourceIdentifier = [[[resourceHandle request] URL] absoluteString];
if (resourceIdentifier == nil) {
@@ -186,7 +179,7 @@
{
WebFrame *frame = [dataSource webFrame];
- [[self resourceProgressHandler] receivedError: error forResourceHandle: resourceHandle partialProgress: progress fromDataSource: dataSource];
+ [[self resourceProgressDelegate] receivedError: error forResourceHandle: resourceHandle partialProgress: progress fromDataSource: dataSource];
[dataSource _setMainDocumentError: error];
[dataSource _setPrimaryLoadComplete: YES];
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 76e454a..fd697cb 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -18,7 +18,7 @@
#import <WebKit/WebIconDatabasePrivate.h>
#import <WebKit/WebIconLoader.h>
#import <WebKit/WebImageRepresentation.h>
-#import <WebKit/WebLocationChangeHandler.h>
+#import <WebKit/WebLocationChangeDelegate.h>
#import <WebKit/WebMainResourceClient.h>
#import <WebKit/WebSubresourceClient.h>
#import <WebKit/WebTextRepresentation.h>
@@ -181,7 +181,7 @@
[self _setLoading:YES];
- [[_private->controller locationChangeHandler] locationChangeStartedForDataSource:self];
+ [[_private->controller locationChangeDelegate] locationChangeStartedForDataSource:self];
// Fire this guy up.
if (!_private->mainHandle) {
@@ -273,7 +273,7 @@
// The title doesn't get communicated to the controller until we are committed.
if (_private->committed)
- [[_private->controller locationChangeHandler] receivedPageTitle:_private->pageTitle forDataSource:self];
+ [[_private->controller locationChangeDelegate] receivedPageTitle:_private->pageTitle forDataSource:self];
}
- (void)_setURL:(NSURL *)URL
@@ -287,7 +287,7 @@
[_private->finalURL release];
_private->finalURL = URL;
- [[_private->controller locationChangeHandler] serverRedirectTo:URL forDataSource:self];
+ [[_private->controller locationChangeDelegate] serverRedirectTo:URL forDataSource:self];
}
- (void) _setContentPolicy:(WebContentPolicy *)policy
@@ -446,7 +446,7 @@
- (void)iconLoader:(WebIconLoader *)iconLoader receivedPageIcon:(NSImage *)icon;
{
[[WebIconDatabase sharedIconDatabase] _setIconURL:[iconLoader URL] forSiteURL:[self URL]];
- [[_private->controller locationChangeHandler] receivedPageIcon:nil forDataSource:self];
+ [[_private->controller locationChangeDelegate] receivedPageIcon:nil forDataSource:self];
}
- (void)_loadIcon
@@ -460,7 +460,7 @@
if([iconDB _hasIconForSiteURL:dataSourceURL]){
// Tell about the icon immediately if the db already has it
- [[_private->controller locationChangeHandler] receivedPageIcon:nil forDataSource:self];
+ [[_private->controller locationChangeDelegate] receivedPageIcon:nil forDataSource:self];
}else{
if(!_private->iconURL){
diff --git a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.h b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.h
index 671f08f..e2686f3 100644
--- a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.h
+++ b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.h
@@ -1,5 +1,5 @@
/*
- WebDefaultContextMenuHandler.h
+ WebDefaultContextMenuDelegate.h
Copyright 2002, Apple, Inc. All rights reserved.
Public header file.
@@ -8,12 +8,12 @@
#import <Foundation/Foundation.h>
- at protocol WebContextMenuHandler;
+ at protocol WebContextMenuDelegate;
/*!
@class WebDefaultContextMenuHandler
*/
- at interface WebDefaultContextMenuHandler : NSObject <WebContextMenuHandler>
+ at interface WebDefaultContextMenuDelegate : NSObject <WebContextMenuDelegate>
{
NSDictionary *element;
}
diff --git a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
index 39eb187..05071fd 100644
--- a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
@@ -1,21 +1,19 @@
/*
- WebDefaultContextMenuHandler.h
-
+ WebDefaultContextMenuDelegate.m
Copyright 2002, Apple, Inc. All rights reserved.
-
*/
-#import <WebKit/WebContextMenuHandler.h>
+#import <WebKit/WebContextMenuDelegate.h>
#import <WebKit/WebController.h>
-#import <WebKit/WebControllerPolicyHandler.h>
+#import <WebKit/WebControllerPolicyDelegate.h>
#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebDataSource.h>
#import <WebKit/WebDataSourcePrivate.h>
-#import <WebKit/WebDefaultContextMenuHandler.h>
+#import <WebKit/WebDefaultContextMenuDelegate.h>
#import <WebKit/WebFrame.h>
-#import <WebKit/WebWindowContext.h>
+#import <WebKit/WebWindowOperationsDelegate.h>
- at implementation WebDefaultContextMenuHandler
+ at implementation WebDefaultContextMenuDelegate
- (void)dealloc
{
@@ -96,14 +94,14 @@
{
WebFrame *webFrame = [element objectForKey:WebContextMenuElementFrameKey];
WebController *controller = [webFrame controller];
- [[controller windowContext] openNewWindowWithURL:URL referrer:referrer];
+ [[controller windowOperationsDelegate] openNewWindowWithURL:URL referrer:referrer];
}
- (void)downloadURL:(NSURL *)URL
{
WebFrame *webFrame = [element objectForKey:WebContextMenuElementFrameKey];
WebController *controller = [webFrame controller];
- WebContentPolicy *contentPolicy = [[controller policyHandler] contentPolicyForMIMEType:@"application/octet-stream" URL:URL inFrame:webFrame];
+ WebContentPolicy *contentPolicy = [[controller policyDelegate] contentPolicyForMIMEType:@"application/octet-stream" URL:URL inFrame:webFrame];
[controller _downloadURL:URL toPath:[contentPolicy path]];
}
diff --git a/WebKit/WebView.subproj/WebDefaultContextMenuHandler.h b/WebKit/WebView.subproj/WebDefaultContextMenuHandler.h
deleted file mode 100644
index 671f08f..0000000
--- a/WebKit/WebView.subproj/WebDefaultContextMenuHandler.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- WebDefaultContextMenuHandler.h
- Copyright 2002, Apple, Inc. All rights reserved.
-
- Public header file.
-*/
-
-
-#import <Foundation/Foundation.h>
-
- at protocol WebContextMenuHandler;
-
-/*!
- @class WebDefaultContextMenuHandler
-*/
- at interface WebDefaultContextMenuHandler : NSObject <WebContextMenuHandler>
-{
- NSDictionary *element;
-}
-
-/*!
- @method addMenuItemWithTitle:action:target:toArray:
- @param title
- @param selector
- @param target
- @param menuItems
-*/
-+ (void)addMenuItemWithTitle:(NSString *)title action:(SEL)selector target:(id)target toArray:(NSMutableArray *)menuItems;
-
- at end
diff --git a/WebKit/WebView.subproj/WebDefaultContextMenuHandler.m b/WebKit/WebView.subproj/WebDefaultContextMenuHandler.m
deleted file mode 100644
index 39eb187..0000000
--- a/WebKit/WebView.subproj/WebDefaultContextMenuHandler.m
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- WebDefaultContextMenuHandler.h
-
- Copyright 2002, Apple, Inc. All rights reserved.
-
-*/
-
-#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/WebFrame.h>
-#import <WebKit/WebWindowContext.h>
-
- at implementation WebDefaultContextMenuHandler
-
-- (void)dealloc
-{
- [element release];
- [super dealloc];
-}
-
-+ (void)addMenuItemWithTitle:(NSString *)title action:(SEL)selector target:(id)target toArray:(NSMutableArray *)menuItems
-{
- NSMenuItem *menuItem = [[NSMenuItem alloc] initWithTitle:title action:selector keyEquivalent:@""];
- [menuItem setTarget:target];
- [menuItems addObject:menuItem];
- [menuItem release];
-}
-
-- (NSArray *)contextMenuItemsForElement: (NSDictionary *)theElement defaultMenuItems: (NSArray *)defaultMenuItems
-{
- NSMutableArray *menuItems = [NSMutableArray array];
- NSURL *linkURL, *imageURL;
-
- [element release];
- element = [theElement retain];
-
- linkURL = [element objectForKey:WebContextMenuElementLinkURLKey];
-
- if(linkURL){
-
- [[self class] addMenuItemWithTitle:NSLocalizedString(@"Open Link in New Window", @"Open in New Window context menu item") action:@selector(openLinkInNewWindow:)
- target:self
- toArray:menuItems];
-
- [[self class] addMenuItemWithTitle:NSLocalizedString(@"Download Link to Disk", @"Download Link to Disk context menu item") action:@selector(downloadLinkToDisk:)
- target:self
- toArray:menuItems];
-
- [[self class] addMenuItemWithTitle:NSLocalizedString(@"Copy Link to Clipboard", @"Copy Link to Clipboard context menu item") action:@selector(copyLinkToClipboard:)
- target:self
- toArray:menuItems];
- }
-
- imageURL = [element objectForKey:WebContextMenuElementImageURLKey];
-
- if(imageURL){
-
- if(linkURL){
- [menuItems addObject:[NSMenuItem separatorItem]];
- }
-
- [[self class] addMenuItemWithTitle:NSLocalizedString(@"Open Image in New Window", @"Open Image in New Window context menu item")
- action:@selector(openImageInNewWindow:)
- target:self
- toArray:menuItems];
-
- [[self class] addMenuItemWithTitle:NSLocalizedString(@"Download Image To Disk", @"Download Image To Disk context menu item") action:@selector(downloadImageToDisk:)
- target:self
- toArray:menuItems];
-
- [[self class] addMenuItemWithTitle:NSLocalizedString(@"Copy Image to Clipboard", @"Copy Image to Clipboard context menu item") action:@selector(copyImageToClipboard:)
- target:self
- toArray:menuItems];
- }
-
- if(!imageURL && !linkURL){
-
- WebFrame *webFrame = [element objectForKey:WebContextMenuElementFrameKey];
-
- if(![[webFrame dataSource] isMainDocument]){
- [[self class] addMenuItemWithTitle:NSLocalizedString(@"Open Frame in New Window", @"Open Frame in New Window context menu item") action:@selector(openFrameInNewWindow:)
- target:self
- toArray:menuItems];
- }
- }
-
- return menuItems;
-}
-
-- (void)openNewWindowWithURL:(NSURL *)URL referrer:(NSString *)referrer
-{
- WebFrame *webFrame = [element objectForKey:WebContextMenuElementFrameKey];
- WebController *controller = [webFrame controller];
- [[controller windowContext] openNewWindowWithURL:URL referrer:referrer];
-}
-
-- (void)downloadURL:(NSURL *)URL
-{
- WebFrame *webFrame = [element objectForKey:WebContextMenuElementFrameKey];
- WebController *controller = [webFrame controller];
- WebContentPolicy *contentPolicy = [[controller policyHandler] contentPolicyForMIMEType:@"application/octet-stream" URL:URL inFrame:webFrame];
- [controller _downloadURL:URL toPath:[contentPolicy path]];
-}
-
-- (void)openLinkInNewWindow:(id)sender
-{
- [self openNewWindowWithURL:[element objectForKey:WebContextMenuElementLinkURLKey] referrer:nil];
-}
-
-- (void)downloadLinkToDisk:(id)sender
-{
- [self downloadURL:[element objectForKey:WebContextMenuElementLinkURLKey]];
-}
-
-- (void)copyLinkToClipboard:(id)sender
-{
- NSPasteboard *pasteboard = [NSPasteboard generalPasteboard];
- NSURL *URL = [element objectForKey:WebContextMenuElementLinkURLKey];
-
- [pasteboard declareTypes:[NSArray arrayWithObjects:NSURLPboardType, NSStringPboardType, nil] owner:nil];
- [pasteboard setString:[URL absoluteString] forType:NSStringPboardType];
- [URL writeToPasteboard:pasteboard];
-}
-
-- (void)openImageInNewWindow:(id)sender
-{
- [self openNewWindowWithURL:[element objectForKey:WebContextMenuElementImageURLKey] referrer:nil];
-}
-
-- (void)downloadImageToDisk:(id)sender
-{
- [self downloadURL:[element objectForKey:WebContextMenuElementImageURLKey]];
-}
-
-- (void)copyImageToClipboard:(id)sender
-{
- NSPasteboard *pasteboard = [NSPasteboard generalPasteboard];
- NSData *tiff = [[element objectForKey:WebContextMenuElementImageKey] TIFFRepresentation];
-
- [pasteboard declareTypes:[NSArray arrayWithObject:NSTIFFPboardType] owner:nil];
- [pasteboard setData:tiff forType:NSTIFFPboardType];
-}
-
-- (void)openFrameInNewWindow:(id)sender
-{
- WebFrame *webFrame = [element objectForKey:WebContextMenuElementFrameKey];
- WebDataSource *dataSource = [webFrame dataSource];
- NSURL *URL = [dataSource URL];
- [self openNewWindowWithURL:URL referrer:nil];
-}
-
-
- at end
diff --git a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.h b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.h
index 6579441..8820f38 100644
--- a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.h
@@ -1,5 +1,5 @@
/*
- WebDefaultPolicyHandler.h
+ WebDefaultPolicyDelegate.h
Copyright 2002, Apple Computer, Inc.
Public header file.
@@ -7,7 +7,7 @@
@class WebController;
- at interface WebDefaultPolicyHandler : NSObject <WebControllerPolicyHandler>
+ at interface WebDefaultPolicyDelegate : NSObject <WebControllerPolicyDelegate>
{
WebController *webController;
}
diff --git a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
index d337470..4262232 100644
--- a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
@@ -1,15 +1,13 @@
/*
- WebDefaultPolicyHandler.h
+ WebDefaultPolicyDelegate.m
Copyright 2002, Apple Computer, Inc.
-
- Public header file.
*/
#import <WebKit/WebDataSource.h>
-#import <WebKit/WebDefaultPolicyHandler.h>
+#import <WebKit/WebDefaultPolicyDelegate.h>
#import <WebKit/WebFrame.h>
- at implementation WebDefaultPolicyHandler
+ at implementation WebDefaultPolicyDelegate
- initWithWebController: (WebController *)wc
{
diff --git a/WebKit/WebView.subproj/WebDefaultPolicyHandler.h b/WebKit/WebView.subproj/WebDefaultPolicyHandler.h
deleted file mode 100644
index 6579441..0000000
--- a/WebKit/WebView.subproj/WebDefaultPolicyHandler.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- WebDefaultPolicyHandler.h
- Copyright 2002, Apple Computer, Inc.
-
- Public header file.
-*/
-
- at class WebController;
-
- at interface WebDefaultPolicyHandler : NSObject <WebControllerPolicyHandler>
-{
- WebController *webController;
-}
-- initWithWebController: (WebController *)wc;
- at end
-
diff --git a/WebKit/WebView.subproj/WebDefaultPolicyHandler.m b/WebKit/WebView.subproj/WebDefaultPolicyHandler.m
deleted file mode 100644
index d337470..0000000
--- a/WebKit/WebView.subproj/WebDefaultPolicyHandler.m
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- WebDefaultPolicyHandler.h
- Copyright 2002, Apple Computer, Inc.
-
- Public header file.
-*/
-#import <WebKit/WebDataSource.h>
-#import <WebKit/WebDefaultPolicyHandler.h>
-#import <WebKit/WebFrame.h>
-
-
- at implementation WebDefaultPolicyHandler
-
-- initWithWebController: (WebController *)wc
-{
- [super init];
- webController = wc; // Non-retained, like a delegate.
- return self;
-}
-
-- (WebURLPolicy *)URLPolicyForURL:(NSURL *)URL inFrame:(WebFrame *)frame
-{
- return [WebController defaultURLPolicyForURL:URL];
-}
-
-- (WebFileURLPolicy *)fileURLPolicyForMIMEType:(NSString *)type inFrame:(WebFrame *)frame isDirectory:(BOOL)isDirectory
-{
- if(isDirectory)
- return [WebFileURLPolicy webPolicyWithFileAction:WebFileURLPolicyIgnore];
- if([WebController canShowMIMEType:type])
- return [WebFileURLPolicy webPolicyWithFileAction:WebFileURLPolicyUseContentPolicy];
- return [WebFileURLPolicy webPolicyWithFileAction:WebFileURLPolicyIgnore];
-}
-
-- (void)unableToImplementPolicy:(WebPolicy *)policy error:(WebError *)error forURL:(NSURL *)URL inFrame:(WebFrame *)frame
-{
- NSLog (@"called unableToImplementPolicy:%derror:%@:inFrame:%@", policy, error, frame);
-}
-
-
-- (WebContentPolicy *)contentPolicyForMIMEType: (NSString *)type URL:(NSURL *)URL inFrame:(WebFrame *)frame;
-{
- if([WebController canShowMIMEType:type]){
- return [WebContentPolicy webPolicyWithContentAction: WebContentPolicyShow andPath:nil];
- }
- else{
- return [WebContentPolicy webPolicyWithContentAction: WebContentPolicyIgnore andPath:nil];
- }
-}
-
-- (void)pluginNotFoundForMIMEType:(NSString *)mime pluginPageURL:(NSURL *)URL
-{
- NSLog (@"pluginNotFoundForMIMEType:pluginPageURL: - MIME %@, URL ", mime, URL);
-}
-
-- (WebClickPolicy *)clickPolicyForElement: (NSDictionary *)elementInformation button: (NSEventType)eventType modifierMask: (unsigned int)eventMask
-{
- return [WebClickPolicy webPolicyWithClickAction:WebClickPolicyShow URL:nil andPath:nil];
-}
-
- at end
-
diff --git a/WebKit/WebView.subproj/WebDocument.h b/WebKit/WebView.subproj/WebDocument.h
index ad4ad18..5c5886e 100644
--- a/WebKit/WebView.subproj/WebDocument.h
+++ b/WebKit/WebView.subproj/WebDocument.h
@@ -25,6 +25,12 @@
- (void)dataSourceUpdated: (WebDataSource *)dataSource;
/*!
+ @method setNeedsLayout:
+ @param flag
+*/
+- (void)setNeedsLayout: (BOOL)flag;
+
+/*!
@method layout
*/
- (void)layout;
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 93d3fdf..5ea7536 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -17,9 +17,9 @@
#import <WebKit/WebHTMLViewPrivate.h>
#import <WebKit/WebKitStatisticsPrivate.h>
#import <WebKit/WebKitLogging.h>
-#import <WebKit/WebLocationChangeHandler.h>
+#import <WebKit/WebLocationChangeDelegate.h>
#import <WebKit/WebViewPrivate.h>
-#import <WebKit/WebWindowContext.h>
+#import <WebKit/WebWindowOperationsDelegate.h>
#import <WebFoundation/WebFoundation.h>
#import <WebFoundation/WebNSURLExtras.h>
@@ -111,7 +111,7 @@
// disallows by returning a WebURLPolicyIgnore.
- (BOOL)setProvisionalDataSource: (WebDataSource *)newDataSource
{
- id <WebLocationChangeHandler>locationChangeHandler;
+ id <WebLocationChangeDelegate>locationChangeDelegate;
WebDataSource *oldDataSource;
ASSERT([self controller] != nil);
@@ -142,7 +142,7 @@
// returns YES if we should show the data source
if([self _shouldShowURL:[newDataSource URL]]){
- locationChangeHandler = [[self controller] locationChangeHandler];
+ locationChangeDelegate = [[self controller] locationChangeDelegate];
oldDataSource = [self dataSource];
@@ -261,8 +261,8 @@
}
else if ([name isEqualToString:@"_blank"]){
- WebController *newController = [[[self controller] windowContext] openNewWindowWithURL:nil referrer:nil];
- [[[[newController windowContext] window] windowController] showWindow:nil];
+ WebController *newController = [[[self controller] windowOperationsDelegate] openNewWindowWithURL:nil referrer:nil];
+ [[[[newController windowOperationsDelegate] window] windowController] showWindow:nil];
return [newController mainFrame];
}
diff --git a/WebKit/WebView.subproj/WebFrameLoadDelegate.h b/WebKit/WebView.subproj/WebFrameLoadDelegate.h
index ed965a9..1e4d47a 100644
--- a/WebKit/WebView.subproj/WebFrameLoadDelegate.h
+++ b/WebKit/WebView.subproj/WebFrameLoadDelegate.h
@@ -1,5 +1,5 @@
/*
- WebLocationChangeHandler.h
+ WebLocationChangeDelegate.h
Copyright 2001, 2002, Apple, Inc. All rights reserved.
Public header file.
@@ -12,10 +12,10 @@
@class WebFrame;
/*!
- @protocol WebLocationChangeHandler
- @abstract A controller's WebLocationChangeHandler track changes it's frame's location.
+ @protocol WebLocationChangeDelegate
+ @abstract A controller's WebLocationChangeDelegate track changes it's frame's location.
*/
- at protocol WebLocationChangeHandler <NSObject>
+ at protocol WebLocationChangeDelegate <NSObject>
/*!
@method locationChangeStartedForDataSource:
@@ -75,12 +75,12 @@
@end
/*!
- @class WebLocationChangeHandler
- @discussion The WebLocationChangeHandler class responds to all WebLocationChangeHandler protocol
+ @class WebLocationChangeDelegate
+ @discussion The WebLocationChangeDelegate class responds to all WebLocationChangeDelegate protocol
methods by doing nothing. It's provided for the convenience of clients who only want
to implement some of the above methods and ignore others.
*/
- at interface WebLocationChangeHandler : NSObject <WebLocationChangeHandler>
+ at interface WebLocationChangeDelegate : NSObject <WebLocationChangeDelegate>
{
}
@end
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index e465680..28e32eb 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -19,7 +19,7 @@
#import <WebKit/WebHTMLViewPrivate.h>
#import <WebKit/WebKitLogging.h>
#import <WebKit/WebKitErrors.h>
-#import <WebKit/WebLocationChangeHandler.h>
+#import <WebKit/WebLocationChangeDelegate.h>
#import <WebKit/WebPreferencesPrivate.h>
#import <WebKit/WebViewPrivate.h>
@@ -179,12 +179,13 @@ static const char * const stateNames[] = {
if ([self controller])
LOG(Timing, "%s: performing timed layout, %f seconds since start of document load", [[self name] cString], CFAbsoluteTimeGetCurrent() - [[[[self controller] mainFrame] dataSource] _loadingStartedTime]);
- if ([[self webView] isDocumentHTML]) {
- WebHTMLView *htmlView = (WebHTMLView *)documentView;
+ [documentView setNeedsLayout: YES];
+
+ if ([documentView isKindOfClass: [NSView class]]) {
+ NSView *dview = (NSView *)documentView;
- [htmlView setNeedsLayout: YES];
- NSRect frame = [htmlView frame];
+ NSRect frame = [dview frame];
if (frame.size.width == 0 || frame.size.height == 0){
// We must do the layout now, rather than depend on
@@ -196,7 +197,7 @@ static const char * const stateNames[] = {
// check to see if any CSS is pending and delay
// the layout further to avoid the flash of unstyled
// content.
- [htmlView layout];
+ [documentView layout];
}
}
@@ -323,11 +324,11 @@ static const char * const stateNames[] = {
}
// Tell the client we've committed this URL.
- [[[self controller] locationChangeHandler] locationChangeCommittedForDataSource:[self dataSource]];
+ [[[self controller] locationChangeDelegate] locationChangeCommittedForDataSource:[self dataSource]];
// If we have a title let the controller know about it.
if ([[self dataSource] pageTitle])
- [[[self controller] locationChangeHandler] receivedPageTitle:[[self dataSource] pageTitle] forDataSource:[self dataSource]];
+ [[[self controller] locationChangeDelegate] receivedPageTitle:[[self dataSource] pageTitle] forDataSource:[self dataSource]];
break;
}
@@ -395,7 +396,7 @@ static const char * const stateNames[] = {
if (![pd isLoading]) {
LOG(Loading, "%s: checking complete in WebFrameStateProvisional, load done", [[self name] cString]);
- [[[self controller] locationChangeHandler] locationChangeDone: [pd mainDocumentError] forDataSource:pd];
+ [[[self controller] locationChangeDelegate] locationChangeDone: [pd mainDocumentError] forDataSource:pd];
// We now the provisional data source didn't cut the mustard, release it.
[_private setProvisionalDataSource: nil];
@@ -489,7 +490,7 @@ static const char * const stateNames[] = {
}
}
- [[[self controller] locationChangeHandler] locationChangeDone: [ds mainDocumentError] forDataSource:ds];
+ [[[self controller] locationChangeDelegate] locationChangeDone: [ds mainDocumentError] forDataSource:ds];
//if ([ds isDocumentHTML])
// [[ds representation] part]->closeURL();
@@ -561,13 +562,13 @@ static const char * const stateNames[] = {
WebError *error = [WebError errorWithCode:code
inDomain:WebErrorDomainWebKit
failingURL:[URL absoluteString]];
- [[[self controller] policyHandler] unableToImplementPolicy:policy error:error forURL:URL inFrame:self];
+ [[[self controller] policyDelegate] unableToImplementPolicy:policy error:error forURL:URL inFrame:self];
}
- (BOOL)_shouldShowURL:(NSURL *)URL
{
- id <WebControllerPolicyHandler> policyHandler = [[self controller] policyHandler];
- WebURLPolicy *URLPolicy = [policyHandler URLPolicyForURL:URL inFrame:self];
+ id <WebControllerPolicyDelegate> policyDelegate = [[self controller] policyDelegate];
+ WebURLPolicy *URLPolicy = [policyDelegate URLPolicyForURL:URL inFrame:self];
switch ([URLPolicy policyAction]) {
case WebURLPolicyIgnore:
@@ -594,7 +595,7 @@ static const char * const stateNames[] = {
BOOL isDirectory;
BOOL fileExists = [fileManager fileExistsAtPath:path isDirectory:&isDirectory];
NSString *type = [WebController _MIMETypeForFile: path];
- WebFileURLPolicy *fileURLPolicy = [policyHandler fileURLPolicyForMIMEType:type inFrame:self isDirectory:isDirectory];
+ WebFileURLPolicy *fileURLPolicy = [policyDelegate fileURLPolicyForMIMEType:type inFrame:self isDirectory:isDirectory];
if([fileURLPolicy policyAction] == WebFileURLPolicyIgnore)
return NO;
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 05dde14..f418d62 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -22,7 +22,7 @@
#import <WebKit/WebTextView.h>
#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebViewFactory.h>
-#import <WebKit/WebWindowContext.h>
+#import <WebKit/WebWindowOperationsDelegate.h>
#import <WebFoundation/WebNSDictionaryExtras.h>
#import <WebFoundation/WebNSURLExtras.h>
@@ -216,7 +216,7 @@ enum {
NSWindow *window = [super window];
if (window == nil) {
- window = [[[self controller] windowContext] window];
+ window = [[[self controller] windowOperationsDelegate] window];
}
return window;
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 9897a85..54a69d4 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -6,7 +6,7 @@
#import <WebKit/WebHTMLView.h>
#import <WebKit/WebBridge.h>
-#import <WebKit/WebContextMenuHandler.h>
+#import <WebKit/WebContextMenuDelegate.h>
#import <WebKit/WebController.h>
#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebDataSourcePrivate.h>
@@ -234,7 +234,7 @@
- (NSMenu *)menuForEvent:(NSEvent *)theEvent
{
- id <WebContextMenuHandler> contextMenuHandler, defaultContextMenuHandler;
+ id <WebContextMenuDelegate> contextMenuDelegate, defaultContextMenuDelegate;
NSArray *menuItems, *defaultMenuItems;
NSDictionary *elementInfo;
NSMenu *menu = nil;
@@ -244,12 +244,12 @@
point = [self convertPoint:[theEvent locationInWindow] fromView:nil];
elementInfo = [self _elementAtPoint:point];
- defaultContextMenuHandler = [[self _controller] _defaultContextMenuHandler];
- defaultMenuItems = [defaultContextMenuHandler contextMenuItemsForElement: elementInfo defaultMenuItems: nil];
- contextMenuHandler = [[self _controller] contextMenuHandler];
+ defaultContextMenuDelegate = [[self _controller] _defaultContextMenuDelegate];
+ defaultMenuItems = [defaultContextMenuDelegate contextMenuItemsForElement: elementInfo defaultMenuItems: nil];
+ contextMenuDelegate = [[self _controller] contextMenuDelegate];
- if(contextMenuHandler){
- menuItems = [contextMenuHandler contextMenuItemsForElement: elementInfo defaultMenuItems: defaultMenuItems];
+ if(contextMenuDelegate){
+ menuItems = [contextMenuDelegate contextMenuItemsForElement: elementInfo defaultMenuItems: defaultMenuItems];
} else {
menuItems = defaultMenuItems;
}
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.m b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
index 6364d6e..ec4d809 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.m
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
@@ -13,7 +13,7 @@
#import <WebFoundation/WebAssertions.h>
#import <WebKit/WebBridge.h>
-#import <WebKit/WebContextMenuHandler.h>
+#import <WebKit/WebContextMenuDelegate.h>
#import <WebKit/WebController.h>
#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebDataSourcePrivate.h>
@@ -22,7 +22,7 @@
#import <WebKit/WebNSViewExtras.h>
#import <WebKit/WebPluginView.h>
#import <WebKit/WebViewPrivate.h>
-#import <WebKit/WebWindowContext.h>
+#import <WebKit/WebWindowOperationsDelegate.h>
@interface NSView (AppKitSecretsIKnowAbout)
- (void)_recursiveDisplayRectIfNeededIgnoringOpacity:(NSRect)rect isVisibleRect:(BOOL)isVisibleRect rectIsVisibleRectForView:(NSView *)visibleView topView:(BOOL)topView;
@@ -140,7 +140,7 @@ BOOL _modifierTrackingEnabled = FALSE;
WebController *controller = [self _controller];
WebClickPolicy *clickPolicy;
- clickPolicy = [[controller policyHandler] clickPolicyForElement:[self _elementAtPoint:point]
+ clickPolicy = [[controller policyDelegate] clickPolicyForElement:[self _elementAtPoint:point]
button:[event type]
modifierMask:[event modifierFlags]];
@@ -151,7 +151,7 @@ BOOL _modifierTrackingEnabled = FALSE;
case WebClickPolicyShow:
return YES;
case WebClickPolicyOpenNewWindow:
- [[controller windowContext] openNewWindowWithURL:URL referrer:nil];
+ [[controller windowOperationsDelegate] openNewWindowWithURL:URL referrer:nil];
break;
case WebClickPolicySave:
case WebClickPolicySaveAndOpenExternally:
diff --git a/WebKit/WebView.subproj/WebImageView.m b/WebKit/WebView.subproj/WebImageView.m
index e2eea9d..c06bb08 100644
--- a/WebKit/WebView.subproj/WebImageView.m
+++ b/WebKit/WebView.subproj/WebImageView.m
@@ -49,6 +49,10 @@
{
}
+- (void)setNeedsLayout: (BOOL)flag
+{
+}
+
- (void)layout
{
WebImageRenderer *image = [representation image];
diff --git a/WebKit/WebView.subproj/WebLocationChangeDelegate.h b/WebKit/WebView.subproj/WebLocationChangeDelegate.h
index ed965a9..1e4d47a 100644
--- a/WebKit/WebView.subproj/WebLocationChangeDelegate.h
+++ b/WebKit/WebView.subproj/WebLocationChangeDelegate.h
@@ -1,5 +1,5 @@
/*
- WebLocationChangeHandler.h
+ WebLocationChangeDelegate.h
Copyright 2001, 2002, Apple, Inc. All rights reserved.
Public header file.
@@ -12,10 +12,10 @@
@class WebFrame;
/*!
- @protocol WebLocationChangeHandler
- @abstract A controller's WebLocationChangeHandler track changes it's frame's location.
+ @protocol WebLocationChangeDelegate
+ @abstract A controller's WebLocationChangeDelegate track changes it's frame's location.
*/
- at protocol WebLocationChangeHandler <NSObject>
+ at protocol WebLocationChangeDelegate <NSObject>
/*!
@method locationChangeStartedForDataSource:
@@ -75,12 +75,12 @@
@end
/*!
- @class WebLocationChangeHandler
- @discussion The WebLocationChangeHandler class responds to all WebLocationChangeHandler protocol
+ @class WebLocationChangeDelegate
+ @discussion The WebLocationChangeDelegate class responds to all WebLocationChangeDelegate protocol
methods by doing nothing. It's provided for the convenience of clients who only want
to implement some of the above methods and ignore others.
*/
- at interface WebLocationChangeHandler : NSObject <WebLocationChangeHandler>
+ at interface WebLocationChangeDelegate : NSObject <WebLocationChangeDelegate>
{
}
@end
diff --git a/WebKit/WebView.subproj/WebLocationChangeDelegate.m b/WebKit/WebView.subproj/WebLocationChangeDelegate.m
index 763a911..9b027b0 100644
--- a/WebKit/WebView.subproj/WebLocationChangeDelegate.m
+++ b/WebKit/WebView.subproj/WebLocationChangeDelegate.m
@@ -1,11 +1,11 @@
/*
- WebLocationChangeHandler.m
+ WebLocationChangeDelegate.m
Copyright 2002, Apple, Inc. All rights reserved.
*/
-#import "WebLocationChangeHandler.h"
+#import "WebLocationChangeDelegate.h"
- at implementation WebLocationChangeHandler
+ at implementation WebLocationChangeDelegate
- (void)locationChangeStartedForDataSource:(WebDataSource *)dataSource { }
- (void)locationChangeCommittedForDataSource:(WebDataSource *)dataSource { }
diff --git a/WebKit/WebView.subproj/WebLocationChangeHandler.h b/WebKit/WebView.subproj/WebLocationChangeHandler.h
deleted file mode 100644
index ed965a9..0000000
--- a/WebKit/WebView.subproj/WebLocationChangeHandler.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- WebLocationChangeHandler.h
- Copyright 2001, 2002, Apple, Inc. All rights reserved.
-
- Public header file.
-*/
-
-#import <Foundation/Foundation.h>
-
- at class WebError;
- at class WebDataSource;
- at class WebFrame;
-
-/*!
- @protocol WebLocationChangeHandler
- @abstract A controller's WebLocationChangeHandler track changes it's frame's location.
-*/
- at protocol WebLocationChangeHandler <NSObject>
-
-/*!
- @method locationChangeStartedForDataSource:
- @param dataSource
-*/
-- (void)locationChangeStartedForDataSource:(WebDataSource *)dataSource;
-
-/*!
- @method locationChangeCommittedForDataSource:
- @param dataSource
-*/
-- (void)locationChangeCommittedForDataSource:(WebDataSource *)dataSource;
-
-/*!
- @method locationChangeDone:forDataSource
- @param error
- @param dataSource
-*/
-- (void)locationChangeDone:(WebError *)error forDataSource:(WebDataSource *)dataSource;
-
-/*!
- @method receivedPageTitle:forDataSource:
- @param title
- @param dataSource
-*/
-- (void)receivedPageTitle:(NSString *)title forDataSource:(WebDataSource *)dataSource;
-
-/*!
- @method receivedPageIcon:forDataSource:
- @param image
- @param dataSource
-*/
-- (void)receivedPageIcon:(NSImage *)image forDataSource:(WebDataSource *)dataSource;
-
-/*!
- @method serverRedirectTo:forDataSource:
- @param URL
- @param dataSource
-*/
-- (void)serverRedirectTo:(NSURL *)URL forDataSource:(WebDataSource *)dataSource;
-
-/*!
- @method clientRedirectTo:delay:fireDate:forFrame:
- @param URL
- @param seconds
- @param date
- @param frame
-*/
-- (void)clientRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date forFrame:(WebFrame *)frame;
-
-/*!
- @method clientRedirectCancelledForFrame:
- @param frame
-*/
-- (void)clientRedirectCancelledForFrame:(WebFrame *)frame;
-
- at end
-
-/*!
- @class WebLocationChangeHandler
- @discussion The WebLocationChangeHandler class responds to all WebLocationChangeHandler protocol
- methods by doing nothing. It's provided for the convenience of clients who only want
- to implement some of the above methods and ignore others.
-*/
- at interface WebLocationChangeHandler : NSObject <WebLocationChangeHandler>
-{
-}
- at end
diff --git a/WebKit/WebView.subproj/WebLocationChangeHandler.m b/WebKit/WebView.subproj/WebLocationChangeHandler.m
deleted file mode 100644
index 763a911..0000000
--- a/WebKit/WebView.subproj/WebLocationChangeHandler.m
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- WebLocationChangeHandler.m
- Copyright 2002, Apple, Inc. All rights reserved.
-*/
-
-#import "WebLocationChangeHandler.h"
-
- at implementation WebLocationChangeHandler
-
-- (void)locationChangeStartedForDataSource:(WebDataSource *)dataSource { }
-- (void)locationChangeCommittedForDataSource:(WebDataSource *)dataSource { }
-- (void)locationChangeDone:(WebError *)error forDataSource:(WebDataSource *)dataSource { }
-
-- (void)receivedPageTitle:(NSString *)title forDataSource:(WebDataSource *)dataSource { }
-- (void)receivedPageIcon:(NSImage *)image forDataSource:(WebDataSource *)dataSource { }
-
-- (void)serverRedirectTo:(NSURL *)URL forDataSource:(WebDataSource *)dataSource { }
-
-- (void)clientRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date forFrame:(WebFrame *)frame { }
-- (void)clientRedirectCancelledForFrame:(WebFrame *)frame { }
-
- at end
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.h b/WebKit/WebView.subproj/WebMainResourceClient.h
index 33ceccf..f8f224f 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.h
+++ b/WebKit/WebView.subproj/WebMainResourceClient.h
@@ -8,13 +8,13 @@
#import <Foundation/Foundation.h>
-#import <WebKit/WebControllerPolicyHandler.h>
+#import <WebKit/WebControllerPolicyDelegate.h>
@class WebDownloadHandler;
@class WebDataSource;
@class WebResourceHandle;
@protocol WebResourceClient;
- at protocol WebResourceProgressHandler;
+ at protocol WebResourceProgressDelegate;
@interface WebMainResourceClient : NSObject <WebResourceClient>
{
@@ -23,7 +23,7 @@
BOOL isFirstChunk;
BOOL suppressErrors;
WebDownloadHandler *downloadHandler;
- id <WebResourceProgressHandler> downloadProgressHandler;
+ id <WebResourceProgressDelegate> downloadProgressDelegate;
WebContentAction policyAction;
NSMutableData *resourceData;
}
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 5f25149..392d881 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -14,9 +14,9 @@
#import <WebKit/WebFramePrivate.h>
#import <WebKit/WebKitLogging.h>
#import <WebKit/WebLoadProgress.h>
-#import <WebKit/WebLocationChangeHandler.h>
+#import <WebKit/WebLocationChangeDelegate.h>
#import <WebKit/WebMainResourceClient.h>
-#import <WebKit/WebResourceProgressHandler.h>
+#import <WebKit/WebResourceProgressDelegate.h>
#import <WebKit/WebView.h>
#import <WebFoundation/WebError.h>
@@ -62,7 +62,7 @@
ASSERT(currentURL == nil);
ASSERT(downloadHandler == nil);
- [downloadProgressHandler release];
+ [downloadProgressDelegate release];
[resourceData release];
[dataSource release];
@@ -88,7 +88,7 @@
if (isComplete) {
[dataSource _setPrimaryLoadComplete:YES];
}
- [downloadProgressHandler receivedProgress:progress forResourceHandle:handle
+ [downloadProgressDelegate receivedProgress:progress forResourceHandle:handle
fromDataSource:dataSource complete:isComplete];
} else {
[[dataSource controller] _mainReceivedProgress:progress forResourceHandle:handle
@@ -106,7 +106,7 @@
WebContentAction contentAction = [[dataSource contentPolicy] policyAction];
if (contentAction == WebContentPolicySaveAndOpenExternally || contentAction == WebContentPolicySave) {
- [downloadProgressHandler receivedError:error forResourceHandle:handle
+ [downloadProgressDelegate receivedError:error forResourceHandle:handle
partialProgress:progress fromDataSource:dataSource];
} else {
[[dataSource controller] _mainReceivedError:error forResourceHandle:handle
@@ -216,14 +216,14 @@
[dataSource _setContentType:contentType];
[dataSource _setEncoding:[[handle response] characterSet]];
- // retain the downloadProgressHandler just in case this is a download.
+ // retain the downloadProgressDelegate just in case this is a download.
// Alexander releases the WebController if no window is created for it.
// This happens in the cases mentioned in 2981866 and 2965312.
- downloadProgressHandler = [[[dataSource controller] downloadProgressHandler] retain];
+ downloadProgressDelegate = [[[dataSource controller] downloadProgressDelegate] retain];
WebContentPolicy *contentPolicy = [dataSource contentPolicy];
if(contentPolicy == nil){
- contentPolicy = [[controller policyHandler] contentPolicyForMIMEType:contentType URL:currentURL inFrame:frame];
+ contentPolicy = [[controller policyDelegate] contentPolicyForMIMEType:contentType URL:currentURL inFrame:frame];
[dataSource _setContentPolicy:contentPolicy];
}
policyAction = [contentPolicy policyAction];
@@ -241,7 +241,7 @@
case WebContentPolicySaveAndOpenExternally:
if (!downloadHandler) {
[frame _setProvisionalDataSource:nil];
- [[[dataSource controller] locationChangeHandler] locationChangeDone:nil forDataSource:dataSource];
+ [[[dataSource controller] locationChangeDelegate] locationChangeDone:nil forDataSource:dataSource];
downloadHandler = [[WebDownloadHandler alloc] initWithDataSource:dataSource];
}
downloadError = [downloadHandler receivedData:data];
@@ -250,7 +250,7 @@
[handle cancelLoadInBackground];
[self didCancelWithHandle:handle];
[frame _setProvisionalDataSource:nil];
- [[[dataSource controller] locationChangeHandler] locationChangeDone:nil forDataSource:dataSource];
+ [[[dataSource controller] locationChangeDelegate] locationChangeDone:nil forDataSource:dataSource];
break;
default:
[NSException raise:NSInvalidArgumentException format:@"contentPolicyForMIMEType:URL:inFrame: returned an invalid content policy."];
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.h b/WebKit/WebView.subproj/WebMainResourceLoader.h
index 33ceccf..f8f224f 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.h
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.h
@@ -8,13 +8,13 @@
#import <Foundation/Foundation.h>
-#import <WebKit/WebControllerPolicyHandler.h>
+#import <WebKit/WebControllerPolicyDelegate.h>
@class WebDownloadHandler;
@class WebDataSource;
@class WebResourceHandle;
@protocol WebResourceClient;
- at protocol WebResourceProgressHandler;
+ at protocol WebResourceProgressDelegate;
@interface WebMainResourceClient : NSObject <WebResourceClient>
{
@@ -23,7 +23,7 @@
BOOL isFirstChunk;
BOOL suppressErrors;
WebDownloadHandler *downloadHandler;
- id <WebResourceProgressHandler> downloadProgressHandler;
+ id <WebResourceProgressDelegate> downloadProgressDelegate;
WebContentAction policyAction;
NSMutableData *resourceData;
}
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 5f25149..392d881 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -14,9 +14,9 @@
#import <WebKit/WebFramePrivate.h>
#import <WebKit/WebKitLogging.h>
#import <WebKit/WebLoadProgress.h>
-#import <WebKit/WebLocationChangeHandler.h>
+#import <WebKit/WebLocationChangeDelegate.h>
#import <WebKit/WebMainResourceClient.h>
-#import <WebKit/WebResourceProgressHandler.h>
+#import <WebKit/WebResourceProgressDelegate.h>
#import <WebKit/WebView.h>
#import <WebFoundation/WebError.h>
@@ -62,7 +62,7 @@
ASSERT(currentURL == nil);
ASSERT(downloadHandler == nil);
- [downloadProgressHandler release];
+ [downloadProgressDelegate release];
[resourceData release];
[dataSource release];
@@ -88,7 +88,7 @@
if (isComplete) {
[dataSource _setPrimaryLoadComplete:YES];
}
- [downloadProgressHandler receivedProgress:progress forResourceHandle:handle
+ [downloadProgressDelegate receivedProgress:progress forResourceHandle:handle
fromDataSource:dataSource complete:isComplete];
} else {
[[dataSource controller] _mainReceivedProgress:progress forResourceHandle:handle
@@ -106,7 +106,7 @@
WebContentAction contentAction = [[dataSource contentPolicy] policyAction];
if (contentAction == WebContentPolicySaveAndOpenExternally || contentAction == WebContentPolicySave) {
- [downloadProgressHandler receivedError:error forResourceHandle:handle
+ [downloadProgressDelegate receivedError:error forResourceHandle:handle
partialProgress:progress fromDataSource:dataSource];
} else {
[[dataSource controller] _mainReceivedError:error forResourceHandle:handle
@@ -216,14 +216,14 @@
[dataSource _setContentType:contentType];
[dataSource _setEncoding:[[handle response] characterSet]];
- // retain the downloadProgressHandler just in case this is a download.
+ // retain the downloadProgressDelegate just in case this is a download.
// Alexander releases the WebController if no window is created for it.
// This happens in the cases mentioned in 2981866 and 2965312.
- downloadProgressHandler = [[[dataSource controller] downloadProgressHandler] retain];
+ downloadProgressDelegate = [[[dataSource controller] downloadProgressDelegate] retain];
WebContentPolicy *contentPolicy = [dataSource contentPolicy];
if(contentPolicy == nil){
- contentPolicy = [[controller policyHandler] contentPolicyForMIMEType:contentType URL:currentURL inFrame:frame];
+ contentPolicy = [[controller policyDelegate] contentPolicyForMIMEType:contentType URL:currentURL inFrame:frame];
[dataSource _setContentPolicy:contentPolicy];
}
policyAction = [contentPolicy policyAction];
@@ -241,7 +241,7 @@
case WebContentPolicySaveAndOpenExternally:
if (!downloadHandler) {
[frame _setProvisionalDataSource:nil];
- [[[dataSource controller] locationChangeHandler] locationChangeDone:nil forDataSource:dataSource];
+ [[[dataSource controller] locationChangeDelegate] locationChangeDone:nil forDataSource:dataSource];
downloadHandler = [[WebDownloadHandler alloc] initWithDataSource:dataSource];
}
downloadError = [downloadHandler receivedData:data];
@@ -250,7 +250,7 @@
[handle cancelLoadInBackground];
[self didCancelWithHandle:handle];
[frame _setProvisionalDataSource:nil];
- [[[dataSource controller] locationChangeHandler] locationChangeDone:nil forDataSource:dataSource];
+ [[[dataSource controller] locationChangeDelegate] locationChangeDone:nil forDataSource:dataSource];
break;
default:
[NSException raise:NSInvalidArgumentException format:@"contentPolicyForMIMEType:URL:inFrame: returned an invalid content policy."];
diff --git a/WebKit/WebView.subproj/WebControllerPolicyHandler.m b/WebKit/WebView.subproj/WebPolicyDelegate.m
similarity index 89%
rename from WebKit/WebView.subproj/WebControllerPolicyHandler.m
rename to WebKit/WebView.subproj/WebPolicyDelegate.m
index 8e409fb..16175e3 100644
--- a/WebKit/WebView.subproj/WebControllerPolicyHandler.m
+++ b/WebKit/WebView.subproj/WebPolicyDelegate.m
@@ -1,12 +1,9 @@
-//
-// WebControllerPolicyHandler.m
-// WebKit
-//
-// Created by Christopher Blumenberg on Thu Jul 25 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import <WebKit/WebControllerPolicyHandler.h>
+/*
+ WebControllerPolicyDelegate.m
+ Copyright 2002, Apple, Inc. All rights reserved.
+*/
+
+#import <WebKit/WebControllerPolicyDelegate.h>
@interface WebPolicyPrivate : NSObject
{
diff --git a/WebKit/WebView.subproj/WebPolicyDelegatePrivate.h b/WebKit/WebView.subproj/WebPolicyDelegatePrivate.h
index e3ddc65..c8609b9 100644
--- a/WebKit/WebView.subproj/WebPolicyDelegatePrivate.h
+++ b/WebKit/WebView.subproj/WebPolicyDelegatePrivate.h
@@ -1,15 +1,11 @@
/*
- * WebControllerPolicyHandlerPrivate.h
- * WebKit
- *
- * Created by Chris Blumenberg on Thu Jul 25 2002.
- * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
- *
- */
+ WebControllerPolicyDelegatePrivate.h
+ Copyright 2002, Apple, Inc. All rights reserved.
+*/
#import <Cocoa/Cocoa.h>
-#import <WebKit/WebControllerPolicyHandler.h>
+#import <WebKit/WebControllerPolicyDelegate.h>
@interface WebPolicy (WebPrivate)
diff --git a/WebKit/WebView.subproj/WebResourceLoadDelegate.h b/WebKit/WebView.subproj/WebResourceLoadDelegate.h
index ee95e9d..98104ef 100644
--- a/WebKit/WebView.subproj/WebResourceLoadDelegate.h
+++ b/WebKit/WebView.subproj/WebResourceLoadDelegate.h
@@ -1,5 +1,5 @@
/*
- WebResourceProgressHandler.h
+ WebResourceProgressDelegate.h
Copyright 2001, 2002, Apple Computer, Inc.
Public header file.
@@ -12,7 +12,7 @@
@discussion Implementors of this protocol will receive messages indicating
data has been received for resources loaded by a data source.
*/
- at protocol WebResourceProgressHandler <NSObject>
+ at protocol WebResourceProgressDelegate <NSObject>
/*!
@method receivedProgress:forResourceHandle:fromDataSource:complete:
diff --git a/WebKit/WebView.subproj/WebResourceProgressDelegate.h b/WebKit/WebView.subproj/WebResourceProgressDelegate.h
index ee95e9d..98104ef 100644
--- a/WebKit/WebView.subproj/WebResourceProgressDelegate.h
+++ b/WebKit/WebView.subproj/WebResourceProgressDelegate.h
@@ -1,5 +1,5 @@
/*
- WebResourceProgressHandler.h
+ WebResourceProgressDelegate.h
Copyright 2001, 2002, Apple Computer, Inc.
Public header file.
@@ -12,7 +12,7 @@
@discussion Implementors of this protocol will receive messages indicating
data has been received for resources loaded by a data source.
*/
- at protocol WebResourceProgressHandler <NSObject>
+ at protocol WebResourceProgressDelegate <NSObject>
/*!
@method receivedProgress:forResourceHandle:fromDataSource:complete:
diff --git a/WebKit/WebView.subproj/WebResourceProgressHandler.h b/WebKit/WebView.subproj/WebResourceProgressHandler.h
deleted file mode 100644
index ee95e9d..0000000
--- a/WebKit/WebView.subproj/WebResourceProgressHandler.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- 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
index e3ec909..27b16bc 100644
--- a/WebKit/WebView.subproj/WebUIDelegate.h
+++ b/WebKit/WebView.subproj/WebUIDelegate.h
@@ -1,5 +1,5 @@
/*
- WebWindowContext.h
+ WebWindowOperationsDelegate.h
Copyright 2001, 2002, Apple Computer, Inc.
Public header file.
@@ -10,13 +10,13 @@
@class WebController;
/*!
- @protocol WebWindowContext
- @discussion A class that implements WebWindowContext provides
+ @protocol WebWindowOperationsDelegate
+ @discussion A class that implements WebWindowOperationsDelegate provides
window-related methods that may be used by Javascript, plugins and
other aspects of web pages. These methods are used to open new
windows and control aspects of existing windows.
*/
- at protocol WebWindowContext <NSObject>
+ at protocol WebWindowOperationsDelegate <NSObject>
/*!
@method openNewWindowWithURL:referrer:
@abstract Open a new window and load the specified URL.
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index 36ff73b..aa303b1 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -8,8 +8,8 @@
#import <Cocoa/Cocoa.h>
#import <Foundation/Foundation.h>
-#import <WebKit/WebLocationChangeHandler.h>
-#import <WebKit/WebControllerPolicyHandler.h>
+#import <WebKit/WebLocationChangeDelegate.h>
+#import <WebKit/WebControllerPolicyDelegate.h>
@class WebBackForwardList;
@class WebController;
@@ -22,9 +22,9 @@
@class WebResourceHandle;
@class WebView;
- at protocol WebWindowContext;
- at protocol WebResourceProgressHandler;
- at protocol WebContextMenuHandler;
+ at protocol WebWindowOperationsDelegate;
+ at protocol WebResourceProgressDelegate;
+ at protocol WebContextMenuDelegate;
/*!
@@ -71,70 +71,70 @@
- initWithView: (WebView *)view provisionalDataSource: (WebDataSource *)dataSource controllerSetName: (NSString *)name;
/*!
- @method setWindowContext:
- @param context
+ @method setWindowOperationsDelegate:
+ @param delegate
*/
-- (void)setWindowContext: (id<WebWindowContext>)context;
+- (void)setWindowOperationsDelegate: (id<WebWindowOperationsDelegate>)delegate;
/*!
- @method windowContext
+ @method windowOperationsDelegate
*/
-- (id<WebWindowContext>)windowContext;
+- (id<WebWindowOperationsDelegate>)windowOperationsDelegate;
/*!
- @method setResourceProgressHandler:
- @param handler
+ @method setResourceProgressDelegate:
+ @param delegate
*/
-- (void)setResourceProgressHandler: (id<WebResourceProgressHandler>)handler;
+- (void)setResourceProgressDelegate: (id<WebResourceProgressDelegate>)delegate;
/*!
- @method resourceProgressHandler
+ @method resourceProgressDelegate
*/
-- (id<WebResourceProgressHandler>)resourceProgressHandler;
+- (id<WebResourceProgressDelegate>)resourceProgressDelegate;
/*!
- @method setDownloadProgressHandler:
- @param handler
+ @method setDownloadProgressDelegate:
+ @param delegate
*/
-- (void)setDownloadProgressHandler: (id<WebResourceProgressHandler>)handler;
+- (void)setDownloadProgressDelegate: (id<WebResourceProgressDelegate>)delegate;
/*!
- @method downloadProgressHandler
+ @method downloadProgressDelegate
*/
-- (id<WebResourceProgressHandler>)downloadProgressHandler;
+- (id<WebResourceProgressDelegate>)downloadProgressDelegate;
/*!
- @method setContextMenuHandler:
- @param handler
+ @method setContextMenuDelegate:
+ @param delegate
*/
-- (void)setContextMenuHandler: (id<WebContextMenuHandler>)handler;
+- (void)setContextMenuDelegate: (id<WebContextMenuDelegate>)delegate;
/*!
- @method contextMenuHandler
+ @method contextMenuDelegate
*/
-- (id<WebContextMenuHandler>)contextMenuHandler;
+- (id<WebContextMenuDelegate>)contextMenuDelegate;
/*!
- @method setLocationChangeHandler:
- @param handler
+ @method setLocationChangeDelegate:
+ @param delegate
*/
-- (void)setLocationChangeHandler:(id <WebLocationChangeHandler>)handler;
+- (void)setLocationChangeDelegate:(id <WebLocationChangeDelegate>)delegate;
/*!
- @method locationChangeHandler
+ @method locationChangeDelegate
*/
-- (id <WebLocationChangeHandler>)locationChangeHandler;
+- (id <WebLocationChangeDelegate>)locationChangeDelegate;
/*!
- @method setPolicyHandler:
- @param handler
+ @method setPolicyDelegate:
+ @param delegate
*/
-- (void)setPolicyHandler: (id<WebControllerPolicyHandler>)handler;
+- (void)setPolicyDelegate: (id<WebControllerPolicyDelegate>)delegate;
/*!
- @method policyHandler
+ @method policyDelegate
*/
-- (id<WebControllerPolicyHandler>)policyHandler;
+- (id<WebControllerPolicyDelegate>)policyDelegate;
/*!
@method frameNamed:
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index 59e0cc3..747370c 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -6,13 +6,13 @@
#import <WebKit/WebController.h>
#import <WebKit/WebBackForwardList.h>
-#import <WebKit/WebContextMenuHandler.h>
+#import <WebKit/WebContextMenuDelegate.h>
#import <WebKit/WebController.h>
#import <WebKit/WebControllerSets.h>
-#import <WebKit/WebControllerPolicyHandler.h>
+#import <WebKit/WebControllerPolicyDelegate.h>
#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebDataSourcePrivate.h>
-#import <WebKit/WebDefaultPolicyHandler.h>
+#import <WebKit/WebDefaultPolicyDelegate.h>
#import <WebKit/WebDocument.h>
#import <WebKit/WebDynamicScrollBarsView.h>
#import <WebKit/WebException.h>
@@ -22,9 +22,9 @@
#import <WebKit/WebKitErrors.h>
#import <WebKit/WebKitStatisticsPrivate.h>
#import <WebKit/WebPluginDatabase.h>
-#import <WebKit/WebResourceProgressHandler.h>
+#import <WebKit/WebResourceProgressDelegate.h>
#import <WebKit/WebViewPrivate.h>
-#import <WebKit/WebWindowContext.h>
+#import <WebKit/WebWindowOperationsDelegate.h>
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebResourceHandle.h>
@@ -74,80 +74,69 @@ NSString * WebContextMenuElementFrameKey = @"WebContextFrame";
}
-- (void)setWindowContext:(id <WebWindowContext>)context
+- (void)setWindowOperationsDelegate:(id <WebWindowOperationsDelegate>)delegate
{
- [context retain];
- [_private->windowContext release];
- _private->windowContext = context;
+ _private->windowContext = delegate;
}
-- (id <WebWindowContext>)windowContext
+- (id <WebWindowOperationsDelegate>)windowOperationsDelegate
{
return _private->windowContext;
}
-- (void)setResourceProgressHandler: (id <WebResourceProgressHandler>)handler
+- (void)setResourceProgressDelegate: (id <WebResourceProgressDelegate>)delegate
{
- [handler retain];
- [_private->resourceProgressHandler release];
- _private->resourceProgressHandler = handler;
+ _private->resourceProgressDelegate = delegate;
}
-- (id<WebResourceProgressHandler>)resourceProgressHandler
+- (id<WebResourceProgressDelegate>)resourceProgressDelegate
{
- return _private->resourceProgressHandler;
+ return _private->resourceProgressDelegate;
}
-- (void)setDownloadProgressHandler: (id<WebResourceProgressHandler>)handler
+- (void)setDownloadProgressDelegate: (id<WebResourceProgressDelegate>)delegate
{
- [handler retain];
- [_private->downloadProgressHandler release];
- _private->downloadProgressHandler = handler;
+ _private->downloadProgressDelegate = delegate;
}
-- (id<WebResourceProgressHandler>)downloadProgressHandler
+- (id<WebResourceProgressDelegate>)downloadProgressDelegate
{
- return _private->downloadProgressHandler;
+ return _private->downloadProgressDelegate;
}
-- (void)setContextMenuHandler: (id<WebContextMenuHandler>)handler
+- (void)setContextMenuDelegate: (id<WebContextMenuDelegate>)delegate
{
- [handler retain];
- [_private->contextMenuHandler release];
- _private->contextMenuHandler = handler;
+ _private->contextMenuDelegate = delegate;
}
-- (id<WebContextMenuHandler>)contextMenuHandler
+- (id<WebContextMenuDelegate>)contextMenuDelegate
{
- return _private->contextMenuHandler;
+ return _private->contextMenuDelegate;
}
-- (void)setPolicyHandler:(id <WebControllerPolicyHandler>)handler
+- (void)setPolicyDelegate:(id <WebControllerPolicyDelegate>)delegate
{
- [handler retain];
- [_private->policyHandler release];
- _private->policyHandler = handler;
+ _private->policyDelegate = delegate;
}
-- (id<WebControllerPolicyHandler>)policyHandler
+- (id<WebControllerPolicyDelegate>)policyDelegate
{
- if (!_private->policyHandler)
- _private->policyHandler = [[WebDefaultPolicyHandler alloc] initWithWebController: self];
- return _private->policyHandler;
+ if (!_private->policyDelegate)
+ _private->policyDelegate = [[WebDefaultPolicyDelegate alloc] initWithWebController: self];
+ return _private->policyDelegate;
}
-- (void)setLocationChangeHandler:(id <WebLocationChangeHandler>)handler
+- (void)setLocationChangeDelegate:(id <WebLocationChangeDelegate>)delegate
{
- [_private->locationChangeHandler autorelease];
- _private->locationChangeHandler = [handler retain];
+ _private->locationChangeDelegate = delegate;
}
-- (id <WebLocationChangeHandler>)locationChangeHandler
+- (id <WebLocationChangeDelegate>)locationChangeDelegate
{
- return _private->locationChangeHandler;
+ return _private->locationChangeDelegate;
}
- (WebFrame *)_frameForDataSource: (WebDataSource *)dataSource fromFrame: (WebFrame *)frame
diff --git a/WebKit/WebView.subproj/WebViewPrivate.h b/WebKit/WebView.subproj/WebViewPrivate.h
index 19bd657..132d3fe 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.h
+++ b/WebKit/WebView.subproj/WebViewPrivate.h
@@ -14,13 +14,13 @@
@public
WebFrame *mainFrame;
- id<WebWindowContext> windowContext;
- id<WebResourceProgressHandler> resourceProgressHandler;
- id<WebResourceProgressHandler> downloadProgressHandler;
- id<WebContextMenuHandler> contextMenuHandler;
- id<WebContextMenuHandler> defaultContextMenuHandler;
- id<WebControllerPolicyHandler> policyHandler;
- id<WebLocationChangeHandler> locationChangeHandler;
+ id<WebWindowOperationsDelegate> windowContext;
+ id<WebResourceProgressDelegate> resourceProgressDelegate;
+ id<WebResourceProgressDelegate> downloadProgressDelegate;
+ id<WebContextMenuDelegate> contextMenuDelegate;
+ id<WebContextMenuDelegate> defaultContextMenuDelegate;
+ id<WebControllerPolicyDelegate> policyDelegate;
+ id<WebLocationChangeDelegate> locationChangeDelegate;
WebBackForwardList *backForwardList;
BOOL useBackForwardList;
@@ -47,7 +47,7 @@
- (WebFrame *)createFrameNamed: (NSString *)fname for: (WebDataSource *)child inParent: (WebDataSource *)parent allowsScrolling: (BOOL)allowsScrolling;
-- (id<WebContextMenuHandler>)_defaultContextMenuHandler;
+- (id<WebContextMenuDelegate>)_defaultContextMenuDelegate;
- (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;
- (void)_mainReceivedProgress: (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 b7543ae..e3ab36b 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -4,18 +4,18 @@
*/
#import <WebKit/WebBackForwardList.h>
-#import <WebKit/WebContextMenuHandler.h>
+#import <WebKit/WebContextMenuDelegate.h>
#import <WebKit/WebControllerPrivate.h>
-#import <WebKit/WebControllerPolicyHandlerPrivate.h>
+#import <WebKit/WebControllerPolicyDelegatePrivate.h>
#import <WebKit/WebDataSourcePrivate.h>
-#import <WebKit/WebDefaultContextMenuHandler.h>
+#import <WebKit/WebDefaultContextMenuDelegate.h>
#import <WebKit/WebFramePrivate.h>
#import <WebKit/WebLoadProgress.h>
#import <WebKit/WebPreferencesPrivate.h>
-#import <WebKit/WebResourceProgressHandler.h>
+#import <WebKit/WebResourceProgressDelegate.h>
#import <WebKit/WebStandardPanelsPrivate.h>
#import <WebKit/WebViewPrivate.h>
-#import <WebKit/WebWindowContext.h>
+#import <WebKit/WebWindowOperationsDelegate.h>
#import <WebFoundation/WebAssertions.h>
@@ -30,7 +30,7 @@
- init
{
backForwardList = [[WebBackForwardList alloc] init];
- defaultContextMenuHandler = [[WebDefaultContextMenuHandler alloc] init];
+ defaultContextMenuDelegate = [[WebDefaultContextMenuDelegate alloc] init];
textSizeMultiplier = 1;
userAgentLock = [[NSLock alloc] init];
return self;
@@ -62,13 +62,6 @@
[mainFrame reset];
[mainFrame release];
- [windowContext release];
- [resourceProgressHandler release];
- [downloadProgressHandler release];
- [contextMenuHandler release];
- [defaultContextMenuHandler release];
- [policyHandler release];
- [locationChangeHandler release];
[backForwardList release];
[applicationNameForUserAgent release];
[userAgentOverride release];
@@ -109,9 +102,9 @@
}
-- (id<WebContextMenuHandler>)_defaultContextMenuHandler
+- (id<WebContextMenuDelegate>)_defaultContextMenuDelegate
{
- return _private->defaultContextMenuHandler;
+ return _private->defaultContextMenuDelegate;
}
- (void)_receivedProgress:(WebLoadProgress *)progress forResourceHandle:(WebResourceHandle *)resourceHandle fromDataSource:(WebDataSource *)dataSource complete:(BOOL)isComplete
@@ -120,7 +113,7 @@
ASSERT(dataSource != nil);
- [[self resourceProgressHandler] receivedProgress: progress forResourceHandle: resourceHandle
+ [[self resourceProgressDelegate] receivedProgress: progress forResourceHandle: resourceHandle
fromDataSource: dataSource complete:isComplete];
// This resource has completed, so check if the load is complete for all frames.
@@ -138,7 +131,7 @@
ASSERT(dataSource != nil);
- [[self resourceProgressHandler] receivedProgress: progress forResourceHandle: resourceHandle
+ [[self resourceProgressDelegate] receivedProgress: progress forResourceHandle: resourceHandle
fromDataSource: dataSource complete:isComplete];
// The frame may be nil if a previously cancelled load is still making progress callbacks.
@@ -168,7 +161,7 @@
{
WebFrame *frame = [dataSource webFrame];
- [[self resourceProgressHandler] receivedError: error forResourceHandle: resourceHandle partialProgress: progress fromDataSource: dataSource];
+ [[self resourceProgressDelegate] receivedError: error forResourceHandle: resourceHandle partialProgress: progress fromDataSource: dataSource];
NSString *resourceIdentifier = [[[resourceHandle request] URL] absoluteString];
if (resourceIdentifier == nil) {
@@ -186,7 +179,7 @@
{
WebFrame *frame = [dataSource webFrame];
- [[self resourceProgressHandler] receivedError: error forResourceHandle: resourceHandle partialProgress: progress fromDataSource: dataSource];
+ [[self resourceProgressDelegate] receivedError: error forResourceHandle: resourceHandle partialProgress: progress fromDataSource: dataSource];
[dataSource _setMainDocumentError: error];
[dataSource _setPrimaryLoadComplete: YES];
diff --git a/WebKit/WebView.subproj/WebWindowContext.h b/WebKit/WebView.subproj/WebWindowContext.h
deleted file mode 100644
index e3ec909..0000000
--- a/WebKit/WebView.subproj/WebWindowContext.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- 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. These methods are used to open new
- windows and control aspects of existing windows.
-*/
- at protocol WebWindowContext <NSObject>
-/*!
- @method openNewWindowWithURL:referrer:
- @abstract Open a new window and load the specified URL.
- @param URL The URL to load.
- @param referrer The referrer to use when loading the URL.
- @result The WebController for the WebView in the new window.
-*/
-- (WebController *)openNewWindowWithURL:(NSURL *)URL referrer:(NSString *)referrer;
-
-/*!
- @method setStatusText:
- @abstract Set the window's status display, if any, to the specified string.
- @param text The status text to set
-*/
-- (void)setStatusText:(NSString *)text;
-
-/*!
- @method statusText
- @abstract Get the currently displayed status text.
- @result The status text
-*/
-- (NSString *)statusText;
-
-/*!
- @method areToolbarsVisible
- @abstract Determine whether the window's toolbars are currently visible
- @discussion This method should return true if the window has any
- toolbars that are currently on, besides the status bar. If the app
- has more than one toolbar per window, for example a regular
- command toolbar and a favorites bar, it should return YES from
- this method if at least one is on.
- @result YES if at least one toolbar is visible, otherwise NO.
-*/
-- (BOOL)areToolbarsVisible;
-
-/*!
- @method setToolbarsVisible:
- @abstract Set whether the window's toolbars are currently visible.
- @param visible New value for toolbar visibility
- @discussion Setting this to YES should turn on all toolbars
- (except for a possible status bar). Setting it to NO should turn
- off all toolbars (with the same exception).
-*/
-- (void)setToolbarsVisible:(BOOL)visible;
-
-/*!
- @method isStatusBarVisible
- @abstract Determine whether the status bar is visible.
- @result YES if the status bar is visible, otherwise NO.
-*/
-- (BOOL)isStatusBarVisible;
-
-/*!
- @method setStatusBarVisible:
- @abstract Set whether the status bar is currently visible.
- @param visible The new visibility value
- @discussion Setting this to YES should show the status bar,
- setting it to NO should hide it.
-*/
-- (void)setStatusBarVisible:(BOOL)visible;
-
-/*!
- @method setFrame:
- @abstract Set the window's frame rect
- @param frame The new window frame size
- @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.
-*/
-- (void)setFrame:(NSRect)frame;
-
-/*!
- @method window
- @abstract Get the NSWindow that contains the top-level view of the WebController
- @result The NSWindow corresponding to this WebController
-*/
-- (NSWindow *)window;
-
- at end
-
-
diff --git a/WebKit/WebView.subproj/WebWindowOperationsDelegate.h b/WebKit/WebView.subproj/WebWindowOperationsDelegate.h
index e3ec909..27b16bc 100644
--- a/WebKit/WebView.subproj/WebWindowOperationsDelegate.h
+++ b/WebKit/WebView.subproj/WebWindowOperationsDelegate.h
@@ -1,5 +1,5 @@
/*
- WebWindowContext.h
+ WebWindowOperationsDelegate.h
Copyright 2001, 2002, Apple Computer, Inc.
Public header file.
@@ -10,13 +10,13 @@
@class WebController;
/*!
- @protocol WebWindowContext
- @discussion A class that implements WebWindowContext provides
+ @protocol WebWindowOperationsDelegate
+ @discussion A class that implements WebWindowOperationsDelegate provides
window-related methods that may be used by Javascript, plugins and
other aspects of web pages. These methods are used to open new
windows and control aspects of existing windows.
*/
- at protocol WebWindowContext <NSObject>
+ at protocol WebWindowOperationsDelegate <NSObject>
/*!
@method openNewWindowWithURL:referrer:
@abstract Open a new window and load the specified URL.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list