diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2009-07-25 17:48:02 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2009-07-25 17:48:02 -0700 |
| commit | 9affe0ab6ef3bb4844d816fad644313cea9a9023 (patch) | |
| tree | bed7d10716109e7ac19386813ba77c558e38faa2 /WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp | |
| parent | 3199981a0522022c71eb4e5a656f254b722d9713 (diff) | |
| parent | b116c1a08412db8a748998c7e8a2ce851cbacacd (diff) | |
| download | external_webkit-9affe0ab6ef3bb4844d816fad644313cea9a9023.zip external_webkit-9affe0ab6ef3bb4844d816fad644313cea9a9023.tar.gz external_webkit-9affe0ab6ef3bb4844d816fad644313cea9a9023.tar.bz2 | |
Merge korg/donut into korg/master
Diffstat (limited to 'WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp')
| -rw-r--r-- | WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp index a99fedd..d8d45fe 100644 --- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp +++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp @@ -569,7 +569,13 @@ void FrameLoaderClientAndroid::finishedLoading(DocumentLoader* docLoader) { void FrameLoaderClientAndroid::updateGlobalHistory() { ASSERT(m_frame); ASSERT(m_frame->loader()->documentLoader()); - m_webFrame->updateVisitedHistory(m_frame->loader()->documentLoader()->urlForHistory(), false); + KURL url; + DocumentLoader* loader = m_frame->loader()->documentLoader(); + if (loader->urlForHistoryReflectsServerRedirect()) + url = loader->url(); + else + url = loader->urlForHistory(); + m_webFrame->updateVisitedHistory(url, false); } void FrameLoaderClientAndroid::updateGlobalHistoryForRedirectWithoutHistoryItem() { |