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 /WebKit/android/plugins/PluginDebugAndroid.cpp | |
| 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 'WebKit/android/plugins/PluginDebugAndroid.cpp')
| -rw-r--r-- | WebKit/android/plugins/PluginDebugAndroid.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/WebKit/android/plugins/PluginDebugAndroid.cpp b/WebKit/android/plugins/PluginDebugAndroid.cpp index e783419..e13e928 100644 --- a/WebKit/android/plugins/PluginDebugAndroid.cpp +++ b/WebKit/android/plugins/PluginDebugAndroid.cpp @@ -93,10 +93,8 @@ void anp_logPluginEvent(void* npp, const ANPEvent* evt, int16 returnVal, int ela case kTouch_ANPEventType: if(evt->data.touch.action < ARRAY_COUNT(inputActions)) { - uint32_t totalTime = android::uptimeMillis() - evt->timeStamp; - - anp_logPlugin("%p EVENT::TOUCH[%d] delay=%d time=%d action=%s [%d %d]", - npp, returnVal, totalTime - elapsedTime, elapsedTime, + anp_logPlugin("%p EVENT::TOUCH[%d] time=%d action=%s [%d %d]", + npp, returnVal, elapsedTime, inputActions[evt->data.touch.action], evt->data.touch.x, evt->data.touch.y); } else { |