diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-04 14:17:46 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-04 14:17:46 -0700 |
| commit | 3df5c413a68315c2771082a8e2deb3bdf814d6d9 (patch) | |
| tree | 58f6b45181342e34b1e357a69b7d5a91767a708e | |
| parent | a867814021aa8ded5698353a900bae42fb816402 (diff) | |
| parent | 48c46b2d3efc59f2883218d8e713d403b658ff2b (diff) | |
| download | external_webkit-3df5c413a68315c2771082a8e2deb3bdf814d6d9.zip external_webkit-3df5c413a68315c2771082a8e2deb3bdf814d6d9.tar.gz external_webkit-3df5c413a68315c2771082a8e2deb3bdf814d6d9.tar.bz2 | |
Merge change 3212
* changes:
resolved conflicts for merge of d88ddb to master
| -rw-r--r-- | WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp index d312fb6..274280e 100644 --- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp +++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp @@ -577,6 +577,8 @@ void FrameLoaderClientAndroid::updateGlobalHistory() { if (docLoader->unreachableURL().isEmpty() && docLoader->response().httpStatusCode() < 400) { m_webFrame->updateVisitedHistory(docLoader->urlForHistory(), false); + if (!docLoader->serverRedirectSourceForHistory().isNull()) + m_webFrame->updateVisitedHistory(KURL(docLoader->serverRedirectDestinationForHistory()), false); } } |