summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webframe_impl.cc
diff options
context:
space:
mode:
authorjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-11 17:31:40 +0000
committerjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-11 17:31:40 +0000
commit67adc80656447c9ff324cd01749fa5e9496b47f2 (patch)
tree14147964470bdecf2c9e6a7db723979367efdcb1 /webkit/glue/webframe_impl.cc
parent7f4302b1a7e2ac35b5e1e9cf5b831e8a08e6e5ce (diff)
downloadchromium_src-67adc80656447c9ff324cd01749fa5e9496b47f2.zip
chromium_src-67adc80656447c9ff324cd01749fa5e9496b47f2.tar.gz
chromium_src-67adc80656447c9ff324cd01749fa5e9496b47f2.tar.bz2
Relanding a backed-out CL:
The navigation entry's state would not be returned for navigation entries of error pages (such as 404). This was causing the following problems when navigating back to a 404 page in test shell: - a new entry to be created instead of going back to the existing entry - the navTarget property not to be set on the HistoryItem That was causing the LayoutTests/http/tests/navigation/error404-goback.html failure. It seems safe to return the navigation entry's state for an error page. BUG=None TBR=darin Review URL: http://codereview.chromium.org/43083 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11453 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webframe_impl.cc')
-rw-r--r--webkit/glue/webframe_impl.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc
index bf4fb03..4894a7d 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 || item->lastVisitWasFailure())
+ if (!item)
return false;
static StatsCounterTimer history_timer("GetHistoryTimer");