Commit 41b6a0c2 authored by jocelyn.turcotte@digia.com's avatar jocelyn.turcotte@digia.com
Browse files

[Qt] WTR: Fix an assert triggered by EventSenderProxy::touchEnd

https://bugs.webkit.org/show_bug.cgi?id=98735

Reviewed by Kenneth Rohde Christiansen.

ASSERT: "itemForTouchPointId.isEmpty()" in file qt5/qtdeclarative/src/quick/items/qquickwindow.cpp, line 1563
This assert is caused by QQuickWindow not registering our TouchPointReleased
since it expects QTouchEvent::touchPointStates() to be filled by the event's sender.

This patch calculates the touchPointStates like QQuickWindowPrivate::touchEventWithPoints does.

* WebKitTestRunner/qt/EventSenderProxyQt.cpp:
(WTR::EventSenderProxy::sendTouchEvent):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@130878 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 701a6d29
2012-10-09 Jocelyn Turcotte <jocelyn.turcotte@digia.com>
[Qt] WTR: Fix an assert triggered by EventSenderProxy::touchEnd
https://bugs.webkit.org/show_bug.cgi?id=98735
Reviewed by Kenneth Rohde Christiansen.
ASSERT: "itemForTouchPointId.isEmpty()" in file qt5/qtdeclarative/src/quick/items/qquickwindow.cpp, line 1563
This assert is caused by QQuickWindow not registering our TouchPointReleased
since it expects QTouchEvent::touchPointStates() to be filled by the event's sender.
This patch calculates the touchPointStates like QQuickWindowPrivate::touchEventWithPoints does.
* WebKitTestRunner/qt/EventSenderProxyQt.cpp:
(WTR::EventSenderProxy::sendTouchEvent):
2012-10-10 Allan Sandfeld Jensen <allan.jensen@digia.com>
[Qt] DumpRenderTree needs a beginDragWithFiles implementation
......
......@@ -418,7 +418,10 @@ void EventSenderProxy::sendTouchEvent(QEvent::Type type)
QWindowSystemInterface::registerTouchDevice(device);
}
QTouchEvent event(type, device, m_touchModifiers);
Qt::TouchPointStates eventStates;
for (int i = 0; i < m_touchPoints.count(); i++)
eventStates |= m_touchPoints[i].state();
QTouchEvent event(type, device, m_touchModifiers, eventStates);
event.setTouchPoints(m_touchPoints);
m_testController->mainWebView()->sendEvent(&event);
QList<QTouchEvent::TouchPoint>::Iterator it = m_touchPoints.begin();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment