[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit a6aaa4a6fcfbd82afc36a56d977d5301cb5f5211
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 2 16:46:48 2002 +0000

    	Get rid of uses of canonicalURL.
    
            * WebCoreSupport.subproj/WebSubresourceClient.m:
            (+[WebSubresourceClient startLoadingResource:withURL:referrer:forDataSource:]):
    	Start with normal URL. The change to the canonical URL will come in as a redirect.
            (-[WebSubresourceClient handle:didReceiveData:]): Remove assert.
            (-[WebSubresourceClient handleDidFinishLoading:]): Ditto.
            * WebView.subproj/WebDataSource.m:
            (-[WebDataSource initWithRequest:]):Start with normal URL. The change to the
    	canonical URL will come in as a redirect.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2224 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d9ea2dc..4c198c2 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2002-10-02  Darin Adler  <darin at apple.com>
+
+	Get rid of uses of canonicalURL.
+
+        * WebCoreSupport.subproj/WebSubresourceClient.m:
+        (+[WebSubresourceClient startLoadingResource:withURL:referrer:forDataSource:]):
+	Start with normal URL. The change to the canonical URL will come in as a redirect.
+        (-[WebSubresourceClient handle:didReceiveData:]): Remove assert.
+        (-[WebSubresourceClient handleDidFinishLoading:]): Ditto.
+        * WebView.subproj/WebDataSource.m:
+        (-[WebDataSource initWithRequest:]):Start with normal URL. The change to the
+	canonical URL will come in as a redirect.
+
 2002-10-02  Ken Kocienda  <kocienda at apple.com>
 
 	Added import of WebHTTPResourceRequest.h to get access to methods
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index d9ea2dc..4c198c2 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,16 @@
+2002-10-02  Darin Adler  <darin at apple.com>
+
+	Get rid of uses of canonicalURL.
+
+        * WebCoreSupport.subproj/WebSubresourceClient.m:
+        (+[WebSubresourceClient startLoadingResource:withURL:referrer:forDataSource:]):
+	Start with normal URL. The change to the canonical URL will come in as a redirect.
+        (-[WebSubresourceClient handle:didReceiveData:]): Remove assert.
+        (-[WebSubresourceClient handleDidFinishLoading:]): Ditto.
+        * WebView.subproj/WebDataSource.m:
+        (-[WebDataSource initWithRequest:]):Start with normal URL. The change to the
+	canonical URL will come in as a redirect.
+
 2002-10-02  Ken Kocienda  <kocienda at apple.com>
 
 	Added import of WebHTTPResourceRequest.h to get access to methods
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index 1fcbd5a..02569ed 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -95,10 +95,10 @@
     
     WebResourceHandle *h = [[WebResourceHandle alloc] initWithRequest:request];
     client->handle = h;
-    [h loadWithDelegate:client];
     [source _addSubresourceClient:client];
-    [client didStartLoadingWithURL:[request canonicalURL]];
+    [client didStartLoadingWithURL:[request URL]];
     [client receivedProgressWithComplete:NO];
+    [h loadWithDelegate:client];
     [request release];
         
     return [client autorelease];
@@ -144,7 +144,6 @@
 - (void)handle:(WebResourceHandle *)h didReceiveData:(NSData *)data
 {
     ASSERT(handle == h);
-    ASSERT([currentURL isEqual:[[handle _request] canonicalURL]]);
 
     [self receivedProgressWithComplete:NO];
     [loader addData:data];
@@ -153,7 +152,6 @@
 - (void)handleDidFinishLoading:(WebResourceHandle *)h
 {
     ASSERT(handle == h);
-    ASSERT([currentURL isEqual:[[handle _request] canonicalURL]]);
     ASSERT([h _statusCode] == WebResourceHandleStatusLoadComplete);
 
     // Calling _removeSubresourceClient will likely result in a call to release, so we must retain.
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index 1fcbd5a..02569ed 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -95,10 +95,10 @@
     
     WebResourceHandle *h = [[WebResourceHandle alloc] initWithRequest:request];
     client->handle = h;
-    [h loadWithDelegate:client];
     [source _addSubresourceClient:client];
-    [client didStartLoadingWithURL:[request canonicalURL]];
+    [client didStartLoadingWithURL:[request URL]];
     [client receivedProgressWithComplete:NO];
+    [h loadWithDelegate:client];
     [request release];
         
     return [client autorelease];
@@ -144,7 +144,6 @@
 - (void)handle:(WebResourceHandle *)h didReceiveData:(NSData *)data
 {
     ASSERT(handle == h);
-    ASSERT([currentURL isEqual:[[handle _request] canonicalURL]]);
 
     [self receivedProgressWithComplete:NO];
     [loader addData:data];
@@ -153,7 +152,6 @@
 - (void)handleDidFinishLoading:(WebResourceHandle *)h
 {
     ASSERT(handle == h);
-    ASSERT([currentURL isEqual:[[handle _request] canonicalURL]]);
     ASSERT([h _statusCode] == WebResourceHandleStatusLoadComplete);
 
     // Calling _removeSubresourceClient will likely result in a call to release, so we must retain.
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index cc5a31b..266e2b4 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -48,7 +48,7 @@
     
     _private = [[WebDataSourcePrivate alloc] init];
     _private->request = [request retain];
-    _private->inputURL = [[request canonicalURL] retain];
+    _private->inputURL = [[request URL] retain];
 
     ++WebDataSourceCount;
     
@@ -156,13 +156,6 @@
 }
 
 
-// May return nil if not initialized with a URL.
-- (NSURL *)originalURL
-{
-    return _private->inputURL;
-}
-
-
 - (void)startLoading
 {
     [self _startLoading];

-- 
WebKit Debian packaging