[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 fb045312be628001d8460b5bb4a0d96f92ae1e7a
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 25 01:23:36 2003 +0000

            Reviewed by Richard.
    
    	- made API (actually doc-only) changes needed for 3087535 -
    	bugzilla queries come back as downloaded files
    
    	* Downloads.subproj/WebDownload.h: Documented that
    	download:didReceiveResponse: may be sent more than once.
            * WebView.subproj/WebLocationChangeDelegate.h: Documented that
    	locationChangeCommittedForDataSource: may be sent more than once.
    	* WebView.subproj/WebPolicyDelegate.h: Documented that
    	decideContentPolicyForMIMEType:andRequest:inFrame: may be sent
    	more than once.
            * WebView.subproj/WebResourceLoadDelegate.h: Documented that
    	resource:didReceiveResponse:fromDataSource: may be sent more than
    	once.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3911 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 151bcac..8a9214e 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -2,6 +2,24 @@
 
         Reviewed by Richard.
 
+	- made API (actually doc-only) changes needed for 3087535 -
+	bugzilla queries come back as downloaded files
+
+	* Downloads.subproj/WebDownload.h: Documented that
+	download:didReceiveResponse: may be sent more than once.
+        * WebView.subproj/WebLocationChangeDelegate.h: Documented that
+	locationChangeCommittedForDataSource: may be sent more than once.
+	* WebView.subproj/WebPolicyDelegate.h: Documented that
+	decideContentPolicyForMIMEType:andRequest:inFrame: may be sent
+	more than once.
+        * WebView.subproj/WebResourceLoadDelegate.h: Documented that
+	resource:didReceiveResponse:fromDataSource: may be sent more than
+	once.
+
+2003-03-24  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Richard.
+
 	- fixed 3083339 - significant top and side margin appended to new windows
 
 	Part of the fix involves adding new window operation delegate methods.
diff --git a/WebKit/Downloads.subproj/WebDownload.h b/WebKit/Downloads.subproj/WebDownload.h
index 4fbf681..20e1726 100644
--- a/WebKit/Downloads.subproj/WebDownload.h
+++ b/WebKit/Downloads.subproj/WebDownload.h
@@ -81,6 +81,10 @@
     @abstract This method is called when the download has received a response from the server.
     @param download The download that now has a WebResponse available for inspection.
     @param response The WebResponse object for the given download.
+    @discussion In some rare cases, multiple responses may be received for a single download.
+    This occurs with multipart/x-mixed-replace, or "server push". In this case, the client
+    should assume that each new response resets progress so far for the resource back to 0,
+    and should check the new response for the expected content length.
 */
 - (void)download:(WebDownload *)download didReceiveResponse:(WebResponse *)response;
 
diff --git a/WebKit/WebView.subproj/WebFrameLoadDelegate.h b/WebKit/WebView.subproj/WebFrameLoadDelegate.h
index 7f3943d..3e7c076 100644
--- a/WebKit/WebView.subproj/WebFrameLoadDelegate.h
+++ b/WebKit/WebView.subproj/WebFrameLoadDelegate.h
@@ -46,6 +46,10 @@
     received. This is done so the old page will not be lost if the new
     page fails to load completely.
 
+    In some cases, a single location change may be committed more than once. This happens
+    in the case of multipart/x-mixed-replace, also known as "server push". In this case,
+    a single location change leads to multiple documents that are loaded in sequence. When
+    this happens, a new commit will be sent for each document.
 */
 - (void)webView:(WebView *)sender locationChangeCommittedForDataSource:(WebDataSource *)dataSource;
 
diff --git a/WebKit/WebView.subproj/WebLocationChangeDelegate.h b/WebKit/WebView.subproj/WebLocationChangeDelegate.h
index 7f3943d..3e7c076 100644
--- a/WebKit/WebView.subproj/WebLocationChangeDelegate.h
+++ b/WebKit/WebView.subproj/WebLocationChangeDelegate.h
@@ -46,6 +46,10 @@
     received. This is done so the old page will not be lost if the new
     page fails to load completely.
 
+    In some cases, a single location change may be committed more than once. This happens
+    in the case of multipart/x-mixed-replace, also known as "server push". In this case,
+    a single location change leads to multiple documents that are loaded in sequence. When
+    this happens, a new commit will be sent for each document.
 */
 - (void)webView:(WebView *)sender locationChangeCommittedForDataSource:(WebDataSource *)dataSource;
 
diff --git a/WebKit/WebView.subproj/WebPolicyDelegate.h b/WebKit/WebView.subproj/WebPolicyDelegate.h
index e0de111..f67668c 100644
--- a/WebKit/WebView.subproj/WebPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebPolicyDelegate.h
@@ -101,8 +101,19 @@ extern NSString *WebActionOriginalURLKey; // NSURL
     the URL represents. Typically, the policy handler methods are called in this order:
 
     decideNewWindowPolicyForAction:andRequest:newFrameName:decisionListener: (at most once)<BR>
-    decideNavigationPolicyForAction:inFrame::decisionListener: (one or more times)<BR>
-    decideContentPolicyForMIMEType:andRequest:inFrame: (at most once)<BR>
+    decideNavigationPolicyForAction:inFrame::decisionListener: (zero or more times)<BR>
+    decideContentPolicyForMIMEType:andRequest:inFrame: (zero or more times)<BR>
+
+    New window policy is always checked. Navigation policy is checked
+    for the initial load and every redirect unless blocked by an
+    earlier policy. Content policy is checked once the content type is
+    known, unless an earlier policy prevented it.
+
+    In rare cases, content policy might be checked more than
+    once. This occurs when loading a "multipart/x-mixed-replace"
+    document, also known as "server push". In this case, multiple
+    documents come in one navigation, with each replacing the last. In
+    this case, conent policy will be checked for each one.
 */
 @interface NSObject (WebPolicyDelegate)
 
diff --git a/WebKit/WebView.subproj/WebResourceLoadDelegate.h b/WebKit/WebView.subproj/WebResourceLoadDelegate.h
index b35e8cc..d8b6f15 100644
--- a/WebKit/WebView.subproj/WebResourceLoadDelegate.h
+++ b/WebKit/WebView.subproj/WebResourceLoadDelegate.h
@@ -54,12 +54,16 @@
 
 /*!
     @method resource:didReceiveResponse:fromDataSource:
-    @discussion This message is sent after a response has been received for this load.
+    @abstract This message is sent after a response has been received for this load.
     @param webView The WebView sending the message.
     @param identifier An identifier that can be used to track the progress of a resource load across
     multiple call backs.
     @param response The response for the request.
     @param dataSource The dataSource that initiated the load.
+    @discussion In some rare cases, multiple responses may be received for a single load.
+    This occurs with multipart/x-mixed-replace, or "server push". In this case, the client
+    should assume that each new response resets progress so far for the resource back to 0,
+    and should check the new response for the expected content length.
 */
 -(void)webView:(WebView *)sender resource:identifier didReceiveResponse: (WebResponse *)response fromDataSource:(WebDataSource *)dataSource;
 

-- 
WebKit Debian packaging