[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
kocienda
kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:46:05 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit f402a5706f058db955907c78074d36b93601ab8d
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 1 16:17:55 2002 +0000
WebFoundation:
Changed WebResourceHandle so that the init method no longer starts the
loading of the request to begin. Added new loadWithDelegate: method which
is called separatetly from the init method, to start loads.
* CacheLoader.subproj/WebResourceHandle.h:
* CacheLoader.subproj/WebResourceHandle.m:
(-[WebResourceHandle initWithRequest:])
(-[WebResourceHandle loadWithDelegate:])
* CacheLoader.subproj/WebResourceHandleInternal.h:
* CacheLoader.subproj/WebResourceHandleInternal.m:
* CacheLoader.subproj/WebResourceSynchronousDelegate.m:
(-[WebResourceHandleSynchronousDelegate run:])
WebKit:
Changed WebResourceHandle so that the init method no longer starts the
loading of the request to begin. Added new loadWithDelegate: method which
is called separatetly from the init method, to start loads.
All of the changes here update code that depends on WebResourceHandle. The
changes move the code to the modified API.
* Misc.subproj/WebIconLoader.m:
(-[WebIconLoader startLoading])
* Plugins.subproj/WebPluginStream.m:
(-[WebNetscapePluginStream startLoad])
* WebCoreSupport.subproj/WebBridge.m:
(-[WebBridge objectLoadedFromCache:size:])
* WebCoreSupport.subproj/WebSubresourceClient.m:
(+[WebSubresourceClient startLoadingResource:withURL:referrer:forDataSource:])
* WebView.subproj/WebDataSourcePrivate.m:
(-[WebDataSource _startLoading])
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2215 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 9ada427..8578da1 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,23 @@
+2002-10-01 Ken Kocienda <kocienda at apple.com>
+
+ Changed WebResourceHandle so that the init method no longer starts the
+ loading of the request to begin. Added new loadWithDelegate: method which
+ is called separatetly from the init method, to start loads.
+
+ All of the changes here update code that depends on WebResourceHandle. The
+ changes move the code to the modified API.
+
+ * Misc.subproj/WebIconLoader.m:
+ (-[WebIconLoader startLoading])
+ * Plugins.subproj/WebPluginStream.m:
+ (-[WebNetscapePluginStream startLoad])
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge objectLoadedFromCache:size:])
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ (+[WebSubresourceClient startLoadingResource:withURL:referrer:forDataSource:])
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSource _startLoading])
+
2002-10-01 Chris Blumenberg <cblu at apple.com>
Fixed copyright comments.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 9ada427..8578da1 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,23 @@
+2002-10-01 Ken Kocienda <kocienda at apple.com>
+
+ Changed WebResourceHandle so that the init method no longer starts the
+ loading of the request to begin. Added new loadWithDelegate: method which
+ is called separatetly from the init method, to start loads.
+
+ All of the changes here update code that depends on WebResourceHandle. The
+ changes move the code to the modified API.
+
+ * Misc.subproj/WebIconLoader.m:
+ (-[WebIconLoader startLoading])
+ * Plugins.subproj/WebPluginStream.m:
+ (-[WebNetscapePluginStream startLoad])
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge objectLoadedFromCache:size:])
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ (+[WebSubresourceClient startLoadingResource:withURL:referrer:forDataSource:])
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSource _startLoading])
+
2002-10-01 Chris Blumenberg <cblu at apple.com>
Fixed copyright comments.
diff --git a/WebKit/Misc.subproj/WebIconLoader.m b/WebKit/Misc.subproj/WebIconLoader.m
index e2e9a66..f3b9c95 100644
--- a/WebKit/Misc.subproj/WebIconLoader.m
+++ b/WebKit/Misc.subproj/WebIconLoader.m
@@ -83,7 +83,8 @@
}
WebResourceRequest *request = [[WebResourceRequest alloc] initWithURL:_private->URL];
- _private->handle = [[WebResourceHandle alloc] initWithRequest:request delegate:self];
+ _private->handle = [[WebResourceHandle alloc] initWithRequest:request];
+ [_private->handle loadWithDelegate:self];
[request release];
}
diff --git a/WebKit/Plugins.subproj/WebPluginStream.m b/WebKit/Plugins.subproj/WebPluginStream.m
index 39e48ce..2f6eb53 100644
--- a/WebKit/Plugins.subproj/WebPluginStream.m
+++ b/WebKit/Plugins.subproj/WebPluginStream.m
@@ -101,7 +101,8 @@
- (void)startLoad
{
- resource = [[WebResourceHandle alloc] initWithRequest:request delegate:self];
+ resource = [[WebResourceHandle alloc] initWithRequest:request];
+ [resource loadWithDelegate:self];
[[view controller] _didStartLoading:[[resource _request] URL]];
}
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index fd66706..23e0445 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -167,7 +167,8 @@
ASSERT(frame != nil);
WebResourceRequest *request = [[WebResourceRequest alloc] initWithURL:URL];
- WebResourceHandle *handle = [[WebResourceHandle alloc] initWithRequest:request delegate:nil];
+ WebResourceHandle *handle = [[WebResourceHandle alloc] initWithRequest:request];
+ [handle loadWithDelegate:nil];
WebLoadProgress *loadProgress = [[WebLoadProgress alloc] initWithBytesSoFar:bytes totalToLoad:bytes];
[[frame controller] _receivedProgress:loadProgress forResourceHandle:handle fromDataSource:[self dataSource] complete:YES];
[loadProgress release];
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index 0d20692..730bc32 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -92,8 +92,9 @@
return nil;
}
- WebResourceHandle *h = [[WebResourceHandle alloc] initWithRequest:request delegate:client];
+ WebResourceHandle *h = [[WebResourceHandle alloc] initWithRequest:request];
client->handle = h;
+ [h loadWithDelegate:client];
[source _addSubresourceClient:client];
[client didStartLoadingWithURL:[request canonicalURL]];
[client receivedProgressWithComplete:NO];
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index 0d20692..730bc32 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -92,8 +92,9 @@
return nil;
}
- WebResourceHandle *h = [[WebResourceHandle alloc] initWithRequest:request delegate:client];
+ WebResourceHandle *h = [[WebResourceHandle alloc] initWithRequest:request];
client->handle = h;
+ [h loadWithDelegate:client];
[source _addSubresourceClient:client];
[client didStartLoadingWithURL:[request canonicalURL]];
[client receivedProgressWithComplete:NO];
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 5860cb7..5678720 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -191,7 +191,8 @@
[_private->request setCookiePolicyBaseURL:[[[_private->controller mainFrame] dataSource] URL]];
}
- _private->mainHandle = [[WebResourceHandle alloc] initWithRequest:_private->request delegate:_private->mainClient];
+ _private->mainHandle = [[WebResourceHandle alloc] initWithRequest:_private->request];
+ [_private->mainHandle loadWithDelegate:_private->mainClient];
}
if (_private->mainHandle) {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list