[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
mjs
mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:41:25 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit d2f9761febf2791c37f32666d7668079d6c985b9
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri May 9 22:14:15 2003 +0000
WebFoundation:
Reviewed by John.
Rename connection:didFailLoadingWithError: to
connection:didFailWithError: to match NSURLDownload and
NSURLProtocol.
* CacheLoader.subproj/NSSynchronousURLConnectionDelegate.m:
* CacheLoader.subproj/NSURLConnection.h:
* CacheLoader.subproj/NSURLConnection.m:
(-[NSURLConnection _sendCallbacks]):
(-[NSURLConnection _postDidFailCallback]):
(-[NSURLConnection _sendDidFailCallback]):
(-[NSURLConnection _wasRedirectedToRequest:redirectResponse:]):
(-[NSURLConnection _didFailWithError:]):
(-[NSURLConnectionInternal prepareCallbacks]):
* FileTransfer.subproj/NSURLDownload.m:
(-[NSURLDownload connection:didFailWithError:]):
(-[NSURLConnectionDelegateProxy connection:didFailWithError:]):
WebKit:
Reviewed by John.
Rename connection:didFailLoadingWithError: to
connection:didFailWithError: to match NSURLDownload and
NSURLProtocol.
* Misc.subproj/WebIconLoader.m:
(-[WebIconLoader connection:didFailWithError:]):
* Plugins.subproj/WebNetscapePluginStream.m:
(-[WebNetscapePluginStream connection:didFailWithError:]):
* WebCoreSupport.subproj/WebSubresourceClient.m:
(-[WebSubresourceClient connection:didFailWithError:]):
* WebView.subproj/WebBaseResourceHandleDelegate.m:
(-[WebBaseResourceHandleDelegate connection:didFailWithError:]):
* WebView.subproj/WebMainResourceClient.m:
(-[WebMainResourceClient receivedError:]):
(-[WebMainResourceClient connection:didFailWithError:]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4334 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index bf4b190..ae160c1 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,23 @@
+2003-05-09 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by John.
+
+ Rename connection:didFailLoadingWithError: to
+ connection:didFailWithError: to match NSURLDownload and
+ NSURLProtocol.
+
+ * Misc.subproj/WebIconLoader.m:
+ (-[WebIconLoader connection:didFailWithError:]):
+ * Plugins.subproj/WebNetscapePluginStream.m:
+ (-[WebNetscapePluginStream connection:didFailWithError:]):
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ (-[WebSubresourceClient connection:didFailWithError:]):
+ * WebView.subproj/WebBaseResourceHandleDelegate.m:
+ (-[WebBaseResourceHandleDelegate connection:didFailWithError:]):
+ * WebView.subproj/WebMainResourceClient.m:
+ (-[WebMainResourceClient receivedError:]):
+ (-[WebMainResourceClient connection:didFailWithError:]):
+
2003-05-09 Richard Williamson <rjw at apple.com>
Apply the same check used to by-pass fast rendering
diff --git a/WebKit/Misc.subproj/WebIconLoader.m b/WebKit/Misc.subproj/WebIconLoader.m
index c8be035..fb07a2b 100644
--- a/WebKit/Misc.subproj/WebIconLoader.m
+++ b/WebKit/Misc.subproj/WebIconLoader.m
@@ -129,7 +129,7 @@
[_private->resourceData appendData:data];
}
-- (void)connection:(NSURLConnection *)connection didFailLoadingWithError:(NSError *)result
+- (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)result
{
}
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginStream.m b/WebKit/Plugins.subproj/WebNetscapePluginStream.m
index 7dc5dd7..ad4a88d 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginStream.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginStream.m
@@ -102,7 +102,7 @@
[super connectionDidFinishLoading:con];
}
-- (void)connection:(NSURLConnection *)con didFailLoadingWithError:(NSError *)result
+- (void)connection:(NSURLConnection *)con didFailWithError:(NSError *)result
{
[[view webView] _receivedError:result fromDataSource:[view dataSource]];
@@ -111,7 +111,7 @@
[view release];
view = nil;
- [super connection:con didFailLoadingWithError:result];
+ [super connection:con didFailWithError:result];
}
@end
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index 164600a..c534e3b 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -123,7 +123,7 @@
[self release];
}
-- (void)connection:(NSURLConnection *)con didFailLoadingWithError:(NSError *)error
+- (void)connection:(NSURLConnection *)con didFailWithError:(NSError *)error
{
// Calling _removeSubresourceClient will likely result in a call to release, so we must retain.
[self retain];
@@ -131,7 +131,7 @@
[loader reportError];
[dataSource _removeSubresourceClient:self];
[self receivedError:error];
- [super connection:con didFailLoadingWithError:error];
+ [super connection:con didFailWithError:error];
[self release];
}
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index 164600a..c534e3b 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -123,7 +123,7 @@
[self release];
}
-- (void)connection:(NSURLConnection *)con didFailLoadingWithError:(NSError *)error
+- (void)connection:(NSURLConnection *)con didFailWithError:(NSError *)error
{
// Calling _removeSubresourceClient will likely result in a call to release, so we must retain.
[self retain];
@@ -131,7 +131,7 @@
[loader reportError];
[dataSource _removeSubresourceClient:self];
[self receivedError:error];
- [super connection:con didFailLoadingWithError:error];
+ [super connection:con didFailWithError:error];
[self release];
}
diff --git a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
index dbdc917..a2d809e 100644
--- a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
+++ b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
@@ -299,7 +299,7 @@
[self _releaseResources];
}
-- (void)connection:(NSURLConnection *)con didFailLoadingWithError:(NSError *)result
+- (void)connection:(NSURLConnection *)con didFailWithError:(NSError *)result
{
ASSERT(con == connection);
ASSERT(!reachedTerminalState);
diff --git a/WebKit/WebView.subproj/WebLoader.m b/WebKit/WebView.subproj/WebLoader.m
index dbdc917..a2d809e 100644
--- a/WebKit/WebView.subproj/WebLoader.m
+++ b/WebKit/WebView.subproj/WebLoader.m
@@ -299,7 +299,7 @@
[self _releaseResources];
}
-- (void)connection:(NSURLConnection *)con didFailLoadingWithError:(NSError *)result
+- (void)connection:(NSURLConnection *)con didFailWithError:(NSError *)result
{
ASSERT(con == connection);
ASSERT(!reachedTerminalState);
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 76cf2bd..8210f18 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -61,7 +61,7 @@
// Calling _receivedError will likely result in a call to release, so we must retain.
[self retain];
[dataSource _receivedError:error complete:YES];
- [super connection:connection didFailLoadingWithError:error];
+ [super connection:connection didFailWithError:error];
[self release];
}
@@ -285,7 +285,7 @@
[self release];
}
-- (void)connection:(NSURLConnection *)con didFailLoadingWithError:(NSError *)error
+- (void)connection:(NSURLConnection *)con didFailWithError:(NSError *)error
{
ASSERT(![con defersCallbacks]);
ASSERT(![self defersCallbacks]);
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 76cf2bd..8210f18 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -61,7 +61,7 @@
// Calling _receivedError will likely result in a call to release, so we must retain.
[self retain];
[dataSource _receivedError:error complete:YES];
- [super connection:connection didFailLoadingWithError:error];
+ [super connection:connection didFailWithError:error];
[self release];
}
@@ -285,7 +285,7 @@
[self release];
}
-- (void)connection:(NSURLConnection *)con didFailLoadingWithError:(NSError *)error
+- (void)connection:(NSURLConnection *)con didFailWithError:(NSError *)error
{
ASSERT(![con defersCallbacks]);
ASSERT(![self defersCallbacks]);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list