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

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit 7e40ab00309b33aed139860580b03e03f024bb35
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 4 15:32:14 2002 +0000

    	Changed WebKit so that it no longer relies on WebResourceHandle to buffer
    	resource data as it is loaded. Instead, this buffering task has been moved
    	out to the WebResourceClient, WebMainResourceClient in this case. This
    	change is a "proof of concept" for the upcoming change where the API in
    	WebFoundation for buffering resource data in WebResourceHandle will be
    	removed altogether.
    
            * WebView.subproj/WebDataSource.m:
            (-[WebDataSource data]): Changed to call WebMainResourceClient when resource data is needed.
            * WebView.subproj/WebMainResourceClient.h: Added mutable data ivar.
            * WebView.subproj/WebMainResourceClient.m:
            (-[WebMainResourceClient initWithDataSource:]): Added mutable data ivar.
            (-[WebMainResourceClient dealloc]): Release new mutable data ivar.
            (-[WebMainResourceClient resourceData]): Added accessor method.
            (-[WebMainResourceClient handleDidReceiveData:data:]): Append received data to the new mutable data object.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1957 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 669b8ac..b55dfd2 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,21 @@
+2002-09-04  Ken Kocienda  <kocienda at apple.com>
+
+	Changed WebKit so that it no longer relies on WebResourceHandle to buffer
+	resource data as it is loaded. Instead, this buffering task has been moved
+	out to the WebResourceClient, WebMainResourceClient in this case. This
+	change is a "proof of concept" for the upcoming change where the API in
+	WebFoundation for buffering resource data in WebResourceHandle will be
+	removed altogether.
+
+        * WebView.subproj/WebDataSource.m:
+        (-[WebDataSource data]): Changed to call WebMainResourceClient when resource data is needed.
+        * WebView.subproj/WebMainResourceClient.h: Added mutable data ivar.
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient initWithDataSource:]): Added mutable data ivar.
+        (-[WebMainResourceClient dealloc]): Release new mutable data ivar.
+        (-[WebMainResourceClient resourceData]): Added accessor method.
+        (-[WebMainResourceClient handleDidReceiveData:data:]): Append received data to the new mutable data object.
+
 2002-09-03  John Sullivan  <sullivan at apple.com>
 
         * Resources/url_icon.tiff: New image (still a placeholder)
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 669b8ac..b55dfd2 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,21 @@
+2002-09-04  Ken Kocienda  <kocienda at apple.com>
+
+	Changed WebKit so that it no longer relies on WebResourceHandle to buffer
+	resource data as it is loaded. Instead, this buffering task has been moved
+	out to the WebResourceClient, WebMainResourceClient in this case. This
+	change is a "proof of concept" for the upcoming change where the API in
+	WebFoundation for buffering resource data in WebResourceHandle will be
+	removed altogether.
+
+        * WebView.subproj/WebDataSource.m:
+        (-[WebDataSource data]): Changed to call WebMainResourceClient when resource data is needed.
+        * WebView.subproj/WebMainResourceClient.h: Added mutable data ivar.
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient initWithDataSource:]): Added mutable data ivar.
+        (-[WebMainResourceClient dealloc]): Release new mutable data ivar.
+        (-[WebMainResourceClient resourceData]): Added accessor method.
+        (-[WebMainResourceClient handleDidReceiveData:data:]): Append received data to the new mutable data object.
+
 2002-09-03  John Sullivan  <sullivan at apple.com>
 
         * Resources/url_icon.tiff: New image (still a placeholder)
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 9553786..4711df2 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -71,7 +71,7 @@
 - (NSData *)data
 {
     if(!_private->resourceData){
-        return [_private->mainHandle resourceData];
+        return [_private->mainHandleClient resourceData];
     }else{
         return _private->resourceData;
     }
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.h b/WebKit/WebView.subproj/WebMainResourceClient.h
index e33ffdd..5a4449b 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.h
+++ b/WebKit/WebView.subproj/WebMainResourceClient.h
@@ -23,7 +23,9 @@
     WebDownloadHandler *downloadHandler;
     id <WebResourceProgressHandler> downloadProgressHandler;
     WebContentAction policyAction;
+    NSMutableData *resourceData;
 }
 - initWithDataSource:(WebDataSource *)dataSource;
 - (WebDownloadHandler *)downloadHandler;
+- (NSData *)resourceData;
 @end
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 34818ec..f34a6e3 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -32,6 +32,7 @@
     
     if (self) {
         dataSource = [ds retain];
+        resourceData = [[NSMutableData alloc] init];
         isFirstChunk = YES;
     }
 
@@ -59,11 +60,17 @@
     WEBKIT_ASSERT(downloadHandler == nil);
     
     [downloadProgressHandler release];
+    [resourceData release];
     [dataSource release];
     
     [super dealloc];
 }
 
+- (NSData *)resourceData
+{
+    return resourceData;
+}
+
 - (WebDownloadHandler *)downloadHandler
 {
     return downloadHandler;
@@ -203,6 +210,8 @@
         WEBKITDEBUGLEVEL(WEBKIT_LOG_DOWNLOAD, "main content type: %s", DEBUG_OBJECT(contentType));
     }
 
+    [resourceData appendData:data];
+
     switch (policyAction) {
     case WebContentPolicyShow:
         [dataSource _receivedData:data];
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.h b/WebKit/WebView.subproj/WebMainResourceLoader.h
index e33ffdd..5a4449b 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.h
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.h
@@ -23,7 +23,9 @@
     WebDownloadHandler *downloadHandler;
     id <WebResourceProgressHandler> downloadProgressHandler;
     WebContentAction policyAction;
+    NSMutableData *resourceData;
 }
 - initWithDataSource:(WebDataSource *)dataSource;
 - (WebDownloadHandler *)downloadHandler;
+- (NSData *)resourceData;
 @end
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 34818ec..f34a6e3 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -32,6 +32,7 @@
     
     if (self) {
         dataSource = [ds retain];
+        resourceData = [[NSMutableData alloc] init];
         isFirstChunk = YES;
     }
 
@@ -59,11 +60,17 @@
     WEBKIT_ASSERT(downloadHandler == nil);
     
     [downloadProgressHandler release];
+    [resourceData release];
     [dataSource release];
     
     [super dealloc];
 }
 
+- (NSData *)resourceData
+{
+    return resourceData;
+}
+
 - (WebDownloadHandler *)downloadHandler
 {
     return downloadHandler;
@@ -203,6 +210,8 @@
         WEBKITDEBUGLEVEL(WEBKIT_LOG_DOWNLOAD, "main content type: %s", DEBUG_OBJECT(contentType));
     }
 
+    [resourceData appendData:data];
+
     switch (policyAction) {
     case WebContentPolicyShow:
         [dataSource _receivedData:data];

-- 
WebKit Debian packaging