232805 2021-11-07 20:40:41 -0800 Fix the CGEvent types used for wheel event generation from streams 2021-11-08 10:00:24 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=232794 InRadar P2 Normal --- 1 simon.fraser simon.fraser sam simon.fraser webkit-bug-importer oldest_to_newest 1812529 0 simon.fraser 2021-11-07 20:40:41 -0800 Fix the CGEvent types used for wheel event generation from streams 1812530 1 443524 simon.fraser 2021-11-07 20:43:54 -0800 Created attachment 443524 Patch 1812621 2 443524 sam 2021-11-08 08:36:42 -0800 Comment on attachment 443524 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=443524&action=review > Tools/ChangeLog:10 > + The set of enum values for wheel event types are confusing, and I used the wrong ones in > + r285390, so fix that. Values are all the same other than kCGMomentumScrollPhaseEnd which is > + now correct. Is the end phase being different detectable? 1812649 3 simon.fraser 2021-11-08 09:27:32 -0800 (In reply to Sam Weinig from comment #2) > Comment on attachment 443524 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=443524&action=review > > > Tools/ChangeLog:10 > > + The set of enum values for wheel event types are confusing, and I used the wrong ones in > > + r285390, so fix that. Values are all the same other than kCGMomentumScrollPhaseEnd which is > > + now correct. > > Is the end phase being different detectable? I don't think it is currently. Since this is new test infrastructure I didn't try to make a regression test for that. 1812669 4 simon.fraser 2021-11-08 09:59:55 -0800 https://trac.webkit.org/changeset/285409/webkit 1812670 5 webkit-bug-importer 2021-11-08 10:00:24 -0800 <rdar://problem/85160514> 443524 2021-11-07 20:43:54 -0800 2021-11-08 09:53:35 -0800 Patch bug-232805-20211107204353.patch text/plain 6844 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MzkwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDYyOTcxYmM0OGMzYTM3MmEyZmQ3NTdkZGQ4ZWMxYjE0 Zjg4MDdiNi4uNDk2YWRlN2JhZTc1ZDY5ZmE1MzMxOTg2OGYxODk1MTMyY2JmMDZiMyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3 IEBACisyMDIxLTExLTA3ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgor CisgICAgICAgIEZpeCB0aGUgQ0dFdmVudCB0eXBlcyB1c2VkIGZvciB3aGVlbCBldmVudCBnZW5l cmF0aW9uIGZyb20gc3RyZWFtcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjMyODA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgVGhlIHNldCBvZiBlbnVtIHZhbHVlcyBmb3Igd2hlZWwgZXZlbnQgdHlwZXMg YXJlIGNvbmZ1c2luZywgYW5kIEkgdXNlZCB0aGUgd3Jvbmcgb25lcyBpbgorICAgICAgICByMjg1 MzkwLCBzbyBmaXggdGhhdC4gVmFsdWVzIGFyZSBhbGwgdGhlIHNhbWUgb3RoZXIgdGhhbiBrQ0dN b21lbnR1bVNjcm9sbFBoYXNlRW5kIHdoaWNoIGlzCisgICAgICAgIG5vdyBjb3JyZWN0LgorCisg ICAgICAgIEFsc28gcmVsYXggcGFyc2luZyBvZiBldmVudCBzdGVhbSBKU09OIHRvIGFsbG93ICJj b250aW51ZSIgZm9yIG1vbWVudHVtUGhhc2U7IHRoaXMgaXMgdGhlCisgICAgICAgIG5hbWUgb2Yg dGhlIENHLWxldmVsIGVudW0sIGJ1dCBBcHBLaXQgY2FsbHMgdGhpcyAiY2hhbmdlZCIuIFRoaXMg d2lsbCBlYXNlIGNvbnZlcnNpb24gZnJvbQorICAgICAgICBldmVudFNlbmRlciBpbiB0ZXN0cy4K KworICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvbWFjL0V2ZW50U2VuZGVyUHJveHkubW06Cisg ICAgICAgIChXVFI6OmNnU2Nyb2xsUGhhc2VGcm9tUGhhc2UpOgorICAgICAgICAoV1RSOjpjZ01v bWVudHVtUGhhc2VGcm9tUGhhc2UpOgorICAgICAgICAoV1RSOjpFdmVudFNlbmRlclByb3h5Ojpz ZW5kV2hlZWxFdmVudCk6CisgICAgICAgIChXVFI6OmNnR2VzdHVyZVBoYXNlRnJvbVN0cmluZyk6 IERlbGV0ZWQuCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9tYWMvVUlTY3JpcHRDb250cm9s bGVyTWFjLm1tOgorICAgICAgICAoV1RSOjpldmVudFBoYXNlRnJvbVN0cmluZyk6CisgICAgICAg IChXVFI6OlVJU2NyaXB0Q29udHJvbGxlck1hYzo6c2VuZEV2ZW50U3RyZWFtKToKKwogMjAyMS0x MS0wNyAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBJ bXBsZW1lbnQgVUlTY3JpcHRDb250cm9sbGVyLnNlbmRFdmVudFN0cmVhbSgpIG9uIG1hY09TIGZv ciB3aGVlbCBldmVudHMKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvbWFjL0V2 ZW50U2VuZGVyUHJveHkubW0gYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL21hYy9FdmVudFNlbmRl clByb3h5Lm1tCmluZGV4IGY3YTUzNWQ5MjhhMjAwM2IzNTI0ZWM2NzNkMTJmOGIwYWYwNWJiOTku LjdlNzU4NWU2OTk2NjNlNWJkYzgyODRlNGUzNTQwODE4NzQyMTAyYWIgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1dlYktpdFRlc3RSdW5uZXIvbWFjL0V2ZW50U2VuZGVyUHJveHkubW0KKysrIGIvVG9vbHMv V2ViS2l0VGVzdFJ1bm5lci9tYWMvRXZlbnRTZW5kZXJQcm94eS5tbQpAQCAtNzUzLDQ2ICs3NTMs NDQgQEAgdm9pZCBFdmVudFNlbmRlclByb3h5Ojptb3VzZVNjcm9sbEJ5V2l0aFdoZWVsQW5kTW9t ZW50dW1QaGFzZXMoaW50IHgsIGludCB5LCBpbnQKICAgICB9CiB9CiAKLQotc3RhdGljIENHU2Ny b2xsUGhhc2UgY2dTY3JvbGxQaGFzZUZyb21QaGFzZShFdmVudFNlbmRlclByb3h5OjpXaGVlbEV2 ZW50UGhhc2UgcGhhc2UpCitzdGF0aWMgQ0dHZXN0dXJlUGhhc2UgY2dTY3JvbGxQaGFzZUZyb21Q aGFzZShFdmVudFNlbmRlclByb3h5OjpXaGVlbEV2ZW50UGhhc2UgcGhhc2UpCiB7CiAgICAgc3dp dGNoIChwaGFzZSkgewogICAgIGNhc2UgRXZlbnRTZW5kZXJQcm94eTo6V2hlZWxFdmVudFBoYXNl OjpOb25lOgotICAgICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8Q0dTY3JvbGxQaGFzZT4oMCk7Cisg ICAgICAgIHJldHVybiBrQ0dHZXN0dXJlUGhhc2VOb25lOwogICAgIGNhc2UgRXZlbnRTZW5kZXJQ cm94eTo6V2hlZWxFdmVudFBoYXNlOjpCZWdhbjoKLSAgICAgICAgcmV0dXJuIGtDR1Njcm9sbFBo YXNlQmVnYW47CisgICAgICAgIHJldHVybiBrQ0dHZXN0dXJlUGhhc2VCZWdhbjsKICAgICBjYXNl IEV2ZW50U2VuZGVyUHJveHk6OldoZWVsRXZlbnRQaGFzZTo6Q2hhbmdlZDoKLSAgICAgICAgcmV0 dXJuIGtDR1Njcm9sbFBoYXNlQ2hhbmdlZDsKKyAgICAgICAgcmV0dXJuIGtDR0dlc3R1cmVQaGFz ZUNoYW5nZWQ7CiAgICAgY2FzZSBFdmVudFNlbmRlclByb3h5OjpXaGVlbEV2ZW50UGhhc2U6OkVu ZGVkOgotICAgICAgICByZXR1cm4ga0NHU2Nyb2xsUGhhc2VFbmRlZDsKKyAgICAgICAgcmV0dXJu IGtDR0dlc3R1cmVQaGFzZUVuZGVkOwogICAgIGNhc2UgRXZlbnRTZW5kZXJQcm94eTo6V2hlZWxF dmVudFBoYXNlOjpDYW5jZWxsZWQ6Ci0gICAgICAgIHJldHVybiBrQ0dTY3JvbGxQaGFzZUNhbmNl bGxlZDsKKyAgICAgICAgcmV0dXJuIGtDR0dlc3R1cmVQaGFzZUNhbmNlbGxlZDsKICAgICBjYXNl IEV2ZW50U2VuZGVyUHJveHk6OldoZWVsRXZlbnRQaGFzZTo6TWF5QmVnaW46Ci0gICAgICAgIHJl dHVybiBrQ0dTY3JvbGxQaGFzZU1heUJlZ2luOworICAgICAgICByZXR1cm4ga0NHR2VzdHVyZVBo YXNlTWF5QmVnaW47CiAgICAgfQogICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgIHJldHVy biBzdGF0aWNfY2FzdDxDR1Njcm9sbFBoYXNlPigwKTsKKyAgICByZXR1cm4ga0NHR2VzdHVyZVBo YXNlTm9uZTsKIH0KIAotc3RhdGljIENHR2VzdHVyZVBoYXNlIGNnR2VzdHVyZVBoYXNlRnJvbVN0 cmluZyhFdmVudFNlbmRlclByb3h5OjpXaGVlbEV2ZW50UGhhc2UgcGhhc2UpCitzdGF0aWMgQ0dN b21lbnR1bVNjcm9sbFBoYXNlIGNnTW9tZW50dW1QaGFzZUZyb21QaGFzZShFdmVudFNlbmRlclBy b3h5OjpXaGVlbEV2ZW50UGhhc2UgcGhhc2UpCiB7CiAgICAgc3dpdGNoIChwaGFzZSkgewogICAg IGNhc2UgRXZlbnRTZW5kZXJQcm94eTo6V2hlZWxFdmVudFBoYXNlOjpOb25lOgotICAgICAgICBy ZXR1cm4ga0NHR2VzdHVyZVBoYXNlTm9uZTsKKyAgICAgICAgcmV0dXJuIGtDR01vbWVudHVtU2Ny b2xsUGhhc2VOb25lOwogICAgIGNhc2UgRXZlbnRTZW5kZXJQcm94eTo6V2hlZWxFdmVudFBoYXNl OjpCZWdhbjoKLSAgICAgICAgcmV0dXJuIGtDR0dlc3R1cmVQaGFzZUJlZ2FuOworICAgICAgICBy ZXR1cm4ga0NHTW9tZW50dW1TY3JvbGxQaGFzZUJlZ2luOwogICAgIGNhc2UgRXZlbnRTZW5kZXJQ cm94eTo6V2hlZWxFdmVudFBoYXNlOjpDaGFuZ2VkOgotICAgICAgICByZXR1cm4ga0NHR2VzdHVy ZVBoYXNlQ2hhbmdlZDsKKyAgICAgICAgcmV0dXJuIGtDR01vbWVudHVtU2Nyb2xsUGhhc2VDb250 aW51ZTsKICAgICBjYXNlIEV2ZW50U2VuZGVyUHJveHk6OldoZWVsRXZlbnRQaGFzZTo6RW5kZWQ6 Ci0gICAgICAgIHJldHVybiBrQ0dHZXN0dXJlUGhhc2VFbmRlZDsKKyAgICAgICAgcmV0dXJuIGtD R01vbWVudHVtU2Nyb2xsUGhhc2VFbmQ7CiAgICAgY2FzZSBFdmVudFNlbmRlclByb3h5OjpXaGVl bEV2ZW50UGhhc2U6OkNhbmNlbGxlZDoKLSAgICAgICAgcmV0dXJuIGtDR0dlc3R1cmVQaGFzZUNh bmNlbGxlZDsKICAgICBjYXNlIEV2ZW50U2VuZGVyUHJveHk6OldoZWVsRXZlbnRQaGFzZTo6TWF5 QmVnaW46Ci0gICAgICAgIHJldHVybiBrQ0dHZXN0dXJlUGhhc2VNYXlCZWdpbjsKKyAgICAgICAg YnJlYWs7CiAgICAgfQogCiAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgcmV0dXJuIGtD R0dlc3R1cmVQaGFzZU5vbmU7CisgICAgcmV0dXJuIGtDR01vbWVudHVtU2Nyb2xsUGhhc2VOb25l OwogfQogCiB2b2lkIEV2ZW50U2VuZGVyUHJveHk6OnNlbmRXaGVlbEV2ZW50KEV2ZW50VGltZXN0 YW1wIHRpbWVzdGFtcCwgZG91YmxlIHdpbmRvd1gsIGRvdWJsZSB3aW5kb3dZLCBkb3VibGUgZGVs dGFYLCBkb3VibGUgZGVsdGFZLCBXaGVlbEV2ZW50UGhhc2UgcGhhc2UsIFdoZWVsRXZlbnRQaGFz ZSBtb21lbnR1bVBoYXNlKQpAQCAtODA5LDcgKzgwNyw3IEBAIHZvaWQgRXZlbnRTZW5kZXJQcm94 eTo6c2VuZFdoZWVsRXZlbnQoRXZlbnRUaW1lc3RhbXAgdGltZXN0YW1wLCBkb3VibGUgd2luZG93 WCwKIAogICAgIENHRXZlbnRTZXRJbnRlZ2VyVmFsdWVGaWVsZChjZ1Njcm9sbEV2ZW50LmdldCgp LCBrQ0dTY3JvbGxXaGVlbEV2ZW50SXNDb250aW51b3VzLCAxKTsKICAgICBDR0V2ZW50U2V0SW50 ZWdlclZhbHVlRmllbGQoY2dTY3JvbGxFdmVudC5nZXQoKSwga0NHU2Nyb2xsV2hlZWxFdmVudFNj cm9sbFBoYXNlLCBjZ1Njcm9sbFBoYXNlRnJvbVBoYXNlKHBoYXNlKSk7Ci0gICAgQ0dFdmVudFNl dEludGVnZXJWYWx1ZUZpZWxkKGNnU2Nyb2xsRXZlbnQuZ2V0KCksIGtDR1Njcm9sbFdoZWVsRXZl bnRNb21lbnR1bVBoYXNlLCBjZ0dlc3R1cmVQaGFzZUZyb21TdHJpbmcobW9tZW50dW1QaGFzZSkp OworICAgIENHRXZlbnRTZXRJbnRlZ2VyVmFsdWVGaWVsZChjZ1Njcm9sbEV2ZW50LmdldCgpLCBr Q0dTY3JvbGxXaGVlbEV2ZW50TW9tZW50dW1QaGFzZSwgY2dNb21lbnR1bVBoYXNlRnJvbVBoYXNl KG1vbWVudHVtUGhhc2UpKTsKIAogICAgIE5TRXZlbnQqIGV2ZW50ID0gW05TRXZlbnQgZXZlbnRX aXRoQ0dFdmVudDpjZ1Njcm9sbEV2ZW50LmdldCgpXTsKICAgICAvLyBPdXIgZXZlbnQgc2hvdWxk IGhhdmUgdGhlIGNvcnJlY3Qgc2V0dGluZ3M6CmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0 UnVubmVyL21hYy9VSVNjcmlwdENvbnRyb2xsZXJNYWMubW0gYi9Ub29scy9XZWJLaXRUZXN0UnVu bmVyL21hYy9VSVNjcmlwdENvbnRyb2xsZXJNYWMubW0KaW5kZXggN2EyNTRkZTg1M2ZjMjIxMjg3 ZmU0MTE4NzM3NTY2YzJjYmVlNjM4Yi4uYzlhODk3NTRiMTM1YzQ2NThlZDRkNDA2Y2E5MWJkOThm NzFmNzdjMCAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9tYWMvVUlTY3JpcHRD b250cm9sbGVyTWFjLm1tCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvbWFjL1VJU2NyaXB0 Q29udHJvbGxlck1hYy5tbQpAQCAtMzIxLDcgKzMyMSw3IEBAIHN0YXRpYyBFdmVudFNlbmRlclBy b3h5OjpXaGVlbEV2ZW50UGhhc2UgZXZlbnRQaGFzZUZyb21TdHJpbmcoTlNTdHJpbmcgKnBoYXNl U3RyCiB7CiAgICAgaWYgKFtwaGFzZVN0ciBpc0VxdWFsVG9TdHJpbmc6QCJiZWdhbiJdKQogICAg ICAgICByZXR1cm4gRXZlbnRTZW5kZXJQcm94eTo6V2hlZWxFdmVudFBoYXNlOjpCZWdhbjsKLSAg ICBpZiAoW3BoYXNlU3RyIGlzRXF1YWxUb1N0cmluZzpAImNoYW5nZWQiXSkKKyAgICBpZiAoW3Bo YXNlU3RyIGlzRXF1YWxUb1N0cmluZzpAImNoYW5nZWQiXSB8fCBbcGhhc2VTdHIgaXNFcXVhbFRv U3RyaW5nOkAiY29udGludWUiXSkgLy8gQWxsb3cgImNvbnRpbnVlIiBmb3IgZWFzZSBvZiBjb252 ZXJzaW9uIGZyb20gbW91c2VTY3JvbGxCeVdpdGhXaGVlbEFuZE1vbWVudHVtUGhhc2VzIHZhbHVl cy4KICAgICAgICAgcmV0dXJuIEV2ZW50U2VuZGVyUHJveHk6OldoZWVsRXZlbnRQaGFzZTo6Q2hh bmdlZDsKICAgICBpZiAoW3BoYXNlU3RyIGlzRXF1YWxUb1N0cmluZzpAImVuZGVkIl0pCiAgICAg ICAgIHJldHVybiBFdmVudFNlbmRlclByb3h5OjpXaGVlbEV2ZW50UGhhc2U6OkVuZGVkOwpAQCAt MzgxLDggKzM4MSwxMyBAQCB2b2lkIFVJU2NyaXB0Q29udHJvbGxlck1hYzo6c2VuZEV2ZW50U3Ry ZWFtKEpTU3RyaW5nUmVmIGV2ZW50c0pTT04sIEpTVmFsdWVSZWYgYwogICAgICAgICAgICAgaWYg KGlkIHBoYXNlU3RyaW5nID0gZXZlbnRbUGhhc2VLZXldKQogICAgICAgICAgICAgICAgIHBoYXNl ID0gZXZlbnRQaGFzZUZyb21TdHJpbmcocGhhc2VTdHJpbmcpOwogCi0gICAgICAgICAgICBpZiAo aWQgcGhhc2VTdHJpbmcgPSBldmVudFtNb21lbnR1bVBoYXNlS2V5XSkKKyAgICAgICAgICAgIGlm IChpZCBwaGFzZVN0cmluZyA9IGV2ZW50W01vbWVudHVtUGhhc2VLZXldKSB7CiAgICAgICAgICAg ICAgICAgbW9tZW50dW1QaGFzZSA9IGV2ZW50UGhhc2VGcm9tU3RyaW5nKHBoYXNlU3RyaW5nKTsK KyAgICAgICAgICAgICAgICBpZiAobW9tZW50dW1QaGFzZSA9PSBFdmVudFNlbmRlclByb3h5OjpX aGVlbEV2ZW50UGhhc2U6OkNhbmNlbGxlZCB8fCBtb21lbnR1bVBoYXNlID09IEV2ZW50U2VuZGVy UHJveHk6OldoZWVsRXZlbnRQaGFzZTo6TWF5QmVnaW4pIHsKKyAgICAgICAgICAgICAgICAgICAg V1RGTG9nQWx3YXlzKCJJbnZhbGlkIHZhbHVlICVAIGZvciBtb21lbnR1bVBoYXNlIiwgcGhhc2VT dHJpbmcpOworICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgICAgICB9Cisg ICAgICAgICAgICB9CiAKICAgICAgICAgICAgIEFTU0VSVF9JTVBMSUVTKHBoYXNlID09IEV2ZW50 U2VuZGVyUHJveHk6OldoZWVsRXZlbnRQaGFzZTo6Tm9uZSwgbW9tZW50dW1QaGFzZSAhPSBFdmVu dFNlbmRlclByb3h5OjpXaGVlbEV2ZW50UGhhc2U6Ok5vbmUpOwogICAgICAgICAgICAgQVNTRVJU X0lNUExJRVMobW9tZW50dW1QaGFzZSA9PSBFdmVudFNlbmRlclByb3h5OjpXaGVlbEV2ZW50UGhh c2U6Ok5vbmUsIHBoYXNlICE9IEV2ZW50U2VuZGVyUHJveHk6OldoZWVsRXZlbnRQaGFzZTo6Tm9u ZSk7Cg==