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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 075f8406086a2c1d81419fe53b6eb0287ba82247
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 18 07:47:20 2002 +0000

    	Some refactoring in preparation for the KHTMLPart change.
    
            * WebView.subproj/WebDataSourcePrivate.h,
    	WebView.subproj/WebDataSourcePrivate.m:
            (-[WebDataSource _stopLoading]): Bail early if not loading.
            (-[WebDataSource _commit]): Method to mark when the data source is
    	committed (it now knows whether it's committed or
    	provisional). This will be useful for adding assertions later on
    	about what operations may happen only when committed, and which
    	can only happen when provisional.
    
    	* WebView.subproj/WebFramePrivate.m:
            (-[WebFrame _transitionProvisionalToCommitted]): Call data
    	source's _commit method.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1585 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 4db3605..f5858aa 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,20 @@
+2002-07-18  Maciej Stachowiak  <mjs at apple.com>
+
+	Some refactoring in preparation for the KHTMLPart change.
+	
+        * WebView.subproj/WebDataSourcePrivate.h,
+	WebView.subproj/WebDataSourcePrivate.m:
+        (-[WebDataSource _stopLoading]): Bail early if not loading.
+        (-[WebDataSource _commit]): Method to mark when the data source is
+	committed (it now knows whether it's committed or
+	provisional). This will be useful for adding assertions later on
+	about what operations may happen only when committed, and which
+	can only happen when provisional.
+
+	* WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _transitionProvisionalToCommitted]): Call data
+	source's _commit method.
+
 2002-07-17  Richard Williamson  <rjw at apple.com>
 
         * WebView.subproj/WebHTMLView.m:
@@ -7,7 +24,7 @@
 
 	Some refactoring in preparation for the KHTMLPart change.
 	
-        * WebView.subproj/WebController.m: 
+        * WebView.subproj/WebController.m:
 	(-[WebController haveContentPolicy:andPath:forDataSource:]): Move
 	more of the work of creating and setting the representation and
 	document view into WebDataSource and WebView.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 4db3605..f5858aa 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,20 @@
+2002-07-18  Maciej Stachowiak  <mjs at apple.com>
+
+	Some refactoring in preparation for the KHTMLPart change.
+	
+        * WebView.subproj/WebDataSourcePrivate.h,
+	WebView.subproj/WebDataSourcePrivate.m:
+        (-[WebDataSource _stopLoading]): Bail early if not loading.
+        (-[WebDataSource _commit]): Method to mark when the data source is
+	committed (it now knows whether it's committed or
+	provisional). This will be useful for adding assertions later on
+	about what operations may happen only when committed, and which
+	can only happen when provisional.
+
+	* WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _transitionProvisionalToCommitted]): Call data
+	source's _commit method.
+
 2002-07-17  Richard Williamson  <rjw at apple.com>
 
         * WebView.subproj/WebHTMLView.m:
@@ -7,7 +24,7 @@
 
 	Some refactoring in preparation for the KHTMLPart change.
 	
-        * WebView.subproj/WebController.m: 
+        * WebView.subproj/WebController.m:
 	(-[WebController haveContentPolicy:andPath:forDataSource:]): Move
 	more of the work of creating and setting the representation and
 	document view into WebDataSource and WebView.
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.h b/WebKit/WebView.subproj/WebDataSourcePrivate.h
index 39c699b..2f201ad 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.h
@@ -67,6 +67,8 @@
     WebContentPolicy contentPolicy;
 
     BOOL loading; // self and controller are retained while loading
+
+    BOOL committed; // This data source has been committed
 }
 
 @end
@@ -104,4 +106,6 @@
 // Convenience interface for getting here from an WebDataSource.
 // This returns nil if the representation is not an WebHTMLRepresentation.
 - (WebBridge *)_bridge;
+
+- (void)_commit;
 @end
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 271602c..fdafd56 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -194,6 +194,10 @@
     int i, count;
     WebResourceHandle *handle;
 
+    if (!_private->loading) {
+	return;
+    }
+
     _private->stopping = YES;
     
     [_private->mainHandle cancelLoadInBackground];
@@ -407,4 +411,9 @@
     return [representation respondsToSelector:@selector(_bridge)] ? [representation _bridge] : nil;
 }
 
+-(void)_commit
+{
+    _private->committed = TRUE;
+}
+
 @end
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 465b3d4..6dbf212 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -223,11 +223,13 @@ static const char * const stateNames[6] = {
 
             // Set the committed data source on the frame.
             [self _setDataSource: _private->provisionalDataSource];
-            
+
+            [_private->provisionalDataSource _commit];
+
             // provisionalDataSourceCommitted: will reset the view and begin trying to
             // display the new new datasource.
             [documentView provisionalDataSourceCommitted: _private->provisionalDataSource];
- 
+
             // Now that the provisional data source is committed, release it.
             [_private setProvisionalDataSource: nil];
         

-- 
WebKit Debian packaging