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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit ee40a09f57ccc29a30a0ee2ab87e56877fa14c4a
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 3 02:03:09 2003 +0000

            Reviewed by Darin.
    
    	- remove use of obsolete HTTLCookiePolicyBaseURL SPI
    
    	* WebCoreSupport.subproj/WebSubresourceClient.m:
    	startLoadingResource:withURL:referrer:forDataSource:]): Use
    	setMainDocumentURL, not setHTTPCookiePolicyBaseURL.
            * WebView.subproj/WebFrame.m:
            (-[WebFrame _addExtraFieldsToRequest:alwaysFromRequest:]): Likewise.
            * WebView.subproj/WebMainResourceClient.m:
            (-[WebMainResourceClient connection:willSendRequest:redirectResponse:]): Likewise.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5357 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index cf25561..f9e51b2 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+2003-11-01  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin.
+
+	- remove use of obsolete HTTLCookiePolicyBaseURL SPI
+        
+	* WebCoreSupport.subproj/WebSubresourceClient.m:
+	startLoadingResource:withURL:referrer:forDataSource:]): Use
+	setMainDocumentURL, not setHTTPCookiePolicyBaseURL.
+        * WebView.subproj/WebFrame.m:
+        (-[WebFrame _addExtraFieldsToRequest:alwaysFromRequest:]): Likewise.
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient connection:willSendRequest:redirectResponse:]): Likewise.
+
 2003-11-01  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej.
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index 627f430..2276261 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -51,7 +51,7 @@
     [newRequest setHTTPReferrer:referrer];
     
     WebView *_webView = [source _webView];
-    [newRequest setHTTPCookiePolicyBaseURL:[[[[_webView mainFrame] dataSource]  request] URL]];
+    [newRequest setMainDocumentURL:[[[[_webView mainFrame] dataSource] request] URL]];
     [newRequest setHTTPUserAgent:[_webView userAgentForURL:URL]];
     
     BOOL succeeded = [client loadWithRequest:newRequest];
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index 627f430..2276261 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -51,7 +51,7 @@
     [newRequest setHTTPReferrer:referrer];
     
     WebView *_webView = [source _webView];
-    [newRequest setHTTPCookiePolicyBaseURL:[[[[_webView mainFrame] dataSource]  request] URL]];
+    [newRequest setMainDocumentURL:[[[[_webView mainFrame] dataSource] request] URL]];
     [newRequest setHTTPUserAgent:[_webView userAgentForURL:URL]];
     
     BOOL succeeded = [client loadWithRequest:newRequest];
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 7e5e76a..84ceb71 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -1644,11 +1644,11 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
     [request setHTTPUserAgent:[[self webView] userAgentForURL:[request URL]]];
     
     // Don't set the cookie policy URL if it's already been set.
-    if ([request HTTPCookiePolicyBaseURL] == nil){
+    if ([request mainDocumentURL] == nil){
         if (self == [[self webView] mainFrame] || f) {
-            [request setHTTPCookiePolicyBaseURL:[request URL]];
+            [request setMainDocumentURL:[request URL]];
         } else {
-            [request setHTTPCookiePolicyBaseURL:[[[[self webView] mainFrame] dataSource] _URL]];
+            [request setMainDocumentURL:[[[[self webView] mainFrame] dataSource] _URL]];
         }
     }
 }
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index be3de18..69ae773 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -125,7 +125,7 @@
     // URL of the main frame which doesn't change when we redirect.
     if ([dataSource webFrame] == [[dataSource _webView] mainFrame]) {
         mutableRequest = [newRequest mutableCopy];
-        [mutableRequest setHTTPCookiePolicyBaseURL:URL];
+        [mutableRequest setMainDocumentURL:URL];
     }
 
     // If we're fielding a redirect in response to a POST, force a load from origin, since
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index be3de18..69ae773 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -125,7 +125,7 @@
     // URL of the main frame which doesn't change when we redirect.
     if ([dataSource webFrame] == [[dataSource _webView] mainFrame]) {
         mutableRequest = [newRequest mutableCopy];
-        [mutableRequest setHTTPCookiePolicyBaseURL:URL];
+        [mutableRequest setMainDocumentURL:URL];
     }
 
     // If we're fielding a redirect in response to a POST, force a load from origin, since

-- 
WebKit Debian packaging