bool createdByDOM() const { return m_createdByDOM; }
void setCreatedByDOM(bool createdByDOM) { m_createdByDOM = createdByDOM; }
+#if PLATFORM(ANDROID)
+ void setCreateTime(DOMTimeStamp time) { m_createTime = time; }
+#endif
+
protected:
Event();
Event(const AtomicString& type, bool canBubble, bool cancelable);
default:
return false;
}
+ te->setCreateTime(static_cast<DOMTimeStamp>(e.eventTime()));
ExceptionCode ec = 0;
m_touch->target()->dispatchEvent(te.get(), ec);
if (type == TouchEventEnd || type == TouchEventCancel)
{
}
- PlatformTouchEvent(const IntPoint& pos, const IntPoint& globalPos, TouchEventType eventType)
+ PlatformTouchEvent(const IntPoint& pos, const IntPoint& globalPos, TouchEventType eventType, long eventTime)
: m_position(pos)
, m_globalPosition(globalPos)
, m_eventType(eventType)
+ , m_eventTime(eventTime)
{
}
int globalX() const { return m_globalPosition.x(); }
int globalY() const { return m_globalPosition.y(); }
TouchEventType eventType() const { return m_eventType; }
+ long eventTime() const { return m_eventTime; }
private:
IntPoint m_position;
IntPoint m_globalPosition;
TouchEventType m_eventType;
+ long m_eventTime;
};
} // namespace WebCore
return;
ANPEvent evt;
- SkANP::InitEvent(&evt, kTouch_ANPEventType);
+ SkANP::InitEvent(&evt, kTouch_ANPEventType, event->timeStamp());
bool ignoreRet = false;
const AtomicString& type = event->type();
}
}
-int WebViewCore::handleTouchEvent(int action, int x, int y)
+int WebViewCore::handleTouchEvent(int action, int x, int y, long time)
{
int preventDefault = 0;
break;
}
WebCore::IntPoint pt(x - m_scrollOffsetX, y - m_scrollOffsetY);
- WebCore::PlatformTouchEvent te(pt, pt, type);
+ WebCore::PlatformTouchEvent te(pt, pt, type, time);
preventDefault = m_mainFrame->eventHandler()->handleTouchEvent(te);
#endif
return ret;
}
-static jint HandleTouchEvent(JNIEnv *env, jobject obj, jint action, jint x, jint y)
+static jint HandleTouchEvent(JNIEnv *env, jobject obj, jint action, jint x, jint y, jlong time)
{
#ifdef ANDROID_INSTRUMENT
TimeCounterAuto counter(TimeCounter::WebViewCoreTimeCounter);
#endif
WebViewCore* viewImpl = GET_NATIVE_VIEW(env, obj);
LOG_ASSERT(viewImpl, "viewImpl not set in %s", __FUNCTION__);
- return viewImpl->handleTouchEvent(action, x, y);
+ return viewImpl->handleTouchEvent(action, x, y, time);
}
static void TouchUp(JNIEnv *env, jobject obj, jint touchGeneration,
(void*) SaveDocumentState },
{ "nativeFindAddress", "(Ljava/lang/String;Z)Ljava/lang/String;",
(void*) FindAddress },
- { "nativeHandleTouchEvent", "(III)I",
+ { "nativeHandleTouchEvent", "(IIIJ)I",
(void*) HandleTouchEvent },
{ "nativeTouchUp", "(IIIII)V",
(void*) TouchUp },
/**
* Handle touch event
*/
- int handleTouchEvent(int action, int x, int y);
+ int handleTouchEvent(int action, int x, int y, long time);
/**
* Handle motionUp event from the UI thread (called touchUp in the
// 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),
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;
}
static bool SetBitmap(ANPBitmap* dst, const SkBitmap& src);
static void InitEvent(ANPEvent* event, ANPEventType et);
+ static void InitEvent(ANPEvent* event, ANPEventType et, long time);
};
#endif
/* This is what is passed to NPP_HandleEvent() */
struct ANPEvent {
uint32_t inSize; // size of this struct in bytes
+ uint32_t timeStamp;
ANPEventType eventType;
// use based on the value in eventType
union {