[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 f012d82d736e1a276abd8df36d5549eb61ceb660
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Apr 29 23:34:18 2002 +0000

            Fix to 2915688.  I wasn't checking if the main document error had an error, only
            the resource errors.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1085 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 8f3b054..9328374 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,13 @@
 2002-04-29  Richard Williamson  <rjw at apple.com>
 
+        Fix to 2915688.  I wasn't checking if the main document error had an error, only
+        the resource errors.
+        
+	* WebView.subproj/IFWebFramePrivate.mm:
+	(-[IFWebFrame _isLoadComplete]):
+
+2002-04-29  Richard Williamson  <rjw at apple.com>
+
         Restored file, line, and function to log messages.
         
 	* Misc.subproj/WebKitDebug.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 8f3b054..9328374 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,13 @@
 2002-04-29  Richard Williamson  <rjw at apple.com>
 
+        Fix to 2915688.  I wasn't checking if the main document error had an error, only
+        the resource errors.
+        
+	* WebView.subproj/IFWebFramePrivate.mm:
+	(-[IFWebFrame _isLoadComplete]):
+
+2002-04-29  Richard Williamson  <rjw at apple.com>
+
         Restored file, line, and function to log messages.
         
 	* Misc.subproj/WebKitDebug.m:
diff --git a/WebKit/WebView.subproj/IFWebFramePrivate.mm b/WebKit/WebView.subproj/IFWebFramePrivate.mm
index 8c59bf3..a9defc0 100644
--- a/WebKit/WebView.subproj/IFWebFramePrivate.mm
+++ b/WebKit/WebView.subproj/IFWebFramePrivate.mm
@@ -290,7 +290,7 @@ static const char * const stateNames[6] = {
             WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "%s:  checking complete in IFWEBFRAMESTATE_PROVISIONAL\n", [[self name] cString]);
             // If we've received any errors we may be stuck in the provisional state and actually
             // complete.
-            if ([[pd errors] count] != 0) {
+            if ([[pd errors] count] != 0 || [pd mainDocumentError]) {
                 // Check all children first.
                 WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "%s:  checking complete, current state IFWEBFRAMESTATE_PROVISIONAL, %d errors\n", [[self name] cString], [[pd errors] count]);
                 if (![pd isLoading]) {
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 8c59bf3..a9defc0 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -290,7 +290,7 @@ static const char * const stateNames[6] = {
             WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "%s:  checking complete in IFWEBFRAMESTATE_PROVISIONAL\n", [[self name] cString]);
             // If we've received any errors we may be stuck in the provisional state and actually
             // complete.
-            if ([[pd errors] count] != 0) {
+            if ([[pd errors] count] != 0 || [pd mainDocumentError]) {
                 // Check all children first.
                 WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "%s:  checking complete, current state IFWEBFRAMESTATE_PROVISIONAL, %d errors\n", [[self name] cString], [[pd errors] count]);
                 if (![pd isLoading]) {

-- 
WebKit Debian packaging