diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebKit/chromium/src/WebInputEventConversion.cpp | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebKit/chromium/src/WebInputEventConversion.cpp')
| -rw-r--r-- | Source/WebKit/chromium/src/WebInputEventConversion.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/WebKit/chromium/src/WebInputEventConversion.cpp b/Source/WebKit/chromium/src/WebInputEventConversion.cpp index 24eb372..24eeb88 100644 --- a/Source/WebKit/chromium/src/WebInputEventConversion.cpp +++ b/Source/WebKit/chromium/src/WebInputEventConversion.cpp @@ -221,6 +221,7 @@ PlatformTouchEventBuilder::PlatformTouchEventBuilder(Widget* widget, const WebTo m_altKey = event.modifiers & WebInputEvent::AltKey; m_shiftKey = event.modifiers & WebInputEvent::ShiftKey; m_metaKey = event.modifiers & WebInputEvent::MetaKey; + m_timestamp = event.timeStampSeconds; for (int i = 0; i < event.touchPointsLength; ++i) m_touchPoints.append(PlatformTouchPointBuilder(widget, event.touchPoints[i])); |