diff options
| -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 8e6050f..2424820 100644 --- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt +++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt @@ -1198,7 +1198,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 @@ -1346,6 +1346,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 + // Passes when run by itself. Fails on the buildbot. // For Windows, see bug 8291. LINUX WIN : LayoutTests/fast/css/beforeSelectorOnCodeElement.html = CRASH PASS |