230444 2021-09-18 11:48:45 -0700 Rename haveScrolledSincePageLoad() and push the state to ScrollbarsController 2021-09-18 13:42:16 -0700 1 1 1 Unclassified WebKit Scrolling WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 230324 1 simon.fraser simon.fraser mmaxfield mrobinson simon.fraser webkit-bug-importer oldest_to_newest 1794785 0 simon.fraser 2021-09-18 11:48:45 -0700 Rename haveScrolledSincePageLoad() and push the state to ScrollbarsController 1794786 1 438564 simon.fraser 2021-09-18 11:53:18 -0700 Created attachment 438564 Patch 1794789 2 438564 mmaxfield 2021-09-18 12:09:15 -0700 Comment on attachment 438564 Patch r=mews 1794797 3 ews-feeder 2021-09-18 13:41:33 -0700 Committed r282729 (241866@main): <https://commits.webkit.org/241866@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 438564. 1794798 4 webkit-bug-importer 2021-09-18 13:42:16 -0700 <rdar://problem/83273674> 438564 2021-09-18 11:53:18 -0700 2021-09-18 13:41:34 -0700 Patch bug-230444-20210918115317.patch text/plain 17638 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyNzI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzk2MzRlMjNhZjA3NjUy OTllNDViMzYxYTExZGRkZWM5ZGFmYjI2Yi4uMmZmMWQ4NjIzYTczZmNlNWJkZDg1NmY3ZGIzOTEw OTZmNzZiYmFkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU4IEBACisyMDIxLTA5LTE4ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlbmFtZSBoYXZl U2Nyb2xsZWRTaW5jZVBhZ2VMb2FkKCkgYW5kIHB1c2ggdGhlIHN0YXRlIHRvIFNjcm9sbGJhcnND b250cm9sbGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMzA0NDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAg CisgICAgICAgIHI4MTE1OSBhZGRlZCBsb2dpYyB0byBzdXBwcmVzcyBzY3JvbGxiYXIgYW5pbWF0 aW9ucyBkdXJpbmcgcGFnZSBsb2FkIChkZWxheWVkIHVzaW5nIGEgMTAwbXMKKyAgICAgICAgdGlt ZXIgaW4gU2Nyb2xsYmFyc0NvbnRyb2xsZXJNYWMpLCBidXQgdG8gdW5zdXBwcmVzcyB0aGUgYW5p bWF0aW9ucyB3aGVuIHJlY2VpdmluZyB1c2VyCisgICAgICAgIGV2ZW50cyBvciBzY3JvbGxpbmcu IFRoaXMgc3RhdGUgdXNpbmcgdGhlIGNvbmZ1c2luZ2x5IG5hbWVkICJoYXZlU2Nyb2xsZWRTaW5j ZVBhZ2VMb2FkIiwKKyAgICAgICAgd2hpY2ggaXMgcmVhbGx5ICJhIHdoZWVsIGV2bmV0IG9yIHNj cm9sbCByZXF1aXJlcyB0aGF0IHdlIHN0b3Agc3VwcHJlc3Npbmcgc2Nyb2xsYmFyCisgICAgICAg IGFuaW1hdGlvbnMiLiBTbyBuYW1lIGl0IHNjcm9sbGJhckFuaW1hdGlvbnNVbnN1c3BlbmRlZEJ5 VXNlckludGVyYWN0aW9uIiwgYW5kIGhhdmUKKyAgICAgICAgU2Nyb2xsYmFyc0NvbnRyb2xsZXIg bWFpbnRhaW4gdGhlIHN0YXRlLCByYXRoZXIgdGhhbiBTY3JvbGxBbmltYXRvci4KKworICAgICAg ICBBZGQgc29tZSBPdmVybGF5U2Nyb2xsYmFycyBsb2dnaW5nIHRvIHNob3cgdGhpcyB3b3JraW5n IChhbHRob3VnaCBpdCByZXZlYWxzIHRoYXQgdGhlCisgICAgICAgIDEwMG1zIHRpbWVyIGNhbiBm aXJlIG11bHRpcGxlIHRpbWVzKS4KKworICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbEFuaW1hdG9y LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbEFuaW1hdG9yOjpjYW5jZWxBbmltYXRpb25z KToKKyAgICAgICAgKiBwbGF0Zm9ybS9TY3JvbGxBbmltYXRvci5oOgorICAgICAgICAoV2ViQ29y ZTo6U2Nyb2xsQW5pbWF0b3I6OmhhdmVTY3JvbGxlZFNpbmNlUGFnZUxvYWQgY29uc3QpOiBEZWxl dGVkLgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsQW5pbWF0b3I6OnNldEhhdmVTY3JvbGxlZFNp bmNlUGFnZUxvYWQpOiBEZWxldGVkLgorICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbGJhcnNDb250 cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhcnNDb250cm9sbGVyOjpzaG91 bGRTdXNwZW5kU2Nyb2xsYmFyQW5pbWF0aW9ucyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpT Y3JvbGxiYXJzQ29udHJvbGxlcjo6Y2FuY2VsQW5pbWF0aW9ucyk6CisgICAgICAgIChXZWJDb3Jl OjpTY3JvbGxiYXJzQ29udHJvbGxlcjo6ZGlkQmVnaW5TY3JvbGxHZXN0dXJlKToKKyAgICAgICAg KFdlYkNvcmU6OlNjcm9sbGJhcnNDb250cm9sbGVyOjpkaWRFbmRTY3JvbGxHZXN0dXJlKToKKyAg ICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhcnNDb250cm9sbGVyOjptYXlCZWdpblNjcm9sbEdlc3R1 cmUpOgorICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbGJhcnNDb250cm9sbGVyLmg6CisgICAgICAg IChXZWJDb3JlOjpTY3JvbGxiYXJzQ29udHJvbGxlcjo6c2Nyb2xsYmFyQW5pbWF0aW9uc1Vuc3Vz cGVuZGVkQnlVc2VySW50ZXJhY3Rpb24gY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xs YmFyc0NvbnRyb2xsZXI6OnNldFNjcm9sbGJhckFuaW1hdGlvbnNVbnN1c3BlbmRlZEJ5VXNlcklu dGVyYWN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhcnNDb250cm9sbGVyOjpjYW5j ZWxBbmltYXRpb25zKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhcnNDb250 cm9sbGVyOjpkaWRCZWdpblNjcm9sbEdlc3R1cmUgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAo V2ViQ29yZTo6U2Nyb2xsYmFyc0NvbnRyb2xsZXI6OmRpZEVuZFNjcm9sbEdlc3R1cmUgY29uc3Qp OiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYmFyc0NvbnRyb2xsZXI6Om1heUJl Z2luU2Nyb2xsR2VzdHVyZSBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgICogcGxhdGZvcm0vbWFj L1Njcm9sbEFuaW1hdG9yTWFjLmg6CisgICAgICAgICogcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1h dG9yTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsQW5pbWF0b3JNYWM6OnNjcm9sbCk6 CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxBbmltYXRvck1hYzo6aGFuZGxlV2hlZWxFdmVudFBo YXNlKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbEFuaW1hdG9yTWFjOjpoYW5kbGVXaGVlbEV2 ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbEFuaW1hdG9yTWFjOjpjYW5jZWxBbmltYXRp b25zKTogRGVsZXRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvU2Nyb2xsYmFyc0NvbnRyb2xs ZXJNYWMuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvU2Nyb2xsYmFyc0NvbnRyb2xsZXJNYWMu bW06CisgICAgICAgICgtW1dlYlNjcm9sbGJhclBhcnRBbmltYXRpb24gc2V0Q3VycmVudFByb2dy ZXNzOl0pOgorICAgICAgICAoLVtXZWJTY3JvbGxlckltcERlbGVnYXRlIHNldFVwQWxwaGFBbmlt YXRpb246c2Nyb2xsZXJQYWludGVyOnBhcnQ6YW5pbWF0ZUFscGhhVG86ZHVyYXRpb246XSk6Cisg ICAgICAgIChXZWJDb3JlOjpTY3JvbGxiYXJzQ29udHJvbGxlck1hYzo6Y2FuY2VsQW5pbWF0aW9u cyk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxiYXJzQ29udHJvbGxlck1hYzo6ZGlkQmVnaW5T Y3JvbGxHZXN0dXJlKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhcnNDb250cm9sbGVyTWFj OjpkaWRFbmRTY3JvbGxHZXN0dXJlKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhcnNDb250 cm9sbGVyTWFjOjptYXlCZWdpblNjcm9sbEdlc3R1cmUpOgorICAgICAgICAoV2ViQ29yZTo6U2Ny b2xsYmFyc0NvbnRyb2xsZXJNYWM6OmluaXRpYWxTY3JvbGxiYXJQYWludFRpbWVyRmlyZWQpOgor ICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYmFyc0NvbnRyb2xsZXJNYWM6OmhhdmVTY3JvbGxlZFNp bmNlUGFnZUxvYWQgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYmFy c0NvbnRyb2xsZXJNYWM6OmRpZEJlZ2luU2Nyb2xsR2VzdHVyZSBjb25zdCk6IERlbGV0ZWQuCisg ICAgICAgIChXZWJDb3JlOjpTY3JvbGxiYXJzQ29udHJvbGxlck1hYzo6ZGlkRW5kU2Nyb2xsR2Vz dHVyZSBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxiYXJzQ29udHJv bGxlck1hYzo6bWF5QmVnaW5TY3JvbGxHZXN0dXJlIGNvbnN0KTogRGVsZXRlZC4KKwogMjAyMS0w OS0xNSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBD bGVhbiB1cCB0aGUgU2Nyb2xsQW5pbWF0b3IgaW50ZXJmYWNlIGEgbGl0dGxlCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxBbmltYXRvci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9TY3JvbGxBbmltYXRvci5jcHAKaW5kZXggZWY4OTRmNjM1OWVjMWJmNWUy N2QwMjJhMzk1ODdiM2JjZjM5YTAwNi4uYzBkMmI4ZTQ4YTZhNTAzNDU2YzIxMjAzZDYyYjA3NzQ1 YzZjYjliYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsQW5pbWF0 b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbEFuaW1hdG9yLmNwcApA QCAtMzgsNiArMzgsNyBAQAogI2luY2x1ZGUgIlBsYXRmb3JtV2hlZWxFdmVudC5oIgogI2luY2x1 ZGUgIlNjcm9sbEFuaW1hdGlvblNtb290aC5oIgogI2luY2x1ZGUgIlNjcm9sbGFibGVBcmVhLmgi CisjaW5jbHVkZSAiU2Nyb2xsYmFyc0NvbnRyb2xsZXIuaCIKICNpbmNsdWRlICJTY3JvbGxpbmdF ZmZlY3RzQ29udHJvbGxlci5oIgogI2luY2x1ZGUgPGFsZ29yaXRobT4KIApAQCAtMzQxLDkgKzM0 Miw4IEBAIHZvaWQgU2Nyb2xsQW5pbWF0b3I6OnJlbW92ZVdoZWVsRXZlbnRUZXN0Q29tcGxldGlv bkRlZmVycmFsRm9yUmVhc29uKFdoZWVsRXZlbnRUCiAKIHZvaWQgU2Nyb2xsQW5pbWF0b3I6OmNh bmNlbEFuaW1hdGlvbnMoKQogewotI2lmICFVU0UoUkVRVUVTVF9BTklNQVRJT05fRlJBTUVfVElN RVIpCiAgICAgbV9zY3JvbGxBbmltYXRpb24tPnN0b3AoKTsKLSNlbmRpZgorICAgIG1fc2Nyb2xs YWJsZUFyZWEuc2Nyb2xsYmFyc0NvbnRyb2xsZXIoKS5jYW5jZWxBbmltYXRpb25zKCk7CiB9CiAK IHZvaWQgU2Nyb2xsQW5pbWF0b3I6OmNvbnRlbnRzU2l6ZUNoYW5nZWQoKSBjb25zdApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsQW5pbWF0b3IuaCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL1Njcm9sbEFuaW1hdG9yLmgKaW5kZXggNWE2NGIyZDg1MzE2MDZlNzA4 MDczYWMxMGJjYmZhYWI3ZjQ5MDc4My4uMmJmNWVlMzIwYTFlYmVhN2VhYjM2MjgzNDUyMTJiZTc4 YWU3YjFmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsQW5pbWF0 b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxBbmltYXRvci5oCkBAIC0x MDYsOSArMTA2LDYgQEAgcHVibGljOgogICAgIHZvaWQgc2V0Q3VycmVudFBvc2l0aW9uKGNvbnN0 IEZsb2F0UG9pbnQmKTsKICAgICBjb25zdCBGbG9hdFBvaW50JiBjdXJyZW50UG9zaXRpb24oKSBj b25zdCB7IHJldHVybiBtX2N1cnJlbnRQb3NpdGlvbjsgfQogCi0gICAgYm9vbCBoYXZlU2Nyb2xs ZWRTaW5jZVBhZ2VMb2FkKCkgY29uc3QgeyByZXR1cm4gbV9oYXZlU2Nyb2xsZWRTaW5jZVBhZ2VM b2FkOyB9Ci0gICAgdm9pZCBzZXRIYXZlU2Nyb2xsZWRTaW5jZVBhZ2VMb2FkKGJvb2wgaGF2ZVNj cm9sbGVkKSB7IG1faGF2ZVNjcm9sbGVkU2luY2VQYWdlTG9hZCA9IGhhdmVTY3JvbGxlZDsgfQot CiAgICAgS2V5Ym9hcmRTY3JvbGxpbmdBbmltYXRvciAqa2V5Ym9hcmRTY3JvbGxpbmdBbmltYXRv cigpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIG1fa2V5Ym9hcmRTY3JvbGxpbmdBbmltYXRvci5n ZXQoKTsgfQogCiAgICAgdm9pZCBzZXRXaGVlbEV2ZW50VGVzdE1vbml0b3IoUmVmUHRyPFdoZWVs RXZlbnRUZXN0TW9uaXRvcj4mJiB0ZXN0TW9uaXRvcikgeyBtX3doZWVsRXZlbnRUZXN0TW9uaXRv ciA9IHRlc3RNb25pdG9yOyB9CkBAIC0xNTUsNyArMTUyLDYgQEAgcHJvdGVjdGVkOgogICAgIFNj cm9sbGluZ0VmZmVjdHNDb250cm9sbGVyIG1fc2Nyb2xsQ29udHJvbGxlcjsKICAgICBUaW1lciBt X3Njcm9sbENvbnRyb2xsZXJBbmltYXRpb25UaW1lcjsKICAgICBGbG9hdFBvaW50IG1fY3VycmVu dFBvc2l0aW9uOwotICAgIGJvb2wgbV9oYXZlU2Nyb2xsZWRTaW5jZVBhZ2VMb2FkIHsgZmFsc2Ug fTsKIAogICAgIHN0ZDo6dW5pcXVlX3B0cjxTY3JvbGxBbmltYXRpb25TbW9vdGg+IG1fc2Nyb2xs QW5pbWF0aW9uOwogICAgIHN0ZDo6dW5pcXVlX3B0cjxLZXlib2FyZFNjcm9sbGluZ0FuaW1hdG9y PiBtX2tleWJvYXJkU2Nyb2xsaW5nQW5pbWF0b3I7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9TY3JvbGxiYXJzQ29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9TY3JvbGxiYXJzQ29udHJvbGxlci5jcHAKaW5kZXggYTk5Y2ZiMjE0MWZiOWZlZTNmYWQ5 ODAzOGIzODI1ZTEyYjJhYWFkZC4uYmFmNTA2NzMwMzRkOTIzMjkxMzE2Mzc4Zjk0NjIxYTc0OGVi NzhkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYmFyc0NvbnRy b2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGJhcnNDb250cm9s bGVyLmNwcApAQCAtNDIsNCArNDIsMjkgQEAgU2Nyb2xsYmFyc0NvbnRyb2xsZXI6OlNjcm9sbGJh cnNDb250cm9sbGVyKFNjcm9sbGFibGVBcmVhJiBzY3JvbGxhYmxlQXJlYSkKIHsKIH0KIAorYm9v bCBTY3JvbGxiYXJzQ29udHJvbGxlcjo6c2hvdWxkU3VzcGVuZFNjcm9sbGJhckFuaW1hdGlvbnMo KSBjb25zdAoreworICAgIHJldHVybiBzY3JvbGxhYmxlQXJlYSgpLnNob3VsZFN1c3BlbmRTY3Jv bGxBbmltYXRpb25zKCk7Cit9CisKK3ZvaWQgU2Nyb2xsYmFyc0NvbnRyb2xsZXI6OmNhbmNlbEFu aW1hdGlvbnMoKQoreworICAgIHNldFNjcm9sbGJhckFuaW1hdGlvbnNVbnN1c3BlbmRlZEJ5VXNl ckludGVyYWN0aW9uKGZhbHNlKTsKK30KKwordm9pZCBTY3JvbGxiYXJzQ29udHJvbGxlcjo6ZGlk QmVnaW5TY3JvbGxHZXN0dXJlKCkKK3sKKyAgICBzZXRTY3JvbGxiYXJBbmltYXRpb25zVW5zdXNw ZW5kZWRCeVVzZXJJbnRlcmFjdGlvbih0cnVlKTsKK30KKwordm9pZCBTY3JvbGxiYXJzQ29udHJv bGxlcjo6ZGlkRW5kU2Nyb2xsR2VzdHVyZSgpCit7CisgICAgc2V0U2Nyb2xsYmFyQW5pbWF0aW9u c1Vuc3VzcGVuZGVkQnlVc2VySW50ZXJhY3Rpb24odHJ1ZSk7Cit9CisKK3ZvaWQgU2Nyb2xsYmFy c0NvbnRyb2xsZXI6Om1heUJlZ2luU2Nyb2xsR2VzdHVyZSgpCit7CisgICAgc2V0U2Nyb2xsYmFy QW5pbWF0aW9uc1Vuc3VzcGVuZGVkQnlVc2VySW50ZXJhY3Rpb24odHJ1ZSk7Cit9CisKIH0gLy8g bmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Nj cm9sbGJhcnNDb250cm9sbGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxiYXJz Q29udHJvbGxlci5oCmluZGV4IDA2NThmZTEzZDMzNDc1NDQwNTIyMjhmNDVlYzM1YWYwNTc5MjM3 ZjIuLjc4MDIwNzBlOWRkZDA5MjY3Nzk0ZTEwZTA4MWU2OTVlNDY0OWUwMTAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGJhcnNDb250cm9sbGVyLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYmFyc0NvbnRyb2xsZXIuaApAQCAtNDYsMTMgKzQ2 LDE4IEBAIHB1YmxpYzoKICAgICAKICAgICBTY3JvbGxhYmxlQXJlYSYgc2Nyb2xsYWJsZUFyZWEo KSBjb25zdCB7IHJldHVybiBtX3Njcm9sbGFibGVBcmVhOyB9CiAKKyAgICBib29sIHNjcm9sbGJh ckFuaW1hdGlvbnNVbnN1c3BlbmRlZEJ5VXNlckludGVyYWN0aW9uKCkgY29uc3QgeyByZXR1cm4g bV9zY3JvbGxiYXJBbmltYXRpb25zVW5zdXNwZW5kZWRCeVVzZXJJbnRlcmFjdGlvbjsgfQorICAg IHZvaWQgc2V0U2Nyb2xsYmFyQW5pbWF0aW9uc1Vuc3VzcGVuZGVkQnlVc2VySW50ZXJhY3Rpb24o Ym9vbCB1bnN1c3BlbmRlZCkgeyBtX3Njcm9sbGJhckFuaW1hdGlvbnNVbnN1c3BlbmRlZEJ5VXNl ckludGVyYWN0aW9uID0gdW5zdXNwZW5kZWQ7IH0KKyAgICAKKyAgICBib29sIHNob3VsZFN1c3Bl bmRTY3JvbGxiYXJBbmltYXRpb25zKCkgY29uc3Q7CisKICAgICB2aXJ0dWFsIHZvaWQgbm90aWZ5 Q29udGVudEFyZWFTY3JvbGxlZChjb25zdCBGbG9hdFNpemUmKSB7IH0KIAotICAgIHZpcnR1YWwg dm9pZCBjYW5jZWxBbmltYXRpb25zKCkgeyB9CisgICAgdmlydHVhbCB2b2lkIGNhbmNlbEFuaW1h dGlvbnMoKTsKIAotICAgIHZpcnR1YWwgdm9pZCBkaWRCZWdpblNjcm9sbEdlc3R1cmUoKSBjb25z dCB7IH0KLSAgICB2aXJ0dWFsIHZvaWQgZGlkRW5kU2Nyb2xsR2VzdHVyZSgpIGNvbnN0IHsgfQot ICAgIHZpcnR1YWwgdm9pZCBtYXlCZWdpblNjcm9sbEdlc3R1cmUoKSBjb25zdCB7IH0KKyAgICB2 aXJ0dWFsIHZvaWQgZGlkQmVnaW5TY3JvbGxHZXN0dXJlKCk7CisgICAgdmlydHVhbCB2b2lkIGRp ZEVuZFNjcm9sbEdlc3R1cmUoKTsKKyAgICB2aXJ0dWFsIHZvaWQgbWF5QmVnaW5TY3JvbGxHZXN0 dXJlKCk7CiAKICAgICB2aXJ0dWFsIHZvaWQgY29udGVudEFyZWFXaWxsUGFpbnQoKSBjb25zdCB7 IH0KICAgICB2aXJ0dWFsIHZvaWQgbW91c2VFbnRlcmVkQ29udGVudEFyZWEoKSB7IH0KQEAgLTg3 LDYgKzkyLDcgQEAgcHVibGljOgogCiBwcml2YXRlOgogICAgIFNjcm9sbGFibGVBcmVhJiBtX3Nj cm9sbGFibGVBcmVhOworICAgIGJvb2wgbV9zY3JvbGxiYXJBbmltYXRpb25zVW5zdXNwZW5kZWRC eVVzZXJJbnRlcmFjdGlvbiB7IHRydWUgfTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxBbmltYXRvck1h Yy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLmgKaW5k ZXggYjM4Y2UyYWI0NDVlZDUxMTMyMTFjNWI4NWM0NDExMzkzZjhiMTcyNC4uYTk3YzlhYzNlYzJl NjNmMmY0ZTI5NWIwNzY4YTM5NGJjMzk5MDllMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLmgKQEAgLTU3LDggKzU3LDYgQEAgcHJpdmF0ZToK ICNlbmRpZgogCiAgICAgdm9pZCBoYW5kbGVXaGVlbEV2ZW50UGhhc2UoUGxhdGZvcm1XaGVlbEV2 ZW50UGhhc2UpIGZpbmFsOwotCi0gICAgdm9pZCBjYW5jZWxBbmltYXRpb25zKCkgZmluYWw7CiAg ICAgCiAgICAgdm9pZCBub3RpZnlQb3NpdGlvbkNoYW5nZWQoY29uc3QgRmxvYXRTaXplJiBkZWx0 YSkgZmluYWw7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3Jv bGxBbmltYXRvck1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxBbmlt YXRvck1hYy5tbQppbmRleCBjNDc0OTBmYjdkZjY4NmI0MTUzODk0NTdhNDU3YWNlYmM1YTZkMjlh Li5jMGFmYzQ4ZjFlOTc0NTg5NTk2ZmQwZmRmYjg0NmFmMmRkZTQ4NDkxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0b3JNYWMubW0KKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLm1tCkBAIC0xOTQsNyAr MTk0LDcgQEAgc3RhdGljIGJvb2wgcnViYmVyQmFuZGluZ0VuYWJsZWRGb3JTeXN0ZW0oKQogCiBi b29sIFNjcm9sbEFuaW1hdG9yTWFjOjpzY3JvbGwoU2Nyb2xsYmFyT3JpZW50YXRpb24gb3JpZW50 YXRpb24sIFNjcm9sbEdyYW51bGFyaXR5IGdyYW51bGFyaXR5LCBmbG9hdCBzdGVwLCBmbG9hdCBt dWx0aXBsaWVyLCBPcHRpb25TZXQ8U2Nyb2xsQmVoYXZpb3I+IGJlaGF2aW9yKQogewotICAgIHNl dEhhdmVTY3JvbGxlZFNpbmNlUGFnZUxvYWQodHJ1ZSk7CisgICAgbV9zY3JvbGxhYmxlQXJlYS5z Y3JvbGxiYXJzQ29udHJvbGxlcigpLnNldFNjcm9sbGJhckFuaW1hdGlvbnNVbnN1c3BlbmRlZEJ5 VXNlckludGVyYWN0aW9uKHRydWUpOwogCiAgICAgLy8gVGhpcyBtZXRob2QgZG9lc24ndCBkbyBk aXJlY3Rpb25hbCBzbmFwcGluZywgYnV0IG91ciBiYXNlIGNsYXNzIGRvZXMuIEl0IHdpbGwgY2Fs bCBpbnRvCiAgICAgLy8gU2Nyb2xsQW5pbWF0b3JNYWM6OnNjcm9sbCBhZ2FpbiB3aXRoIHRoZSBz bmFwcGVkIHBvc2l0aW9ucyBhbmQgU2Nyb2xsQmVoYXZpb3I6OkRlZmF1bHQuCkBAIC0yOTMsMjEg KzI5MywxMCBAQCB2b2lkIFNjcm9sbEFuaW1hdG9yTWFjOjpub3RpZnlQb3NpdGlvbkNoYW5nZWQo Y29uc3QgRmxvYXRTaXplJiBkZWx0YSkKICAgICBTY3JvbGxBbmltYXRvcjo6bm90aWZ5UG9zaXRp b25DaGFuZ2VkKGRlbHRhKTsKIH0KIAotdm9pZCBTY3JvbGxBbmltYXRvck1hYzo6Y2FuY2VsQW5p bWF0aW9ucygpCi17Ci0gICAgU2Nyb2xsQW5pbWF0b3I6OmNhbmNlbEFuaW1hdGlvbnMoKTsKLSAg ICBzZXRIYXZlU2Nyb2xsZWRTaW5jZVBhZ2VMb2FkKGZhbHNlKTsKLSAgICBtX3Njcm9sbGFibGVB cmVhLnNjcm9sbGJhcnNDb250cm9sbGVyKCkuY2FuY2VsQW5pbWF0aW9ucygpOwotfQotCiB2b2lk IFNjcm9sbEFuaW1hdG9yTWFjOjpoYW5kbGVXaGVlbEV2ZW50UGhhc2UoUGxhdGZvcm1XaGVlbEV2 ZW50UGhhc2UgcGhhc2UpCiB7CiAgICAgTE9HX1dJVEhfU1RSRUFNKE92ZXJsYXlTY3JvbGxiYXJz LCBzdHJlYW0gPDwgIlNjcm9sbEFuaW1hdG9yTWFjICIgPDwgdGhpcyA8PCAiIHNjcm9sbGFibGVB cmVhICIgPDwgbV9zY3JvbGxhYmxlQXJlYSA8PCAiIGhhbmRsZVdoZWVsRXZlbnRQaGFzZSAiIDw8 IHBoYXNlKTsKIAotICAgIC8vIFRoaXMgbWF5IG5vdCBoYXZlIGJlZW4gc2V0IHRvIHRydWUgeWV0 IGlmIHRoZSB3aGVlbCBldmVudCB3YXMgaGFuZGxlZCBieSB0aGUgU2Nyb2xsaW5nVHJlZSwKLSAg ICAvLyBTbyBzZXQgaXQgdG8gdHJ1ZSBoZXJlLgotICAgIHNldEhhdmVTY3JvbGxlZFNpbmNlUGFn ZUxvYWQodHJ1ZSk7Ci0KICAgICAvLyBGSVhNRTogTmVlZCB0byBlbnN1cmUgd2UgZ2V0IFBsYXRm b3JtV2hlZWxFdmVudFBoYXNlOjpFbmRlZC4KICAgICBpZiAocGhhc2UgPT0gUGxhdGZvcm1XaGVl bEV2ZW50UGhhc2U6OkJlZ2FuKQogICAgICAgICBtX3Njcm9sbGFibGVBcmVhLnNjcm9sbGJhcnND b250cm9sbGVyKCkuZGlkQmVnaW5TY3JvbGxHZXN0dXJlKCk7CkBAIC0zMjksNyArMzE4LDcgQEAg Ym9vbCBTY3JvbGxBbmltYXRvck1hYzo6c2hvdWxkRm9yd2FyZFdoZWVsRXZlbnRzVG9QYXJlbnQo Y29uc3QgUGxhdGZvcm1XaGVlbEV2ZW4KICAgICAKIGJvb2wgU2Nyb2xsQW5pbWF0b3JNYWM6Omhh bmRsZVdoZWVsRXZlbnQoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiB3aGVlbEV2ZW50KQogewot ICAgIHNldEhhdmVTY3JvbGxlZFNpbmNlUGFnZUxvYWQodHJ1ZSk7CisgICAgbV9zY3JvbGxhYmxl QXJlYS5zY3JvbGxiYXJzQ29udHJvbGxlcigpLnNldFNjcm9sbGJhckFuaW1hdGlvbnNVbnN1c3Bl bmRlZEJ5VXNlckludGVyYWN0aW9uKHRydWUpOwogCiAgICAgaWYgKCF3aGVlbEV2ZW50Lmhhc1By ZWNpc2VTY3JvbGxpbmdEZWx0YXMoKSB8fCAhcnViYmVyQmFuZGluZ0VuYWJsZWRGb3JTeXN0ZW0o KSkKICAgICAgICAgcmV0dXJuIFNjcm9sbEFuaW1hdG9yOjpoYW5kbGVXaGVlbEV2ZW50KHdoZWVs RXZlbnQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbGJh cnNDb250cm9sbGVyTWFjLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsYmFy c0NvbnRyb2xsZXJNYWMuaAppbmRleCA0MDQzNDAwZTgzNTU3OTI0NDI3NmRiNjZiODIyYzAyZDE3 ZTViMDkwLi5jNTJlNDdkZDI2ZTdiMmUxNTljODNlMDJjYWE0MDFjYzJjMmZhYWIwIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsYmFyc0NvbnRyb2xsZXJNYWMu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsYmFyc0NvbnRyb2xsZXJN YWMuaApAQCAtNTQsOSArNTQsOSBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGNhbmNlbEFuaW1hdGlv bnMoKSBmaW5hbDsKIAotICAgIHZvaWQgZGlkQmVnaW5TY3JvbGxHZXN0dXJlKCkgY29uc3QgZmlu YWw7Ci0gICAgdm9pZCBkaWRFbmRTY3JvbGxHZXN0dXJlKCkgY29uc3QgZmluYWw7Ci0gICAgdm9p ZCBtYXlCZWdpblNjcm9sbEdlc3R1cmUoKSBjb25zdCBmaW5hbDsKKyAgICB2b2lkIGRpZEJlZ2lu U2Nyb2xsR2VzdHVyZSgpIGZpbmFsOworICAgIHZvaWQgZGlkRW5kU2Nyb2xsR2VzdHVyZSgpIGZp bmFsOworICAgIHZvaWQgbWF5QmVnaW5TY3JvbGxHZXN0dXJlKCkgZmluYWw7CiAKICAgICB2b2lk IGNvbnRlbnRBcmVhV2lsbFBhaW50KCkgY29uc3QgZmluYWw7CiAgICAgdm9pZCBtb3VzZUVudGVy ZWRDb250ZW50QXJlYSgpIGZpbmFsOwpAQCAtOTYsNyArOTYsNiBAQCBwdWJsaWM6CiAgICAgdm9p ZCBzdGFydFNjcm9sbGJhclBhaW50VGltZXIoKTsKICAgICB2b2lkIHN0b3BTY3JvbGxiYXJQYWlu dFRpbWVyKCk7CiAgICAgdm9pZCBzZXRWaXNpYmxlU2Nyb2xsZXJUaHVtYlJlY3QoY29uc3QgSW50 UmVjdCYpOwotICAgIGJvb2wgaGF2ZVNjcm9sbGVkU2luY2VQYWdlTG9hZCgpIGNvbnN0OwogCiBw cml2YXRlOgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xs YmFyc0NvbnRyb2xsZXJNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xs YmFyc0NvbnRyb2xsZXJNYWMubW0KaW5kZXggY2Y5ZWRiNGYzMTJhMDg3ODg4NjU2YmY2NjgwN2Jl YWM3MzkwOTczMy4uNjUxMDQzYTM1OThlM2Y4YTE0YTEyNDI2MGQzZjdjYzQ2NWMyNWUyYyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbGJhcnNDb250cm9sbGVy TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxiYXJzQ29udHJv bGxlck1hYy5tbQpAQCAtMjY1LDcgKzI2NSw3IEBAIC0gKHZvaWQpc2V0Q3VycmVudFByb2dyZXNz OihOU1RpbWVyICopdGltZXIKICAgICB9CiAgICAgQVNTRVJUKF9zY3JvbGxiYXIpOwogCi0gICAg TE9HX1dJVEhfU1RSRUFNKE92ZXJsYXlTY3JvbGxiYXJzLCBzdHJlYW0gPDwgIi1bV2ViU2Nyb2xs YmFyUGFydEFuaW1hdGlvbiAiIDw8IHNlbGYgPDwgInNldEN1cnJlbnRQcm9ncmVzczoiIDw8IHBy b2dyZXNzIDw8Il0gZm9yICIgPDwgX2ZlYXR1cmVUb0FuaW1hdGUpOworICAgIExPR19XSVRIX1NU UkVBTShPdmVybGF5U2Nyb2xsYmFycywgc3RyZWFtIDw8ICItWyIgPDwgc2VsZiA8PCAiIHNldEN1 cnJlbnRQcm9ncmVzczogIiA8PCBwcm9ncmVzcyA8PCAiXSBmb3IgIiA8PCBfZmVhdHVyZVRvQW5p bWF0ZSk7CiAKICAgICBDR0Zsb2F0IGN1cnJlbnRWYWx1ZTsKICAgICBpZiAoX3N0YXJ0VmFsdWUg PiBfZW5kVmFsdWUpCkBAIC00MzEsMTIgKzQzMSwxNCBAQCAtICh2b2lkKXNldFVwQWxwaGFBbmlt YXRpb246KFJldGFpblB0cjxXZWJTY3JvbGxiYXJQYXJ0QW5pbWF0aW9uPiYpc2Nyb2xsYmFyUGFy dAogewogICAgIC8vIElmIHRoZSB1c2VyIGhhcyBzY3JvbGxlZCB0aGUgcGFnZSwgdGhlbiB0aGUg c2Nyb2xsYmFycyBtdXN0IGJlIGFuaW1hdGVkIGhlcmUuCiAgICAgLy8gVGhpcyBvdmVycmlkZXMg dGhlIGVhcmx5IHJldHVybnMuCi0gICAgYm9vbCBtdXN0QW5pbWF0ZSA9IFtzZWxmIHNjcm9sbGJh cnNDb250cm9sbGVyXS0+aGF2ZVNjcm9sbGVkU2luY2VQYWdlTG9hZCgpOworICAgIGJvb2wgbXVz dEFuaW1hdGUgPSAhW3NlbGYgc2Nyb2xsYmFyc0NvbnRyb2xsZXJdLT5zY3JvbGxiYXJBbmltYXRp b25zVW5zdXNwZW5kZWRCeVVzZXJJbnRlcmFjdGlvbigpOworCisgICAgTE9HX1dJVEhfU1RSRUFN KE92ZXJsYXlTY3JvbGxiYXJzLCBzdHJlYW0gPDwgIldlYlNjcm9sbGVySW1wRGVsZWdhdGUgZm9y IFsiIDw8IF9zY3JvbGxiYXItPnNjcm9sbGFibGVBcmVhKCkgPDwgIl0gc2V0VXBBbHBoYUFuaW1h dGlvbjogc2Nyb2xsYmFyQW5pbWF0aW9uc1Vuc3VzcGVuZGVkQnlVc2VySW50ZXJhY3Rpb24gIiA8 PCBbc2VsZiBzY3JvbGxiYXJzQ29udHJvbGxlcl0tPnNjcm9sbGJhckFuaW1hdGlvbnNVbnN1c3Bl bmRlZEJ5VXNlckludGVyYWN0aW9uKCkgPDwgIiBzaG91bGRTdXNwZW5kU2Nyb2xsQW5pbWF0aW9u cyAiIDw8IF9zY3JvbGxiYXItPnNjcm9sbGFibGVBcmVhKCkuc2hvdWxkU3VzcGVuZFNjcm9sbEFu aW1hdGlvbnMoKSk7CiAKICAgICBpZiAoW3NlbGYgc2Nyb2xsYmFyc0NvbnRyb2xsZXJdLT5zY3Jv bGxiYXJQYWludFRpbWVySXNBY3RpdmUoKSAmJiAhbXVzdEFuaW1hdGUpCiAgICAgICAgIHJldHVy bjsKIAotICAgIGlmIChfc2Nyb2xsYmFyLT5zY3JvbGxhYmxlQXJlYSgpLnNob3VsZFN1c3BlbmRT Y3JvbGxBbmltYXRpb25zKCkgJiYgIW11c3RBbmltYXRlKSB7CisgICAgaWYgKFtzZWxmIHNjcm9s bGJhcnNDb250cm9sbGVyXS0+c2hvdWxkU3VzcGVuZFNjcm9sbGJhckFuaW1hdGlvbnMoKSAmJiAh bXVzdEFuaW1hdGUpIHsKICAgICAgICAgW3NlbGYgc2Nyb2xsYmFyc0NvbnRyb2xsZXJdLT5zdGFy dFNjcm9sbGJhclBhaW50VGltZXIoKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTYwNiwx MCArNjA4LDEzIEBAIFNjcm9sbGJhcnNDb250cm9sbGVyTWFjOjp+U2Nyb2xsYmFyc0NvbnRyb2xs ZXJNYWMoKQogCiB2b2lkIFNjcm9sbGJhcnNDb250cm9sbGVyTWFjOjpjYW5jZWxBbmltYXRpb25z KCkKIHsKKyAgICBMT0dfV0lUSF9TVFJFQU0oT3ZlcmxheVNjcm9sbGJhcnMsIHN0cmVhbSA8PCAi U2Nyb2xsYmFyc0NvbnRyb2xsZXJNYWMgZm9yIFsiIDw8IHNjcm9sbGFibGVBcmVhKCkgPDwgIl0g Y2FuY2VsQW5pbWF0aW9ucyIpOwogICAgIGlmIChzY3JvbGxiYXJQYWludFRpbWVySXNBY3RpdmUo KSkKICAgICAgICAgc3RvcFNjcm9sbGJhclBhaW50VGltZXIoKTsKICAgICBbbV9ob3Jpem9udGFs U2Nyb2xsZXJJbXBEZWxlZ2F0ZSBjYW5jZWxBbmltYXRpb25zXTsKICAgICBbbV92ZXJ0aWNhbFNj cm9sbGVySW1wRGVsZWdhdGUgY2FuY2VsQW5pbWF0aW9uc107CisKKyAgICBTY3JvbGxiYXJzQ29u dHJvbGxlcjo6Y2FuY2VsQW5pbWF0aW9ucygpOwogfQogCiB2b2lkIFNjcm9sbGJhcnNDb250cm9s bGVyTWFjOjpzZXRWaXNpYmxlU2Nyb2xsZXJUaHVtYlJlY3QoY29uc3QgSW50UmVjdCYgc2Nyb2xs ZXJUaHVtYikKQEAgLTYyNiwxMSArNjMxLDYgQEAgdm9pZCBTY3JvbGxiYXJzQ29udHJvbGxlck1h Yzo6c2V0VmlzaWJsZVNjcm9sbGVyVGh1bWJSZWN0KGNvbnN0IEludFJlY3QmIHNjcm9sbGUKIH0K IAogCi1ib29sIFNjcm9sbGJhcnNDb250cm9sbGVyTWFjOjpoYXZlU2Nyb2xsZWRTaW5jZVBhZ2VM b2FkKCkgY29uc3QKLXsKLSAgICByZXR1cm4gc2Nyb2xsYWJsZUFyZWEoKS5zY3JvbGxBbmltYXRv cigpLmhhdmVTY3JvbGxlZFNpbmNlUGFnZUxvYWQoKTsKLX0KLQogdm9pZCBTY3JvbGxiYXJzQ29u dHJvbGxlck1hYzo6Y29udGVudEFyZWFXaWxsUGFpbnQoKSBjb25zdAogewogICAgIGlmIChbbV9z Y3JvbGxlckltcFBhaXIgb3ZlcmxheVNjcm9sbGVyU3RhdGVJc0xvY2tlZF0pCkBAIC03NTAsNyAr NzUwLDcgQEAgdm9pZCBTY3JvbGxiYXJzQ29udHJvbGxlck1hYzo6Y29udGVudEFyZWFEaWRIaWRl KCkKICAgICBbbV9zY3JvbGxlckltcFBhaXIgd2luZG93T3JkZXJlZE91dF07CiB9CiAKLXZvaWQg U2Nyb2xsYmFyc0NvbnRyb2xsZXJNYWM6OmRpZEJlZ2luU2Nyb2xsR2VzdHVyZSgpIGNvbnN0Cit2 b2lkIFNjcm9sbGJhcnNDb250cm9sbGVyTWFjOjpkaWRCZWdpblNjcm9sbEdlc3R1cmUoKQogewog ICAgIExPR19XSVRIX1NUUkVBTShPdmVybGF5U2Nyb2xsYmFycywgc3RyZWFtIDw8ICJTY3JvbGxi YXJzQ29udHJvbGxlck1hYyBmb3IgWyIgPDwgc2Nyb2xsYWJsZUFyZWEoKSA8PCAiXSBkaWRCZWdp blNjcm9sbEdlc3R1cmUiKTsKIApAQCAtNzYxLDkgKzc2MSwxMSBAQCB2b2lkIFNjcm9sbGJhcnND b250cm9sbGVyTWFjOjpkaWRCZWdpblNjcm9sbEdlc3R1cmUoKSBjb25zdAogCiAgICAgaWYgKGF1 dG8qIG1vbml0b3IgPSB3aGVlbEV2ZW50VGVzdE1vbml0b3IoKSkKICAgICAgICAgbW9uaXRvci0+ ZGVmZXJGb3JSZWFzb24ocmVpbnRlcnByZXRfY2FzdDxXaGVlbEV2ZW50VGVzdE1vbml0b3I6OlNj cm9sbGFibGVBcmVhSWRlbnRpZmllcj4odGhpcyksIFdoZWVsRXZlbnRUZXN0TW9uaXRvcjo6Q29u dGVudFNjcm9sbEluUHJvZ3Jlc3MpOworCisgICAgU2Nyb2xsYmFyc0NvbnRyb2xsZXI6OmRpZEJl Z2luU2Nyb2xsR2VzdHVyZSgpOwogfQogCi12b2lkIFNjcm9sbGJhcnNDb250cm9sbGVyTWFjOjpk aWRFbmRTY3JvbGxHZXN0dXJlKCkgY29uc3QKK3ZvaWQgU2Nyb2xsYmFyc0NvbnRyb2xsZXJNYWM6 OmRpZEVuZFNjcm9sbEdlc3R1cmUoKQogewogICAgIExPR19XSVRIX1NUUkVBTShPdmVybGF5U2Ny b2xsYmFycywgc3RyZWFtIDw8ICJTY3JvbGxiYXJzQ29udHJvbGxlck1hYyBmb3IgWyIgPDwgc2Ny b2xsYWJsZUFyZWEoKSA8PCAiXSBkaWRFbmRTY3JvbGxHZXN0dXJlIik7CiAKQEAgLTc3NCw5ICs3 NzYsMTEgQEAgdm9pZCBTY3JvbGxiYXJzQ29udHJvbGxlck1hYzo6ZGlkRW5kU2Nyb2xsR2VzdHVy ZSgpIGNvbnN0CiAKICAgICBpZiAoYXV0byogbW9uaXRvciA9IHdoZWVsRXZlbnRUZXN0TW9uaXRv cigpKQogICAgICAgICBtb25pdG9yLT5yZW1vdmVEZWZlcnJhbEZvclJlYXNvbihyZWludGVycHJl dF9jYXN0PFdoZWVsRXZlbnRUZXN0TW9uaXRvcjo6U2Nyb2xsYWJsZUFyZWFJZGVudGlmaWVyPih0 aGlzKSwgV2hlZWxFdmVudFRlc3RNb25pdG9yOjpDb250ZW50U2Nyb2xsSW5Qcm9ncmVzcyk7CisK KyAgICBTY3JvbGxiYXJzQ29udHJvbGxlcjo6ZGlkRW5kU2Nyb2xsR2VzdHVyZSgpOwogfQogCi12 b2lkIFNjcm9sbGJhcnNDb250cm9sbGVyTWFjOjptYXlCZWdpblNjcm9sbEdlc3R1cmUoKSBjb25z dAordm9pZCBTY3JvbGxiYXJzQ29udHJvbGxlck1hYzo6bWF5QmVnaW5TY3JvbGxHZXN0dXJlKCkK IHsKICAgICBMT0dfV0lUSF9TVFJFQU0oT3ZlcmxheVNjcm9sbGJhcnMsIHN0cmVhbSA8PCAiU2Ny b2xsYmFyc0NvbnRyb2xsZXJNYWMgZm9yIFsiIDw8IHNjcm9sbGFibGVBcmVhKCkgPDwgIl0gbWF5 QmVnaW5TY3JvbGxHZXN0dXJlIik7CiAKQEAgLTc4NSw2ICs3ODksOCBAQCB2b2lkIFNjcm9sbGJh cnNDb250cm9sbGVyTWFjOjptYXlCZWdpblNjcm9sbEdlc3R1cmUoKSBjb25zdAogCiAgICAgW21f c2Nyb2xsZXJJbXBQYWlyIGJlZ2luU2Nyb2xsR2VzdHVyZV07CiAgICAgW21fc2Nyb2xsZXJJbXBQ YWlyIGNvbnRlbnRBcmVhU2Nyb2xsZWRdOworCisgICAgU2Nyb2xsYmFyc0NvbnRyb2xsZXI6Om1h eUJlZ2luU2Nyb2xsR2VzdHVyZSgpOwogfQogCiB2b2lkIFNjcm9sbGJhcnNDb250cm9sbGVyTWFj Ojpsb2NrT3ZlcmxheVNjcm9sbGJhclN0YXRlVG9IaWRkZW4oYm9vbCBzaG91bGRMb2NrU3RhdGUp CkBAIC0xMDA2LDYgKzEwMTIsOCBAQCB2b2lkIFNjcm9sbGJhcnNDb250cm9sbGVyTWFjOjpzdG9w U2Nyb2xsYmFyUGFpbnRUaW1lcigpCiAKIHZvaWQgU2Nyb2xsYmFyc0NvbnRyb2xsZXJNYWM6Omlu aXRpYWxTY3JvbGxiYXJQYWludFRpbWVyRmlyZWQoKQogeworICAgIExPR19XSVRIX1NUUkVBTShP dmVybGF5U2Nyb2xsYmFycywgc3RyZWFtIDw8ICJXZWJTY3JvbGxlckltcERlbGVnYXRlIGZvciBb IiA8PCBzY3JvbGxhYmxlQXJlYSgpIDw8ICJdIGluaXRpYWxTY3JvbGxiYXJQYWludFRpbWVyRmly ZWQgLSBmbGFzaGluZyBzY3JvbGxlcnMiKTsKKwogICAgIC8vIFRvIGZvcmNlIHRoZSBzY3JvbGxi YXJzIHRvIGZsYXNoLCB3ZSBoYXZlIHRvIGNhbGwgaGlkZSBmaXJzdC4gT3RoZXJ3aXNlLCB0aGUg U2Nyb2xsZXJJbXBQYWlyCiAgICAgLy8gbWlnaHQgdGhpbmsgdGhhdCB0aGUgc2Nyb2xsYmFycyBh cmUgYWxyZWFkeSBzaG93aW5nIGFuZCBiYWlsIGVhcmx5LgogICAgIFttX3Njcm9sbGVySW1wUGFp ciBoaWRlT3ZlcmxheVNjcm9sbGVyc107Cg==