Fix by Trey Matteson, reviewed by Maciej.
authorap <ap@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 31 Mar 2006 20:30:07 +0000 (20:30 +0000)
committerap <ap@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 31 Mar 2006 20:30:07 +0000 (20:30 +0000)
commit20de27365ad7277022fcf16f9e179f200c9446bc
tree1edeedd23b4c9096369cca8a60fc62fc34fde046
parentbc49237f5dc2532ba17d4ae4bbfef07867983c6e
    Fix by Trey Matteson, reviewed by Maciej.

        http://bugzilla.opendarwin.org/show_bug.cgi?id=7739
        REGRESSION: Assertion failure loading acid2 test in -[WebCoreFrameBridge installInFrame:]

        Tests: http/tests/misc/acid2.html, http/tests/misc/acid2-pixel.html

        The gist of this change is that we must cancel the load from the Webkit side when we
        realize we're switching to the fallback content.  This is somewhat a temp workaround
        since control of loading will be moving to WebCore.

        * WebView/WebMainResourceLoader.m:
        (-[WebMainResourceLoader continueAfterContentPolicy:response:]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@13615 268f45cc-cd09-0410-ab3c-d52691b4dbfc
LayoutTests/ChangeLog
LayoutTests/http/tests/misc/acid2-expected.checksum [new file with mode: 0644]
LayoutTests/http/tests/misc/acid2-expected.png [new file with mode: 0644]
LayoutTests/http/tests/misc/acid2-expected.txt [new file with mode: 0644]
LayoutTests/http/tests/misc/acid2-pixel-expected.checksum [new file with mode: 0644]
LayoutTests/http/tests/misc/acid2-pixel-expected.png [new file with mode: 0644]
LayoutTests/http/tests/misc/acid2-pixel-expected.txt [new file with mode: 0644]
LayoutTests/http/tests/misc/acid2-pixel.html [new file with mode: 0644]
LayoutTests/http/tests/misc/acid2.html [new file with mode: 0644]
WebKit/ChangeLog
WebKit/WebView/WebMainResourceLoader.m