227701 2021-07-06 04:27:31 -0700 [GTK] Touch navigation gesture triggers kinetic scrolling when cancelling 2021-07-12 08:24:07 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 alicem webkit-unassigned bugs-noreply mcatanzaro oldest_to_newest 1774918 0 alicem 2021-07-06 04:27:31 -0700 Another very specific bug. See the patch. 1774919 1 432918 alicem 2021-07-06 04:31:20 -0700 Created attachment 432918 Patch 1774927 2 432918 mcatanzaro 2021-07-06 06:15:04 -0700 Comment on attachment 432918 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=432918&action=review > Source/WebKit/ChangeLog:11 > + Move the navigatoin swipe ending from drag-end to swipe signal handler, since navigation 1774928 3 432920 alicem 2021-07-06 06:16:25 -0700 Created attachment 432920 Patch Fixed. 1775078 4 alicem 2021-07-06 14:10:04 -0700 Oh right, it also doesn't apply without https://bugs.webkit.org/show_bug.cgi?id=227691. These fixes sadly all change the same areas, in retrospect maybe they should have all been one bug... 1776323 5 ews-feeder 2021-07-12 08:24:04 -0700 Committed r279827 (239588@main): <https://commits.webkit.org/239588@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 432920. 432918 2021-07-06 04:31:20 -0700 2021-07-06 06:16:25 -0700 Patch 0001-Patch.patch text/plain 4460 alicem RnJvbSBhMWFjYzVjZjdiZGQxMjY4M2RjOWVlNjI0N2FiMjhmMGU0NTJjOWI0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGV4YW5kZXIgTWlraGF5bGVua28gPGFsZXhtQGdub21lLm9y Zz4KRGF0ZTogVHVlLCA2IEp1bCAyMDIxIDE2OjMwOjA0ICswNTAwClN1YmplY3Q6IFtQQVRDSF0g UGF0Y2gKCi0tLQogU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAg IHwgMTkgKysrKysrKysrKysrKysrKysrKwogLi4uL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdl YlZpZXdCYXNlLmNwcCAgIHwgMTUgKysrKysrKystLS0tLS0tCiAuLi4vZ3RrL1ZpZXdHZXN0dXJl Q29udHJvbGxlckd0ay5jcHAgICAgICAgICAgfCAgMiArLQogMyBmaWxlcyBjaGFuZ2VkLCAyOCBp bnNlcnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv Q2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggNjY0YWU5ZmI4NWM5Li41 NzEwZDg5N2RhYzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjEtMDctMDYgIEFsZXhh bmRlciBNaWtoYXlsZW5rbyAgPGFsZXhtQGdub21lLm9yZz4KKworICAgICAgICBbR1RLXSBUb3Vj aCBuYXZpZ2F0aW9uIGdlc3R1cmUgdHJpZ2dlcnMga2luZXRpYyBzY3JvbGxpbmcgd2hlbiBjYW5j ZWxsaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y Mjc3MDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBN YWtlIHN1cmUgYW4gZXZlbnQgdGhhdCBoYXMgZmluaXNoZWQgYSBuYXZpZ2F0aW9uIHN3aXBlIGdl c3R1cmUgaXNuJ3QgcHJvcGFnYXRlZAorICAgICAgICB0byB0aGUgcGFnZSB0cmlnZ2VyaW5nIGtp bmV0aWMgc2Nyb2xsaW5nLgorCisgICAgICAgIE1vdmUgdGhlIG5hdmlnYXRvaW4gc3dpcGUgZW5k aW5nIGZyb20gZHJhZy1lbmQgdG8gc3dpcGUgc2lnbmFsIGhhbmRsZXIsIHNpbmNlCisgICAgICAg IHRoYXQncyB3aGVyZSBraW5ldGljIHNjcm9sbGluZyBpcyBoYW5kbGVkIGFuZCB3ZSBjYW4gc3Rv cCBpdC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNw cDoKKyAgICAgICAgKHdlYmtpdFdlYlZpZXdCYXNlVG91Y2hEcmFnRW5kKToKKyAgICAgICAgKHdl YmtpdFdlYlZpZXdCYXNlVG91Y2hTd2lwZSk6CisgICAgICAgICogVUlQcm9jZXNzL2d0ay9WaWV3 R2VzdHVyZUNvbnRyb2xsZXJHdGsuY3BwOgorICAgICAgICAoV2ViS2l0OjpWaWV3R2VzdHVyZUNv bnRyb2xsZXI6OlN3aXBlUHJvZ3Jlc3NUcmFja2VyOjpoYW5kbGVFdmVudCk6CisKIDIwMjEtMDct MDYgIEFsZXhhbmRlciBNaWtoYXlsZW5rbyAgPGFsZXhtQGdub21lLm9yZz4KIAogICAgICAgICBb R1RLXSBUb3VjaHNjcmVlbiBuYXZpZ2F0aW9uIHN3aXBlIGRvZXNuJ3Qgd29yayB3aGVuIHRoZSBw YWdlIHNjcm9sbHMgaG9yaXpvbnRhbGx5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2UuY3BwCmluZGV4IDI0OTQ2ZmExYjMzZC4uNzJl NGUxNjA0MzIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dl YktpdFdlYlZpZXdCYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3Rr L1dlYktpdFdlYlZpZXdCYXNlLmNwcApAQCAtMjAxMiwxMyArMjAxMiw2IEBAIHN0YXRpYyB2b2lk IHdlYmtpdFdlYlZpZXdCYXNlVG91Y2hEcmFnRW5kKFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJWaWV3 QmFzZSwgZ2RvdWJsCiAgICAgICAgIGd0a19nZXN0dXJlX2RyYWdfZ2V0X3N0YXJ0X3BvaW50KEdU S19HRVNUVVJFX0RSQUcoZ2VzdHVyZSksICZ4LCAmeSk7CiAgICAgICAgIHVuc2lnbmVkIG1vZGlm aWVycyA9IGd0a19ldmVudF9jb250cm9sbGVyX2dldF9jdXJyZW50X2V2ZW50X3N0YXRlKEdUS19F VkVOVF9DT05UUk9MTEVSKGdlc3R1cmUpKTsKICAgICAgICAgd2Via2l0V2ViVmlld0Jhc2VTeW50 aGVzaXplTW91c2VFdmVudCh3ZWJWaWV3QmFzZSwgTW91c2VFdmVudFR5cGU6OlJlbGVhc2UsIEdE S19CVVRUT05fUFJJTUFSWSwgR0RLX0JVVFRPTjFfTUFTSywgeCArIG9mZnNldFgsIHkgKyBvZmZz ZXRZLCBtb2RpZmllcnMsIDAsIHRvdWNoUG9pbnRlckV2ZW50VHlwZSgpKTsKLSAgICB9IGVsc2Ug ewotICAgICAgICBWaWV3R2VzdHVyZUNvbnRyb2xsZXIqIGNvbnRyb2xsZXIgPSB3ZWJraXRXZWJW aWV3QmFzZVZpZXdHZXN0dXJlQ29udHJvbGxlcih3ZWJWaWV3QmFzZSk7Ci0gICAgICAgIGlmIChj b250cm9sbGVyICYmIGNvbnRyb2xsZXItPmlzU3dpcGVHZXN0dXJlRW5hYmxlZCgpKSB7Ci0gICAg ICAgICAgICBpbnQzMl90IGV2ZW50VGltZSA9IHN0YXRpY19jYXN0PGludDMyX3Q+KGd0a19ldmVu dF9jb250cm9sbGVyX2dldF9jdXJyZW50X2V2ZW50X3RpbWUoR1RLX0VWRU5UX0NPTlRST0xMRVIo Z2VzdHVyZSkpKTsKLSAgICAgICAgICAgIFBsYXRmb3JtR3RrU2Nyb2xsRGF0YSBzY3JvbGxEYXRh ID0geyAuZGVsdGEgPSBGbG9hdFNpemUoKSwgLmV2ZW50VGltZSA9IGV2ZW50VGltZSwgLnNvdXJj ZSA9IEdES19TT1VSQ0VfVE9VQ0hTQ1JFRU4sIC5pc0VuZCA9IHRydWUgfTsKLSAgICAgICAgICAg IGNvbnRyb2xsZXItPmhhbmRsZVNjcm9sbFdoZWVsRXZlbnQoJnNjcm9sbERhdGEpOwotICAgICAg ICB9CiAgICAgfQogfQogCkBAIC0yMDM4LDYgKzIwMzEsMTQgQEAgc3RhdGljIHZvaWQgd2Via2l0 V2ViVmlld0Jhc2VUb3VjaFN3aXBlKFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJWaWV3QmFzZSwgZ2Rv dWJsZQogICAgIGlmIChndGtfZ2VzdHVyZV9nZXRfcG9pbnQoZ2VzdHVyZSwgZ3RrX2dlc3R1cmVf c2luZ2xlX2dldF9jdXJyZW50X3NlcXVlbmNlKEdUS19HRVNUVVJFX1NJTkdMRShnZXN0dXJlKSks ICZ4LCAmeSkpIHsKICAgICAgICAgR2RrRXZlbnQqIGV2ZW50ID0gZ3RrX2V2ZW50X2NvbnRyb2xs ZXJfZ2V0X2N1cnJlbnRfZXZlbnQoR1RLX0VWRU5UX0NPTlRST0xMRVIoZ2VzdHVyZSkpOwogCisg ICAgICAgIFZpZXdHZXN0dXJlQ29udHJvbGxlciogY29udHJvbGxlciA9IHdlYmtpdFdlYlZpZXdC YXNlVmlld0dlc3R1cmVDb250cm9sbGVyKHdlYlZpZXdCYXNlKTsKKyAgICAgICAgaWYgKGNvbnRy b2xsZXIgJiYgY29udHJvbGxlci0+aXNTd2lwZUdlc3R1cmVFbmFibGVkKCkpIHsKKyAgICAgICAg ICAgIGludDMyX3QgZXZlbnRUaW1lID0gc3RhdGljX2Nhc3Q8aW50MzJfdD4oZ3RrX2V2ZW50X2Nv bnRyb2xsZXJfZ2V0X2N1cnJlbnRfZXZlbnRfdGltZShHVEtfRVZFTlRfQ09OVFJPTExFUihnZXN0 dXJlKSkpOworICAgICAgICAgICAgUGxhdGZvcm1HdGtTY3JvbGxEYXRhIHNjcm9sbERhdGEgPSB7 IC5kZWx0YSA9IEZsb2F0U2l6ZSgpLCAuZXZlbnRUaW1lID0gZXZlbnRUaW1lLCAuc291cmNlID0g R0RLX1NPVVJDRV9UT1VDSFNDUkVFTiwgLmlzRW5kID0gdHJ1ZSB9OworICAgICAgICAgICAgaWYg KGNvbnRyb2xsZXItPmhhbmRsZVNjcm9sbFdoZWVsRXZlbnQoJnNjcm9sbERhdGEpKQorICAgICAg ICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCiAgICAgICAgIHdlYmtpdFdlYlZpZXdCYXNl U3ludGhlc2l6ZVdoZWVsRXZlbnQod2ViVmlld0Jhc2UsIGV2ZW50LCAtdmVsb2NpdHlYLCAtdmVs b2NpdHlZLCB4LCB5LCBXaGVlbEV2ZW50UGhhc2U6Ok5vUGhhc2UsIFdoZWVsRXZlbnRQaGFzZTo6 QmVnYW4pOwogICAgIH0KIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0 ay9WaWV3R2VzdHVyZUNvbnRyb2xsZXJHdGsuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv Z3RrL1ZpZXdHZXN0dXJlQ29udHJvbGxlckd0ay5jcHAKaW5kZXggMzVlYTEwMzhjOTI3Li5lY2U0 ODZhOTYwYTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9WaWV3R2Vz dHVyZUNvbnRyb2xsZXJHdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9W aWV3R2VzdHVyZUNvbnRyb2xsZXJHdGsuY3BwCkBAIC0xNzYsNyArMTc2LDcgQEAgYm9vbCBWaWV3 R2VzdHVyZUNvbnRyb2xsZXI6OlN3aXBlUHJvZ3Jlc3NUcmFja2VyOjpoYW5kbGVFdmVudChQbGF0 Zm9ybUd0a1Njcm9sbEQKIAogICAgIGlmIChpc0V2ZW50U3RvcChldmVudCkpIHsKICAgICAgICAg c3RhcnRBbmltYXRpb24oKTsKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICByZXR1cm4g dHJ1ZTsKICAgICB9CiAKICAgICB1aW50MzJfdCBldmVudFRpbWUgPSBldmVudC0+ZXZlbnRUaW1l OwotLSAKMi4zMS4xCgo= 432920 2021-07-06 06:16:25 -0700 2021-07-12 08:24:05 -0700 Patch 0001-Patch.patch text/plain 4460 alicem RnJvbSBhMWFjYzVjZjdiZGQxMjY4M2RjOWVlNjI0N2FiMjhmMGU0NTJjOWI0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGV4YW5kZXIgTWlraGF5bGVua28gPGFsZXhtQGdub21lLm9y Zz4KRGF0ZTogVHVlLCA2IEp1bCAyMDIxIDE2OjMwOjA0ICswNTAwClN1YmplY3Q6IFtQQVRDSF0g UGF0Y2gKCi0tLQogU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAg IHwgMTkgKysrKysrKysrKysrKysrKysrKwogLi4uL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdl YlZpZXdCYXNlLmNwcCAgIHwgMTUgKysrKysrKystLS0tLS0tCiAuLi4vZ3RrL1ZpZXdHZXN0dXJl Q29udHJvbGxlckd0ay5jcHAgICAgICAgICAgfCAgMiArLQogMyBmaWxlcyBjaGFuZ2VkLCAyOCBp bnNlcnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv Q2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggNjY0YWU5ZmI4NWM5Li41 NzEwZDg5N2RhYzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjEtMDctMDYgIEFsZXhh bmRlciBNaWtoYXlsZW5rbyAgPGFsZXhtQGdub21lLm9yZz4KKworICAgICAgICBbR1RLXSBUb3Vj aCBuYXZpZ2F0aW9uIGdlc3R1cmUgdHJpZ2dlcnMga2luZXRpYyBzY3JvbGxpbmcgd2hlbiBjYW5j ZWxsaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y Mjc3MDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBN YWtlIHN1cmUgYW4gZXZlbnQgdGhhdCBoYXMgZmluaXNoZWQgYSBuYXZpZ2F0aW9uIHN3aXBlIGdl c3R1cmUgaXNuJ3QgcHJvcGFnYXRlZAorICAgICAgICB0byB0aGUgcGFnZSB0cmlnZ2VyaW5nIGtp bmV0aWMgc2Nyb2xsaW5nLgorCisgICAgICAgIE1vdmUgdGhlIG5hdmlnYXRpb24gc3dpcGUgZW5k aW5nIGZyb20gZHJhZy1lbmQgdG8gc3dpcGUgc2lnbmFsIGhhbmRsZXIsIHNpbmNlCisgICAgICAg IHRoYXQncyB3aGVyZSBraW5ldGljIHNjcm9sbGluZyBpcyBoYW5kbGVkIGFuZCB3ZSBjYW4gc3Rv cCBpdC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNw cDoKKyAgICAgICAgKHdlYmtpdFdlYlZpZXdCYXNlVG91Y2hEcmFnRW5kKToKKyAgICAgICAgKHdl YmtpdFdlYlZpZXdCYXNlVG91Y2hTd2lwZSk6CisgICAgICAgICogVUlQcm9jZXNzL2d0ay9WaWV3 R2VzdHVyZUNvbnRyb2xsZXJHdGsuY3BwOgorICAgICAgICAoV2ViS2l0OjpWaWV3R2VzdHVyZUNv bnRyb2xsZXI6OlN3aXBlUHJvZ3Jlc3NUcmFja2VyOjpoYW5kbGVFdmVudCk6CisKIDIwMjEtMDct MDYgIEFsZXhhbmRlciBNaWtoYXlsZW5rbyAgPGFsZXhtQGdub21lLm9yZz4KIAogICAgICAgICBb R1RLXSBUb3VjaHNjcmVlbiBuYXZpZ2F0aW9uIHN3aXBlIGRvZXNuJ3Qgd29yayB3aGVuIHRoZSBw YWdlIHNjcm9sbHMgaG9yaXpvbnRhbGx5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2UuY3BwCmluZGV4IDI0OTQ2ZmExYjMzZC4uNzJl NGUxNjA0MzIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dl YktpdFdlYlZpZXdCYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3Rr L1dlYktpdFdlYlZpZXdCYXNlLmNwcApAQCAtMjAxMiwxMyArMjAxMiw2IEBAIHN0YXRpYyB2b2lk IHdlYmtpdFdlYlZpZXdCYXNlVG91Y2hEcmFnRW5kKFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJWaWV3 QmFzZSwgZ2RvdWJsCiAgICAgICAgIGd0a19nZXN0dXJlX2RyYWdfZ2V0X3N0YXJ0X3BvaW50KEdU S19HRVNUVVJFX0RSQUcoZ2VzdHVyZSksICZ4LCAmeSk7CiAgICAgICAgIHVuc2lnbmVkIG1vZGlm aWVycyA9IGd0a19ldmVudF9jb250cm9sbGVyX2dldF9jdXJyZW50X2V2ZW50X3N0YXRlKEdUS19F VkVOVF9DT05UUk9MTEVSKGdlc3R1cmUpKTsKICAgICAgICAgd2Via2l0V2ViVmlld0Jhc2VTeW50 aGVzaXplTW91c2VFdmVudCh3ZWJWaWV3QmFzZSwgTW91c2VFdmVudFR5cGU6OlJlbGVhc2UsIEdE S19CVVRUT05fUFJJTUFSWSwgR0RLX0JVVFRPTjFfTUFTSywgeCArIG9mZnNldFgsIHkgKyBvZmZz ZXRZLCBtb2RpZmllcnMsIDAsIHRvdWNoUG9pbnRlckV2ZW50VHlwZSgpKTsKLSAgICB9IGVsc2Ug ewotICAgICAgICBWaWV3R2VzdHVyZUNvbnRyb2xsZXIqIGNvbnRyb2xsZXIgPSB3ZWJraXRXZWJW aWV3QmFzZVZpZXdHZXN0dXJlQ29udHJvbGxlcih3ZWJWaWV3QmFzZSk7Ci0gICAgICAgIGlmIChj b250cm9sbGVyICYmIGNvbnRyb2xsZXItPmlzU3dpcGVHZXN0dXJlRW5hYmxlZCgpKSB7Ci0gICAg ICAgICAgICBpbnQzMl90IGV2ZW50VGltZSA9IHN0YXRpY19jYXN0PGludDMyX3Q+KGd0a19ldmVu dF9jb250cm9sbGVyX2dldF9jdXJyZW50X2V2ZW50X3RpbWUoR1RLX0VWRU5UX0NPTlRST0xMRVIo Z2VzdHVyZSkpKTsKLSAgICAgICAgICAgIFBsYXRmb3JtR3RrU2Nyb2xsRGF0YSBzY3JvbGxEYXRh ID0geyAuZGVsdGEgPSBGbG9hdFNpemUoKSwgLmV2ZW50VGltZSA9IGV2ZW50VGltZSwgLnNvdXJj ZSA9IEdES19TT1VSQ0VfVE9VQ0hTQ1JFRU4sIC5pc0VuZCA9IHRydWUgfTsKLSAgICAgICAgICAg IGNvbnRyb2xsZXItPmhhbmRsZVNjcm9sbFdoZWVsRXZlbnQoJnNjcm9sbERhdGEpOwotICAgICAg ICB9CiAgICAgfQogfQogCkBAIC0yMDM4LDYgKzIwMzEsMTQgQEAgc3RhdGljIHZvaWQgd2Via2l0 V2ViVmlld0Jhc2VUb3VjaFN3aXBlKFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJWaWV3QmFzZSwgZ2Rv dWJsZQogICAgIGlmIChndGtfZ2VzdHVyZV9nZXRfcG9pbnQoZ2VzdHVyZSwgZ3RrX2dlc3R1cmVf c2luZ2xlX2dldF9jdXJyZW50X3NlcXVlbmNlKEdUS19HRVNUVVJFX1NJTkdMRShnZXN0dXJlKSks ICZ4LCAmeSkpIHsKICAgICAgICAgR2RrRXZlbnQqIGV2ZW50ID0gZ3RrX2V2ZW50X2NvbnRyb2xs ZXJfZ2V0X2N1cnJlbnRfZXZlbnQoR1RLX0VWRU5UX0NPTlRST0xMRVIoZ2VzdHVyZSkpOwogCisg ICAgICAgIFZpZXdHZXN0dXJlQ29udHJvbGxlciogY29udHJvbGxlciA9IHdlYmtpdFdlYlZpZXdC YXNlVmlld0dlc3R1cmVDb250cm9sbGVyKHdlYlZpZXdCYXNlKTsKKyAgICAgICAgaWYgKGNvbnRy b2xsZXIgJiYgY29udHJvbGxlci0+aXNTd2lwZUdlc3R1cmVFbmFibGVkKCkpIHsKKyAgICAgICAg ICAgIGludDMyX3QgZXZlbnRUaW1lID0gc3RhdGljX2Nhc3Q8aW50MzJfdD4oZ3RrX2V2ZW50X2Nv bnRyb2xsZXJfZ2V0X2N1cnJlbnRfZXZlbnRfdGltZShHVEtfRVZFTlRfQ09OVFJPTExFUihnZXN0 dXJlKSkpOworICAgICAgICAgICAgUGxhdGZvcm1HdGtTY3JvbGxEYXRhIHNjcm9sbERhdGEgPSB7 IC5kZWx0YSA9IEZsb2F0U2l6ZSgpLCAuZXZlbnRUaW1lID0gZXZlbnRUaW1lLCAuc291cmNlID0g R0RLX1NPVVJDRV9UT1VDSFNDUkVFTiwgLmlzRW5kID0gdHJ1ZSB9OworICAgICAgICAgICAgaWYg KGNvbnRyb2xsZXItPmhhbmRsZVNjcm9sbFdoZWVsRXZlbnQoJnNjcm9sbERhdGEpKQorICAgICAg ICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCiAgICAgICAgIHdlYmtpdFdlYlZpZXdCYXNl U3ludGhlc2l6ZVdoZWVsRXZlbnQod2ViVmlld0Jhc2UsIGV2ZW50LCAtdmVsb2NpdHlYLCAtdmVs b2NpdHlZLCB4LCB5LCBXaGVlbEV2ZW50UGhhc2U6Ok5vUGhhc2UsIFdoZWVsRXZlbnRQaGFzZTo6 QmVnYW4pOwogICAgIH0KIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0 ay9WaWV3R2VzdHVyZUNvbnRyb2xsZXJHdGsuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv Z3RrL1ZpZXdHZXN0dXJlQ29udHJvbGxlckd0ay5jcHAKaW5kZXggMzVlYTEwMzhjOTI3Li5lY2U0 ODZhOTYwYTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9WaWV3R2Vz dHVyZUNvbnRyb2xsZXJHdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9W aWV3R2VzdHVyZUNvbnRyb2xsZXJHdGsuY3BwCkBAIC0xNzYsNyArMTc2LDcgQEAgYm9vbCBWaWV3 R2VzdHVyZUNvbnRyb2xsZXI6OlN3aXBlUHJvZ3Jlc3NUcmFja2VyOjpoYW5kbGVFdmVudChQbGF0 Zm9ybUd0a1Njcm9sbEQKIAogICAgIGlmIChpc0V2ZW50U3RvcChldmVudCkpIHsKICAgICAgICAg c3RhcnRBbmltYXRpb24oKTsKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICByZXR1cm4g dHJ1ZTsKICAgICB9CiAKICAgICB1aW50MzJfdCBldmVudFRpbWUgPSBldmVudC0+ZXZlbnRUaW1l OwotLSAKMi4zMS4xCgo=