230529 2021-09-20 21:27:57 -0700 ScrollAnimationSmooth should only have one way to start an animation 2021-09-21 07:55:40 -0700 1 1 1 Unclassified WebKit Scrolling WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser cmarcelo ews-watchlist fred.wang jamesr luiz mrobinson simon.fraser tonikitoo webkit-bug-importer oldest_to_newest 1795402 0 simon.fraser 2021-09-20 21:27:57 -0700 ScrollAnimationSmooth should only have one way to start an animation 1795403 1 438773 simon.fraser 2021-09-20 21:28:56 -0700 Created attachment 438773 Patch 1795405 2 438775 simon.fraser 2021-09-20 21:37:40 -0700 Created attachment 438775 Patch 1795494 3 438775 mrobinson 2021-09-21 02:59:49 -0700 Comment on attachment 438775 Patch This is a very nice cleanup. 1795542 4 ews-feeder 2021-09-21 07:54:08 -0700 Committed r282814 (241945@main): <https://commits.webkit.org/241945@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 438775. 1795544 5 webkit-bug-importer 2021-09-21 07:55:40 -0700 <rdar://problem/83351975> 438773 2021-09-20 21:28:56 -0700 2021-09-20 21:37:38 -0700 Patch bug-230529-20210920212855.patch text/plain 5887 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyNzk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzgxZmQyYjcyYzJiNmVi MzI2MmY2ZTFiZTBhN2Y0YTk0NTFmZmI4Mi4uN2JhM2Q5ZDFmOTU0NTUwMTQyYWE0MWZkZTZkYzkx YWY0OWRmMGFkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTA5LTIwICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFNjcm9sbEFuaW1h dGlvblNtb290aCBzaG91bGQgb25seSBoYXZlIG9uZSB3YXkgdG8gc3RhcnQgYW4gYW5pbWF0aW9u CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzA1MjkK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUg dGhlIFNjcm9sbGJhck9yaWVudGF0aW9uL1Njcm9sbEdyYW51bGFyaXR5L3N0ZXAvbXVsdGlwbGll ciBlbnRyeSBwb2ludCBvbgorICAgICAgICBTY3JvbGxBbmltYXRpb25TbW9vdGg7IHRoZSBjYWxs ZXIgY2FuIGRvIHRoZSBtYXRoIHRvIGNvbXB1dGUgdGhlIGVuZCBwb2ludC4KKworICAgICAgICAq IHBhZ2Uvc2Nyb2xsaW5nL25pY29zaWEvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGVEZWxlZ2F0 ZU5pY29zaWEuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05v ZGVEZWxlZ2F0ZU5pY29zaWE6OmhhbmRsZVdoZWVsRXZlbnQpOgorICAgICAgICAqIHBsYXRmb3Jt L1Njcm9sbEFuaW1hdGlvblNtb290aC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxBbmlt YXRpb25TbW9vdGg6OnN0YXJ0QW5pbWF0ZWRTY3JvbGwpOiBEZWxldGVkLgorICAgICAgICAqIHBs YXRmb3JtL1Njcm9sbEFuaW1hdGlvblNtb290aC5oOgorICAgICAgICAqIHBsYXRmb3JtL1Njcm9s bEFuaW1hdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbEFuaW1hdG9yOjpzY3JvbGwp OgorCiAyMDIxLTA5LTIwICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgog CiAgICAgICAgIFdyYXAgU2Nyb2xsaW5nTW9tZW50dW1DYWxjdWxhdG9yIGluIGEgU2Nyb2xsQW5p bWF0aW9uTW9tZW50dW0gd2hlbiB1c2VkIGZvciBzY3JvbGwgc25hcApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbmljb3NpYS9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5n Tm9kZURlbGVnYXRlTmljb3NpYS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9u aWNvc2lhL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlRGVsZWdhdGVOaWNvc2lhLmNwcAppbmRl eCBmZjJjNjgwN2NjM2FmNGExOTVkYzNkY2FiNzNiNjQ3ZmQ2NzRjMmQ5Li42YzI0OThiYzcxNWE5 OGM3ZjI1YjFjNzlmZWM0MDNmMzQwNTg5OTRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL3Njcm9sbGluZy9uaWNvc2lhL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlRGVsZWdhdGVO aWNvc2lhLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9uaWNvc2lhL1Nj cm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlRGVsZWdhdGVOaWNvc2lhLmNwcApAQCAtMTYyLDggKzE2 Miw4IEBAIFdoZWVsRXZlbnRIYW5kbGluZ1Jlc3VsdCBTY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9k ZURlbGVnYXRlTmljb3NpYTo6aGFuZGxlV2hlZWxFCiAjaWYgRU5BQkxFKFNNT09USF9TQ1JPTExJ TkcpCiAgICAgaWYgKG1fc2Nyb2xsQW5pbWF0b3JFbmFibGVkICYmICF3aGVlbEV2ZW50Lmhhc1By ZWNpc2VTY3JvbGxpbmdEZWx0YXMoKSkgewogICAgICAgICBlbnN1cmVTY3JvbGxBbmltYXRpb25T bW9vdGgoKTsKLSAgICAgICAgbV9zbW9vdGhBbmltYXRpb24tPnN0YXJ0QW5pbWF0ZWRTY3JvbGwo SG9yaXpvbnRhbFNjcm9sbGJhciwgU2Nyb2xsQnlQaXhlbCwgY3VycmVudFNjcm9sbFBvc2l0aW9u KCksIDEsIGRlbHRhWCk7Ci0gICAgICAgIG1fc21vb3RoQW5pbWF0aW9uLT5zdGFydEFuaW1hdGVk U2Nyb2xsKFZlcnRpY2FsU2Nyb2xsYmFyLCBTY3JvbGxCeVBpeGVsLCBjdXJyZW50U2Nyb2xsUG9z aXRpb24oKSwgMSwgZGVsdGFZKTsKKyAgICAgICAgYXV0byBkZXN0aW5hdGlvbk9mZnNldCA9IGN1 cnJlbnRTY3JvbGxPZmZzZXQoKSArIEZsb2F0U2l6ZSB7IGRlbHRhWCwgZGVsdGFZIH07CisgICAg ICAgIG1fc21vb3RoQW5pbWF0aW9uLT5zdGFydEFuaW1hdGVkU2Nyb2xsVG9EZXN0aW5hdGlvbihj dXJyZW50U2Nyb2xsT2Zmc2V0KCksIGRlc3RpbmF0aW9uT2Zmc2V0KTsKICAgICAgICAgcmV0dXJu IFdoZWVsRXZlbnRIYW5kbGluZ1Jlc3VsdDo6aGFuZGxlZCgpOwogICAgIH0KICNlbmRpZgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsQW5pbWF0aW9uU21vb3RoLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbEFuaW1hdGlvblNtb290aC5jcHAKaW5k ZXggYTBjZDk1MmY1NzBmZmRiZjFkZGY4ODIwM2MxZmVlN2IwZDkxN2MxMC4uNzBlOTRhOWM2ZjRj ZGIyNGVmYWE4MmUxOGM2MWFhMDlkNWJjZTI3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vU2Nyb2xsQW5pbWF0aW9uU21vb3RoLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9TY3JvbGxBbmltYXRpb25TbW9vdGguY3BwCkBAIC01NiwyNSArNTYsNiBAQCBTY3Jv bGxBbmltYXRpb25TbW9vdGg6OlNjcm9sbEFuaW1hdGlvblNtb290aChTY3JvbGxBbmltYXRpb25D bGllbnQmIGNsaWVudCkKIAogU2Nyb2xsQW5pbWF0aW9uU21vb3RoOjp+U2Nyb2xsQW5pbWF0aW9u U21vb3RoKCkgPSBkZWZhdWx0OwogCi1ib29sIFNjcm9sbEFuaW1hdGlvblNtb290aDo6c3RhcnRB bmltYXRlZFNjcm9sbChTY3JvbGxiYXJPcmllbnRhdGlvbiBvcmllbnRhdGlvbiwgU2Nyb2xsR3Jh bnVsYXJpdHksIGNvbnN0IEZsb2F0UG9pbnQmIGZyb21PZmZzZXQsIGZsb2F0IHN0ZXAsIGZsb2F0 IG11bHRpcGxpZXIpCi17Ci0gICAgbV9zdGFydE9mZnNldCA9IGZyb21PZmZzZXQ7Ci0gICAgYXV0 byBkZXN0aW5hdGlvbk9mZnNldCA9IGZyb21PZmZzZXQ7Ci0gICAgc3dpdGNoIChvcmllbnRhdGlv bikgewotICAgIGNhc2UgSG9yaXpvbnRhbFNjcm9sbGJhcjoKLSAgICAgICAgZGVzdGluYXRpb25P ZmZzZXQuc2V0WChkZXN0aW5hdGlvbk9mZnNldC54KCkgKyBzdGVwICogbXVsdGlwbGllcik7Ci0g ICAgICAgIGJyZWFrOwotICAgIGNhc2UgVmVydGljYWxTY3JvbGxiYXI6Ci0gICAgICAgIGRlc3Rp bmF0aW9uT2Zmc2V0LnNldFkoZGVzdGluYXRpb25PZmZzZXQueSgpICsgc3RlcCAqIG11bHRpcGxp ZXIpOwotICAgICAgICBicmVhazsKLSAgICB9Ci0KLSAgICBtX2R1cmF0aW9uID0gZHVyYXRpb25G cm9tRGlzdGFuY2UoZGVzdGluYXRpb25PZmZzZXQgLSBtX3N0YXJ0T2Zmc2V0KTsKLQotICAgIGF1 dG8gZXh0ZW50cyA9IG1fY2xpZW50LnNjcm9sbEV4dGVudHNGb3JBbmltYXRpb24oKnRoaXMpOwot ICAgIHJldHVybiBzdGFydE9yUmV0YXJnZXRBbmltYXRpb24oZXh0ZW50cywgZGVzdGluYXRpb25P ZmZzZXQpOwotfQotCiBib29sIFNjcm9sbEFuaW1hdGlvblNtb290aDo6c3RhcnRBbmltYXRlZFNj cm9sbFRvRGVzdGluYXRpb24oY29uc3QgRmxvYXRQb2ludCYgZnJvbU9mZnNldCwgY29uc3QgRmxv YXRQb2ludCYgZGVzdGluYXRpb25PZmZzZXQpCiB7CiAgICAgbV9zdGFydE9mZnNldCA9IGZyb21P ZmZzZXQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxBbmltYXRp b25TbW9vdGguaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbEFuaW1hdGlvblNtb290 aC5oCmluZGV4IDEzMzdkZmVmYTdjZDAyZjMzNDg5OWNkNGU2YzkwMTliY2YyNjcyMjAuLjVhZmRj MTNkNzljZjg3YzM5Njc1MDYzZDcyNjMwMzE2ZDMxNDFjNTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL1Njcm9sbEFuaW1hdGlvblNtb290aC5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL1Njcm9sbEFuaW1hdGlvblNtb290aC5oCkBAIC00MCw3ICs0MCw2IEBAIHB1 YmxpYzoKICAgICBTY3JvbGxBbmltYXRpb25TbW9vdGgoU2Nyb2xsQW5pbWF0aW9uQ2xpZW50Jik7 CiAgICAgdmlydHVhbCB+U2Nyb2xsQW5pbWF0aW9uU21vb3RoKCk7CiAKLSAgICBib29sIHN0YXJ0 QW5pbWF0ZWRTY3JvbGwoU2Nyb2xsYmFyT3JpZW50YXRpb24sIFNjcm9sbEdyYW51bGFyaXR5LCBj b25zdCBGbG9hdFBvaW50JiBmcm9tT2Zmc2V0LCBmbG9hdCBzdGVwLCBmbG9hdCBtdWx0aXBsaWVy KTsKICAgICBib29sIHN0YXJ0QW5pbWF0ZWRTY3JvbGxUb0Rlc3RpbmF0aW9uKGNvbnN0IEZsb2F0 UG9pbnQmIGZyb21PZmZzZXQsIGNvbnN0IEZsb2F0UG9pbnQmIGRlc3RpbmF0aW9uT2Zmc2V0KTsK IAogICAgIGJvb2wgcmV0YXJnZXRBY3RpdmVBbmltYXRpb24oY29uc3QgRmxvYXRQb2ludCYgbmV3 T2Zmc2V0KSBmaW5hbDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9s bEFuaW1hdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbEFuaW1hdG9yLmNw cAppbmRleCAyZjBmZWJkOGQzZjBmMGJkZjJlYWRjZmYxNmI4ODVkM2M4NDIyNzM1Li4yMjA4ODYw M2I2ZDk5NGZiMmQyYTU2ZDEzMDc0NmQyYjY1MjM5YjEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9TY3JvbGxBbmltYXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vU2Nyb2xsQW5pbWF0b3IuY3BwCkBAIC04Nyw4ICs4NywxMiBAQCBib29sIFNjcm9sbEFu aW1hdG9yOjpzY3JvbGwoU2Nyb2xsYmFyT3JpZW50YXRpb24gb3JpZW50YXRpb24sIFNjcm9sbEdy YW51bGFyaXR5CiAgICAgfQogCiAjaWYgRU5BQkxFKFNNT09USF9TQ1JPTExJTkcpICYmICFQTEFU Rk9STShJT1NfRkFNSUxZKQotICAgIGlmIChtX3Njcm9sbGFibGVBcmVhLnNjcm9sbEFuaW1hdG9y RW5hYmxlZCgpICYmIHBsYXRmb3JtQWxsb3dzU2Nyb2xsQW5pbWF0aW9uKCkgJiYgIWJlaGF2aW9y LmNvbnRhaW5zKFNjcm9sbEJlaGF2aW9yOjpOZXZlckFuaW1hdGUpKQotICAgICAgICByZXR1cm4g bV9zY3JvbGxBbmltYXRpb24tPnN0YXJ0QW5pbWF0ZWRTY3JvbGwob3JpZW50YXRpb24sIGdyYW51 bGFyaXR5LCBvZmZzZXRGcm9tUG9zaXRpb24obV9jdXJyZW50UG9zaXRpb24pLCBzdGVwLCBtdWx0 aXBsaWVyKTsKKyAgICBpZiAobV9zY3JvbGxhYmxlQXJlYS5zY3JvbGxBbmltYXRvckVuYWJsZWQo KSAmJiBwbGF0Zm9ybUFsbG93c1Njcm9sbEFuaW1hdGlvbigpICYmICFiZWhhdmlvci5jb250YWlu cyhTY3JvbGxCZWhhdmlvcjo6TmV2ZXJBbmltYXRlKSkgeworICAgICAgICBhdXRvIHN0YXJ0T2Zm c2V0ID0gb2Zmc2V0RnJvbVBvc2l0aW9uKG1fY3VycmVudFBvc2l0aW9uKTsKKyAgICAgICAgYXV0 byBleHRlbnRzID0gc2Nyb2xsRXh0ZW50cygpOworICAgICAgICBhdXRvIGRlc3RpbmF0aW9uT2Zm c2V0ID0gKHN0YXJ0T2Zmc2V0ICsgZGVsdGEpLmNvbnN0cmFpbmVkQmV0d2VlbihleHRlbnRzLm1p bmltdW1TY3JvbGxPZmZzZXQoKSwgZXh0ZW50cy5tYXhpbXVtU2Nyb2xsT2Zmc2V0KCkpOworICAg ICAgICByZXR1cm4gbV9zY3JvbGxBbmltYXRpb24tPnN0YXJ0QW5pbWF0ZWRTY3JvbGxUb0Rlc3Rp bmF0aW9uKHN0YXJ0T2Zmc2V0LCBkZXN0aW5hdGlvbk9mZnNldCk7CisgICAgfQogI2VuZGlmCiAK ICAgICByZXR1cm4gc2Nyb2xsVG9Qb3NpdGlvbldpdGhvdXRBbmltYXRpb24oY3VycmVudFBvc2l0 aW9uKCkgKyBkZWx0YSk7Cg== 438775 2021-09-20 21:37:40 -0700 2021-09-21 07:54:09 -0700 Patch bug-230529-20210920213739.patch text/plain 5940 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyNzk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzgxZmQyYjcyYzJiNmVi MzI2MmY2ZTFiZTBhN2Y0YTk0NTFmZmI4Mi4uN2JhM2Q5ZDFmOTU0NTUwMTQyYWE0MWZkZTZkYzkx YWY0OWRmMGFkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTA5LTIwICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFNjcm9sbEFuaW1h dGlvblNtb290aCBzaG91bGQgb25seSBoYXZlIG9uZSB3YXkgdG8gc3RhcnQgYW4gYW5pbWF0aW9u CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzA1MjkK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUg dGhlIFNjcm9sbGJhck9yaWVudGF0aW9uL1Njcm9sbEdyYW51bGFyaXR5L3N0ZXAvbXVsdGlwbGll ciBlbnRyeSBwb2ludCBvbgorICAgICAgICBTY3JvbGxBbmltYXRpb25TbW9vdGg7IHRoZSBjYWxs ZXIgY2FuIGRvIHRoZSBtYXRoIHRvIGNvbXB1dGUgdGhlIGVuZCBwb2ludC4KKworICAgICAgICAq IHBhZ2Uvc2Nyb2xsaW5nL25pY29zaWEvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGVEZWxlZ2F0 ZU5pY29zaWEuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05v ZGVEZWxlZ2F0ZU5pY29zaWE6OmhhbmRsZVdoZWVsRXZlbnQpOgorICAgICAgICAqIHBsYXRmb3Jt L1Njcm9sbEFuaW1hdGlvblNtb290aC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxBbmlt YXRpb25TbW9vdGg6OnN0YXJ0QW5pbWF0ZWRTY3JvbGwpOiBEZWxldGVkLgorICAgICAgICAqIHBs YXRmb3JtL1Njcm9sbEFuaW1hdGlvblNtb290aC5oOgorICAgICAgICAqIHBsYXRmb3JtL1Njcm9s bEFuaW1hdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbEFuaW1hdG9yOjpzY3JvbGwp OgorCiAyMDIxLTA5LTIwICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgog CiAgICAgICAgIFdyYXAgU2Nyb2xsaW5nTW9tZW50dW1DYWxjdWxhdG9yIGluIGEgU2Nyb2xsQW5p bWF0aW9uTW9tZW50dW0gd2hlbiB1c2VkIGZvciBzY3JvbGwgc25hcApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbmljb3NpYS9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5n Tm9kZURlbGVnYXRlTmljb3NpYS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9u aWNvc2lhL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlRGVsZWdhdGVOaWNvc2lhLmNwcAppbmRl eCBmZjJjNjgwN2NjM2FmNGExOTVkYzNkY2FiNzNiNjQ3ZmQ2NzRjMmQ5Li5lNDAzZTI0MTU3NGFl OWU1MzJhYjgzZjI5MmJhOGFkZDVmYWM0NjBjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL3Njcm9sbGluZy9uaWNvc2lhL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlRGVsZWdhdGVO aWNvc2lhLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9uaWNvc2lhL1Nj cm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlRGVsZWdhdGVOaWNvc2lhLmNwcApAQCAtMTYyLDggKzE2 Miw5IEBAIFdoZWVsRXZlbnRIYW5kbGluZ1Jlc3VsdCBTY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9k ZURlbGVnYXRlTmljb3NpYTo6aGFuZGxlV2hlZWxFCiAjaWYgRU5BQkxFKFNNT09USF9TQ1JPTExJ TkcpCiAgICAgaWYgKG1fc2Nyb2xsQW5pbWF0b3JFbmFibGVkICYmICF3aGVlbEV2ZW50Lmhhc1By ZWNpc2VTY3JvbGxpbmdEZWx0YXMoKSkgewogICAgICAgICBlbnN1cmVTY3JvbGxBbmltYXRpb25T bW9vdGgoKTsKLSAgICAgICAgbV9zbW9vdGhBbmltYXRpb24tPnN0YXJ0QW5pbWF0ZWRTY3JvbGwo SG9yaXpvbnRhbFNjcm9sbGJhciwgU2Nyb2xsQnlQaXhlbCwgY3VycmVudFNjcm9sbFBvc2l0aW9u KCksIDEsIGRlbHRhWCk7Ci0gICAgICAgIG1fc21vb3RoQW5pbWF0aW9uLT5zdGFydEFuaW1hdGVk U2Nyb2xsKFZlcnRpY2FsU2Nyb2xsYmFyLCBTY3JvbGxCeVBpeGVsLCBjdXJyZW50U2Nyb2xsUG9z aXRpb24oKSwgMSwgZGVsdGFZKTsKKyAgICAgICAgYXV0byBjdXJyZW50T2Zmc2V0ID0gc2Nyb2xs aW5nTm9kZSgpLmN1cnJlbnRTY3JvbGxPZmZzZXQoKTsKKyAgICAgICAgYXV0byBkZXN0aW5hdGlv bk9mZnNldCA9IGN1cnJlbnRPZmZzZXQgKyBGbG9hdFNpemUgeyBkZWx0YVgsIGRlbHRhWSB9Owor ICAgICAgICBtX3Ntb290aEFuaW1hdGlvbi0+c3RhcnRBbmltYXRlZFNjcm9sbFRvRGVzdGluYXRp b24oY3VycmVudE9mZnNldCwgZGVzdGluYXRpb25PZmZzZXQpOwogICAgICAgICByZXR1cm4gV2hl ZWxFdmVudEhhbmRsaW5nUmVzdWx0OjpoYW5kbGVkKCk7CiAgICAgfQogI2VuZGlmCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxBbmltYXRpb25TbW9vdGguY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsQW5pbWF0aW9uU21vb3RoLmNwcAppbmRleCBh MGNkOTUyZjU3MGZmZGJmMWRkZjg4MjAzYzFmZWU3YjBkOTE3YzEwLi43MGU5NGE5YzZmNGNkYjI0 ZWZhYTgyZTE4YzYxYWEwOWQ1YmNlMjc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9TY3JvbGxBbmltYXRpb25TbW9vdGguY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL1Njcm9sbEFuaW1hdGlvblNtb290aC5jcHAKQEAgLTU2LDI1ICs1Niw2IEBAIFNjcm9sbEFu aW1hdGlvblNtb290aDo6U2Nyb2xsQW5pbWF0aW9uU21vb3RoKFNjcm9sbEFuaW1hdGlvbkNsaWVu dCYgY2xpZW50KQogCiBTY3JvbGxBbmltYXRpb25TbW9vdGg6On5TY3JvbGxBbmltYXRpb25TbW9v dGgoKSA9IGRlZmF1bHQ7CiAKLWJvb2wgU2Nyb2xsQW5pbWF0aW9uU21vb3RoOjpzdGFydEFuaW1h dGVkU2Nyb2xsKFNjcm9sbGJhck9yaWVudGF0aW9uIG9yaWVudGF0aW9uLCBTY3JvbGxHcmFudWxh cml0eSwgY29uc3QgRmxvYXRQb2ludCYgZnJvbU9mZnNldCwgZmxvYXQgc3RlcCwgZmxvYXQgbXVs dGlwbGllcikKLXsKLSAgICBtX3N0YXJ0T2Zmc2V0ID0gZnJvbU9mZnNldDsKLSAgICBhdXRvIGRl c3RpbmF0aW9uT2Zmc2V0ID0gZnJvbU9mZnNldDsKLSAgICBzd2l0Y2ggKG9yaWVudGF0aW9uKSB7 Ci0gICAgY2FzZSBIb3Jpem9udGFsU2Nyb2xsYmFyOgotICAgICAgICBkZXN0aW5hdGlvbk9mZnNl dC5zZXRYKGRlc3RpbmF0aW9uT2Zmc2V0LngoKSArIHN0ZXAgKiBtdWx0aXBsaWVyKTsKLSAgICAg ICAgYnJlYWs7Ci0gICAgY2FzZSBWZXJ0aWNhbFNjcm9sbGJhcjoKLSAgICAgICAgZGVzdGluYXRp b25PZmZzZXQuc2V0WShkZXN0aW5hdGlvbk9mZnNldC55KCkgKyBzdGVwICogbXVsdGlwbGllcik7 Ci0gICAgICAgIGJyZWFrOwotICAgIH0KLQotICAgIG1fZHVyYXRpb24gPSBkdXJhdGlvbkZyb21E aXN0YW5jZShkZXN0aW5hdGlvbk9mZnNldCAtIG1fc3RhcnRPZmZzZXQpOwotCi0gICAgYXV0byBl eHRlbnRzID0gbV9jbGllbnQuc2Nyb2xsRXh0ZW50c0ZvckFuaW1hdGlvbigqdGhpcyk7Ci0gICAg cmV0dXJuIHN0YXJ0T3JSZXRhcmdldEFuaW1hdGlvbihleHRlbnRzLCBkZXN0aW5hdGlvbk9mZnNl dCk7Ci19Ci0KIGJvb2wgU2Nyb2xsQW5pbWF0aW9uU21vb3RoOjpzdGFydEFuaW1hdGVkU2Nyb2xs VG9EZXN0aW5hdGlvbihjb25zdCBGbG9hdFBvaW50JiBmcm9tT2Zmc2V0LCBjb25zdCBGbG9hdFBv aW50JiBkZXN0aW5hdGlvbk9mZnNldCkKIHsKICAgICBtX3N0YXJ0T2Zmc2V0ID0gZnJvbU9mZnNl dDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbEFuaW1hdGlvblNt b290aC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsQW5pbWF0aW9uU21vb3RoLmgK aW5kZXggMTMzN2RmZWZhN2NkMDJmMzM0ODk5Y2Q0ZTZjOTAxOWJjZjI2NzIyMC4uNWFmZGMxM2Q3 OWNmODdjMzk2NzUwNjNkNzI2MzAzMTZkMzE0MWM1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vU2Nyb2xsQW5pbWF0aW9uU21vb3RoLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vU2Nyb2xsQW5pbWF0aW9uU21vb3RoLmgKQEAgLTQwLDcgKzQwLDYgQEAgcHVibGlj OgogICAgIFNjcm9sbEFuaW1hdGlvblNtb290aChTY3JvbGxBbmltYXRpb25DbGllbnQmKTsKICAg ICB2aXJ0dWFsIH5TY3JvbGxBbmltYXRpb25TbW9vdGgoKTsKIAotICAgIGJvb2wgc3RhcnRBbmlt YXRlZFNjcm9sbChTY3JvbGxiYXJPcmllbnRhdGlvbiwgU2Nyb2xsR3JhbnVsYXJpdHksIGNvbnN0 IEZsb2F0UG9pbnQmIGZyb21PZmZzZXQsIGZsb2F0IHN0ZXAsIGZsb2F0IG11bHRpcGxpZXIpOwog ICAgIGJvb2wgc3RhcnRBbmltYXRlZFNjcm9sbFRvRGVzdGluYXRpb24oY29uc3QgRmxvYXRQb2lu dCYgZnJvbU9mZnNldCwgY29uc3QgRmxvYXRQb2ludCYgZGVzdGluYXRpb25PZmZzZXQpOwogCiAg ICAgYm9vbCByZXRhcmdldEFjdGl2ZUFuaW1hdGlvbihjb25zdCBGbG9hdFBvaW50JiBuZXdPZmZz ZXQpIGZpbmFsOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsQW5p bWF0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsQW5pbWF0b3IuY3BwCmlu ZGV4IDJmMGZlYmQ4ZDNmMGYwYmRmMmVhZGNmZjE2Yjg4NWQzYzg0MjI3MzUuLjIyMDg4NjAzYjZk OTk0ZmIyZDJhNTZkMTMwNzQ2ZDJiNjUyMzliMTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL1Njcm9sbEFuaW1hdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9TY3JvbGxBbmltYXRvci5jcHAKQEAgLTg3LDggKzg3LDEyIEBAIGJvb2wgU2Nyb2xsQW5pbWF0 b3I6OnNjcm9sbChTY3JvbGxiYXJPcmllbnRhdGlvbiBvcmllbnRhdGlvbiwgU2Nyb2xsR3JhbnVs YXJpdHkKICAgICB9CiAKICNpZiBFTkFCTEUoU01PT1RIX1NDUk9MTElORykgJiYgIVBMQVRGT1JN KElPU19GQU1JTFkpCi0gICAgaWYgKG1fc2Nyb2xsYWJsZUFyZWEuc2Nyb2xsQW5pbWF0b3JFbmFi bGVkKCkgJiYgcGxhdGZvcm1BbGxvd3NTY3JvbGxBbmltYXRpb24oKSAmJiAhYmVoYXZpb3IuY29u dGFpbnMoU2Nyb2xsQmVoYXZpb3I6Ok5ldmVyQW5pbWF0ZSkpCi0gICAgICAgIHJldHVybiBtX3Nj cm9sbEFuaW1hdGlvbi0+c3RhcnRBbmltYXRlZFNjcm9sbChvcmllbnRhdGlvbiwgZ3JhbnVsYXJp dHksIG9mZnNldEZyb21Qb3NpdGlvbihtX2N1cnJlbnRQb3NpdGlvbiksIHN0ZXAsIG11bHRpcGxp ZXIpOworICAgIGlmIChtX3Njcm9sbGFibGVBcmVhLnNjcm9sbEFuaW1hdG9yRW5hYmxlZCgpICYm IHBsYXRmb3JtQWxsb3dzU2Nyb2xsQW5pbWF0aW9uKCkgJiYgIWJlaGF2aW9yLmNvbnRhaW5zKFNj cm9sbEJlaGF2aW9yOjpOZXZlckFuaW1hdGUpKSB7CisgICAgICAgIGF1dG8gc3RhcnRPZmZzZXQg PSBvZmZzZXRGcm9tUG9zaXRpb24obV9jdXJyZW50UG9zaXRpb24pOworICAgICAgICBhdXRvIGV4 dGVudHMgPSBzY3JvbGxFeHRlbnRzKCk7CisgICAgICAgIGF1dG8gZGVzdGluYXRpb25PZmZzZXQg PSAoc3RhcnRPZmZzZXQgKyBkZWx0YSkuY29uc3RyYWluZWRCZXR3ZWVuKGV4dGVudHMubWluaW11 bVNjcm9sbE9mZnNldCgpLCBleHRlbnRzLm1heGltdW1TY3JvbGxPZmZzZXQoKSk7CisgICAgICAg IHJldHVybiBtX3Njcm9sbEFuaW1hdGlvbi0+c3RhcnRBbmltYXRlZFNjcm9sbFRvRGVzdGluYXRp b24oc3RhcnRPZmZzZXQsIGRlc3RpbmF0aW9uT2Zmc2V0KTsKKyAgICB9CiAjZW5kaWYKIAogICAg IHJldHVybiBzY3JvbGxUb1Bvc2l0aW9uV2l0aG91dEFuaW1hdGlvbihjdXJyZW50UG9zaXRpb24o KSArIGRlbHRhKTsK