[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:57:01 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit d2a4a2edac27e309ec10c09d31c8837fa65ea9d8
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Nov 4 23:08:10 2002 +0000
- fixed 3090257 -- "leak the world" using the Wallace and Gromit "console"
* Plugins.subproj/WebNetscapePluginStream.m: Update for changes to the base delegate.
(-[WebNetscapePluginStream start]): Use loadWithRequest:.
(-[WebNetscapePluginStream stop]): Call cancel instead of just canceling the handle
directly. This fixes the world leak.
(-[WebNetscapePluginStream cancel]): Do some of the work that was formerly in "stop".
* WebView.subproj/WebMainResourceClient.m:
(-[WebMainResourceClient handle:willSendRequest:]): Call the "stop loading URL" whenever
we cancel I/O, so we don't leak the world.
(-[WebMainResourceClient handle:didReceiveResponse:]): Ditto.
* WebCoreSupport.subproj/WebBridge.m: (-[WebBridge objectLoadedFromCache:response:size:]):
* WebCoreSupport.subproj/WebSubresourceClient.m: (-[WebSubresourceClient handleDidFinishLoading:]):
* WebView.subproj/WebControllerPrivate.h:
* WebView.subproj/WebControllerPrivate.m:
(-[WebController _finishedLoadingResourceFromDataSource:]):
Fix a typo in the word "finished".
* WebView.subproj/WebBaseResourceHandleDelegate.m:
(-[WebBaseResourceHandleDelegate handle:willSendRequest:]): Tweak.
(-[WebBaseResourceHandleDelegate cancel]): Tweak.
* Panels.subproj/WebStandardPanels.m:
(-[WebStandardPanels didStartLoadingURL:inWindow:]): Add assertions.
(-[WebStandardPanels didStopLoadingURL:inWindow:]): Ditto.
(-[WebStandardPanels _didStartLoadingURL:inController:]): Ditto.
(-[WebStandardPanels _didStopLoadingURL:inController:]): Ditto.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2553 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 08cda98..1bbe7ba 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,37 @@
2002-11-04 Darin Adler <darin at apple.com>
+ - fixed 3090257 -- "leak the world" using the Wallace and Gromit "console"
+
+ * Plugins.subproj/WebNetscapePluginStream.m: Update for changes to the base delegate.
+ (-[WebNetscapePluginStream start]): Use loadWithRequest:.
+ (-[WebNetscapePluginStream stop]): Call cancel instead of just canceling the handle
+ directly. This fixes the world leak.
+ (-[WebNetscapePluginStream cancel]): Do some of the work that was formerly in "stop".
+
+ * WebView.subproj/WebMainResourceClient.m:
+ (-[WebMainResourceClient handle:willSendRequest:]): Call the "stop loading URL" whenever
+ we cancel I/O, so we don't leak the world.
+ (-[WebMainResourceClient handle:didReceiveResponse:]): Ditto.
+
+ * WebCoreSupport.subproj/WebBridge.m: (-[WebBridge objectLoadedFromCache:response:size:]):
+ * WebCoreSupport.subproj/WebSubresourceClient.m: (-[WebSubresourceClient handleDidFinishLoading:]):
+ * WebView.subproj/WebControllerPrivate.h:
+ * WebView.subproj/WebControllerPrivate.m:
+ (-[WebController _finishedLoadingResourceFromDataSource:]):
+ Fix a typo in the word "finished".
+
+ * WebView.subproj/WebBaseResourceHandleDelegate.m:
+ (-[WebBaseResourceHandleDelegate handle:willSendRequest:]): Tweak.
+ (-[WebBaseResourceHandleDelegate cancel]): Tweak.
+
+ * Panels.subproj/WebStandardPanels.m:
+ (-[WebStandardPanels didStartLoadingURL:inWindow:]): Add assertions.
+ (-[WebStandardPanels didStopLoadingURL:inWindow:]): Ditto.
+ (-[WebStandardPanels _didStartLoadingURL:inController:]): Ditto.
+ (-[WebStandardPanels _didStopLoadingURL:inController:]): Ditto.
+
+2002-11-04 Darin Adler <darin at apple.com>
+
* Downloads.subproj/WebMacBinaryDecoder.h: Removed many unneeded fields.
* Downloads.subproj/WebMacBinaryDecoder.m:
(+[WebMacBinaryDecoder canDecodeHeaderData:]): Added comments. Changed maximum filename
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 08cda98..1bbe7ba 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,37 @@
2002-11-04 Darin Adler <darin at apple.com>
+ - fixed 3090257 -- "leak the world" using the Wallace and Gromit "console"
+
+ * Plugins.subproj/WebNetscapePluginStream.m: Update for changes to the base delegate.
+ (-[WebNetscapePluginStream start]): Use loadWithRequest:.
+ (-[WebNetscapePluginStream stop]): Call cancel instead of just canceling the handle
+ directly. This fixes the world leak.
+ (-[WebNetscapePluginStream cancel]): Do some of the work that was formerly in "stop".
+
+ * WebView.subproj/WebMainResourceClient.m:
+ (-[WebMainResourceClient handle:willSendRequest:]): Call the "stop loading URL" whenever
+ we cancel I/O, so we don't leak the world.
+ (-[WebMainResourceClient handle:didReceiveResponse:]): Ditto.
+
+ * WebCoreSupport.subproj/WebBridge.m: (-[WebBridge objectLoadedFromCache:response:size:]):
+ * WebCoreSupport.subproj/WebSubresourceClient.m: (-[WebSubresourceClient handleDidFinishLoading:]):
+ * WebView.subproj/WebControllerPrivate.h:
+ * WebView.subproj/WebControllerPrivate.m:
+ (-[WebController _finishedLoadingResourceFromDataSource:]):
+ Fix a typo in the word "finished".
+
+ * WebView.subproj/WebBaseResourceHandleDelegate.m:
+ (-[WebBaseResourceHandleDelegate handle:willSendRequest:]): Tweak.
+ (-[WebBaseResourceHandleDelegate cancel]): Tweak.
+
+ * Panels.subproj/WebStandardPanels.m:
+ (-[WebStandardPanels didStartLoadingURL:inWindow:]): Add assertions.
+ (-[WebStandardPanels didStopLoadingURL:inWindow:]): Ditto.
+ (-[WebStandardPanels _didStartLoadingURL:inController:]): Ditto.
+ (-[WebStandardPanels _didStopLoadingURL:inController:]): Ditto.
+
+2002-11-04 Darin Adler <darin at apple.com>
+
* Downloads.subproj/WebMacBinaryDecoder.h: Removed many unneeded fields.
* Downloads.subproj/WebMacBinaryDecoder.m:
(+[WebMacBinaryDecoder canDecodeHeaderData:]): Added comments. Changed maximum filename
diff --git a/WebKit/Panels.subproj/WebStandardPanels.m b/WebKit/Panels.subproj/WebStandardPanels.m
index 3961bc5..8050eb7 100644
--- a/WebKit/Panels.subproj/WebStandardPanels.m
+++ b/WebKit/Panels.subproj/WebStandardPanels.m
@@ -5,10 +5,13 @@
*/
#import <WebKit/WebStandardPanels.h>
+
#import <WebKit/WebStandardPanelsPrivate.h>
#import <WebKit/WebPanelAuthenticationHandler.h>
#import <WebKit/WebFrame.h>
#import <WebKit/WebView.h>
+
+#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebAuthenticationManager.h>
#import <Carbon/Carbon.h>
@@ -103,6 +106,9 @@ static void initSharedStandardPanels(void)
-(void)didStartLoadingURL:(NSURL *)URL inWindow:(NSWindow *)window
{
+ ASSERT_ARG(URL, URL);
+ ASSERT_ARG(window, window);
+
NSCountedSet *set = [_privatePanels->URLContainers objectForKey:URL];
if (set == nil) {
@@ -115,8 +121,13 @@ static void initSharedStandardPanels(void)
-(void)didStopLoadingURL:(NSURL *)URL inWindow:(NSWindow *)window
{
+ ASSERT_ARG(URL, URL);
+ ASSERT_ARG(window, window);
+
NSCountedSet *set = [_privatePanels->URLContainers objectForKey:URL];
+ ASSERT([set containsObject:window]);
+
if (set == nil) {
return;
}
@@ -130,6 +141,9 @@ static void initSharedStandardPanels(void)
-(void)_didStartLoadingURL:(NSURL *)URL inController:(WebController *)controller
{
+ ASSERT_ARG(URL, URL);
+ ASSERT_ARG(controller, controller);
+
NSCountedSet *set = [_privatePanels->URLContainers objectForKey:URL];
if (set == nil) {
@@ -142,8 +156,13 @@ static void initSharedStandardPanels(void)
-(void)_didStopLoadingURL:(NSURL *)URL inController:(WebController *)controller
{
+ ASSERT_ARG(URL, URL);
+ ASSERT_ARG(controller, controller);
+
NSCountedSet *set = [_privatePanels->URLContainers objectForKey:URL];
+ ASSERT([set containsObject:controller]);
+
if (set == nil) {
return;
}
@@ -198,6 +217,3 @@ static BOOL WindowInFront(NSWindow *a, NSWindow *b)
}
@end
-
-
-
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginStream.m b/WebKit/Plugins.subproj/WebNetscapePluginStream.m
index 86dc3e8..0b47fe9 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginStream.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginStream.m
@@ -44,74 +44,51 @@
- (void)start
{
- handle = [[WebResourceHandle alloc] initWithRequest:request];
- [handle loadWithDelegate:self];
+ [self loadWithRequest:request];
}
- (void)stop
{
- [view release];
- view = nil;
-
- if (!handle) {
- return;
+ if (view) {
+ [self cancel];
}
+}
- // Stopped while loading.
- [handle cancel];
-
- WebController *controller = [view controller];
-
- WebError *cancelError = [[WebError alloc] initWithErrorCode:WebErrorCodeCancelled
- inDomain:WebErrorDomainWebFoundation
- failingURL:nil];
- [controller _receivedError:cancelError fromDataSource:[view dataSource]];
-
- [cancelError release];
+- (void)cancel
+{
+ [view release];
+ view = nil;
- [handle release];
- handle = nil;
+ [super cancel];
- if(URL){
- // Send error only if the response has been set (the URL is set with the response).
+ // Send error only if the response has been set (the URL is set with the response).
+ if (URL) {
[self receivedError:NPRES_USER_BREAK];
}
}
-- (WebResourceRequest *)handle:(WebResourceHandle *)h willSendRequest:(WebResourceRequest *)theRequest
-{
- return [super handle: h willSendRequest: theRequest];
-}
-
- (void)handle:(WebResourceHandle *)h didReceiveResponse:(WebResourceResponse *)theResponse
{
- ASSERT(handle == h);
-
[self setResponse:theResponse];
- [super handle: h didReceiveResponse: theResponse];
+ [super handle:h didReceiveResponse:theResponse];
}
- (void)handle:(WebResourceHandle *)h didReceiveData:(NSData *)data
{
- ASSERT(handle == h);
-
- if(transferMode == NP_ASFILE || transferMode == NP_ASFILEONLY) {
+ if (transferMode == NP_ASFILE || transferMode == NP_ASFILEONLY) {
[resourceData appendData:data];
}
[self receivedData:data];
- [super handle: handle didReceiveData: data];
+ [super handle:handle didReceiveData:data];
}
- (void)handleDidFinishLoading:(WebResourceHandle *)h
{
- ASSERT(handle == h);
-
WebController *controller = [view controller];
- [controller _finsishedLoadingResourceFromDataSource: [view dataSource]];
-
+ [controller _finishedLoadingResourceFromDataSource:[view dataSource]];
[self finishedLoadingWithData:resourceData];
[view release];
@@ -126,14 +103,14 @@
WebController *controller = [view controller];
- [controller _receivedError: result fromDataSource: [view dataSource]];
+ [controller _receivedError:result fromDataSource:[view dataSource]];
[self receivedError:NPRES_NETWORK_ERR];
[view release];
view = nil;
- [super handle: h didFailLoadingWithError: result];
+ [super handle:h didFailLoadingWithError:result];
}
@end
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index df596ce..dd622c9 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -204,7 +204,7 @@
[delegate resource: identifier didReceiveContentLength: bytes fromDataSource: [self dataSource]];
[delegate resource: identifier didFinishLoadingFromDataSource: [self dataSource]];
- [[frame controller] _finsishedLoadingResourceFromDataSource:[self dataSource]];
+ [[frame controller] _finishedLoadingResourceFromDataSource:[self dataSource]];
[request release];
}
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index fa99bc6..570eae7 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -122,7 +122,7 @@
[self receivedError:nonTerminalError];
}
- [[dataSource controller] _finsishedLoadingResourceFromDataSource:dataSource];
+ [[dataSource controller] _finishedLoadingResourceFromDataSource:dataSource];
[self release];
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index fa99bc6..570eae7 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -122,7 +122,7 @@
[self receivedError:nonTerminalError];
}
- [[dataSource controller] _finsishedLoadingResourceFromDataSource:dataSource];
+ [[dataSource controller] _finishedLoadingResourceFromDataSource:dataSource];
[self release];
diff --git a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
index 50d7a44..eac3896 100644
--- a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
+++ b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
@@ -121,35 +121,34 @@
{
ASSERT(handle == h);
ASSERT(!reachedTerminalState);
+
+ NSURL *newURL = [newRequest URL];
- [newRequest setUserAgent:[[dataSource controller] userAgentForURL:[newRequest URL]]];
+ [newRequest setUserAgent:[[dataSource controller] userAgentForURL:newURL]];
- // No need to retain here, will be copied after delegate callback.
[request autorelease];
- request = newRequest;
+ request = [newRequest copy];
- if (identifier == nil){
+ if (identifier == nil) {
// The identifier is released after the last callback, rather than in dealloc
// to avoid potential cycles.
- identifier = [[resourceLoadDelegate identifierForInitialRequest: request fromDataSource: dataSource] retain];
+ identifier = [[resourceLoadDelegate identifierForInitialRequest:request fromDataSource:dataSource] retain];
}
if (resourceLoadDelegate)
- request = [resourceLoadDelegate resource: identifier willSendRequest: request fromDataSource: dataSource];
+ request = [resourceLoadDelegate resource:identifier willSendRequest:request fromDataSource:dataSource];
- [[WebStandardPanels sharedStandardPanels] _didStopLoadingURL:currentURL inController: [dataSource controller]];
-
- if ([request URL] != currentURL){
- [currentURL release];
- currentURL = [[request URL] retain];
+ if (currentURL) {
+ [[WebStandardPanels sharedStandardPanels] _didStopLoadingURL:currentURL inController:[dataSource controller]];
}
+ [newURL retain];
+ [currentURL release];
+ currentURL = newURL;
+
[[WebStandardPanels sharedStandardPanels] _didStartLoadingURL:currentURL inController:[dataSource controller]];
- // It'd be nice if we could depend on WebResourceRequest being immutable, but we can't so always
- // copy.
- request = [request copy];
- return request;
+ return newRequest;
}
-(void)handle:(WebResourceHandle *)h didReceiveResponse:(WebResourceResponse *)r
@@ -210,23 +209,19 @@
- (void)cancel
{
- ASSERT (!reachedTerminalState);
+ ASSERT(!reachedTerminalState);
[handle cancel];
[[WebStandardPanels sharedStandardPanels] _didStopLoadingURL:currentURL inController:[dataSource controller]];
- WebError *error = [[WebError alloc] initWithErrorCode:WebErrorCodeCancelled
- inDomain:WebErrorDomainWebFoundation failingURL:[[request URL] absoluteString]];
- if (![self isDownload])
- [resourceLoadDelegate resource: identifier didFailLoadingWithError: error fromDataSource: dataSource];
+ if (![self isDownload]) {
+ WebError *error = [[WebError alloc] initWithErrorCode:WebErrorCodeCancelled
+ inDomain:WebErrorDomainWebFoundation failingURL:[[request URL] absoluteString]];
+ [resourceLoadDelegate resource:identifier didFailLoadingWithError:error fromDataSource:dataSource];
+ }
[self _releaseResources];
}
-- (WebResourceHandle *)handle
-{
- return handle;
-}
-
@end
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.h b/WebKit/WebView.subproj/WebControllerPrivate.h
index c666dbb..994e821 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.h
+++ b/WebKit/WebView.subproj/WebControllerPrivate.h
@@ -44,7 +44,7 @@
- (WebFrame *)_createFrameNamed:(NSString *)name inParent:(WebFrame *)parent allowsScrolling:(BOOL)allowsScrolling;
- (id <WebContextMenuDelegate>)_defaultContextMenuDelegate;
-- (void)_finsishedLoadingResourceFromDataSource:(WebDataSource *)dataSource;
+- (void)_finishedLoadingResourceFromDataSource:(WebDataSource *)dataSource;
- (void)_receivedError:(WebError *)error fromDataSource:(WebDataSource *)dataSource;
- (void)_mainReceivedBytesSoFar:(unsigned)bytesSoFar fromDataSource:(WebDataSource *)dataSource complete:(BOOL)isComplete;
- (void)_mainReceivedError:(WebError *)error fromDataSource:(WebDataSource *)dataSource;
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.m b/WebKit/WebView.subproj/WebControllerPrivate.m
index 5bae102..ed436e4 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.m
+++ b/WebKit/WebView.subproj/WebControllerPrivate.m
@@ -102,7 +102,7 @@
return _private->defaultContextMenuDelegate;
}
-- (void)_finsishedLoadingResourceFromDataSource: (WebDataSource *)dataSource
+- (void)_finishedLoadingResourceFromDataSource: (WebDataSource *)dataSource
{
WebFrame *frame = [dataSource webFrame];
diff --git a/WebKit/WebView.subproj/WebLoader.m b/WebKit/WebView.subproj/WebLoader.m
index 50d7a44..eac3896 100644
--- a/WebKit/WebView.subproj/WebLoader.m
+++ b/WebKit/WebView.subproj/WebLoader.m
@@ -121,35 +121,34 @@
{
ASSERT(handle == h);
ASSERT(!reachedTerminalState);
+
+ NSURL *newURL = [newRequest URL];
- [newRequest setUserAgent:[[dataSource controller] userAgentForURL:[newRequest URL]]];
+ [newRequest setUserAgent:[[dataSource controller] userAgentForURL:newURL]];
- // No need to retain here, will be copied after delegate callback.
[request autorelease];
- request = newRequest;
+ request = [newRequest copy];
- if (identifier == nil){
+ if (identifier == nil) {
// The identifier is released after the last callback, rather than in dealloc
// to avoid potential cycles.
- identifier = [[resourceLoadDelegate identifierForInitialRequest: request fromDataSource: dataSource] retain];
+ identifier = [[resourceLoadDelegate identifierForInitialRequest:request fromDataSource:dataSource] retain];
}
if (resourceLoadDelegate)
- request = [resourceLoadDelegate resource: identifier willSendRequest: request fromDataSource: dataSource];
+ request = [resourceLoadDelegate resource:identifier willSendRequest:request fromDataSource:dataSource];
- [[WebStandardPanels sharedStandardPanels] _didStopLoadingURL:currentURL inController: [dataSource controller]];
-
- if ([request URL] != currentURL){
- [currentURL release];
- currentURL = [[request URL] retain];
+ if (currentURL) {
+ [[WebStandardPanels sharedStandardPanels] _didStopLoadingURL:currentURL inController:[dataSource controller]];
}
+ [newURL retain];
+ [currentURL release];
+ currentURL = newURL;
+
[[WebStandardPanels sharedStandardPanels] _didStartLoadingURL:currentURL inController:[dataSource controller]];
- // It'd be nice if we could depend on WebResourceRequest being immutable, but we can't so always
- // copy.
- request = [request copy];
- return request;
+ return newRequest;
}
-(void)handle:(WebResourceHandle *)h didReceiveResponse:(WebResourceResponse *)r
@@ -210,23 +209,19 @@
- (void)cancel
{
- ASSERT (!reachedTerminalState);
+ ASSERT(!reachedTerminalState);
[handle cancel];
[[WebStandardPanels sharedStandardPanels] _didStopLoadingURL:currentURL inController:[dataSource controller]];
- WebError *error = [[WebError alloc] initWithErrorCode:WebErrorCodeCancelled
- inDomain:WebErrorDomainWebFoundation failingURL:[[request URL] absoluteString]];
- if (![self isDownload])
- [resourceLoadDelegate resource: identifier didFailLoadingWithError: error fromDataSource: dataSource];
+ if (![self isDownload]) {
+ WebError *error = [[WebError alloc] initWithErrorCode:WebErrorCodeCancelled
+ inDomain:WebErrorDomainWebFoundation failingURL:[[request URL] absoluteString]];
+ [resourceLoadDelegate resource:identifier didFailLoadingWithError:error fromDataSource:dataSource];
+ }
[self _releaseResources];
}
-- (WebResourceHandle *)handle
-{
- return handle;
-}
-
@end
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index cc1f721..ea362af 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -116,6 +116,8 @@
if (![[dataSource webFrame] _shouldShowRequest:request]) {
[handle cancel];
+ [[WebStandardPanels sharedStandardPanels] _didStopLoadingURL:currentURL inController:[dataSource controller]];
+
[[dataSource webFrame] _setProvisionalDataSource:nil];
[[[dataSource controller] locationChangeDelegate] locationChangeDone:[WebError errorWithCode:WebErrorLocationChangeInterruptedByPolicyChange inDomain:WebErrorDomainWebKit failingURL:nil] forDataSource:dataSource];
result = nil;
@@ -190,6 +192,7 @@
if (downloadError) {
[self receivedError:downloadError];
[handle cancel];
+ [[WebStandardPanels sharedStandardPanels] _didStopLoadingURL:currentURL inController:[dataSource controller]];
}
}
break;
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index cc1f721..ea362af 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -116,6 +116,8 @@
if (![[dataSource webFrame] _shouldShowRequest:request]) {
[handle cancel];
+ [[WebStandardPanels sharedStandardPanels] _didStopLoadingURL:currentURL inController:[dataSource controller]];
+
[[dataSource webFrame] _setProvisionalDataSource:nil];
[[[dataSource controller] locationChangeDelegate] locationChangeDone:[WebError errorWithCode:WebErrorLocationChangeInterruptedByPolicyChange inDomain:WebErrorDomainWebKit failingURL:nil] forDataSource:dataSource];
result = nil;
@@ -190,6 +192,7 @@
if (downloadError) {
[self receivedError:downloadError];
[handle cancel];
+ [[WebStandardPanels sharedStandardPanels] _didStopLoadingURL:currentURL inController:[dataSource controller]];
}
}
break;
diff --git a/WebKit/WebView.subproj/WebViewPrivate.h b/WebKit/WebView.subproj/WebViewPrivate.h
index c666dbb..994e821 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.h
+++ b/WebKit/WebView.subproj/WebViewPrivate.h
@@ -44,7 +44,7 @@
- (WebFrame *)_createFrameNamed:(NSString *)name inParent:(WebFrame *)parent allowsScrolling:(BOOL)allowsScrolling;
- (id <WebContextMenuDelegate>)_defaultContextMenuDelegate;
-- (void)_finsishedLoadingResourceFromDataSource:(WebDataSource *)dataSource;
+- (void)_finishedLoadingResourceFromDataSource:(WebDataSource *)dataSource;
- (void)_receivedError:(WebError *)error fromDataSource:(WebDataSource *)dataSource;
- (void)_mainReceivedBytesSoFar:(unsigned)bytesSoFar fromDataSource:(WebDataSource *)dataSource complete:(BOOL)isComplete;
- (void)_mainReceivedError:(WebError *)error fromDataSource:(WebDataSource *)dataSource;
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index 5bae102..ed436e4 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -102,7 +102,7 @@
return _private->defaultContextMenuDelegate;
}
-- (void)_finsishedLoadingResourceFromDataSource: (WebDataSource *)dataSource
+- (void)_finishedLoadingResourceFromDataSource: (WebDataSource *)dataSource
{
WebFrame *frame = [dataSource webFrame];
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list