[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 1359f4c21a61c64314f6271d3bcbb3d183f97806
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jun 12 00:22:51 2003 +0000

    	Fixed: <rdar://problem/3289380>: REGRESSION: policyDataSource == nil assertion failure after closing particular window
    
            Reviewed by john.
    
            * WebView.subproj/WebFramePrivate.m:
            (-[WebFrame _continueAfterNavigationPolicy:]): don't clear policyDataSource here because this method may not be called during navigation
            (-[WebFrame _continueLoadRequestAfterNavigationPolicy:formState:]): clear policyDataSource here
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4526 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 618cd15..68ee842 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,15 @@
 2003-06-11  Chris Blumenberg  <cblu at apple.com>
 
+	Fixed: <rdar://problem/3289380>: REGRESSION: policyDataSource == nil assertion failure after closing particular window
+
+        Reviewed by john.
+
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _continueAfterNavigationPolicy:]): don't clear policyDataSource here because this method may not be called during navigation
+        (-[WebFrame _continueLoadRequestAfterNavigationPolicy:formState:]): clear policyDataSource here 
+
+2003-06-11  Chris Blumenberg  <cblu at apple.com>
+
 	Fixed: <rdar://problem/3288097>: REGRESSION: assertion failure after hitting back while loading page after fragment scroll
 
         Fixed by darin, reviewed by me.
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 155e30d..3c2a080 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -1574,8 +1574,6 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
     }
 
     [target performSelector:selector withObject:(shouldContinue ? request : nil) withObject:formState];
-
-    [self _setPolicyDataSource:nil];
 }
 
 -(void)_continueFragmentScrollAfterNavigationPolicy:(NSURLRequest *)request formState:(WebFormState *)formState
@@ -2056,6 +2054,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
     ASSERT(_private->policyDataSource);
     
     if (!request) {
+        [self _setPolicyDataSource:nil];
         return;
     }
 
@@ -2064,6 +2063,8 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
     [self stopLoading];
     [self _setLoadType:loadType];
     [self _setProvisionalDataSource:_private->policyDataSource];
+
+    [self _setPolicyDataSource:nil];
     
     // We tell the documentView provisionalDataSourceChanged:
     // once it has been created by the WebView.

-- 
WebKit Debian packaging