234384 2021-12-15 21:43:35 -0800 REGRESSION (r284136): A slight horizontal rubberband kills scroll momentum 2022-01-25 13:36:34 -0800 1 1 1 Unclassified WebKit Scrolling Safari Technology Preview Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=235605 InRadar P2 Normal --- 1 simon.fraser simon.fraser simon.fraser thorton webkit-bug-importer oldest_to_newest 1824685 0 simon.fraser 2021-12-15 21:43:35 -0800 Load daringrireball.net on trunk and do a slightly diagonal scroll swipe (or a J-shaped scroll). The vertical momentum stalls when the rubberband animation starts (and then you sometimes get a bit at the end). 1824686 1 webkit-bug-importer 2021-12-15 21:44:04 -0800 <rdar://problem/86558157> 1824687 2 simon.fraser 2021-12-15 21:45:20 -0800 This probably regressed at https://trac.webkit.org/changeset/284136/webkit 1832598 3 449614 simon.fraser 2022-01-20 15:50:43 -0800 Created attachment 449614 Patch 1832602 4 449616 simon.fraser 2022-01-20 16:02:36 -0800 Created attachment 449616 Patch 1832636 5 ews-feeder 2022-01-20 17:25:03 -0800 Committed r288336 (246244@main): <https://commits.webkit.org/246244@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 449616. 449614 2022-01-20 15:50:43 -0800 2022-01-20 16:09:37 -0800 Patch bug-234384-20220120155042.patch text/plain 15704 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4MjY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTU4Yjk1ODhhODk4ZDY2 Y2E0MWZhNTY2ZWQyNzQ3MDZmYTYwZjhlOC4uNWIxMDY0ZDRlMTBmMmU2MWI3MTJjZTRjMzczNDU0 MmFmOGM5YjMzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDIyLTAxLTIwICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04g KHIyODQxMzYpOiBBIHNsaWdodCBob3Jpem9udGFsIHJ1YmJlcmJhbmQga2lsbHMgc2Nyb2xsIG1v bWVudHVtCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MzQzODQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBT Y3JvbGxBbmltYXRpb25SdWJiZXJCYW5kIHN1YnRseSBjaGFuZ2VkIHRoZSBiZWhhdmlvciBvZiB0 aGUgcnViYmVyYmFuZCBhbmltYXRpb24gb24gdGhlCisgICAgICAgIGF4aXMgdGhhdCBpcyBub3Qg dGhlIHJ1YmJlcmJhbmRpbmcgYXhpcy4gQmVjYXVzZSBpdCBjb252ZXJnZWQgb24gbV90YXJnZXRP ZmZzZXQsIGl0IGFsd2F5cworICAgICAgICByZXN1bHRlZCBpbiBubyBvZmZzZXQgb24gdGhhdCBh eGlzLgorICAgICAgICAKKyAgICAgICAgRml4IGJ5IHJlc3RvcmluZyB0aGUgYmVoYXZpb3IgZnJv bSBiZWZvcmUgcjI4NDEzNiwgd2hpY2ggYXBwbGllcyB0aGUgcnViYmVyYmFuZGluZyBhcyBhCisg ICAgICAgIGRlbHRhIGZyb20gdGhlIGN1cnJlbnQgb2Zmc2V0IGFuZCBubyBsb25nZXIgdXNlcyBt X3RhcmdldE9mZnNldCwgd2hpY2ggaXMgcmVtb3ZlZC4gSXQncyBhCisgICAgICAgIGJpdCBzdXJw cmlzaW5nIHRoYXQgdGhpcyBydWJiZXJiYW5kIGFuaW1hdGlvbiBkcml2ZXMgYSB2ZXJ0aWNhbCBz Y3JvbGwgd2hlbiB0aGUgZ2VzdHVyZSBpcworICAgICAgICBwcmltYXJpbHkgaG9yaXpvbnRhbCAo bm9ybWFsbHkgd2UnZCBjbGFtcCB0aGVzZSBkZWx0YXMgdG8gYmUgcHVyZWx5IGhvcml6b250YWwp LCBidXQgcGVvcGxlCisgICAgICAgIGFyZSB1c2VkIHRvIHRoaXMgYmVoYXZpb3Igc28gcmVzdG9y ZSBpdC4KKworICAgICAgICBUZXN0OiBmYXN0L3Njcm9sbGluZy9tYWMvai1zaGFwZWQtc2Nyb2xs LXJ1YmJlcmJhbmQuaHRtbAorCisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsQW5pbWF0aW9uLmg6 CisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsaW5nRWZmZWN0c0NvbnRyb2xsZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nRWZmZWN0c0NvbnRyb2xsZXI6Om92ZXJzY3JvbGxBbW91 bnQpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nRWZmZWN0c0NvbnRyb2xsZXI6OnNjcm9s bE9mZnNldCk6CisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsaW5nRWZmZWN0c0NvbnRyb2xsZXIu aDoKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0aW9uUnViYmVyQmFuZC5oOgor ICAgICAgICAqIHBsYXRmb3JtL21hYy9TY3JvbGxBbmltYXRpb25SdWJiZXJCYW5kLm1tOgorICAg ICAgICAoV2ViQ29yZTo6U2Nyb2xsQW5pbWF0aW9uUnViYmVyQmFuZDo6c3RhcnRSdWJiZXJCYW5k QW5pbWF0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbEFuaW1hdGlvblJ1YmJlckJhbmQ6 OnNlcnZpY2VBbmltYXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsQW5pbWF0aW9uUnVi YmVyQmFuZDo6ZGVidWdEZXNjcmlwdGlvbiBjb25zdCk6CisgICAgICAgICogcGxhdGZvcm0vbWFj L1Njcm9sbGluZ0VmZmVjdHNDb250cm9sbGVyLm1tOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xs aW5nRWZmZWN0c0NvbnRyb2xsZXI6OnN0YXJ0UnViYmVyQmFuZEFuaW1hdGlvbik6CisgICAgICAg IChXZWJDb3JlOjpTY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlcjo6c3RhcnRSdWJiZXJCYW5kQW5p bWF0aW9uSWZOZWNlc3NhcnkpOgorCiAyMDIyLTAxLTE5ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5m cmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIDxkaWFsb2c+IHdpdGggdHJhbnNmb3JtZWQgYW5j ZXN0b3IgYXNzZXJ0cyB1bmRlciBSZW5kZXJHZW9tZXRyeU1hcApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsQW5pbWF0aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9TY3JvbGxBbmltYXRpb24uaAppbmRleCAwZDQ2OTYyOTVhYWExZGJiNzBkNjQyOTUyODQ2 MTM1NTQwYmZjMDk4Li5mMGNkMmQ3NjliNTExMjQ0YjUyZmZkYWE2MmI5ODQ2Y2MyOTJjMzQ0IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxBbmltYXRpb24uaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxBbmltYXRpb24uaApAQCAtNDUsNiArNDUs OCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHNjcm9sbEFuaW1hdGlvbldpbGxTdGFydChT Y3JvbGxBbmltYXRpb24mKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgc2Nyb2xsQW5pbWF0aW9uRGlk RW5kKFNjcm9sbEFuaW1hdGlvbiYpIHsgfQogICAgIHZpcnR1YWwgU2Nyb2xsRXh0ZW50cyBzY3Jv bGxFeHRlbnRzRm9yQW5pbWF0aW9uKFNjcm9sbEFuaW1hdGlvbiYpID0gMDsKKyAgICB2aXJ0dWFs IEZsb2F0U2l6ZSBvdmVyc2Nyb2xsQW1vdW50KFNjcm9sbEFuaW1hdGlvbiYpID0gMDsKKyAgICB2 aXJ0dWFsIEZsb2F0UG9pbnQgc2Nyb2xsT2Zmc2V0KFNjcm9sbEFuaW1hdGlvbiYpID0gMDsKIH07 CiAKIGNsYXNzIFNjcm9sbEFuaW1hdGlvbiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9TY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9TY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlci5jcHAKaW5kZXggMTI4OWJmMTcwNjU0 YTMzYjc3ZDkwZDZkMzhhZGIwZGM0NTlmZjk1OS4uODMwMzFmZDZlNTc0NDQ3ZjcwYmMxNmM0MDFi ZWEwOTc0MDFhY2ZhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xs aW5nRWZmZWN0c0NvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Nj cm9sbGluZ0VmZmVjdHNDb250cm9sbGVyLmNwcApAQCAtNTIyLDYgKzUyMiwxNiBAQCBTY3JvbGxF eHRlbnRzIFNjcm9sbGluZ0VmZmVjdHNDb250cm9sbGVyOjpzY3JvbGxFeHRlbnRzRm9yQW5pbWF0 aW9uKFNjcm9sbEFuaW1hdAogICAgIHJldHVybiBtX2NsaWVudC5zY3JvbGxFeHRlbnRzKCk7CiB9 CiAKK0Zsb2F0U2l6ZSBTY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlcjo6b3ZlcnNjcm9sbEFtb3Vu dChTY3JvbGxBbmltYXRpb24mKQoreworICAgIHJldHVybiBtX2NsaWVudC5zdHJldGNoQW1vdW50 KCk7Cit9CisKK0Zsb2F0UG9pbnQgU2Nyb2xsaW5nRWZmZWN0c0NvbnRyb2xsZXI6OnNjcm9sbE9m ZnNldChTY3JvbGxBbmltYXRpb24mKQoreworICAgIHJldHVybiBtX2NsaWVudC5zY3JvbGxPZmZz ZXQoKTsKK30KKwogdm9pZCBTY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlcjo6c3RhcnREZWZlcnJp bmdXaGVlbEV2ZW50VGVzdENvbXBsZXRpb24oV2hlZWxFdmVudFRlc3RNb25pdG9yOjpEZWZlclJl YXNvbiByZWFzb24pCiB7CiAgICAgbV9jbGllbnQuZGVmZXJXaGVlbEV2ZW50VGVzdENvbXBsZXRp b25Gb3JSZWFzb24ocmVpbnRlcnByZXRfY2FzdDxXaGVlbEV2ZW50VGVzdE1vbml0b3I6OlNjcm9s bGFibGVBcmVhSWRlbnRpZmllcj4odGhpcyksIHJlYXNvbik7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlci5oIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vU2Nyb2xsaW5nRWZmZWN0c0NvbnRyb2xsZXIuaAppbmRleCBjN2EzYTJm ODVlYTBlZDVhN2M2YTk0YmUxYmYzNTcyOGIxOGM4OGYzLi5iNzhmNjY0YjgyODY1OWI1YTc5YjY2 NDdiNjM5NGEyNWRhYzNmZmU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9T Y3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L1Njcm9sbGluZ0VmZmVjdHNDb250cm9sbGVyLmgKQEAgLTIwNSw3ICsyMDUsNyBAQCBwcml2YXRl OgogCiAgICAgdm9pZCBzdGFydFJ1YmJlckJhbmRBbmltYXRpb25JZk5lY2Vzc2FyeSgpOwogCi0g ICAgYm9vbCBzdGFydFJ1YmJlckJhbmRBbmltYXRpb24oY29uc3QgRmxvYXRQb2ludCYgdGFyZ2V0 T2Zmc2V0LCBjb25zdCBGbG9hdFNpemUmIGluaXRpYWxWZWxvY2l0eSwgY29uc3QgRmxvYXRTaXpl JiBpbml0aWFsT3ZlcnNjcm9sbCk7CisgICAgYm9vbCBzdGFydFJ1YmJlckJhbmRBbmltYXRpb24o Y29uc3QgRmxvYXRTaXplJiBpbml0aWFsVmVsb2NpdHksIGNvbnN0IEZsb2F0U2l6ZSYgaW5pdGlh bE92ZXJzY3JvbGwpOwogICAgIHZvaWQgc3RvcFJ1YmJlckJhbmRBbmltYXRpb24oKTsKIAogICAg IHZvaWQgd2lsbFN0YXJ0UnViYmVyQmFuZEFuaW1hdGlvbigpOwpAQCAtMjI3LDYgKzIyNyw4IEBA IHByaXZhdGU6CiAgICAgdm9pZCBzY3JvbGxBbmltYXRpb25XaWxsU3RhcnQoU2Nyb2xsQW5pbWF0 aW9uJikgZmluYWw7CiAgICAgdm9pZCBzY3JvbGxBbmltYXRpb25EaWRFbmQoU2Nyb2xsQW5pbWF0 aW9uJikgZmluYWw7CiAgICAgU2Nyb2xsRXh0ZW50cyBzY3JvbGxFeHRlbnRzRm9yQW5pbWF0aW9u KFNjcm9sbEFuaW1hdGlvbiYpIGZpbmFsOworICAgIEZsb2F0U2l6ZSBvdmVyc2Nyb2xsQW1vdW50 KFNjcm9sbEFuaW1hdGlvbiYpIGZpbmFsOworICAgIEZsb2F0UG9pbnQgc2Nyb2xsT2Zmc2V0KFNj cm9sbEFuaW1hdGlvbiYpIGZpbmFsOwogCiAgICAgdm9pZCBhZGp1c3REZWx0YUZvclNuYXBwaW5n SWZOZWVkZWQoZmxvYXQmIGRlbHRhWCwgZmxvYXQmIGRlbHRhWSk7CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxBbmltYXRpb25SdWJiZXJCYW5kLmggYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0aW9uUnViYmVyQmFuZC5oCmlu ZGV4IGVlMjY5ZmVhMzk3ZDM2Y2JhYTJkOWQ0MjRiODFhYzFiMTE1OWZiZWIuLjY0N2E4MjUwMjQ1 MDYxMjM5ZjM1ZjQ1NWZiZGM4ZmY3ODM4OGZmNGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL21hYy9TY3JvbGxBbmltYXRpb25SdWJiZXJCYW5kLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdGlvblJ1YmJlckJhbmQuaApAQCAtMzYsNyAr MzYsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB+U2Nyb2xsQW5pbWF0aW9uUnViYmVyQmFuZCgp OwogCiAgICAgLy8gdGFyZ2V0T2Zmc2V0IGlzIHRoZSBzY3JvbGwgb2Zmc2V0IHdoZW4gdGhlIGFu aW1hdGlvbiBoYXMgZmluaXNoZWQgKGkuZS4gc2Nyb2xsZWQgdG8gYW4gZWRnZSkuCi0gICAgYm9v bCBzdGFydFJ1YmJlckJhbmRBbmltYXRpb24oY29uc3QgRmxvYXRQb2ludCYgdGFyZ2V0T2Zmc2V0 LCBjb25zdCBGbG9hdFNpemUmIGluaXRpYWxWZWxvY2l0eSwgY29uc3QgRmxvYXRTaXplJiBpbml0 aWFsT3ZlcnNjcm9sbCk7CisgICAgYm9vbCBzdGFydFJ1YmJlckJhbmRBbmltYXRpb24oY29uc3Qg RmxvYXRTaXplJiBpbml0aWFsVmVsb2NpdHksIGNvbnN0IEZsb2F0U2l6ZSYgaW5pdGlhbE92ZXJz Y3JvbGwpOwogCiBwcml2YXRlOgogICAgIHZvaWQgdXBkYXRlU2Nyb2xsRXh0ZW50cygpIGZpbmFs OwpAQCAtNDcsNyArNDcsNiBAQCBwcml2YXRlOgogCiAgICAgYm9vbCBhbmltYXRlU2Nyb2xsKE1v bm90b25pY1RpbWUpOwogCi0gICAgRmxvYXRQb2ludCBtX3RhcmdldE9mZnNldDsKICAgICBGbG9h dFNpemUgbV9pbml0aWFsVmVsb2NpdHk7CiAgICAgRmxvYXRTaXplIG1faW5pdGlhbE92ZXJzY3Jv bGw7CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbEFu aW1hdGlvblJ1YmJlckJhbmQubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xs QW5pbWF0aW9uUnViYmVyQmFuZC5tbQppbmRleCA2MjQ5MTRkNDY0MmQ1ODRlYzhjZDI3MDExNzBj NmNhOTc4YjA3YjhjLi44ZDA3ZDY1ZjQ3ODVjNzAzYzkxMjM2NDFhMmY3NDFkOWIzMGI1OTFlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0aW9uUnVi YmVyQmFuZC5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0 aW9uUnViYmVyQmFuZC5tbQpAQCAtNTksOSArNTksOCBAQCBTY3JvbGxBbmltYXRpb25SdWJiZXJC YW5kOjpTY3JvbGxBbmltYXRpb25SdWJiZXJCYW5kKFNjcm9sbEFuaW1hdGlvbkNsaWVudCYgY2xp ZQogCiBTY3JvbGxBbmltYXRpb25SdWJiZXJCYW5kOjp+U2Nyb2xsQW5pbWF0aW9uUnViYmVyQmFu ZCgpID0gZGVmYXVsdDsKIAotYm9vbCBTY3JvbGxBbmltYXRpb25SdWJiZXJCYW5kOjpzdGFydFJ1 YmJlckJhbmRBbmltYXRpb24oY29uc3QgRmxvYXRQb2ludCYgdGFyZ2V0T2Zmc2V0LCBjb25zdCBG bG9hdFNpemUmIGluaXRpYWxWZWxvY2l0eSwgY29uc3QgRmxvYXRTaXplJiBpbml0aWFsT3ZlcnNj cm9sbCkKK2Jvb2wgU2Nyb2xsQW5pbWF0aW9uUnViYmVyQmFuZDo6c3RhcnRSdWJiZXJCYW5kQW5p bWF0aW9uKGNvbnN0IEZsb2F0U2l6ZSYgaW5pdGlhbFZlbG9jaXR5LCBjb25zdCBGbG9hdFNpemUm IGluaXRpYWxPdmVyc2Nyb2xsKQogewotICAgIG1fdGFyZ2V0T2Zmc2V0ID0gdGFyZ2V0T2Zmc2V0 OwogICAgIG1faW5pdGlhbFZlbG9jaXR5ID0gaW5pdGlhbFZlbG9jaXR5OwogICAgIG1faW5pdGlh bE92ZXJzY3JvbGwgPSBpbml0aWFsT3ZlcnNjcm9sbDsKIApAQCAtOTMsNyArOTIsOSBAQCB2b2lk IFNjcm9sbEFuaW1hdGlvblJ1YmJlckJhbmQ6OnNlcnZpY2VBbmltYXRpb24oTW9ub3RvbmljVGlt ZSBjdXJyZW50VGltZSkKIAogICAgIC8vIFdlIG1pZ2h0IGJlIHJ1YmJlcmJhbmRpbmcgYXdheSBm cm9tIGFuIGVkZ2UgYW5kIGJhY2ssIHNvIHdhaXQgYSBmcmFtZSBvciB0d28gYmVmb3JlIGNoZWNr aW5nIGZvciBjb21wbGV0aW9uLgogICAgIGJvb2wgYW5pbWF0aW9uQ29tcGxldGUgPSBydWJiZXJC YW5kT2Zmc2V0LmlzWmVybygpICYmIGVsYXBzZWRUaW1lID4gMjRfbXM7Ci0gICAgbV9jdXJyZW50 T2Zmc2V0ID0gbV90YXJnZXRPZmZzZXQgKyBydWJiZXJCYW5kT2Zmc2V0OworICAgIAorICAgIGF1 dG8gc2Nyb2xsRGVsdGEgPSBydWJiZXJCYW5kT2Zmc2V0IC0gbV9jbGllbnQub3ZlcnNjcm9sbEFt b3VudCgqdGhpcyk7CisgICAgbV9jdXJyZW50T2Zmc2V0ID0gbV9jbGllbnQuc2Nyb2xsT2Zmc2V0 KCp0aGlzKSArIHNjcm9sbERlbHRhOwogCiAgICAgbV9jbGllbnQuc2Nyb2xsQW5pbWF0aW9uRGlk VXBkYXRlKCp0aGlzLCBtX2N1cnJlbnRPZmZzZXQpOwogCkBAIC0xMDQsNyArMTA1LDcgQEAgdm9p ZCBTY3JvbGxBbmltYXRpb25SdWJiZXJCYW5kOjpzZXJ2aWNlQW5pbWF0aW9uKE1vbm90b25pY1Rp bWUgY3VycmVudFRpbWUpCiBTdHJpbmcgU2Nyb2xsQW5pbWF0aW9uUnViYmVyQmFuZDo6ZGVidWdE ZXNjcmlwdGlvbigpIGNvbnN0CiB7CiAgICAgVGV4dFN0cmVhbSB0ZXh0U3RyZWFtOwotICAgIHRl eHRTdHJlYW0gPDwgIlNjcm9sbEFuaW1hdGlvblJ1YmJlckJhbmQgIiA8PCB0aGlzIDw8ICIgYWN0 aXZlICIgPDwgaXNBY3RpdmUoKSA8PCAiIHRhcmdldCAiIDw8IG1fdGFyZ2V0T2Zmc2V0IDw8ICIg Y3VycmVudCBvZmZzZXQgIiA8PCBjdXJyZW50T2Zmc2V0KCk7CisgICAgdGV4dFN0cmVhbSA8PCAi U2Nyb2xsQW5pbWF0aW9uUnViYmVyQmFuZCAiIDw8IHRoaXMgPDwgIiBhY3RpdmUgIiA8PCBpc0Fj dGl2ZSgpIDw8ICIgaW5pdGlhbCB2ZWxvY2l0eSAiIDw8IG1faW5pdGlhbFZlbG9jaXR5IDw8ICIg aW5pdGlhbCBvdmVyc2Nyb2xsICIgPDwgbV9pbml0aWFsT3ZlcnNjcm9sbDsKICAgICByZXR1cm4g dGV4dFN0cmVhbS5yZWxlYXNlKCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL21hYy9TY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlci5tbSBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL21hYy9TY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlci5tbQppbmRleCBjYTdmNzg2 Mjg1ZTVhODRlMDQ2NmI2MDY4ZDFiNjdmZjJhYmRiZWQ4Li4zY2MzZDI0ZmE5MDlkOWNlZGE4ZTMy Zjg2NDMyMTMyNTcwYTcxOGY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9t YWMvU2Nyb2xsaW5nRWZmZWN0c0NvbnRyb2xsZXIubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbWFjL1Njcm9sbGluZ0VmZmVjdHNDb250cm9sbGVyLm1tCkBAIC0zOTksMTMgKzM5OSwx MyBAQCB2b2lkIFNjcm9sbGluZ0VmZmVjdHNDb250cm9sbGVyOjpzdG9wUnViYmVyQmFuZGluZygp CiAgICAgdXBkYXRlUnViYmVyQmFuZGluZ1N0YXRlKCk7CiB9CiAKLWJvb2wgU2Nyb2xsaW5nRWZm ZWN0c0NvbnRyb2xsZXI6OnN0YXJ0UnViYmVyQmFuZEFuaW1hdGlvbihjb25zdCBGbG9hdFBvaW50 JiB0YXJnZXRPZmZzZXQsIGNvbnN0IEZsb2F0U2l6ZSYgaW5pdGlhbFZlbG9jaXR5LCBjb25zdCBG bG9hdFNpemUmIGluaXRpYWxPdmVyc2Nyb2xsKQorYm9vbCBTY3JvbGxpbmdFZmZlY3RzQ29udHJv bGxlcjo6c3RhcnRSdWJiZXJCYW5kQW5pbWF0aW9uKGNvbnN0IEZsb2F0U2l6ZSYgaW5pdGlhbFZl bG9jaXR5LCBjb25zdCBGbG9hdFNpemUmIGluaXRpYWxPdmVyc2Nyb2xsKQogewogICAgIGlmICht X2N1cnJlbnRBbmltYXRpb24pCiAgICAgICAgIG1fY3VycmVudEFuaW1hdGlvbi0+c3RvcCgpOwog CiAgICAgbV9jdXJyZW50QW5pbWF0aW9uID0gbWFrZVVuaXF1ZTxTY3JvbGxBbmltYXRpb25SdWJi ZXJCYW5kPigqdGhpcyk7Ci0gICAgYm9vbCBzdGFydGVkID0gZG93bmNhc3Q8U2Nyb2xsQW5pbWF0 aW9uUnViYmVyQmFuZD4oKm1fY3VycmVudEFuaW1hdGlvbikuc3RhcnRSdWJiZXJCYW5kQW5pbWF0 aW9uKHRhcmdldE9mZnNldCwgaW5pdGlhbFZlbG9jaXR5LCBpbml0aWFsT3ZlcnNjcm9sbCk7Cisg ICAgYm9vbCBzdGFydGVkID0gZG93bmNhc3Q8U2Nyb2xsQW5pbWF0aW9uUnViYmVyQmFuZD4oKm1f Y3VycmVudEFuaW1hdGlvbikuc3RhcnRSdWJiZXJCYW5kQW5pbWF0aW9uKGluaXRpYWxWZWxvY2l0 eSwgaW5pdGlhbE92ZXJzY3JvbGwpOwogICAgIExPR19XSVRIX1NUUkVBTShTY3JvbGxBbmltYXRp b25zLCBzdHJlYW0gPDwgIlNjcm9sbGluZ0VmZmVjdHNDb250cm9sbGVyOjpzdGFydFJ1YmJlckJh bmRBbmltYXRpb24oKSAtIGFuaW1hdGlvbiAiIDw8ICptX2N1cnJlbnRBbmltYXRpb24gPDwgIiBz dGFydGVkICIgPDwgc3RhcnRlZCk7CiAgICAgcmV0dXJuIHN0YXJ0ZWQ7CiB9CkBAIC00NjQsOCAr NDY0LDggQEAgdm9pZCBTY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlcjo6c3RhcnRSdWJiZXJCYW5k QW5pbWF0aW9uSWZOZWNlc3NhcnkoKQogICAgIGlmICghbV9jbGllbnQuYWxsb3dzVmVydGljYWxT Y3JvbGxpbmcoKSkKICAgICAgICAgaW5pdGlhbFZlbG9jaXR5LnNldEhlaWdodCgwKTsKIAotICAg IExPR19XSVRIX1NUUkVBTShTY3JvbGxBbmltYXRpb25zLCBzdHJlYW0gPDwgIlNjcm9sbGluZ0Vm ZmVjdHNDb250cm9sbGVyOjpzdGFydFJ1YmJlckJhbmRBbmltYXRpb25JZk5lY2Vzc2FyeSgpIC0g cnViYmVyQmFuZEFuaW1hdGlvblJ1bm5pbmcgIiA8PCBtX2lzQW5pbWF0aW5nUnViYmVyQmFuZCA8 PCAiIHN0cmV0Y2hBbW91bnQgIiA8PCBzdHJldGNoQW1vdW50IDw8ICIgY29udHJhaW5lZE9mZnNl dCAiIDw8IGNvbnRyYWluZWRPZmZzZXQgPDwgIiBpbml0aWFsVmVsb2NpdHkgIiA8PCBpbml0aWFs VmVsb2NpdHkpOwotICAgIHN0YXJ0UnViYmVyQmFuZEFuaW1hdGlvbihjb250cmFpbmVkT2Zmc2V0 LCBpbml0aWFsVmVsb2NpdHksIHN0cmV0Y2hBbW91bnQpOworICAgIExPR19XSVRIX1NUUkVBTShT Y3JvbGxBbmltYXRpb25zLCBzdHJlYW0gPDwgIlNjcm9sbGluZ0VmZmVjdHNDb250cm9sbGVyOjpz dGFydFJ1YmJlckJhbmRBbmltYXRpb25JZk5lY2Vzc2FyeSgpIC0gcnViYmVyQmFuZEFuaW1hdGlv blJ1bm5pbmcgIiA8PCBtX2lzQW5pbWF0aW5nUnViYmVyQmFuZCA8PCAiIHN0cmV0Y2hBbW91bnQg IiA8PCBzdHJldGNoQW1vdW50IDw8ICIgaW5pdGlhbFZlbG9jaXR5ICIgPDwgaW5pdGlhbFZlbG9j aXR5KTsKKyAgICBzdGFydFJ1YmJlckJhbmRBbmltYXRpb24oaW5pdGlhbFZlbG9jaXR5LCBzdHJl dGNoQW1vdW50KTsKIH0KIAogYm9vbCBTY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlcjo6c2hvdWxk UnViYmVyQmFuZE9uU2lkZShCb3hTaWRlIHNpZGUpIGNvbnN0CmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMmJjYzg3MDM3NDg3 MzFiMTE1YjM5OTg5ODQyNmEyNWY5MjE0OWEzYy4uNjdkYzczY2YzMDg4MTI2NTIxZjY4ODRkNTJm MmM0MmNmNTE1NGRjNyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xh eW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIyLTAxLTIwICBTaW1vbiBG cmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04gKHIy ODQxMzYpOiBBIHNsaWdodCBob3Jpem9udGFsIHJ1YmJlcmJhbmQga2lsbHMgc2Nyb2xsIG1vbWVu dHVtCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzQz ODQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZh c3Qvc2Nyb2xsaW5nL21hYy9qLXNoYXBlZC1zY3JvbGwtcnViYmVyYmFuZC1leHBlY3RlZC50eHQ6 IEFkZGVkLgorICAgICAgICAqIGZhc3Qvc2Nyb2xsaW5nL21hYy9qLXNoYXBlZC1zY3JvbGwtcnVi YmVyYmFuZC5odG1sOiBBZGRlZC4KKwogMjAyMi0wMS0xOSAgU2ltb24gRnJhc2VyICA8c2ltb24u ZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICA8ZGlhbG9nPiB3aXRoIHRyYW5zZm9ybWVkIGFu Y2VzdG9yIGFzc2VydHMgdW5kZXIgUmVuZGVyR2VvbWV0cnlNYXAKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5nL21hYy9qLXNoYXBlZC1zY3JvbGwtcnViYmVyYmFuZC1leHBl Y3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9tYWMvai1zaGFwZWQtc2Nyb2xs LXJ1YmJlcmJhbmQtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjA1ODE0OGQ5OTI4OTgxMzhlZjYx YTE4ZTljZTcwZjkxNzVmNWQ5NDUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0 L3Njcm9sbGluZy9tYWMvai1zaGFwZWQtc2Nyb2xsLXJ1YmJlcmJhbmQtZXhwZWN0ZWQudHh0CkBA IC0wLDAgKzEsMiBAQAorUEFTUyB3aW5kb3cuc2Nyb2xsWSA+IDAgaXMgdHJ1ZQorCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9tYWMvai1zaGFwZWQtc2Nyb2xsLXJ1YmJl cmJhbmQuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5nL21hYy9qLXNoYXBlZC1zY3Jv bGwtcnViYmVyYmFuZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmI5NGYxNDJmNmY2NDhkMTQzM2YyMGU4NTU2 ZjIzNDRhZDEzZDcxYWQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3Njcm9s bGluZy9tYWMvai1zaGFwZWQtc2Nyb2xsLXJ1YmJlcmJhbmQuaHRtbApAQCAtMCwwICsxLDEyNiBA QAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorICAgIDxzdHlsZT4KKyAgICAgICAg Ym9keSB7CisgICAgICAgICAgICBoZWlnaHQ6IDUwMDBweDsKKyAgICAgICAgfQorICAgIDwvc3R5 bGU+CisgICAgPHNjcmlwdCBzcmM9Ii4uLy4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+ PC9zY3JpcHQ+CisgICAgPHNjcmlwdCBzcmM9Ii4uLy4uLy4uL3Jlc291cmNlcy91aS1oZWxwZXIu anMiPjwvc2NyaXB0PgorICAgIDxzY3JpcHQ+CisgICAgICAgIHZhciBqc1Rlc3RJc0FzeW5jID0g dHJ1ZTsKKworICAgICAgICBmdW5jdGlvbiBjaGVja0ZvclNjcm9sbCgpCisgICAgICAgIHsKKyAg ICAgICAgICAgIHNob3VsZEJlVHJ1ZSgnd2luZG93LnNjcm9sbFkgPiAwJyk7CisgICAgICAgICAg ICB0ZXN0UnVubmVyLm5vdGlmeURvbmUoKTsKKyAgICAgICAgfQorCisgICAgICAgIGFzeW5jIGZ1 bmN0aW9uIHNjcm9sbFRlc3QoKQorICAgICAgICB7CisgICAgICAgICAgICAvLyBHZXN0dXJlIHRo YXQgc3RhcnRzIGhvcml6b250YWwgdGhlbiBoYXMgc29tZSB1cHdhcmQgdHJhamVjdG9yeSBhdCB0 aGUgZW5kLgorICAgICAgICAgICAgY29uc3QgZXZlbnRzID0gWworICAgICAgICAgICAgICAgIHsK KyAgICAgICAgICAgICAgICAgICAgdHlwZSA6ICJ3aGVlbCIsCisgICAgICAgICAgICAgICAgICAg IHZpZXdYIDogMTAwLAorICAgICAgICAgICAgICAgICAgICB2aWV3WSA6IDEwMCwKKyAgICAgICAg ICAgICAgICAgICAgZGVsdGFYIDogMSwKKyAgICAgICAgICAgICAgICAgICAgcGhhc2UgOiAiYmVn YW4iCisgICAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAg ICAgICAgIHR5cGUgOiAid2hlZWwiLAorICAgICAgICAgICAgICAgICAgICBkZWx0YVggOiA0LAor ICAgICAgICAgICAgICAgICAgICBkZWx0YVkgOiAtMSwKKyAgICAgICAgICAgICAgICAgICAgcGhh c2UgOiAiY2hhbmdlZCIKKyAgICAgICAgICAgICAgICB9LAorICAgICAgICAgICAgICAgIHsKKyAg ICAgICAgICAgICAgICAgICAgdHlwZSA6ICJ3aGVlbCIsCisgICAgICAgICAgICAgICAgICAgIHZp ZXdYIDogMTAxLCAvLyBkZWZlYXQgY29hbGVzY2luZworICAgICAgICAgICAgICAgICAgICBkZWx0 YVggOiA2LAorICAgICAgICAgICAgICAgICAgICBkZWx0YVkgOiAtMiwKKyAgICAgICAgICAgICAg ICAgICAgcGhhc2UgOiAiY2hhbmdlZCIKKyAgICAgICAgICAgICAgICB9LAorICAgICAgICAgICAg ICAgIHsKKyAgICAgICAgICAgICAgICAgICAgdHlwZSA6ICJ3aGVlbCIsCisgICAgICAgICAgICAg ICAgICAgIHZpZXdYIDogMTAwLCAvLyBkZWZlYXQgY29hbGVzY2luZworICAgICAgICAgICAgICAg ICAgICBkZWx0YVggOiAxMCwKKyAgICAgICAgICAgICAgICAgICAgZGVsdGFZIDogLTQsCisgICAg ICAgICAgICAgICAgICAgIHBoYXNlIDogImNoYW5nZWQiCisgICAgICAgICAgICAgICAgfSwKKyAg ICAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgIHR5cGUgOiAid2hlZWwiLAorICAg ICAgICAgICAgICAgICAgICB2aWV3WCA6IDEwMSwgLy8gZGVmZWF0IGNvYWxlc2NpbmcKKyAgICAg ICAgICAgICAgICAgICAgZGVsdGFYIDogOCwKKyAgICAgICAgICAgICAgICAgICAgZGVsdGFZIDog LTYsCisgICAgICAgICAgICAgICAgICAgIHBoYXNlIDogImNoYW5nZWQiCisgICAgICAgICAgICAg ICAgfSwKKyAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgIHR5cGUgOiAid2hl ZWwiLAorICAgICAgICAgICAgICAgICAgICBwaGFzZSA6ICJlbmRlZCIKKyAgICAgICAgICAgICAg ICB9LAorICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgdHlwZSA6ICJ3aGVl bCIsCisgICAgICAgICAgICAgICAgICAgIHZpZXdYIDogMTAwLCAvLyBkZWZlYXQgY29hbGVzY2lu ZworICAgICAgICAgICAgICAgICAgICBkZWx0YVggOiAxMCwKKyAgICAgICAgICAgICAgICAgICAg ZGVsdGFZIDogLTYsCisgICAgICAgICAgICAgICAgICAgIG1vbWVudHVtUGhhc2UgOiAiYmVnYW4i CisgICAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAg ICAgIHR5cGUgOiAid2hlZWwiLAorICAgICAgICAgICAgICAgICAgICB2aWV3WCA6IDEwMSwgLy8g ZGVmZWF0IGNvYWxlc2NpbmcKKyAgICAgICAgICAgICAgICAgICAgZGVsdGFYIDogMTIsCisgICAg ICAgICAgICAgICAgICAgIGRlbHRhWSA6IC01LAorICAgICAgICAgICAgICAgICAgICBtb21lbnR1 bVBoYXNlIDogImNoYW5nZWQiCisgICAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICAgICB7 CisgICAgICAgICAgICAgICAgICAgIHR5cGUgOiAid2hlZWwiLAorICAgICAgICAgICAgICAgICAg ICB2aWV3WCA6IDEwMCwgLy8gZGVmZWF0IGNvYWxlc2NpbmcKKyAgICAgICAgICAgICAgICAgICAg ZGVsdGFYIDogOCwKKyAgICAgICAgICAgICAgICAgICAgZGVsdGFZIDogLTQsCisgICAgICAgICAg ICAgICAgICAgIG1vbWVudHVtUGhhc2UgOiAiY2hhbmdlZCIKKyAgICAgICAgICAgICAgICB9LAor ICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgdHlwZSA6ICJ3aGVlbCIsCisg ICAgICAgICAgICAgICAgICAgIHZpZXdYIDogMTAxLCAvLyBkZWZlYXQgY29hbGVzY2luZworICAg ICAgICAgICAgICAgICAgICBkZWx0YVggOiA2LAorICAgICAgICAgICAgICAgICAgICBkZWx0YVkg OiAtMiwKKyAgICAgICAgICAgICAgICAgICAgbW9tZW50dW1QaGFzZSA6ICJjaGFuZ2VkIgorICAg ICAgICAgICAgICAgIH0sCisgICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICAgICB0 eXBlIDogIndoZWVsIiwKKyAgICAgICAgICAgICAgICAgICAgdmlld1ggOiAxMDAsIC8vIGRlZmVh dCBjb2FsZXNjaW5nCisgICAgICAgICAgICAgICAgICAgIGRlbHRhWCA6IDQsCisgICAgICAgICAg ICAgICAgICAgIGRlbHRhWSA6IC0xLAorICAgICAgICAgICAgICAgICAgICBtb21lbnR1bVBoYXNl IDogImNoYW5nZWQiCisgICAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICAgICB7CisgICAg ICAgICAgICAgICAgICAgIHR5cGUgOiAid2hlZWwiLAorICAgICAgICAgICAgICAgICAgICBtb21l bnR1bVBoYXNlIDogImVuZGVkIgorICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIF07Cisg ICAgICAgICAgICAKKyAgICAgICAgICAgIGF3YWl0IFVJSGVscGVyLm1vdXNlV2hlZWxTZXF1ZW5j ZSh7IGV2ZW50cyB9KTsKKyAgICAgICAgICAgIGNoZWNrRm9yU2Nyb2xsKCk7CisgICAgICAgIH0K KworICAgICAgICBmdW5jdGlvbiBzdGFydFRlc3QoKQorICAgICAgICB7CisgICAgICAgICAgICBp ZiAoIXdpbmRvdy5ldmVudFNlbmRlcikgeworICAgICAgICAgICAgICAgIHNldFRpbWVvdXQoc2Ny b2xsVGVzdCwgMCk7CisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgfQorCisg ICAgICAgICAgICB0ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsKKyAgICAgICAgICAgIHRlc3RSdW5u ZXIud2FpdFVudGlsRG9uZSgpOworCisgICAgICAgICAgICBzZXRUaW1lb3V0KHNjcm9sbFRlc3Qs IDApOworICAgICAgICB9CisgICAgICAgIAorICAgICAgICB3aW5kb3cuYWRkRXZlbnRMaXN0ZW5l cignbG9hZCcsIHN0YXJ0VGVzdCwgZmFsc2UpOworICAgIDwvc2NyaXB0PgorPC9oZWFkPgorPGJv ZHk+CisgICAgPHNjcmlwdCBzcmM9Ii4uLy4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMi Pjwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgo= 449616 2022-01-20 16:02:36 -0800 2022-01-20 17:25:05 -0800 Patch bug-234384-20220120160235.patch text/plain 15762 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4MjY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTU4Yjk1ODhhODk4ZDY2 Y2E0MWZhNTY2ZWQyNzQ3MDZmYTYwZjhlOC4uNWIxMDY0ZDRlMTBmMmU2MWI3MTJjZTRjMzczNDU0 MmFmOGM5YjMzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDIyLTAxLTIwICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04g KHIyODQxMzYpOiBBIHNsaWdodCBob3Jpem9udGFsIHJ1YmJlcmJhbmQga2lsbHMgc2Nyb2xsIG1v bWVudHVtCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MzQzODQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBT Y3JvbGxBbmltYXRpb25SdWJiZXJCYW5kIHN1YnRseSBjaGFuZ2VkIHRoZSBiZWhhdmlvciBvZiB0 aGUgcnViYmVyYmFuZCBhbmltYXRpb24gb24gdGhlCisgICAgICAgIGF4aXMgdGhhdCBpcyBub3Qg dGhlIHJ1YmJlcmJhbmRpbmcgYXhpcy4gQmVjYXVzZSBpdCBjb252ZXJnZWQgb24gbV90YXJnZXRP ZmZzZXQsIGl0IGFsd2F5cworICAgICAgICByZXN1bHRlZCBpbiBubyBvZmZzZXQgb24gdGhhdCBh eGlzLgorICAgICAgICAKKyAgICAgICAgRml4IGJ5IHJlc3RvcmluZyB0aGUgYmVoYXZpb3IgZnJv bSBiZWZvcmUgcjI4NDEzNiwgd2hpY2ggYXBwbGllcyB0aGUgcnViYmVyYmFuZGluZyBhcyBhCisg ICAgICAgIGRlbHRhIGZyb20gdGhlIGN1cnJlbnQgb2Zmc2V0IGFuZCBubyBsb25nZXIgdXNlcyBt X3RhcmdldE9mZnNldCwgd2hpY2ggaXMgcmVtb3ZlZC4gSXQncyBhCisgICAgICAgIGJpdCBzdXJw cmlzaW5nIHRoYXQgdGhpcyBydWJiZXJiYW5kIGFuaW1hdGlvbiBkcml2ZXMgYSB2ZXJ0aWNhbCBz Y3JvbGwgd2hlbiB0aGUgZ2VzdHVyZSBpcworICAgICAgICBwcmltYXJpbHkgaG9yaXpvbnRhbCAo bm9ybWFsbHkgd2UnZCBjbGFtcCB0aGVzZSBkZWx0YXMgdG8gYmUgcHVyZWx5IGhvcml6b250YWwp LCBidXQgcGVvcGxlCisgICAgICAgIGFyZSB1c2VkIHRvIHRoaXMgYmVoYXZpb3Igc28gcmVzdG9y ZSBpdC4KKworICAgICAgICBUZXN0OiBmYXN0L3Njcm9sbGluZy9tYWMvai1zaGFwZWQtc2Nyb2xs LXJ1YmJlcmJhbmQuaHRtbAorCisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsQW5pbWF0aW9uLmg6 CisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsaW5nRWZmZWN0c0NvbnRyb2xsZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nRWZmZWN0c0NvbnRyb2xsZXI6Om92ZXJzY3JvbGxBbW91 bnQpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nRWZmZWN0c0NvbnRyb2xsZXI6OnNjcm9s bE9mZnNldCk6CisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsaW5nRWZmZWN0c0NvbnRyb2xsZXIu aDoKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0aW9uUnViYmVyQmFuZC5oOgor ICAgICAgICAqIHBsYXRmb3JtL21hYy9TY3JvbGxBbmltYXRpb25SdWJiZXJCYW5kLm1tOgorICAg ICAgICAoV2ViQ29yZTo6U2Nyb2xsQW5pbWF0aW9uUnViYmVyQmFuZDo6c3RhcnRSdWJiZXJCYW5k QW5pbWF0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbEFuaW1hdGlvblJ1YmJlckJhbmQ6 OnNlcnZpY2VBbmltYXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsQW5pbWF0aW9uUnVi YmVyQmFuZDo6ZGVidWdEZXNjcmlwdGlvbiBjb25zdCk6CisgICAgICAgICogcGxhdGZvcm0vbWFj L1Njcm9sbGluZ0VmZmVjdHNDb250cm9sbGVyLm1tOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xs aW5nRWZmZWN0c0NvbnRyb2xsZXI6OnN0YXJ0UnViYmVyQmFuZEFuaW1hdGlvbik6CisgICAgICAg IChXZWJDb3JlOjpTY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlcjo6c3RhcnRSdWJiZXJCYW5kQW5p bWF0aW9uSWZOZWNlc3NhcnkpOgorCiAyMDIyLTAxLTE5ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5m cmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIDxkaWFsb2c+IHdpdGggdHJhbnNmb3JtZWQgYW5j ZXN0b3IgYXNzZXJ0cyB1bmRlciBSZW5kZXJHZW9tZXRyeU1hcApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsQW5pbWF0aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9TY3JvbGxBbmltYXRpb24uaAppbmRleCAwZDQ2OTYyOTVhYWExZGJiNzBkNjQyOTUyODQ2 MTM1NTQwYmZjMDk4Li5mMGNkMmQ3NjliNTExMjQ0YjUyZmZkYWE2MmI5ODQ2Y2MyOTJjMzQ0IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxBbmltYXRpb24uaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxBbmltYXRpb24uaApAQCAtNDUsNiArNDUs OCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHNjcm9sbEFuaW1hdGlvbldpbGxTdGFydChT Y3JvbGxBbmltYXRpb24mKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgc2Nyb2xsQW5pbWF0aW9uRGlk RW5kKFNjcm9sbEFuaW1hdGlvbiYpIHsgfQogICAgIHZpcnR1YWwgU2Nyb2xsRXh0ZW50cyBzY3Jv bGxFeHRlbnRzRm9yQW5pbWF0aW9uKFNjcm9sbEFuaW1hdGlvbiYpID0gMDsKKyAgICB2aXJ0dWFs IEZsb2F0U2l6ZSBvdmVyc2Nyb2xsQW1vdW50KFNjcm9sbEFuaW1hdGlvbiYpID0gMDsKKyAgICB2 aXJ0dWFsIEZsb2F0UG9pbnQgc2Nyb2xsT2Zmc2V0KFNjcm9sbEFuaW1hdGlvbiYpID0gMDsKIH07 CiAKIGNsYXNzIFNjcm9sbEFuaW1hdGlvbiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9TY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9TY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlci5jcHAKaW5kZXggMTI4OWJmMTcwNjU0 YTMzYjc3ZDkwZDZkMzhhZGIwZGM0NTlmZjk1OS4uMmY1MjY3NWQxNTg1ZjA2ZGFhZWYyMzc1NGZm NThlOTIxYmU5N2UyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xs aW5nRWZmZWN0c0NvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Nj cm9sbGluZ0VmZmVjdHNDb250cm9sbGVyLmNwcApAQCAtNTIyLDYgKzUyMiwyMCBAQCBTY3JvbGxF eHRlbnRzIFNjcm9sbGluZ0VmZmVjdHNDb250cm9sbGVyOjpzY3JvbGxFeHRlbnRzRm9yQW5pbWF0 aW9uKFNjcm9sbEFuaW1hdAogICAgIHJldHVybiBtX2NsaWVudC5zY3JvbGxFeHRlbnRzKCk7CiB9 CiAKK0Zsb2F0U2l6ZSBTY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlcjo6b3ZlcnNjcm9sbEFtb3Vu dChTY3JvbGxBbmltYXRpb24mKQoreworI2lmIEhBVkUoUlVCQkVSX0JBTkRJTkcpCisgICAgcmV0 dXJuIG1fY2xpZW50LnN0cmV0Y2hBbW91bnQoKTsKKyNlbHNlCisgICAgcmV0dXJuIHsgfTsKKyNl bmRpZgorfQorCitGbG9hdFBvaW50IFNjcm9sbGluZ0VmZmVjdHNDb250cm9sbGVyOjpzY3JvbGxP ZmZzZXQoU2Nyb2xsQW5pbWF0aW9uJikKK3sKKyAgICByZXR1cm4gbV9jbGllbnQuc2Nyb2xsT2Zm c2V0KCk7Cit9CisKIHZvaWQgU2Nyb2xsaW5nRWZmZWN0c0NvbnRyb2xsZXI6OnN0YXJ0RGVmZXJy aW5nV2hlZWxFdmVudFRlc3RDb21wbGV0aW9uKFdoZWVsRXZlbnRUZXN0TW9uaXRvcjo6RGVmZXJS ZWFzb24gcmVhc29uKQogewogICAgIG1fY2xpZW50LmRlZmVyV2hlZWxFdmVudFRlc3RDb21wbGV0 aW9uRm9yUmVhc29uKHJlaW50ZXJwcmV0X2Nhc3Q8V2hlZWxFdmVudFRlc3RNb25pdG9yOjpTY3Jv bGxhYmxlQXJlYUlkZW50aWZpZXI+KHRoaXMpLCByZWFzb24pOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsaW5nRWZmZWN0c0NvbnRyb2xsZXIuaCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGluZ0VmZmVjdHNDb250cm9sbGVyLmgKaW5kZXggYzdhM2Ey Zjg1ZWEwZWQ1YTdjNmE5NGJlMWJmMzU3MjhiMThjODhmMy4uYjc4ZjY2NGI4Mjg2NTliNWE3OWI2 NjQ3YjYzOTRhMjVkYWMzZmZlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v U2Nyb2xsaW5nRWZmZWN0c0NvbnRyb2xsZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9TY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlci5oCkBAIC0yMDUsNyArMjA1LDcgQEAgcHJpdmF0 ZToKIAogICAgIHZvaWQgc3RhcnRSdWJiZXJCYW5kQW5pbWF0aW9uSWZOZWNlc3NhcnkoKTsKIAot ICAgIGJvb2wgc3RhcnRSdWJiZXJCYW5kQW5pbWF0aW9uKGNvbnN0IEZsb2F0UG9pbnQmIHRhcmdl dE9mZnNldCwgY29uc3QgRmxvYXRTaXplJiBpbml0aWFsVmVsb2NpdHksIGNvbnN0IEZsb2F0U2l6 ZSYgaW5pdGlhbE92ZXJzY3JvbGwpOworICAgIGJvb2wgc3RhcnRSdWJiZXJCYW5kQW5pbWF0aW9u KGNvbnN0IEZsb2F0U2l6ZSYgaW5pdGlhbFZlbG9jaXR5LCBjb25zdCBGbG9hdFNpemUmIGluaXRp YWxPdmVyc2Nyb2xsKTsKICAgICB2b2lkIHN0b3BSdWJiZXJCYW5kQW5pbWF0aW9uKCk7CiAKICAg ICB2b2lkIHdpbGxTdGFydFJ1YmJlckJhbmRBbmltYXRpb24oKTsKQEAgLTIyNyw2ICsyMjcsOCBA QCBwcml2YXRlOgogICAgIHZvaWQgc2Nyb2xsQW5pbWF0aW9uV2lsbFN0YXJ0KFNjcm9sbEFuaW1h dGlvbiYpIGZpbmFsOwogICAgIHZvaWQgc2Nyb2xsQW5pbWF0aW9uRGlkRW5kKFNjcm9sbEFuaW1h dGlvbiYpIGZpbmFsOwogICAgIFNjcm9sbEV4dGVudHMgc2Nyb2xsRXh0ZW50c0ZvckFuaW1hdGlv bihTY3JvbGxBbmltYXRpb24mKSBmaW5hbDsKKyAgICBGbG9hdFNpemUgb3ZlcnNjcm9sbEFtb3Vu dChTY3JvbGxBbmltYXRpb24mKSBmaW5hbDsKKyAgICBGbG9hdFBvaW50IHNjcm9sbE9mZnNldChT Y3JvbGxBbmltYXRpb24mKSBmaW5hbDsKIAogICAgIHZvaWQgYWRqdXN0RGVsdGFGb3JTbmFwcGlu Z0lmTmVlZGVkKGZsb2F0JiBkZWx0YVgsIGZsb2F0JiBkZWx0YVkpOwogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0aW9uUnViYmVyQmFuZC5oIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdGlvblJ1YmJlckJhbmQuaApp bmRleCBlZTI2OWZlYTM5N2QzNmNiYWEyZDlkNDI0YjgxYWMxYjExNTlmYmViLi42NDdhODI1MDI0 NTA2MTIzOWYzNWY0NTVmYmRjOGZmNzgzODhmZjRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0aW9uUnViYmVyQmFuZC5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxBbmltYXRpb25SdWJiZXJCYW5kLmgKQEAgLTM2LDcg KzM2LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgflNjcm9sbEFuaW1hdGlvblJ1YmJlckJhbmQo KTsKIAogICAgIC8vIHRhcmdldE9mZnNldCBpcyB0aGUgc2Nyb2xsIG9mZnNldCB3aGVuIHRoZSBh bmltYXRpb24gaGFzIGZpbmlzaGVkIChpLmUuIHNjcm9sbGVkIHRvIGFuIGVkZ2UpLgotICAgIGJv b2wgc3RhcnRSdWJiZXJCYW5kQW5pbWF0aW9uKGNvbnN0IEZsb2F0UG9pbnQmIHRhcmdldE9mZnNl dCwgY29uc3QgRmxvYXRTaXplJiBpbml0aWFsVmVsb2NpdHksIGNvbnN0IEZsb2F0U2l6ZSYgaW5p dGlhbE92ZXJzY3JvbGwpOworICAgIGJvb2wgc3RhcnRSdWJiZXJCYW5kQW5pbWF0aW9uKGNvbnN0 IEZsb2F0U2l6ZSYgaW5pdGlhbFZlbG9jaXR5LCBjb25zdCBGbG9hdFNpemUmIGluaXRpYWxPdmVy c2Nyb2xsKTsKIAogcHJpdmF0ZToKICAgICB2b2lkIHVwZGF0ZVNjcm9sbEV4dGVudHMoKSBmaW5h bDsKQEAgLTQ3LDcgKzQ3LDYgQEAgcHJpdmF0ZToKIAogICAgIGJvb2wgYW5pbWF0ZVNjcm9sbChN b25vdG9uaWNUaW1lKTsKIAotICAgIEZsb2F0UG9pbnQgbV90YXJnZXRPZmZzZXQ7CiAgICAgRmxv YXRTaXplIG1faW5pdGlhbFZlbG9jaXR5OwogICAgIEZsb2F0U2l6ZSBtX2luaXRpYWxPdmVyc2Ny b2xsOwogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxB bmltYXRpb25SdWJiZXJCYW5kLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9s bEFuaW1hdGlvblJ1YmJlckJhbmQubW0KaW5kZXggNjI0OTE0ZDQ2NDJkNTg0ZWM4Y2QyNzAxMTcw YzZjYTk3OGIwN2I4Yy4uOGQwN2Q2NWY0Nzg1YzcwM2M5MTIzNjQxYTJmNzQxZDliMzBiNTkxZSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdGlvblJ1 YmJlckJhbmQubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1h dGlvblJ1YmJlckJhbmQubW0KQEAgLTU5LDkgKzU5LDggQEAgU2Nyb2xsQW5pbWF0aW9uUnViYmVy QmFuZDo6U2Nyb2xsQW5pbWF0aW9uUnViYmVyQmFuZChTY3JvbGxBbmltYXRpb25DbGllbnQmIGNs aWUKIAogU2Nyb2xsQW5pbWF0aW9uUnViYmVyQmFuZDo6flNjcm9sbEFuaW1hdGlvblJ1YmJlckJh bmQoKSA9IGRlZmF1bHQ7CiAKLWJvb2wgU2Nyb2xsQW5pbWF0aW9uUnViYmVyQmFuZDo6c3RhcnRS dWJiZXJCYW5kQW5pbWF0aW9uKGNvbnN0IEZsb2F0UG9pbnQmIHRhcmdldE9mZnNldCwgY29uc3Qg RmxvYXRTaXplJiBpbml0aWFsVmVsb2NpdHksIGNvbnN0IEZsb2F0U2l6ZSYgaW5pdGlhbE92ZXJz Y3JvbGwpCitib29sIFNjcm9sbEFuaW1hdGlvblJ1YmJlckJhbmQ6OnN0YXJ0UnViYmVyQmFuZEFu aW1hdGlvbihjb25zdCBGbG9hdFNpemUmIGluaXRpYWxWZWxvY2l0eSwgY29uc3QgRmxvYXRTaXpl JiBpbml0aWFsT3ZlcnNjcm9sbCkKIHsKLSAgICBtX3RhcmdldE9mZnNldCA9IHRhcmdldE9mZnNl dDsKICAgICBtX2luaXRpYWxWZWxvY2l0eSA9IGluaXRpYWxWZWxvY2l0eTsKICAgICBtX2luaXRp YWxPdmVyc2Nyb2xsID0gaW5pdGlhbE92ZXJzY3JvbGw7CiAKQEAgLTkzLDcgKzkyLDkgQEAgdm9p ZCBTY3JvbGxBbmltYXRpb25SdWJiZXJCYW5kOjpzZXJ2aWNlQW5pbWF0aW9uKE1vbm90b25pY1Rp bWUgY3VycmVudFRpbWUpCiAKICAgICAvLyBXZSBtaWdodCBiZSBydWJiZXJiYW5kaW5nIGF3YXkg ZnJvbSBhbiBlZGdlIGFuZCBiYWNrLCBzbyB3YWl0IGEgZnJhbWUgb3IgdHdvIGJlZm9yZSBjaGVj a2luZyBmb3IgY29tcGxldGlvbi4KICAgICBib29sIGFuaW1hdGlvbkNvbXBsZXRlID0gcnViYmVy QmFuZE9mZnNldC5pc1plcm8oKSAmJiBlbGFwc2VkVGltZSA+IDI0X21zOwotICAgIG1fY3VycmVu dE9mZnNldCA9IG1fdGFyZ2V0T2Zmc2V0ICsgcnViYmVyQmFuZE9mZnNldDsKKyAgICAKKyAgICBh dXRvIHNjcm9sbERlbHRhID0gcnViYmVyQmFuZE9mZnNldCAtIG1fY2xpZW50Lm92ZXJzY3JvbGxB bW91bnQoKnRoaXMpOworICAgIG1fY3VycmVudE9mZnNldCA9IG1fY2xpZW50LnNjcm9sbE9mZnNl dCgqdGhpcykgKyBzY3JvbGxEZWx0YTsKIAogICAgIG1fY2xpZW50LnNjcm9sbEFuaW1hdGlvbkRp ZFVwZGF0ZSgqdGhpcywgbV9jdXJyZW50T2Zmc2V0KTsKIApAQCAtMTA0LDcgKzEwNSw3IEBAIHZv aWQgU2Nyb2xsQW5pbWF0aW9uUnViYmVyQmFuZDo6c2VydmljZUFuaW1hdGlvbihNb25vdG9uaWNU aW1lIGN1cnJlbnRUaW1lKQogU3RyaW5nIFNjcm9sbEFuaW1hdGlvblJ1YmJlckJhbmQ6OmRlYnVn RGVzY3JpcHRpb24oKSBjb25zdAogewogICAgIFRleHRTdHJlYW0gdGV4dFN0cmVhbTsKLSAgICB0 ZXh0U3RyZWFtIDw8ICJTY3JvbGxBbmltYXRpb25SdWJiZXJCYW5kICIgPDwgdGhpcyA8PCAiIGFj dGl2ZSAiIDw8IGlzQWN0aXZlKCkgPDwgIiB0YXJnZXQgIiA8PCBtX3RhcmdldE9mZnNldCA8PCAi IGN1cnJlbnQgb2Zmc2V0ICIgPDwgY3VycmVudE9mZnNldCgpOworICAgIHRleHRTdHJlYW0gPDwg IlNjcm9sbEFuaW1hdGlvblJ1YmJlckJhbmQgIiA8PCB0aGlzIDw8ICIgYWN0aXZlICIgPDwgaXNB Y3RpdmUoKSA8PCAiIGluaXRpYWwgdmVsb2NpdHkgIiA8PCBtX2luaXRpYWxWZWxvY2l0eSA8PCAi IGluaXRpYWwgb3ZlcnNjcm9sbCAiIDw8IG1faW5pdGlhbE92ZXJzY3JvbGw7CiAgICAgcmV0dXJu IHRleHRTdHJlYW0ucmVsZWFzZSgpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9tYWMvU2Nyb2xsaW5nRWZmZWN0c0NvbnRyb2xsZXIubW0gYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsaW5nRWZmZWN0c0NvbnRyb2xsZXIubW0KaW5kZXggY2E3Zjc4 NjI4NWU1YTg0ZTA0NjZiNjA2OGQxYjY3ZmYyYWJkYmVkOC4uM2NjM2QyNGZhOTA5ZDljZWRhOGUz MmY4NjQzMjEzMjU3MGE3MThmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bWFjL1Njcm9sbGluZ0VmZmVjdHNDb250cm9sbGVyLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL21hYy9TY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlci5tbQpAQCAtMzk5LDEzICszOTks MTMgQEAgdm9pZCBTY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlcjo6c3RvcFJ1YmJlckJhbmRpbmco KQogICAgIHVwZGF0ZVJ1YmJlckJhbmRpbmdTdGF0ZSgpOwogfQogCi1ib29sIFNjcm9sbGluZ0Vm ZmVjdHNDb250cm9sbGVyOjpzdGFydFJ1YmJlckJhbmRBbmltYXRpb24oY29uc3QgRmxvYXRQb2lu dCYgdGFyZ2V0T2Zmc2V0LCBjb25zdCBGbG9hdFNpemUmIGluaXRpYWxWZWxvY2l0eSwgY29uc3Qg RmxvYXRTaXplJiBpbml0aWFsT3ZlcnNjcm9sbCkKK2Jvb2wgU2Nyb2xsaW5nRWZmZWN0c0NvbnRy b2xsZXI6OnN0YXJ0UnViYmVyQmFuZEFuaW1hdGlvbihjb25zdCBGbG9hdFNpemUmIGluaXRpYWxW ZWxvY2l0eSwgY29uc3QgRmxvYXRTaXplJiBpbml0aWFsT3ZlcnNjcm9sbCkKIHsKICAgICBpZiAo bV9jdXJyZW50QW5pbWF0aW9uKQogICAgICAgICBtX2N1cnJlbnRBbmltYXRpb24tPnN0b3AoKTsK IAogICAgIG1fY3VycmVudEFuaW1hdGlvbiA9IG1ha2VVbmlxdWU8U2Nyb2xsQW5pbWF0aW9uUnVi YmVyQmFuZD4oKnRoaXMpOwotICAgIGJvb2wgc3RhcnRlZCA9IGRvd25jYXN0PFNjcm9sbEFuaW1h dGlvblJ1YmJlckJhbmQ+KCptX2N1cnJlbnRBbmltYXRpb24pLnN0YXJ0UnViYmVyQmFuZEFuaW1h dGlvbih0YXJnZXRPZmZzZXQsIGluaXRpYWxWZWxvY2l0eSwgaW5pdGlhbE92ZXJzY3JvbGwpOwor ICAgIGJvb2wgc3RhcnRlZCA9IGRvd25jYXN0PFNjcm9sbEFuaW1hdGlvblJ1YmJlckJhbmQ+KCpt X2N1cnJlbnRBbmltYXRpb24pLnN0YXJ0UnViYmVyQmFuZEFuaW1hdGlvbihpbml0aWFsVmVsb2Np dHksIGluaXRpYWxPdmVyc2Nyb2xsKTsKICAgICBMT0dfV0lUSF9TVFJFQU0oU2Nyb2xsQW5pbWF0 aW9ucywgc3RyZWFtIDw8ICJTY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlcjo6c3RhcnRSdWJiZXJC YW5kQW5pbWF0aW9uKCkgLSBhbmltYXRpb24gIiA8PCAqbV9jdXJyZW50QW5pbWF0aW9uIDw8ICIg c3RhcnRlZCAiIDw8IHN0YXJ0ZWQpOwogICAgIHJldHVybiBzdGFydGVkOwogfQpAQCAtNDY0LDgg KzQ2NCw4IEBAIHZvaWQgU2Nyb2xsaW5nRWZmZWN0c0NvbnRyb2xsZXI6OnN0YXJ0UnViYmVyQmFu ZEFuaW1hdGlvbklmTmVjZXNzYXJ5KCkKICAgICBpZiAoIW1fY2xpZW50LmFsbG93c1ZlcnRpY2Fs U2Nyb2xsaW5nKCkpCiAgICAgICAgIGluaXRpYWxWZWxvY2l0eS5zZXRIZWlnaHQoMCk7CiAKLSAg ICBMT0dfV0lUSF9TVFJFQU0oU2Nyb2xsQW5pbWF0aW9ucywgc3RyZWFtIDw8ICJTY3JvbGxpbmdF ZmZlY3RzQ29udHJvbGxlcjo6c3RhcnRSdWJiZXJCYW5kQW5pbWF0aW9uSWZOZWNlc3NhcnkoKSAt IHJ1YmJlckJhbmRBbmltYXRpb25SdW5uaW5nICIgPDwgbV9pc0FuaW1hdGluZ1J1YmJlckJhbmQg PDwgIiBzdHJldGNoQW1vdW50ICIgPDwgc3RyZXRjaEFtb3VudCA8PCAiIGNvbnRyYWluZWRPZmZz ZXQgIiA8PCBjb250cmFpbmVkT2Zmc2V0IDw8ICIgaW5pdGlhbFZlbG9jaXR5ICIgPDwgaW5pdGlh bFZlbG9jaXR5KTsKLSAgICBzdGFydFJ1YmJlckJhbmRBbmltYXRpb24oY29udHJhaW5lZE9mZnNl dCwgaW5pdGlhbFZlbG9jaXR5LCBzdHJldGNoQW1vdW50KTsKKyAgICBMT0dfV0lUSF9TVFJFQU0o U2Nyb2xsQW5pbWF0aW9ucywgc3RyZWFtIDw8ICJTY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlcjo6 c3RhcnRSdWJiZXJCYW5kQW5pbWF0aW9uSWZOZWNlc3NhcnkoKSAtIHJ1YmJlckJhbmRBbmltYXRp b25SdW5uaW5nICIgPDwgbV9pc0FuaW1hdGluZ1J1YmJlckJhbmQgPDwgIiBzdHJldGNoQW1vdW50 ICIgPDwgc3RyZXRjaEFtb3VudCA8PCAiIGluaXRpYWxWZWxvY2l0eSAiIDw8IGluaXRpYWxWZWxv Y2l0eSk7CisgICAgc3RhcnRSdWJiZXJCYW5kQW5pbWF0aW9uKGluaXRpYWxWZWxvY2l0eSwgc3Ry ZXRjaEFtb3VudCk7CiB9CiAKIGJvb2wgU2Nyb2xsaW5nRWZmZWN0c0NvbnRyb2xsZXI6OnNob3Vs ZFJ1YmJlckJhbmRPblNpZGUoQm94U2lkZSBzaWRlKSBjb25zdApkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDJiY2M4NzAzNzQ4 NzMxYjExNWIzOTk4OTg0MjZhMjVmOTIxNDlhM2MuLjY3ZGM3M2NmMzA4ODEyNjUyMWY2ODg0ZDUy ZjJjNDJjZjUxNTRkYzcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMi0wMS0yMCAgU2ltb24g RnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChy Mjg0MTM2KTogQSBzbGlnaHQgaG9yaXpvbnRhbCBydWJiZXJiYW5kIGtpbGxzIHNjcm9sbCBtb21l bnR1bQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM0 Mzg0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBm YXN0L3Njcm9sbGluZy9tYWMvai1zaGFwZWQtc2Nyb2xsLXJ1YmJlcmJhbmQtZXhwZWN0ZWQudHh0 OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3Njcm9sbGluZy9tYWMvai1zaGFwZWQtc2Nyb2xsLXJ1 YmJlcmJhbmQuaHRtbDogQWRkZWQuCisKIDIwMjItMDEtMTkgIFNpbW9uIEZyYXNlciAgPHNpbW9u LmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgPGRpYWxvZz4gd2l0aCB0cmFuc2Zvcm1lZCBh bmNlc3RvciBhc3NlcnRzIHVuZGVyIFJlbmRlckdlb21ldHJ5TWFwCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9mYXN0L3Njcm9sbGluZy9tYWMvai1zaGFwZWQtc2Nyb2xsLXJ1YmJlcmJhbmQtZXhw ZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcvbWFjL2otc2hhcGVkLXNjcm9s bC1ydWJiZXJiYW5kLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4wNTgxNDhkOTkyODk4MTM4ZWY2 MWExOGU5Y2U3MGY5MTc1ZjVkOTQ1Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFz dC9zY3JvbGxpbmcvbWFjL2otc2hhcGVkLXNjcm9sbC1ydWJiZXJiYW5kLWV4cGVjdGVkLnR4dApA QCAtMCwwICsxLDIgQEAKK1BBU1Mgd2luZG93LnNjcm9sbFkgPiAwIGlzIHRydWUKKwpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcvbWFjL2otc2hhcGVkLXNjcm9sbC1ydWJi ZXJiYW5kLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9tYWMvai1zaGFwZWQtc2Ny b2xsLXJ1YmJlcmJhbmQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5iOTRmMTQyZjZmNjQ4ZDE0MzNmMjBlODU1 NmYyMzQ0YWQxM2Q3MWFkCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9zY3Jv bGxpbmcvbWFjL2otc2hhcGVkLXNjcm9sbC1ydWJiZXJiYW5kLmh0bWwKQEAgLTAsMCArMSwxMjYg QEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKyAgICA8c3R5bGU+CisgICAgICAg IGJvZHkgeworICAgICAgICAgICAgaGVpZ2h0OiA1MDAwcHg7CisgICAgICAgIH0KKyAgICA8L3N0 eWxlPgorICAgIDxzY3JpcHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMi Pjwvc2NyaXB0PgorICAgIDxzY3JpcHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJjZXMvdWktaGVscGVy LmpzIj48L3NjcmlwdD4KKyAgICA8c2NyaXB0PgorICAgICAgICB2YXIganNUZXN0SXNBc3luYyA9 IHRydWU7CisKKyAgICAgICAgZnVuY3Rpb24gY2hlY2tGb3JTY3JvbGwoKQorICAgICAgICB7Cisg ICAgICAgICAgICBzaG91bGRCZVRydWUoJ3dpbmRvdy5zY3JvbGxZID4gMCcpOworICAgICAgICAg ICAgdGVzdFJ1bm5lci5ub3RpZnlEb25lKCk7CisgICAgICAgIH0KKworICAgICAgICBhc3luYyBm dW5jdGlvbiBzY3JvbGxUZXN0KCkKKyAgICAgICAgeworICAgICAgICAgICAgLy8gR2VzdHVyZSB0 aGF0IHN0YXJ0cyBob3Jpem9udGFsIHRoZW4gaGFzIHNvbWUgdXB3YXJkIHRyYWplY3RvcnkgYXQg dGhlIGVuZC4KKyAgICAgICAgICAgIGNvbnN0IGV2ZW50cyA9IFsKKyAgICAgICAgICAgICAgICB7 CisgICAgICAgICAgICAgICAgICAgIHR5cGUgOiAid2hlZWwiLAorICAgICAgICAgICAgICAgICAg ICB2aWV3WCA6IDEwMCwKKyAgICAgICAgICAgICAgICAgICAgdmlld1kgOiAxMDAsCisgICAgICAg ICAgICAgICAgICAgIGRlbHRhWCA6IDEsCisgICAgICAgICAgICAgICAgICAgIHBoYXNlIDogImJl Z2FuIgorICAgICAgICAgICAgICAgIH0sCisgICAgICAgICAgICAgICAgeworICAgICAgICAgICAg ICAgICAgICB0eXBlIDogIndoZWVsIiwKKyAgICAgICAgICAgICAgICAgICAgZGVsdGFYIDogNCwK KyAgICAgICAgICAgICAgICAgICAgZGVsdGFZIDogLTEsCisgICAgICAgICAgICAgICAgICAgIHBo YXNlIDogImNoYW5nZWQiCisgICAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICAgICB7Cisg ICAgICAgICAgICAgICAgICAgIHR5cGUgOiAid2hlZWwiLAorICAgICAgICAgICAgICAgICAgICB2 aWV3WCA6IDEwMSwgLy8gZGVmZWF0IGNvYWxlc2NpbmcKKyAgICAgICAgICAgICAgICAgICAgZGVs dGFYIDogNiwKKyAgICAgICAgICAgICAgICAgICAgZGVsdGFZIDogLTIsCisgICAgICAgICAgICAg ICAgICAgIHBoYXNlIDogImNoYW5nZWQiCisgICAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAg ICAgICB7CisgICAgICAgICAgICAgICAgICAgIHR5cGUgOiAid2hlZWwiLAorICAgICAgICAgICAg ICAgICAgICB2aWV3WCA6IDEwMCwgLy8gZGVmZWF0IGNvYWxlc2NpbmcKKyAgICAgICAgICAgICAg ICAgICAgZGVsdGFYIDogMTAsCisgICAgICAgICAgICAgICAgICAgIGRlbHRhWSA6IC00LAorICAg ICAgICAgICAgICAgICAgICBwaGFzZSA6ICJjaGFuZ2VkIgorICAgICAgICAgICAgICAgIH0sCisg ICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICAgICB0eXBlIDogIndoZWVsIiwKKyAg ICAgICAgICAgICAgICAgICAgdmlld1ggOiAxMDEsIC8vIGRlZmVhdCBjb2FsZXNjaW5nCisgICAg ICAgICAgICAgICAgICAgIGRlbHRhWCA6IDgsCisgICAgICAgICAgICAgICAgICAgIGRlbHRhWSA6 IC02LAorICAgICAgICAgICAgICAgICAgICBwaGFzZSA6ICJjaGFuZ2VkIgorICAgICAgICAgICAg ICAgIH0sCisgICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICAgICB0eXBlIDogIndo ZWVsIiwKKyAgICAgICAgICAgICAgICAgICAgcGhhc2UgOiAiZW5kZWQiCisgICAgICAgICAgICAg ICAgfSwKKyAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgIHR5cGUgOiAid2hl ZWwiLAorICAgICAgICAgICAgICAgICAgICB2aWV3WCA6IDEwMCwgLy8gZGVmZWF0IGNvYWxlc2Np bmcKKyAgICAgICAgICAgICAgICAgICAgZGVsdGFYIDogMTAsCisgICAgICAgICAgICAgICAgICAg IGRlbHRhWSA6IC02LAorICAgICAgICAgICAgICAgICAgICBtb21lbnR1bVBoYXNlIDogImJlZ2Fu IgorICAgICAgICAgICAgICAgIH0sCisgICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAg ICAgICB0eXBlIDogIndoZWVsIiwKKyAgICAgICAgICAgICAgICAgICAgdmlld1ggOiAxMDEsIC8v IGRlZmVhdCBjb2FsZXNjaW5nCisgICAgICAgICAgICAgICAgICAgIGRlbHRhWCA6IDEyLAorICAg ICAgICAgICAgICAgICAgICBkZWx0YVkgOiAtNSwKKyAgICAgICAgICAgICAgICAgICAgbW9tZW50 dW1QaGFzZSA6ICJjaGFuZ2VkIgorICAgICAgICAgICAgICAgIH0sCisgICAgICAgICAgICAgICAg eworICAgICAgICAgICAgICAgICAgICB0eXBlIDogIndoZWVsIiwKKyAgICAgICAgICAgICAgICAg ICAgdmlld1ggOiAxMDAsIC8vIGRlZmVhdCBjb2FsZXNjaW5nCisgICAgICAgICAgICAgICAgICAg IGRlbHRhWCA6IDgsCisgICAgICAgICAgICAgICAgICAgIGRlbHRhWSA6IC00LAorICAgICAgICAg ICAgICAgICAgICBtb21lbnR1bVBoYXNlIDogImNoYW5nZWQiCisgICAgICAgICAgICAgICAgfSwK KyAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgIHR5cGUgOiAid2hlZWwiLAor ICAgICAgICAgICAgICAgICAgICB2aWV3WCA6IDEwMSwgLy8gZGVmZWF0IGNvYWxlc2NpbmcKKyAg ICAgICAgICAgICAgICAgICAgZGVsdGFYIDogNiwKKyAgICAgICAgICAgICAgICAgICAgZGVsdGFZ IDogLTIsCisgICAgICAgICAgICAgICAgICAgIG1vbWVudHVtUGhhc2UgOiAiY2hhbmdlZCIKKyAg ICAgICAgICAgICAgICB9LAorICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAg dHlwZSA6ICJ3aGVlbCIsCisgICAgICAgICAgICAgICAgICAgIHZpZXdYIDogMTAwLCAvLyBkZWZl YXQgY29hbGVzY2luZworICAgICAgICAgICAgICAgICAgICBkZWx0YVggOiA0LAorICAgICAgICAg ICAgICAgICAgICBkZWx0YVkgOiAtMSwKKyAgICAgICAgICAgICAgICAgICAgbW9tZW50dW1QaGFz ZSA6ICJjaGFuZ2VkIgorICAgICAgICAgICAgICAgIH0sCisgICAgICAgICAgICAgICAgeworICAg ICAgICAgICAgICAgICAgICB0eXBlIDogIndoZWVsIiwKKyAgICAgICAgICAgICAgICAgICAgbW9t ZW50dW1QaGFzZSA6ICJlbmRlZCIKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICBdOwor ICAgICAgICAgICAgCisgICAgICAgICAgICBhd2FpdCBVSUhlbHBlci5tb3VzZVdoZWVsU2VxdWVu Y2UoeyBldmVudHMgfSk7CisgICAgICAgICAgICBjaGVja0ZvclNjcm9sbCgpOworICAgICAgICB9 CisKKyAgICAgICAgZnVuY3Rpb24gc3RhcnRUZXN0KCkKKyAgICAgICAgeworICAgICAgICAgICAg aWYgKCF3aW5kb3cuZXZlbnRTZW5kZXIpIHsKKyAgICAgICAgICAgICAgICBzZXRUaW1lb3V0KHNj cm9sbFRlc3QsIDApOworICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIH0KKwor ICAgICAgICAgICAgdGVzdFJ1bm5lci5kdW1wQXNUZXh0KCk7CisgICAgICAgICAgICB0ZXN0UnVu bmVyLndhaXRVbnRpbERvbmUoKTsKKworICAgICAgICAgICAgc2V0VGltZW91dChzY3JvbGxUZXN0 LCAwKTsKKyAgICAgICAgfQorICAgICAgICAKKyAgICAgICAgd2luZG93LmFkZEV2ZW50TGlzdGVu ZXIoJ2xvYWQnLCBzdGFydFRlc3QsIGZhbHNlKTsKKyAgICA8L3NjcmlwdD4KKzwvaGVhZD4KKzxi b2R5PgorICAgIDxzY3JpcHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wb3N0Lmpz Ij48L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4K