diff options
| author | Patrick Scott <phanna@android.com> | 2009-06-04 16:51:50 -0400 |
|---|---|---|
| committer | Patrick Scott <phanna@android.com> | 2009-06-04 17:16:26 -0400 |
| commit | 48c46b2d3efc59f2883218d8e713d403b658ff2b (patch) | |
| tree | c23c5b1313de33908e9ddf97a32ee92ed1a030d8 | |
| parent | 08ccebc1045cc42af60d01c19ce6ce27ca616604 (diff) | |
| parent | d88ddb512f90bbb26b918b3e0bcebf5a636ba19b (diff) | |
| download | external_webkit-48c46b2d3efc59f2883218d8e713d403b658ff2b.zip external_webkit-48c46b2d3efc59f2883218d8e713d403b658ff2b.tar.gz external_webkit-48c46b2d3efc59f2883218d8e713d403b658ff2b.tar.bz2 | |
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); } } |