diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-08 14:51:42 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-08 14:51:42 -0400 |
| commit | cb964215003240df4826e49f411f9a84ac582725 (patch) | |
| tree | f2bb453ab718ed78c3ffac1d7c0413f5a648954a /WebCore | |
| parent | c58bba378aa071d21ea37958f715cdd23f956924 (diff) | |
| parent | 6b6403731606a6dcd6a2a6d60a799369924f88d6 (diff) | |
| download | external_webkit-cb964215003240df4826e49f411f9a84ac582725.zip external_webkit-cb964215003240df4826e49f411f9a84ac582725.tar.gz external_webkit-cb964215003240df4826e49f411f9a84ac582725.tar.bz2 | |
Merge change I6b640373 into eclair-mr2
* changes:
Fix bug 2132969
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 8e8540d..c28040f 100644 --- a/WebCore/loader/FrameLoader.cpp +++ b/WebCore/loader/FrameLoader.cpp @@ -3907,7 +3907,14 @@ void FrameLoader::continueFragmentScrollAfterNavigationPolicy(const ResourceRequ KURL url = request.url(); m_documentLoader->replaceRequestURLForAnchorScroll(url); +#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 + if (!isRedirect && !shouldTreatURLAsSameAsCurrent(url) + && (isProcessingUserGesture() || request.getUserGesture())) { +#else if (!isRedirect && !shouldTreatURLAsSameAsCurrent(url)) { +#endif // NB: must happen after _setURL, since we add based on the current request. // Must also happen before we openURL and displace the scroll position, since // adding the BF item will save away scroll state. |