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

[trey]

The following commit has been merged in the debian/unstable branch:
commit 3795ae7ea75abebefc95d6d0fad5e02d47323434
Author: trey <trey at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 13 22:13:46 2002 +0000

    	Fixed 3100084 - REGRESSION: web page is not first responder after visiting web page
    
            * WebView.subproj/WebDataSourcePrivate.m:
            (-[WebDataSource _commitIfReady]):  Make the rep before _transitionToCommitted.  This is the way it used to be.
            (-[WebDataSource _makeRepresentation]):  Don't make the docView here.
    
            * WebView.subproj/WebFramePrivate.m:
            (-[WebFrame _transitionToCommitted]):  Make the docView here, after we save the scroll state but before notifying the delegate.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2658 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 05516bd..1cef826 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2002-11-13  Trey Matteson  <trey at apple.com>
+
+	Fixed 3100084 - REGRESSION: web page is not first responder after visiting web page
+
+        * WebView.subproj/WebDataSourcePrivate.m:
+        (-[WebDataSource _commitIfReady]):  Make the rep before _transitionToCommitted.  This is the way it used to be.
+        (-[WebDataSource _makeRepresentation]):  Don't make the docView here.
+
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _transitionToCommitted]):  Make the docView here, after we save the scroll state but before notifying the delegate.
+
 2002-11-13  Darin Adler  <darin at apple.com>
 
 	- fixed 3100013 -- REGRESSION: Can't get results from i-Bench anymore
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 05516bd..1cef826 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,14 @@
+2002-11-13  Trey Matteson  <trey at apple.com>
+
+	Fixed 3100084 - REGRESSION: web page is not first responder after visiting web page
+
+        * WebView.subproj/WebDataSourcePrivate.m:
+        (-[WebDataSource _commitIfReady]):  Make the rep before _transitionToCommitted.  This is the way it used to be.
+        (-[WebDataSource _makeRepresentation]):  Don't make the docView here.
+
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _transitionToCommitted]):  Make the docView here, after we save the scroll state but before notifying the delegate.
+
 2002-11-13  Darin Adler  <darin at apple.com>
 
 	- fixed 3100013 -- REGRESSION: Can't get results from i-Bench anymore
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 7c3c65c..175f8d0 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -425,11 +425,11 @@
     if (![self isDownloading] && _private->gotFirstByte && !_private->committed) {
         LOG(Loading, "committed resource = %@", [[self request] URL]);
 	_private->committed = TRUE;
+        [self _makeRepresentation];
         [[self webFrame] _transitionToCommitted];
 	[[self _bridge] dataSourceChanged];
         // Must do this after dataSourceChanged.  makeRep installs a new view, which blows away
         // scroll state, which is saved within _transitionToCommitted
-        [self _makeRepresentation];
     }
 }
 
@@ -445,8 +445,6 @@
     }
 
     [_private->representation setDataSource:self];
-
-    [[[self webFrame] webView] _makeDocumentViewForDataSource:self];
 }
 
 -(void)_receivedData:(NSData *)data
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 7682ce7..21716e5 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -440,11 +440,15 @@ static const char * const stateNames[] = {
                 case WebFrameLoadTypeIndexedBackForward:
                     // Must grab the current scroll position before disturbing it
                     [self _saveScrollPositionToItem:[_private previousItem]];
+                    [[self webView] _makeDocumentViewForDataSource:ds];
+                    // FIXME - I'm not sure this call does anything.  Should be dealt with as
+                    // part of 3024377
                     [self _restoreScrollPosition];
                     break;
                     
                 case WebFrameLoadTypeReload:
                     [self _saveScrollPositionToItem:[_private currentItem]];
+                    [[self webView] _makeDocumentViewForDataSource:ds];
                     break;
     
                 case WebFrameLoadTypeStandard:
@@ -459,6 +463,7 @@ static const char * const stateNames[] = {
                         // update the URL in the BF list that we made before the redirect
                         [[[[self controller] backForwardList] currentEntry] setURL:[[ds request] URL]];
                     }
+                    [[self webView] _makeDocumentViewForDataSource:ds];
                     break;
                     
                 case WebFrameLoadTypeInternal:
@@ -468,6 +473,7 @@ static const char * const stateNames[] = {
                     ASSERT([[self parent]->_private currentItem]);
                     [[[self parent]->_private currentItem] addChildItem:item];
                     [item release];
+                    [[self webView] _makeDocumentViewForDataSource:ds];
                     }
                     break;
 
@@ -481,7 +487,9 @@ static const char * const stateNames[] = {
                 }
             }
 
+            
             // Tell the client we've committed this URL.
+            ASSERT([[self webView] documentView] != nil);
 	    [[[self controller] locationChangeDelegate] locationChangeCommittedForDataSource:ds];
             
             // If we have a title let the controller know about it.

-- 
WebKit Debian packaging