[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:55:39 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 126b83a250601dbe9bcd4265ef1543741a63e374
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Oct 28 23:16:36 2002 +0000
WebFoundation:
- fixed bug that caused us to leak one block sometimes when we called WebCallFromCFRunLoop
* Misc.subproj/WebCFRunLoopExtras.m: (WebCallFromCFRunLoop):
Initialize refCount to 0.
WebKit:
- fixed bug that caused us to leak all WebResourceHandles used for subresources
* WebCoreSupport.subproj/WebSubresourceClient.m:
(-[WebSubresourceClient dealloc]): Remove bogus "currentURL == nil" assert.
(+[WebSubresourceClient startLoadingResource:withURL:referrer:forDataSource:]):
Use the new loadWithRequest: call instead of making handle and doing loadWithDelegate:.
This is where the leak was, because no one ever released the handle, but releasing it
right away would be too soon.
* WebView.subproj/WebBaseResourceHandleDelegate.h: Added defersCallbacks field,
loadWithRequest: method, and setDefersCallbacks: method. Removed handle method.
* WebView.subproj/WebBaseResourceHandleDelegate.m:
(-[WebBaseResourceHandleDelegate loadWithRequest:]): New method. Sets up the handle,
set the defersCallbacks state on it, and calls loadWithDelegate:.
(-[WebBaseResourceHandleDelegate setDefersCallbacks:]): Stores defersCallbacks state,
and also sets it on the handle, if any.
(-[WebBaseResourceHandleDelegate handle:willSendRequest:]): Remove code to set up
the handle, since we now do that at loadWithRequest: time.
* WebView.subproj/WebDataSourcePrivate.h: Remove mainHandle field.
* WebView.subproj/WebDataSourcePrivate.m:
(-[WebDataSourcePrivate dealloc]): Don't release mainHandle.
(-[WebDataSource _setPrimaryLoadComplete:]): Ditto.
(-[WebDataSource _startLoading]): Use loadWithRequest: on the client, no need to deal
with the handle directly at all.
(-[WebDataSource _addSubresourceClient:]): Call setDefersCallbacks: on the client.
(-[WebDataSource _defersCallbacksChanged]): Ditto.
* WebView.subproj/WebControllerPrivate.m: Remove unneeded include.
* WebView.subproj/WebMainResourceClient.m: Ditto.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2496 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 2b4deae..5fe0849 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,36 @@
+2002-10-28 Darin Adler <darin at apple.com>
+
+ - fixed bug that caused us to leak all WebResourceHandles used for subresources
+
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ (-[WebSubresourceClient dealloc]): Remove bogus "currentURL == nil" assert.
+ (+[WebSubresourceClient startLoadingResource:withURL:referrer:forDataSource:]):
+ Use the new loadWithRequest: call instead of making handle and doing loadWithDelegate:.
+ This is where the leak was, because no one ever released the handle, but releasing it
+ right away would be too soon.
+
+ * WebView.subproj/WebBaseResourceHandleDelegate.h: Added defersCallbacks field,
+ loadWithRequest: method, and setDefersCallbacks: method. Removed handle method.
+ * WebView.subproj/WebBaseResourceHandleDelegate.m:
+ (-[WebBaseResourceHandleDelegate loadWithRequest:]): New method. Sets up the handle,
+ set the defersCallbacks state on it, and calls loadWithDelegate:.
+ (-[WebBaseResourceHandleDelegate setDefersCallbacks:]): Stores defersCallbacks state,
+ and also sets it on the handle, if any.
+ (-[WebBaseResourceHandleDelegate handle:willSendRequest:]): Remove code to set up
+ the handle, since we now do that at loadWithRequest: time.
+
+ * WebView.subproj/WebDataSourcePrivate.h: Remove mainHandle field.
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSourcePrivate dealloc]): Don't release mainHandle.
+ (-[WebDataSource _setPrimaryLoadComplete:]): Ditto.
+ (-[WebDataSource _startLoading]): Use loadWithRequest: on the client, no need to deal
+ with the handle directly at all.
+ (-[WebDataSource _addSubresourceClient:]): Call setDefersCallbacks: on the client.
+ (-[WebDataSource _defersCallbacksChanged]): Ditto.
+
+ * WebView.subproj/WebControllerPrivate.m: Remove unneeded include.
+ * WebView.subproj/WebMainResourceClient.m: Ditto.
+
2002-10-28 Chris Blumenberg <cblu at apple.com>
Fixed: 3056726 - View Source window always displays the source in current system encoding
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 2b4deae..5fe0849 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,36 @@
+2002-10-28 Darin Adler <darin at apple.com>
+
+ - fixed bug that caused us to leak all WebResourceHandles used for subresources
+
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ (-[WebSubresourceClient dealloc]): Remove bogus "currentURL == nil" assert.
+ (+[WebSubresourceClient startLoadingResource:withURL:referrer:forDataSource:]):
+ Use the new loadWithRequest: call instead of making handle and doing loadWithDelegate:.
+ This is where the leak was, because no one ever released the handle, but releasing it
+ right away would be too soon.
+
+ * WebView.subproj/WebBaseResourceHandleDelegate.h: Added defersCallbacks field,
+ loadWithRequest: method, and setDefersCallbacks: method. Removed handle method.
+ * WebView.subproj/WebBaseResourceHandleDelegate.m:
+ (-[WebBaseResourceHandleDelegate loadWithRequest:]): New method. Sets up the handle,
+ set the defersCallbacks state on it, and calls loadWithDelegate:.
+ (-[WebBaseResourceHandleDelegate setDefersCallbacks:]): Stores defersCallbacks state,
+ and also sets it on the handle, if any.
+ (-[WebBaseResourceHandleDelegate handle:willSendRequest:]): Remove code to set up
+ the handle, since we now do that at loadWithRequest: time.
+
+ * WebView.subproj/WebDataSourcePrivate.h: Remove mainHandle field.
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSourcePrivate dealloc]): Don't release mainHandle.
+ (-[WebDataSource _setPrimaryLoadComplete:]): Ditto.
+ (-[WebDataSource _startLoading]): Use loadWithRequest: on the client, no need to deal
+ with the handle directly at all.
+ (-[WebDataSource _addSubresourceClient:]): Call setDefersCallbacks: on the client.
+ (-[WebDataSource _defersCallbacksChanged]): Ditto.
+
+ * WebView.subproj/WebControllerPrivate.m: Remove unneeded include.
+ * WebView.subproj/WebMainResourceClient.m: Ditto.
+
2002-10-28 Chris Blumenberg <cblu at apple.com>
Fixed: 3056726 - View Source window always displays the source in current system encoding
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index fb10096..484e38f 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -13,7 +13,6 @@
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebError.h>
#import <WebFoundation/WebResourceHandle.h>
-#import <WebFoundation/WebResourceHandlePrivate.h>
#import <WebFoundation/WebResourceRequest.h>
#import <WebFoundation/WebHTTPResourceRequest.h>
#import <WebFoundation/WebResourceResponse.h>
@@ -36,10 +35,7 @@
- (void)dealloc
{
- ASSERT(currentURL == nil);
-
[loader release];
-
[super dealloc];
}
@@ -66,9 +62,8 @@
return nil;
}
- WebResourceHandle *h = [[WebResourceHandle alloc] initWithRequest:newRequest];
[source _addSubresourceClient:client];
- [h loadWithDelegate:client];
+ [client loadWithRequest:newRequest];
[newRequest release];
return [client autorelease];
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index fb10096..484e38f 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -13,7 +13,6 @@
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebError.h>
#import <WebFoundation/WebResourceHandle.h>
-#import <WebFoundation/WebResourceHandlePrivate.h>
#import <WebFoundation/WebResourceRequest.h>
#import <WebFoundation/WebHTTPResourceRequest.h>
#import <WebFoundation/WebResourceResponse.h>
@@ -36,10 +35,7 @@
- (void)dealloc
{
- ASSERT(currentURL == nil);
-
[loader release];
-
[super dealloc];
}
@@ -66,9 +62,8 @@
return nil;
}
- WebResourceHandle *h = [[WebResourceHandle alloc] initWithRequest:newRequest];
[source _addSubresourceClient:client];
- [h loadWithDelegate:client];
+ [client loadWithRequest:newRequest];
[newRequest release];
return [client autorelease];
diff --git a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.h b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.h
index 0e856eb..81ebc8b 100644
--- a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.h
+++ b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.h
@@ -25,15 +25,19 @@
NSURL *currentURL;
BOOL isDownload;
BOOL reachedTerminalState;
+ BOOL defersCallbacks;
}
-- (WebResourceHandle *)handle;
+- (void)loadWithRequest:(WebResourceRequest *)request;
-- (void)setDataSource: (WebDataSource *)d;
+- (void)setDataSource:(WebDataSource *)d;
- (WebDataSource *)dataSource;
+
- (id <WebResourceLoadDelegate>)resourceLoadDelegate;
- (id <WebResourceLoadDelegate>)downloadDelegate;
-- (void)setIsDownload: (BOOL)f;
+- (void)setIsDownload:(BOOL)f;
- (void)cancel;
+- (void)setDefersCallbacks:(BOOL)defers;
+
@end
diff --git a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
index 637cf46..50d7a44 100644
--- a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
+++ b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
@@ -8,7 +8,7 @@
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebError.h>
#import <WebFoundation/WebHTTPResourceRequest.h>
-#import <WebFoundation/WebResourceHandle.h>
+#import <WebFoundation/WebResourceHandlePrivate.h>
#import <WebFoundation/WebResourceRequest.h>
#import <WebFoundation/WebResourceResponse.h>
@@ -19,15 +19,6 @@
@implementation WebBaseResourceHandleDelegate
-- init
-{
- self = [super init];
-
- [self setIsDownload: NO];
-
- return self;
-}
-
- (void)_releaseResources
{
// It's possible that when we release the handle, it will be
@@ -66,6 +57,23 @@
[super dealloc];
}
+- (void)loadWithRequest:(WebResourceRequest *)r
+{
+ ASSERT(handle == nil);
+
+ handle = [[WebResourceHandle alloc] initWithRequest:r];
+ if (defersCallbacks) {
+ [handle _setDefersCallbacks:YES];
+ }
+ [handle loadWithDelegate:self];
+}
+
+- (void)setDefersCallbacks:(BOOL)defers
+{
+ defersCallbacks = defers;
+ [handle _setDefersCallbacks:defers];
+}
+
- (void)setDataSource: (WebDataSource *)d
{
if (d != dataSource){
@@ -111,14 +119,9 @@
-(WebResourceRequest *)handle:(WebResourceHandle *)h willSendRequest:(WebResourceRequest *)newRequest
{
- ASSERT (!reachedTerminalState);
+ ASSERT(handle == h);
+ ASSERT(!reachedTerminalState);
- if (!handle){
- // Retained so we can cancel if necessary. Released when we
- // reach a terminal state.
- handle = [h retain];
- }
-
[newRequest setUserAgent:[[dataSource controller] userAgentForURL:[newRequest URL]]];
// No need to retain here, will be copied after delegate callback.
@@ -151,8 +154,8 @@
-(void)handle:(WebResourceHandle *)h didReceiveResponse:(WebResourceResponse *)r
{
- ASSERT (handle == h);
- ASSERT (!reachedTerminalState);
+ ASSERT(handle == h);
+ ASSERT(!reachedTerminalState);
[r retain];
[response release];
@@ -166,8 +169,8 @@
- (void)handle:(WebResourceHandle *)h didReceiveData:(NSData *)data
{
- ASSERT (handle == h);
- ASSERT (!reachedTerminalState);
+ ASSERT(handle == h);
+ ASSERT(!reachedTerminalState);
if ([self isDownload])
[downloadDelegate resource: identifier didReceiveContentLength: [data length] fromDataSource: dataSource];
@@ -177,8 +180,8 @@
- (void)handleDidFinishLoading:(WebResourceHandle *)h
{
- ASSERT (handle == h);
- ASSERT (!reachedTerminalState);
+ ASSERT(handle == h);
+ ASSERT(!reachedTerminalState);
if ([self isDownload])
[downloadDelegate resource:identifier didFinishLoadingFromDataSource:dataSource];
@@ -192,8 +195,8 @@
- (void)handle:(WebResourceHandle *)h didFailLoadingWithError:(WebError *)result
{
- ASSERT (handle == h);
- ASSERT (!reachedTerminalState);
+ ASSERT(handle == h);
+ ASSERT(!reachedTerminalState);
if ([self isDownload])
[downloadDelegate resource: identifier didFailLoadingWithError: result fromDataSource: dataSource];
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.m b/WebKit/WebView.subproj/WebControllerPrivate.m
index 8bb61bf..f2eb927 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.m
+++ b/WebKit/WebView.subproj/WebControllerPrivate.m
@@ -24,7 +24,6 @@
#import <WebFoundation/WebFileTypeMappings.h>
#import <WebFoundation/WebNSStringExtras.h>
#import <WebFoundation/WebResourceHandle.h>
-#import <WebFoundation/WebResourceHandlePrivate.h>
#import <WebFoundation/WebResourceRequest.h>
@implementation WebControllerPrivate
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.h b/WebKit/WebView.subproj/WebDataSourcePrivate.h
index e78f6e3..8d9f2e1 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.h
@@ -33,9 +33,8 @@
WebResourceRequest *request;
WebResourceResponse *response;
- // Client for main resource, and corresponding handle.
+ // Client for main resource.
WebMainResourceClient *mainClient;
- WebResourceHandle *mainHandle;
// Clients for other resources.
NSMutableArray *subresourceClients;
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 1352a3a..e5b65d1 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -32,7 +32,6 @@
#import <WebFoundation/WebNSStringExtras.h>
#import <WebFoundation/WebNSURLExtras.h>
#import <WebFoundation/WebResourceHandle.h>
-#import <WebFoundation/WebResourceHandlePrivate.h>
#import <WebFoundation/WebResourceRequest.h>
#import <WebFoundation/WebResourceResponse.h>
#import <WebFoundation/WebHTTPResourceRequest.h>
@@ -50,7 +49,6 @@
[request release];
[originalRequest release];
[mainClient release];
- [mainHandle release];
[subresourceClients release];
[pageTitle release];
[response release];
@@ -132,8 +130,6 @@
[_private->mainClient release];
_private->mainClient = 0;
- [_private->mainHandle release];
- _private->mainHandle = 0;
[self _updateLoading];
}
}
@@ -165,8 +161,7 @@
[_private->request setCookiePolicyBaseURL:[[[_private->controller mainFrame] dataSource] URL]];
}
- _private->mainHandle = [[WebResourceHandle alloc] initWithRequest:_private->request];
- [_private->mainHandle loadWithDelegate:_private->mainClient];
+ [_private->mainClient loadWithRequest:_private->request];
}
}
@@ -176,7 +171,7 @@
_private->subresourceClients = [[NSMutableArray alloc] init];
}
if ([_private->controller _defersCallbacks]) {
- [[client handle] _setDefersCallbacks:YES];
+ [client setDefersCallbacks:YES];
}
[_private->subresourceClients addObject:client];
[self _setLoading:YES];
@@ -535,11 +530,11 @@
}
_private->defersCallbacks = defers;
- [_private->mainHandle _setDefersCallbacks:defers];
+ [_private->mainClient setDefersCallbacks:defers];
NSEnumerator *e = [_private->subresourceClients objectEnumerator];
WebSubresourceClient *client;
while ((client = [e nextObject])) {
- [[client handle] _setDefersCallbacks:defers];
+ [client setDefersCallbacks:defers];
}
[[[self webFrame] children] makeObjectsPerformSelector:@selector(_defersCallbacksChanged)];
diff --git a/WebKit/WebView.subproj/WebLoader.h b/WebKit/WebView.subproj/WebLoader.h
index 0e856eb..81ebc8b 100644
--- a/WebKit/WebView.subproj/WebLoader.h
+++ b/WebKit/WebView.subproj/WebLoader.h
@@ -25,15 +25,19 @@
NSURL *currentURL;
BOOL isDownload;
BOOL reachedTerminalState;
+ BOOL defersCallbacks;
}
-- (WebResourceHandle *)handle;
+- (void)loadWithRequest:(WebResourceRequest *)request;
-- (void)setDataSource: (WebDataSource *)d;
+- (void)setDataSource:(WebDataSource *)d;
- (WebDataSource *)dataSource;
+
- (id <WebResourceLoadDelegate>)resourceLoadDelegate;
- (id <WebResourceLoadDelegate>)downloadDelegate;
-- (void)setIsDownload: (BOOL)f;
+- (void)setIsDownload:(BOOL)f;
- (void)cancel;
+- (void)setDefersCallbacks:(BOOL)defers;
+
@end
diff --git a/WebKit/WebView.subproj/WebLoader.m b/WebKit/WebView.subproj/WebLoader.m
index 637cf46..50d7a44 100644
--- a/WebKit/WebView.subproj/WebLoader.m
+++ b/WebKit/WebView.subproj/WebLoader.m
@@ -8,7 +8,7 @@
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebError.h>
#import <WebFoundation/WebHTTPResourceRequest.h>
-#import <WebFoundation/WebResourceHandle.h>
+#import <WebFoundation/WebResourceHandlePrivate.h>
#import <WebFoundation/WebResourceRequest.h>
#import <WebFoundation/WebResourceResponse.h>
@@ -19,15 +19,6 @@
@implementation WebBaseResourceHandleDelegate
-- init
-{
- self = [super init];
-
- [self setIsDownload: NO];
-
- return self;
-}
-
- (void)_releaseResources
{
// It's possible that when we release the handle, it will be
@@ -66,6 +57,23 @@
[super dealloc];
}
+- (void)loadWithRequest:(WebResourceRequest *)r
+{
+ ASSERT(handle == nil);
+
+ handle = [[WebResourceHandle alloc] initWithRequest:r];
+ if (defersCallbacks) {
+ [handle _setDefersCallbacks:YES];
+ }
+ [handle loadWithDelegate:self];
+}
+
+- (void)setDefersCallbacks:(BOOL)defers
+{
+ defersCallbacks = defers;
+ [handle _setDefersCallbacks:defers];
+}
+
- (void)setDataSource: (WebDataSource *)d
{
if (d != dataSource){
@@ -111,14 +119,9 @@
-(WebResourceRequest *)handle:(WebResourceHandle *)h willSendRequest:(WebResourceRequest *)newRequest
{
- ASSERT (!reachedTerminalState);
+ ASSERT(handle == h);
+ ASSERT(!reachedTerminalState);
- if (!handle){
- // Retained so we can cancel if necessary. Released when we
- // reach a terminal state.
- handle = [h retain];
- }
-
[newRequest setUserAgent:[[dataSource controller] userAgentForURL:[newRequest URL]]];
// No need to retain here, will be copied after delegate callback.
@@ -151,8 +154,8 @@
-(void)handle:(WebResourceHandle *)h didReceiveResponse:(WebResourceResponse *)r
{
- ASSERT (handle == h);
- ASSERT (!reachedTerminalState);
+ ASSERT(handle == h);
+ ASSERT(!reachedTerminalState);
[r retain];
[response release];
@@ -166,8 +169,8 @@
- (void)handle:(WebResourceHandle *)h didReceiveData:(NSData *)data
{
- ASSERT (handle == h);
- ASSERT (!reachedTerminalState);
+ ASSERT(handle == h);
+ ASSERT(!reachedTerminalState);
if ([self isDownload])
[downloadDelegate resource: identifier didReceiveContentLength: [data length] fromDataSource: dataSource];
@@ -177,8 +180,8 @@
- (void)handleDidFinishLoading:(WebResourceHandle *)h
{
- ASSERT (handle == h);
- ASSERT (!reachedTerminalState);
+ ASSERT(handle == h);
+ ASSERT(!reachedTerminalState);
if ([self isDownload])
[downloadDelegate resource:identifier didFinishLoadingFromDataSource:dataSource];
@@ -192,8 +195,8 @@
- (void)handle:(WebResourceHandle *)h didFailLoadingWithError:(WebError *)result
{
- ASSERT (handle == h);
- ASSERT (!reachedTerminalState);
+ ASSERT(handle == h);
+ ASSERT(!reachedTerminalState);
if ([self isDownload])
[downloadDelegate resource: identifier didFailLoadingWithError: result fromDataSource: dataSource];
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 0a84a1e..2753812 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -11,7 +11,6 @@
#import <WebFoundation/WebResourceHandle.h>
#import <WebFoundation/WebResourceRequest.h>
#import <WebFoundation/WebHTTPResourceRequest.h>
-#import <WebFoundation/WebResourceHandlePrivate.h>
#import <WebFoundation/WebResourceResponse.h>
#import <WebKit/WebBridge.h>
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 0a84a1e..2753812 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -11,7 +11,6 @@
#import <WebFoundation/WebResourceHandle.h>
#import <WebFoundation/WebResourceRequest.h>
#import <WebFoundation/WebHTTPResourceRequest.h>
-#import <WebFoundation/WebResourceHandlePrivate.h>
#import <WebFoundation/WebResourceResponse.h>
#import <WebKit/WebBridge.h>
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index 8bb61bf..f2eb927 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -24,7 +24,6 @@
#import <WebFoundation/WebFileTypeMappings.h>
#import <WebFoundation/WebNSStringExtras.h>
#import <WebFoundation/WebResourceHandle.h>
-#import <WebFoundation/WebResourceHandlePrivate.h>
#import <WebFoundation/WebResourceRequest.h>
@implementation WebControllerPrivate
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list