summaryrefslogtreecommitdiffstats
path: root/Source/WebKit/android/jni/WebViewCore.h
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2012-05-24 18:15:40 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-24 18:15:40 -0700
commite0d7d53d0af7715347bc694de7b140773174149e (patch)
treec423f0dbde9d6ec9d60495d4096a04f94059b369 /Source/WebKit/android/jni/WebViewCore.h
parent3551374e25ca65d153ff3c3ffe7f7c79095d6025 (diff)
parent8959907b97e269d7183d4817f295234718b41365 (diff)
downloadexternal_webkit-e0d7d53d0af7715347bc694de7b140773174149e.zip
external_webkit-e0d7d53d0af7715347bc694de7b140773174149e.tar.gz
external_webkit-e0d7d53d0af7715347bc694de7b140773174149e.tar.bz2
am 8959907b: am 91f41286: Support skipping a touch stream due to lack of handlers
* commit '8959907b97e269d7183d4817f295234718b41365': Support skipping a touch stream due to lack of handlers
Diffstat (limited to 'Source/WebKit/android/jni/WebViewCore.h')
-rw-r--r--Source/WebKit/android/jni/WebViewCore.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/WebKit/android/jni/WebViewCore.h b/Source/WebKit/android/jni/WebViewCore.h
index 8dc782f..221b012 100644
--- a/Source/WebKit/android/jni/WebViewCore.h
+++ b/Source/WebKit/android/jni/WebViewCore.h
@@ -323,8 +323,11 @@ namespace android {
/**
* Handle touch event
+ * Returns an int with the following flags:
+ * bit 0: hit an event handler
+ * bit 1: preventDefault was called
*/
- bool handleTouchEvent(int action, WTF::Vector<int>& ids,
+ int handleTouchEvent(int action, WTF::Vector<int>& ids,
WTF::Vector<WebCore::IntPoint>& points,
int actionIndex, int metaState);