245740 2022-09-27 09:38:13 -0700 [LFC][IFC] fix fast/block/float/022.html 2022-09-27 14:50:20 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham changseok esprehn+autocc ews-watchlist glenn koivisto kondapallykalyan pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1901553 0 zalan 2022-09-27 09:38:13 -0700 ssia 1901554 1 462664 zalan 2022-09-27 09:52:12 -0700 Created attachment 462664 Patch 1901613 2 ews-feeder 2022-09-27 14:49:04 -0700 Committed 254930@main (d7f19f513f31): <https://commits.webkit.org/254930@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 462664. 1901614 3 webkit-bug-importer 2022-09-27 14:50:20 -0700 <rdar://problem/100477583> 462664 2022-09-27 09:52:12 -0700 2022-09-27 14:49:06 -0700 Patch bug-245740-20220927095211.patch text/plain 13026 zalan RnJvbSAzYmMwYTk5ZmRjZjkzNGExMThkZTk4YjlhYTQzZmFiYmNhNzhiZTZmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJ1anRhcyA8emFsYW5AYXBwbGUuY29tPgpEYXRlOiBU dWUsIDI3IFNlcCAyMDIyIDA5OjQwOjE0IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gW0xGQ11bSUZD XSBmaXggZmFzdC9ibG9jay9mbG9hdC8wMjIuaHRtbAogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTI0NTc0MAoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgoxLiBN b3ZlIHRvcC9sZWZ0IHN0YXRpYyBwb3NpdGlvbiBjb21wdXRhdGlvbiBvdmVyIHRvIElubGluZUZv cm1hdHRpbmdHZW9tZXRyeS4KMi4gQWRkIGJhc2ljIHN1cHBvcnQgZm9yIGJsb2NrIGxldmVsIGJv eGVzIGFuZCBwbGFjZSB0aGVtIHdoZXJlIHRoZXkgd291bGQgZ28gaWYgdGhleSB3ZXJlIGluZmxv dyBlLmcuCldlIGxheW91dCB0aGUgZm9sbG93aW5nIGNvbnRlbnQ6CiAgPGRpdj5zb21lIHRleHQ8 ZGl2IG91dC1vZi1mbG93PjwvZGl2PnNvbWUgbW9yZSB0ZXh0PC9kaXY+CmFzIGlmIGl0IHdhcwog IDxkaXY+CiAgICA8ZGl2IGFub24+c29tZSB0ZXh0PC9kaXY+CiAgICA8ZGl2IG91dC1vZi1mbG93 PjwvZGl2CiAgICA8ZGl2IGFub24+c29tZSBtb3JlIHRleHQ8L2Rpdj4KICA8L2Rpdj4KCiogU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0 dGluZ0NvbnRleHQuY3BwOgooV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4 dDo6Y29tcHV0ZVN0YXRpY1Bvc2l0aW9uRm9yT3V0T2ZGbG93Q29udGVudCk6CiogU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0dl b21ldHJ5LmNwcDoKKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0dlb21ldHJ5Ojpz dGF0aWNQb3NpdGlvbkZvck91dE9mRmxvd0lubGluZUxldmVsQm94IGNvbnN0KToKKFdlYkNvcmU6 OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0dlb21ldHJ5OjpzdGF0aWNQb3NpdGlvbkZvck91dE9m Rmxvd0Jsb2NrTGV2ZWxCb3ggY29uc3QpOgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdHZW9tZXRyeS5oOgoqIFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oOgooV2ViQ29yZTo6UmVuZGVyU3R5 bGU6OmlzRGlzcGxheUJsb2NrTGV2ZWwgY29uc3QpOgooV2ViQ29yZTo6UmVuZGVyU3R5bGU6Omlz T3JpZ2luYWxEaXNwbGF5QmxvY2tUeXBlIGNvbnN0KToKKFdlYkNvcmU6OlJlbmRlclN0eWxlOjpp c0Rpc3BsYXlCbG9ja1R5cGUpOgotLS0KIC4uLi9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRl eHQuY3BwICAgICAgICB8IDM1ICsrLS0tLS0tLS0tCiAuLi4vaW5saW5lL0lubGluZUZvcm1hdHRp bmdHZW9tZXRyeS5jcHAgICAgICAgfCA1OCArKysrKysrKysrKysrKysrKystCiAuLi4vaW5saW5l L0lubGluZUZvcm1hdHRpbmdHZW9tZXRyeS5oICAgICAgICAgfCAgNCArLQogU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmggIHwgMTIgKystLQogNCBmaWxlcyBjaGFu Z2VkLCA3MiBpbnNlcnRpb25zKCspLCAzNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0 aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggMGM3MzgxZDY4OTdmLi4y YzFkOTVjMzUxYTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5n Q29udGV4dC5jcHAKQEAgLTI1Myw0MCArMjUzLDE1IEBAIHZvaWQgSW5saW5lRm9ybWF0dGluZ0Nv bnRleHQ6OmNvbXB1dGVTdGF0aWNQb3NpdGlvbkZvck91dE9mRmxvd0NvbnRlbnQoY29uc3QgRm9y CiAgICAgLy8gSG93ZXZlciBpdCBkb2VzIG5vdCBtZWFuIHRoYXQgdGhlIG91dC1vZi1mbG93IGJv eCBzaG91bGQgYmUgaW52b2x2ZWQgaW4gdGhlIGlubGluZSBsYXlvdXQgcHJvY2Vzcy4KICAgICAv LyBJbnN0ZWFkIHdlIGZpZ3VyZSBvdXQgdGhpcyBzdGF0aWMgcG9zaXRpb24gYWZ0ZXIgdGhlIGlu bGluZSBsYXlvdXQgYnkgbG9va2luZyBhdCB0aGUgcHJldmlvdXMvbmV4dCBzaWJsaW5nIChvciBw YXJlbnQpIGJveCdzIGdlb21ldHJ5IGFuZAogICAgIC8vIHBsYWNlIHRoZSBvdXQtb2YtZmxvdyBi b3ggYXQgdGhlIGxvZ2ljYWwgcmlnaHQgcG9zaXRpb24uCisgICAgYXV0byYgZm9ybWF0dGluZ0dl b21ldHJ5ID0gdGhpcy0+Zm9ybWF0dGluZ0dlb21ldHJ5KCk7CiAgICAgYXV0byYgZm9ybWF0dGlu Z1N0YXRlID0gdGhpcy0+Zm9ybWF0dGluZ1N0YXRlKCk7Ci0gICAgYXV0byYgbGluZXMgPSBmb3Jt YXR0aW5nU3RhdGUubGluZXMoKTsKLSAgICBhdXRvJiBib3hlcyA9IGZvcm1hdHRpbmdTdGF0ZS5i b3hlcygpOwogCiAgICAgZm9yIChhdXRvJiBvdXRPZkZsb3dCb3ggOiBvdXRPZkZsb3dCb3hlcykg ewotICAgICAgICBhdXRvIHRvcExlZnQgPSBMYXlvdXRQb2ludCB7IH07Ci0gICAgICAgIGF1dG8g W3ByZXZpb3VzRGlzcGxheUJveCwgbmV4dERpc3BsYXlCb3hdID0gSW5saW5lRm9ybWF0dGluZ0dl b21ldHJ5OjpwcmV2aW91c0FuZE5leHREaXNwbGF5Qm94Rm9yU3RhdGljUG9zaXRpb24ob3V0T2ZG bG93Qm94LCBib3hlcyk7Ci0KLSAgICAgICAgaWYgKHByZXZpb3VzRGlzcGxheUJveCAmJiBuZXh0 RGlzcGxheUJveCkgewotICAgICAgICAgICAgaWYgKHByZXZpb3VzRGlzcGxheUJveC0+aXNJbmxp bmVCb3goKSkgewotICAgICAgICAgICAgICAgIC8vIFNwZWNpYWwgaGFuZGxpbmcgZm9yIGNhc2Vz IHdoZW4gdGhlIHByZXZpb3VzIGNvbnRlbnQgaXMgYW4gaW5saW5lIGJveDoKLSAgICAgICAgICAg ICAgICAvLyA8ZGl2PnRleHQ8c3Bhbj48aW1nIHN0eWxlPSJwb3NpdGlvbjogYWJzb2x1dGUiPmNv bnRlbnQ8L3NwYW4+PC9kaXY+Ci0gICAgICAgICAgICAgICAgLy8gb3IKLSAgICAgICAgICAgICAg ICAvLyA8ZGl2PnRleHQ8c3Bhbj5jb250ZW50PC9zcGFuPjxpbWcgc3R5bGU9InBvc2l0aW9uOiBh YnNvbHV0ZSI+PC9kaXY+Ci0gICAgICAgICAgICAgICAgYXV0byBpc0ZpcnN0Q29udGVudEluc2lk ZUlubGluZUJveCA9ICZvdXRPZkZsb3dCb3gtPnBhcmVudCgpID09ICZwcmV2aW91c0Rpc3BsYXlC b3gtPmxheW91dEJveCgpOwotICAgICAgICAgICAgICAgIGF1dG8mIGlubGluZUJveEJveEdlb21l dHJ5ID0gZ2VvbWV0cnlGb3JCb3gocHJldmlvdXNEaXNwbGF5Qm94LT5sYXlvdXRCb3goKSk7Ci0K LSAgICAgICAgICAgICAgICB0b3BMZWZ0ID0gewotICAgICAgICAgICAgICAgICAgICBpc0ZpcnN0 Q29udGVudEluc2lkZUlubGluZUJveCA/IEJveEdlb21ldHJ5Ojpib3JkZXJCb3hMZWZ0KGlubGlu ZUJveEJveEdlb21ldHJ5KSArIGlubGluZUJveEJveEdlb21ldHJ5LmNvbnRlbnRCb3hMZWZ0KCkg OiBCb3hHZW9tZXRyeTo6bWFyZ2luQm94UmVjdChpbmxpbmVCb3hCb3hHZW9tZXRyeSkucmlnaHQo KSwKLSAgICAgICAgICAgICAgICAgICAgbGluZXNbcHJldmlvdXNEaXNwbGF5Qm94LT5saW5lSW5k ZXgoKV0udG9wKCkKLSAgICAgICAgICAgICAgICB9OwotICAgICAgICAgICAgfSBlbHNlIHsKLSAg ICAgICAgICAgICAgICBhdXRvJiBjdXJyZW50TGluZSA9IGxpbmVzW3ByZXZpb3VzRGlzcGxheUJv eC0+bGluZUluZGV4KCldOwotICAgICAgICAgICAgICAgIGF1dG8gc2hvdWxkRml0TGluZSA9IHBy ZXZpb3VzRGlzcGxheUJveC0+bGluZUluZGV4KCkgPT0gbmV4dERpc3BsYXlCb3gtPmxpbmVJbmRl eCgpIHx8IChwcmV2aW91c0Rpc3BsYXlCb3gtPnJpZ2h0KCkgPD0gY3VycmVudExpbmUubGVmdCgp ICYmICFwcmV2aW91c0Rpc3BsYXlCb3gtPmlzTGluZUJyZWFrQm94KCkpOwotICAgICAgICAgICAg ICAgIHRvcExlZnQgPSBzaG91bGRGaXRMaW5lID8gTGF5b3V0UG9pbnQgeyBwcmV2aW91c0Rpc3Bs YXlCb3gtPnJpZ2h0KCksIGN1cnJlbnRMaW5lLnRvcCgpIH0gOiBMYXlvdXRQb2ludCB7IG5leHRE aXNwbGF5Qm94LT5sZWZ0KCksIGxpbmVzW25leHREaXNwbGF5Qm94LT5saW5lSW5kZXgoKV0udG9w KCkgfTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgfSBlbHNlIGlmICghcHJldmlvdXNEaXNwbGF5 Qm94KQotICAgICAgICAgICAgdG9wTGVmdCA9IHsgYm94ZXNbMF0ubGVmdCgpLCBsaW5lc1swXS50 b3AoKSB9OwotICAgICAgICBlbHNlIHsKLSAgICAgICAgICAgIGF1dG8mIGN1cnJlbnRMaW5lID0g bGluZXNbcHJldmlvdXNEaXNwbGF5Qm94LT5saW5lSW5kZXgoKV07Ci0gICAgICAgICAgICBhdXRv IHNob3VsZEZpdExpbmUgPSBwcmV2aW91c0Rpc3BsYXlCb3gtPnJpZ2h0KCkgPD0gY3VycmVudExp bmUucmlnaHQoKSAmJiAhcHJldmlvdXNEaXNwbGF5Qm94LT5pc0xpbmVCcmVha0JveCgpOwotICAg ICAgICAgICAgdG9wTGVmdCA9IHNob3VsZEZpdExpbmUgPyBMYXlvdXRQb2ludCB7IHByZXZpb3Vz RGlzcGxheUJveC0+cmlnaHQoKSwgY3VycmVudExpbmUudG9wKCkgfSA6IExheW91dFBvaW50IHsg Y3VycmVudExpbmUubGVmdCgpLCBjdXJyZW50TGluZS5ib3R0b20oKSB9OworICAgICAgICBpZiAo b3V0T2ZGbG93Qm94LT5zdHlsZSgpLmlzT3JpZ2luYWxEaXNwbGF5SW5saW5lVHlwZSgpKSB7Cisg ICAgICAgICAgICBmb3JtYXR0aW5nU3RhdGUuYm94R2VvbWV0cnkob3V0T2ZGbG93Qm94KS5zZXRM b2dpY2FsVG9wTGVmdChmb3JtYXR0aW5nR2VvbWV0cnkuc3RhdGljUG9zaXRpb25Gb3JPdXRPZkZs b3dJbmxpbmVMZXZlbEJveChvdXRPZkZsb3dCb3gpKTsKKyAgICAgICAgICAgIGNvbnRpbnVlOwog ICAgICAgICB9Ci0gICAgICAgIGZvcm1hdHRpbmdTdGF0ZS5ib3hHZW9tZXRyeShvdXRPZkZsb3dC b3gpLnNldExvZ2ljYWxUb3BMZWZ0KHRvcExlZnQpOworICAgICAgICBmb3JtYXR0aW5nU3RhdGUu Ym94R2VvbWV0cnkob3V0T2ZGbG93Qm94KS5zZXRMb2dpY2FsVG9wTGVmdChmb3JtYXR0aW5nR2Vv bWV0cnkuc3RhdGljUG9zaXRpb25Gb3JPdXRPZkZsb3dCbG9ja0xldmVsQm94KG91dE9mRmxvd0Jv eCkpOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0dlb21ldHJ5LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRp bmdHZW9tZXRyeS5jcHAKaW5kZXggNWY5MDRmYjk3ZDllLi5kM2UzNjZkODBiOGMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGlu ZUZvcm1hdHRpbmdHZW9tZXRyeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0dlb21ldHJ5LmNwcApAQCAtMTkz LDcgKzE5Myw3IEBAIElubGluZUxheW91dFVuaXQgSW5saW5lRm9ybWF0dGluZ0dlb21ldHJ5Ojpj b21wdXRlZFRleHRJbmRlbnQoSXNJbnRyaW5zaWNXaWR0aE1vCiAgICAgcmV0dXJuIHsgbWluaW11 bVZhbHVlRm9yTGVuZ3RoKHRleHRJbmRlbnQsIGF2YWlsYWJsZVdpZHRoKSB9OwogfQogCi1zdGQ6 OnR1cGxlPGNvbnN0IElubGluZURpc3BsYXk6OkJveCosIGNvbnN0IElubGluZURpc3BsYXk6OkJv eCo+IElubGluZUZvcm1hdHRpbmdHZW9tZXRyeTo6cHJldmlvdXNBbmROZXh0RGlzcGxheUJveEZv clN0YXRpY1Bvc2l0aW9uKGNvbnN0IEJveCYgb3V0T2ZGbG93Qm94LCBjb25zdCBEaXNwbGF5Qm94 ZXMmIGRpc3BsYXlCb3hlcykKK3N0YXRpYyBzdGQ6OnR1cGxlPGNvbnN0IElubGluZURpc3BsYXk6 OkJveCosIGNvbnN0IElubGluZURpc3BsYXk6OkJveCo+IHByZXZpb3VzQW5kTmV4dERpc3BsYXlC b3hGb3JTdGF0aWNQb3NpdGlvbihjb25zdCBCb3gmIG91dE9mRmxvd0JveCwgY29uc3QgRGlzcGxh eUJveGVzJiBkaXNwbGF5Qm94ZXMpCiB7CiAgICAgLy8gQm90aCBwcmV2aW91cyBmbG9hdCBhbmQg b3V0LW9mLWZsb3cgYm94ZXMgYXJlIHNraXBwZWQgaGVyZS4gQSBzZXJpZXMgb2YgYWRqb2luaW5n IG91dC1vZi1mbG93IGJveGVzIHNob3VsZCBhbGwgYmUgcGxhY2VkCiAgICAgLy8gYXQgdGhlIHNh bWUgc3RhdGljIHBvc2l0aW9uICh0aGV5IGRvbid0IGFmZmVjdCBuZXh0LXNpYmxpbmcgcG9zaXRp b25zKSBhbmQgd2hpbGUgZmxvYXRzIGRvIHBhcnRpY2lwYXRlIGluIHRoZSBpbmxpbmUgbGF5b3V0 CkBAIC0yMjcsNiArMjI3LDYyIEBAIHN0ZDo6dHVwbGU8Y29uc3QgSW5saW5lRGlzcGxheTo6Qm94 KiwgY29uc3QgSW5saW5lRGlzcGxheTo6Qm94Kj4gSW5saW5lRm9ybWF0dGluCiAgICAgcmV0dXJu IHsgbnVsbHB0ciwgbnVsbHB0ciB9OwogfQogCitMYXlvdXRQb2ludCBJbmxpbmVGb3JtYXR0aW5n R2VvbWV0cnk6OnN0YXRpY1Bvc2l0aW9uRm9yT3V0T2ZGbG93SW5saW5lTGV2ZWxCb3goY29uc3Qg Qm94JiBvdXRPZkZsb3dCb3gpIGNvbnN0Cit7CisgICAgQVNTRVJUKG91dE9mRmxvd0JveC5zdHls ZSgpLmlzT3JpZ2luYWxEaXNwbGF5SW5saW5lVHlwZSgpKTsKKworICAgIGF1dG8mIGZvcm1hdHRp bmdTdGF0ZSA9IGZvcm1hdHRpbmdDb250ZXh0KCkuZm9ybWF0dGluZ1N0YXRlKCk7CisgICAgYXV0 byYgbGluZXMgPSBmb3JtYXR0aW5nU3RhdGUubGluZXMoKTsKKyAgICBhdXRvJiBib3hlcyA9IGZv cm1hdHRpbmdTdGF0ZS5ib3hlcygpOworCisgICAgYXV0byBbcHJldmlvdXNEaXNwbGF5Qm94LCBu ZXh0RGlzcGxheUJveF0gPSBwcmV2aW91c0FuZE5leHREaXNwbGF5Qm94Rm9yU3RhdGljUG9zaXRp b24ob3V0T2ZGbG93Qm94LCBib3hlcyk7CisKKyAgICBpZiAoIXByZXZpb3VzRGlzcGxheUJveCAm JiAhbmV4dERpc3BsYXlCb3gpCisgICAgICAgIHJldHVybiB7IGJveGVzWzBdLmxlZnQoKSwgbGlu ZXNbMF0udG9wKCkgfTsKKworICAgIGlmICghbmV4dERpc3BsYXlCb3gpIHsKKyAgICAgICAgYXV0 byYgY3VycmVudExpbmUgPSBsaW5lc1twcmV2aW91c0Rpc3BsYXlCb3gtPmxpbmVJbmRleCgpXTsK KyAgICAgICAgYXV0byBzaG91bGRGaXRMaW5lID0gcHJldmlvdXNEaXNwbGF5Qm94LT5yaWdodCgp IDw9IGN1cnJlbnRMaW5lLnJpZ2h0KCkgJiYgIXByZXZpb3VzRGlzcGxheUJveC0+aXNMaW5lQnJl YWtCb3goKTsKKyAgICAgICAgcmV0dXJuIHNob3VsZEZpdExpbmUgPyBMYXlvdXRQb2ludCB7IHBy ZXZpb3VzRGlzcGxheUJveC0+cmlnaHQoKSwgY3VycmVudExpbmUudG9wKCkgfSA6IExheW91dFBv aW50IHsgY3VycmVudExpbmUubGVmdCgpLCBjdXJyZW50TGluZS5ib3R0b20oKSB9OworICAgIH0K KworICAgIGlmIChwcmV2aW91c0Rpc3BsYXlCb3gtPmlzSW5saW5lQm94KCkpIHsKKyAgICAgICAg Ly8gU3BlY2lhbCBoYW5kbGluZyBmb3IgY2FzZXMgd2hlbiB0aGUgcHJldmlvdXMgY29udGVudCBp cyBhbiBpbmxpbmUgYm94OgorICAgICAgICAvLyA8ZGl2PnRleHQ8c3Bhbj48aW1nIHN0eWxlPSJw b3NpdGlvbjogYWJzb2x1dGUiPmNvbnRlbnQ8L3NwYW4+PC9kaXY+CisgICAgICAgIC8vIG9yCisg ICAgICAgIC8vIDxkaXY+dGV4dDxzcGFuPmNvbnRlbnQ8L3NwYW4+PGltZyBzdHlsZT0icG9zaXRp b246IGFic29sdXRlIj48L2Rpdj4KKyAgICAgICAgYXV0byBpc0ZpcnN0Q29udGVudEluc2lkZUlu bGluZUJveCA9ICZvdXRPZkZsb3dCb3gucGFyZW50KCkgPT0gJnByZXZpb3VzRGlzcGxheUJveC0+ bGF5b3V0Qm94KCk7CisgICAgICAgIGF1dG8mIGlubGluZUJveEJveEdlb21ldHJ5ID0gZm9ybWF0 dGluZ0NvbnRleHQoKS5nZW9tZXRyeUZvckJveChwcmV2aW91c0Rpc3BsYXlCb3gtPmxheW91dEJv eCgpKTsKKworICAgICAgICByZXR1cm4geworICAgICAgICAgICAgaXNGaXJzdENvbnRlbnRJbnNp ZGVJbmxpbmVCb3ggPyBCb3hHZW9tZXRyeTo6Ym9yZGVyQm94TGVmdChpbmxpbmVCb3hCb3hHZW9t ZXRyeSkgKyBpbmxpbmVCb3hCb3hHZW9tZXRyeS5jb250ZW50Qm94TGVmdCgpIDogQm94R2VvbWV0 cnk6Om1hcmdpbkJveFJlY3QoaW5saW5lQm94Qm94R2VvbWV0cnkpLnJpZ2h0KCksCisgICAgICAg ICAgICBsaW5lc1twcmV2aW91c0Rpc3BsYXlCb3gtPmxpbmVJbmRleCgpXS50b3AoKQorICAgICAg ICB9OworICAgIH0KKyAgICBhdXRvJiBjdXJyZW50TGluZSA9IGxpbmVzW3ByZXZpb3VzRGlzcGxh eUJveC0+bGluZUluZGV4KCldOworICAgIGF1dG8gc2hvdWxkRml0TGluZSA9IHByZXZpb3VzRGlz cGxheUJveC0+bGluZUluZGV4KCkgPT0gbmV4dERpc3BsYXlCb3gtPmxpbmVJbmRleCgpIHx8IChw cmV2aW91c0Rpc3BsYXlCb3gtPnJpZ2h0KCkgPD0gY3VycmVudExpbmUubGVmdCgpICYmICFwcmV2 aW91c0Rpc3BsYXlCb3gtPmlzTGluZUJyZWFrQm94KCkpOworICAgIHJldHVybiBzaG91bGRGaXRM aW5lID8gTGF5b3V0UG9pbnQgeyBwcmV2aW91c0Rpc3BsYXlCb3gtPnJpZ2h0KCksIGN1cnJlbnRM aW5lLnRvcCgpIH0gOiBMYXlvdXRQb2ludCB7IG5leHREaXNwbGF5Qm94LT5sZWZ0KCksIGxpbmVz W25leHREaXNwbGF5Qm94LT5saW5lSW5kZXgoKV0udG9wKCkgfTsKK30KKworTGF5b3V0UG9pbnQg SW5saW5lRm9ybWF0dGluZ0dlb21ldHJ5OjpzdGF0aWNQb3NpdGlvbkZvck91dE9mRmxvd0Jsb2Nr TGV2ZWxCb3goY29uc3QgQm94JiBvdXRPZkZsb3dCb3gpIGNvbnN0Cit7CisgICAgQVNTRVJUKG91 dE9mRmxvd0JveC5zdHlsZSgpLmlzT3JpZ2luYWxEaXNwbGF5QmxvY2tUeXBlKCkpOworCisgICAg YXV0byYgZm9ybWF0dGluZ1N0YXRlID0gZm9ybWF0dGluZ0NvbnRleHQoKS5mb3JtYXR0aW5nU3Rh dGUoKTsKKyAgICBhdXRvJiBsaW5lcyA9IGZvcm1hdHRpbmdTdGF0ZS5saW5lcygpOworICAgIGF1 dG8mIGJveGVzID0gZm9ybWF0dGluZ1N0YXRlLmJveGVzKCk7CisKKyAgICAvLyBCbG9jayBsZXZl bCBib3hlcyBhcmUgcGxhY2VkIHVuZGVyIHRoZSBjdXJyZW50IGxpbmUgYXMgaWYgdGhleSB3ZXJl IG5vcm1hbCBpbmZsb3cgYmxvY2sgbGV2ZWwgYm94ZXMuCisgICAgY29uc3QgSW5saW5lRGlzcGxh eTo6Qm94KiBwcmV2aW91c0Rpc3BsYXlCb3ggPSBudWxscHRyOworICAgIHN0ZDo6dGllKHByZXZp b3VzRGlzcGxheUJveCwgc3RkOjppZ25vcmUpID0gcHJldmlvdXNBbmROZXh0RGlzcGxheUJveEZv clN0YXRpY1Bvc2l0aW9uKG91dE9mRmxvd0JveCwgYm94ZXMpOworCisgICAgaWYgKCFwcmV2aW91 c0Rpc3BsYXlCb3gpCisgICAgICAgIHJldHVybiB7IGJveGVzWzBdLmxlZnQoKSwgbGluZXNbMF0u dG9wKCkgfTsKKworICAgIGF1dG8mIGN1cnJlbnRMaW5lID0gbGluZXNbcHJldmlvdXNEaXNwbGF5 Qm94LT5saW5lSW5kZXgoKV07CisgICAgcmV0dXJuIHsgY3VycmVudExpbmUubGVmdCgpLCBjdXJy ZW50TGluZS5ib3R0b20oKSB9OworfQorCiBJbmxpbmVMYXlvdXRVbml0IElubGluZUZvcm1hdHRp bmdHZW9tZXRyeTo6aW5pdGlhbExpbmVIZWlnaHQoKSBjb25zdAogewogICAgIGlmIChsYXlvdXRT dGF0ZSgpLmluU3RhbmRhcmRzTW9kZSgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0dlb21ldHJ5Lmgg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVG b3JtYXR0aW5nR2VvbWV0cnkuaAppbmRleCA3YzAwMzNlNGFkODYuLjBmYmMzMzUzMjI2ZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUv SW5saW5lRm9ybWF0dGluZ0dlb21ldHJ5LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0dlb21ldHJ5LmgKQEAgLTUz LDcgKzUzLDkgQEAgcHVibGljOgogICAgIHN0ZDo6b3B0aW9uYWw8SG9yaXpvbnRhbENvbnN0cmFp bnRzPiBmbG9hdENvbnN0cmFpbnRzRm9yTGluZShjb25zdCBJbmxpbmVSZWN0JiBsaW5lTG9naWNh bFJlY3QsIGNvbnN0IEZsb2F0aW5nQ29udGV4dCYpIGNvbnN0OwogCiAgICAgc3RhdGljIElubGlu ZVJlY3QgZmxpcFZpc3VhbFJlY3RUb0xvZ2ljYWxGb3JXcml0aW5nTW9kZShjb25zdCBJbmxpbmVS ZWN0JiB2aXN1YWxSZWN0LCBXcml0aW5nTW9kZSk7Ci0gICAgc3RhdGljIHN0ZDo6dHVwbGU8Y29u c3QgSW5saW5lRGlzcGxheTo6Qm94KiwgY29uc3QgSW5saW5lRGlzcGxheTo6Qm94Kj4gcHJldmlv dXNBbmROZXh0RGlzcGxheUJveEZvclN0YXRpY1Bvc2l0aW9uKGNvbnN0IEJveCYgb3V0T2ZGbG93 Qm94LCBjb25zdCBEaXNwbGF5Qm94ZXMmKTsKKworICAgIExheW91dFBvaW50IHN0YXRpY1Bvc2l0 aW9uRm9yT3V0T2ZGbG93SW5saW5lTGV2ZWxCb3goY29uc3QgQm94JikgY29uc3Q7CisgICAgTGF5 b3V0UG9pbnQgc3RhdGljUG9zaXRpb25Gb3JPdXRPZkZsb3dCbG9ja0xldmVsQm94KGNvbnN0IEJv eCYpIGNvbnN0OwogCiBwcml2YXRlOgogICAgIGNvbnN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0 JiBmb3JtYXR0aW5nQ29udGV4dCgpIGNvbnN0IHsgcmV0dXJuIGRvd25jYXN0PElubGluZUZvcm1h dHRpbmdDb250ZXh0PihGb3JtYXR0aW5nR2VvbWV0cnk6OmZvcm1hdHRpbmdDb250ZXh0KCkpOyB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUu aCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCmluZGV4IDM1 ODhmODVlZGEyZi4uMDk3ZDkyNmM0ODM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv c3R5bGUvUmVuZGVyU3R5bGUuaApAQCAtMTU2NSw3ICsxNTY1LDggQEAgcHVibGljOgogICAgIGJv b2wgaXNEaXNwbGF5RmxleGlibGVPckdyaWRCb3goKSBjb25zdCB7IHJldHVybiBpc0Rpc3BsYXlG bGV4aWJsZU9yR3JpZEJveChkaXNwbGF5KCkpOyB9CiAgICAgYm9vbCBpc0Rpc3BsYXlGbGV4aWJs ZUJveEluY2x1ZGluZ0RlcHJlY2F0ZWRPckdyaWRCb3goKSBjb25zdCB7IHJldHVybiBpc0Rpc3Bs YXlGbGV4aWJsZU9yR3JpZEJveCgpIHx8IGlzRGlzcGxheURlcHJlY2F0ZWRGbGV4aWJsZUJveChk aXNwbGF5KCkpOyB9CiAgICAgYm9vbCBpc0Rpc3BsYXlSZWdpb25UeXBlKCkgY29uc3Q7Ci0gICAg Ym9vbCBpc0Rpc3BsYXlCbG9ja0xldmVsKCkgY29uc3Q7CisgICAgYm9vbCBpc0Rpc3BsYXlCbG9j a0xldmVsKCkgY29uc3QgeyByZXR1cm4gaXNEaXNwbGF5QmxvY2tUeXBlKGRpc3BsYXkoKSk7IH0K KyAgICBib29sIGlzT3JpZ2luYWxEaXNwbGF5QmxvY2tUeXBlKCkgY29uc3QgeyByZXR1cm4gaXNE aXNwbGF5QmxvY2tUeXBlKG9yaWdpbmFsRGlzcGxheSgpKTsgfQogICAgIGJvb2wgaXNEaXNwbGF5 VGFibGVPclRhYmxlUGFydCgpIGNvbnN0IHsgcmV0dXJuIGlzRGlzcGxheVRhYmxlT3JUYWJsZVBh cnQoZGlzcGxheSgpKTsgfQogICAgIGJvb2wgaXNPcmlnaW5hbERpc3BsYXlMaXN0SXRlbVR5cGUo KSBjb25zdCB7IHJldHVybiBpc0Rpc3BsYXlMaXN0SXRlbVR5cGUob3JpZ2luYWxEaXNwbGF5KCkp OyB9CiAKQEAgLTIwNjgsNiArMjA2OSw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBoYXNBdXRvVG9w QW5kQm90dG9tKCkgY29uc3QgeyByZXR1cm4gdG9wKCkuaXNBdXRvKCkgJiYgYm90dG9tKCkuaXNB dXRvKCk7IH0KIAogICAgIHN0YXRpYyBib29sIGlzRGlzcGxheUlubGluZVR5cGUoRGlzcGxheVR5 cGUpOworICAgIHN0YXRpYyBib29sIGlzRGlzcGxheUJsb2NrVHlwZShEaXNwbGF5VHlwZSk7CiAg ICAgc3RhdGljIGJvb2wgaXNEaXNwbGF5RmxleGlibGVCb3goRGlzcGxheVR5cGUpOwogICAgIHN0 YXRpYyBib29sIGlzRGlzcGxheUdyaWRCb3goRGlzcGxheVR5cGUpOwogICAgIHN0YXRpYyBib29s IGlzRGlzcGxheUZsZXhpYmxlT3JHcmlkQm94KERpc3BsYXlUeXBlKTsKQEAgLTI0NTUsMTEgKzI0 NTcsMTEgQEAgaW5saW5lIGJvb2wgUmVuZGVyU3R5bGU6OmlzRGlzcGxheVJlZ2lvblR5cGUoKSBj b25zdAogICAgICAgICB8fCBkaXNwbGF5KCkgPT0gRGlzcGxheVR5cGU6Okxpc3RJdGVtOwogfQog Ci1pbmxpbmUgYm9vbCBSZW5kZXJTdHlsZTo6aXNEaXNwbGF5QmxvY2tMZXZlbCgpIGNvbnN0Citp bmxpbmUgYm9vbCBSZW5kZXJTdHlsZTo6aXNEaXNwbGF5QmxvY2tUeXBlKERpc3BsYXlUeXBlIGRp c3BsYXkpCiB7Ci0gICAgcmV0dXJuIGRpc3BsYXkoKSA9PSBEaXNwbGF5VHlwZTo6QmxvY2sgfHwg ZGlzcGxheSgpID09IERpc3BsYXlUeXBlOjpUYWJsZQotICAgICAgICB8fCBkaXNwbGF5KCkgPT0g RGlzcGxheVR5cGU6OkZsb3dSb290IHx8IGRpc3BsYXkoKSA9PSBEaXNwbGF5VHlwZTo6R3JpZAot ICAgICAgICB8fCBkaXNwbGF5KCkgPT0gRGlzcGxheVR5cGU6OkZsZXggfHwgZGlzcGxheSgpID09 IERpc3BsYXlUeXBlOjpMaXN0SXRlbTsKKyAgICByZXR1cm4gZGlzcGxheSA9PSBEaXNwbGF5VHlw ZTo6QmxvY2sgfHwgZGlzcGxheSA9PSBEaXNwbGF5VHlwZTo6VGFibGUKKyAgICAgICAgfHwgZGlz cGxheSA9PSBEaXNwbGF5VHlwZTo6Rmxvd1Jvb3QgfHwgZGlzcGxheSA9PSBEaXNwbGF5VHlwZTo6 R3JpZAorICAgICAgICB8fCBkaXNwbGF5ID09IERpc3BsYXlUeXBlOjpGbGV4IHx8IGRpc3BsYXkg PT0gRGlzcGxheVR5cGU6Okxpc3RJdGVtOwogfQogCiBpbmxpbmUgYm9vbCBSZW5kZXJTdHlsZTo6 c2V0V3JpdGluZ01vZGUoV3JpdGluZ01vZGUgdikK