diff options
| author | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-10 19:42:48 +0000 |
|---|---|---|
| committer | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-10 19:42:48 +0000 |
| commit | fa3d4049583ff0d7f8f5467ed45e456beb34c0b3 (patch) | |
| tree | f7aca87c254885d96581bbb7b274c96e72c9a62c | |
| parent | 31b1bc3aee74415fc8333f537da2dde64f0e08f9 (diff) | |
| download | chromium_src-fa3d4049583ff0d7f8f5467ed45e456beb34c0b3.zip chromium_src-fa3d4049583ff0d7f8f5467ed45e456beb34c0b3.tar.gz chromium_src-fa3d4049583ff0d7f8f5467ed45e456beb34c0b3.tar.bz2 | |
Reverting 11357.
Reverting 11357 as the layout test still fails
Review URL: http://codereview.chromium.org/42032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11365 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/glue/webframe_impl.cc | 2 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_lists/tests_fixable.txt | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc index 4894a7d..bf4fb03 100644 --- a/webkit/glue/webframe_impl.cc +++ b/webkit/glue/webframe_impl.cc @@ -492,7 +492,7 @@ bool WebFrameImpl::GetPreviousHistoryState(std::string* history_state) const { // is expected to query the history state after a navigation occurs, after // the desired history item has become the previous entry. RefPtr<HistoryItem> item = webview_impl_->GetPreviousHistoryItem(); - if (!item) + if (!item || item->lastVisitWasFailure()) return false; static StatsCounterTimer history_timer("GetHistoryTimer"); diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt index 7ffd06b..8faec31 100644 --- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt +++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt @@ -1214,7 +1214,7 @@ MAC : LayoutTests/fast/events/init-events.html = FAIL // maybe we just need to update to this order? MAC : LayoutTests/fast/events/drag-in-frames.html = FAIL -// These two have a different object type in the dom dump. Plugin-related. +// These two have a different object type in the dom dump. Plugin-related. // Ignored on Win/Linux because they rely on QT to provide a TIFF decoder. MAC : LayoutTests/fast/images/embed-image.html = FAIL MAC : LayoutTests/fast/images/object-image.html = FAIL @@ -1362,6 +1362,9 @@ LINUX MAC : LayoutTests/fast/transforms/transformed-focused-text-input.html = FA // TODO(tc): flaky. LINUX : LayoutTests/fast/events/5056619.html = PASS FAIL +// Failed with r6844 (dglazkov) +LayoutTests/http/tests/navigation/error404-goback.html = FAIL + // Started failing when landing the new skia r6925. WIN : LayoutTests/fast/lists/w3-list-styles.html = FAIL |