224176 2021-04-05 00:29:10 -0700 [css-scroll-snap] Properly support fractional scroll steps in WebCore::ScrollAnimator::scroll 2021-12-15 12:03:23 -0800 1 1 1 Unclassified WebKit Scrolling WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=234360 InRadar P2 Normal --- 222594 1 mrobinson mrobinson simon.fraser webkit-bug-importer oldest_to_newest 1746910 0 mrobinson 2021-04-05 00:29:10 -0700 This bug tracks adding support for fractional scroll offsets in this function. Currently, for scroll snapping, only integral offsets are supported because it is reading the current scroll offset from ScrollableArea, which stores the current scroll offset as an IntPoint. 1746920 1 425143 mrobinson 2021-04-05 03:30:56 -0700 Created attachment 425143 Patch 1749146 2 webkit-bug-importer 2021-04-12 00:30:16 -0700 <rdar://problem/76527260> 1751699 3 ews-feeder 2021-04-19 01:23:40 -0700 Committed r276239 (236721@main): <https://commits.webkit.org/236721@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 425143. 425143 2021-04-05 03:30:56 -0700 2021-04-19 01:23:41 -0700 Patch bug-224176-20210405123055.patch text/plain 8784 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1NDUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzA5ZmRjYzBkZWVkYmI0 NDFlOGI3MWEyZTliYjQ5OTliY2IwZjQ2Ni4uNWU4YjBiNzQ5ZWM2YWE0MTEzNjA0ZjA5ZWYwNzM3 MTc2OWFlZDJjNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDIxLTA0LTA1ICBNYXJ0 aW4gUm9iaW5zb24gIDxtcm9iaW5zb25Ad2Via2l0Lm9yZz4KKworICAgICAgICBbY3NzLXNjcm9s bC1zbmFwXSBQcm9wZXJseSBzdXBwb3J0IGZyYWN0aW9uYWwgc2Nyb2xsIHN0ZXBzIGluIFdlYkNv cmU6OlNjcm9sbEFuaW1hdG9yOjpzY3JvbGwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyNDE3NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFN0b3AgdXNpbmcgdGhlIFNjcm9sbGFibGVBcmVhJ3MgcG9zaXRp b24gdG8gY2FsY3VsYXRlIHNjcm9sbCBzbmFwIHBvc2l0aW9ucyBpbiBTY3JvbGxBbmltYXRvcjo6 c25hcC4KKyAgICAgICAgVGhlIHBvc2l0aW9uIHN0b3JlZCBpbiBTY3JvbGxBbmltYXRvciBpcyBh IGZsb2F0aW5nIHBvaW50IHBvc2l0aW9uLCB3aGlsZSB0aGUgb25lIHN0b3JlZCBpbiBTY3JvbGxh YmxlQXJlYQorICAgICAgICBpcyBhbiBpbnRlZ2VyIHBvc2l0aW9uLiBUaGlzIGN1cnJlbnRseSBp c24ndCBhbiBpc3N1ZSwgYmVjYXVzZSBhbGwgY2FsbGVycyBvZiBTY3JvbGxBbmltYXRvcjo6c2Ny b2xsCisgICAgICAgIHVzZSBpbnRlZ2VyIHNjcm9sbCBvZmZzZXRzLCBidXQgdGhpcyB3aWxsIGFs bG93IHRoaXMgZnVuY3Rpb24gdG8gYmUgdXNlZCBpbiB0aGUgZnV0dXJlIGZvciBwcmVjaXNlCisg ICAgICAgIHNjcm9sbGluZyBkZWx0YS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIFRoaXMgZG9l c24ndCBjaGFuZ2UgYW55IGJlaGF2aW9yLCBzaW5jZSBhbGwgY2FsbGVycyBjdXJyZW50bHkgdXNl CisgICAgICAgIGludGVnZXIgc2Nyb2xsIG9mZnNldHMsIGJ1dCBhIGZ1dHVyZSBjaGFuZ2Ugd2ls bCBtYWtlIHVzZSBvZiB0aGlzIGZpeC4KKworICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbEFuaW1h dG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbEFuaW1hdG9yOjpzY3JvbGwpOiBHZXQg dGhlIGN1cnJlbnQgc2Nyb2xsIHBvc2l0aW9uIGZyb20gdGhlIFNjcm9sbEFuaW1hdG9yLAorICAg ICAgICB3aGljaCBzdG9yZXMgaXQgaW4gZmxvYXRpbmcgcG9pbnQuIEFsc28sIG9ubHkgY2FsbCBp bnRvIHRoZSBzY3JvbGwgc25hcCBjb2RlIGlmIHdlIGFjdHVhbGx5CisgICAgICAgIGhhdmUgc2Ny b2xsIG9mZnNldHMuCisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxBbmltYXRvcjo6b2Zmc2V0RnJv bVBvc2l0aW9uKTogQWRkZWQgdGhpcyBoZWxwZXIuCisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxB bmltYXRvcjo6cG9zaXRpb25Gcm9tT2Zmc2V0KTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpT Y3JvbGxBbmltYXRvcjo6ZGVsdGFGcm9tU3RlcCk6IFJldHVybiBhIGRlbHRhIGluc3RlYWQgb2Yg YSBwb3NpdGlvbiBzbyB0aGlzIGhlbHBlcgorICAgICAgICBjYW4gYmUgdXNlZCB3aXRoIG9mZnNl dHMgb3IgcG9zaXRpb25zLgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsQW5pbWF0b3I6OnBvc2l0 aW9uRnJvbVN0ZXApOiBEZWxldGVkLgorICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbEFuaW1hdG9y Lmg6CisgICAgICAgICogcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLm1tOgorICAgICAg ICAoV2ViQ29yZTo6U2Nyb2xsQW5pbWF0b3JNYWM6OnNjcm9sbCk6IFVzZSB0aGUgbmV3IGhlbHBl ci5qCisKIDIwMjEtMDQtMDIgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAg ICAgICAgUGVuZGluZ0ltYWdlQml0bWFwIGdldHMgY3JlYXRlZCBvbiBhIHN0b3BwZWQgc2NyaXB0 IGV4ZWN1dGlvbiBjb250ZXh0LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v U2Nyb2xsQW5pbWF0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsQW5pbWF0 b3IuY3BwCmluZGV4IDY0Yzg0M2I1OTc1MjQ2NGFjZjdmNzQ0YjViYmU1NzhiMjdkNDhmODQuLjZi ZGUwYmNiOWYyZGFlYmI4ZDgzNzRhM2E4MjBjOWE5NjcyNGJlZDggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbEFuaW1hdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9TY3JvbGxBbmltYXRvci5jcHAKQEAgLTgzLDE2ICs4MywyMyBAQCBTY3JvbGxB bmltYXRvcjo6flNjcm9sbEFuaW1hdG9yKCkKIAogYm9vbCBTY3JvbGxBbmltYXRvcjo6c2Nyb2xs KFNjcm9sbGJhck9yaWVudGF0aW9uIG9yaWVudGF0aW9uLCBTY3JvbGxHcmFudWxhcml0eSBncmFu dWxhcml0eSwgZmxvYXQgc3RlcCwgZmxvYXQgbXVsdGlwbGllciwgU2Nyb2xsQmVoYXZpb3IgYmVo YXZpb3IpCiB7CisgICAgYXV0byBkZWx0YSA9IGRlbHRhRnJvbVN0ZXAob3JpZW50YXRpb24sIHN0 ZXAsIG11bHRpcGxpZXIpOwogI2lmIEVOQUJMRShDU1NfU0NST0xMX1NOQVApCiAgICAgaWYgKGJl aGF2aW9yID09IFNjcm9sbEJlaGF2aW9yOjpEb0RpcmVjdGlvbmFsU25hcHBpbmcpIHsKLSAgICAg ICAgYXV0byBuZXdPZmZzZXQgPSBTY3JvbGxhYmxlQXJlYTo6c2Nyb2xsT2Zmc2V0RnJvbVBvc2l0 aW9uKHBvc2l0aW9uRnJvbVN0ZXAob3JpZW50YXRpb24sIHN0ZXAsIG11bHRpcGxpZXIpLCB0b0Zs b2F0U2l6ZShtX3Njcm9sbGFibGVBcmVhLnNjcm9sbE9yaWdpbigpKSk7Ci0gICAgICAgIGF1dG8g Y3VycmVudE9mZnNldCA9IG1fc2Nyb2xsYWJsZUFyZWEuc2Nyb2xsT2Zmc2V0KCk7Ci0gICAgICAg IGlmIChvcmllbnRhdGlvbiA9PSBIb3Jpem9udGFsU2Nyb2xsYmFyKSB7CisgICAgICAgIGlmICgh bV9zY3JvbGxDb250cm9sbGVyLnVzZXNTY3JvbGxTbmFwKCkpCisgICAgICAgICAgICByZXR1cm4g c2Nyb2xsKG9yaWVudGF0aW9uLCBncmFudWxhcml0eSwgc3RlcCwgbXVsdGlwbGllcik7CisKKyAg ICAgICAgYXV0byBjdXJyZW50T2Zmc2V0ID0gb2Zmc2V0RnJvbVBvc2l0aW9uKGN1cnJlbnRQb3Np dGlvbigpKTsKKyAgICAgICAgYXV0byBuZXdPZmZzZXQgPSBjdXJyZW50T2Zmc2V0ICsgZGVsdGE7 CisgICAgICAgIGlmIChvcmllbnRhdGlvbiA9PSBIb3Jpem9udGFsU2Nyb2xsYmFyKQogICAgICAg ICAgICAgbmV3T2Zmc2V0LnNldFgobV9zY3JvbGxDb250cm9sbGVyLmFkanVzdFNjcm9sbERlc3Rp bmF0aW9uKFNjcm9sbEV2ZW50QXhpczo6SG9yaXpvbnRhbCwgbmV3T2Zmc2V0LngoKSwgbXVsdGlw bGllciwgY3VycmVudE9mZnNldC54KCkpKTsKLSAgICAgICAgICAgIHJldHVybiBzY3JvbGwoSG9y aXpvbnRhbFNjcm9sbGJhciwgZ3JhbnVsYXJpdHksIG5ld09mZnNldC54KCkgLSBjdXJyZW50T2Zm c2V0LngoKSwgMS4wKTsKLSAgICAgICAgfQotICAgICAgICBuZXdPZmZzZXQuc2V0WShtX3Njcm9s bENvbnRyb2xsZXIuYWRqdXN0U2Nyb2xsRGVzdGluYXRpb24oU2Nyb2xsRXZlbnRBeGlzOjpWZXJ0 aWNhbCwgbmV3T2Zmc2V0LnkoKSwgbXVsdGlwbGllciwgY3VycmVudE9mZnNldC55KCkpKTsKLSAg ICAgICAgcmV0dXJuIHNjcm9sbChWZXJ0aWNhbFNjcm9sbGJhciwgZ3JhbnVsYXJpdHksIG5ld09m ZnNldC55KCkgLSBjdXJyZW50T2Zmc2V0LnkoKSwgMS4wKTsKKyAgICAgICAgZWxzZQorICAgICAg ICAgICAgbmV3T2Zmc2V0LnNldFkobV9zY3JvbGxDb250cm9sbGVyLmFkanVzdFNjcm9sbERlc3Rp bmF0aW9uKFNjcm9sbEV2ZW50QXhpczo6VmVydGljYWwsIG5ld09mZnNldC55KCksIG11bHRpcGxp ZXIsIGN1cnJlbnRPZmZzZXQueSgpKSk7CisgICAgICAgIGF1dG8gbmV3RGVsdGEgPSBuZXdPZmZz ZXQgLSBjdXJyZW50T2Zmc2V0OworCisgICAgICAgIGlmIChvcmllbnRhdGlvbiA9PSBIb3Jpem9u dGFsU2Nyb2xsYmFyKQorICAgICAgICAgICAgcmV0dXJuIHNjcm9sbChIb3Jpem9udGFsU2Nyb2xs YmFyLCBncmFudWxhcml0eSwgbmV3RGVsdGEud2lkdGgoKSwgMS4wKTsKKyAgICAgICAgcmV0dXJu IHNjcm9sbChWZXJ0aWNhbFNjcm9sbGJhciwgZ3JhbnVsYXJpdHksIG5ld0RlbHRhLmhlaWdodCgp LCAxLjApOwogICAgIH0KICNlbHNlCiAgICAgVU5VU0VEX1BBUkFNKGdyYW51bGFyaXR5KTsKQEAg LTEwNiw3ICsxMTMsNyBAQCBib29sIFNjcm9sbEFuaW1hdG9yOjpzY3JvbGwoU2Nyb2xsYmFyT3Jp ZW50YXRpb24gb3JpZW50YXRpb24sIFNjcm9sbEdyYW51bGFyaXR5CiAgICAgfQogI2VuZGlmCiAK LSAgICByZXR1cm4gc2Nyb2xsVG9Qb3NpdGlvbldpdGhvdXRBbmltYXRpb24ocG9zaXRpb25Gcm9t U3RlcChvcmllbnRhdGlvbiwgc3RlcCwgbXVsdGlwbGllcikpOworICAgIHJldHVybiBzY3JvbGxU b1Bvc2l0aW9uV2l0aG91dEFuaW1hdGlvbihjdXJyZW50UG9zaXRpb24oKSArIGRlbHRhKTsKIH0K IAogYm9vbCBTY3JvbGxBbmltYXRvcjo6c2Nyb2xsVG9PZmZzZXRXaXRob3V0QW5pbWF0aW9uKGNv bnN0IEZsb2F0UG9pbnQmIG9mZnNldCwgU2Nyb2xsQ2xhbXBpbmcgY2xhbXBpbmcpCkBAIC0xNDgs MTQgKzE1NSwyNCBAQCBib29sIFNjcm9sbEFuaW1hdG9yOjpzY3JvbGxUb1Bvc2l0aW9uV2l0aEFu aW1hdGlvbihjb25zdCBGbG9hdFBvaW50JiBuZXdQb3NpdGlvbgogICAgIHJldHVybiB0cnVlOwog fQogCi1GbG9hdFBvaW50IFNjcm9sbEFuaW1hdG9yOjpwb3NpdGlvbkZyb21TdGVwKFNjcm9sbGJh ck9yaWVudGF0aW9uIG9yaWVudGF0aW9uLCBmbG9hdCBzdGVwLCBmbG9hdCBtdWx0aXBsaWVyKQor RmxvYXRQb2ludCBTY3JvbGxBbmltYXRvcjo6b2Zmc2V0RnJvbVBvc2l0aW9uKGNvbnN0IEZsb2F0 UG9pbnQmIHBvc2l0aW9uKQoreworICAgIHJldHVybiBTY3JvbGxhYmxlQXJlYTo6c2Nyb2xsT2Zm c2V0RnJvbVBvc2l0aW9uKHBvc2l0aW9uLCB0b0Zsb2F0U2l6ZShtX3Njcm9sbGFibGVBcmVhLnNj cm9sbE9yaWdpbigpKSk7Cit9CisKK0Zsb2F0UG9pbnQgU2Nyb2xsQW5pbWF0b3I6OnBvc2l0aW9u RnJvbU9mZnNldChjb25zdCBGbG9hdFBvaW50JiBvZmZzZXQpCit7CisgICAgcmV0dXJuIFNjcm9s bGFibGVBcmVhOjpzY3JvbGxQb3NpdGlvbkZyb21PZmZzZXQob2Zmc2V0LCB0b0Zsb2F0U2l6ZSht X3Njcm9sbGFibGVBcmVhLnNjcm9sbE9yaWdpbigpKSk7Cit9CisKK0Zsb2F0U2l6ZSBTY3JvbGxB bmltYXRvcjo6ZGVsdGFGcm9tU3RlcChTY3JvbGxiYXJPcmllbnRhdGlvbiBvcmllbnRhdGlvbiwg ZmxvYXQgc3RlcCwgZmxvYXQgbXVsdGlwbGllcikKIHsKICAgICBGbG9hdFNpemUgZGVsdGE7CiAg ICAgaWYgKG9yaWVudGF0aW9uID09IEhvcml6b250YWxTY3JvbGxiYXIpCiAgICAgICAgIGRlbHRh LnNldFdpZHRoKHN0ZXAgKiBtdWx0aXBsaWVyKTsKICAgICBlbHNlCiAgICAgICAgIGRlbHRhLnNl dEhlaWdodChzdGVwICogbXVsdGlwbGllcik7Ci0gICAgcmV0dXJuIHRoaXMtPmN1cnJlbnRQb3Np dGlvbigpICsgZGVsdGE7CisgICAgcmV0dXJuIGRlbHRhOwogfQogCiAjaWYgRU5BQkxFKENTU19T Q1JPTExfU05BUCkKQEAgLTIyMCw3ICsyMzcsNyBAQCBib29sIFNjcm9sbEFuaW1hdG9yOjpoYW5k bGVXaGVlbEV2ZW50KGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYgZSkKICAgICAgICAgICAgICAg ICAgICAgZGVsdGFZID0gLWRlbHRhWTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGlmIChl Lmhhc1ByZWNpc2VTY3JvbGxpbmdEZWx0YXMoKSkKLSAgICAgICAgICAgICAgICBzY3JvbGxUb1Bv c2l0aW9uV2l0aG91dEFuaW1hdGlvbihwb3NpdGlvbkZyb21TdGVwKFZlcnRpY2FsU2Nyb2xsYmFy LCB2ZXJ0aWNhbFNjcm9sbGJhci0+cGl4ZWxTdGVwKCksIC1kZWx0YVkpKTsKKyAgICAgICAgICAg ICAgICBzY3JvbGxUb1Bvc2l0aW9uV2l0aG91dEFuaW1hdGlvbihjdXJyZW50UG9zaXRpb24oKSAr IGRlbHRhRnJvbVN0ZXAoVmVydGljYWxTY3JvbGxiYXIsIHZlcnRpY2FsU2Nyb2xsYmFyLT5waXhl bFN0ZXAoKSwgLWRlbHRhWSkpOwogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIHNj cm9sbChWZXJ0aWNhbFNjcm9sbGJhciwgZ3JhbnVsYXJpdHksIHZlcnRpY2FsU2Nyb2xsYmFyLT5w aXhlbFN0ZXAoKSwgLWRlbHRhWSk7CiAgICAgICAgIH0KQEAgLTIzMyw3ICsyNTAsNyBAQCBib29s IFNjcm9sbEFuaW1hdG9yOjpoYW5kbGVXaGVlbEV2ZW50KGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVu dCYgZSkKICAgICAgICAgICAgICAgICAgICAgZGVsdGFYID0gLWRlbHRhWDsKICAgICAgICAgICAg IH0KICAgICAgICAgICAgIGlmIChlLmhhc1ByZWNpc2VTY3JvbGxpbmdEZWx0YXMoKSkKLSAgICAg ICAgICAgICAgICBzY3JvbGxUb1Bvc2l0aW9uV2l0aG91dEFuaW1hdGlvbihwb3NpdGlvbkZyb21T dGVwKEhvcml6b250YWxTY3JvbGxiYXIsIGhvcml6b250YWxTY3JvbGxiYXItPnBpeGVsU3RlcCgp LCAtZGVsdGFYKSk7CisgICAgICAgICAgICAgICAgc2Nyb2xsVG9Qb3NpdGlvbldpdGhvdXRBbmlt YXRpb24oY3VycmVudFBvc2l0aW9uKCkgKyBkZWx0YUZyb21TdGVwKEhvcml6b250YWxTY3JvbGxi YXIsIGhvcml6b250YWxTY3JvbGxiYXItPnBpeGVsU3RlcCgpLCAtZGVsdGFYKSk7CiAgICAgICAg ICAgICBlbHNlCiAgICAgICAgICAgICAgICAgc2Nyb2xsKEhvcml6b250YWxTY3JvbGxiYXIsIGdy YW51bGFyaXR5LCBob3Jpem9udGFsU2Nyb2xsYmFyLT5waXhlbFN0ZXAoKSwgLWRlbHRhWCk7CiAg ICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbEFuaW1h dG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxBbmltYXRvci5oCmluZGV4IDZl YjE0MDY3N2QxMzhiZWQwNTRlNmU3MGYxMGIzZjE4Njg1Yjg4ZDguLjg1MjAzMzZiODRlZGRiMjkz M2NmNzYyMzM3M2IxMTBhY2I1YzNlNjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL1Njcm9sbEFuaW1hdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xs QW5pbWF0b3IuaApAQCAtMTczLDcgKzE3MywxMCBAQCBwdWJsaWM6CiBwcm90ZWN0ZWQ6CiAgICAg dmlydHVhbCB2b2lkIG5vdGlmeVBvc2l0aW9uQ2hhbmdlZChjb25zdCBGbG9hdFNpemUmIGRlbHRh KTsKICAgICB2b2lkIHVwZGF0ZUFjdGl2ZVNjcm9sbFNuYXBJbmRleEZvck9mZnNldCgpOwotICAg IEZsb2F0UG9pbnQgcG9zaXRpb25Gcm9tU3RlcChTY3JvbGxiYXJPcmllbnRhdGlvbiwgZmxvYXQg c3RlcCwgZmxvYXQgbXVsdGlwbGllcik7CisKKyAgICBGbG9hdFBvaW50IG9mZnNldEZyb21Qb3Np dGlvbihjb25zdCBGbG9hdFBvaW50JiBwb3NpdGlvbik7CisgICAgRmxvYXRQb2ludCBwb3NpdGlv bkZyb21PZmZzZXQoY29uc3QgRmxvYXRQb2ludCYgb2Zmc2V0KTsKKyAgICBGbG9hdFNpemUgZGVs dGFGcm9tU3RlcChTY3JvbGxiYXJPcmllbnRhdGlvbiwgZmxvYXQgc3RlcCwgZmxvYXQgbXVsdGlw bGllcik7CiAKICAgICBTY3JvbGxhYmxlQXJlYSYgbV9zY3JvbGxhYmxlQXJlYTsKICAgICBSZWZQ dHI8V2hlZWxFdmVudFRlc3RNb25pdG9yPiBtX3doZWVsRXZlbnRUZXN0TW9uaXRvcjsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5tbSBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5tbQppbmRleCBk ZWU0MmM1ZDQ2OWQ1ZTVjYmQxNDVhOGY4NzdmZWI1Y2VmNmM5ZjA0Li41NWQ4ZmIwOTRiNWQxMzE2 Y2NiODEyMmRhYmJkMDQxYjBmZTM0OGRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0b3JNYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLm1tCkBAIC03NjEsNyArNzYxLDcgQEAgYm9vbCBTY3Jv bGxBbmltYXRvck1hYzo6c2Nyb2xsKFNjcm9sbGJhck9yaWVudGF0aW9uIG9yaWVudGF0aW9uLCBT Y3JvbGxHcmFudWxhcmkKICAgICAgICAgcmV0dXJuIFNjcm9sbEFuaW1hdG9yOjpzY3JvbGwob3Jp ZW50YXRpb24sIGdyYW51bGFyaXR5LCBzdGVwLCBtdWx0aXBsaWVyLCBiZWhhdmlvcik7CiAKICAg ICBib29sIHNob3VsZEFuaW1hdGUgPSBzY3JvbGxBbmltYXRpb25FbmFibGVkRm9yU3lzdGVtKCkg JiYgbV9zY3JvbGxhYmxlQXJlYS5zY3JvbGxBbmltYXRvckVuYWJsZWQoKSAmJiBncmFudWxhcml0 eSAhPSBTY3JvbGxCeVBpeGVsOwotICAgIEZsb2F0UG9pbnQgbmV3UG9zaXRpb24gPSBwb3NpdGlv bkZyb21TdGVwKG9yaWVudGF0aW9uLCBzdGVwLCBtdWx0aXBsaWVyKTsKKyAgICBGbG9hdFBvaW50 IG5ld1Bvc2l0aW9uID0gdGhpcy0+Y3VycmVudFBvc2l0aW9uKCkgKyBkZWx0YUZyb21TdGVwKG9y aWVudGF0aW9uLCBzdGVwLCBtdWx0aXBsaWVyKTsKICAgICBuZXdQb3NpdGlvbiA9IG5ld1Bvc2l0 aW9uLmNvbnN0cmFpbmVkQmV0d2VlbihzY3JvbGxhYmxlQXJlYSgpLm1pbmltdW1TY3JvbGxQb3Np dGlvbigpLCBzY3JvbGxhYmxlQXJlYSgpLm1heGltdW1TY3JvbGxQb3NpdGlvbigpKTsKIAogICAg IExPR19XSVRIX1NUUkVBTShTY3JvbGxpbmcsIHN0cmVhbSA8PCAiU2Nyb2xsQW5pbWF0b3JNYWM6 OnNjcm9sbCBmcm9tICIgPDwgY3VycmVudFBvc2l0aW9uKCkgPDwgIiB0byAiIDw8IG5ld1Bvc2l0 aW9uKTsK