diff options
author | Ben Murdoch <benm@google.com> | 2010-02-23 18:26:46 +0000 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2010-03-01 10:22:54 +0000 |
commit | cd97be1e939c83f2a837fa63c24d06231a0097d9 (patch) | |
tree | e3e269a1831eed404644674e15be048d893139db /WebCore/platform | |
parent | bd176981556f55a8f081b8ee6c804a384deb9644 (diff) | |
download | external_webkit-cd97be1e939c83f2a837fa63c24d06231a0097d9.zip external_webkit-cd97be1e939c83f2a837fa63c24d06231a0097d9.tar.gz external_webkit-cd97be1e939c83f2a837fa63c24d06231a0097d9.tar.bz2 |
Update touch handler in preparation for upstreaming of m_originatingTouchTargets map. WebKit bug tracking is https://bugs.webkit.org/show_bug.cgi?id=34585
Landed to webkit as http://trac.webkit.org/changeset/55230
Change-Id: I68fa02615aec35c8c2d3e7c69e8479c33d66293c
Diffstat (limited to 'WebCore/platform')
-rw-r--r-- | WebCore/platform/PlatformTouchPoint.h | 4 | ||||
-rw-r--r-- | WebCore/platform/qt/PlatformTouchPointQt.cpp | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/WebCore/platform/PlatformTouchPoint.h b/WebCore/platform/PlatformTouchPoint.h index 2df9e31..d4f855e 100644 --- a/WebCore/platform/PlatformTouchPoint.h +++ b/WebCore/platform/PlatformTouchPoint.h @@ -50,13 +50,13 @@ public: PlatformTouchPoint(const IntPoint& windowPos, State); #endif - int id() const { return m_id; } + unsigned id() const { return m_id; } State state() const { return m_state; } IntPoint screenPos() const { return m_screenPos; } IntPoint pos() const { return m_pos; } private: - int m_id; + unsigned m_id; State m_state; IntPoint m_screenPos; IntPoint m_pos; diff --git a/WebCore/platform/qt/PlatformTouchPointQt.cpp b/WebCore/platform/qt/PlatformTouchPointQt.cpp index 1788cef..c293212 100644 --- a/WebCore/platform/qt/PlatformTouchPointQt.cpp +++ b/WebCore/platform/qt/PlatformTouchPointQt.cpp @@ -29,7 +29,8 @@ namespace WebCore { PlatformTouchPoint::PlatformTouchPoint(const QTouchEvent::TouchPoint& point) { - m_id = point.id(); + // The QTouchEvent::TouchPoint API states that ids will be >= 0. + m_id = static_cast<unsigned>(point.id()); switch (point.state()) { case Qt::TouchPointReleased: m_state = TouchReleased; break; case Qt::TouchPointMoved: m_state = TouchMoved; break; |