diff options
| author | Ben Murdoch <benm@google.com> | 2010-01-07 16:20:05 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-01-20 10:33:01 +0000 |
| commit | f5306da72ab6bb63f7ae07371e687f72a75c2fb2 (patch) | |
| tree | 34c3ada7bea43cd10fd036aad91a9bf2e7dbdc2d /WebKit/android/WebCoreSupport | |
| parent | efd3d8ad1e5b1af7b31f8a9569df0b8568cdb52b (diff) | |
| download | external_webkit-f5306da72ab6bb63f7ae07371e687f72a75c2fb2.zip external_webkit-f5306da72ab6bb63f7ae07371e687f72a75c2fb2.tar.gz external_webkit-f5306da72ab6bb63f7ae07371e687f72a75c2fb2.tar.bz2 | |
Refactor our touch event code to use the version submitted to webkit.org by the Qt team.
Change-Id: I2953472cee68aadf18f9dd740e9b3f69ad729cf0
Diffstat (limited to 'WebKit/android/WebCoreSupport')
| -rw-r--r-- | WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp | 10 | ||||
| -rw-r--r-- | WebKit/android/WebCoreSupport/ChromeClientAndroid.h | 4 |
2 files changed, 14 insertions, 0 deletions
diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp index f14c2c1..ffa96f8 100644 --- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp +++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp @@ -465,4 +465,14 @@ void ChromeClientAndroid::wakeUpMainThreadWithNewQuota(long newQuota) { m_quotaThreadCondition.signal(); } +#if ENABLE(TOUCH_EVENTS) +void ChromeClientAndroid::needTouchEvents(bool needTouchEvents, bool force) +{ + FrameView* frameView = m_webFrame->page()->mainFrame()->view(); + android::WebViewCore* core = android::WebViewCore::getWebViewCore(frameView); + if (core) + core->needTouchEvents(needTouchEvents, force); +} +#endif + } diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.h b/WebKit/android/WebCoreSupport/ChromeClientAndroid.h index 45dd078..b61f9fd 100644 --- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.h +++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.h @@ -136,6 +136,10 @@ namespace android { virtual void populateVisitedLinks(); +#if ENABLE(TOUCH_EVENTS) + virtual void needTouchEvents(bool, bool); +#endif + // Methods used to request and provide Geolocation permissions. virtual void requestGeolocationPermissionForFrame(Frame*, Geolocation*); // Android-specific |