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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit bf850bd441e50af84fb41f8747c5f78e335e37b6
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 28 22:21:35 2003 +0000

    WebKit:
    
    	Fixed: <rdar://problem/3465383>: REGRESSION: Text field progress bar goes to 100% after error or stop
    
            Reviewed by john.
    
            * WebView.subproj/WebFrame.m:
            (-[WebFrame _isLoadComplete]): call _progressCompleted after we deliver the didFailLoadWithError or didFinishLoadForFrame message as we do in other places. This allows to be aware of the error (if there is one), when they get the WebViewProgressFinishedNotification notification.
    
    WebBrowser:
    
    	Fixed:
    	<rdar://problem/3465383>: REGRESSION: Text field progress bar goes to 100% after error or stop
    	<rdar://problem/3465910>: REGRESSION (100-110): Switching to bookmarks view shows progress bar but shouldn't
    
            Reviewed by john.
    
            * BrowserWebController.h:
            * BrowserWebController.m:
            (-[BrowserWebView setMainFrameLoadEndedInError:]): new
            (-[BrowserWebView progressFinished:]): if we have a main frame error, set the progress bar to 0
            * LocationChangeHandler.m:
            (-[LocationChangeHandler webView:didStartProvisionalLoadForFrame:]): call setMainFrameLoadEndedInError:NO for the main frame
            (-[LocationChangeHandler webView:locationChangeDone:forDataSource:]): call setMainFrameLoadEndedInError:YES for the main frame
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5289 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index e73147b..269e972 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2003-10-28  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: <rdar://problem/3465383>: REGRESSION: Text field progress bar goes to 100% after error or stop
+	
+        Reviewed by john.
+
+        * WebView.subproj/WebFrame.m:
+        (-[WebFrame _isLoadComplete]): call _progressCompleted after we deliver the didFailLoadWithError or didFinishLoadForFrame message as we do in other places. This allows to be aware of the error (if there is one), when they get the WebViewProgressFinishedNotification notification.
+
 2003-10-27  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Darin.
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 4491091..7e5e76a 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -1021,7 +1021,6 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
                     }
                 }
 
-                [[self webView] _progressCompleted: self];
                 
                 if ([ds _mainDocumentError]) {
                     [[self webView] _didFailLoadWithError:[ds _mainDocumentError] forFrame:self];
@@ -1033,6 +1032,8 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
                     [[[self webView] _frameLoadDelegateForwarder] webView:_private->webView
                                                     didFinishLoadForFrame:self];
                 }
+                
+                [[self webView] _progressCompleted: self];
  
                 return;
             }

-- 
WebKit Debian packaging