Commit 3795ae7e authored by trey's avatar trey
Browse files

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
parent 80844874
2002-11-13 Trey Matteson <trey@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@apple.com>
 
- fixed 3100013 -- REGRESSION: Can't get results from i-Bench anymore
......
2002-11-13 Trey Matteson <trey@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@apple.com>
 
- fixed 3100013 -- REGRESSION: Can't get results from i-Bench anymore
......
......@@ -425,11 +425,11 @@ -(void)_commitIfReady
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 @@ -(void)_makeRepresentation
}
[_private->representation setDataSource:self];
[[[self webFrame] webView] _makeDocumentViewForDataSource:self];
}
-(void)_receivedData:(NSData *)data
......
......@@ -440,11 +440,15 @@ - (void)_transitionToCommitted
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 @@ - (void)_transitionToCommitted
// 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 @@ - (void)_transitionToCommitted
ASSERT([[self parent]->_private currentItem]);
[[[self parent]->_private currentItem] addChildItem:item];
[item release];
[[self webView] _makeDocumentViewForDataSource:ds];
}
break;
......@@ -481,7 +487,9 @@ - (void)_transitionToCommitted
}
}
// 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.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment