Oxide

Merge lp://qastaging/~osomon/oxide/override-touchUngrabEvent into lp://qastaging/~oxide-developers/oxide/oxide.trunk

override-touchUngrabEvent
Merge into oxide.trunk

Proposed by Olivier Tilloy on 2016-01-20

Status:

Merged

Merged at revision:

1358

Proposed branch:

lp://qastaging/~osomon/oxide/override-touchUngrabEvent

Merge into:

lp://qastaging/~oxide-developers/oxide/oxide.trunk

Diff against target:

222 lines (+56/-7)

9 files modified

qt/core/browser/oxide_qt_event_utils.cc (+18/-2)
qt/core/browser/oxide_qt_event_utils.h (+3/-1)
qt/core/browser/oxide_qt_web_view.cc (+5/-0)
qt/core/browser/oxide_qt_web_view.h (+1/-0)
qt/core/glue/oxide_qt_web_view_proxy.h (+1/-0)
qt/quick/api/oxideqquickwebview.cc (+12/-0)
qt/quick/api/oxideqquickwebview.h (+1/-0)
shared/browser/oxide_touch_event_state.cc (+13/-3)
shared/browser/oxide_touch_event_state.h (+2/-1)

To merge this branch:

bzr merge lp://qastaging/~osomon/oxide/override-touchUngrabEvent

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Chris Coulson		2016-01-20	Approve on 2016-02-23
Review via email: mp+283257@code.qastaging.launchpad.net

Commit message

Override OxideQQuickWebView::touchUngrabEvent().

Revision history for this message

Chris Coulson (chrisccoulson) wrote on 2016-01-20:

Thanks, but there's a few issues with this (comments inline)

review: Needs Fixing

Revision history for this message

Chris Coulson (chrisccoulson) wrote on 2016-01-21:

I've added another comment as well.

Also, one other issue is that this will leave stale touch points in oxide::qt::UITouchEventFactory.

Another way to fix this might be:

- Fix oxide::TouchEventState so that calling Update() with an event that has the type ui::ET_TOUCH_CANCELLED results in all touch points being marked inactive.
- Add code to oxide::qt::UITouchEventFactory::MakeEvents that handles a QTouchEvent with the type Qt::TouchCancel, by injecting a single ui::TouchEvent with the appropriate type in to the results and clearing out any state.
- Add a Cancel() method to oxide::qt::UITouchEventFactory that just calls MakeEvents with a dummy Qt::TouchCancel event and returns the appropriate ui::TouchEvent.
- Make handleTouchUngrabEvent() just call Cancel() and then oxide::WebView::HandleTouchEvent() with the cancel event.

lp://qastaging/~osomon/oxide/override-touchUngrabEvent updated on 2016-02-23

1319. By Olivier Tilloy on 2016-02-01: Merge the latest changes from trunk.
1320. By Olivier Tilloy on 2016-02-01: Revert most of the previous change, per review comments.
1321. By Olivier Tilloy on 2016-02-01: Override OxideQQuickWebView::touchUngrabEvent().
1322. By Olivier Tilloy on 2016-02-10: Merge the latest changes from trunk and resolve minor conflicts.
1323. By Olivier Tilloy on 2016-02-10: Copy cancel event to prevent using a freed object.
1324. By Olivier Tilloy on 2016-02-23: Reset the active touch point counter when marking all touch points inactive.