[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:46:59 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 3458d7e6019289fe0dde6541580d57b5e8c2096b
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 4 02:48:40 2002 +0000
Changed name of controller's resourceProgressDelegate methods to resourceLoadDelegate.
* WebCoreSupport.subproj/WebSubresourceClient.m:
(-[WebSubresourceClient initWithLoader:dataSource:]):
(-[WebSubresourceClient handle:didReceiveResponse:]):
(-[WebSubresourceClient handle:didReceiveData:]):
(-[WebSubresourceClient handleDidFinishLoading:]):
(-[WebSubresourceClient handle:didFailLoadingWithError:]):
* WebView.subproj/WebController.h:
* WebView.subproj/WebController.m:
(-[WebController setResourceLoadDelegate:]):
(-[WebController resourceLoadDelegate]):
(-[WebController setDownloadDelegate:]):
(-[WebController downloadDelegate]):
* WebView.subproj/WebMainResourceClient.m:
(-[WebMainResourceClient initWithDataSource:]):
(-[WebMainResourceClient handle:didReceiveResponse:]):
Changed name of controller's resourceProgressDelegate methods to resourceLoadDelegate.
* BrowserDocument.m:
(-[BrowserDocument init]):
(-[BrowserDocument close]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2244 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 0c06d37..fe5bb7f 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,25 @@
2002-10-03 Richard Williamson <rjw at apple.com>
+ Changed name of controller's resourceProgressDelegate methods to resourceLoadDelegate.
+
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ (-[WebSubresourceClient initWithLoader:dataSource:]):
+ (-[WebSubresourceClient handle:didReceiveResponse:]):
+ (-[WebSubresourceClient handle:didReceiveData:]):
+ (-[WebSubresourceClient handleDidFinishLoading:]):
+ (-[WebSubresourceClient handle:didFailLoadingWithError:]):
+ * WebView.subproj/WebController.h:
+ * WebView.subproj/WebController.m:
+ (-[WebController setResourceLoadDelegate:]):
+ (-[WebController resourceLoadDelegate]):
+ (-[WebController setDownloadDelegate:]):
+ (-[WebController downloadDelegate]):
+ * WebView.subproj/WebMainResourceClient.m:
+ (-[WebMainResourceClient initWithDataSource:]):
+ (-[WebMainResourceClient handle:didReceiveResponse:]):
+
+2002-10-03 Richard Williamson <rjw at apple.com>
+
Always call resourceRequest:willSendRequest: on resourceProgressDelegate.
* WebView.subproj/WebMainResourceClient.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 0c06d37..fe5bb7f 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,25 @@
2002-10-03 Richard Williamson <rjw at apple.com>
+ Changed name of controller's resourceProgressDelegate methods to resourceLoadDelegate.
+
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ (-[WebSubresourceClient initWithLoader:dataSource:]):
+ (-[WebSubresourceClient handle:didReceiveResponse:]):
+ (-[WebSubresourceClient handle:didReceiveData:]):
+ (-[WebSubresourceClient handleDidFinishLoading:]):
+ (-[WebSubresourceClient handle:didFailLoadingWithError:]):
+ * WebView.subproj/WebController.h:
+ * WebView.subproj/WebController.m:
+ (-[WebController setResourceLoadDelegate:]):
+ (-[WebController resourceLoadDelegate]):
+ (-[WebController setDownloadDelegate:]):
+ (-[WebController downloadDelegate]):
+ * WebView.subproj/WebMainResourceClient.m:
+ (-[WebMainResourceClient initWithDataSource:]):
+ (-[WebMainResourceClient handle:didReceiveResponse:]):
+
+2002-10-03 Richard Williamson <rjw at apple.com>
+
Always call resourceRequest:willSendRequest: on resourceProgressDelegate.
* WebView.subproj/WebMainResourceClient.m:
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index b5a1d7a..9587034 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -30,7 +30,7 @@
loader = [l retain];
dataSource = [s retain];
- resourceProgressDelegate = [[[dataSource controller] resourceProgressDelegate] retain];
+ resourceProgressDelegate = [[[dataSource controller] resourceLoadDelegate] retain];
return self;
}
@@ -153,14 +153,14 @@
[r retain];
[response release];
response = r;
- [[[dataSource controller] resourceProgressDelegate] resourceRequest: request didReceiveResponse: r fromDataSource: dataSource];
+ [resourceProgressDelegate resourceRequest: request didReceiveResponse: r fromDataSource: dataSource];
}
- (void)handle:(WebResourceHandle *)h didReceiveData:(NSData *)data
{
ASSERT(handle == h);
- [[[dataSource controller] resourceProgressDelegate] resourceRequest: request didReceiveContentLength: [data length]
+ [resourceProgressDelegate resourceRequest: request didReceiveContentLength: [data length]
fromDataSource: dataSource];
[self receivedProgressWithComplete:NO];
@@ -190,7 +190,7 @@
[handle release];
handle = nil;
- [[[dataSource controller] resourceProgressDelegate] resourceRequest:request didFinishLoadingFromDataSource:dataSource];
+ [resourceProgressDelegate resourceRequest:request didFinishLoadingFromDataSource:dataSource];
[self release];
}
@@ -206,7 +206,7 @@
[dataSource _removeSubresourceClient:self];
- [[[dataSource controller] resourceProgressDelegate] resourceRequest: request didFailLoadingWithError: error fromDataSource: dataSource];
+ [resourceProgressDelegate resourceRequest: request didFailLoadingWithError: error fromDataSource: dataSource];
[self receivedError:error];
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index b5a1d7a..9587034 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -30,7 +30,7 @@
loader = [l retain];
dataSource = [s retain];
- resourceProgressDelegate = [[[dataSource controller] resourceProgressDelegate] retain];
+ resourceProgressDelegate = [[[dataSource controller] resourceLoadDelegate] retain];
return self;
}
@@ -153,14 +153,14 @@
[r retain];
[response release];
response = r;
- [[[dataSource controller] resourceProgressDelegate] resourceRequest: request didReceiveResponse: r fromDataSource: dataSource];
+ [resourceProgressDelegate resourceRequest: request didReceiveResponse: r fromDataSource: dataSource];
}
- (void)handle:(WebResourceHandle *)h didReceiveData:(NSData *)data
{
ASSERT(handle == h);
- [[[dataSource controller] resourceProgressDelegate] resourceRequest: request didReceiveContentLength: [data length]
+ [resourceProgressDelegate resourceRequest: request didReceiveContentLength: [data length]
fromDataSource: dataSource];
[self receivedProgressWithComplete:NO];
@@ -190,7 +190,7 @@
[handle release];
handle = nil;
- [[[dataSource controller] resourceProgressDelegate] resourceRequest:request didFinishLoadingFromDataSource:dataSource];
+ [resourceProgressDelegate resourceRequest:request didFinishLoadingFromDataSource:dataSource];
[self release];
}
@@ -206,7 +206,7 @@
[dataSource _removeSubresourceClient:self];
- [[[dataSource controller] resourceProgressDelegate] resourceRequest: request didFailLoadingWithError: error fromDataSource: dataSource];
+ [resourceProgressDelegate resourceRequest: request didFailLoadingWithError: error fromDataSource: dataSource];
[self receivedError:error];
diff --git a/WebKit/WebView.subproj/WebController.h b/WebKit/WebView.subproj/WebController.h
index b7d2900..618a944 100644
--- a/WebKit/WebView.subproj/WebController.h
+++ b/WebKit/WebView.subproj/WebController.h
@@ -14,7 +14,6 @@
@class WebDownloadHandler;
@class WebError;
@class WebFrame;
- at class WebLoadProgress;
@class WebResourceHandle;
@class WebView;
@@ -127,30 +126,30 @@ extern NSString *WebElementFrameKey;
- (id<WebWindowOperationsDelegate>)windowOperationsDelegate;
/*!
- @method setResourceProgressDelegate:
+ @method setResourceLoadDelegate:
@abstract Set the controller's WebResourceLoadDelegate.
@param delegate The WebResourceLoadDelegate to set as the delegate.
*/
-- (void)setResourceProgressDelegate: (id<WebResourceLoadDelegate>)delegate;
+- (void)setResourceLoadDelegate: (id<WebResourceLoadDelegate>)delegate;
/*!
- @method resourceProgressDelegate
+ @method resourceLoadDelegate
@result Return the controller's WebResourceLoadDelegate.
*/
-- (id<WebResourceLoadDelegate>)resourceProgressDelegate;
+- (id<WebResourceLoadDelegate>)resourceLoadDelegate;
/*!
- @method setDownloadProgressDelegate:
+ @method setDownloadDelegate:
@abstract Set the controller's WebResourceLoadDelegate download delegate.
@param delegate The WebResourceLoadDelegate to set as the download delegate.
*/
-- (void)setDownloadProgressDelegate: (id<WebResourceLoadDelegate>)delegate;
+- (void)setDownloadDelegate: (id<WebResourceLoadDelegate>)delegate;
/*!
- @method downloadProgressDelegate
+ @method downloadDelegate
@result Return the controller's WebResourceLoadDelegate download delegate.
*/
-- (id<WebResourceLoadDelegate>)downloadProgressDelegate;
+- (id<WebResourceLoadDelegate>)downloadDelegate;
/*!
@method setContextMenuDelegate:
diff --git a/WebKit/WebView.subproj/WebController.m b/WebKit/WebView.subproj/WebController.m
index 744230c..06b90cb 100644
--- a/WebKit/WebView.subproj/WebController.m
+++ b/WebKit/WebView.subproj/WebController.m
@@ -86,25 +86,25 @@ NSString *WebElementFrameKey = @"WebElementFrame";
return _private->windowContext;
}
-- (void)setResourceProgressDelegate: (id <WebResourceLoadDelegate>)delegate
+- (void)setResourceLoadDelegate: (id <WebResourceLoadDelegate>)delegate
{
_private->resourceProgressDelegate = delegate;
}
-- (id<WebResourceLoadDelegate>)resourceProgressDelegate
+- (id<WebResourceLoadDelegate>)resourceLoadDelegate
{
return _private->resourceProgressDelegate;
}
-- (void)setDownloadProgressDelegate: (id<WebResourceLoadDelegate>)delegate
+- (void)setDownloadDelegate: (id<WebResourceLoadDelegate>)delegate
{
_private->downloadProgressDelegate = delegate;
}
-- (id<WebResourceLoadDelegate>)downloadProgressDelegate
+- (id<WebResourceLoadDelegate>)downloadDelegate
{
return _private->downloadProgressDelegate;
}
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index fec5e12..140c051 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -42,7 +42,7 @@
// set the user agent for the request
// consult the data source's controller
WebController *controller = [dataSource controller];
- resourceProgressDelegate = [[controller resourceProgressDelegate] retain];
+ resourceProgressDelegate = [[controller resourceLoadDelegate] retain];
}
return self;
@@ -246,7 +246,7 @@
// 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.
- downloadProgressDelegate = [[[dataSource controller] downloadProgressDelegate] retain];
+ downloadProgressDelegate = [[[dataSource controller] downloadDelegate] retain];
// Figure out the content policy.
WebContentPolicy *contentPolicy = [dataSource contentPolicy];
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index fec5e12..140c051 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -42,7 +42,7 @@
// set the user agent for the request
// consult the data source's controller
WebController *controller = [dataSource controller];
- resourceProgressDelegate = [[controller resourceProgressDelegate] retain];
+ resourceProgressDelegate = [[controller resourceLoadDelegate] retain];
}
return self;
@@ -246,7 +246,7 @@
// 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.
- downloadProgressDelegate = [[[dataSource controller] downloadProgressDelegate] retain];
+ downloadProgressDelegate = [[[dataSource controller] downloadDelegate] retain];
// Figure out the content policy.
WebContentPolicy *contentPolicy = [dataSource contentPolicy];
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index b7d2900..618a944 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -14,7 +14,6 @@
@class WebDownloadHandler;
@class WebError;
@class WebFrame;
- at class WebLoadProgress;
@class WebResourceHandle;
@class WebView;
@@ -127,30 +126,30 @@ extern NSString *WebElementFrameKey;
- (id<WebWindowOperationsDelegate>)windowOperationsDelegate;
/*!
- @method setResourceProgressDelegate:
+ @method setResourceLoadDelegate:
@abstract Set the controller's WebResourceLoadDelegate.
@param delegate The WebResourceLoadDelegate to set as the delegate.
*/
-- (void)setResourceProgressDelegate: (id<WebResourceLoadDelegate>)delegate;
+- (void)setResourceLoadDelegate: (id<WebResourceLoadDelegate>)delegate;
/*!
- @method resourceProgressDelegate
+ @method resourceLoadDelegate
@result Return the controller's WebResourceLoadDelegate.
*/
-- (id<WebResourceLoadDelegate>)resourceProgressDelegate;
+- (id<WebResourceLoadDelegate>)resourceLoadDelegate;
/*!
- @method setDownloadProgressDelegate:
+ @method setDownloadDelegate:
@abstract Set the controller's WebResourceLoadDelegate download delegate.
@param delegate The WebResourceLoadDelegate to set as the download delegate.
*/
-- (void)setDownloadProgressDelegate: (id<WebResourceLoadDelegate>)delegate;
+- (void)setDownloadDelegate: (id<WebResourceLoadDelegate>)delegate;
/*!
- @method downloadProgressDelegate
+ @method downloadDelegate
@result Return the controller's WebResourceLoadDelegate download delegate.
*/
-- (id<WebResourceLoadDelegate>)downloadProgressDelegate;
+- (id<WebResourceLoadDelegate>)downloadDelegate;
/*!
@method setContextMenuDelegate:
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index 744230c..06b90cb 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -86,25 +86,25 @@ NSString *WebElementFrameKey = @"WebElementFrame";
return _private->windowContext;
}
-- (void)setResourceProgressDelegate: (id <WebResourceLoadDelegate>)delegate
+- (void)setResourceLoadDelegate: (id <WebResourceLoadDelegate>)delegate
{
_private->resourceProgressDelegate = delegate;
}
-- (id<WebResourceLoadDelegate>)resourceProgressDelegate
+- (id<WebResourceLoadDelegate>)resourceLoadDelegate
{
return _private->resourceProgressDelegate;
}
-- (void)setDownloadProgressDelegate: (id<WebResourceLoadDelegate>)delegate
+- (void)setDownloadDelegate: (id<WebResourceLoadDelegate>)delegate
{
_private->downloadProgressDelegate = delegate;
}
-- (id<WebResourceLoadDelegate>)downloadProgressDelegate
+- (id<WebResourceLoadDelegate>)downloadDelegate
{
return _private->downloadProgressDelegate;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list