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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 52932a9385998e8a0c702ecb4ccb18f593a0cbb9
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Apr 26 22:19:24 2004 +0000

    	More header doc changes after John's review.
    
            * WebView.subproj/WebDataSourcePrivate.h:
            * WebView.subproj/WebResource.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6490 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 9422831..c391ccc 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,12 @@
 2004-04-26  Chris Blumenberg  <cblu at apple.com>
 
+	More header doc changes after John's review.
+	
+        * WebView.subproj/WebDataSourcePrivate.h:
+        * WebView.subproj/WebResource.h:
+
+2004-04-26  Chris Blumenberg  <cblu at apple.com>
+
         * WebView.subproj/WebDataSourcePrivate.h: added some header doc comments
         * WebView.subproj/WebFramePrivate.h: fixed header doc typo
 
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.h b/WebKit/WebView.subproj/WebDataSourcePrivate.h
index 47f8224..45ee645 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.h
@@ -122,6 +122,7 @@
 /*!
     @method subresources
     @abstract Returns all the subresources associated with the data source.
+    @description The returned array only contains subresources that have fully downloaded.
 */
 - (NSArray *)subresources;
 
@@ -129,6 +130,7 @@
     method subresourceForURL:
     @abstract Returns a subresource for a given URL.
     @param URL The URL of the subresource.
+    @description Non-nil is returned if the data source has fully downloaded a subresource with the given URL.
 */
 - (WebResource *)subresourceForURL:(NSURL *)URL;
 
@@ -136,16 +138,18 @@
     @method addSubresource:
     @abstract Adds a subresource to the data source.
     @param subresource The subresource to be added.
-    @description addSubresource: adds a subresource to the data source's list of subresources. 
-    From then on, if something causes the data source to load the URL of the subresource, the data source 
-    will load the data from the subresource instead of from the network. NOTE: If the data source already has
-    a subresource with the same URL, addSubresource: will replace it.
+    @description addSubresource: adds a subresource to the data source's list of subresources.
+    Later, if something causes the data source to load the URL of the subresource, the data source
+    will load the data from the subresource instead of from the network. For example, if one wants to add
+    an image that is already downloaded to a web page, addSubresource: can be called so that the data source
+    uses the downloaded image rather than accessing the network. NOTE: If the data source already has a
+    subresource with the same URL, addSubresource: will replace it.
 */
 - (void)addSubresource:(WebResource *)subresource;
 
-- (void)addSubresources:(NSArray *)subresources;
 
 // Other private methods
+- (void)addSubresources:(NSArray *)subresources;
 - (NSFileWrapper *)_fileWrapperForURL:(NSURL *)URL;
 
 - (WebArchive *)_archive;
diff --git a/WebKit/WebView.subproj/WebResource.h b/WebKit/WebView.subproj/WebResource.h
index 26798f3..7a0bfb2 100644
--- a/WebKit/WebView.subproj/WebResource.h
+++ b/WebKit/WebView.subproj/WebResource.h
@@ -13,8 +13,8 @@
 
 /*!
     @class WebResource
-    @discussion A WebResource represents a fully downloaded resource. It includes the data of the resource
-    as well as the metadata associated with the resource.
+    @discussion A WebResource represents a fully downloaded URL. 
+    It includes the data of the resource as well as the metadata associated with the resource.
 */
 @interface WebResource : NSObject 
 {

-- 
WebKit Debian packaging