239512 2022-04-19 11:45:16 -0700 Some AutoscrollController cleanup 2022-04-20 08:06:16 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser bfulgham simon.fraser webkit-bug-importer zalan oldest_to_newest 1862659 0 simon.fraser 2022-04-19 11:45:16 -0700 Sone AutoscrollController cleanup 1862660 1 457922 simon.fraser 2022-04-19 11:47:28 -0700 Created attachment 457922 Patch 1862806 2 457952 simon.fraser 2022-04-19 20:10:44 -0700 Created attachment 457952 Patch 1862821 3 457959 simon.fraser 2022-04-19 21:28:25 -0700 Created attachment 457959 Patch 1862938 4 ews-feeder 2022-04-20 08:05:34 -0700 Committed r293094 (249805@main): <https://commits.webkit.org/249805@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 457959. 1862939 5 webkit-bug-importer 2022-04-20 08:06:16 -0700 <rdar://problem/92027447> 457922 2022-04-19 11:47:28 -0700 2022-04-19 14:25:49 -0700 Patch bug-239512-20220419114727.patch text/plain 9297 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyOTc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGI3ZTZjYmQzZGU5MGQ2 YzVlODE4N2ZlZGJjYjBkYWY3MDhkYTBmMy4uNGY5ZWIyNzIzOGM1MmM1OGUwNzM2OGU1YjI1YTgz YzhhMTRjZjY5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIyLTA0LTE5ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFNvbWUgQXV0b3Nj cm9sbENvbnRyb2xsZXIgY2xlYW51cAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjM5NTEyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgSGF2ZSBBdXRvc2Nyb2xsQ29udHJvbGxlciBzdG9yZSBhIFdlYWtQdHIg dG8gdGhlIHJlbmRlciBvYmplY3QuIEFkZHJlc3MgYW4gYXBwYXJlbnQKKyAgICAgICAgbnVsbCBk ZS1yZWYgaW4gQXV0b3Njcm9sbENvbnRyb2xsZXI6OnN0b3BBdXRvc2Nyb2xsVGltZXIoKSB3aGVy ZSB0aGUgRnJhbWUgY2FuIG51bGwuCisgICAgICAgIAorICAgICAgICBSZWZhY3RvciB1cGRhdGVE cmFnQW5kRHJvcCgpIHdpdGggYSBsYW1iZGEgc28gdGhhdCBhbGwgdGhlIGNvZGUgcGF0aHMgdGhh dCBleGl0IGVhcmx5CisgICAgICAgIGNsZWFybHkgY2FsbCBzdG9wQXV0b3Njcm9sbFRpbWVyKCkg d2hpY2ggbnVsbHMgb3V0IHRoZSByZW5kZXJlci4KKworICAgICAgICAqIHBhZ2UvQXV0b3Njcm9s bENvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QXV0b3Njcm9sbENvbnRyb2xsZXI6 OmF1dG9zY3JvbGxSZW5kZXJlciBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpBdXRvc2Nyb2xs Q29udHJvbGxlcjo6c3RhcnRBdXRvc2Nyb2xsRm9yU2VsZWN0aW9uKToKKyAgICAgICAgKFdlYkNv cmU6OkF1dG9zY3JvbGxDb250cm9sbGVyOjpzdG9wQXV0b3Njcm9sbFRpbWVyKToKKyAgICAgICAg KFdlYkNvcmU6OkF1dG9zY3JvbGxDb250cm9sbGVyOjp1cGRhdGVBdXRvc2Nyb2xsUmVuZGVyZXIp OgorICAgICAgICAoV2ViQ29yZTo6QXV0b3Njcm9sbENvbnRyb2xsZXI6OnVwZGF0ZURyYWdBbmRE cm9wKToKKyAgICAgICAgKFdlYkNvcmU6OkF1dG9zY3JvbGxDb250cm9sbGVyOjpzdGFydFBhblNj cm9sbGluZyk6CisgICAgICAgICogcGFnZS9BdXRvc2Nyb2xsQ29udHJvbGxlci5oOgorICAgICAg ICAqIHBhZ2UvRXZlbnRIYW5kbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxl cjo6c3RhcnRQYW5TY3JvbGxpbmcpOgorCiAyMDIyLTA0LTE4ICBNYXR0IFdvb2Ryb3cgIDxtYXR0 d29vZHJvd0BhcHBsZS5jb20+CiAKICAgICAgICAgSW1wbGVtZW50IHN1cHBvcnQgZm9yIGFsaWdu aW5nIGJhc2VsaW5lcyB0aHJvdWdoIHN1YmdyaWRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL0F1dG9zY3JvbGxDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQXV0 b3Njcm9sbENvbnRyb2xsZXIuY3BwCmluZGV4IDM0NGNkZmIzODkxYTE3MzJhNTAzODc1YWRmYTMx ODJjNTIyZGU5NDQuLjBjMDRhNGQwNDUzODBhMzYwODQwZjkwNmNjMzVlMGRiNjgxNjE0ODQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQXV0b3Njcm9sbENvbnRyb2xsZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQXV0b3Njcm9sbENvbnRyb2xsZXIuY3BwCkBAIC02Myw3 ICs2Myw3IEBAIEF1dG9zY3JvbGxDb250cm9sbGVyOjpBdXRvc2Nyb2xsQ29udHJvbGxlcigpCiAK IFJlbmRlckJveCogQXV0b3Njcm9sbENvbnRyb2xsZXI6OmF1dG9zY3JvbGxSZW5kZXJlcigpIGNv bnN0CiB7Ci0gICAgcmV0dXJuIG1fYXV0b3Njcm9sbFJlbmRlcmVyOworICAgIHJldHVybiBtX2F1 dG9zY3JvbGxSZW5kZXJlci5nZXQoKTsKIH0KIAogYm9vbCBBdXRvc2Nyb2xsQ29udHJvbGxlcjo6 YXV0b3Njcm9sbEluUHJvZ3Jlc3MoKSBjb25zdApAQCAtNzYsMjYgKzc2LDI3IEBAIHZvaWQgQXV0 b3Njcm9sbENvbnRyb2xsZXI6OnN0YXJ0QXV0b3Njcm9sbEZvclNlbGVjdGlvbihSZW5kZXJPYmpl Y3QqIHJlbmRlcmVyKQogICAgIC8vIFdlIGRvbid0IHdhbnQgdG8gdHJpZ2dlciB0aGUgYXV0b3Nj cm9sbCBvciB0aGUgcGFuU2Nyb2xsIGlmIGl0J3MgYWxyZWFkeSBhY3RpdmUKICAgICBpZiAobV9h dXRvc2Nyb2xsVGltZXIuaXNBY3RpdmUoKSkKICAgICAgICAgcmV0dXJuOwotICAgIFJlbmRlckJv eCogc2Nyb2xsYWJsZSA9IFJlbmRlckJveDo6ZmluZEF1dG9zY3JvbGxhYmxlKHJlbmRlcmVyKTsK KyAgICBhdXRvKiBzY3JvbGxhYmxlID0gUmVuZGVyQm94OjpmaW5kQXV0b3Njcm9sbGFibGUocmVu ZGVyZXIpOwogICAgIGlmICghc2Nyb2xsYWJsZSkKICAgICAgICAgcmV0dXJuOwogICAgIG1fYXV0 b3Njcm9sbFR5cGUgPSBBdXRvc2Nyb2xsRm9yU2VsZWN0aW9uOwotICAgIG1fYXV0b3Njcm9sbFJl bmRlcmVyID0gc2Nyb2xsYWJsZTsKKyAgICBtX2F1dG9zY3JvbGxSZW5kZXJlciA9IFdlYWtQdHIg eyAqc2Nyb2xsYWJsZSB9OwogICAgIHN0YXJ0QXV0b3Njcm9sbFRpbWVyKCk7CiB9CiAKIHZvaWQg QXV0b3Njcm9sbENvbnRyb2xsZXI6OnN0b3BBdXRvc2Nyb2xsVGltZXIoYm9vbCByZW5kZXJlcklz QmVpbmdEZXN0cm95ZWQpCiB7Ci0gICAgUmVuZGVyQm94KiBzY3JvbGxhYmxlID0gbV9hdXRvc2Ny b2xsUmVuZGVyZXI7CisgICAgYXV0byBzY3JvbGxhYmxlID0gbV9hdXRvc2Nyb2xsUmVuZGVyZXI7 CisKICAgICBtX2F1dG9zY3JvbGxUaW1lci5zdG9wKCk7CiAgICAgbV9hdXRvc2Nyb2xsUmVuZGVy ZXIgPSBudWxscHRyOwogCiAgICAgaWYgKCFzY3JvbGxhYmxlKQogICAgICAgICByZXR1cm47CiAK LSAgICBGcmFtZSYgZnJhbWUgPSBzY3JvbGxhYmxlLT5mcmFtZSgpOwotICAgIGlmIChhdXRvc2Ny b2xsSW5Qcm9ncmVzcygpICYmIGZyYW1lLmV2ZW50SGFuZGxlcigpLm1vdXNlRG93bldhc0luU3Vi ZnJhbWUoKSkgewotICAgICAgICBpZiAoYXV0byBzdWJmcmFtZSA9IGZyYW1lLmV2ZW50SGFuZGxl cigpLnN1YmZyYW1lRm9yVGFyZ2V0Tm9kZShmcmFtZS5ldmVudEhhbmRsZXIoKS5tb3VzZVByZXNz Tm9kZSgpKSkKKyAgICBGcmFtZSogZnJhbWUgPSBzY3JvbGxhYmxlLT5kb2N1bWVudCgpLmZyYW1l KCk7CisgICAgaWYgKGF1dG9zY3JvbGxJblByb2dyZXNzKCkgJiYgZnJhbWUgJiYgZnJhbWUtPmV2 ZW50SGFuZGxlcigpLm1vdXNlRG93bldhc0luU3ViZnJhbWUoKSkgeworICAgICAgICBpZiAoYXV0 byBzdWJmcmFtZSA9IGZyYW1lLT5ldmVudEhhbmRsZXIoKS5zdWJmcmFtZUZvclRhcmdldE5vZGUo ZnJhbWUtPmV2ZW50SGFuZGxlcigpLm1vdXNlUHJlc3NOb2RlKCkpKQogICAgICAgICAgICAgc3Vi ZnJhbWUtPmV2ZW50SGFuZGxlcigpLnN0b3BBdXRvc2Nyb2xsVGltZXIocmVuZGVyZXJJc0JlaW5n RGVzdHJveWVkKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTEyNCw0NCArMTI1LDUyIEBA IHZvaWQgQXV0b3Njcm9sbENvbnRyb2xsZXI6OnVwZGF0ZUF1dG9zY3JvbGxSZW5kZXJlcigpCiAg ICAgaWYgKCFtX2F1dG9zY3JvbGxSZW5kZXJlcikKICAgICAgICAgcmV0dXJuOwogCi0gICAgUmVu ZGVyT2JqZWN0KiByZW5kZXJlciA9IG1fYXV0b3Njcm9sbFJlbmRlcmVyOworICAgIFJlbmRlckVs ZW1lbnQqIHJlbmRlcmVyID0gbV9hdXRvc2Nyb2xsUmVuZGVyZXIuZ2V0KCk7CiAKICNpZiBFTkFC TEUoUEFOX1NDUk9MTElORykKICAgICBjb25zdGV4cHIgT3B0aW9uU2V0PEhpdFRlc3RSZXF1ZXN0 OjpUeXBlPiBoaXRUeXBlIHsgSGl0VGVzdFJlcXVlc3Q6OlR5cGU6OlJlYWRPbmx5LCBIaXRUZXN0 UmVxdWVzdDo6VHlwZTo6QWN0aXZlLCBIaXRUZXN0UmVxdWVzdDo6VHlwZTo6QWxsb3dDaGlsZEZy YW1lQ29udGVudCB9OwogICAgIEhpdFRlc3RSZXN1bHQgaGl0VGVzdCA9IG1fYXV0b3Njcm9sbFJl bmRlcmVyLT5mcmFtZSgpLmV2ZW50SGFuZGxlcigpLmhpdFRlc3RSZXN1bHRBdFBvaW50KG1fcGFu U2Nyb2xsU3RhcnRQb3MsIGhpdFR5cGUpOwogCi0gICAgaWYgKE5vZGUqIG5vZGVBdFBvaW50ID0g aGl0VGVzdC5pbm5lck5vZGUoKSkKKyAgICBpZiAoYXV0byogbm9kZUF0UG9pbnQgPSBoaXRUZXN0 LmlubmVyTm9kZSgpKQogICAgICAgICByZW5kZXJlciA9IG5vZGVBdFBvaW50LT5yZW5kZXJlcigp OwogI2VuZGlmCiAKICAgICB3aGlsZSAocmVuZGVyZXIgJiYgIShpczxSZW5kZXJCb3g+KCpyZW5k ZXJlcikgJiYgZG93bmNhc3Q8UmVuZGVyQm94PigqcmVuZGVyZXIpLmNhbkF1dG9zY3JvbGwoKSkp CiAgICAgICAgIHJlbmRlcmVyID0gcmVuZGVyZXItPnBhcmVudCgpOwotICAgIG1fYXV0b3Njcm9s bFJlbmRlcmVyID0gZHluYW1pY0Rvd25jYXN0PFJlbmRlckJveD4ocmVuZGVyZXIpOwotfQogCi12 b2lkIEF1dG9zY3JvbGxDb250cm9sbGVyOjp1cGRhdGVEcmFnQW5kRHJvcChOb2RlKiBkcm9wVGFy Z2V0Tm9kZSwgY29uc3QgSW50UG9pbnQmIGV2ZW50UG9zaXRpb24sIFdhbGxUaW1lIGV2ZW50VGlt ZSkKLXsKLSAgICBpZiAoIWRyb3BUYXJnZXROb2RlKSB7Ci0gICAgICAgIHN0b3BBdXRvc2Nyb2xs VGltZXIoKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIFJlbmRlckJveCogc2Nyb2xs YWJsZSA9IFJlbmRlckJveDo6ZmluZEF1dG9zY3JvbGxhYmxlKGRyb3BUYXJnZXROb2RlLT5yZW5k ZXJlcigpKTsKLSAgICBpZiAoIXNjcm9sbGFibGUpIHsKLSAgICAgICAgc3RvcEF1dG9zY3JvbGxU aW1lcigpOworICAgIGlmICghaXM8UmVuZGVyQm94PihyZW5kZXJlcikpIHsKKyAgICAgICAgbV9h dXRvc2Nyb2xsUmVuZGVyZXIgPSBudWxscHRyOwogICAgICAgICByZXR1cm47CiAgICAgfQogCi0g ICAgRnJhbWUmIGZyYW1lID0gc2Nyb2xsYWJsZS0+ZnJhbWUoKTsKLQotICAgIFBhZ2UqIHBhZ2Ug PSBmcmFtZS5wYWdlKCk7Ci0gICAgaWYgKCFwYWdlIHx8ICFwYWdlLT5zZXR0aW5ncygpLmF1dG9z Y3JvbGxGb3JEcmFnQW5kRHJvcEVuYWJsZWQoKSkgewotICAgICAgICBzdG9wQXV0b3Njcm9sbFRp bWVyKCk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9CisgICAgbV9hdXRvc2Nyb2xsUmVuZGVyZXIg PSBXZWFrUHRyIHsgZG93bmNhc3Q8UmVuZGVyQm94PigqcmVuZGVyZXIpIH07Cit9CiAKLSAgICBJ bnRTaXplIG9mZnNldCA9IHNjcm9sbGFibGUtPmNhbGN1bGF0ZUF1dG9zY3JvbGxEaXJlY3Rpb24o ZXZlbnRQb3NpdGlvbik7Ci0gICAgaWYgKG9mZnNldC5pc1plcm8oKSkgewordm9pZCBBdXRvc2Ny b2xsQ29udHJvbGxlcjo6dXBkYXRlRHJhZ0FuZERyb3AoTm9kZSogZHJvcFRhcmdldE5vZGUsIGNv bnN0IEludFBvaW50JiBldmVudFBvc2l0aW9uLCBXYWxsVGltZSBldmVudFRpbWUpCit7CisgICAg SW50U2l6ZSBvZmZzZXQ7CisgICAgYXV0byBmaW5kRHJhZ0FuZERyb3BTY3JvbGxlciA9IFsmXSgp IC0+IFJlbmRlckJveCogeworICAgICAgICBpZiAoIWRyb3BUYXJnZXROb2RlKQorICAgICAgICAg ICAgcmV0dXJuIG51bGxwdHI7CisKKyAgICAgICAgYXV0byogc2Nyb2xsYWJsZSA9IFJlbmRlckJv eDo6ZmluZEF1dG9zY3JvbGxhYmxlKGRyb3BUYXJnZXROb2RlLT5yZW5kZXJlcigpKTsKKyAgICAg ICAgaWYgKCFzY3JvbGxhYmxlKQorICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CisKKyAgICAg ICAgYXV0byYgZnJhbWUgPSBzY3JvbGxhYmxlLT5mcmFtZSgpOworICAgICAgICBhdXRvKiBwYWdl ID0gZnJhbWUucGFnZSgpOworICAgICAgICBpZiAoIXBhZ2UgfHwgIXBhZ2UtPnNldHRpbmdzKCku YXV0b3Njcm9sbEZvckRyYWdBbmREcm9wRW5hYmxlZCgpKQorICAgICAgICAgICAgcmV0dXJuIG51 bGxwdHI7CisKKyAgICAgICAgb2Zmc2V0ID0gc2Nyb2xsYWJsZS0+Y2FsY3VsYXRlQXV0b3Njcm9s bERpcmVjdGlvbihldmVudFBvc2l0aW9uKTsKKyAgICAgICAgaWYgKG9mZnNldC5pc1plcm8oKSkK KyAgICAgICAgICAgIHJldHVybiBudWxscHRyOworCisgICAgICAgIHJldHVybiBzY3JvbGxhYmxl OworICAgIH07CisgICAgCisgICAgUmVuZGVyQm94KiBzY3JvbGxhYmxlID0gZmluZERyYWdBbmRE cm9wU2Nyb2xsZXIoKTsKKyAgICBpZiAoIXNjcm9sbGFibGUpIHsKICAgICAgICAgc3RvcEF1dG9z Y3JvbGxUaW1lcigpOwogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtMTcwLDEyICsxNzksMTIg QEAgdm9pZCBBdXRvc2Nyb2xsQ29udHJvbGxlcjo6dXBkYXRlRHJhZ0FuZERyb3AoTm9kZSogZHJv cFRhcmdldE5vZGUsIGNvbnN0IEludFBvaW4KIAogICAgIGlmIChtX2F1dG9zY3JvbGxUeXBlID09 IE5vQXV0b3Njcm9sbCkgewogICAgICAgICBtX2F1dG9zY3JvbGxUeXBlID0gQXV0b3Njcm9sbEZv ckRyYWdBbmREcm9wOwotICAgICAgICBtX2F1dG9zY3JvbGxSZW5kZXJlciA9IHNjcm9sbGFibGU7 CisgICAgICAgIG1fYXV0b3Njcm9sbFJlbmRlcmVyID0gV2Vha1B0ciB7ICpzY3JvbGxhYmxlIH07 CiAgICAgICAgIG1fZHJhZ0FuZERyb3BBdXRvc2Nyb2xsU3RhcnRUaW1lID0gZXZlbnRUaW1lOwog ICAgICAgICBzdGFydEF1dG9zY3JvbGxUaW1lcigpOwogICAgIH0gZWxzZSBpZiAobV9hdXRvc2Ny b2xsUmVuZGVyZXIgIT0gc2Nyb2xsYWJsZSkgewogICAgICAgICBtX2RyYWdBbmREcm9wQXV0b3Nj cm9sbFN0YXJ0VGltZSA9IGV2ZW50VGltZTsKLSAgICAgICAgbV9hdXRvc2Nyb2xsUmVuZGVyZXIg PSBzY3JvbGxhYmxlOworICAgICAgICBtX2F1dG9zY3JvbGxSZW5kZXJlciA9IFdlYWtQdHIgeyAq c2Nyb2xsYWJsZSB9OwogICAgIH0KIH0KIApAQCAtMjEwLDE0ICsyMTksMTQgQEAgYm9vbCBBdXRv c2Nyb2xsQ29udHJvbGxlcjo6cGFuU2Nyb2xsSW5Qcm9ncmVzcygpIGNvbnN0CiAgICAgcmV0dXJu IG1fYXV0b3Njcm9sbFR5cGUgPT0gQXV0b3Njcm9sbEZvclBhbiB8fCBtX2F1dG9zY3JvbGxUeXBl ID09IEF1dG9zY3JvbGxGb3JQYW5DYW5TdG9wOwogfQogCi12b2lkIEF1dG9zY3JvbGxDb250cm9s bGVyOjpzdGFydFBhblNjcm9sbGluZyhSZW5kZXJCb3gqIHNjcm9sbGFibGUsIGNvbnN0IEludFBv aW50JiBsYXN0S25vd25Nb3VzZVBvc2l0aW9uKQordm9pZCBBdXRvc2Nyb2xsQ29udHJvbGxlcjo6 c3RhcnRQYW5TY3JvbGxpbmcoUmVuZGVyQm94JiBzY3JvbGxhYmxlLCBjb25zdCBJbnRQb2ludCYg bGFzdEtub3duTW91c2VQb3NpdGlvbikKIHsKICAgICAvLyBXZSBkb24ndCB3YW50IHRvIHRyaWdn ZXIgdGhlIGF1dG9zY3JvbGwgb3IgdGhlIHBhblNjcm9sbCBpZiBpdCdzIGFscmVhZHkgYWN0aXZl CiAgICAgaWYgKG1fYXV0b3Njcm9sbFRpbWVyLmlzQWN0aXZlKCkpCiAgICAgICAgIHJldHVybjsK IAogICAgIG1fYXV0b3Njcm9sbFR5cGUgPSBBdXRvc2Nyb2xsRm9yUGFuOwotICAgIG1fYXV0b3Nj cm9sbFJlbmRlcmVyID0gc2Nyb2xsYWJsZTsKKyAgICBtX2F1dG9zY3JvbGxSZW5kZXJlciA9IFdl YWtQdHIgeyBzY3JvbGxhYmxlIH07CiAgICAgbV9wYW5TY3JvbGxTdGFydFBvcyA9IGxhc3RLbm93 bk1vdXNlUG9zaXRpb247CiAKICAgICBpZiAoRnJhbWVWaWV3KiB2aWV3ID0gc2Nyb2xsYWJsZS0+ ZnJhbWUoKS52aWV3KCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0F1dG9zY3Jv bGxDb250cm9sbGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0F1dG9zY3JvbGxDb250cm9sbGVy LmgKaW5kZXggNzEzNjBiYTQ0ZGRjOTQ1MTRmNjk0MmQ0NmJkYjhmMGY4ZDA2YmUzMi4uOGUwZjUy NDVhMzQxNjg3YTg5NTkyMjkyNDYwYmU0ZmVjOGM2MzM0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGFnZS9BdXRvc2Nyb2xsQ29udHJvbGxlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvQXV0b3Njcm9sbENvbnRyb2xsZXIuaApAQCAtNjYsNyArNjYsNyBAQCBwdWJsaWM6CiAgICAg dm9pZCBkaWRQYW5TY3JvbGxTdG9wKCk7CiAgICAgdm9pZCBoYW5kbGVNb3VzZVJlbGVhc2VFdmVu dChjb25zdCBQbGF0Zm9ybU1vdXNlRXZlbnQmKTsKICAgICB2b2lkIHNldFBhblNjcm9sbEluUHJv Z3Jlc3MoYm9vbCk7Ci0gICAgdm9pZCBzdGFydFBhblNjcm9sbGluZyhSZW5kZXJCb3gqLCBjb25z dCBJbnRQb2ludCYpOworICAgIHZvaWQgc3RhcnRQYW5TY3JvbGxpbmcoUmVuZGVyQm94JiwgY29u c3QgSW50UG9pbnQmKTsKICNlbmRpZgogCiBwcml2YXRlOgpAQCAtNzcsNyArNzcsNyBAQCBwcml2 YXRlOgogI2VuZGlmCiAKICAgICBUaW1lciBtX2F1dG9zY3JvbGxUaW1lcjsKLSAgICBSZW5kZXJC b3gqIG1fYXV0b3Njcm9sbFJlbmRlcmVyOworICAgIFdlYWtQdHI8UmVuZGVyQm94PiBtX2F1dG9z Y3JvbGxSZW5kZXJlcjsKICAgICBBdXRvc2Nyb2xsVHlwZSBtX2F1dG9zY3JvbGxUeXBlOwogICAg IEludFBvaW50IG1fZHJhZ0FuZERyb3BBdXRvc2Nyb2xsUmVmZXJlbmNlUG9zaXRpb247CiAgICAg V2FsbFRpbWUgbV9kcmFnQW5kRHJvcEF1dG9zY3JvbGxTdGFydFRpbWU7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L0V2ZW50SGFuZGxlci5jcHAKaW5kZXggNjhlZWIxMjQzYjYzOTY3YzM5MzljZDRkNTJkM2EwOTdm ZDJlOWViNy4uMDA3NTRjNWM3NzhkZjhmYWVjMDlhMTNlMGY2MGNjZTBiMTY2M2QxNCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcApAQCAtMTEyNywxMiArMTEyNywxMCBAQCB2b2lk IEV2ZW50SGFuZGxlcjo6ZGlkUGFuU2Nyb2xsU3RvcCgpCiAKIHZvaWQgRXZlbnRIYW5kbGVyOjpz dGFydFBhblNjcm9sbGluZyhSZW5kZXJFbGVtZW50JiByZW5kZXJlcikKIHsKLSNpZiAhUExBVEZP Uk0oSU9TX0ZBTUlMWSkKICAgICBpZiAoIWlzPFJlbmRlckJveD4ocmVuZGVyZXIpKQogICAgICAg ICByZXR1cm47Ci0gICAgbV9hdXRvc2Nyb2xsQ29udHJvbGxlci0+c3RhcnRQYW5TY3JvbGxpbmco JmRvd25jYXN0PFJlbmRlckJveD4ocmVuZGVyZXIpLCBsYXN0S25vd25Nb3VzZVBvc2l0aW9uKCkp OworICAgIG1fYXV0b3Njcm9sbENvbnRyb2xsZXItPnN0YXJ0UGFuU2Nyb2xsaW5nKGRvd25jYXN0 PFJlbmRlckJveD4ocmVuZGVyZXIpLCBsYXN0S25vd25Nb3VzZVBvc2l0aW9uKCkpOwogICAgIGlu dmFsaWRhdGVDbGljaygpOwotI2VuZGlmCiB9CiAKICNlbmRpZiAvLyBFTkFCTEUoUEFOX1NDUk9M TElORykK 457952 2022-04-19 20:10:44 -0700 2022-04-19 22:08:28 -0700 Patch bug-239512-20220419201042.patch text/plain 10483 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyOTc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGI3ZTZjYmQzZGU5MGQ2 YzVlODE4N2ZlZGJjYjBkYWY3MDhkYTBmMy4uODM1YWVmYzk5MmQ0MDJmOGMwMjZlNmExNjkyNDE0 NzEyMDA0MzE4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIyLTA0LTE5ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFNvbWUgQXV0b3Nj cm9sbENvbnRyb2xsZXIgY2xlYW51cAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjM5NTEyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWxhbiBCdWp0YXMu CisKKyAgICAgICAgSGF2ZSBBdXRvc2Nyb2xsQ29udHJvbGxlciBzdG9yZSBhIFdlYWtQdHIgdG8g dGhlIHJlbmRlciBvYmplY3QuIEFkZHJlc3MgYW4gYXBwYXJlbnQKKyAgICAgICAgbnVsbCBkZS1y ZWYgaW4gQXV0b3Njcm9sbENvbnRyb2xsZXI6OnN0b3BBdXRvc2Nyb2xsVGltZXIoKSB3aGVyZSB0 aGUgRnJhbWUgY2FuIG51bGwuCisgICAgICAgIAorICAgICAgICBSZWZhY3RvciB1cGRhdGVEcmFn QW5kRHJvcCgpIHdpdGggYSBsYW1iZGEgc28gdGhhdCBhbGwgdGhlIGNvZGUgcGF0aHMgdGhhdCBl eGl0IGVhcmx5CisgICAgICAgIGNsZWFybHkgY2FsbCBzdG9wQXV0b3Njcm9sbFRpbWVyKCkgd2hp Y2ggbnVsbHMgb3V0IHRoZSByZW5kZXJlci4KKworICAgICAgICAqIHBhZ2UvQXV0b3Njcm9sbENv bnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QXV0b3Njcm9sbENvbnRyb2xsZXI6OmF1 dG9zY3JvbGxSZW5kZXJlciBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpBdXRvc2Nyb2xsQ29u dHJvbGxlcjo6c3RhcnRBdXRvc2Nyb2xsRm9yU2VsZWN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6 OkF1dG9zY3JvbGxDb250cm9sbGVyOjpzdG9wQXV0b3Njcm9sbFRpbWVyKToKKyAgICAgICAgKFdl YkNvcmU6OkF1dG9zY3JvbGxDb250cm9sbGVyOjp1cGRhdGVBdXRvc2Nyb2xsUmVuZGVyZXIpOgor ICAgICAgICAoV2ViQ29yZTo6QXV0b3Njcm9sbENvbnRyb2xsZXI6OnVwZGF0ZURyYWdBbmREcm9w KToKKyAgICAgICAgKFdlYkNvcmU6OkF1dG9zY3JvbGxDb250cm9sbGVyOjpzdGFydFBhblNjcm9s bGluZyk6CisgICAgICAgICogcGFnZS9BdXRvc2Nyb2xsQ29udHJvbGxlci5oOgorICAgICAgICAq IHBhZ2UvRXZlbnRIYW5kbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6 c3RhcnRQYW5TY3JvbGxpbmcpOgorCiAyMDIyLTA0LTE4ICBNYXR0IFdvb2Ryb3cgIDxtYXR0d29v ZHJvd0BhcHBsZS5jb20+CiAKICAgICAgICAgSW1wbGVtZW50IHN1cHBvcnQgZm9yIGFsaWduaW5n IGJhc2VsaW5lcyB0aHJvdWdoIHN1YmdyaWRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL0F1dG9zY3JvbGxDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQXV0b3Nj cm9sbENvbnRyb2xsZXIuY3BwCmluZGV4IDM0NGNkZmIzODkxYTE3MzJhNTAzODc1YWRmYTMxODJj NTIyZGU5NDQuLjU2MWU0MWIzMzc3ZGY5NzE0YmE2ZTg1OTQ0N2IyYjg0ZTJlNzU4MTEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQXV0b3Njcm9sbENvbnRyb2xsZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvQXV0b3Njcm9sbENvbnRyb2xsZXIuY3BwCkBAIC01NiwxNCAr NTYsMTIgQEAgc3RhdGljIEZyYW1lKiBnZXRNYWluRnJhbWUoRnJhbWUqIGZyYW1lKQogCiBBdXRv c2Nyb2xsQ29udHJvbGxlcjo6QXV0b3Njcm9sbENvbnRyb2xsZXIoKQogICAgIDogbV9hdXRvc2Ny b2xsVGltZXIoKnRoaXMsICZBdXRvc2Nyb2xsQ29udHJvbGxlcjo6YXV0b3Njcm9sbFRpbWVyRmly ZWQpCi0gICAgLCBtX2F1dG9zY3JvbGxSZW5kZXJlcihudWxscHRyKQotICAgICwgbV9hdXRvc2Ny b2xsVHlwZShOb0F1dG9zY3JvbGwpCiB7CiB9CiAKIFJlbmRlckJveCogQXV0b3Njcm9sbENvbnRy b2xsZXI6OmF1dG9zY3JvbGxSZW5kZXJlcigpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIG1fYXV0b3Nj cm9sbFJlbmRlcmVyOworICAgIHJldHVybiBtX2F1dG9zY3JvbGxSZW5kZXJlci5nZXQoKTsKIH0K IAogYm9vbCBBdXRvc2Nyb2xsQ29udHJvbGxlcjo6YXV0b3Njcm9sbEluUHJvZ3Jlc3MoKSBjb25z dApAQCAtNzYsMzIgKzc0LDM0IEBAIHZvaWQgQXV0b3Njcm9sbENvbnRyb2xsZXI6OnN0YXJ0QXV0 b3Njcm9sbEZvclNlbGVjdGlvbihSZW5kZXJPYmplY3QqIHJlbmRlcmVyKQogICAgIC8vIFdlIGRv bid0IHdhbnQgdG8gdHJpZ2dlciB0aGUgYXV0b3Njcm9sbCBvciB0aGUgcGFuU2Nyb2xsIGlmIGl0 J3MgYWxyZWFkeSBhY3RpdmUKICAgICBpZiAobV9hdXRvc2Nyb2xsVGltZXIuaXNBY3RpdmUoKSkK ICAgICAgICAgcmV0dXJuOwotICAgIFJlbmRlckJveCogc2Nyb2xsYWJsZSA9IFJlbmRlckJveDo6 ZmluZEF1dG9zY3JvbGxhYmxlKHJlbmRlcmVyKTsKKyAgICBhdXRvKiBzY3JvbGxhYmxlID0gUmVu ZGVyQm94OjpmaW5kQXV0b3Njcm9sbGFibGUocmVuZGVyZXIpOwogICAgIGlmICghc2Nyb2xsYWJs ZSkKICAgICAgICAgcmV0dXJuOwogICAgIG1fYXV0b3Njcm9sbFR5cGUgPSBBdXRvc2Nyb2xsRm9y U2VsZWN0aW9uOwotICAgIG1fYXV0b3Njcm9sbFJlbmRlcmVyID0gc2Nyb2xsYWJsZTsKKyAgICBt X2F1dG9zY3JvbGxSZW5kZXJlciA9IFdlYWtQdHIgeyAqc2Nyb2xsYWJsZSB9OwogICAgIHN0YXJ0 QXV0b3Njcm9sbFRpbWVyKCk7CiB9CiAKIHZvaWQgQXV0b3Njcm9sbENvbnRyb2xsZXI6OnN0b3BB dXRvc2Nyb2xsVGltZXIoYm9vbCByZW5kZXJlcklzQmVpbmdEZXN0cm95ZWQpCiB7Ci0gICAgUmVu ZGVyQm94KiBzY3JvbGxhYmxlID0gbV9hdXRvc2Nyb2xsUmVuZGVyZXI7CisgICAgYXV0byBzY3Jv bGxhYmxlID0gbV9hdXRvc2Nyb2xsUmVuZGVyZXI7CisKICAgICBtX2F1dG9zY3JvbGxUaW1lci5z dG9wKCk7CiAgICAgbV9hdXRvc2Nyb2xsUmVuZGVyZXIgPSBudWxscHRyOwogCiAgICAgaWYgKCFz Y3JvbGxhYmxlKQogICAgICAgICByZXR1cm47CiAKLSAgICBGcmFtZSYgZnJhbWUgPSBzY3JvbGxh YmxlLT5mcmFtZSgpOwotICAgIGlmIChhdXRvc2Nyb2xsSW5Qcm9ncmVzcygpICYmIGZyYW1lLmV2 ZW50SGFuZGxlcigpLm1vdXNlRG93bldhc0luU3ViZnJhbWUoKSkgewotICAgICAgICBpZiAoYXV0 byBzdWJmcmFtZSA9IGZyYW1lLmV2ZW50SGFuZGxlcigpLnN1YmZyYW1lRm9yVGFyZ2V0Tm9kZShm cmFtZS5ldmVudEhhbmRsZXIoKS5tb3VzZVByZXNzTm9kZSgpKSkKKyAgICBhdXRvKiBmcmFtZSA9 IHNjcm9sbGFibGUtPmRvY3VtZW50KCkuZnJhbWUoKTsKKyAgICBpZiAoYXV0b3Njcm9sbEluUHJv Z3Jlc3MoKSAmJiBmcmFtZSAmJiBmcmFtZS0+ZXZlbnRIYW5kbGVyKCkubW91c2VEb3duV2FzSW5T dWJmcmFtZSgpKSB7CisgICAgICAgIGlmIChhdXRvIHN1YmZyYW1lID0gZnJhbWUtPmV2ZW50SGFu ZGxlcigpLnN1YmZyYW1lRm9yVGFyZ2V0Tm9kZShmcmFtZS0+ZXZlbnRIYW5kbGVyKCkubW91c2VQ cmVzc05vZGUoKSkpCiAgICAgICAgICAgICBzdWJmcmFtZS0+ZXZlbnRIYW5kbGVyKCkuc3RvcEF1 dG9zY3JvbGxUaW1lcihyZW5kZXJlcklzQmVpbmdEZXN0cm95ZWQpOwogICAgICAgICByZXR1cm47 CiAgICAgfQogCiAgICAgaWYgKCFyZW5kZXJlcklzQmVpbmdEZXN0cm95ZWQpCiAgICAgICAgIHNj cm9sbGFibGUtPnN0b3BBdXRvc2Nyb2xsKCk7CisKICNpZiBFTkFCTEUoUEFOX1NDUk9MTElORykK ICAgICBpZiAocGFuU2Nyb2xsSW5Qcm9ncmVzcygpKSB7CiAgICAgICAgIEZyYW1lVmlldyYgZnJh bWVWaWV3ID0gc2Nyb2xsYWJsZS0+dmlldygpLmZyYW1lVmlldygpOwpAQCAtMTE0LDggKzExNCw4 IEBAIHZvaWQgQXV0b3Njcm9sbENvbnRyb2xsZXI6OnN0b3BBdXRvc2Nyb2xsVGltZXIoYm9vbCBy ZW5kZXJlcklzQmVpbmdEZXN0cm95ZWQpCiAKICNpZiBFTkFCTEUoUEFOX1NDUk9MTElORykKICAg ICAvLyBJZiB3ZSdyZSBub3QgaW4gdGhlIHRvcCBmcmFtZSB3ZSBub3RpZnkgaXQgdGhhdCB3ZSBh cmUgbm90IGRvaW5nIGEgcGFuU2Nyb2xsIGFueSBtb3JlLgotICAgIGlmICghZnJhbWUuaXNNYWlu RnJhbWUoKSkKLSAgICAgICAgZnJhbWUubWFpbkZyYW1lKCkuZXZlbnRIYW5kbGVyKCkuZGlkUGFu U2Nyb2xsU3RvcCgpOworICAgIGlmIChmcmFtZSAmJiAhZnJhbWUtPmlzTWFpbkZyYW1lKCkpCisg ICAgICAgIGZyYW1lLT5tYWluRnJhbWUoKS5ldmVudEhhbmRsZXIoKS5kaWRQYW5TY3JvbGxTdG9w KCk7CiAjZW5kaWYKIH0KIApAQCAtMTI0LDQ0ICsxMjQsNTIgQEAgdm9pZCBBdXRvc2Nyb2xsQ29u dHJvbGxlcjo6dXBkYXRlQXV0b3Njcm9sbFJlbmRlcmVyKCkKICAgICBpZiAoIW1fYXV0b3Njcm9s bFJlbmRlcmVyKQogICAgICAgICByZXR1cm47CiAKLSAgICBSZW5kZXJPYmplY3QqIHJlbmRlcmVy ID0gbV9hdXRvc2Nyb2xsUmVuZGVyZXI7CisgICAgUmVuZGVyRWxlbWVudCogcmVuZGVyZXIgPSBt X2F1dG9zY3JvbGxSZW5kZXJlci5nZXQoKTsKIAogI2lmIEVOQUJMRShQQU5fU0NST0xMSU5HKQog ICAgIGNvbnN0ZXhwciBPcHRpb25TZXQ8SGl0VGVzdFJlcXVlc3Q6OlR5cGU+IGhpdFR5cGUgeyBI aXRUZXN0UmVxdWVzdDo6VHlwZTo6UmVhZE9ubHksIEhpdFRlc3RSZXF1ZXN0OjpUeXBlOjpBY3Rp dmUsIEhpdFRlc3RSZXF1ZXN0OjpUeXBlOjpBbGxvd0NoaWxkRnJhbWVDb250ZW50IH07CiAgICAg SGl0VGVzdFJlc3VsdCBoaXRUZXN0ID0gbV9hdXRvc2Nyb2xsUmVuZGVyZXItPmZyYW1lKCkuZXZl bnRIYW5kbGVyKCkuaGl0VGVzdFJlc3VsdEF0UG9pbnQobV9wYW5TY3JvbGxTdGFydFBvcywgaGl0 VHlwZSk7CiAKLSAgICBpZiAoTm9kZSogbm9kZUF0UG9pbnQgPSBoaXRUZXN0LmlubmVyTm9kZSgp KQorICAgIGlmIChhdXRvKiBub2RlQXRQb2ludCA9IGhpdFRlc3QuaW5uZXJOb2RlKCkpCiAgICAg ICAgIHJlbmRlcmVyID0gbm9kZUF0UG9pbnQtPnJlbmRlcmVyKCk7CiAjZW5kaWYKIAogICAgIHdo aWxlIChyZW5kZXJlciAmJiAhKGlzPFJlbmRlckJveD4oKnJlbmRlcmVyKSAmJiBkb3duY2FzdDxS ZW5kZXJCb3g+KCpyZW5kZXJlcikuY2FuQXV0b3Njcm9sbCgpKSkKICAgICAgICAgcmVuZGVyZXIg PSByZW5kZXJlci0+cGFyZW50KCk7Ci0gICAgbV9hdXRvc2Nyb2xsUmVuZGVyZXIgPSBkeW5hbWlj RG93bmNhc3Q8UmVuZGVyQm94PihyZW5kZXJlcik7Ci19Ci0KLXZvaWQgQXV0b3Njcm9sbENvbnRy b2xsZXI6OnVwZGF0ZURyYWdBbmREcm9wKE5vZGUqIGRyb3BUYXJnZXROb2RlLCBjb25zdCBJbnRQ b2ludCYgZXZlbnRQb3NpdGlvbiwgV2FsbFRpbWUgZXZlbnRUaW1lKQotewotICAgIGlmICghZHJv cFRhcmdldE5vZGUpIHsKLSAgICAgICAgc3RvcEF1dG9zY3JvbGxUaW1lcigpOwotICAgICAgICBy ZXR1cm47Ci0gICAgfQogCi0gICAgUmVuZGVyQm94KiBzY3JvbGxhYmxlID0gUmVuZGVyQm94Ojpm aW5kQXV0b3Njcm9sbGFibGUoZHJvcFRhcmdldE5vZGUtPnJlbmRlcmVyKCkpOwotICAgIGlmICgh c2Nyb2xsYWJsZSkgewotICAgICAgICBzdG9wQXV0b3Njcm9sbFRpbWVyKCk7CisgICAgaWYgKCFp czxSZW5kZXJCb3g+KHJlbmRlcmVyKSkgeworICAgICAgICBtX2F1dG9zY3JvbGxSZW5kZXJlciA9 IG51bGxwdHI7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBGcmFtZSYgZnJhbWUgPSBz Y3JvbGxhYmxlLT5mcmFtZSgpOwotCi0gICAgUGFnZSogcGFnZSA9IGZyYW1lLnBhZ2UoKTsKLSAg ICBpZiAoIXBhZ2UgfHwgIXBhZ2UtPnNldHRpbmdzKCkuYXV0b3Njcm9sbEZvckRyYWdBbmREcm9w RW5hYmxlZCgpKSB7Ci0gICAgICAgIHN0b3BBdXRvc2Nyb2xsVGltZXIoKTsKLSAgICAgICAgcmV0 dXJuOwotICAgIH0KKyAgICBtX2F1dG9zY3JvbGxSZW5kZXJlciA9IFdlYWtQdHIgeyBkb3duY2Fz dDxSZW5kZXJCb3g+KCpyZW5kZXJlcikgfTsKK30KIAotICAgIEludFNpemUgb2Zmc2V0ID0gc2Ny b2xsYWJsZS0+Y2FsY3VsYXRlQXV0b3Njcm9sbERpcmVjdGlvbihldmVudFBvc2l0aW9uKTsKLSAg ICBpZiAob2Zmc2V0LmlzWmVybygpKSB7Cit2b2lkIEF1dG9zY3JvbGxDb250cm9sbGVyOjp1cGRh dGVEcmFnQW5kRHJvcChOb2RlKiBkcm9wVGFyZ2V0Tm9kZSwgY29uc3QgSW50UG9pbnQmIGV2ZW50 UG9zaXRpb24sIFdhbGxUaW1lIGV2ZW50VGltZSkKK3sKKyAgICBJbnRTaXplIG9mZnNldDsKKyAg ICBhdXRvIGZpbmREcmFnQW5kRHJvcFNjcm9sbGVyID0gWyZdKCkgLT4gUmVuZGVyQm94KiB7Cisg ICAgICAgIGlmICghZHJvcFRhcmdldE5vZGUpCisgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsK KworICAgICAgICBhdXRvKiBzY3JvbGxhYmxlID0gUmVuZGVyQm94OjpmaW5kQXV0b3Njcm9sbGFi bGUoZHJvcFRhcmdldE5vZGUtPnJlbmRlcmVyKCkpOworICAgICAgICBpZiAoIXNjcm9sbGFibGUp CisgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKKworICAgICAgICBhdXRvJiBmcmFtZSA9IHNj cm9sbGFibGUtPmZyYW1lKCk7CisgICAgICAgIGF1dG8qIHBhZ2UgPSBmcmFtZS5wYWdlKCk7Cisg ICAgICAgIGlmICghcGFnZSB8fCAhcGFnZS0+c2V0dGluZ3MoKS5hdXRvc2Nyb2xsRm9yRHJhZ0Fu ZERyb3BFbmFibGVkKCkpCisgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKKworICAgICAgICBv ZmZzZXQgPSBzY3JvbGxhYmxlLT5jYWxjdWxhdGVBdXRvc2Nyb2xsRGlyZWN0aW9uKGV2ZW50UG9z aXRpb24pOworICAgICAgICBpZiAob2Zmc2V0LmlzWmVybygpKQorICAgICAgICAgICAgcmV0dXJu IG51bGxwdHI7CisKKyAgICAgICAgcmV0dXJuIHNjcm9sbGFibGU7CisgICAgfTsKKyAgICAKKyAg ICBSZW5kZXJCb3gqIHNjcm9sbGFibGUgPSBmaW5kRHJhZ0FuZERyb3BTY3JvbGxlcigpOworICAg IGlmICghc2Nyb2xsYWJsZSkgewogICAgICAgICBzdG9wQXV0b3Njcm9sbFRpbWVyKCk7CiAgICAg ICAgIHJldHVybjsKICAgICB9CkBAIC0xNzAsMTIgKzE3OCwxMiBAQCB2b2lkIEF1dG9zY3JvbGxD b250cm9sbGVyOjp1cGRhdGVEcmFnQW5kRHJvcChOb2RlKiBkcm9wVGFyZ2V0Tm9kZSwgY29uc3Qg SW50UG9pbgogCiAgICAgaWYgKG1fYXV0b3Njcm9sbFR5cGUgPT0gTm9BdXRvc2Nyb2xsKSB7CiAg ICAgICAgIG1fYXV0b3Njcm9sbFR5cGUgPSBBdXRvc2Nyb2xsRm9yRHJhZ0FuZERyb3A7Ci0gICAg ICAgIG1fYXV0b3Njcm9sbFJlbmRlcmVyID0gc2Nyb2xsYWJsZTsKKyAgICAgICAgbV9hdXRvc2Ny b2xsUmVuZGVyZXIgPSBXZWFrUHRyIHsgKnNjcm9sbGFibGUgfTsKICAgICAgICAgbV9kcmFnQW5k RHJvcEF1dG9zY3JvbGxTdGFydFRpbWUgPSBldmVudFRpbWU7CiAgICAgICAgIHN0YXJ0QXV0b3Nj cm9sbFRpbWVyKCk7CiAgICAgfSBlbHNlIGlmIChtX2F1dG9zY3JvbGxSZW5kZXJlciAhPSBzY3Jv bGxhYmxlKSB7CiAgICAgICAgIG1fZHJhZ0FuZERyb3BBdXRvc2Nyb2xsU3RhcnRUaW1lID0gZXZl bnRUaW1lOwotICAgICAgICBtX2F1dG9zY3JvbGxSZW5kZXJlciA9IHNjcm9sbGFibGU7CisgICAg ICAgIG1fYXV0b3Njcm9sbFJlbmRlcmVyID0gV2Vha1B0ciB7ICpzY3JvbGxhYmxlIH07CiAgICAg fQogfQogCkBAIC0yMTAsMTkgKzIxOCwyMCBAQCBib29sIEF1dG9zY3JvbGxDb250cm9sbGVyOjpw YW5TY3JvbGxJblByb2dyZXNzKCkgY29uc3QKICAgICByZXR1cm4gbV9hdXRvc2Nyb2xsVHlwZSA9 PSBBdXRvc2Nyb2xsRm9yUGFuIHx8IG1fYXV0b3Njcm9sbFR5cGUgPT0gQXV0b3Njcm9sbEZvclBh bkNhblN0b3A7CiB9CiAKLXZvaWQgQXV0b3Njcm9sbENvbnRyb2xsZXI6OnN0YXJ0UGFuU2Nyb2xs aW5nKFJlbmRlckJveCogc2Nyb2xsYWJsZSwgY29uc3QgSW50UG9pbnQmIGxhc3RLbm93bk1vdXNl UG9zaXRpb24pCit2b2lkIEF1dG9zY3JvbGxDb250cm9sbGVyOjpzdGFydFBhblNjcm9sbGluZyhS ZW5kZXJCb3gmIHNjcm9sbGFibGUsIGNvbnN0IEludFBvaW50JiBsYXN0S25vd25Nb3VzZVBvc2l0 aW9uKQogewogICAgIC8vIFdlIGRvbid0IHdhbnQgdG8gdHJpZ2dlciB0aGUgYXV0b3Njcm9sbCBv ciB0aGUgcGFuU2Nyb2xsIGlmIGl0J3MgYWxyZWFkeSBhY3RpdmUKICAgICBpZiAobV9hdXRvc2Ny b2xsVGltZXIuaXNBY3RpdmUoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgbV9hdXRvc2Nyb2xs VHlwZSA9IEF1dG9zY3JvbGxGb3JQYW47Ci0gICAgbV9hdXRvc2Nyb2xsUmVuZGVyZXIgPSBzY3Jv bGxhYmxlOworICAgIG1fYXV0b3Njcm9sbFJlbmRlcmVyID0gV2Vha1B0ciB7IHNjcm9sbGFibGUg fTsKICAgICBtX3BhblNjcm9sbFN0YXJ0UG9zID0gbGFzdEtub3duTW91c2VQb3NpdGlvbjsKIAot ICAgIGlmIChGcmFtZVZpZXcqIHZpZXcgPSBzY3JvbGxhYmxlLT5mcmFtZSgpLnZpZXcoKSkKKyAg ICBpZiAoYXV0byogdmlldyA9IHNjcm9sbGFibGUuZnJhbWUoKS52aWV3KCkpCiAgICAgICAgIHZp ZXctPmFkZFBhblNjcm9sbEljb24obGFzdEtub3duTW91c2VQb3NpdGlvbik7Ci0gICAgc2Nyb2xs YWJsZS0+ZnJhbWUoKS5ldmVudEhhbmRsZXIoKS5kaWRQYW5TY3JvbGxTdGFydCgpOworCisgICAg c2Nyb2xsYWJsZS5mcmFtZSgpLmV2ZW50SGFuZGxlcigpLmRpZFBhblNjcm9sbFN0YXJ0KCk7CiAg ICAgc3RhcnRBdXRvc2Nyb2xsVGltZXIoKTsKIH0KICNlbHNlCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL0F1dG9zY3JvbGxDb250cm9sbGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L0F1dG9zY3JvbGxDb250cm9sbGVyLmgKaW5kZXggNzEzNjBiYTQ0ZGRjOTQ1MTRmNjk0MmQ0NmJk YjhmMGY4ZDA2YmUzMi4uZDMxZmFiNDQ2NTIzZWYwMmU2Nzk2ZjMyZGM0ZTg3YWI3MDZhYTQ0NyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9BdXRvc2Nyb2xsQ29udHJvbGxlci5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQXV0b3Njcm9sbENvbnRyb2xsZXIuaApAQCAtNjYsNyAr NjYsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBkaWRQYW5TY3JvbGxTdG9wKCk7CiAgICAgdm9pZCBo YW5kbGVNb3VzZVJlbGVhc2VFdmVudChjb25zdCBQbGF0Zm9ybU1vdXNlRXZlbnQmKTsKICAgICB2 b2lkIHNldFBhblNjcm9sbEluUHJvZ3Jlc3MoYm9vbCk7Ci0gICAgdm9pZCBzdGFydFBhblNjcm9s bGluZyhSZW5kZXJCb3gqLCBjb25zdCBJbnRQb2ludCYpOworICAgIHZvaWQgc3RhcnRQYW5TY3Jv bGxpbmcoUmVuZGVyQm94JiwgY29uc3QgSW50UG9pbnQmKTsKICNlbmRpZgogCiBwcml2YXRlOgpA QCAtNzcsOCArNzcsOCBAQCBwcml2YXRlOgogI2VuZGlmCiAKICAgICBUaW1lciBtX2F1dG9zY3Jv bGxUaW1lcjsKLSAgICBSZW5kZXJCb3gqIG1fYXV0b3Njcm9sbFJlbmRlcmVyOwotICAgIEF1dG9z Y3JvbGxUeXBlIG1fYXV0b3Njcm9sbFR5cGU7CisgICAgV2Vha1B0cjxSZW5kZXJCb3g+IG1fYXV0 b3Njcm9sbFJlbmRlcmVyOworICAgIEF1dG9zY3JvbGxUeXBlIG1fYXV0b3Njcm9sbFR5cGUgeyBO b0F1dG9zY3JvbGwgfTsKICAgICBJbnRQb2ludCBtX2RyYWdBbmREcm9wQXV0b3Njcm9sbFJlZmVy ZW5jZVBvc2l0aW9uOwogICAgIFdhbGxUaW1lIG1fZHJhZ0FuZERyb3BBdXRvc2Nyb2xsU3RhcnRU aW1lOwogI2lmIEVOQUJMRShQQU5fU0NST0xMSU5HKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRs ZXIuY3BwCmluZGV4IDY4ZWViMTI0M2I2Mzk2N2MzOTM5Y2Q0ZDUyZDNhMDk3ZmQyZTllYjcuLjAw NzU0YzVjNzc4ZGY4ZmFlYzA5YTEzZTBmNjBjY2UwYjE2NjNkMTQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L0V2ZW50SGFuZGxlci5jcHAKQEAgLTExMjcsMTIgKzExMjcsMTAgQEAgdm9pZCBFdmVudEhhbmRs ZXI6OmRpZFBhblNjcm9sbFN0b3AoKQogCiB2b2lkIEV2ZW50SGFuZGxlcjo6c3RhcnRQYW5TY3Jv bGxpbmcoUmVuZGVyRWxlbWVudCYgcmVuZGVyZXIpCiB7Ci0jaWYgIVBMQVRGT1JNKElPU19GQU1J TFkpCiAgICAgaWYgKCFpczxSZW5kZXJCb3g+KHJlbmRlcmVyKSkKICAgICAgICAgcmV0dXJuOwot ICAgIG1fYXV0b3Njcm9sbENvbnRyb2xsZXItPnN0YXJ0UGFuU2Nyb2xsaW5nKCZkb3duY2FzdDxS ZW5kZXJCb3g+KHJlbmRlcmVyKSwgbGFzdEtub3duTW91c2VQb3NpdGlvbigpKTsKKyAgICBtX2F1 dG9zY3JvbGxDb250cm9sbGVyLT5zdGFydFBhblNjcm9sbGluZyhkb3duY2FzdDxSZW5kZXJCb3g+ KHJlbmRlcmVyKSwgbGFzdEtub3duTW91c2VQb3NpdGlvbigpKTsKICAgICBpbnZhbGlkYXRlQ2xp Y2soKTsKLSNlbmRpZgogfQogCiAjZW5kaWYgLy8gRU5BQkxFKFBBTl9TQ1JPTExJTkcpCg== 457959 2022-04-19 21:28:25 -0700 2022-04-20 08:05:35 -0700 Patch bug-239512-20220419212823.patch text/plain 10482 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyOTc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGI3ZTZjYmQzZGU5MGQ2 YzVlODE4N2ZlZGJjYjBkYWY3MDhkYTBmMy4uODM1YWVmYzk5MmQ0MDJmOGMwMjZlNmExNjkyNDE0 NzEyMDA0MzE4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIyLTA0LTE5ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFNvbWUgQXV0b3Nj cm9sbENvbnRyb2xsZXIgY2xlYW51cAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjM5NTEyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWxhbiBCdWp0YXMu CisKKyAgICAgICAgSGF2ZSBBdXRvc2Nyb2xsQ29udHJvbGxlciBzdG9yZSBhIFdlYWtQdHIgdG8g dGhlIHJlbmRlciBvYmplY3QuIEFkZHJlc3MgYW4gYXBwYXJlbnQKKyAgICAgICAgbnVsbCBkZS1y ZWYgaW4gQXV0b3Njcm9sbENvbnRyb2xsZXI6OnN0b3BBdXRvc2Nyb2xsVGltZXIoKSB3aGVyZSB0 aGUgRnJhbWUgY2FuIG51bGwuCisgICAgICAgIAorICAgICAgICBSZWZhY3RvciB1cGRhdGVEcmFn QW5kRHJvcCgpIHdpdGggYSBsYW1iZGEgc28gdGhhdCBhbGwgdGhlIGNvZGUgcGF0aHMgdGhhdCBl eGl0IGVhcmx5CisgICAgICAgIGNsZWFybHkgY2FsbCBzdG9wQXV0b3Njcm9sbFRpbWVyKCkgd2hp Y2ggbnVsbHMgb3V0IHRoZSByZW5kZXJlci4KKworICAgICAgICAqIHBhZ2UvQXV0b3Njcm9sbENv bnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QXV0b3Njcm9sbENvbnRyb2xsZXI6OmF1 dG9zY3JvbGxSZW5kZXJlciBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpBdXRvc2Nyb2xsQ29u dHJvbGxlcjo6c3RhcnRBdXRvc2Nyb2xsRm9yU2VsZWN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6 OkF1dG9zY3JvbGxDb250cm9sbGVyOjpzdG9wQXV0b3Njcm9sbFRpbWVyKToKKyAgICAgICAgKFdl YkNvcmU6OkF1dG9zY3JvbGxDb250cm9sbGVyOjp1cGRhdGVBdXRvc2Nyb2xsUmVuZGVyZXIpOgor ICAgICAgICAoV2ViQ29yZTo6QXV0b3Njcm9sbENvbnRyb2xsZXI6OnVwZGF0ZURyYWdBbmREcm9w KToKKyAgICAgICAgKFdlYkNvcmU6OkF1dG9zY3JvbGxDb250cm9sbGVyOjpzdGFydFBhblNjcm9s bGluZyk6CisgICAgICAgICogcGFnZS9BdXRvc2Nyb2xsQ29udHJvbGxlci5oOgorICAgICAgICAq IHBhZ2UvRXZlbnRIYW5kbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6 c3RhcnRQYW5TY3JvbGxpbmcpOgorCiAyMDIyLTA0LTE4ICBNYXR0IFdvb2Ryb3cgIDxtYXR0d29v ZHJvd0BhcHBsZS5jb20+CiAKICAgICAgICAgSW1wbGVtZW50IHN1cHBvcnQgZm9yIGFsaWduaW5n IGJhc2VsaW5lcyB0aHJvdWdoIHN1YmdyaWRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL0F1dG9zY3JvbGxDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQXV0b3Nj cm9sbENvbnRyb2xsZXIuY3BwCmluZGV4IDM0NGNkZmIzODkxYTE3MzJhNTAzODc1YWRmYTMxODJj NTIyZGU5NDQuLmYxZDU1MTdkNzk5MWRhNjJjZTRiNjcwMDUzZjYzZWNmOTM1MDNlNjIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQXV0b3Njcm9sbENvbnRyb2xsZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvQXV0b3Njcm9sbENvbnRyb2xsZXIuY3BwCkBAIC01NiwxNCAr NTYsMTIgQEAgc3RhdGljIEZyYW1lKiBnZXRNYWluRnJhbWUoRnJhbWUqIGZyYW1lKQogCiBBdXRv c2Nyb2xsQ29udHJvbGxlcjo6QXV0b3Njcm9sbENvbnRyb2xsZXIoKQogICAgIDogbV9hdXRvc2Ny b2xsVGltZXIoKnRoaXMsICZBdXRvc2Nyb2xsQ29udHJvbGxlcjo6YXV0b3Njcm9sbFRpbWVyRmly ZWQpCi0gICAgLCBtX2F1dG9zY3JvbGxSZW5kZXJlcihudWxscHRyKQotICAgICwgbV9hdXRvc2Ny b2xsVHlwZShOb0F1dG9zY3JvbGwpCiB7CiB9CiAKIFJlbmRlckJveCogQXV0b3Njcm9sbENvbnRy b2xsZXI6OmF1dG9zY3JvbGxSZW5kZXJlcigpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIG1fYXV0b3Nj cm9sbFJlbmRlcmVyOworICAgIHJldHVybiBtX2F1dG9zY3JvbGxSZW5kZXJlci5nZXQoKTsKIH0K IAogYm9vbCBBdXRvc2Nyb2xsQ29udHJvbGxlcjo6YXV0b3Njcm9sbEluUHJvZ3Jlc3MoKSBjb25z dApAQCAtNzYsMzIgKzc0LDM0IEBAIHZvaWQgQXV0b3Njcm9sbENvbnRyb2xsZXI6OnN0YXJ0QXV0 b3Njcm9sbEZvclNlbGVjdGlvbihSZW5kZXJPYmplY3QqIHJlbmRlcmVyKQogICAgIC8vIFdlIGRv bid0IHdhbnQgdG8gdHJpZ2dlciB0aGUgYXV0b3Njcm9sbCBvciB0aGUgcGFuU2Nyb2xsIGlmIGl0 J3MgYWxyZWFkeSBhY3RpdmUKICAgICBpZiAobV9hdXRvc2Nyb2xsVGltZXIuaXNBY3RpdmUoKSkK ICAgICAgICAgcmV0dXJuOwotICAgIFJlbmRlckJveCogc2Nyb2xsYWJsZSA9IFJlbmRlckJveDo6 ZmluZEF1dG9zY3JvbGxhYmxlKHJlbmRlcmVyKTsKKyAgICBhdXRvKiBzY3JvbGxhYmxlID0gUmVu ZGVyQm94OjpmaW5kQXV0b3Njcm9sbGFibGUocmVuZGVyZXIpOwogICAgIGlmICghc2Nyb2xsYWJs ZSkKICAgICAgICAgcmV0dXJuOwogICAgIG1fYXV0b3Njcm9sbFR5cGUgPSBBdXRvc2Nyb2xsRm9y U2VsZWN0aW9uOwotICAgIG1fYXV0b3Njcm9sbFJlbmRlcmVyID0gc2Nyb2xsYWJsZTsKKyAgICBt X2F1dG9zY3JvbGxSZW5kZXJlciA9IFdlYWtQdHIgeyAqc2Nyb2xsYWJsZSB9OwogICAgIHN0YXJ0 QXV0b3Njcm9sbFRpbWVyKCk7CiB9CiAKIHZvaWQgQXV0b3Njcm9sbENvbnRyb2xsZXI6OnN0b3BB dXRvc2Nyb2xsVGltZXIoYm9vbCByZW5kZXJlcklzQmVpbmdEZXN0cm95ZWQpCiB7Ci0gICAgUmVu ZGVyQm94KiBzY3JvbGxhYmxlID0gbV9hdXRvc2Nyb2xsUmVuZGVyZXI7CisgICAgYXV0byBzY3Jv bGxhYmxlID0gbV9hdXRvc2Nyb2xsUmVuZGVyZXI7CisKICAgICBtX2F1dG9zY3JvbGxUaW1lci5z dG9wKCk7CiAgICAgbV9hdXRvc2Nyb2xsUmVuZGVyZXIgPSBudWxscHRyOwogCiAgICAgaWYgKCFz Y3JvbGxhYmxlKQogICAgICAgICByZXR1cm47CiAKLSAgICBGcmFtZSYgZnJhbWUgPSBzY3JvbGxh YmxlLT5mcmFtZSgpOwotICAgIGlmIChhdXRvc2Nyb2xsSW5Qcm9ncmVzcygpICYmIGZyYW1lLmV2 ZW50SGFuZGxlcigpLm1vdXNlRG93bldhc0luU3ViZnJhbWUoKSkgewotICAgICAgICBpZiAoYXV0 byBzdWJmcmFtZSA9IGZyYW1lLmV2ZW50SGFuZGxlcigpLnN1YmZyYW1lRm9yVGFyZ2V0Tm9kZShm cmFtZS5ldmVudEhhbmRsZXIoKS5tb3VzZVByZXNzTm9kZSgpKSkKKyAgICBhdXRvKiBmcmFtZSA9 IHNjcm9sbGFibGUtPmRvY3VtZW50KCkuZnJhbWUoKTsKKyAgICBpZiAoYXV0b3Njcm9sbEluUHJv Z3Jlc3MoKSAmJiBmcmFtZSAmJiBmcmFtZS0+ZXZlbnRIYW5kbGVyKCkubW91c2VEb3duV2FzSW5T dWJmcmFtZSgpKSB7CisgICAgICAgIGlmIChhdXRvIHN1YmZyYW1lID0gZnJhbWUtPmV2ZW50SGFu ZGxlcigpLnN1YmZyYW1lRm9yVGFyZ2V0Tm9kZShmcmFtZS0+ZXZlbnRIYW5kbGVyKCkubW91c2VQ cmVzc05vZGUoKSkpCiAgICAgICAgICAgICBzdWJmcmFtZS0+ZXZlbnRIYW5kbGVyKCkuc3RvcEF1 dG9zY3JvbGxUaW1lcihyZW5kZXJlcklzQmVpbmdEZXN0cm95ZWQpOwogICAgICAgICByZXR1cm47 CiAgICAgfQogCiAgICAgaWYgKCFyZW5kZXJlcklzQmVpbmdEZXN0cm95ZWQpCiAgICAgICAgIHNj cm9sbGFibGUtPnN0b3BBdXRvc2Nyb2xsKCk7CisKICNpZiBFTkFCTEUoUEFOX1NDUk9MTElORykK ICAgICBpZiAocGFuU2Nyb2xsSW5Qcm9ncmVzcygpKSB7CiAgICAgICAgIEZyYW1lVmlldyYgZnJh bWVWaWV3ID0gc2Nyb2xsYWJsZS0+dmlldygpLmZyYW1lVmlldygpOwpAQCAtMTE0LDggKzExNCw4 IEBAIHZvaWQgQXV0b3Njcm9sbENvbnRyb2xsZXI6OnN0b3BBdXRvc2Nyb2xsVGltZXIoYm9vbCBy ZW5kZXJlcklzQmVpbmdEZXN0cm95ZWQpCiAKICNpZiBFTkFCTEUoUEFOX1NDUk9MTElORykKICAg ICAvLyBJZiB3ZSdyZSBub3QgaW4gdGhlIHRvcCBmcmFtZSB3ZSBub3RpZnkgaXQgdGhhdCB3ZSBh cmUgbm90IGRvaW5nIGEgcGFuU2Nyb2xsIGFueSBtb3JlLgotICAgIGlmICghZnJhbWUuaXNNYWlu RnJhbWUoKSkKLSAgICAgICAgZnJhbWUubWFpbkZyYW1lKCkuZXZlbnRIYW5kbGVyKCkuZGlkUGFu U2Nyb2xsU3RvcCgpOworICAgIGlmIChmcmFtZSAmJiAhZnJhbWUtPmlzTWFpbkZyYW1lKCkpCisg ICAgICAgIGZyYW1lLT5tYWluRnJhbWUoKS5ldmVudEhhbmRsZXIoKS5kaWRQYW5TY3JvbGxTdG9w KCk7CiAjZW5kaWYKIH0KIApAQCAtMTI0LDQ0ICsxMjQsNTIgQEAgdm9pZCBBdXRvc2Nyb2xsQ29u dHJvbGxlcjo6dXBkYXRlQXV0b3Njcm9sbFJlbmRlcmVyKCkKICAgICBpZiAoIW1fYXV0b3Njcm9s bFJlbmRlcmVyKQogICAgICAgICByZXR1cm47CiAKLSAgICBSZW5kZXJPYmplY3QqIHJlbmRlcmVy ID0gbV9hdXRvc2Nyb2xsUmVuZGVyZXI7CisgICAgUmVuZGVyT2JqZWN0KiByZW5kZXJlciA9IG1f YXV0b3Njcm9sbFJlbmRlcmVyLmdldCgpOwogCiAjaWYgRU5BQkxFKFBBTl9TQ1JPTExJTkcpCiAg ICAgY29uc3RleHByIE9wdGlvblNldDxIaXRUZXN0UmVxdWVzdDo6VHlwZT4gaGl0VHlwZSB7IEhp dFRlc3RSZXF1ZXN0OjpUeXBlOjpSZWFkT25seSwgSGl0VGVzdFJlcXVlc3Q6OlR5cGU6OkFjdGl2 ZSwgSGl0VGVzdFJlcXVlc3Q6OlR5cGU6OkFsbG93Q2hpbGRGcmFtZUNvbnRlbnQgfTsKICAgICBI aXRUZXN0UmVzdWx0IGhpdFRlc3QgPSBtX2F1dG9zY3JvbGxSZW5kZXJlci0+ZnJhbWUoKS5ldmVu dEhhbmRsZXIoKS5oaXRUZXN0UmVzdWx0QXRQb2ludChtX3BhblNjcm9sbFN0YXJ0UG9zLCBoaXRU eXBlKTsKIAotICAgIGlmIChOb2RlKiBub2RlQXRQb2ludCA9IGhpdFRlc3QuaW5uZXJOb2RlKCkp CisgICAgaWYgKGF1dG8qIG5vZGVBdFBvaW50ID0gaGl0VGVzdC5pbm5lck5vZGUoKSkKICAgICAg ICAgcmVuZGVyZXIgPSBub2RlQXRQb2ludC0+cmVuZGVyZXIoKTsKICNlbmRpZgogCiAgICAgd2hp bGUgKHJlbmRlcmVyICYmICEoaXM8UmVuZGVyQm94PigqcmVuZGVyZXIpICYmIGRvd25jYXN0PFJl bmRlckJveD4oKnJlbmRlcmVyKS5jYW5BdXRvc2Nyb2xsKCkpKQogICAgICAgICByZW5kZXJlciA9 IHJlbmRlcmVyLT5wYXJlbnQoKTsKLSAgICBtX2F1dG9zY3JvbGxSZW5kZXJlciA9IGR5bmFtaWNE b3duY2FzdDxSZW5kZXJCb3g+KHJlbmRlcmVyKTsKLX0KLQotdm9pZCBBdXRvc2Nyb2xsQ29udHJv bGxlcjo6dXBkYXRlRHJhZ0FuZERyb3AoTm9kZSogZHJvcFRhcmdldE5vZGUsIGNvbnN0IEludFBv aW50JiBldmVudFBvc2l0aW9uLCBXYWxsVGltZSBldmVudFRpbWUpCi17Ci0gICAgaWYgKCFkcm9w VGFyZ2V0Tm9kZSkgewotICAgICAgICBzdG9wQXV0b3Njcm9sbFRpbWVyKCk7Ci0gICAgICAgIHJl dHVybjsKLSAgICB9CiAKLSAgICBSZW5kZXJCb3gqIHNjcm9sbGFibGUgPSBSZW5kZXJCb3g6OmZp bmRBdXRvc2Nyb2xsYWJsZShkcm9wVGFyZ2V0Tm9kZS0+cmVuZGVyZXIoKSk7Ci0gICAgaWYgKCFz Y3JvbGxhYmxlKSB7Ci0gICAgICAgIHN0b3BBdXRvc2Nyb2xsVGltZXIoKTsKKyAgICBpZiAoIWlz PFJlbmRlckJveD4ocmVuZGVyZXIpKSB7CisgICAgICAgIG1fYXV0b3Njcm9sbFJlbmRlcmVyID0g bnVsbHB0cjsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIEZyYW1lJiBmcmFtZSA9IHNj cm9sbGFibGUtPmZyYW1lKCk7Ci0KLSAgICBQYWdlKiBwYWdlID0gZnJhbWUucGFnZSgpOwotICAg IGlmICghcGFnZSB8fCAhcGFnZS0+c2V0dGluZ3MoKS5hdXRvc2Nyb2xsRm9yRHJhZ0FuZERyb3BF bmFibGVkKCkpIHsKLSAgICAgICAgc3RvcEF1dG9zY3JvbGxUaW1lcigpOwotICAgICAgICByZXR1 cm47Ci0gICAgfQorICAgIG1fYXV0b3Njcm9sbFJlbmRlcmVyID0gV2Vha1B0ciB7IGRvd25jYXN0 PFJlbmRlckJveD4oKnJlbmRlcmVyKSB9OworfQogCi0gICAgSW50U2l6ZSBvZmZzZXQgPSBzY3Jv bGxhYmxlLT5jYWxjdWxhdGVBdXRvc2Nyb2xsRGlyZWN0aW9uKGV2ZW50UG9zaXRpb24pOwotICAg IGlmIChvZmZzZXQuaXNaZXJvKCkpIHsKK3ZvaWQgQXV0b3Njcm9sbENvbnRyb2xsZXI6OnVwZGF0 ZURyYWdBbmREcm9wKE5vZGUqIGRyb3BUYXJnZXROb2RlLCBjb25zdCBJbnRQb2ludCYgZXZlbnRQ b3NpdGlvbiwgV2FsbFRpbWUgZXZlbnRUaW1lKQoreworICAgIEludFNpemUgb2Zmc2V0OworICAg IGF1dG8gZmluZERyYWdBbmREcm9wU2Nyb2xsZXIgPSBbJl0oKSAtPiBSZW5kZXJCb3gqIHsKKyAg ICAgICAgaWYgKCFkcm9wVGFyZ2V0Tm9kZSkKKyAgICAgICAgICAgIHJldHVybiBudWxscHRyOwor CisgICAgICAgIGF1dG8qIHNjcm9sbGFibGUgPSBSZW5kZXJCb3g6OmZpbmRBdXRvc2Nyb2xsYWJs ZShkcm9wVGFyZ2V0Tm9kZS0+cmVuZGVyZXIoKSk7CisgICAgICAgIGlmICghc2Nyb2xsYWJsZSkK KyAgICAgICAgICAgIHJldHVybiBudWxscHRyOworCisgICAgICAgIGF1dG8mIGZyYW1lID0gc2Ny b2xsYWJsZS0+ZnJhbWUoKTsKKyAgICAgICAgYXV0byogcGFnZSA9IGZyYW1lLnBhZ2UoKTsKKyAg ICAgICAgaWYgKCFwYWdlIHx8ICFwYWdlLT5zZXR0aW5ncygpLmF1dG9zY3JvbGxGb3JEcmFnQW5k RHJvcEVuYWJsZWQoKSkKKyAgICAgICAgICAgIHJldHVybiBudWxscHRyOworCisgICAgICAgIG9m ZnNldCA9IHNjcm9sbGFibGUtPmNhbGN1bGF0ZUF1dG9zY3JvbGxEaXJlY3Rpb24oZXZlbnRQb3Np dGlvbik7CisgICAgICAgIGlmIChvZmZzZXQuaXNaZXJvKCkpCisgICAgICAgICAgICByZXR1cm4g bnVsbHB0cjsKKworICAgICAgICByZXR1cm4gc2Nyb2xsYWJsZTsKKyAgICB9OworICAgIAorICAg IFJlbmRlckJveCogc2Nyb2xsYWJsZSA9IGZpbmREcmFnQW5kRHJvcFNjcm9sbGVyKCk7CisgICAg aWYgKCFzY3JvbGxhYmxlKSB7CiAgICAgICAgIHN0b3BBdXRvc2Nyb2xsVGltZXIoKTsKICAgICAg ICAgcmV0dXJuOwogICAgIH0KQEAgLTE3MCwxMiArMTc4LDEyIEBAIHZvaWQgQXV0b3Njcm9sbENv bnRyb2xsZXI6OnVwZGF0ZURyYWdBbmREcm9wKE5vZGUqIGRyb3BUYXJnZXROb2RlLCBjb25zdCBJ bnRQb2luCiAKICAgICBpZiAobV9hdXRvc2Nyb2xsVHlwZSA9PSBOb0F1dG9zY3JvbGwpIHsKICAg ICAgICAgbV9hdXRvc2Nyb2xsVHlwZSA9IEF1dG9zY3JvbGxGb3JEcmFnQW5kRHJvcDsKLSAgICAg ICAgbV9hdXRvc2Nyb2xsUmVuZGVyZXIgPSBzY3JvbGxhYmxlOworICAgICAgICBtX2F1dG9zY3Jv bGxSZW5kZXJlciA9IFdlYWtQdHIgeyAqc2Nyb2xsYWJsZSB9OwogICAgICAgICBtX2RyYWdBbmRE cm9wQXV0b3Njcm9sbFN0YXJ0VGltZSA9IGV2ZW50VGltZTsKICAgICAgICAgc3RhcnRBdXRvc2Ny b2xsVGltZXIoKTsKICAgICB9IGVsc2UgaWYgKG1fYXV0b3Njcm9sbFJlbmRlcmVyICE9IHNjcm9s bGFibGUpIHsKICAgICAgICAgbV9kcmFnQW5kRHJvcEF1dG9zY3JvbGxTdGFydFRpbWUgPSBldmVu dFRpbWU7Ci0gICAgICAgIG1fYXV0b3Njcm9sbFJlbmRlcmVyID0gc2Nyb2xsYWJsZTsKKyAgICAg ICAgbV9hdXRvc2Nyb2xsUmVuZGVyZXIgPSBXZWFrUHRyIHsgKnNjcm9sbGFibGUgfTsKICAgICB9 CiB9CiAKQEAgLTIxMCwxOSArMjE4LDIwIEBAIGJvb2wgQXV0b3Njcm9sbENvbnRyb2xsZXI6OnBh blNjcm9sbEluUHJvZ3Jlc3MoKSBjb25zdAogICAgIHJldHVybiBtX2F1dG9zY3JvbGxUeXBlID09 IEF1dG9zY3JvbGxGb3JQYW4gfHwgbV9hdXRvc2Nyb2xsVHlwZSA9PSBBdXRvc2Nyb2xsRm9yUGFu Q2FuU3RvcDsKIH0KIAotdm9pZCBBdXRvc2Nyb2xsQ29udHJvbGxlcjo6c3RhcnRQYW5TY3JvbGxp bmcoUmVuZGVyQm94KiBzY3JvbGxhYmxlLCBjb25zdCBJbnRQb2ludCYgbGFzdEtub3duTW91c2VQ b3NpdGlvbikKK3ZvaWQgQXV0b3Njcm9sbENvbnRyb2xsZXI6OnN0YXJ0UGFuU2Nyb2xsaW5nKFJl bmRlckJveCYgc2Nyb2xsYWJsZSwgY29uc3QgSW50UG9pbnQmIGxhc3RLbm93bk1vdXNlUG9zaXRp b24pCiB7CiAgICAgLy8gV2UgZG9uJ3Qgd2FudCB0byB0cmlnZ2VyIHRoZSBhdXRvc2Nyb2xsIG9y IHRoZSBwYW5TY3JvbGwgaWYgaXQncyBhbHJlYWR5IGFjdGl2ZQogICAgIGlmIChtX2F1dG9zY3Jv bGxUaW1lci5pc0FjdGl2ZSgpKQogICAgICAgICByZXR1cm47CiAKICAgICBtX2F1dG9zY3JvbGxU eXBlID0gQXV0b3Njcm9sbEZvclBhbjsKLSAgICBtX2F1dG9zY3JvbGxSZW5kZXJlciA9IHNjcm9s bGFibGU7CisgICAgbV9hdXRvc2Nyb2xsUmVuZGVyZXIgPSBXZWFrUHRyIHsgc2Nyb2xsYWJsZSB9 OwogICAgIG1fcGFuU2Nyb2xsU3RhcnRQb3MgPSBsYXN0S25vd25Nb3VzZVBvc2l0aW9uOwogCi0g ICAgaWYgKEZyYW1lVmlldyogdmlldyA9IHNjcm9sbGFibGUtPmZyYW1lKCkudmlldygpKQorICAg IGlmIChhdXRvKiB2aWV3ID0gc2Nyb2xsYWJsZS5mcmFtZSgpLnZpZXcoKSkKICAgICAgICAgdmll dy0+YWRkUGFuU2Nyb2xsSWNvbihsYXN0S25vd25Nb3VzZVBvc2l0aW9uKTsKLSAgICBzY3JvbGxh YmxlLT5mcmFtZSgpLmV2ZW50SGFuZGxlcigpLmRpZFBhblNjcm9sbFN0YXJ0KCk7CisKKyAgICBz Y3JvbGxhYmxlLmZyYW1lKCkuZXZlbnRIYW5kbGVyKCkuZGlkUGFuU2Nyb2xsU3RhcnQoKTsKICAg ICBzdGFydEF1dG9zY3JvbGxUaW1lcigpOwogfQogI2Vsc2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvQXV0b3Njcm9sbENvbnRyb2xsZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv QXV0b3Njcm9sbENvbnRyb2xsZXIuaAppbmRleCA3MTM2MGJhNDRkZGM5NDUxNGY2OTQyZDQ2YmRi OGYwZjhkMDZiZTMyLi5kMzFmYWI0NDY1MjNlZjAyZTY3OTZmMzJkYzRlODdhYjcwNmFhNDQ3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0F1dG9zY3JvbGxDb250cm9sbGVyLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcGFnZS9BdXRvc2Nyb2xsQ29udHJvbGxlci5oCkBAIC02Niw3ICs2 Niw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGRpZFBhblNjcm9sbFN0b3AoKTsKICAgICB2b2lkIGhh bmRsZU1vdXNlUmVsZWFzZUV2ZW50KGNvbnN0IFBsYXRmb3JtTW91c2VFdmVudCYpOwogICAgIHZv aWQgc2V0UGFuU2Nyb2xsSW5Qcm9ncmVzcyhib29sKTsKLSAgICB2b2lkIHN0YXJ0UGFuU2Nyb2xs aW5nKFJlbmRlckJveCosIGNvbnN0IEludFBvaW50Jik7CisgICAgdm9pZCBzdGFydFBhblNjcm9s bGluZyhSZW5kZXJCb3gmLCBjb25zdCBJbnRQb2ludCYpOwogI2VuZGlmCiAKIHByaXZhdGU6CkBA IC03Nyw4ICs3Nyw4IEBAIHByaXZhdGU6CiAjZW5kaWYKIAogICAgIFRpbWVyIG1fYXV0b3Njcm9s bFRpbWVyOwotICAgIFJlbmRlckJveCogbV9hdXRvc2Nyb2xsUmVuZGVyZXI7Ci0gICAgQXV0b3Nj cm9sbFR5cGUgbV9hdXRvc2Nyb2xsVHlwZTsKKyAgICBXZWFrUHRyPFJlbmRlckJveD4gbV9hdXRv c2Nyb2xsUmVuZGVyZXI7CisgICAgQXV0b3Njcm9sbFR5cGUgbV9hdXRvc2Nyb2xsVHlwZSB7IE5v QXV0b3Njcm9sbCB9OwogICAgIEludFBvaW50IG1fZHJhZ0FuZERyb3BBdXRvc2Nyb2xsUmVmZXJl bmNlUG9zaXRpb247CiAgICAgV2FsbFRpbWUgbV9kcmFnQW5kRHJvcEF1dG9zY3JvbGxTdGFydFRp bWU7CiAjaWYgRU5BQkxFKFBBTl9TQ1JPTExJTkcpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxl ci5jcHAKaW5kZXggNjhlZWIxMjQzYjYzOTY3YzM5MzljZDRkNTJkM2EwOTdmZDJlOWViNy4uMDA3 NTRjNWM3NzhkZjhmYWVjMDlhMTNlMGY2MGNjZTBiMTY2M2QxNCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv RXZlbnRIYW5kbGVyLmNwcApAQCAtMTEyNywxMiArMTEyNywxMCBAQCB2b2lkIEV2ZW50SGFuZGxl cjo6ZGlkUGFuU2Nyb2xsU3RvcCgpCiAKIHZvaWQgRXZlbnRIYW5kbGVyOjpzdGFydFBhblNjcm9s bGluZyhSZW5kZXJFbGVtZW50JiByZW5kZXJlcikKIHsKLSNpZiAhUExBVEZPUk0oSU9TX0ZBTUlM WSkKICAgICBpZiAoIWlzPFJlbmRlckJveD4ocmVuZGVyZXIpKQogICAgICAgICByZXR1cm47Ci0g ICAgbV9hdXRvc2Nyb2xsQ29udHJvbGxlci0+c3RhcnRQYW5TY3JvbGxpbmcoJmRvd25jYXN0PFJl bmRlckJveD4ocmVuZGVyZXIpLCBsYXN0S25vd25Nb3VzZVBvc2l0aW9uKCkpOworICAgIG1fYXV0 b3Njcm9sbENvbnRyb2xsZXItPnN0YXJ0UGFuU2Nyb2xsaW5nKGRvd25jYXN0PFJlbmRlckJveD4o cmVuZGVyZXIpLCBsYXN0S25vd25Nb3VzZVBvc2l0aW9uKCkpOwogICAgIGludmFsaWRhdGVDbGlj aygpOwotI2VuZGlmCiB9CiAKICNlbmRpZiAvLyBFTkFCTEUoUEFOX1NDUk9MTElORykK