diff options
| author | Leon Scroggins <scroggo@google.com> | 2010-03-05 11:39:01 -0500 |
|---|---|---|
| committer | Grace Kloba <klobag@google.com> | 2010-03-09 11:33:41 -0800 |
| commit | 6ed4a4e9a23ead7c910239171daf02b8fbecc17b (patch) | |
| tree | 481f3029333ec03e0f3952cdc1088f46f2c64242 /WebCore/platform | |
| parent | fa26a8dd531dff44d6cad0700ff32c0bb949392c (diff) | |
| download | external_webkit-6ed4a4e9a23ead7c910239171daf02b8fbecc17b.zip external_webkit-6ed4a4e9a23ead7c910239171daf02b8fbecc17b.tar.gz external_webkit-6ed4a4e9a23ead7c910239171daf02b8fbecc17b.tar.bz2 | |
Only call plugin touch code if it is in full screen
mode or it is the document focused node.
Remove Android special code added to support prevent
default for double tap and long press. Long press
and double tap needs to call preventDefault if it
is needed.
Remove Android special code added to pass event time.
Need a separate CL for android_npapi.
Diffstat (limited to 'WebCore/platform')
| -rw-r--r-- | WebCore/platform/PlatformTouchEvent.h | 9 | ||||
| -rw-r--r-- | WebCore/platform/android/PlatformTouchEventAndroid.cpp | 5 |
2 files changed, 3 insertions, 11 deletions
diff --git a/WebCore/platform/PlatformTouchEvent.h b/WebCore/platform/PlatformTouchEvent.h index 56d1020..7e2ac84 100644 --- a/WebCore/platform/PlatformTouchEvent.h +++ b/WebCore/platform/PlatformTouchEvent.h @@ -61,7 +61,7 @@ public: PlatformTouchEvent(QTouchEvent*); #elif PLATFORM(ANDROID) // TODO (benm): eventTime and metaState are new and need to be upstreamed. - PlatformTouchEvent(const IntPoint& windowPos, TouchEventType, PlatformTouchPoint::State, long eventTime, int metaState); + PlatformTouchEvent(const IntPoint& windowPos, TouchEventType, PlatformTouchPoint::State, int metaState); #endif TouchEventType type() const { return m_type; } @@ -72,10 +72,6 @@ public: bool shiftKey() const { return m_shiftKey; } bool metaKey() const { return m_metaKey; } -#if PLATFORM(ANDROID) - long eventTime() const { return m_eventTime; } -#endif - private: TouchEventType m_type; Vector<PlatformTouchPoint> m_touchPoints; @@ -83,9 +79,6 @@ private: bool m_altKey; bool m_shiftKey; bool m_metaKey; -#if PLATFORM(ANDROID) - long m_eventTime; -#endif }; } diff --git a/WebCore/platform/android/PlatformTouchEventAndroid.cpp b/WebCore/platform/android/PlatformTouchEventAndroid.cpp index 085eb0a..0b3ac13 100644 --- a/WebCore/platform/android/PlatformTouchEventAndroid.cpp +++ b/WebCore/platform/android/PlatformTouchEventAndroid.cpp @@ -38,11 +38,10 @@ enum AndroidMetaKeyState { META_SYM_ON = 0x04 }; -// TODO (benm): eventTime and metaState are new and needs to be upstreamed. -PlatformTouchEvent::PlatformTouchEvent(const IntPoint& windowPos, TouchEventType type, PlatformTouchPoint::State state, long eventTime, int metaState) +// TODO (benm): metaState are new and needs to be upstreamed. +PlatformTouchEvent::PlatformTouchEvent(const IntPoint& windowPos, TouchEventType type, PlatformTouchPoint::State state, int metaState) : m_type(type) , m_metaKey(false) - , m_eventTime(eventTime) { m_touchPoints.append(PlatformTouchPoint(windowPos, state)); |