diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-07-15 16:46:22 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-07-15 16:46:22 +0100 |
| commit | bbe299e200c3fe5dbfd0696096de121f9057eb0d (patch) | |
| tree | aed7c96a697c4c677d4a392fdeca283d743b572d | |
| parent | ff80790be406da04e7afbd8aea7bb0e26f1f08f0 (diff) | |
| download | external_webkit-bbe299e200c3fe5dbfd0696096de121f9057eb0d.zip external_webkit-bbe299e200c3fe5dbfd0696096de121f9057eb0d.tar.gz external_webkit-bbe299e200c3fe5dbfd0696096de121f9057eb0d.tar.bz2 | |
Removing ANDROID_USER_GESTURE ifdef
As discussed on CL https://android-git.corp.google.com/g/#change,56717, removing the ifdef is a good thing as this is not a feature we want to turn on
and off.
Change-Id: Ic7a062e2bb15850ca17fcb46fbd25d786e08028d
| -rw-r--r-- | WebCore/config.h | 3 | ||||
| -rw-r--r-- | WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp | 5 | ||||
| -rw-r--r-- | WebKit/android/jni/WebCoreFrameBridge.cpp | 8 |
3 files changed, 1 insertions, 15 deletions
diff --git a/WebCore/config.h b/WebCore/config.h index 8af4fe9..9a3cd78 100644 --- a/WebCore/config.h +++ b/WebCore/config.h @@ -194,9 +194,6 @@ // apple-touch-icon support in <link> tags #define ANDROID_APPLE_TOUCH_ICON -// Checking if an action is user initiated or not -#define ANDROID_USER_GESTURE_CHECK - // Enable prefetching when specified via the rel element of <link> elements. #define ENABLE_LINK_PREFETCH 1 diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp index af74638..6495bb4 100644 --- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp +++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp @@ -127,11 +127,8 @@ float ChromeClientAndroid::scaleFactor() void ChromeClientAndroid::focus() { ASSERT(m_webFrame); -#ifdef ANDROID_USER_GESTURE_CHECK bool isUserGesture = UserGestureIndicator::processingUserGesture(); -#else - bool isUserGesture = true; -#endif + // Ask the application to focus this WebView if the action is intiated by the user if (isUserGesture) m_webFrame->requestFocus(); diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp index 7324173..f57a94f 100644 --- a/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -482,11 +482,7 @@ WebFrame::startLoadingResource(WebCore::ResourceHandle* loader, jstring jPasswordString = loaderInternal->m_pass.isEmpty() ? NULL : env->NewString(loaderInternal->m_pass.characters(), loaderInternal->m_pass.length()); -#ifdef ANDROID_USER_GESTURE_CHECK bool isUserGesture = UserGestureIndicator::processingUserGesture(); -#else - bool isUserGesture = true; -#endif jobject jLoadListener = env->CallObjectMethod(obj.get(), mJavaFrame->mStartLoadingResource, (int)loader, jUrlStr, jMethodStr, jHeaderMap, @@ -756,11 +752,7 @@ WebFrame::canHandleRequest(const WebCore::ResourceRequest& request) if (equalIgnoringCase(request.httpMethod(), "POST")) return true; WebCore::KURL requestUrl = request.url(); -#ifdef ANDROID_USER_GESTURE_CHECK bool isUserGesture = UserGestureIndicator::processingUserGesture(); -#else - bool isUserGesture = true; -#endif if (!mUserInitiatedClick && !isUserGesture && (requestUrl.protocolIs("http") || requestUrl.protocolIs("https") || requestUrl.protocolIs("file") || requestUrl.protocolIs("about") || |