[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 c6a3264dad15d9ec52fe2b1cb2b0ac88ece6b3ee
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 30 21:06:30 2003 +0000

    	Fixed 3422138.  We weren't sending a didChange call for isLoading until the load was complete!  Also [WebView isLoading] wasn't accounting for provisional datasources.
    
            Reviewed by Chris.
    
            * WebView.subproj/WebView.m:
            (-[WebView isLoading]):
            * WebView.subproj/WebViewPrivate.h:
            * WebView.subproj/WebViewPrivate.m:
            (-[WebView _didStartProvisionalLoadForFrame:]):
            (-[WebView _didCommitLoadForFrame:]):
            (-[WebView _didFinishLoadForFrame:]):
            (-[WebView _didFailLoadWithError:forFrame:]):
            (-[WebView _didFailProvisionalLoadWithError:forFrame:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5089 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 9fe260f..6f3ad6e 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,19 @@
+2003-09-30  Richard Williamson   <rjw at apple.com>
+
+	Fixed 3422138.  We weren't sending a didChange call for isLoading until the load was complete!  Also [WebView isLoading] wasn't accounting for provisional datasources.
+
+        Reviewed by Chris.
+
+        * WebView.subproj/WebView.m:
+        (-[WebView isLoading]):
+        * WebView.subproj/WebViewPrivate.h:
+        * WebView.subproj/WebViewPrivate.m:
+        (-[WebView _didStartProvisionalLoadForFrame:]):
+        (-[WebView _didCommitLoadForFrame:]):
+        (-[WebView _didFinishLoadForFrame:]):
+        (-[WebView _didFailLoadWithError:forFrame:]):
+        (-[WebView _didFailProvisionalLoadWithError:forFrame:]):
+
 2003-09-30  David Hyatt  <hyatt at apple.com>
 
 	Improvements to scrolling and layout.  Also fixing 3264346, body overflow should
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index d011942..515d8d3 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -61,6 +61,9 @@ NSString *WebViewProgressFinishedNotification = @"WebProgressFinishedNotificatio
 
 enum { WebViewVersion = 2 };
 
+ at interface WebView (WebInternal)
+- (BOOL)_isLoading;
+ at end
 
 @implementation WebView
 
@@ -822,7 +825,8 @@ static WebFrame *incrementFrame(WebFrame *curr, BOOL forward, BOOL wrapFlag)
 
 - (BOOL)isLoading
 {
-    return [[[self mainFrame] dataSource] isLoading];
+    LOG (Bindings, "isLoading = %d", (int)[self _isLoading]);
+    return [self _isLoading];
 }
 
 - (NSString *)mainFrameTitle
diff --git a/WebKit/WebView.subproj/WebViewPrivate.h b/WebKit/WebView.subproj/WebViewPrivate.h
index cb6be3f..0d23457 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.h
+++ b/WebKit/WebView.subproj/WebViewPrivate.h
@@ -243,8 +243,8 @@ Could be worth adding to the API.
 - (void)_didFailLoadWithError:(NSError *)error forFrame:(WebFrame *)frame;
 - (void)_didFailProvisionalLoadWithError:(NSError *)error forFrame:(WebFrame *)frame;
 
--  (void)_willChangeValueForKey:(NSString *)key;
--  (void)_didChangeValueForKey:(NSString *)key;
+- (void)_willChangeValueForKey:(NSString *)key;
+- (void)_didChangeValueForKey:(NSString *)key;
 @end
 
 @interface _WebSafeForwarder : NSObject
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index 0cf3a79..df9b2e7 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -819,7 +819,10 @@ NSString *_WebMainFrameURLKey = @"mainFrameURL";
 {
     [self _willChangeBackForwardKeys];
     if (frame == [self mainFrame]){
+        // Force an observer update by sending a will/did.
         [self _willChangeValueForKey: _WebIsLoadingKey];
+        [self _didChangeValueForKey: _WebIsLoadingKey];
+
         [self _willChangeValueForKey: _WebMainFrameURLKey];
     }
     [NSApp setWindowsNeedUpdate:YES];
@@ -827,24 +830,31 @@ NSString *_WebMainFrameURLKey = @"mainFrameURL";
 
 - (void)_didCommitLoadForFrame:(WebFrame *)frame
 {
-    if (frame == [self mainFrame])
+    if (frame == [self mainFrame]){
         [self _didChangeValueForKey: _WebMainFrameURLKey];
+    }
     [NSApp setWindowsNeedUpdate:YES];
 }
 
 - (void)_didFinishLoadForFrame:(WebFrame *)frame
 {
     [self _didChangeBackForwardKeys];
-    if (frame == [self mainFrame])
+    if (frame == [self mainFrame]){
+        // Force an observer update by sending a will/did.
+        [self _willChangeValueForKey: _WebIsLoadingKey];
         [self _didChangeValueForKey: _WebIsLoadingKey];
+    }
     [NSApp setWindowsNeedUpdate:YES];
 }
 
 - (void)_didFailLoadWithError:(NSError *)error forFrame:(WebFrame *)frame
 {
     [self _didChangeBackForwardKeys];
-    if (frame == [self mainFrame])
+    if (frame == [self mainFrame]){
+        // Force an observer update by sending a will/did.
+        [self _willChangeValueForKey: _WebIsLoadingKey];
         [self _didChangeValueForKey: _WebIsLoadingKey];
+    }
     [NSApp setWindowsNeedUpdate:YES];
 }
 
@@ -852,7 +862,10 @@ NSString *_WebMainFrameURLKey = @"mainFrameURL";
 {
     [self _didChangeBackForwardKeys];
     if (frame == [self mainFrame]){
+        // Force an observer update by sending a will/did.
+        [self _willChangeValueForKey: _WebIsLoadingKey];
         [self _didChangeValueForKey: _WebIsLoadingKey];
+        
         [self _didChangeValueForKey: _WebMainFrameURLKey];
     }
     [NSApp setWindowsNeedUpdate:YES];

-- 
WebKit Debian packaging