32432 2009-12-11 08:01:43 -0800 [Qt] Add support for touch events in QWebView and QGraphicsWebView 2009-12-17 09:09:40 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED Qt P3 Normal --- 32434 32485 1 hausmann webkit-unassigned commit-queue jonni.rainisto kim.1.gronholm webkit.review.bot oldest_to_newest 170763 0 hausmann 2009-12-11 08:01:43 -0800 QWebPage has been extended with support for handling QTouchEvents and forwarding them to the event handler. However what is still missing is 1) Forwarding touch events from QGraphicsWebView and QWebView to QWebPage 2) Enabling the WA_AcceptsTouch widget attribute It may seem like we would have to dynamically toggle the WA_AcceptsTouchEvents widget attribute, but since in the long run we want to have have QWebPage also interpret touch events (for example for panning), we might as well enable it all the time ;-) 171814 1 44866 kim.1.gronholm 2009-12-15 04:53:14 -0800 Created attachment 44866 Patch for adding support for touch events in QWebView and QGraphicsWebView. 171816 2 webkit.review.bot 2009-12-15 04:55:12 -0800 style-queue ran check-webkit-style on attachment 44866 without any errors. 171845 3 44866 hausmann 2009-12-15 06:20:27 -0800 Comment on attachment 44866 Patch for adding support for touch events in QWebView and QGraphicsWebView. The patch looks good to me! Just a few minor style nitpicks that need to be fixed before we can land this: > + > +#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0) > + if (d->page) { > + if (event->type() == QEvent::TouchBegin > + || event->type() == QEvent::TouchEnd > + || event->type() == QEvent::TouchUpdate) { > + d->page->event(event); > + } The curly braces are left out when the body is only a one-liner. I would recommend combining the two if statements: if (d->page && event->type() == ... && ... ) d->page->event(event); Also, with the above code we always call QWidget::event() with the touch event, which will convert the first touch to a mouse event (according to the docs). I think perhaps the code should be like: if (...) { d->page->event(event); if (event->isAccepted()) return true; } ... else we call QWidget::event. The same for QGraphicsWebView and QWebView of course. 172012 4 44908 kim.1.gronholm 2009-12-15 13:57:59 -0800 Created attachment 44908 Updated patch according to Simon's comments 172017 5 webkit.review.bot 2009-12-15 14:02:33 -0800 style-queue ran check-webkit-style on attachment 44908 without any errors. 172798 6 44908 hausmann 2009-12-17 08:58:29 -0800 Comment on attachment 44908 Updated patch according to Simon's comments r=me 172800 7 44908 benjamin 2009-12-17 09:04:36 -0800 Comment on attachment 44908 Updated patch according to Simon's comments >+ if (d->page && (event->type() == QEvent::TouchBegin >+ || event->type() == QEvent::TouchEnd >+ || event->type() == QEvent::TouchUpdate)) { I think the indentation is not correct here. Looks good otherwise. 172803 8 44908 commit-queue 2009-12-17 09:09:33 -0800 Comment on attachment 44908 Updated patch according to Simon's comments Clearing flags on attachment: 44908 Committed r52256: <http://trac.webkit.org/changeset/52256> 172804 9 commit-queue 2009-12-17 09:09:40 -0800 All reviewed patches have been landed. Closing bug. 44866 2009-12-15 04:53:14 -0800 2009-12-15 13:57:59 -0800 Patch for adding support for touch events in QWebView and QGraphicsWebView. touchevent-handling text/plain 2696 kim.1.gronholm ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vidmlldy5jcHAgYi9XZWJLaXQv cXQvQXBpL3FncmFwaGljc3dlYnZpZXcuY3BwCmluZGV4IGIyNWI1M2IuLmI3ZTQ1YTAgMTAwNjQ0 Ci0tLSBhL1dlYktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vidmlldy5jcHAKKysrIGIvV2ViS2l0L3F0 L0FwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcApAQCAtMjQ0LDYgKzI0NCw5IEBAIFFHcmFwaGljc1dl YlZpZXc6OlFHcmFwaGljc1dlYlZpZXcoUUdyYXBoaWNzSXRlbSogcGFyZW50KQogI2VuZGlmCiAg ICAgc2V0QWNjZXB0RHJvcHModHJ1ZSk7CiAgICAgc2V0QWNjZXB0SG92ZXJFdmVudHModHJ1ZSk7 CisjaWYgUVRfVkVSU0lPTiA+PSBRVF9WRVJTSU9OX0NIRUNLKDQsIDYsIDApCisgICAgc2V0QWNj ZXB0VG91Y2hFdmVudHModHJ1ZSk7CisjZW5kaWYKICAgICBzZXRGb2N1c1BvbGljeShRdDo6U3Ry b25nRm9jdXMpOwogfQogCkBAIC0zMDIsNiArMzA1LDE3IEBAIHZvaWQgUUdyYXBoaWNzV2ViVmll dzo6cGFpbnQoUVBhaW50ZXIqIHBhaW50ZXIsIGNvbnN0IFFTdHlsZU9wdGlvbkdyYXBoaWNzSXRl bSoKIGJvb2wgUUdyYXBoaWNzV2ViVmlldzo6c2NlbmVFdmVudChRRXZlbnQqIGV2ZW50KQogewog ICAgIC8vIFJlLWltcGxlbWVudGVkIGluIG9yZGVyIHRvIGFsbG93cyBmaXhpbmcgZXZlbnQtcmVs YXRlZCBidWdzIGluIHBhdGNoIHJlbGVhc2VzLgorCisjaWYgUVRfVkVSU0lPTiA+PSBRVF9WRVJT SU9OX0NIRUNLKDQsIDYsIDApCisgICAgaWYgKGQtPnBhZ2UpIHsKKyAgICAgICAgaWYgKGV2ZW50 LT50eXBlKCkgPT0gUUV2ZW50OjpUb3VjaEJlZ2luIAorICAgICAgICAgICAgfHwgZXZlbnQtPnR5 cGUoKSA9PSBRRXZlbnQ6OlRvdWNoRW5kIAorICAgICAgICAgICAgfHwgZXZlbnQtPnR5cGUoKSA9 PSBRRXZlbnQ6OlRvdWNoVXBkYXRlKSB7CisgICAgICAgICAgICAgICAgZC0+cGFnZS0+ZXZlbnQo ZXZlbnQpOworICAgICAgICB9CisgICAgfQorI2VuZGlmCisKICAgICByZXR1cm4gUUdyYXBoaWNz V2lkZ2V0OjpzY2VuZUV2ZW50KGV2ZW50KTsKIH0KIApkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0Fw aS9xd2Vidmlldy5jcHAgYi9XZWJLaXQvcXQvQXBpL3F3ZWJ2aWV3LmNwcAppbmRleCA3YmMzMTY4 Li4yY2E0OWZiIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQXBpL3F3ZWJ2aWV3LmNwcAorKysgYi9X ZWJLaXQvcXQvQXBpL3F3ZWJ2aWV3LmNwcApAQCAtMTUzLDYgKzE1MywxMCBAQCBRV2ViVmlldzo6 UVdlYlZpZXcoUVdpZGdldCAqcGFyZW50KQogICAgIHNldEF0dHJpYnV0ZShRdDo6V0FfSW5wdXRN ZXRob2RFbmFibGVkKTsKICNlbmRpZgogCisjaWYgUVRfVkVSU0lPTiA+PSBRVF9WRVJTSU9OX0NI RUNLKDQsIDYsIDApCisgICAgc2V0QXR0cmlidXRlKFF0OjpXQV9BY2NlcHRUb3VjaEV2ZW50cyk7 CisjZW5kaWYKKwogICAgIHNldEFjY2VwdERyb3BzKHRydWUpOwogCiAgICAgc2V0TW91c2VUcmFj a2luZyh0cnVlKTsKQEAgLTY0MCw2ICs2NDQsMTIgQEAgYm9vbCBRV2ViVmlldzo6ZXZlbnQoUUV2 ZW50ICplKQogICAgICAgICAgICAgaWYgKGN1cnNvcigpLnNoYXBlKCkgPT0gUXQ6OkFycm93Q3Vy c29yKQogICAgICAgICAgICAgICAgIGQtPnBhZ2UtPmQtPmNsaWVudC0+cmVzZXRDdXJzb3IoKTsK ICNlbmRpZgorI2lmIFFUX1ZFUlNJT04gPj0gUVRfVkVSU0lPTl9DSEVDSyg0LCA2LCAwKQorICAg ICAgICB9IGVsc2UgaWYgKGUtPnR5cGUoKSA9PSBRRXZlbnQ6OlRvdWNoQmVnaW4gCisgICAgICAg ICAgICAgICAgICAgfHwgZS0+dHlwZSgpID09IFFFdmVudDo6VG91Y2hFbmQgCisgICAgICAgICAg ICAgICAgICAgfHwgZS0+dHlwZSgpID09IFFFdmVudDo6VG91Y2hVcGRhdGUpIHsKKyAgICAgICAg ICAgIGQtPnBhZ2UtPmV2ZW50KGUpOworI2VuZGlmCiAgICAgICAgIH0gZWxzZSBpZiAoZS0+dHlw ZSgpID09IFFFdmVudDo6TGVhdmUpCiAgICAgICAgICAgICBkLT5wYWdlLT5ldmVudChlKTsKICAg ICB9CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvV2ViS2l0L3F0L0NoYW5nZUxv ZwppbmRleCAwOTAyNDkyLi4wODdmY2JjIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQ2hhbmdlTG9n CisrKyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAwOS0xMi0xNSAg S2ltIEdyw7ZuaG9sbSAgPGtpbS5ncm9uaG9sbUBub21vdm9rLmNvbT4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIEFkZCBzdXBwb3J0IGZvciB0 b3VjaCBldmVudHMgaW4gUVdlYlZpZXcgYW5kIFFHcmFwaGljc1dlYlZpZXcKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMyNDMyCisKKyAgICAgICAgKiBB cGkvcWdyYXBoaWNzd2Vidmlldy5jcHA6CisgICAgICAgIChRR3JhcGhpY3NXZWJWaWV3OjpRR3Jh cGhpY3NXZWJWaWV3KToKKyAgICAgICAgKFFHcmFwaGljc1dlYlZpZXc6OnNjZW5lRXZlbnQpOgor ICAgICAgICAqIEFwaS9xd2Vidmlldy5jcHA6CisgICAgICAgIChRV2ViVmlldzo6UVdlYlZpZXcp OgorICAgICAgICAoUVdlYlZpZXc6OmV2ZW50KToKKwogMjAwOS0xMi0xMyAgQmVuamFtaW4gUG91 bGFpbiAgPGJlbmphbWluLnBvdWxhaW5Abm9raWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IFNpbW9uIEhhdXNtYW5uLgo= 44908 2009-12-15 13:57:59 -0800 2009-12-17 09:09:32 -0800 Updated patch according to Simon's comments touchevent-handling text/plain 2796 kim.1.gronholm ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vidmlldy5jcHAgYi9XZWJLaXQv cXQvQXBpL3FncmFwaGljc3dlYnZpZXcuY3BwCmluZGV4IGIyNWI1M2IuLjAzMWQ4ZjggMTAwNjQ0 Ci0tLSBhL1dlYktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vidmlldy5jcHAKKysrIGIvV2ViS2l0L3F0 L0FwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcApAQCAtMjQ0LDYgKzI0NCw5IEBAIFFHcmFwaGljc1dl YlZpZXc6OlFHcmFwaGljc1dlYlZpZXcoUUdyYXBoaWNzSXRlbSogcGFyZW50KQogI2VuZGlmCiAg ICAgc2V0QWNjZXB0RHJvcHModHJ1ZSk7CiAgICAgc2V0QWNjZXB0SG92ZXJFdmVudHModHJ1ZSk7 CisjaWYgUVRfVkVSU0lPTiA+PSBRVF9WRVJTSU9OX0NIRUNLKDQsIDYsIDApCisgICAgc2V0QWNj ZXB0VG91Y2hFdmVudHModHJ1ZSk7CisjZW5kaWYKICAgICBzZXRGb2N1c1BvbGljeShRdDo6U3Ry b25nRm9jdXMpOwogfQogCkBAIC0zMDIsNiArMzA1LDE3IEBAIHZvaWQgUUdyYXBoaWNzV2ViVmll dzo6cGFpbnQoUVBhaW50ZXIqIHBhaW50ZXIsIGNvbnN0IFFTdHlsZU9wdGlvbkdyYXBoaWNzSXRl bSoKIGJvb2wgUUdyYXBoaWNzV2ViVmlldzo6c2NlbmVFdmVudChRRXZlbnQqIGV2ZW50KQogewog ICAgIC8vIFJlLWltcGxlbWVudGVkIGluIG9yZGVyIHRvIGFsbG93cyBmaXhpbmcgZXZlbnQtcmVs YXRlZCBidWdzIGluIHBhdGNoIHJlbGVhc2VzLgorCisjaWYgUVRfVkVSU0lPTiA+PSBRVF9WRVJT SU9OX0NIRUNLKDQsIDYsIDApCisgICAgaWYgKGQtPnBhZ2UgJiYgKGV2ZW50LT50eXBlKCkgPT0g UUV2ZW50OjpUb3VjaEJlZ2luCisgICAgICAgICAgICAgICAgfHwgZXZlbnQtPnR5cGUoKSA9PSBR RXZlbnQ6OlRvdWNoRW5kCisgICAgICAgICAgICAgICAgfHwgZXZlbnQtPnR5cGUoKSA9PSBRRXZl bnQ6OlRvdWNoVXBkYXRlKSkgeworICAgICAgICBkLT5wYWdlLT5ldmVudChldmVudCk7CisgICAg ICAgIGlmIChldmVudC0+aXNBY2NlcHRlZCgpKQorICAgICAgICAgICAgcmV0dXJuIHRydWU7Cisg ICAgfQorI2VuZGlmCisKICAgICByZXR1cm4gUUdyYXBoaWNzV2lkZ2V0OjpzY2VuZUV2ZW50KGV2 ZW50KTsKIH0KIApkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0FwaS9xd2Vidmlldy5jcHAgYi9XZWJL aXQvcXQvQXBpL3F3ZWJ2aWV3LmNwcAppbmRleCA3YmMzMTY4Li4yNzVmMjA4IDEwMDY0NAotLS0g YS9XZWJLaXQvcXQvQXBpL3F3ZWJ2aWV3LmNwcAorKysgYi9XZWJLaXQvcXQvQXBpL3F3ZWJ2aWV3 LmNwcApAQCAtMTUzLDYgKzE1MywxMCBAQCBRV2ViVmlldzo6UVdlYlZpZXcoUVdpZGdldCAqcGFy ZW50KQogICAgIHNldEF0dHJpYnV0ZShRdDo6V0FfSW5wdXRNZXRob2RFbmFibGVkKTsKICNlbmRp ZgogCisjaWYgUVRfVkVSU0lPTiA+PSBRVF9WRVJTSU9OX0NIRUNLKDQsIDYsIDApCisgICAgc2V0 QXR0cmlidXRlKFF0OjpXQV9BY2NlcHRUb3VjaEV2ZW50cyk7CisjZW5kaWYKKwogICAgIHNldEFj Y2VwdERyb3BzKHRydWUpOwogCiAgICAgc2V0TW91c2VUcmFja2luZyh0cnVlKTsKQEAgLTY0MCw2 ICs2NDQsMTQgQEAgYm9vbCBRV2ViVmlldzo6ZXZlbnQoUUV2ZW50ICplKQogICAgICAgICAgICAg aWYgKGN1cnNvcigpLnNoYXBlKCkgPT0gUXQ6OkFycm93Q3Vyc29yKQogICAgICAgICAgICAgICAg IGQtPnBhZ2UtPmQtPmNsaWVudC0+cmVzZXRDdXJzb3IoKTsKICNlbmRpZgorI2lmIFFUX1ZFUlNJ T04gPj0gUVRfVkVSU0lPTl9DSEVDSyg0LCA2LCAwKQorICAgICAgICB9IGVsc2UgaWYgKGUtPnR5 cGUoKSA9PSBRRXZlbnQ6OlRvdWNoQmVnaW4gCisgICAgICAgICAgICAgICAgICAgfHwgZS0+dHlw ZSgpID09IFFFdmVudDo6VG91Y2hFbmQgCisgICAgICAgICAgICAgICAgICAgfHwgZS0+dHlwZSgp ID09IFFFdmVudDo6VG91Y2hVcGRhdGUpIHsKKyAgICAgICAgICAgIGQtPnBhZ2UtPmV2ZW50KGUp OworICAgICAgICAgICAgaWYgKGUtPmlzQWNjZXB0ZWQoKSkKKyAgICAgICAgICAgICAgICByZXR1 cm4gdHJ1ZTsKKyNlbmRpZgogICAgICAgICB9IGVsc2UgaWYgKGUtPnR5cGUoKSA9PSBRRXZlbnQ6 OkxlYXZlKQogICAgICAgICAgICAgZC0+cGFnZS0+ZXZlbnQoZSk7CiAgICAgfQpkaWZmIC0tZ2l0 IGEvV2ViS2l0L3F0L0NoYW5nZUxvZyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKaW5kZXggMDkwMjQ5 Mi4uMDg3ZmNiYyAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0NoYW5nZUxvZworKysgYi9XZWJLaXQv cXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMDktMTItMTUgIEtpbSBHcsO2bmhvbG0g IDxraW0uZ3JvbmhvbG1Abm9tb3Zvay5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgW1F0XSBBZGQgc3VwcG9ydCBmb3IgdG91Y2ggZXZlbnRzIGlu IFFXZWJWaWV3IGFuZCBRR3JhcGhpY3NXZWJWaWV3CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMjQzMgorCisgICAgICAgICogQXBpL3FncmFwaGljc3dl YnZpZXcuY3BwOgorICAgICAgICAoUUdyYXBoaWNzV2ViVmlldzo6UUdyYXBoaWNzV2ViVmlldyk6 CisgICAgICAgIChRR3JhcGhpY3NXZWJWaWV3OjpzY2VuZUV2ZW50KToKKyAgICAgICAgKiBBcGkv cXdlYnZpZXcuY3BwOgorICAgICAgICAoUVdlYlZpZXc6OlFXZWJWaWV3KToKKyAgICAgICAgKFFX ZWJWaWV3OjpldmVudCk6CisKIDIwMDktMTItMTMgIEJlbmphbWluIFBvdWxhaW4gIDxiZW5qYW1p bi5wb3VsYWluQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBIYXVzbWFu bi4K