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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 4dfcde43c8495dec8a3172de2a342f3d103db040
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 18 22:33:52 2002 +0000

    	- fixed 3053155 -- REGRESSION: Activity Window thinks 0-byte
    	images are "complete"
    
    	I thought I had fixed it before, but this is needed too.
    
            * WebView.subproj/WebLoadProgress.m:
            (-[WebLoadProgress init]): Set "bytes so far" to 0, not -1.
            (-[WebLoadProgress initWithResourceHandle:]): Make sure we set total
    	to -1, not 0, when the response is nil.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2090 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index fbf3bfb..6da942c 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2002-09-18  Darin Adler  <darin at apple.com>
+
+	- fixed 3053155 -- REGRESSION: Activity Window thinks 0-byte
+	images are "complete"
+
+	I thought I had fixed it before, but this is needed too.
+
+        * WebView.subproj/WebLoadProgress.m:
+        (-[WebLoadProgress init]): Set "bytes so far" to 0, not -1.
+        (-[WebLoadProgress initWithResourceHandle:]): Make sure we set total
+	to -1, not 0, when the response is nil.
+
 2002-09-18  Richard Williamson  <rjw at apple.com>
 
         Added documentation keywords to header.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index fbf3bfb..6da942c 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,15 @@
+2002-09-18  Darin Adler  <darin at apple.com>
+
+	- fixed 3053155 -- REGRESSION: Activity Window thinks 0-byte
+	images are "complete"
+
+	I thought I had fixed it before, but this is needed too.
+
+        * WebView.subproj/WebLoadProgress.m:
+        (-[WebLoadProgress init]): Set "bytes so far" to 0, not -1.
+        (-[WebLoadProgress initWithResourceHandle:]): Make sure we set total
+	to -1, not 0, when the response is nil.
+
 2002-09-18  Richard Williamson  <rjw at apple.com>
 
         Added documentation keywords to header.
diff --git a/WebKit/WebView.subproj/WebLoadProgress.m b/WebKit/WebView.subproj/WebLoadProgress.m
index 03aad88..8db6564 100644
--- a/WebKit/WebView.subproj/WebLoadProgress.m
+++ b/WebKit/WebView.subproj/WebLoadProgress.m
@@ -12,7 +12,7 @@
 
 - (id)init
 {
-    return [self initWithBytesSoFar:-1 totalToLoad:-1];
+    return [self initWithBytesSoFar:0 totalToLoad:-1];
 }
 
 - (id)initWithBytesSoFar:(int)bytes totalToLoad:(int)total
@@ -30,6 +30,9 @@
 - (id)initWithResourceHandle:(WebResourceHandle *)handle
 {
     WebResourceResponse *theResponse = [handle response];
+    if (theResponse == nil) {
+        return [self init];
+    }
     int b = [theResponse contentLengthReceived];
     int t = [theResponse statusCode] == WebResourceHandleStatusLoadComplete ? b : [theResponse contentLength];
     return [self initWithBytesSoFar:b totalToLoad:t];

-- 
WebKit Debian packaging