summaryrefslogtreecommitdiffstats
path: root/WebCore/loader/FrameLoader.cpp
diff options
context:
space:
mode:
authorPatrick Scott <phanna@android.com>2010-03-23 16:27:00 -0400
committerPatrick Scott <phanna@android.com>2010-03-23 16:27:00 -0400
commit93344fe93e06bba98be73ae30e42e5b59277ef5a (patch)
tree6a398ba6cc37c1d5850a14cb380f3b5d4adab973 /WebCore/loader/FrameLoader.cpp
parentbd150a788daef4180dc4d1afea9d7517b6721eff (diff)
downloadexternal_webkit-93344fe93e06bba98be73ae30e42e5b59277ef5a.zip
external_webkit-93344fe93e06bba98be73ae30e42e5b59277ef5a.tar.gz
external_webkit-93344fe93e06bba98be73ae30e42e5b59277ef5a.tar.bz2
Revert "Revive my change to not add anchor navigations to the history in some cases."
This reverts commit a6e5d463b2fbb6ad4e154719d6846231a32764a7.
Diffstat (limited to 'WebCore/loader/FrameLoader.cpp')
-rw-r--r--WebCore/loader/FrameLoader.cpp7
1 files changed, 0 insertions, 7 deletions
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index 945cd90..be782f1 100644
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -3502,14 +3502,7 @@ 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)