diff options
| author | Patrick Scott <phanna@android.com> | 2010-03-03 11:05:39 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-03 11:05:39 -0800 |
| commit | c78ee2bd2860bd1afb920b35fe05d3a250146c45 (patch) | |
| tree | 597fcc9b39aa54a3b6e4f11bfe17e0428e3eb8e3 /WebCore | |
| parent | 4acd3ef4a110a488963ca204c9ceac640fa5b113 (diff) | |
| parent | a6e5d463b2fbb6ad4e154719d6846231a32764a7 (diff) | |
| download | external_webkit-c78ee2bd2860bd1afb920b35fe05d3a250146c45.zip external_webkit-c78ee2bd2860bd1afb920b35fe05d3a250146c45.tar.gz external_webkit-c78ee2bd2860bd1afb920b35fe05d3a250146c45.tar.bz2 | |
Merge "Revive my change to not add anchor navigations to the history in some cases."
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/loader/FrameLoader.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp index be782f1..945cd90 100644 --- a/WebCore/loader/FrameLoader.cpp +++ b/WebCore/loader/FrameLoader.cpp @@ -3502,7 +3502,14 @@ void FrameLoader::continueFragmentScrollAfterNavigationPolicy(const ResourceRequ return; bool isRedirect = m_quickRedirectComing || policyChecker()->loadType() == FrameLoadTypeRedirectWithLockedBackForwardList; +#ifdef ANDROID_USER_GESTURE + // Do not add history items for a fragment scroll not initiated by the + // user. http://bugs.webkit.org/show_bug.cgi?id=30224 + loadInSameDocument(request.url(), 0, !isRedirect && + (isProcessingUserGesture() || request.getUserGesture())); +#else loadInSameDocument(request.url(), 0, !isRedirect); +#endif } bool FrameLoader::shouldScrollToAnchor(bool isFormSubmission, FrameLoadType loadType, const KURL& url) |