64374 2011-07-12 11:28:21 -0700 [Qt][WK2] Add multi-point touch mocking to MiniBrowser 2011-07-26 04:33:23 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Qt, QtTriaged P2 Normal --- 1 benjamin benjamin jturcotte vestbo oldest_to_newest 435806 0 benjamin 2011-07-12 11:28:21 -0700 Hard to test pinch on desktop mocking for multiple touch point :) 435819 1 100532 benjamin 2011-07-12 11:42:00 -0700 Created attachment 100532 Patch 435823 2 benjamin 2011-07-12 11:43:27 -0700 This is mostly code from Tor Arne, I set him as the author. 436314 3 100532 jturcotte 2011-07-13 02:26:07 -0700 Comment on attachment 100532 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=100532&action=review Looks good to me, beside: > Tools/ChangeLog:1 > +2011-07-12 Tor Arne Vestbø <tor.arne.vestbo@nokia.com> vestbo@webkit.org 441635 4 100532 vestbo 2011-07-25 07:10:21 -0700 Comment on attachment 100532 Patch I'll update the name, just a sec 441648 5 vestbo 2011-07-25 07:48:40 -0700 Landed in r91667 100532 2011-07-12 11:42:00 -0700 2011-07-26 04:33:23 -0700 Patch bug-64374-20110712204845.patch text/plain 4755 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogOTA4MTEKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA4ODBjNmFiNTg3OTUwOTY2ZjNmNTFjNDU4YzA3NDY1NTA0 ODY4MTA2Li5hYjIwNGY4OTAyMTcxZTIxOWEyYjlhYTY5YzcxNGZiZjEwZDQxNzRiIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTEtMDctMTIgIFRvciBBcm5lIFZlc3Riw7ggIDx0b3IuYXJuZS52ZXN0Ym9Abm9raWEu Y29tPgorCisgICAgICAgIFtRdF1bV0syXSBBZGQgbXVsdGktcG9pbnQgdG91Y2ggbW9ja2luZyB0 byBNaW5pQnJvd3NlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NjQzNzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBFYWNoIG1vdXNlIGJ1dHRvbiBnZW5lcmF0ZSBhIHRvdWNoIHBvaW50LiBUaGUgdG91Y2gg cG9pbnQgc3RheSB2aXJ0dWFsbHkKKyAgICAgICAgb24gc2NyZWVuIGlmIHRoZSBtb3VzZSByZWxl YXNlIGhhcHBlbmVkIHdoaWxlIHRoZSBDdHJsIG1vZGlmaWVyIHdhcworICAgICAgICBwcmVzc2Vk LgorCisgICAgICAgICogTWluaUJyb3dzZXIvcXQvTWluaUJyb3dzZXJBcHBsaWNhdGlvbi5jcHA6 CisgICAgICAgIChNaW5pQnJvd3NlckFwcGxpY2F0aW9uOjpub3RpZnkpOgorICAgICAgICAqIE1p bmlCcm93c2VyL3F0L01pbmlCcm93c2VyQXBwbGljYXRpb24uaDoKKwogMjAxMS0wNy0xMiAgRXJp YyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW1F0XSBOUldUIHNob3VsZCBw aWNrIHVwIHRoZSByaWdodCBodHRwZCBjb25maWcgZmlsZQpkaWZmIC0tZ2l0IGEvVG9vbHMvTWlu aUJyb3dzZXIvcXQvTWluaUJyb3dzZXJBcHBsaWNhdGlvbi5jcHAgYi9Ub29scy9NaW5pQnJvd3Nl ci9xdC9NaW5pQnJvd3NlckFwcGxpY2F0aW9uLmNwcAppbmRleCBjMTNkZDI4OGRiMGMyNWU3NWM3 NDFlYjlkYTEzZDVhMzc1NWU3ODM4Li5jZTdlMmI0NTc4ZTIxNmUzMzJhNTQ5NGY5NzdhNjI5Zjdh MDI4YTcwIDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9xdC9NaW5pQnJvd3NlckFwcGxp Y2F0aW9uLmNwcAorKysgYi9Ub29scy9NaW5pQnJvd3Nlci9xdC9NaW5pQnJvd3NlckFwcGxpY2F0 aW9uLmNwcApAQCAtOTAsMzUgKzkwLDU0IEBAIGJvb2wgTWluaUJyb3dzZXJBcHBsaWNhdGlvbjo6 bm90aWZ5KFFPYmplY3QqIHRhcmdldCwgUUV2ZW50KiBldmVudCkKICAgICB9CiAgICAgaWYgKGlz TW91c2VFdmVudChldmVudCkpIHsKICAgICAgICAgY29uc3QgUU1vdXNlRXZlbnQqIGNvbnN0IG1v dXNlRXZlbnQgPSBzdGF0aWNfY2FzdDxRTW91c2VFdmVudCo+KGV2ZW50KTsKLSAgICAgICAgaWYg KG1vdXNlRXZlbnQtPmJ1dHRvbigpICE9IFF0OjpMZWZ0QnV0dG9uICYmIG1vdXNlRXZlbnQtPmJ1 dHRvbnMoKSAhPSBRdDo6TGVmdEJ1dHRvbikKLSAgICAgICAgICAgIHJldHVybiBRQXBwbGljYXRp b246Om5vdGlmeSh0YXJnZXQsIGV2ZW50KTsKIAogICAgICAgICBRVG91Y2hFdmVudDo6VG91Y2hQ b2ludCB0b3VjaFBvaW50OwogICAgICAgICB0b3VjaFBvaW50LnNldFNjcmVlblBvcyhtb3VzZUV2 ZW50LT5nbG9iYWxQb3MoKSk7CiAgICAgICAgIHRvdWNoUG9pbnQuc2V0UG9zKG1vdXNlRXZlbnQt PnBvcygpKTsKLSAgICAgICAgdG91Y2hQb2ludC5zZXRJZCgwKTsKIAogICAgICAgICBzd2l0Y2gg KG1vdXNlRXZlbnQtPnR5cGUoKSkgewogICAgICAgICBjYXNlIFFFdmVudDo6TW91c2VCdXR0b25Q cmVzczoKICAgICAgICAgY2FzZSBRRXZlbnQ6Ok1vdXNlQnV0dG9uRGJsQ2xpY2s6Ci0gICAgICAg ICAgICB0b3VjaFBvaW50LnNldFN0YXRlKFF0OjpUb3VjaFBvaW50UHJlc3NlZCk7CisgICAgICAg ICAgICB0b3VjaFBvaW50LnNldElkKG1vdXNlRXZlbnQtPmJ1dHRvbigpKTsKKyAgICAgICAgICAg IGlmIChtX3RvdWNoUG9pbnRzLmNvbnRhaW5zKHRvdWNoUG9pbnQuaWQoKSkpCisgICAgICAgICAg ICAgICAgdG91Y2hQb2ludC5zZXRTdGF0ZShRdDo6VG91Y2hQb2ludE1vdmVkKTsKKyAgICAgICAg ICAgIGVsc2UKKyAgICAgICAgICAgICAgICB0b3VjaFBvaW50LnNldFN0YXRlKFF0OjpUb3VjaFBv aW50UHJlc3NlZCk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBRRXZlbnQ6Ok1v dXNlTW92ZToKKyAgICAgICAgICAgIGlmICghbW91c2VFdmVudC0+YnV0dG9ucygpIHx8ICFtX3Rv dWNoUG9pbnRzLmNvbnRhaW5zKG1vdXNlRXZlbnQtPmJ1dHRvbnMoKSkpCisgICAgICAgICAgICAg ICAgcmV0dXJuIFFBcHBsaWNhdGlvbjo6bm90aWZ5KHRhcmdldCwgZXZlbnQpOwogICAgICAgICAg ICAgdG91Y2hQb2ludC5zZXRTdGF0ZShRdDo6VG91Y2hQb2ludE1vdmVkKTsKKyAgICAgICAgICAg IHRvdWNoUG9pbnQuc2V0SWQobW91c2VFdmVudC0+YnV0dG9ucygpKTsKICAgICAgICAgICAgIGJy ZWFrOwogICAgICAgICBjYXNlIFFFdmVudDo6TW91c2VCdXR0b25SZWxlYXNlOgorICAgICAgICAg ICAgaWYgKG1vdXNlRXZlbnQtPm1vZGlmaWVycygpLnRlc3RGbGFnKFF0OjpDb250cm9sTW9kaWZp ZXIpKQorICAgICAgICAgICAgICAgIHJldHVybiBRQXBwbGljYXRpb246Om5vdGlmeSh0YXJnZXQs IGV2ZW50KTsKICAgICAgICAgICAgIHRvdWNoUG9pbnQuc2V0U3RhdGUoUXQ6OlRvdWNoUG9pbnRS ZWxlYXNlZCk7CisgICAgICAgICAgICB0b3VjaFBvaW50LnNldElkKG1vdXNlRXZlbnQtPmJ1dHRv bigpKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBkZWZhdWx0OgotICAgICAgICAgICAg UV9BU1NFUlQoZmFsc2UpOwotICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBRX0FTU0VS VF9YKGZhbHNlLCAibXVsdGktdG91Y2ggbW9ja2luZyIsICJ1bmhhbmRsZWQgZXZlbnQgdHlwZSIp OworICAgICAgICB9CisKKyAgICAgICAgLy8gVXBkYXRlIGN1cnJlbnQgdG91Y2gtcG9pbnQKKyAg ICAgICAgbV90b3VjaFBvaW50cy5pbnNlcnQodG91Y2hQb2ludC5pZCgpLCB0b3VjaFBvaW50KTsK KworICAgICAgICAvLyBVcGRhdGUgc3RhdGVzIGZvciBhbGwgb3RoZXIgdG91Y2gtcG9pbnRzCisg ICAgICAgIGZvciAoUUhhc2g8aW50LCBRVG91Y2hFdmVudDo6VG91Y2hQb2ludD46Oml0ZXJhdG9y IGl0ID0gbV90b3VjaFBvaW50cy5iZWdpbigpOyBpdCAhPSBtX3RvdWNoUG9pbnRzLmVuZCgpOyAr K2l0KSB7CisgICAgICAgICAgICBpZiAoaXQudmFsdWUoKS5pZCgpICE9IHRvdWNoUG9pbnQuaWQo KSkKKyAgICAgICAgICAgICAgICBpdC52YWx1ZSgpLnNldFN0YXRlKFF0OjpUb3VjaFBvaW50U3Rh dGlvbmFyeSk7CiAgICAgICAgIH0KIAotICAgICAgICBRTGlzdDxRVG91Y2hFdmVudDo6VG91Y2hQ b2ludD4gdG91Y2hQb2ludHM7Ci0gICAgICAgIHRvdWNoUG9pbnRzLmFwcGVuZCh0b3VjaFBvaW50 KTsKICAgICAgICAgbV9zZW5kaW5nRmFrZVRvdWNoRXZlbnQgPSB0cnVlOwotICAgICAgICBxdF90 cmFuc2xhdGVSYXdUb3VjaEV2ZW50KDAsIFFUb3VjaEV2ZW50OjpUb3VjaFNjcmVlbiwgdG91Y2hQ b2ludHMpOworICAgICAgICBxdF90cmFuc2xhdGVSYXdUb3VjaEV2ZW50KDAsIFFUb3VjaEV2ZW50 OjpUb3VjaFNjcmVlbiwgbV90b3VjaFBvaW50cy52YWx1ZXMoKSk7CiAgICAgICAgIG1fc2VuZGlu Z0Zha2VUb3VjaEV2ZW50ID0gZmFsc2U7CisKKyAgICAgICAgLy8gR2V0IHJpZCBvZiB0b3VjaC1w b2ludHMgdGhhdCBhcmUgbm8gbG9uZ2VyIHZhbGlkCisgICAgICAgIGZvcmVhY2ggKGNvbnN0IFFU b3VjaEV2ZW50OjpUb3VjaFBvaW50JiB0b3VjaFBvaW50LCBtX3RvdWNoUG9pbnRzKSB7CisgICAg ICAgICAgICBpZiAodG91Y2hQb2ludC5zdGF0ZSgpID09ICBRdDo6VG91Y2hQb2ludFJlbGVhc2Vk KQorICAgICAgICAgICAgICAgIG1fdG91Y2hQb2ludHMucmVtb3ZlKHRvdWNoUG9pbnQuaWQoKSk7 CisgICAgICAgIH0KICAgICB9CiAKICAgICByZXR1cm4gUUFwcGxpY2F0aW9uOjpub3RpZnkodGFy Z2V0LCBldmVudCk7CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9xdC9NaW5pQnJvd3Nl ckFwcGxpY2F0aW9uLmggYi9Ub29scy9NaW5pQnJvd3Nlci9xdC9NaW5pQnJvd3NlckFwcGxpY2F0 aW9uLmgKaW5kZXggYTE4MmY5YmE4ZDAxNjA0YzY4YWYzNWE5NWE1ZjRmZjVmYzVmOTUzZC4uNTY5 Nzc0OGEyNDY0Mzk1ZDQ1NWRmZDAwZDUzNDg4NjhkOWY3NjI5OCAxMDA2NDQKLS0tIGEvVG9vbHMv TWluaUJyb3dzZXIvcXQvTWluaUJyb3dzZXJBcHBsaWNhdGlvbi5oCisrKyBiL1Rvb2xzL01pbmlC cm93c2VyL3F0L01pbmlCcm93c2VyQXBwbGljYXRpb24uaApAQCAtMjksNyArMjksOSBAQAogI2lm bmRlZiBNaW5pQnJvd3NlckFwcGxpY2F0aW9uX2gKICNkZWZpbmUgTWluaUJyb3dzZXJBcHBsaWNh dGlvbl9oCiAKKyNpbmNsdWRlIDxRSGFzaD4KICNpbmNsdWRlIDxRU3RyaW5nTGlzdD4KKyNpbmNs dWRlIDxRVG91Y2hFdmVudD4KICNpbmNsdWRlIDxRdEd1aT4KIAogc3RydWN0IFdpbmRvd09wdGlv bnMgewpAQCAtNzUsNiArNzcsOCBAQCBwcml2YXRlOgogICAgIGludCBtX3JvYm90VGltZW91dFNl Y29uZHM7CiAgICAgaW50IG1fcm9ib3RFeHRyYVRpbWVTZWNvbmRzOwogICAgIFFTdHJpbmdMaXN0 IG1fdXJsczsKKworICAgIFFIYXNoPGludCwgUVRvdWNoRXZlbnQ6OlRvdWNoUG9pbnQ+IG1fdG91 Y2hQb2ludHM7CiB9OwogCiAjZW5kaWYK