[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 ce32cabe99656a2287017e8f54b071374f62da69
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 19 05:50:36 2002 +0000

    	Fix two problems that led to an assertion now that a bogus
    	load progress doesn't pass the "bytesReceived == total" test.
    
            * Plugins.subproj/WebPluginStream.m:
            (-[WebNetscapePluginStream handleDidFinishLoading:]): Nil out the
    	resource at the start of the function so that a cancel doesn't
    	do anything if called in the middle when we stop.
            (-[WebNetscapePluginStream cancel]): Send a cancel error instead
    	of a _receivedProgress. And make a partial progress rather than
    	sending an empty progress.
            (-[WebNetscapePluginStream handleDidFailLoading:withError:]):
    	Same as handleDidFinishLoading.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2096 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d1535bf..0825d2e 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,18 @@
+2002-09-18  Darin Adler  <darin at apple.com>
+
+	Fix two problems that led to an assertion now that a bogus
+	load progress doesn't pass the "bytesReceived == total" test.
+
+        * Plugins.subproj/WebPluginStream.m:
+        (-[WebNetscapePluginStream handleDidFinishLoading:]): Nil out the
+	resource at the start of the function so that a cancel doesn't
+	do anything if called in the middle when we stop.
+        (-[WebNetscapePluginStream cancel]): Send a cancel error instead
+	of a _receivedProgress. And make a partial progress rather than
+	sending an empty progress.
+        (-[WebNetscapePluginStream handleDidFailLoading:withError:]):
+	Same as handleDidFinishLoading.
+
 2002-09-18  Richard Williamson   <rjw at apple.com>
 
         More documentation stuff.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index d1535bf..0825d2e 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,18 @@
+2002-09-18  Darin Adler  <darin at apple.com>
+
+	Fix two problems that led to an assertion now that a bogus
+	load progress doesn't pass the "bytesReceived == total" test.
+
+        * Plugins.subproj/WebPluginStream.m:
+        (-[WebNetscapePluginStream handleDidFinishLoading:]): Nil out the
+	resource at the start of the function so that a cancel doesn't
+	do anything if called in the middle when we stop.
+        (-[WebNetscapePluginStream cancel]): Send a cancel error instead
+	of a _receivedProgress. And make a partial progress rather than
+	sending an empty progress.
+        (-[WebNetscapePluginStream handleDidFailLoading:withError:]):
+	Same as handleDidFinishLoading.
+
 2002-09-18  Richard Williamson   <rjw at apple.com>
 
         More documentation stuff.
diff --git a/WebKit/Plugins.subproj/WebPluginStream.m b/WebKit/Plugins.subproj/WebPluginStream.m
index 62c0da5..61bbddc 100644
--- a/WebKit/Plugins.subproj/WebPluginStream.m
+++ b/WebKit/Plugins.subproj/WebPluginStream.m
@@ -295,7 +295,10 @@
 - (void)handleDidFinishLoading:(WebResourceHandle *)handle
 {
     ASSERT(resource == handle);
-    
+
+    [resource release];    
+    resource = nil;
+
     WebController *webController = [view webController];
     
     [webController _receivedProgress:[WebLoadProgress progressWithResourceHandle:handle]
@@ -304,9 +307,6 @@
     [self finishedLoadingWithData:resourceData];
           
     [webController _didStopLoading:URL];
-    
-    [resource release];
-    resource = nil;
 }
 
 - (void)cancel
@@ -319,8 +319,15 @@
     
     WebController *webController = [view webController];
     
-    [webController _receivedProgress:[WebLoadProgress progress]
-        forResourceHandle:resource fromDataSource:[view webDataSource] complete: YES];
+    WebError *cancelError = [[WebError alloc] initWithErrorCode:WebResultCancelled
+                                                       inDomain:WebErrorDomainWebFoundation
+                                                     failingURL:nil];
+    WebLoadProgress *loadProgress = [[WebLoadProgress alloc] initWithResourceHandle:resource];
+    [webController _receivedError: cancelError forResourceHandle: resource 
+        partialProgress: loadProgress fromDataSource: [view webDataSource]];
+    [loadProgress release];
+    
+    [cancelError release];
 
     [self receivedError:NPRES_USER_BREAK];
     
@@ -334,6 +341,9 @@
 {
     ASSERT(resource == handle);
     
+    [resource release];
+    resource = nil;
+    
     WebController *webController = [view webController];
     
     WebLoadProgress *loadProgress = [[WebLoadProgress alloc] initWithResourceHandle:handle];
@@ -345,9 +355,6 @@
     [self receivedError:NPRES_NETWORK_ERR];
     
     [webController _didStopLoading:URL];
-    
-    [resource release];
-    resource = nil;
 }
 
 - (void)handleDidRedirect:(WebResourceHandle *)handle toURL:(NSURL *)toURL

-- 
WebKit Debian packaging