Commit 2d55e968 authored by andersca's avatar andersca
Browse files

LayoutTests:

        Reviewed by John Sullivan.

        Update result, we shouldn't call didFinishLoadForFrame if the URL isn't valid.
        
        * http/tests/loading/bad-scheme-subframe-expected.txt:

WebCore:

        Reviewed by John Sullivan.

        <rdar://problem/5277008> Assertion in [LocationChangeHandler finishedLoadingFrame:]
        
        Don't send any frame load callbacks if the document load hasn't been
        committed for real.
        
        * loader/FrameLoader.cpp:
        (WebCore::FrameLoader::checkLoadCompleteForThisFrame):

WebKitTools:

        Reviewed by John Sullivan.

        Assert that the frame has a dataSource.
        
        * DumpRenderTree/FrameLoadDelegate.m:
        (-[FrameLoadDelegate webView:didFinishLoadForFrame:]):



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@23577 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent b8d23237
2007-06-18 Anders Carlsson <andersca@apple.com>
Reviewed by John Sullivan.
Update result, we shouldn't call didFinishLoadForFrame if the URL isn't valid.
* http/tests/loading/bad-scheme-subframe-expected.txt:
2007-06-18 Sam Weinig <sam@webkit.org>
 
Reviewed by Geoff.
main frame - didStartProvisionalLoadForFrame
main frame - didFirstLayoutInFrame
main frame - willCloseFrame
main frame - didCommitLoadForFrame
main frame - didClearWindowObjectForFrame
frame "f1" - didClearWindowObjectForFrame
main frame - didFinishDocumentLoadForFrame
frame "f1" - didFirstLayoutInFrame
frame "f1" - didFinishLoadForFrame
main frame - didFinishLoadForFrame
main frame - didFirstLayoutInFrame
This is a test of load callbacks. It is only useful inside the regression test tool.
......
2007-06-18 Anders Carlsson <andersca@apple.com>
Reviewed by John Sullivan.
<rdar://problem/5277008> Assertion in [LocationChangeHandler finishedLoadingFrame:]
Don't send any frame load callbacks if the document load hasn't been
committed for real.
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::checkLoadCompleteForThisFrame):
2007-06-18 Sam Weinig <sam@webkit.org>
 
Reviewed by Geoff.
......@@ -2778,7 +2778,7 @@ void FrameLoader::checkLoadCompleteForThisFrame()
&& m_frame->page() && m_frame->page()->backForwardList())
restoreScrollPositionAndViewState();
if (m_creatingInitialEmptyDocument)
if (m_creatingInitialEmptyDocument || !m_committedFirstRealDocumentLoad)
return;
const ResourceError& error = dl->mainDocumentError();
......
2007-06-18 Anders Carlsson <andersca@apple.com>
Reviewed by John Sullivan.
Assert that the frame has a dataSource.
* DumpRenderTree/FrameLoadDelegate.m:
(-[FrameLoadDelegate webView:didFinishLoadForFrame:]):
2007-06-18 Adam Treat <adam@staikos.net>
Reviewed by George.
......
......@@ -157,6 +157,9 @@ - (void)webView:(WebView *)sender didFailProvisionalLoadWithError:(NSError *)err
- (void)webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame
{
ASSERT([frame dataSource]);
ASSERT(frame == [[frame dataSource] webFrame]);
if (shouldDumpFrameLoadCallbacks && !done) {
NSString *string = [NSString stringWithFormat:@"%@ - didFinishLoadForFrame", [frame _drt_descriptionSuitableForTestResult]];
printf ("%s\n", [string UTF8String]);
......
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