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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit ca801f5a084f1efaa7219c8192ad0f37ca6cea1d
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 12 08:48:28 2002 +0000

            Fixed 3125585.  One click crasher option clicking on
            any link.  Added additional check to curtail overly
            zealous ASSERT.
    
            Reviewed by mjs.
    
            * WebView.subproj/WebControllerPrivate.m:
            (-[WebController _mainReceivedError:fromDataSource:complete:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3012 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 07c905a..bda0a7b 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2002-12-12  Richard Williamson   <rjw at apple.com>
+
+        Fixed 3125585.  One click crasher option clicking on
+        any link.  Added additional check to curtail overly
+        zealous ASSERT.
+        
+        Reviewed by mjs.
+
+        * WebView.subproj/WebControllerPrivate.m:
+        (-[WebController _mainReceivedError:fromDataSource:complete:]):
+
 2002-12-11  Richard Williamson   <rjw at apple.com>
 
         Fixed 3125425.  Just call super if view isn't in view heirarchy,
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.m b/WebKit/WebView.subproj/WebControllerPrivate.m
index 2f1e1a6..f9c5c14 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.m
+++ b/WebKit/WebView.subproj/WebControllerPrivate.m
@@ -152,7 +152,10 @@
 {
     ASSERT(error);
     ASSERT(dataSource);
-    ASSERT([dataSource webFrame]);
+#ifndef NDEBUG
+    if (![dataSource isDownloading])
+        ASSERT([dataSource webFrame]);
+#endif    
 
     [dataSource _setMainDocumentError: error];
 
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index 2f1e1a6..f9c5c14 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -152,7 +152,10 @@
 {
     ASSERT(error);
     ASSERT(dataSource);
-    ASSERT([dataSource webFrame]);
+#ifndef NDEBUG
+    if (![dataSource isDownloading])
+        ASSERT([dataSource webFrame]);
+#endif    
 
     [dataSource _setMainDocumentError: error];
 

-- 
WebKit Debian packaging