210179 2020-04-08 03:02:25 -0700 [GTK] Drop usage of deprecated GdkDeviceManager 2020-04-08 05:26:14 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 210100 1 csaavedra csaavedra aperez webkit-bug-importer oldest_to_newest 1638991 0 csaavedra 2020-04-08 03:02:25 -0700 [GTK] Drop usage of deprecated GdkDeviceManager 1638992 1 395787 csaavedra 2020-04-08 03:06:45 -0700 Created attachment 395787 Patch 1638993 2 395787 aperez 2020-04-08 03:12:40 -0700 Comment on attachment 395787 Patch Please wait until the EWS passes before landing. Changes look good, so I expect there won't be any problems. BTW, I have double checked and the gdk_seat_*() functions have been introduced in GTK 3.20; and we are already requiring 3.22 as the minimum supported version—no changes needed in that regard =) 1639011 3 ews-feeder 2020-04-08 05:25:13 -0700 Committed r259713: <https://trac.webkit.org/changeset/259713> All reviewed patches have been landed. Closing bug and clearing flags on attachment 395787. 1639012 4 webkit-bug-importer 2020-04-08 05:26:14 -0700 <rdar://problem/61449213> 395787 2020-04-08 03:06:45 -0700 2020-04-08 05:25:14 -0700 Patch bug-210179-20200408130643.patch text/plain 12306 csaavedra U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5NjMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM2MDlmNzM3ZDQwYjE2NzEy ZmY5Zjk4NzMzMWI2Y2I3OWE3NDQxNmEuLmE2MGRlMGMzNmMwY2NkMmQ3Mjg2ZjE4YmY5ZWYzZDNi NWVhYjQ0MDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMjAtMDQtMDggIENsYXVkaW8g U2FhdmVkcmEgIDxjc2FhdmVkcmFAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBEcm9wIHVz YWdlIG9mIGRlcHJlY2F0ZWQgR2RrRGV2aWNlTWFuYWdlcgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEwMTc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVwbGFjZSBHZGtEZXZpY2VNYW5hZ2VyIHVzYWdl IGZvciBHZGtTZWF0LgorICAgICAgICBGb3IgR1RLNCBmdXJ0aGVyIGNoYW5nZXMgd2lsbCBiZSBu ZWVkZWQgYnV0IHRoaXMgaXMgYQorICAgICAgICBzdGFydC4KKworICAgICAgICAqIFVJUHJvY2Vz cy9ndGsvVmlld0dlc3R1cmVDb250cm9sbGVyR3RrLmNwcDoKKyAgICAgICAgKFdlYktpdDo6Y3Jl YXRlU2Nyb2xsRXZlbnQpOgorCiAyMDIwLTA0LTA3ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5j b20+CiAKICAgICAgICAgVXNlIEdsb2JhbEZyYW1lSWRlbnRpZmllciBpbiBOYXZpZ2F0aW9uQWN0 aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9ndGsvVmlld0dlc3R1cmVD b250cm9sbGVyR3RrLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9WaWV3R2VzdHVy ZUNvbnRyb2xsZXJHdGsuY3BwCmluZGV4IGY4MjlhZjAzYWMwNDE0M2Q4Mzk0YTdlN2Y4ZGJkZGMy N2UxOTI1N2QuLjM1MzU5YmQ3Y2NiMTkxMjZiZmNjYzZmZjRhODM4YTIxNzRjMWIyMGUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9WaWV3R2VzdHVyZUNvbnRyb2xsZXJH dGsuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9WaWV3R2VzdHVyZUNvbnRy b2xsZXJHdGsuY3BwCkBAIC01MzUsOCArNTM1LDEwIEBAIHN0YXRpYyBHVW5pcXVlUHRyPEdka0V2 ZW50PiBjcmVhdGVTY3JvbGxFdmVudChHdGtXaWRnZXQqIHdpZGdldCwgZG91YmxlIHhEZWx0YSwK ICAgICBldmVudC0+c2Nyb2xsLmlzX3N0b3AgPSAheERlbHRhICYmICF5RGVsdGE7CiAgICAgZXZl bnQtPnNjcm9sbC53aW5kb3cgPSBHREtfV0lORE9XKGdfb2JqZWN0X3JlZih3aW5kb3cpKTsKICAg ICBnZGtfZXZlbnRfc2V0X3NjcmVlbihldmVudC5nZXQoKSwgZ2RrX3dpbmRvd19nZXRfc2NyZWVu KHdpbmRvdykpOwotICAgIGdka19ldmVudF9zZXRfZGV2aWNlKGV2ZW50LmdldCgpLCBnZGtfZGV2 aWNlX21hbmFnZXJfZ2V0X2NsaWVudF9wb2ludGVyKGdka19kaXNwbGF5X2dldF9kZXZpY2VfbWFu YWdlcihnZGtfd2luZG93X2dldF9kaXNwbGF5KHdpbmRvdykpKSk7Ci0gICAgZ2RrX2V2ZW50X3Nl dF9zb3VyY2VfZGV2aWNlKGV2ZW50LmdldCgpLCBnZGtfZGV2aWNlX21hbmFnZXJfZ2V0X2NsaWVu dF9wb2ludGVyKGdka19kaXNwbGF5X2dldF9kZXZpY2VfbWFuYWdlcihnZGtfd2luZG93X2dldF9k aXNwbGF5KHdpbmRvdykpKSk7CisKKyAgICBHZGtEZXZpY2UqIHBvaW50ZXIgPSBnZGtfc2VhdF9n ZXRfcG9pbnRlcihnZGtfZGlzcGxheV9nZXRfZGVmYXVsdF9zZWF0KGdka193aW5kb3dfZ2V0X2Rp c3BsYXkod2luZG93KSkpOworICAgIGdka19ldmVudF9zZXRfZGV2aWNlKGV2ZW50LmdldCgpLCBw b2ludGVyKTsKKyAgICBnZGtfZXZlbnRfc2V0X3NvdXJjZV9kZXZpY2UoZXZlbnQuZ2V0KCksIHBv aW50ZXIpOwogCiAgICAgcmV0dXJuIGV2ZW50OwogfQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdl TG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDQzNDhjY2ZhYTYwOWI4MmZhZjZkN2YwNzMwNGFi NzQzODRmYTBjNWUuLjFkNmI2OTJjYTZlZGJmMDBiMDk0YjBiM2M2NjA3NzI2NDRlMTZiMGMgMTAw NjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwzMCBAQAorMjAyMC0wNC0wOCAgQ2xhdWRpbyBTYWF2ZWRyYSAgPGNzYWF2ZWRyYUBpZ2FsaWEu Y29tPgorCisgICAgICAgIFtHVEtdIERyb3AgdXNhZ2Ugb2YgZGVwcmVjYXRlZCBHZGtEZXZpY2VN YW5hZ2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MTAxNzkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBS ZXBsYWNlIEdka0RldmljZU1hbmFnZXIgdXNhZ2UgZm9yIEdka1NlYXQuCisgICAgICAgIEZvciBH VEs0IGZ1cnRoZXIgY2hhbmdlcyB3aWxsIGJlIG5lZWRlZCBidXQgdGhpcyBpcyBhCisgICAgICAg IHN0YXJ0LgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9nbGliL1dlYktpdEdMaWIvZ3RrL1dl YlZpZXdUZXN0R3RrLmNwcDoKKyAgICAgICAgKFdlYlZpZXdUZXN0Ojptb3VzZU1vdmVUbyk6Cisg ICAgICAgIChXZWJWaWV3VGVzdDo6a2V5U3Ryb2tlKToKKyAgICAgICAgKFdlYlZpZXdUZXN0Ojpk b01vdXNlQnV0dG9uRXZlbnQpOgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkvZ3RrL1BsYXRmb3Jt V2ViVmlld0d0ay5jcHA6CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpkb0tleVN0cm9rZSk6Cisg ICAgICAgIChUZXN0V2ViS2l0QVBJOjpkb01vdXNlQnV0dG9uRXZlbnQpOgorICAgICAgICAoVGVz dFdlYktpdEFQSTo6UGxhdGZvcm1XZWJWaWV3OjpzaW11bGF0ZU1vdXNlTW92ZSk6CisgICAgICAg ICogV2ViS2l0VGVzdFJ1bm5lci9ndGsvRXZlbnRTZW5kZXJQcm94eUd0ay5jcHA6CisgICAgICAg IChXVFI6OkV2ZW50U2VuZGVyUHJveHk6OmNyZWF0ZU1vdXNlQnV0dG9uRXZlbnQpOgorICAgICAg ICAoV1RSOjpFdmVudFNlbmRlclByb3h5OjprZXlEb3duKToKKyAgICAgICAgKFdUUjo6RXZlbnRT ZW5kZXJQcm94eTo6bW91c2VNb3ZlVG8pOgorICAgICAgICAoV1RSOjpFdmVudFNlbmRlclByb3h5 Ojptb3VzZVNjcm9sbEJ5KToKKyAgICAgICAgKFdUUjo6RXZlbnRTZW5kZXJQcm94eTo6Y29udGlu dW91c01vdXNlU2Nyb2xsQnkpOgorICAgICAgICAoV1RSOjpFdmVudFNlbmRlclByb3h5OjpjcmVh dGVUb3VjaEV2ZW50KToKKwogMjAyMC0wNC0wNiAgUGVuZyBMaXUgIDxwZW5nLmxpdTZAYXBwbGUu Y29tPgogCiAgICAgICAgIFJFR1JFU1NJT04gKHIyNTk1MzE/KTogW2lPU10gVGVzdFdlYktpdEFQ SS5XZWJLaXRMZWdhY3kuU2Nyb2xsaW5nRG9lc05vdFBhdXNlTWVkaWEgaXMgdGltaW5nIG91dApk aWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9nbGliL1dlYktpdEdMaWIvZ3RrL1dlYlZp ZXdUZXN0R3RrLmNwcCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ2xpYi9XZWJLaXRHTGliL2d0ay9X ZWJWaWV3VGVzdEd0ay5jcHAKaW5kZXggYmJhODRiMDJkOTY2ZGE4NjJiYTVjNDdlMDQzZTgxZTQ0 NmFjYjlkYi4uODI0OTYyNjI0YmQ1NWQwY2Q3MzM4MTA0NmFkNjM3OTJlNDZhMGI5NCAxMDA2NDQK LS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9nbGliL1dlYktpdEdMaWIvZ3RrL1dlYlZpZXdUZXN0 R3RrLmNwcAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL2dsaWIvV2ViS2l0R0xpYi9ndGsvV2Vi Vmlld1Rlc3RHdGsuY3BwCkBAIC0xMDQsNyArMTA0LDcgQEAgdm9pZCBXZWJWaWV3VGVzdDo6bW91 c2VNb3ZlVG8oaW50IHgsIGludCB5LCB1bnNpZ25lZCBtb3VzZU1vZGlmaWVycykKICAgICBldmVu dC0+bW90aW9uLnRpbWUgPSBHREtfQ1VSUkVOVF9USU1FOwogICAgIGV2ZW50LT5tb3Rpb24ud2lu ZG93ID0gZ3RrX3dpZGdldF9nZXRfd2luZG93KHZpZXdXaWRnZXQpOwogICAgIGdfb2JqZWN0X3Jl ZihldmVudC0+bW90aW9uLndpbmRvdyk7Ci0gICAgZXZlbnQtPm1vdGlvbi5kZXZpY2UgPSBnZGtf ZGV2aWNlX21hbmFnZXJfZ2V0X2NsaWVudF9wb2ludGVyKGdka19kaXNwbGF5X2dldF9kZXZpY2Vf bWFuYWdlcihndGtfd2lkZ2V0X2dldF9kaXNwbGF5KHZpZXdXaWRnZXQpKSk7CisgICAgZXZlbnQt Pm1vdGlvbi5kZXZpY2UgPSBnZGtfc2VhdF9nZXRfcG9pbnRlcihnZGtfZGlzcGxheV9nZXRfZGVm YXVsdF9zZWF0KGd0a193aWRnZXRfZ2V0X2Rpc3BsYXkodmlld1dpZGdldCkpKTsKICAgICBldmVu dC0+bW90aW9uLnN0YXRlID0gbW91c2VNb2RpZmllcnM7CiAgICAgZXZlbnQtPm1vdGlvbi5heGVz ID0gMDsKIApAQCAtMTQyLDcgKzE0Miw3IEBAIHZvaWQgV2ViVmlld1Rlc3Q6OmtleVN0cm9rZSh1 bnNpZ25lZCBrZXlWYWwsIHVuc2lnbmVkIGtleU1vZGlmaWVycykKICAgICBldmVudC0+a2V5LnRp bWUgPSBHREtfQ1VSUkVOVF9USU1FOwogICAgIGV2ZW50LT5rZXkud2luZG93ID0gZ3RrX3dpZGdl dF9nZXRfd2luZG93KHZpZXdXaWRnZXQpOwogICAgIGdfb2JqZWN0X3JlZihldmVudC0+a2V5Lndp bmRvdyk7Ci0gICAgZ2RrX2V2ZW50X3NldF9kZXZpY2UoZXZlbnQuZ2V0KCksIGdka19kZXZpY2Vf bWFuYWdlcl9nZXRfY2xpZW50X3BvaW50ZXIoZ2RrX2Rpc3BsYXlfZ2V0X2RldmljZV9tYW5hZ2Vy KGd0a193aWRnZXRfZ2V0X2Rpc3BsYXkodmlld1dpZGdldCkpKSk7CisgICAgZ2RrX2V2ZW50X3Nl dF9kZXZpY2UoZXZlbnQuZ2V0KCksIGdka19zZWF0X2dldF9wb2ludGVyKGdka19kaXNwbGF5X2dl dF9kZWZhdWx0X3NlYXQoZ3RrX3dpZGdldF9nZXRfZGlzcGxheSh2aWV3V2lkZ2V0KSkpKTsKICAg ICBldmVudC0+a2V5LnN0YXRlID0ga2V5TW9kaWZpZXJzOwogCiAgICAgLy8gV2hlbiBzeW50aGVz aXppbmcgYW4gZXZlbnQsIGFuIGludmFsaWQgaGFyZHdhcmVfa2V5Y29kZSB2YWx1ZSBjYW4gY2F1 c2UgaXQgdG8gYmUgYmFkbHkgcHJvY2Vzc2VkIGJ5IEdUSysuCkBAIC0xNzMsNyArMTczLDcgQEAg dm9pZCBXZWJWaWV3VGVzdDo6ZG9Nb3VzZUJ1dHRvbkV2ZW50KEdka0V2ZW50VHlwZSBldmVudFR5 cGUsIGludCB4LCBpbnQgeSwgdW5zaWcKICAgICBldmVudC0+YnV0dG9uLnN0YXRlID0gbW91c2VN b2RpZmllcnM7CiAgICAgZXZlbnQtPmJ1dHRvbi5idXR0b24gPSBidXR0b247CiAKLSAgICBldmVu dC0+YnV0dG9uLmRldmljZSA9IGdka19kZXZpY2VfbWFuYWdlcl9nZXRfY2xpZW50X3BvaW50ZXIo Z2RrX2Rpc3BsYXlfZ2V0X2RldmljZV9tYW5hZ2VyKGd0a193aWRnZXRfZ2V0X2Rpc3BsYXkodmll d1dpZGdldCkpKTsKKyAgICBldmVudC0+YnV0dG9uLmRldmljZSA9IGdka19zZWF0X2dldF9wb2lu dGVyKGdka19kaXNwbGF5X2dldF9kZWZhdWx0X3NlYXQoZ3RrX3dpZGdldF9nZXRfZGlzcGxheSh2 aWV3V2lkZ2V0KSkpOwogCiAgICAgaW50IHhSb290LCB5Um9vdDsKICAgICBnZGtfd2luZG93X2dl dF9yb290X2Nvb3JkcyhndGtfd2lkZ2V0X2dldF93aW5kb3codmlld1dpZGdldCksIHgsIHksICZ4 Um9vdCwgJnlSb290KTsKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ3RrL1BsYXRm b3JtV2ViVmlld0d0ay5jcHAgYi9Ub29scy9UZXN0V2ViS2l0QVBJL2d0ay9QbGF0Zm9ybVdlYlZp ZXdHdGsuY3BwCmluZGV4IDE3YzIyNmJjZjliNDE1OGYxMjljOWQ3ZTZiOGNlNmM2ODU5NGQwYTcu LjM4YjJiMmUwY2Q2ZDVjN2NjYTYzMGNhN2RhMDgyZTQ3MWZjMTJmZDUgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvZ3RrL1BsYXRmb3JtV2ViVmlld0d0ay5jcHAKKysrIGIvVG9vbHMv VGVzdFdlYktpdEFQSS9ndGsvUGxhdGZvcm1XZWJWaWV3R3RrLmNwcApAQCAtOTAsNyArOTAsNyBA QCBzdGF0aWMgdm9pZCBkb0tleVN0cm9rZShHdGtXaWRnZXQqIHZpZXdXaWRnZXQsIHVuc2lnbmVk IGludCBrZXlWYWwpCiAgICAgZXZlbnQtPmtleS5zdGF0ZSA9IDA7CiAgICAgZXZlbnQtPmtleS53 aW5kb3cgPSBndGtfd2lkZ2V0X2dldF93aW5kb3codmlld1dpZGdldCk7CiAgICAgZ19vYmplY3Rf cmVmKGV2ZW50LT5rZXkud2luZG93KTsKLSAgICBnZGtfZXZlbnRfc2V0X2RldmljZShldmVudC5n ZXQoKSwgZ2RrX2RldmljZV9tYW5hZ2VyX2dldF9jbGllbnRfcG9pbnRlcihnZGtfZGlzcGxheV9n ZXRfZGV2aWNlX21hbmFnZXIoZ3RrX3dpZGdldF9nZXRfZGlzcGxheSh2aWV3V2lkZ2V0KSkpKTsK KyAgICBnZGtfZXZlbnRfc2V0X2RldmljZShldmVudC5nZXQoKSwgZ2RrX3NlYXRfZ2V0X3BvaW50 ZXIoZ2RrX2Rpc3BsYXlfZ2V0X2RlZmF1bHRfc2VhdChndGtfd2lkZ2V0X2dldF9kaXNwbGF5KHZp ZXdXaWRnZXQpKSkpOwogCiAgICAgLy8gV2hlbiBzeW50aGVzaXppbmcgYW4gZXZlbnQsIGFuIGlu dmFsaWQgaGFyZHdhcmVfa2V5Y29kZSB2YWx1ZSBjYW4gY2F1c2UgaXQgdG8gYmUgYmFkbHkgcHJv Y2Vzc2VkIGJ5IEdUSysuCiAgICAgR1VuaXF1ZU91dFB0cjxHZGtLZXltYXBLZXk+IGtleXM7CkBA IC0xMzAsNyArMTMwLDcgQEAgc3RhdGljIHZvaWQgZG9Nb3VzZUJ1dHRvbkV2ZW50KEd0a1dpZGdl dCogdmlld1dpZGdldCwgR2RrRXZlbnRUeXBlIGV2ZW50VHlwZSwgaW4KICAgICBldmVudC0+YnV0 dG9uLnN0YXRlID0gMDsKICAgICBldmVudC0+YnV0dG9uLndpbmRvdyA9IGd0a193aWRnZXRfZ2V0 X3dpbmRvdyh2aWV3V2lkZ2V0KTsKICAgICBnX29iamVjdF9yZWYoZXZlbnQtPmJ1dHRvbi53aW5k b3cpOwotICAgIGV2ZW50LT5idXR0b24uZGV2aWNlID0gZ2RrX2RldmljZV9tYW5hZ2VyX2dldF9j bGllbnRfcG9pbnRlcihnZGtfZGlzcGxheV9nZXRfZGV2aWNlX21hbmFnZXIoZ3RrX3dpZGdldF9n ZXRfZGlzcGxheSh2aWV3V2lkZ2V0KSkpOworICAgIGV2ZW50LT5idXR0b24uZGV2aWNlID0gZ2Rr X3NlYXRfZ2V0X3BvaW50ZXIoZ2RrX2Rpc3BsYXlfZ2V0X2RlZmF1bHRfc2VhdChndGtfd2lkZ2V0 X2dldF9kaXNwbGF5KHZpZXdXaWRnZXQpKSk7CiAKICAgICBpbnQgeFJvb3QsIHlSb290OwogICAg IGdka193aW5kb3dfZ2V0X3Jvb3RfY29vcmRzKGd0a193aWRnZXRfZ2V0X3dpbmRvdyh2aWV3V2lk Z2V0KSwgeCwgeSwgJnhSb290LCAmeVJvb3QpOwpAQCAtMTYyLDcgKzE2Miw3IEBAIHZvaWQgUGxh dGZvcm1XZWJWaWV3OjpzaW11bGF0ZU1vdXNlTW92ZSh1bnNpZ25lZCB4LCB1bnNpZ25lZCB5LCBX S0V2ZW50TW9kaWZpZXJzCiAgICAgICAgIGd0a193aWRnZXRfc2hvdyhtX3dpbmRvdyk7CiAgICAg ZXZlbnQtPm1vdGlvbi53aW5kb3cgPSBndGtfd2lkZ2V0X2dldF93aW5kb3codmlld1dpZGdldCk7 CiAgICAgZ19vYmplY3RfcmVmKGV2ZW50LT5tb3Rpb24ud2luZG93KTsKLSAgICBldmVudC0+bW90 aW9uLmRldmljZSA9IGdka19kZXZpY2VfbWFuYWdlcl9nZXRfY2xpZW50X3BvaW50ZXIoZ2RrX2Rp c3BsYXlfZ2V0X2RldmljZV9tYW5hZ2VyKGd0a193aWRnZXRfZ2V0X2Rpc3BsYXkodmlld1dpZGdl dCkpKTsKKyAgICBldmVudC0+bW90aW9uLmRldmljZSA9IGdka19zZWF0X2dldF9wb2ludGVyKGdk a19kaXNwbGF5X2dldF9kZWZhdWx0X3NlYXQoZ3RrX3dpZGdldF9nZXRfZGlzcGxheSh2aWV3V2lk Z2V0KSkpOwogCiAgICAgaW50IHhSb290LCB5Um9vdDsKICAgICBnZGtfd2luZG93X2dldF9yb290 X2Nvb3JkcyhndGtfd2lkZ2V0X2dldF93aW5kb3codmlld1dpZGdldCksIHgsIHksICZ4Um9vdCwg JnlSb290KTsKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvZ3RrL0V2ZW50U2Vu ZGVyUHJveHlHdGsuY3BwIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9ndGsvRXZlbnRTZW5kZXJQ cm94eUd0ay5jcHAKaW5kZXggN2U5NWIxMTJjYzljMDJiZmEwZDFkZGNlZDRkOGI2MzJlYjMwZjg5 Yy4uNDhhMDdkMGZmOTExMjIwNTdmYmQ5Y2Q0OTg5ZGU4NDcxMzQzMWQzNSAxMDA2NDQKLS0tIGEv VG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9ndGsvRXZlbnRTZW5kZXJQcm94eUd0ay5jcHAKKysrIGIv VG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9ndGsvRXZlbnRTZW5kZXJQcm94eUd0ay5jcHAKQEAgLTEy Nyw3ICsxMjcsNyBAQCBHZGtFdmVudCogRXZlbnRTZW5kZXJQcm94eTo6Y3JlYXRlTW91c2VCdXR0 b25FdmVudChHZGtFdmVudFR5cGUgZXZlbnRUeXBlLCB1bnNpZwogICAgIG1vdXNlRXZlbnQtPmJ1 dHRvbi55ID0gbV9wb3NpdGlvbi55OwogICAgIG1vdXNlRXZlbnQtPmJ1dHRvbi53aW5kb3cgPSBn dGtfd2lkZ2V0X2dldF93aW5kb3coR1RLX1dJREdFVChtX3Rlc3RDb250cm9sbGVyLT5tYWluV2Vi VmlldygpLT5wbGF0Zm9ybVZpZXcoKSkpOwogICAgIGdfb2JqZWN0X3JlZihtb3VzZUV2ZW50LT5i dXR0b24ud2luZG93KTsKLSAgICBnZGtfZXZlbnRfc2V0X2RldmljZShtb3VzZUV2ZW50LCBnZGtf ZGV2aWNlX21hbmFnZXJfZ2V0X2NsaWVudF9wb2ludGVyKGdka19kaXNwbGF5X2dldF9kZXZpY2Vf bWFuYWdlcihnZGtfd2luZG93X2dldF9kaXNwbGF5KG1vdXNlRXZlbnQtPmJ1dHRvbi53aW5kb3cp KSkpOworICAgIGdka19ldmVudF9zZXRfZGV2aWNlKG1vdXNlRXZlbnQsIGdka19zZWF0X2dldF9w b2ludGVyKGdka19kaXNwbGF5X2dldF9kZWZhdWx0X3NlYXQoZ2RrX3dpbmRvd19nZXRfZGlzcGxh eShtb3VzZUV2ZW50LT5idXR0b24ud2luZG93KSkpKTsKICAgICBtb3VzZUV2ZW50LT5idXR0b24u c3RhdGUgPSB3ZWJraXRNb2RpZmllcnNUb0dES01vZGlmaWVycyhtb2RpZmllcnMpIHwgbV9tb3Vz ZUJ1dHRvbnNDdXJyZW50bHlEb3duOwogICAgIG1vdXNlRXZlbnQtPmJ1dHRvbi50aW1lID0gR0RL X0NVUlJFTlRfVElNRTsKICAgICBtb3VzZUV2ZW50LT5idXR0b24uYXhlcyA9IDA7CkBAIC0zMDMs NyArMzAzLDcgQEAgdm9pZCBFdmVudFNlbmRlclByb3h5OjprZXlEb3duKFdLU3RyaW5nUmVmIGtl eVJlZiwgV0tFdmVudE1vZGlmaWVycyB3a01vZGlmaWVycywKICAgICBwcmVzc0V2ZW50LT5rZXku c3RhdGUgPSBtb2RpZmllcnM7CiAgICAgcHJlc3NFdmVudC0+a2V5LndpbmRvdyA9IGd0a193aWRn ZXRfZ2V0X3dpbmRvdyhHVEtfV0lER0VUKG1fdGVzdENvbnRyb2xsZXItPm1haW5XZWJWaWV3KCkt PnBsYXRmb3JtV2luZG93KCkpKTsKICAgICBnX29iamVjdF9yZWYocHJlc3NFdmVudC0+a2V5Lndp bmRvdyk7Ci0gICAgZ2RrX2V2ZW50X3NldF9kZXZpY2UocHJlc3NFdmVudCwgZ2RrX2RldmljZV9t YW5hZ2VyX2dldF9jbGllbnRfcG9pbnRlcihnZGtfZGlzcGxheV9nZXRfZGV2aWNlX21hbmFnZXIo Z2RrX3dpbmRvd19nZXRfZGlzcGxheShwcmVzc0V2ZW50LT5rZXkud2luZG93KSkpKTsKKyAgICBn ZGtfZXZlbnRfc2V0X2RldmljZShwcmVzc0V2ZW50LCBnZGtfc2VhdF9nZXRfcG9pbnRlcihnZGtf ZGlzcGxheV9nZXRfZGVmYXVsdF9zZWF0KGdka193aW5kb3dfZ2V0X2Rpc3BsYXkocHJlc3NFdmVu dC0+a2V5LndpbmRvdykpKSk7CiAKICAgICBHVW5pcXVlT3V0UHRyPEdka0tleW1hcEtleT4ga2V5 czsKICAgICBnaW50IG5LZXlzOwpAQCAtMzc0LDcgKzM3NCw3IEBAIHZvaWQgRXZlbnRTZW5kZXJQ cm94eTo6bW91c2VNb3ZlVG8oZG91YmxlIHgsIGRvdWJsZSB5KQogICAgIGV2ZW50LT5tb3Rpb24u dGltZSA9IEdES19DVVJSRU5UX1RJTUU7CiAgICAgZXZlbnQtPm1vdGlvbi53aW5kb3cgPSBndGtf d2lkZ2V0X2dldF93aW5kb3coR1RLX1dJREdFVChtX3Rlc3RDb250cm9sbGVyLT5tYWluV2ViVmll dygpLT5wbGF0Zm9ybVZpZXcoKSkpOwogICAgIGdfb2JqZWN0X3JlZihldmVudC0+bW90aW9uLndp bmRvdyk7Ci0gICAgZ2RrX2V2ZW50X3NldF9kZXZpY2UoZXZlbnQsIGdka19kZXZpY2VfbWFuYWdl cl9nZXRfY2xpZW50X3BvaW50ZXIoZ2RrX2Rpc3BsYXlfZ2V0X2RldmljZV9tYW5hZ2VyKGdka193 aW5kb3dfZ2V0X2Rpc3BsYXkoZXZlbnQtPm1vdGlvbi53aW5kb3cpKSkpOworICAgIGdka19ldmVu dF9zZXRfZGV2aWNlKGV2ZW50LCBnZGtfc2VhdF9nZXRfcG9pbnRlcihnZGtfZGlzcGxheV9nZXRf ZGVmYXVsdF9zZWF0KGdka193aW5kb3dfZ2V0X2Rpc3BsYXkoZXZlbnQtPm1vdGlvbi53aW5kb3cp KSkpOwogICAgIGV2ZW50LT5tb3Rpb24uc3RhdGUgPSBtX21vdXNlQnV0dG9uc0N1cnJlbnRseURv d247CiAgICAgZXZlbnQtPm1vdGlvbi5heGVzID0gMDsKIApAQCAtMzk4LDcgKzM5OCw3IEBAIHZv aWQgRXZlbnRTZW5kZXJQcm94eTo6bW91c2VTY3JvbGxCeShpbnQgaG9yaXpvbnRhbCwgaW50IHZl cnRpY2FsKQogICAgIGV2ZW50LT5zY3JvbGwudGltZSA9IEdES19DVVJSRU5UX1RJTUU7CiAgICAg ZXZlbnQtPnNjcm9sbC53aW5kb3cgPSBndGtfd2lkZ2V0X2dldF93aW5kb3coR1RLX1dJREdFVCht X3Rlc3RDb250cm9sbGVyLT5tYWluV2ViVmlldygpLT5wbGF0Zm9ybVZpZXcoKSkpOwogICAgIGdf b2JqZWN0X3JlZihldmVudC0+c2Nyb2xsLndpbmRvdyk7Ci0gICAgZ2RrX2V2ZW50X3NldF9kZXZp Y2UoZXZlbnQsIGdka19kZXZpY2VfbWFuYWdlcl9nZXRfY2xpZW50X3BvaW50ZXIoZ2RrX2Rpc3Bs YXlfZ2V0X2RldmljZV9tYW5hZ2VyKGdka193aW5kb3dfZ2V0X2Rpc3BsYXkoZXZlbnQtPnNjcm9s bC53aW5kb3cpKSkpOworICAgIGdka19ldmVudF9zZXRfZGV2aWNlKGV2ZW50LCBnZGtfc2VhdF9n ZXRfcG9pbnRlcihnZGtfZGlzcGxheV9nZXRfZGVmYXVsdF9zZWF0KGdka193aW5kb3dfZ2V0X2Rp c3BsYXkoZXZlbnQtPnNjcm9sbC53aW5kb3cpKSkpOwogCiAgICAgLy8gRm9yIG1vcmUgdGhhbiBv bmUgdGljayBpbiBhIHNjcm9sbCwgd2UgbmVlZCBzbW9vdGggc2Nyb2xsIGV2ZW50CiAgICAgaWYg KChob3Jpem9udGFsICYmIHZlcnRpY2FsKSB8fCBob3Jpem9udGFsID4gMSB8fCBob3Jpem9udGFs IDwgLTEgfHwgdmVydGljYWwgPiAxIHx8IHZlcnRpY2FsIDwgLTEpIHsKQEAgLTQzOCw3ICs0Mzgs NyBAQCB2b2lkIEV2ZW50U2VuZGVyUHJveHk6OmNvbnRpbnVvdXNNb3VzZVNjcm9sbEJ5KGludCBo b3Jpem9udGFsLCBpbnQgdmVydGljYWwsIGJvbwogICAgIGV2ZW50LT5zY3JvbGwudGltZSA9IEdE S19DVVJSRU5UX1RJTUU7CiAgICAgZXZlbnQtPnNjcm9sbC53aW5kb3cgPSBndGtfd2lkZ2V0X2dl dF93aW5kb3coR1RLX1dJREdFVChtX3Rlc3RDb250cm9sbGVyLT5tYWluV2ViVmlldygpLT5wbGF0 Zm9ybVZpZXcoKSkpOwogICAgIGdfb2JqZWN0X3JlZihldmVudC0+c2Nyb2xsLndpbmRvdyk7Ci0g ICAgZ2RrX2V2ZW50X3NldF9kZXZpY2UoZXZlbnQsIGdka19kZXZpY2VfbWFuYWdlcl9nZXRfY2xp ZW50X3BvaW50ZXIoZ2RrX2Rpc3BsYXlfZ2V0X2RldmljZV9tYW5hZ2VyKGdka193aW5kb3dfZ2V0 X2Rpc3BsYXkoZXZlbnQtPnNjcm9sbC53aW5kb3cpKSkpOworICAgIGdka19ldmVudF9zZXRfZGV2 aWNlKGV2ZW50LCBnZGtfc2VhdF9nZXRfcG9pbnRlcihnZGtfZGlzcGxheV9nZXRfZGVmYXVsdF9z ZWF0KGdka193aW5kb3dfZ2V0X2Rpc3BsYXkoZXZlbnQtPnNjcm9sbC53aW5kb3cpKSkpOwogCiAg ICAgZXZlbnQtPnNjcm9sbC5kaXJlY3Rpb24gPSBHREtfU0NST0xMX1NNT09USDsKICAgICBldmVu dC0+c2Nyb2xsLmRlbHRhX3ggPSAtaG9yaXpvbnRhbCAvIHBpeGVsc1BlclNjcm9sbFRpY2s7CkBA IC00ODEsNyArNDgxLDcgQEAgR1VuaXF1ZVB0cjxHZGtFdmVudD4gRXZlbnRTZW5kZXJQcm94eTo6 Y3JlYXRlVG91Y2hFdmVudChHZGtFdmVudFR5cGUgZXZlbnRUeXBlLAogICAgIHRvdWNoRXZlbnQt PnRvdWNoLnNlcXVlbmNlID0gc3RhdGljX2Nhc3Q8R2RrRXZlbnRTZXF1ZW5jZSo+KEdJTlRfVE9f UE9JTlRFUihpZCkpOwogICAgIHRvdWNoRXZlbnQtPnRvdWNoLndpbmRvdyA9IGd0a193aWRnZXRf Z2V0X3dpbmRvdyhHVEtfV0lER0VUKG1fdGVzdENvbnRyb2xsZXItPm1haW5XZWJWaWV3KCktPnBs YXRmb3JtVmlldygpKSk7CiAgICAgZ19vYmplY3RfcmVmKHRvdWNoRXZlbnQtPnRvdWNoLndpbmRv dyk7Ci0gICAgZ2RrX2V2ZW50X3NldF9kZXZpY2UodG91Y2hFdmVudC5nZXQoKSwgZ2RrX2Rldmlj ZV9tYW5hZ2VyX2dldF9jbGllbnRfcG9pbnRlcihnZGtfZGlzcGxheV9nZXRfZGV2aWNlX21hbmFn ZXIoZ2RrX3dpbmRvd19nZXRfZGlzcGxheSh0b3VjaEV2ZW50LT5idXR0b24ud2luZG93KSkpKTsK KyAgICBnZGtfZXZlbnRfc2V0X2RldmljZSh0b3VjaEV2ZW50LmdldCgpLCBnZGtfc2VhdF9nZXRf cG9pbnRlcihnZGtfZGlzcGxheV9nZXRfZGVmYXVsdF9zZWF0KGdka193aW5kb3dfZ2V0X2Rpc3Bs YXkodG91Y2hFdmVudC0+YnV0dG9uLndpbmRvdykpKSk7CiAgICAgdG91Y2hFdmVudC0+dG91Y2gu dGltZSA9IEdES19DVVJSRU5UX1RJTUU7CiAKICAgICByZXR1cm4gdG91Y2hFdmVudDsK