diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-16 13:22:39 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-16 13:22:39 -0400 |
| commit | 2dfa40e5ed41a783615f2a7e81e82f7d1a4bd517 (patch) | |
| tree | 03cc5bc731935c9d8e035d96f85f9ae4c8ba7317 /WebCore | |
| parent | 10d4052577e66430f5a3716ec51a401f1b4b21c2 (diff) | |
| parent | 64f216064ff66ab180b5c65256b770d60b1beee3 (diff) | |
| download | external_webkit-2dfa40e5ed41a783615f2a7e81e82f7d1a4bd517.zip external_webkit-2dfa40e5ed41a783615f2a7e81e82f7d1a4bd517.tar.gz external_webkit-2dfa40e5ed41a783615f2a7e81e82f7d1a4bd517.tar.bz2 | |
Merge change 25135 into eclair
* changes:
For TouchEventEnd, touches and targetTouches are empty list.
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/page/EventHandler.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/WebCore/page/EventHandler.cpp b/WebCore/page/EventHandler.cpp index 41e859f..937f08f 100644 --- a/WebCore/page/EventHandler.cpp +++ b/WebCore/page/EventHandler.cpp @@ -2529,6 +2529,8 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& e) RefPtr<TouchList> touchList = TouchList::create(); touchList->append(m_touch); + // For TouchEventEnd, touches and targetTouches are empty list + RefPtr<TouchList> emptyList = TouchList::create(); RefPtr<TouchEvent> te; switch(type) { case TouchEventStart: @@ -2538,7 +2540,7 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& e) break; case TouchEventEnd: - te = TouchEvent::create(touchList.get(), touchList.get(), touchList.get(), + te = TouchEvent::create(emptyList.get(), emptyList.get(), touchList.get(), eventNames().touchendEvent, m_touch->frame()->document()->defaultView(), m_touch->screenX(), m_touch->screenY(), m_touch->pageX(), m_touch->pageY()); break; |