summaryrefslogtreecommitdiffstats
path: root/WebKit/android/plugins/SkANP.cpp
diff options
context:
space:
mode:
authorGrace Kloba <klobag@google.com>2010-02-02 19:08:37 -0800
committerGrace Kloba <klobag@google.com>2010-02-03 09:45:07 -0800
commit22c64e5cc7b7c54cea1cf6cb3bb1021f072e365c (patch)
treed556cec3ecc5cbbde2ada12a9d5100d4c73d7d62 /WebKit/android/plugins/SkANP.cpp
parent52d25f0b47a8bb2c38de3a8429316221f742b8f9 (diff)
downloadexternal_webkit-22c64e5cc7b7c54cea1cf6cb3bb1021f072e365c.zip
external_webkit-22c64e5cc7b7c54cea1cf6cb3bb1021f072e365c.tar.gz
external_webkit-22c64e5cc7b7c54cea1cf6cb3bb1021f072e365c.tar.bz2
Pass touch event time from Java to WebKit
merge from https://android-git.corp.google.com/g/#change,39356
Diffstat (limited to 'WebKit/android/plugins/SkANP.cpp')
-rw-r--r--WebKit/android/plugins/SkANP.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/WebKit/android/plugins/SkANP.cpp b/WebKit/android/plugins/SkANP.cpp
index 9bbb09e..bb3fe45 100644
--- a/WebKit/android/plugins/SkANP.cpp
+++ b/WebKit/android/plugins/SkANP.cpp
@@ -26,6 +26,7 @@
// must include config.h first for webkit to fiddle with new/delete
#include "config.h"
#include "SkANP.h"
+#include <wtf/CurrentTime.h>
SkRect* SkANP::SetRect(SkRect* dst, const ANPRectF& src) {
dst->set(SkFloatToScalar(src.left),
@@ -102,4 +103,11 @@ bool SkANP::SetBitmap(ANPBitmap* dst, const SkBitmap& src) {
void SkANP::InitEvent(ANPEvent* event, ANPEventType et) {
event->inSize = sizeof(ANPEvent);
event->eventType = et;
+ event->timeStamp = currentTime() * 1000.0;
+}
+
+void SkANP::InitEvent(ANPEvent* event, ANPEventType et, long time) {
+ event->inSize = sizeof(ANPEvent);
+ event->eventType = et;
+ event->timeStamp = time;
}