[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

cblu cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:38:50 UTC 2009 

The following commit has been merged in the debian/unstable branch:
commit 18adcab50d682c2cfb8bf06f7dcae105b5619281
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Apr 25 21:55:28 2003 +0000

    Tests:
    
            Turned WebLocationChangeDelegate into WebFrameLoadDelegate. Renamed WebFrameLoadDelegate all methods to pass a frame instead of the data source.
    
            Reviewed by rjw.
    
            * DumpBackForward/main.m:
            (main):
            (-[WaitUntilDoneDelegate webView:locationChangeDone:forDataSource:]):
            (-[WaitUntilDoneDelegate webView:didFailProvisionalLoadWithError:forFrame:]):
            (-[WaitUntilDoneDelegate webView:didFinishLoadForFrame:]):
            (-[WaitUntilDoneDelegate webView:didFailLoadWithError:forFrame:]):
            * DumpRenderTree/main.m:
            (main):
            (-[WaitUntilDoneDelegate webView:locationChangeDone:forDataSource:]):
            (-[WaitUntilDoneDelegate webView:didFailProvisionalLoadWithError:forFrame:]):
            (-[WaitUntilDoneDelegate webView:didFinishLoadForFrame:]):
            (-[WaitUntilDoneDelegate webView:didFailLoadWithError:forFrame:]):
            * IBViewer/DocumentController.m:
            (-[DocumentController webView:didStartProvisionalLoadForFrame:]):
            (-[DocumentController webView:didReceiveTitle:forFrame:]):
            (-[DocumentController webView:locationChangeDone:forDataSource:]):
            (-[DocumentController webView:didFailProvisionalLoadWithError:forFrame:]):
            (-[DocumentController webView:didFinishLoadForFrame:]):
            (-[DocumentController webView:didFailLoadWithError:forFrame:]):
            * PDFViewer/DocumentController.m:
            (-[DocumentController webView:didStartProvisionalLoadForFrame:]):
            (-[DocumentController webView:didReceiveTitle:forFrame:]):
            (-[DocumentController webView:locationChangeDone:forDataSource:]):
            (-[DocumentController webView:didFailProvisionalLoadWithError:forFrame:]):
            (-[DocumentController webView:didFinishLoadForFrame:]):
            (-[DocumentController webView:didFailLoadWithError:forFrame:]):
            * PictureBrowser/Document.m:
            (-[Document webView:didStartProvisionalLoadForFrame:]):
            (-[Document webView:locationChangeDone:forDataSource:]):
            (-[Document webView:didFailProvisionalLoadWithError:forFrame:]):
            (-[Document webView:didFinishLoadForFrame:]):
            (-[Document webView:didFailLoadWithError:forFrame:]):
            * SimpleViewer/DocumentController.m:
            (-[DocumentController webView:didStartProvisionalLoadForFrame:]):
            (-[DocumentController webView:didReceiveTitle:forFrame:]):
            (-[DocumentController webView:didFailProvisionalLoadWithError:forFrame:]):
            (-[DocumentController webView:didFinishLoadForFrame:]):
            (-[DocumentController webView:didFailLoadWithError:forFrame:]):
            * SnippetEditor/SnippetController.m:
            (-[SnippetController updateFromURL:]):
            (-[SnippetController webView:didReceiveTitle:forFrame:]):
            (-[SnippetController webView:didFailProvisionalLoadWithError:forFrame:]):
            (-[SnippetController webView:didFinishLoadForFrame:]):
            (-[SnippetController webView:didFailLoadWithError:forFrame:]):
    
    WebKit:
    
    	Turned WebLocationChangeDelegate into WebFrameLoadDelegate. Renamed WebFrameLoadDelegate all methods to pass a frame instead of the data source.
    
            Reviewed by rjw.
    
            * English.lproj/Localizable.strings:
            * Misc.subproj/WebKit.h:
            * Misc.subproj/WebKitErrors.h:
            * Misc.subproj/WebKitErrors.m:
            (registerErrors):
            * WebCoreSupport.subproj/WebBridge.m:
            * WebKit.pbproj/project.pbxproj:
            * WebView.subproj/WebDataSourcePrivate.m:
            (-[WebDataSource _startLoading:]):
            (-[WebDataSource _setTitle:]):
            (-[WebDataSource _setRequest:]):
            (-[WebDataSource _updateIconDatabaseWithURL:]):
            * WebView.subproj/WebDefaultFrameLoadDelegate.h: Added.
            * WebView.subproj/WebDefaultFrameLoadDelegate.m: Added.
            (+[WebDefaultFrameLoadDelegate sharedFrameLoadDelegate]):
            (-[WebDefaultFrameLoadDelegate webView:didStartProvisionalLoadForFrame:]):
            (-[WebDefaultFrameLoadDelegate webView:didReceiveServerRedirectForProvisionalLoadForFrame:]):
            (-[WebDefaultFrameLoadDelegate webView:didFailProvisionalLoadWithError:forFrame:]):
            (-[WebDefaultFrameLoadDelegate webView:didCommitLoadForFrame:]):
            (-[WebDefaultFrameLoadDelegate webView:didReceiveTitle:forFrame:]):
            (-[WebDefaultFrameLoadDelegate webView:didReceiveIcon:forFrame:]):
            (-[WebDefaultFrameLoadDelegate webView:didFinishLoadForFrame:]):
            (-[WebDefaultFrameLoadDelegate webView:didFailLoadWithError:forFrame:]):
            (-[WebDefaultFrameLoadDelegate webView:didChangeLocationWithinPageForFrame:]):
            (-[WebDefaultFrameLoadDelegate webView:willPerformClientRedirectToURL:delay:fireDate:forFrame:]):
            (-[WebDefaultFrameLoadDelegate webView:didCancelClientRedirectForFrame:]):
            (-[WebDefaultFrameLoadDelegate webView:willCloseFrame:]):
            * WebView.subproj/WebDefaultLocationChangeDelegate.h: Removed.
            * WebView.subproj/WebDefaultLocationChangeDelegate.m: Removed.
            * WebView.subproj/WebFrame.m:
            * WebView.subproj/WebFrameLoadDelegate.h: Added.
            * WebView.subproj/WebFramePrivate.m:
            (-[WebFrame _closeOldDataSources]):
            (-[WebFrame _transitionToCommitted:]):
            (-[WebFrame _isLoadComplete]):
            (-[WebFrame _loadItem:withLoadType:]):
            (-[WebFrame _continueFragmentScrollAfterNavigationPolicy:formState:]):
            (-[WebFrame _clientRedirectedTo:delay:fireDate:lockHistory:]):
            (-[WebFrame _clientRedirectCancelled]):
            * WebView.subproj/WebLocationChangeDelegate.h: Removed.
            * WebView.subproj/WebMainResourceClient.m:
            (-[WebMainResourceClient interruptForPolicyChangeError]):
            * WebView.subproj/WebPolicyDelegate.h:
            * WebView.subproj/WebView.h:
            * WebView.subproj/WebView.m:
            (-[WebView setFrameLoadDelegate:]):
            (-[WebView frameLoadDelegate]):
            * WebView.subproj/WebViewPrivate.h:
            * WebView.subproj/WebViewPrivate.m:
            (-[WebViewPrivate dealloc]):
            (-[WebView _frameLoadDelegateForwarder]):
    
    WebBrowser:
    
            Turned WebLocationChangeDelegate into WebFrameLoadDelegate. Renamed WebFrameLoadDelegate all methods to pass a frame instead of the data source.
    
            Reviewed by rjw.
    
            * BrowserNSErrorExtras.m:
            (-[NSError isPolicyChangeError]):
            * BrowserWebController.m:
            (-[BrowserWebController initWithDocument:request:frameName:]):
            (-[BrowserWebController close]):
            * Debug/SnippetController.m:
            (-[SnippetController load]):
            (-[SnippetController webView:didFinishLoadForFrame:]):
            (-[SnippetController webView:didReceiveTitle:forFrame:]):
            * LocationChangeHandler.h:
            * LocationChangeHandler.m:
            (-[LocationChangeHandler webView:didStartProvisionalLoadForFrame:]):
            (-[LocationChangeHandler webView:didReceiveServerRedirectForProvisionalLoadForFrame:]):
            (-[LocationChangeHandler webView:didCommitLoadForFrame:]):
            (-[LocationChangeHandler webView:didReceiveTitle:forFrame:]):
            (-[LocationChangeHandler webView:didReceiveIcon:forFrame:]):
            (-[LocationChangeHandler webView:didFailProvisionalLoadWithError:forFrame:]):
            (-[LocationChangeHandler webView:didFinishLoadForFrame:]):
            (-[LocationChangeHandler webView:didFailLoadWithError:forFrame:]):
            (-[LocationChangeHandler webView:didChangeLocationWithinPageForFrame:]):
            (-[LocationChangeHandler webView:willPerformClientRedirectToURL:delay:fireDate:forFrame:]):
            (-[LocationChangeHandler webView:didCancelClientRedirectForFrame:]):
            (-[LocationChangeHandler webView:willCloseFrame:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4189 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 7ec1ae2..e934064 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,61 @@
+2003-04-25  Chris Blumenberg  <cblu at apple.com>
+
+	Turned WebLocationChangeDelegate into WebFrameLoadDelegate. Renamed WebFrameLoadDelegate all methods to pass a frame instead of the data source.
+
+        Reviewed by rjw.
+
+        * English.lproj/Localizable.strings:
+        * Misc.subproj/WebKit.h:
+        * Misc.subproj/WebKitErrors.h:
+        * Misc.subproj/WebKitErrors.m:
+        (registerErrors):
+        * WebCoreSupport.subproj/WebBridge.m:
+        * WebKit.pbproj/project.pbxproj:
+        * WebView.subproj/WebDataSourcePrivate.m:
+        (-[WebDataSource _startLoading:]):
+        (-[WebDataSource _setTitle:]):
+        (-[WebDataSource _setRequest:]):
+        (-[WebDataSource _updateIconDatabaseWithURL:]):
+        * WebView.subproj/WebDefaultFrameLoadDelegate.h: Added.
+        * WebView.subproj/WebDefaultFrameLoadDelegate.m: Added.
+        (+[WebDefaultFrameLoadDelegate sharedFrameLoadDelegate]):
+        (-[WebDefaultFrameLoadDelegate webView:didStartProvisionalLoadForFrame:]):
+        (-[WebDefaultFrameLoadDelegate webView:didReceiveServerRedirectForProvisionalLoadForFrame:]):
+        (-[WebDefaultFrameLoadDelegate webView:didFailProvisionalLoadWithError:forFrame:]):
+        (-[WebDefaultFrameLoadDelegate webView:didCommitLoadForFrame:]):
+        (-[WebDefaultFrameLoadDelegate webView:didReceiveTitle:forFrame:]):
+        (-[WebDefaultFrameLoadDelegate webView:didReceiveIcon:forFrame:]):
+        (-[WebDefaultFrameLoadDelegate webView:didFinishLoadForFrame:]):
+        (-[WebDefaultFrameLoadDelegate webView:didFailLoadWithError:forFrame:]):
+        (-[WebDefaultFrameLoadDelegate webView:didChangeLocationWithinPageForFrame:]):
+        (-[WebDefaultFrameLoadDelegate webView:willPerformClientRedirectToURL:delay:fireDate:forFrame:]):
+        (-[WebDefaultFrameLoadDelegate webView:didCancelClientRedirectForFrame:]):
+        (-[WebDefaultFrameLoadDelegate webView:willCloseFrame:]):
+        * WebView.subproj/WebDefaultLocationChangeDelegate.h: Removed.
+        * WebView.subproj/WebDefaultLocationChangeDelegate.m: Removed.
+        * WebView.subproj/WebFrame.m:
+        * WebView.subproj/WebFrameLoadDelegate.h: Added.
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _closeOldDataSources]):
+        (-[WebFrame _transitionToCommitted:]):
+        (-[WebFrame _isLoadComplete]):
+        (-[WebFrame _loadItem:withLoadType:]):
+        (-[WebFrame _continueFragmentScrollAfterNavigationPolicy:formState:]):
+        (-[WebFrame _clientRedirectedTo:delay:fireDate:lockHistory:]):
+        (-[WebFrame _clientRedirectCancelled]):
+        * WebView.subproj/WebLocationChangeDelegate.h: Removed.
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient interruptForPolicyChangeError]):
+        * WebView.subproj/WebPolicyDelegate.h:
+        * WebView.subproj/WebView.h:
+        * WebView.subproj/WebView.m:
+        (-[WebView setFrameLoadDelegate:]):
+        (-[WebView frameLoadDelegate]):
+        * WebView.subproj/WebViewPrivate.h:
+        * WebView.subproj/WebViewPrivate.m:
+        (-[WebViewPrivate dealloc]):
+        (-[WebView _frameLoadDelegateForwarder]):
+
 2003-04-25  John Sullivan  <sullivan at apple.com>
 
 	- fixed 3240676 -- REGRESSION: Using old Safari then new one 
diff --git a/WebKit/English.lproj/Localizable.strings b/WebKit/English.lproj/Localizable.strings
index a8190ea..32cd24e 100644
Binary files a/WebKit/English.lproj/Localizable.strings and b/WebKit/English.lproj/Localizable.strings differ
diff --git a/WebKit/Misc.subproj/WebKit.h b/WebKit/Misc.subproj/WebKit.h
index 4653efa..334809a 100644
--- a/WebKit/Misc.subproj/WebKit.h
+++ b/WebKit/Misc.subproj/WebKit.h
@@ -8,11 +8,11 @@
 #import <WebKit/WebDocument.h>
 #import <WebKit/WebDownload.h>
 #import <WebKit/WebFrame.h>
+#import <WebKit/WebFrameLoadDelegate.h>
 #import <WebKit/WebFrameView.h>
 #import <WebKit/WebHistory.h>
 #import <WebKit/WebHistoryItem.h>
 #import <WebKit/WebKitErrors.h>
-#import <WebKit/WebLocationChangeDelegate.h>
 #import <WebKit/WebPreferences.h>
 #import <WebKit/WebPolicyDelegate.h>
 #import <WebKit/WebResourceLoadDelegate.h>
diff --git a/WebKit/Misc.subproj/WebKitErrors.h b/WebKit/Misc.subproj/WebKitErrors.h
index 1ecc6b3..95278e2 100644
--- a/WebKit/Misc.subproj/WebKitErrors.h
+++ b/WebKit/Misc.subproj/WebKitErrors.h
@@ -37,13 +37,12 @@ enum {
     @description Policy errors
     @constant WebKitErrorCannotShowMIMEType
     @constant WebKitErrorCannotShowURL
-    @constant WebKitErrorLocationChangeInterruptedByPolicyChange
-    @constant WebKitErrorResourceLoadInterruptedByPolicyChange
+    @constant WebKitErrorFrameLoadInterruptedByPolicyChange
 */
 enum {
     WebKitErrorCannotShowMIMEType = 				100,
     WebKitErrorCannotShowURL = 					101,
-    WebKitErrorLocationChangeInterruptedByPolicyChange = 	102,
+    WebKitErrorFrameLoadInterruptedByPolicyChange = 		102,
 };
 
 /*!
diff --git a/WebKit/Misc.subproj/WebKitErrors.m b/WebKit/Misc.subproj/WebKitErrors.m
index b708977..07a504d 100644
--- a/WebKit/Misc.subproj/WebKitErrors.m
+++ b/WebKit/Misc.subproj/WebKitErrors.m
@@ -33,10 +33,7 @@ NSString * const WebKitErrorPlugInPageURLStringKey = 	@"WebKitErrorPlugInPageURL
 // Policy errors
 #define WebKitErrorDescriptionCannotShowMIMEType UI_STRING("Cannot show content with specified mime type", "WebKitErrorCannotShowMIMEType description")
 #define WebKitErrorDescriptionCannotShowURL UI_STRING("Cannot show URL", "WebKitErrorCannotShowURL description")
-#define WebKitErrorDescriptionLocationChangeInterruptedByPolicyChange UI_STRING("Location change interrupted", "WebKitErrorLocationChangeInterruptedByPolicyChange description")
-
-// FIXME: Delete this error once localization is unfrozen. It isn't used.
-#define WebKitErrorDescriptionResourceLoadInterruptedByPolicyChange UI_STRING("Resource load interrupted", "WebKitErrorResourceLoadInterruptedByPolicyChange description")
+#define WebKitErrorDescriptionFrameLoadInterruptedByPolicyChange UI_STRING("Frame load interrupted", "WebKitErrorFrameLoadInterruptedByPolicyChange description")
 
 // Plug-in and java errors
 #define WebKitErrorDescriptionCannotFindPlugin UI_STRING("Cannot find plug-in", "WebKitErrorCannotFindPlugin description")
@@ -112,7 +109,7 @@ static void registerErrors()
         // Policy errors
         WebKitErrorDescriptionCannotShowMIMEType, 		[NSNumber numberWithInt: WebKitErrorCannotShowMIMEType],
         WebKitErrorDescriptionCannotShowURL, 			[NSNumber numberWithInt: WebKitErrorCannotShowURL],
-        WebKitErrorDescriptionLocationChangeInterruptedByPolicyChange, 	[NSNumber numberWithInt: WebKitErrorLocationChangeInterruptedByPolicyChange],
+        WebKitErrorDescriptionFrameLoadInterruptedByPolicyChange,[NSNumber numberWithInt: WebKitErrorFrameLoadInterruptedByPolicyChange],
 
         // Plug-in and java errors
         WebKitErrorDescriptionCannotFindPlugin,		[NSNumber numberWithInt: WebKitErrorCannotFindPlugin],
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 230a2bb..53de402 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -23,7 +23,6 @@
 #import <WebKit/WebKitErrorsPrivate.h>
 #import <WebKit/WebKitLogging.h>
 #import <WebKit/WebKitStatisticsPrivate.h>
-#import <WebKit/WebLocationChangeDelegate.h>
 #import <WebKit/WebNetscapePluginEmbeddedView.h>
 #import <WebKit/WebNetscapePluginPackage.h>
 #import <WebKit/WebNullPluginView.h>
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index f4c87d1..2f0a26f 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -1163,8 +1163,8 @@
 		5152FAE5033FC52200CA2ACD = {
 			fileEncoding = 4;
 			isa = PBXFileReference;
-			name = WebLocationChangeDelegate.h;
-			path = WebView.subproj/WebLocationChangeDelegate.h;
+			name = WebFrameLoadDelegate.h;
+			path = WebView.subproj/WebFrameLoadDelegate.h;
 			refType = 2;
 		};
 		5152FAE7033FC52200CA2ACD = {
@@ -1645,7 +1645,7 @@
 		70BC9ED604144F3200A80182 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			path = WebDefaultLocationChangeDelegate.m;
+			path = WebDefaultFrameLoadDelegate.m;
 			refType = 4;
 		};
 		70BC9ED704144F3200A80182 = {
@@ -1657,7 +1657,7 @@
 		70BC9ED804144FC500A80182 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			path = WebDefaultLocationChangeDelegate.h;
+			path = WebDefaultFrameLoadDelegate.h;
 			refType = 4;
 		};
 		70BC9ED904144FC500A80182 = {
@@ -2434,13 +2434,13 @@
 				2D36FD5E03F78F9E00A80166,
 				39446074020F50ED0ECA1767,
 				F5143A370221DCCE01A80181,
+				5152FAE5033FC52200CA2ACD,
 				9CF0E249021361B00ECA16EA,
 				9CF0E24A021361B00ECA16EA,
 				51A8B52E04282B5900CA2D3A,
 				51A8B52F04282B5900CA2D3A,
 				51A8B53204282BD200CA2D3A,
 				51A8B53304282BD200CA2D3A,
-				5152FAE5033FC52200CA2ACD,
 				F5D538E802441F2601A80181,
 				F5D538EC02441FDD01A80181,
 				51443F9A0429392B00CA2D3A,
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index a6964b9..7390f8a 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -9,6 +9,7 @@
 #import <WebKit/WebDocument.h>
 #import <WebKit/WebDownload.h>
 #import <WebKit/WebException.h>
+#import <WebKit/WebFrameLoadDelegate.h>
 #import <WebKit/WebFramePrivate.h>
 #import <WebKit/WebFrameViewPrivate.h>
 #import <WebKit/WebHistory.h>
@@ -22,7 +23,6 @@
 #import <WebKit/WebImageRepresentation.h>
 #import <WebKit/WebImageView.h>
 #import <WebKit/WebKitLogging.h>
-#import <WebKit/WebLocationChangeDelegate.h>
 #import <WebKit/WebMainResourceClient.h>
 #import <WebKit/WebPolicyDelegate.h>
 #import <WebKit/WebResourceLoadDelegate.h>
@@ -180,7 +180,8 @@
     
     [self _setLoading:YES];
     
-    [[_private->controller _locationChangeDelegateForwarder] webView: _private->controller locationChangeStartedForDataSource:self];
+    [[_private->controller _frameLoadDelegateForwarder] webView:_private->controller
+                                     didStartProvisionalLoadForFrame:[self webFrame]];
 
     if (pageCache){
         _private->loadingFromPageCache = YES;
@@ -306,7 +307,9 @@
         // Must update the entries in the back-forward list too.
         [_private->ourBackForwardItems makeObjectsPerformSelector:@selector(setTitle:) withObject:_private->pageTitle];
 
-        [[_private->controller _locationChangeDelegateForwarder] webView: _private->controller receivedPageTitle:_private->pageTitle forDataSource:self];
+        [[_private->controller _frameLoadDelegateForwarder] webView:_private->controller
+                                                         didReceiveTitle:_private->pageTitle
+                                                                forFrame:[self webFrame]];
     }
 }
 
@@ -337,10 +340,11 @@
 
     _private->request = [request retain];
 
-    // Only send serverRedirectedForDataSource: if URL changed.
+    // Only send webView:didReceiveServerRedirectForProvisionalLoadForFrame: if URL changed.
     if (![[oldRequest URL] isEqual: [request URL]]) {
         LOG(Redirect, "Server redirect to: %@", [request URL]);
-        [[_private->controller _locationChangeDelegateForwarder] webView: _private->controller serverRedirectedForDataSource:self];
+        [[_private->controller _frameLoadDelegateForwarder] webView:_private->controller
+                      didReceiveServerRedirectForProvisionalLoadForFrame:[self webFrame]];
     }
         
     [oldRequest release];
@@ -595,7 +599,9 @@
     [iconDB _setIconURL:[iconURL absoluteString] forURL:[[[self _originalRequest] URL] absoluteString]];
 
     NSImage *icon = [iconDB iconForURL:[[self _URL] absoluteString] withSize:WebIconSmallSize];
-    [[_private->controller _locationChangeDelegateForwarder] webView: _private->controller receivedPageIcon:icon forDataSource:self];
+    [[_private->controller _frameLoadDelegateForwarder] webView:_private->controller
+                                                      didReceiveIcon:icon
+                                                            forFrame:[self webFrame]];
 }
 
 - (void)_iconLoaderReceivedPageIcon:(WebIconLoader *)iconLoader
diff --git a/WebKit/WebView.subproj/WebDefaultFrameLoadDelegate.h b/WebKit/WebView.subproj/WebDefaultFrameLoadDelegate.h
index e7223e8..8d10c02 100644
--- a/WebKit/WebView.subproj/WebDefaultFrameLoadDelegate.h
+++ b/WebKit/WebView.subproj/WebDefaultFrameLoadDelegate.h
@@ -1,5 +1,5 @@
 /*	
-        WebDefaultPolicyDelegate.h
+        WebDefaultFrameLoadDelegate.h
 	Copyright 2002, Apple Computer, Inc.
 
         Private header file.
@@ -7,11 +7,11 @@
 #import <Foundation/Foundation.h>
 
 /*!
-    @class WebDefaultLocationChangeDelegate
+    @class WebDefaultFrameLoadDelegate
     @discussion WebDefaultPolicyDelegate will be used as a WebController's
     default policy delegate.  It can be subclassed to modify policies. 
 */
- at interface WebDefaultLocationChangeDelegate : NSObject
-+ (WebDefaultLocationChangeDelegate *)sharedLocationChangeDelegate;
+ at interface WebDefaultFrameLoadDelegate : NSObject
++ (WebDefaultFrameLoadDelegate *)sharedFrameLoadDelegate;
 @end
 
diff --git a/WebKit/WebView.subproj/WebDefaultFrameLoadDelegate.m b/WebKit/WebView.subproj/WebDefaultFrameLoadDelegate.m
index 226baab..0dfae7e 100644
--- a/WebKit/WebView.subproj/WebDefaultFrameLoadDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultFrameLoadDelegate.m
@@ -1,8 +1,8 @@
 /*	
-        WebLocationChangeDelegate.m
+        WebDefaultFrameLoadDelegate.m
 	Copyright 2002, Apple, Inc. All rights reserved.
 */
-#import <WebKit/WebDefaultLocationChangeDelegate.h>
+#import <WebKit/WebDefaultFrameLoadDelegate.h>
 #import <WebKit/WebDataSource.h>
 #import <WebKit/WebFrame.h>
 
@@ -10,36 +10,42 @@
 #import <WebFoundation/NSError.h>
 #endif
 
- at implementation WebDefaultLocationChangeDelegate
+ at implementation WebDefaultFrameLoadDelegate
 
-static WebDefaultLocationChangeDelegate *sharedDelegate = nil;
+static WebDefaultFrameLoadDelegate *sharedDelegate = nil;
 
 // Return a object with vanilla implementations of the protocol's methods
 // Note this feature relies on our default delegate being stateless
-+ (WebDefaultLocationChangeDelegate *)sharedLocationChangeDelegate
++ (WebDefaultFrameLoadDelegate *)sharedFrameLoadDelegate
 {
     if (!sharedDelegate) {
-        sharedDelegate = [[WebDefaultLocationChangeDelegate alloc] init];
+        sharedDelegate = [[WebDefaultFrameLoadDelegate alloc] init];
     }
     return sharedDelegate;
 }
 
-- (void)webView: (WebView *)wv locationChangeStartedForDataSource:(WebDataSource *)dataSource { }
+- (void)webView:(WebView *)sender didStartProvisionalLoadForFrame:(WebFrame *)frame { }
 
-- (void)webView: (WebView *)wv serverRedirectedForDataSource:(WebDataSource *)dataSource { }
+- (void)webView:(WebView *)sender didReceiveServerRedirectForProvisionalLoadForFrame:(WebFrame *)frame { }
 
-- (void)webView: (WebView *)wv locationChangeCommittedForDataSource:(WebDataSource *)dataSource { }
+- (void)webView:(WebView *)sender didFailProvisionalLoadWithError:(NSError *)error forFrame:(WebFrame *)frame { }
 
-- (void)webView: (WebView *)wv receivedPageTitle:(NSString *)title forDataSource:(WebDataSource *)dataSource { }
-- (void)webView: (WebView *)wv receivedPageIcon:(NSImage *)image forDataSource:(WebDataSource *)dataSource { }
+- (void)webView:(WebView *)sender didCommitLoadForFrame:(WebFrame *)frame { }
 
-- (void)webView: (WebView *)wv locationChangeDone:(NSError *)error forDataSource:(WebDataSource *)dataSource { }
+- (void)webView:(WebView *)sender didReceiveTitle:(NSString *)title forFrame:(WebFrame *)frame { }
 
-- (void)webView: (WebView *)wv willCloseLocationForDataSource:(WebDataSource *)dataSource { }
+- (void)webView:(WebView *)sender didReceiveIcon:(NSImage *)image forFrame:(WebFrame *)frame { }
 
-- (void)webView: (WebView *)wv locationChangedWithinPageForDataSource:(WebDataSource *)dataSource { }
+- (void)webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame { }
 
-- (void)webView: (WebView *)wv clientWillRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date forFrame:(WebFrame *)frame { }
-- (void)webView: (WebView *)wv clientRedirectCancelledForFrame:(WebFrame *)frame { }
+- (void)webView:(WebView *)sender didFailLoadWithError:(NSError *)error forFrame:(WebFrame *)frame { }
+
+- (void)webView:(WebView *)sender didChangeLocationWithinPageForFrame:(WebFrame *)frame { }
+
+- (void)webView:(WebView *)sender willPerformClientRedirectToURL:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date forFrame:(WebFrame *)frame { }
+
+- (void)webView:(WebView *)sender didCancelClientRedirectForFrame:(WebFrame *)frame { }
+
+- (void)webView:(WebView *)sender willCloseFrame:(WebFrame *)frame { }
 
 @end
diff --git a/WebKit/WebView.subproj/WebDefaultLocationChangeDelegate.h b/WebKit/WebView.subproj/WebDefaultLocationChangeDelegate.h
deleted file mode 100644
index e7223e8..0000000
--- a/WebKit/WebView.subproj/WebDefaultLocationChangeDelegate.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*	
-        WebDefaultPolicyDelegate.h
-	Copyright 2002, Apple Computer, Inc.
-
-        Private header file.
-*/
-#import <Foundation/Foundation.h>
-
-/*!
-    @class WebDefaultLocationChangeDelegate
-    @discussion WebDefaultPolicyDelegate will be used as a WebController's
-    default policy delegate.  It can be subclassed to modify policies. 
-*/
- at interface WebDefaultLocationChangeDelegate : NSObject
-+ (WebDefaultLocationChangeDelegate *)sharedLocationChangeDelegate;
- at end
-
diff --git a/WebKit/WebView.subproj/WebDefaultLocationChangeDelegate.m b/WebKit/WebView.subproj/WebDefaultLocationChangeDelegate.m
deleted file mode 100644
index 226baab..0000000
--- a/WebKit/WebView.subproj/WebDefaultLocationChangeDelegate.m
+++ /dev/null
@@ -1,45 +0,0 @@
-/*	
-        WebLocationChangeDelegate.m
-	Copyright 2002, Apple, Inc. All rights reserved.
-*/
-#import <WebKit/WebDefaultLocationChangeDelegate.h>
-#import <WebKit/WebDataSource.h>
-#import <WebKit/WebFrame.h>
-
-#if !defined(MAC_OS_X_VERSION_10_3) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3)
-#import <WebFoundation/NSError.h>
-#endif
-
- at implementation WebDefaultLocationChangeDelegate
-
-static WebDefaultLocationChangeDelegate *sharedDelegate = nil;
-
-// Return a object with vanilla implementations of the protocol's methods
-// Note this feature relies on our default delegate being stateless
-+ (WebDefaultLocationChangeDelegate *)sharedLocationChangeDelegate
-{
-    if (!sharedDelegate) {
-        sharedDelegate = [[WebDefaultLocationChangeDelegate alloc] init];
-    }
-    return sharedDelegate;
-}
-
-- (void)webView: (WebView *)wv locationChangeStartedForDataSource:(WebDataSource *)dataSource { }
-
-- (void)webView: (WebView *)wv serverRedirectedForDataSource:(WebDataSource *)dataSource { }
-
-- (void)webView: (WebView *)wv locationChangeCommittedForDataSource:(WebDataSource *)dataSource { }
-
-- (void)webView: (WebView *)wv receivedPageTitle:(NSString *)title forDataSource:(WebDataSource *)dataSource { }
-- (void)webView: (WebView *)wv receivedPageIcon:(NSImage *)image forDataSource:(WebDataSource *)dataSource { }
-
-- (void)webView: (WebView *)wv locationChangeDone:(NSError *)error forDataSource:(WebDataSource *)dataSource { }
-
-- (void)webView: (WebView *)wv willCloseLocationForDataSource:(WebDataSource *)dataSource { }
-
-- (void)webView: (WebView *)wv locationChangedWithinPageForDataSource:(WebDataSource *)dataSource { }
-
-- (void)webView: (WebView *)wv clientWillRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date forFrame:(WebFrame *)frame { }
-- (void)webView: (WebView *)wv clientRedirectCancelledForFrame:(WebFrame *)frame { }
-
- at end
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index aa75885..34023d8 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -18,7 +18,6 @@
 #import <WebKit/WebHTMLViewPrivate.h>
 #import <WebKit/WebKitStatisticsPrivate.h>
 #import <WebKit/WebKitLogging.h>
-#import <WebKit/WebLocationChangeDelegate.h>
 #import <WebKit/WebViewPrivate.h>
 #import <WebKit/WebUIDelegate.h>
 
diff --git a/WebKit/WebView.subproj/WebFrameLoadDelegate.h b/WebKit/WebView.subproj/WebFrameLoadDelegate.h
index 6a3e2b3..6480098 100644
--- a/WebKit/WebView.subproj/WebFrameLoadDelegate.h
+++ b/WebKit/WebView.subproj/WebFrameLoadDelegate.h
@@ -1,5 +1,5 @@
 /*	
-        WebLocationChangeDelegate.h
+        WebFrameLoadDelegate.h
 	Copyright 2001, 2002, Apple, Inc. All rights reserved.
 
         Public header file.
@@ -7,108 +7,112 @@
 
 #import <Foundation/Foundation.h>
 
- at class NSError;
 @class WebView;
 @class WebDataSource;
+ at class NSError;
 @class WebFrame;
 
 /*!
-    @category WebLocationChangeDelegate
-    @discussion A WebView's WebLocationChangeDelegate track changes its frame's location. 
+    @category WebFrameLoadDelegate
+    @discussion A WebView's WebFrameLoadDelegate tracks changes to its frames' location(s). 
 */
- at interface NSObject (WebLocationChangeDelegate)
+ at interface NSObject (WebFrameLoadDelegate)
 
 /*!
-    @method locationChangeStartedForDataSource:
-    @abstract Notify that a location change has started on a given data source
-    @param webView The WebView sending the message.
-    @param dataSource The data source for which the location change has started
-    @discussion You can find out the URL and other parameters of the location change
-    from the data source object.
+    @method webView:didStartProvisionalLoadForFrame:
+    @abstract Notifies the delegate that the provisional data source on the frame has started to load.
+    @param webView The WebView sending the message
+    @param frame The frame for which the provisional load has started
 */
-- (void)webView:(WebView *)sender locationChangeStartedForDataSource:(WebDataSource *)dataSource;
+- (void)webView:(WebView *)sender didStartProvisionalLoadForFrame:(WebFrame *)frame;
 
 /*!
-    @method serverRedirectedTo:forDataSource:
-    @abstract Notify that the data source has received a server redirect.
-    @param dataSource The data source for which the redirect occurred
-    @discussion You can find the new URL from the data source object.
+    @method webView:didReceiveServerRedirectForProvisionalLoadForFrame:
+    @abstract Notifies the delegate that the provisional data source has received a server redirect.
+    @param webView The WebView sending the message
+    @param frame The data source for which the redirect occurred
 */
-- (void)webView:(WebView *)sender serverRedirectedForDataSource:(WebDataSource *)dataSource;
+- (void)webView:(WebView *)sender didReceiveServerRedirectForProvisionalLoadForFrame:(WebFrame *)frame;
 
 /*!
-    @method locationChangeCommittedForDataSource:
-    @abstract Notify that a location change has been committed on a given data source
-    @param webView The WebView sending the message.
-    @param dataSource The data source for which the location change has started
-    @discussion When a location change starts, it is considered
+    @method webView:didFailProvisionalLoadWithError:forFrame:
+    @abstract Notifies the delegate that the provisional load has failed.
+    @param webView The WebView sending the message
+    @param error The error that occurred
+    @param frame The data source for which the error occurred
+    @discussion When webView:didFailProvisionalLoadWithError:forFrame: is called the provisional data source
+    has failed to load. The frame will continue to display the committed data source if there is one.
+*/
+- (void)webView:(WebView *)sender didFailProvisionalLoadWithError:(NSError *)error forFrame:(WebFrame *)frame;
+
+/*!
+    @method webView:didCommitLoadForFrame:
+    @abstract Notifies the delegate that the load has changed from provisional to committed.
+    @param webView The WebView sending the message
+    @param frame The frame for which the load has committed
+    @discussion When a load starts, it is considered
     "provisional" until at least one byte of the new page is
     received. This is done so the old page will not be lost if the new
     page fails to load completely.
 
-    In some cases, a single location change may be committed more than once. This happens
+    In some cases, a single load may be committed more than once. This happens
     in the case of multipart/x-mixed-replace, also known as "server push". In this case,
     a single location change leads to multiple documents that are loaded in sequence. When
     this happens, a new commit will be sent for each document.
 */
-- (void)webView:(WebView *)sender locationChangeCommittedForDataSource:(WebDataSource *)dataSource;
+- (void)webView:(WebView *)sender didCommitLoadForFrame:(WebFrame *)frame;
 
 /*!
-    @method receivedPageTitle:forDataSource:
+    @method webView:didReceiveTitle:forFrame:
     @abstract Notify that the page title has been determined or has changed
+    @param webView The WebView sending the message
     @param title The new page title
-    @param dataSource The data source for which the title changed
+    @param frame The frame for which the title changed
     @discussion The title may update during loading; clients should be prepared for this.
 */
-- (void)webView:(WebView *)sender receivedPageTitle:(NSString *)title forDataSource:(WebDataSource *)dataSource;
+- (void)webView:(WebView *)sender didReceiveTitle:(NSString *)title forFrame:(WebFrame *)frame;
 
 /*!
-    @method receivedPageIcon:forDataSource:
-    @abstract Notify that a page icon image is available or has changed
-    @param webView The WebView sending the message.
+    @method webView:didReceiveIcon:forFrame:
+    @abstract Notifies the delegate that a page icon image has been received
+    @param webView The WebView sending the message
     @param image The icon image
-    @param dataSource The data source for which a page icon is ready
-    @discussion It's possible the image will change, starting out as a
-    default or stored image and changing on a refresh.
-
+    @param frame The frame for which a page icon has been received
 */
-- (void)webView:(WebView *)sender receivedPageIcon:(NSImage *)image forDataSource:(WebDataSource *)dataSource;
+- (void)webView:(WebView *)sender didReceiveIcon:(NSImage *)image forFrame:(WebFrame *)frame;
 
 /*!
-    @method locationChangeDone:forDataSource:
-    @abstract Notify that a location change is done (possibly with an error) for a data source
-    @param webView The WebView sending the message.
-    @param error The error, if one occurred, or nil if none
-    @param dataSource The data source that finished changing location
-    @discussion This callback will only be received when all
-    subresources are done loading.
+    @method webView:didFinishLoadForFrame:
+    @abstract Notifies the delegate that the load is done
+    @param webView The WebView sending the message
+    @param frame The frame that finished loading
+    @discussion This callback will only be received when all subresources are done loading.
 */
-- (void)webView:(WebView *)sender locationChangeDone:(NSError *)error forDataSource:(WebDataSource *)dataSource;
+- (void)webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame;
 
 /*!
-    @method willCloseLocationForDataSource:
-    @abstract Notify that a location will be closed.
-    @param webView The WebView sending the message.
-    @param dataSource The data source that where the location change originally happened
-    @discussion This callback happens right before WebKit is done with the data source
-    and the document representation that it contains.
- */
-- (void)webView:(WebView *)sender willCloseLocationForDataSource:(WebDataSource *)dataSource;
+    @method webView:didFailLoadWithError:forFrame:
+    @abstract Notifies the delegate that the committed load has failed
+    @param webView The WebView sending the message
+    @param error The error that occurred
+    @param frame The frame that failed to load
+    @discussion This method is called after the load has commmitted but ended in error.
+*/
+- (void)webView:(WebView *)sender didFailLoadWithError:(NSError *)error forFrame:(WebFrame *)frame;
 
 /*!
-    @method locationChangedWithinPageForDataSource:
-    @abstract Notify that a further location change within the page
-    has occurred for an already loaded data source
-    @param webView The WebView sending the message.
-    @param dataSource The data source that had a location change
+    @method webView:didChangeLocationWithinPageForFrame:
+    @abstract Notifies the delegate that the scroll position in a frame has changed
+    @param webView The WebView sending the message
+    @param frame The frame that scrolled
     @discussion This is normally used for clicks on anchors within a page
     that is already displayed. You can find the new URL from the data source object.
 */
-- (void)webView:(WebView *)sender locationChangedWithinPageForDataSource:(WebDataSource *)dataSource;
+- (void)webView:(WebView *)sender didChangeLocationWithinPageForFrame:(WebFrame *)frame;
 
 /*!
-    @method clientWillRedirectTo:delay:fireDate:forFrame:
-    @abstract Notify that the frame has received a client-side redirect that may trigger soon
+    @method webView:willPerformClientRedirectToURL:delay:fireDate:forFrame:
+    @abstract Notifies the delegate that the frame has received a client-side redirect that may trigger soon
     @param webView The WebView sending the message.
     @param URL The URL to be redirected to
     @param seconds Seconds in which the redirect will happen
@@ -116,19 +120,29 @@
     @param frame The frame on which the redirect will occur
     @discussion This method can be used to keep progress feedback
     going while a client redirect is pending. A client redirect might
-    be cancelled before it fires - see clientRedirectCancelledForFrame.
+    be cancelled before it fires - see webView:didCancelClientRedirectForFrame:.
 */
-- (void)webView:(WebView *)sender clientWillRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date forFrame:(WebFrame *)frame;
+- (void)webView:(WebView *)sender willPerformClientRedirectToURL:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date forFrame:(WebFrame *)frame;
 
 /*!
-    @method clientRedirectCancelledForFrame:
-    @abstract Notify that a pending client redirect has been cancelled.
+    method webView:didCancelClientRedirectForFrame:
+    @abstract Notifies the delegate that a pending client redirect has been cancelled.
     @param webView The WebView sending the message.
     @param frame The frame for which the pending redirect was cancelled
     @discussion A client redirect can be cancelled if the frame
     changes locations before the timeout.
 */
-- (void)webView:(WebView *)sender clientRedirectCancelledForFrame:(WebFrame *)frame;
+- (void)webView:(WebView *)sender didCancelClientRedirectForFrame:(WebFrame *)frame;
+
+/*!
+    @method webView:willCloseFrame:
+    @abstract Notifies the delegate that a frame will be closed
+    @param webView The WebView sending the message
+    @param frame The frame that will be closed
+    @discussion This callback happens right before WebKit is done with the frame
+    and the objects that it contains.
+*/
+- (void)webView:(WebView *)sender willCloseFrame:(WebFrame *)frame;
 
 @end
 
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index ca87ebb..4de115e 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -15,6 +15,7 @@
 #import <WebKit/WebDocument.h>
 #import <WebKit/WebDynamicScrollBarsView.h>
 #import <WebKit/WebFormDelegate.h>
+#import <WebKit/WebFrameLoadDelegate.h>
 #import <WebKit/WebFrameViewPrivate.h>
 #import <WebKit/WebHistoryPrivate.h>
 #import <WebKit/WebHistoryItemPrivate.h>
@@ -24,7 +25,6 @@
 #import <WebKit/WebKitLogging.h>
 #import <WebKit/WebKitErrors.h>
 #import <WebKit/WebKitErrorsPrivate.h>
-#import <WebKit/WebLocationChangeDelegate.h>
 #import <WebKit/WebPolicyDelegatePrivate.h>
 #import <WebKit/WebPreferencesPrivate.h>
 #import <WebKit/WebViewPrivate.h>
@@ -390,7 +390,7 @@ Repeat load of the same URL (by any other means of navigation other than the rel
         }
     }
     if (_private->dataSource) {
-        [[[self webView] _locationChangeDelegateForwarder] webView: _private->controller willCloseLocationForDataSource:_private->dataSource];
+        [[[self webView] _frameLoadDelegateForwarder] webView:_private->controller willCloseFrame:self];
     }
 }
 
@@ -708,12 +708,14 @@ Repeat load of the same URL (by any other means of navigation other than the rel
             
             // Tell the client we've committed this URL.
             ASSERT([[self frameView] documentView] != nil);
-            [[[self webView] _locationChangeDelegateForwarder] webView: _private->controller locationChangeCommittedForDataSource:ds];
+            [[[self webView] _frameLoadDelegateForwarder] webView:_private->controller didCommitLoadForFrame:self];
             
             // If we have a title let the controller know about it.
             if (ptitle) {
                 [entry setTitle:ptitle];
-                [[[self webView] _locationChangeDelegateForwarder] webView: _private->controller receivedPageTitle:ptitle forDataSource:ds];
+                [[[self webView] _frameLoadDelegateForwarder] webView:_private->controller
+                                                           didReceiveTitle:ptitle
+                                                                  forFrame:self];
             }
             break;
         }
@@ -893,7 +895,9 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
                 if (![pd isLoading]) {
                     LOG(Loading, "%@:  checking complete in WebFrameStateProvisional, load done", [self name]);
 
-                    [[[self webView] _locationChangeDelegateForwarder] webView: _private->controller locationChangeDone:[pd _mainDocumentError] forDataSource:pd];
+                    [[[self webView] _frameLoadDelegateForwarder] webView:_private->controller
+                                               didFailProvisionalLoadWithError:[pd _mainDocumentError]
+                                                                      forFrame:self];
 
                     // We know the provisional data source didn't cut the muster, release it.
                     [self _setProvisionalDataSource:nil];
@@ -972,7 +976,14 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
                     }
                 }
 
-                [[[self webView] _locationChangeDelegateForwarder] webView: _private->controller locationChangeDone:[ds _mainDocumentError] forDataSource:ds];
+                if ([ds _mainDocumentError]) {
+                    [[[self webView] _frameLoadDelegateForwarder] webView:_private->controller
+                                                     didFailLoadWithError:[ds _mainDocumentError]
+                                                                 forFrame:self];
+                } else {
+                    [[[self webView] _frameLoadDelegateForwarder] webView:_private->controller
+                                                    didFinishLoadForFrame:self];
+                }
  
                 //if ([ds isDocumentHTML])
                 //    [[ds representation] part]->closeURL();        
@@ -1122,7 +1133,8 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
         [[self dataSource] __setRequest: [[hackedRequest copy] autorelease]];
         [hackedRequest release];
         
-        [[[self webView] _locationChangeDelegateForwarder] webView: _private->controller locationChangedWithinPageForDataSource:_private->dataSource];
+        [[[self webView] _frameLoadDelegateForwarder] webView:_private->controller
+                               didChangeLocationWithinPageForFrame:self];
     } else {
         // Remember this item so we can traverse any child items as child frames load
         [_private setProvisionalItem:item];
@@ -1530,7 +1542,8 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
         [self _checkLoadComplete];
     }
 
-    [[[self webView] _locationChangeDelegateForwarder] webView: _private->controller locationChangedWithinPageForDataSource:dataSrc];
+    [[[self webView] _frameLoadDelegateForwarder] webView:_private->controller
+                           didChangeLocationWithinPageForFrame:self];
 }
 
 - (void)_addExtraFieldsToRequest:(NSMutableURLRequest *)request alwaysFromRequest: (BOOL)f
@@ -1742,7 +1755,11 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
 {
     LOG(Redirect, "Client redirect to: %@", URL);
 
-    [[[self webView] _locationChangeDelegateForwarder] webView: _private->controller clientWillRedirectTo:URL delay:seconds fireDate:date forFrame:self];
+    [[[self webView] _frameLoadDelegateForwarder] webView:_private->controller
+                                willPerformClientRedirectToURL:URL
+                                                         delay:seconds
+                                                      fireDate:date
+                                                      forFrame:self];
     // If a "quick" redirect comes in an, we set a special mode so we treat the next
     // load as part of the same navigation.
 
@@ -1757,7 +1774,8 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
 
 - (void)_clientRedirectCancelled
 {
-    [[[self webView] _locationChangeDelegateForwarder] webView: _private->controller clientRedirectCancelledForFrame:self];
+    [[[self webView] _frameLoadDelegateForwarder] webView:_private->controller
+                               didCancelClientRedirectForFrame:self];
     _private->quickRedirectComing = NO;
 }
 
diff --git a/WebKit/WebView.subproj/WebLocationChangeDelegate.h b/WebKit/WebView.subproj/WebLocationChangeDelegate.h
deleted file mode 100644
index 6a3e2b3..0000000
--- a/WebKit/WebView.subproj/WebLocationChangeDelegate.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/*	
-        WebLocationChangeDelegate.h
-	Copyright 2001, 2002, Apple, Inc. All rights reserved.
-
-        Public header file.
-*/
-
-#import <Foundation/Foundation.h>
-
- at class NSError;
- at class WebView;
- at class WebDataSource;
- at class WebFrame;
-
-/*!
-    @category WebLocationChangeDelegate
-    @discussion A WebView's WebLocationChangeDelegate track changes its frame's location. 
-*/
- at interface NSObject (WebLocationChangeDelegate)
-
-/*!
-    @method locationChangeStartedForDataSource:
-    @abstract Notify that a location change has started on a given data source
-    @param webView The WebView sending the message.
-    @param dataSource The data source for which the location change has started
-    @discussion You can find out the URL and other parameters of the location change
-    from the data source object.
-*/
-- (void)webView:(WebView *)sender locationChangeStartedForDataSource:(WebDataSource *)dataSource;
-
-/*!
-    @method serverRedirectedTo:forDataSource:
-    @abstract Notify that the data source has received a server redirect.
-    @param dataSource The data source for which the redirect occurred
-    @discussion You can find the new URL from the data source object.
-*/
-- (void)webView:(WebView *)sender serverRedirectedForDataSource:(WebDataSource *)dataSource;
-
-/*!
-    @method locationChangeCommittedForDataSource:
-    @abstract Notify that a location change has been committed on a given data source
-    @param webView The WebView sending the message.
-    @param dataSource The data source for which the location change has started
-    @discussion When a location change starts, it is considered
-    "provisional" until at least one byte of the new page is
-    received. This is done so the old page will not be lost if the new
-    page fails to load completely.
-
-    In some cases, a single location change may be committed more than once. This happens
-    in the case of multipart/x-mixed-replace, also known as "server push". In this case,
-    a single location change leads to multiple documents that are loaded in sequence. When
-    this happens, a new commit will be sent for each document.
-*/
-- (void)webView:(WebView *)sender locationChangeCommittedForDataSource:(WebDataSource *)dataSource;
-
-/*!
-    @method receivedPageTitle:forDataSource:
-    @abstract Notify that the page title has been determined or has changed
-    @param title The new page title
-    @param dataSource The data source for which the title changed
-    @discussion The title may update during loading; clients should be prepared for this.
-*/
-- (void)webView:(WebView *)sender receivedPageTitle:(NSString *)title forDataSource:(WebDataSource *)dataSource;
-
-/*!
-    @method receivedPageIcon:forDataSource:
-    @abstract Notify that a page icon image is available or has changed
-    @param webView The WebView sending the message.
-    @param image The icon image
-    @param dataSource The data source for which a page icon is ready
-    @discussion It's possible the image will change, starting out as a
-    default or stored image and changing on a refresh.
-
-*/
-- (void)webView:(WebView *)sender receivedPageIcon:(NSImage *)image forDataSource:(WebDataSource *)dataSource;
-
-/*!
-    @method locationChangeDone:forDataSource:
-    @abstract Notify that a location change is done (possibly with an error) for a data source
-    @param webView The WebView sending the message.
-    @param error The error, if one occurred, or nil if none
-    @param dataSource The data source that finished changing location
-    @discussion This callback will only be received when all
-    subresources are done loading.
-*/
-- (void)webView:(WebView *)sender locationChangeDone:(NSError *)error forDataSource:(WebDataSource *)dataSource;
-
-/*!
-    @method willCloseLocationForDataSource:
-    @abstract Notify that a location will be closed.
-    @param webView The WebView sending the message.
-    @param dataSource The data source that where the location change originally happened
-    @discussion This callback happens right before WebKit is done with the data source
-    and the document representation that it contains.
- */
-- (void)webView:(WebView *)sender willCloseLocationForDataSource:(WebDataSource *)dataSource;
-
-/*!
-    @method locationChangedWithinPageForDataSource:
-    @abstract Notify that a further location change within the page
-    has occurred for an already loaded data source
-    @param webView The WebView sending the message.
-    @param dataSource The data source that had a location change
-    @discussion This is normally used for clicks on anchors within a page
-    that is already displayed. You can find the new URL from the data source object.
-*/
-- (void)webView:(WebView *)sender locationChangedWithinPageForDataSource:(WebDataSource *)dataSource;
-
-/*!
-    @method clientWillRedirectTo:delay:fireDate:forFrame:
-    @abstract Notify that the frame has received a client-side redirect that may trigger soon
-    @param webView The WebView sending the message.
-    @param URL The URL to be redirected to
-    @param seconds Seconds in which the redirect will happen
-    @param date The fire date
-    @param frame The frame on which the redirect will occur
-    @discussion This method can be used to keep progress feedback
-    going while a client redirect is pending. A client redirect might
-    be cancelled before it fires - see clientRedirectCancelledForFrame.
-*/
-- (void)webView:(WebView *)sender clientWillRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date forFrame:(WebFrame *)frame;
-
-/*!
-    @method clientRedirectCancelledForFrame:
-    @abstract Notify that a pending client redirect has been cancelled.
-    @param webView The WebView sending the message.
-    @param frame The frame for which the pending redirect was cancelled
-    @discussion A client redirect can be cancelled if the frame
-    changes locations before the timeout.
-*/
-- (void)webView:(WebView *)sender clientRedirectCancelledForFrame:(WebFrame *)frame;
-
- at end
-
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 6a70554..8793c96 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -22,12 +22,12 @@
 #import <WebKit/WebDefaultPolicyDelegate.h>
 #import <WebKit/WebDocument.h>
 #import <WebKit/WebDownloadPrivate.h>
+#import <WebKit/WebFrameLoadDelegate.h>
 #import <WebKit/WebFrameView.h>
 #import <WebKit/WebFramePrivate.h>
 #import <WebKit/WebKitErrors.h>
 #import <WebKit/WebKitErrorsPrivate.h>
 #import <WebKit/WebKitLogging.h>
-#import <WebKit/WebLocationChangeDelegate.h>
 #import <WebKit/WebPolicyDelegatePrivate.h>
 #import <WebKit/WebStandardPanelsPrivate.h>
 #import <WebKit/WebViewPrivate.h>
@@ -84,7 +84,7 @@
 
 - (NSError *)interruptForPolicyChangeError
 {
-    return [NSError _webKitErrorWithCode:WebKitErrorLocationChangeInterruptedByPolicyChange
+    return [NSError _webKitErrorWithCode:WebKitErrorFrameLoadInterruptedByPolicyChange
                               failingURL:[[request URL] absoluteString]];
 }
 
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 6a70554..8793c96 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -22,12 +22,12 @@
 #import <WebKit/WebDefaultPolicyDelegate.h>
 #import <WebKit/WebDocument.h>
 #import <WebKit/WebDownloadPrivate.h>
+#import <WebKit/WebFrameLoadDelegate.h>
 #import <WebKit/WebFrameView.h>
 #import <WebKit/WebFramePrivate.h>
 #import <WebKit/WebKitErrors.h>
 #import <WebKit/WebKitErrorsPrivate.h>
 #import <WebKit/WebKitLogging.h>
-#import <WebKit/WebLocationChangeDelegate.h>
 #import <WebKit/WebPolicyDelegatePrivate.h>
 #import <WebKit/WebStandardPanelsPrivate.h>
 #import <WebKit/WebViewPrivate.h>
@@ -84,7 +84,7 @@
 
 - (NSError *)interruptForPolicyChangeError
 {
-    return [NSError _webKitErrorWithCode:WebKitErrorLocationChangeInterruptedByPolicyChange
+    return [NSError _webKitErrorWithCode:WebKitErrorFrameLoadInterruptedByPolicyChange
                               failingURL:[[request URL] absoluteString]];
 }
 
diff --git a/WebKit/WebView.subproj/WebPolicyDelegate.h b/WebKit/WebView.subproj/WebPolicyDelegate.h
index 1cd709f..9bb394f 100644
--- a/WebKit/WebView.subproj/WebPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebPolicyDelegate.h
@@ -155,7 +155,8 @@ extern NSString *WebActionOriginalURLKey; // NSURL
 
 /*!
     @method decidePolicyForMIMEType:request:frame:
-    @discussion Returns the policy for content which has been partially loaded. Sent after locationChangeStarted. 
+    @discussion Returns the policy for content which has been partially loaded.
+    Sent after webView:didStartProvisionalLoadForFrame: is sent on the WebFrameLoadDelegate.
     @param type MIME type for the resource.
     @param request A NSURLRequest for the partially loaded content.
     @param frame The frame which is loading the URL.
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index ef49206..05ff816 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -137,18 +137,18 @@ extern NSString *WebElementLinkLabelKey;	// NSString of the text within the anch
 - (id)downloadDelegate;
 
 /*!
-    @method setLocationChangeDelegate:
-    @abstract Set the WebView's WebLocationChangeDelegate delegate.
-    @param delegate The WebLocationChangeDelegate to set as the delegate.
+    @method setFrameLoadDelegate:
+    @abstract Set the WebView's WebFrameLoadDelegate delegate.
+    @param delegate The WebFrameLoadDelegate to set as the delegate.
 */    
-- (void)setLocationChangeDelegate: (id)delegate;
+- (void)setFrameLoadDelegate: (id)delegate;
 
 /*!
-    @method locationChangeDelegate
-    @abstract Return the WebView's WebLocationChangeDelegate delegate.
-    @result The WebView's WebLocationChangeDelegate delegate.
+    @method frameLoadDelegate
+    @abstract Return the WebView's WebFrameLoadDelegate delegate.
+    @result The WebView's WebFrameLoadDelegate delegate.
 */    
-- (id)locationChangeDelegate;
+- (id)frameLoadDelegate;
 
 /*!
     @method setPolicyDelegate:
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index 21a1ea6..df53f3f 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -203,16 +203,16 @@ NSString *WebElementLinkTitleKey = 		@"WebElementLinkTitle";
     return _private->policyDelegate;
 }
 
-- (void)setLocationChangeDelegate:delegate
+- (void)setFrameLoadDelegate:delegate
 {
-    _private->locationChangeDelegate = delegate;
-    [_private->locationChangeDelegateForwarder release];
-    _private->locationChangeDelegateForwarder = nil;
+    _private->frameLoadDelegate = delegate;
+    [_private->frameLoadDelegateForwarder release];
+    _private->frameLoadDelegateForwarder = nil;
 }
 
-- locationChangeDelegate
+- frameLoadDelegate
 {
-    return _private->locationChangeDelegate;
+    return _private->frameLoadDelegate;
 }
 
 - (WebFrame *)mainFrame
diff --git a/WebKit/WebView.subproj/WebViewPrivate.h b/WebKit/WebView.subproj/WebViewPrivate.h
index 401f615..a96faa5 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.h
+++ b/WebKit/WebView.subproj/WebViewPrivate.h
@@ -38,8 +38,8 @@ typedef struct _WebResourceDelegateImplementationCache {
     id downloadDelegate;
     id policyDelegate;
     id policyDelegateForwarder;
-    id locationChangeDelegate;
-    id locationChangeDelegateForwarder;
+    id frameLoadDelegate;
+    id frameLoadDelegateForwarder;
     id <WebFormDelegate> formDelegate;
     
     WebBackForwardList *backForwardList;
@@ -156,7 +156,7 @@ Could be worth adding to the API.
 - (WebCoreSettings *)_settings;
 - (void)_updateWebCoreSettingsFromPreferences: (WebPreferences *)prefs;
 
-- _locationChangeDelegateForwarder;
+- _frameLoadDelegateForwarder;
 - _resourceLoadDelegateForwarder;
 - (void)_cacheResourceLoadDelegateImplementations;
 - (WebResourceDelegateImplementationCache)_resourceLoadDelegateImplementations;
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index 6161532..19f5451 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -6,16 +6,16 @@
 #import <WebKit/WebBackForwardList.h>
 #import <WebKit/WebControllerSets.h>
 #import <WebKit/WebDataSourcePrivate.h>
-#import <WebKit/WebDefaultLocationChangeDelegate.h>
+#import <WebKit/WebDefaultFrameLoadDelegate.h>
 #import <WebKit/WebDefaultPolicyDelegate.h>
 #import <WebKit/WebDefaultResourceLoadDelegate.h>
 #import <WebKit/WebDefaultUIDelegate.h>
 #import <WebKit/WebDownloadPrivate.h>
 #import <WebKit/WebFormDelegatePrivate.h>
+#import <WebKit/WebFrameLoadDelegate.h>
 #import <WebKit/WebFramePrivate.h>
 #import <WebKit/WebFrameViewPrivate.h>
 #import <WebKit/WebHistoryItemPrivate.h>
-#import <WebKit/WebLocationChangeDelegate.h>
 #import <WebKit/WebNSPasteboardExtras.h>
 #import <WebKit/WebPreferencesPrivate.h>
 #import <WebKit/WebResourceLoadDelegate.h>
@@ -87,7 +87,7 @@
     [policyDelegateForwarder release];
     [resourceProgressDelegateForwarder release];
     [UIDelegateForwarder release];
-    [locationChangeDelegateForwarder release];
+    [frameLoadDelegateForwarder release];
     
     [super dealloc];
 }
@@ -455,11 +455,11 @@
     [self _updateWebCoreSettingsFromPreferences: preferences];
 }
 
-- _locationChangeDelegateForwarder
+- _frameLoadDelegateForwarder
 {
-    if (!_private->locationChangeDelegateForwarder)
-        _private->locationChangeDelegateForwarder = [[_WebSafeForwarder alloc] initWithTarget: [self locationChangeDelegate]  defaultTarget: [WebDefaultLocationChangeDelegate sharedLocationChangeDelegate] templateClass: [WebDefaultLocationChangeDelegate class]];
-    return _private->locationChangeDelegateForwarder;
+    if (!_private->frameLoadDelegateForwarder)
+        _private->frameLoadDelegateForwarder = [[_WebSafeForwarder alloc] initWithTarget: [self frameLoadDelegate]  defaultTarget: [WebDefaultFrameLoadDelegate sharedFrameLoadDelegate] templateClass: [WebDefaultFrameLoadDelegate class]];
+    return _private->frameLoadDelegateForwarder;
 }
 
 - _resourceLoadDelegateForwarder

-- 
WebKit Debian packaging

More information about the Pkg-webkit-commits mailing list