summaryrefslogtreecommitdiffstats
path: root/WebCore/loader
diff options
context:
space:
mode:
authorPatrick Scott <phanna@android.com>2009-09-30 08:32:50 -0400
committerPatrick Scott <phanna@android.com>2009-09-30 08:44:48 -0400
commitc8238eccbdd8de109a5d7c28b514ee36033ed4ba (patch)
treedb92e9333a6a63781ef8aa7ee351bdd841043cc1 /WebCore/loader
parent14e3d9bdf2270d399bae78946e3efe62a6c6c373 (diff)
downloadexternal_webkit-c8238eccbdd8de109a5d7c28b514ee36033ed4ba.zip
external_webkit-c8238eccbdd8de109a5d7c28b514ee36033ed4ba.tar.gz
external_webkit-c8238eccbdd8de109a5d7c28b514ee36033ed4ba.tar.bz2
Fix the user gesture change to be more like donut.
Bug: 2151004
Diffstat (limited to 'WebCore/loader')
-rw-r--r--WebCore/loader/FrameLoader.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index 5c81cfc..8e8540d 100644
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -519,6 +519,9 @@ void FrameLoader::submitForm(const char* action, const String& url, PassRefPtr<F
}
FrameLoadRequest frameRequest;
+#ifdef ANDROID_USER_GESTURE
+ frameRequest.resourceRequest().setUserGesture(isProcessingUserGesture());
+#endif
String targetOrBaseTarget = target.isEmpty() ? m_frame->document()->baseTarget() : target;
Frame* targetFrame = findFrameForNavigation(targetOrBaseTarget);
@@ -1538,7 +1541,7 @@ void FrameLoader::loadURLIntoChildFrame(const KURL& url, const String& referer,
else
#endif
#ifdef ANDROID_USER_GESTURE
- childFrame->loader()->loadURL(workingURL, referer, String(), false, childLoadType, 0, 0, true);
+ childFrame->loader()->loadURL(workingURL, referer, String(), false, childLoadType, 0, 0, false);
#else
childFrame->loader()->loadURL(workingURL, referer, String(), false, childLoadType, 0, 0);
#endif