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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 2ba4d53d47b80f081fcaa40002b167224dcca4c7
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Feb 2 01:02:15 2003 +0000

            Reviewed by Darin and Ken.
    
    	- fixed 3162581 - 56 debug: Assertion failure displaying pop-up menu while downloading
    
            * WebView.subproj/WebMainResourceClient.m:
            (-[WebMainResourceClient handle:didReceiveResponse:]): No need to assert that the controller is
    	not deferred if this is a handle being used for a download.
            (-[WebMainResourceClient handle:didReceiveData:]): Likewise.
            (-[WebMainResourceClient handleDidFinishLoading:]): Likewise.
            (-[WebMainResourceClient handle:didFailLoadingWithError:]): Likewise.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3539 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 61cea40..85f6553 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2003-02-01  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin and Ken.
+
+	- fixed 3162581 - 56 debug: Assertion failure displaying pop-up menu while downloading
+	
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handle:didReceiveResponse:]): No need to assert that the controller is
+	not deferred if this is a handle being used for a download.
+        (-[WebMainResourceClient handle:didReceiveData:]): Likewise.
+        (-[WebMainResourceClient handleDidFinishLoading:]): Likewise.
+        (-[WebMainResourceClient handle:didFailLoadingWithError:]): Likewise.
+
 2003-01-31  Trey Matteson  <trey at apple.com>
 
 	New plumbing for autofill/autocomplete.  WebBrowser receives controlText delegate
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index b8e81da..e97f8fe 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -267,7 +267,7 @@
 {
     ASSERT(![h _defersCallbacks]);
     ASSERT(![self defersCallbacks]);
-    ASSERT(![[dataSource controller] _defersCallbacks]);
+    ASSERT([dataSource isDownloading] || ![[dataSource controller] _defersCallbacks]);
     [dataSource _setResponse:r];
 
     LOG(Download, "main content type: %@", [r contentType]);
@@ -290,7 +290,7 @@
     ASSERT([data length] != 0);
     ASSERT(![h _defersCallbacks]);
     ASSERT(![self defersCallbacks]);
-    ASSERT(![[dataSource controller] _defersCallbacks]);
+    ASSERT([self isDownload] || ![[dataSource controller] _defersCallbacks]);
  
     LOG(Loading, "URL = %@, data = %p, length %d", [dataSource URL], data, [data length]);
 
@@ -321,7 +321,7 @@
 {
     ASSERT(![h _defersCallbacks]);
     ASSERT(![self defersCallbacks]);
-    ASSERT(![[dataSource controller] _defersCallbacks]);
+    ASSERT([self isDownload] || ![[dataSource controller] _defersCallbacks]);
     LOG(Loading, "URL = %@", [dataSource URL]);
         
     // Calls in this method will most likely result in a call to release, so we must retain.
@@ -356,7 +356,7 @@
 {
     ASSERT(![h _defersCallbacks]);
     ASSERT(![self defersCallbacks]);
-    ASSERT(![[dataSource controller] _defersCallbacks]);
+    ASSERT([self isDownload] || ![[dataSource controller] _defersCallbacks]);
     LOG(Loading, "URL = %@, error = %@", [error failingURL], [error errorDescription]);
 
     // Calling receivedError will likely result in a call to release, so we must retain.
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index b8e81da..e97f8fe 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -267,7 +267,7 @@
 {
     ASSERT(![h _defersCallbacks]);
     ASSERT(![self defersCallbacks]);
-    ASSERT(![[dataSource controller] _defersCallbacks]);
+    ASSERT([dataSource isDownloading] || ![[dataSource controller] _defersCallbacks]);
     [dataSource _setResponse:r];
 
     LOG(Download, "main content type: %@", [r contentType]);
@@ -290,7 +290,7 @@
     ASSERT([data length] != 0);
     ASSERT(![h _defersCallbacks]);
     ASSERT(![self defersCallbacks]);
-    ASSERT(![[dataSource controller] _defersCallbacks]);
+    ASSERT([self isDownload] || ![[dataSource controller] _defersCallbacks]);
  
     LOG(Loading, "URL = %@, data = %p, length %d", [dataSource URL], data, [data length]);
 
@@ -321,7 +321,7 @@
 {
     ASSERT(![h _defersCallbacks]);
     ASSERT(![self defersCallbacks]);
-    ASSERT(![[dataSource controller] _defersCallbacks]);
+    ASSERT([self isDownload] || ![[dataSource controller] _defersCallbacks]);
     LOG(Loading, "URL = %@", [dataSource URL]);
         
     // Calls in this method will most likely result in a call to release, so we must retain.
@@ -356,7 +356,7 @@
 {
     ASSERT(![h _defersCallbacks]);
     ASSERT(![self defersCallbacks]);
-    ASSERT(![[dataSource controller] _defersCallbacks]);
+    ASSERT([self isDownload] || ![[dataSource controller] _defersCallbacks]);
     LOG(Loading, "URL = %@, error = %@", [error failingURL], [error errorDescription]);
 
     // Calling receivedError will likely result in a call to release, so we must retain.

-- 
WebKit Debian packaging