[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 f5e133eb13dbb426c7b69bdae240721018ddafd9
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 9 21:24:40 2002 +0000

    	Content length information now accessible via WebResourceResponse object,
            rather than from WebResourceHandle.
    
            * WebView.subproj/WebLoadProgress.m:
            (-[WebLoadProgress initWithResourceHandle:]):
            * WebView.subproj/WebMainResourceClient.m:
            (-[WebMainResourceClient handleDidReceiveData:data:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2012 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index fd1d8da..76844d2 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2002-09-09  ken  <kocienda at apple.com>
+
+	Content length information now accessible via WebResourceResponse object,
+        rather than from WebResourceHandle.
+
+        * WebView.subproj/WebLoadProgress.m:
+        (-[WebLoadProgress initWithResourceHandle:]):
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handleDidReceiveData:data:]):
+
 2002-09-09  Richard Williamson  <rjw at apple.com>
 
         Make both calls to adjust CG font cache dynamic.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index fd1d8da..76844d2 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-09-09  ken  <kocienda at apple.com>
+
+	Content length information now accessible via WebResourceResponse object,
+        rather than from WebResourceHandle.
+
+        * WebView.subproj/WebLoadProgress.m:
+        (-[WebLoadProgress initWithResourceHandle:]):
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handleDidReceiveData:data:]):
+
 2002-09-09  Richard Williamson  <rjw at apple.com>
 
         Make both calls to adjust CG font cache dynamic.
diff --git a/WebKit/WebView.subproj/WebLoadProgress.m b/WebKit/WebView.subproj/WebLoadProgress.m
index ae2258c..03aad88 100644
--- a/WebKit/WebView.subproj/WebLoadProgress.m
+++ b/WebKit/WebView.subproj/WebLoadProgress.m
@@ -29,8 +29,9 @@
 
 - (id)initWithResourceHandle:(WebResourceHandle *)handle
 {
-    int b = [handle contentLengthReceived];
-    int t = [[handle response] statusCode] == WebResourceHandleStatusLoadComplete ? b : [handle contentLength];
+    WebResourceResponse *theResponse = [handle response];
+    int b = [theResponse contentLengthReceived];
+    int t = [theResponse statusCode] == WebResourceHandleStatusLoadComplete ? b : [theResponse contentLength];
     return [self initWithBytesSoFar:b totalToLoad:t];
 }
 
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 1b03336..5db3351 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -240,7 +240,7 @@
 
     [self receivedProgressWithHandle:handle complete:NO];
     
-    LOG(Download, "%d of %d", [handle contentLengthReceived], [handle contentLength]);
+    LOG(Download, "%d of %d", [[handle response] contentLengthReceived], [[handle response] contentLength]);
     isFirstChunk = NO;
 }
 
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 1b03336..5db3351 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -240,7 +240,7 @@
 
     [self receivedProgressWithHandle:handle complete:NO];
     
-    LOG(Download, "%d of %d", [handle contentLengthReceived], [handle contentLength]);
+    LOG(Download, "%d of %d", [[handle response] contentLengthReceived], [[handle response] contentLength]);
     isFirstChunk = NO;
 }
 

-- 
WebKit Debian packaging