WebCore:
authorbeidson@apple.com <beidson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 3 Mar 2009 19:08:56 +0000 (19:08 +0000)
committerbeidson@apple.com <beidson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 3 Mar 2009 19:08:56 +0000 (19:08 +0000)
commitcbbf030e2d618ff2c3547de30ecd2fcaf099c58e
treecf664af85019a7c8b5796dce5bd58d0014d7d789
parentc1901e16e8db187727f161d4cceed664a63117ac
WebCore:

2009-03-03  Brady Eidson  <beidson@apple.com>

        Reviewed by Darin Adler

        <rdar://problem/6616664> - Quick looks of various file types is broken

        In http://trac.webkit.org/changeset/40553 there was an attempt to prevent NSURLRequest churn
        for non-HTTP loads when the underlying ResourceRequest changed.  Unfortunately it was a little
        overzealous as the mainDocumentURL is relevant for all loads, not only HTTP/HTTPS loads.

        Partially reverted behavior to always set the mainDocumentURL in situations when we would've
        before that patch.

        * loader/FrameLoader.cpp:
        (WebCore::FrameLoader::addExtraFieldsToRequest):

        * platform/network/ResourceRequestBase.cpp:
        (WebCore::ResourceRequestBase::setMainDocumentURL):

WebKitTools:

2009-03-03  Brady Eidson  <beidson@apple.com>

        Reviewed by Darin Adler

        Support layout test covering <rdar://problem/6616664>

        Change NSURLRequest/IWebURLRequest dumping to include the mainDocumentURL

        * DumpRenderTree/mac/ResourceLoadDelegate.mm:
        (-[NSURLRequest _drt_descriptionSuitableForTestResult]): Return both the request URL and the
          mainDocumentURL.

        * DumpRenderTree/win/ResourceLoadDelegate.cpp:
        (descriptionSuitableForTestResult): Return both the request URL and the mainDocumentURL.

LayoutTests:

2009-03-03  Brady Eidson  <beidson@apple.com>

        Reviewed by Darin Adler

        Layout test covering <rdar://problem/6616664> - Quick looks of various file types is broken

        Added to test the changes:
        * fast/loader/main-document-url-for-non-http-loads-expected.txt: Added.
        * fast/loader/main-document-url-for-non-http-loads.html: Added.
        * fast/loader/resources/subframe-notify-done.html: Added.

        Updated the following for the new info from dumpResourceLoadCallbacks():
        * http/tests/misc/window-dot-stop-expected.txt:
        * http/tests/xmlhttprequest/abort-should-cancel-load-expected.txt:
        * platform/mac-leopard/security/block-test-expected.txt:
        * platform/mac-tiger/http/tests/misc/willCacheResponse-delegate-callback-expected.txt:
        * platform/mac/http/tests/misc/willCacheResponse-delegate-callback-expected.txt:
        * platform/mac/webarchive/loading/cache-expired-subresource-expected.txt:
        * security/block-test-expected.txt:
        * webarchive/loading/test-loading-archive-expected.txt:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@41398 268f45cc-cd09-0410-ab3c-d52691b4dbfc
18 files changed:
LayoutTests/ChangeLog
LayoutTests/fast/loader/main-document-url-for-non-http-loads-expected.txt [new file with mode: 0644]
LayoutTests/fast/loader/main-document-url-for-non-http-loads.html [new file with mode: 0644]
LayoutTests/fast/loader/resources/subframe-notify-done.html [new file with mode: 0644]
LayoutTests/http/tests/misc/window-dot-stop-expected.txt
LayoutTests/http/tests/xmlhttprequest/abort-should-cancel-load-expected.txt
LayoutTests/platform/mac-leopard/security/block-test-expected.txt
LayoutTests/platform/mac-tiger/http/tests/misc/willCacheResponse-delegate-callback-expected.txt
LayoutTests/platform/mac/http/tests/misc/willCacheResponse-delegate-callback-expected.txt
LayoutTests/platform/mac/webarchive/loading/cache-expired-subresource-expected.txt
LayoutTests/security/block-test-expected.txt
LayoutTests/webarchive/loading/test-loading-archive-expected.txt
WebCore/ChangeLog
WebCore/loader/FrameLoader.cpp
WebCore/platform/network/ResourceRequestBase.cpp
WebKitTools/ChangeLog
WebKitTools/DumpRenderTree/mac/ResourceLoadDelegate.mm
WebKitTools/DumpRenderTree/win/ResourceLoadDelegate.cpp