WebCore/ChangeLog

2010-09-16  Jacob Dinu  <dinu.jacob@nokia.com>

        Reviewed by Adam Barth.

        When loading a cached page, dispatchDidCommitLoad is called after FrameLoader::open so

        that all initialzations are done before calling client dispatchDidCommitLoad to avoid

        client from accessing incorrect data.

        https://bugs.webkit.org/show_bug.cgi?id=41155

        * loader/FrameLoader.cpp:

        (WebCore::FrameLoader::commitProvisionalLoad):

        (WebCore::FrameLoader::transitionToCommitted):

2010-09-16  Thomas Zander <t.zander@nokia.com>

        Reviewed by Andreas Kling.

67657

WebCore/loader/FrameLoader.cpp

@@void FrameLoader::commitProvisionalLoad(

    if (cachedPage && cachedPage->document()) {

        prepareForCachedPageRestore();

        cachedPage->restore(m_frame->page());

        dispatchDidCommitLoad();

        // If we have a title let the WebView know about it. 

        String title = m_documentLoader->title();

        if (!title.isNull()) 

            m_client->dispatchDidReceiveTitle(title);

        checkCompleted();

    } else {        

        KURL url = pdl->substituteData().responseURL();

@@void FrameLoader::transitionToCommitted(

    // Handle adding the URL to the back/forward list.

    DocumentLoader* dl = m_documentLoader.get();

1931 String ptitle = dl->title();

    switch (m_loadType) {

        case FrameLoadTypeForward:

@@void FrameLoader::transitionToCommitted(

    if (!m_client->hasHTMLView())

        receivedFirstData();

    else if (cachedPage) {

        // For non-cached HTML pages, these methods are called in receivedFirstData().

        dispatchDidCommitLoad();

        // If we have a title let the WebView know about it. 

        if (!ptitle.isNull()) 

            m_client->dispatchDidReceiveTitle(ptitle);         

    }

}

void FrameLoader::clientRedirectCancelledOrFinished(bool cancelWithLoadInProgress)

67622

WebKit/qt/ChangeLog

2010-09-16  Jacob Dinu  <dinu.jacob@nokia.com>

        Reviewed by Adam Barth.

        Added a new qwebpage test for loading a cached page

        https://bugs.webkit.org/show_bug.cgi?id=41155

        * tests/qwebpage/tst_qwebpage.cpp:

        (tst_QWebPage::loadCachedPage):

2010-09-16  Darin Adler  <darin@apple.com>

        Fix build.

67657

WebKit/qt/tests/qwebpage/tst_qwebpage.cpp

@@private slots:

    void backActionUpdate();

    void frameAt();

    void requestCache();

100 void loadCachedPage();

    void protectBindingsRuntimeObjectsFromCollector();

    void localURLSchemes();

    void testOptionalJSObjects();

@@void tst_QWebPage::requestCache()

             (int)QNetworkRequest::PreferCache);

}

void tst_QWebPage::loadCachedPage()

{

    TestPage page;

    QSignalSpy loadSpy(&page, SIGNAL(loadFinished(bool)));

    page.settings()->setMaximumPagesInCache(3);

    page.mainFrame()->load(QUrl("data:text/html,This is first page"));

    QTRY_COMPARE(loadSpy.count(), 1);

    QTRY_COMPARE(page.navigations.count(), 1);

    QUrl firstPageUrl = page.mainFrame()->url();

    page.mainFrame()->load(QUrl("data:text/html,This is second page"));

    QTRY_COMPARE(loadSpy.count(), 2);

    QTRY_COMPARE(page.navigations.count(), 2);

    page.triggerAction(QWebPage::Stop);

    QVERIFY(page.history()->canGoBack());

    QSignalSpy urlSpy(page.mainFrame(), SIGNAL(urlChanged(QUrl)));

    QVERIFY(urlSpy.isValid());

    page.triggerAction(QWebPage::Back);

    ::waitForSignal(page.mainFrame(), SIGNAL(urlChanged(QUrl)));

    QCOMPARE(urlSpy.size(), 1);

    QList<QVariant> arguments1 = urlSpy.takeFirst();

    QCOMPARE(arguments1.at(0).toUrl(), firstPageUrl);

}

void tst_QWebPage::backActionUpdate()

{

    QWebView view;

67622