251210 2023-01-26 08:11:39 -0800 [IFC] Rename InlineDisplay::Line::contentVisualOffsetInInlineDirection to contentLogicalLeftIgnoringInlineDirection 2023-01-26 13:12:03 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 251169 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1928607 0 zalan 2023-01-26 08:11:39 -0800 ssia 1928612 1 464669 zalan 2023-01-26 08:34:26 -0800 Created attachment 464669 [fast-cq]Patch 1928662 2 ews-feeder 2023-01-26 11:20:32 -0800 Committed 259443@main (f1b16009440d): <https://commits.webkit.org/259443@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 464669. 1928665 3 webkit-bug-importer 2023-01-26 11:21:34 -0800 <rdar://problem/104704865> 464669 2023-01-26 08:34:26 -0800 2023-01-26 13:12:03 -0800 [fast-cq]Patch bug-251210-20230126083425.patch text/plain 17407 zalan RnJvbSBhMmMwODAwNDIwZjQzZWRlMDM5M2YyZDAyMDUxZjVlMDcxYmUyYWU0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFRodSwgMjYgSmFuIDIwMjMgMDg6MTE6NTUgLTA4MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXSBS ZW5hbWUKIElubGluZURpc3BsYXk6OkxpbmU6OmNvbnRlbnRWaXN1YWxPZmZzZXRJbklubGluZURp cmVjdGlvbiB0bwogY29udGVudExvZ2ljYWxMZWZ0SWdub3JpbmdJbmxpbmVEaXJlY3Rpb24KIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNTEyMTAKClJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgoKVGhpcyB2YWx1ZSByZXByZXNlbnRzIHRoZSBjb250ZW50IChyb290 IGlubGluZSBib3gpIG9mZnNldCBmcm9tIHRoZSBsaW5lIGJveC4gSXQncyBtb3N0bHkgMCBidXQg aW4gY2VydGFpbiBjYXNlcyBsaWtlIHRleHQtYWxpZ24sCnRoZSBjb250ZW50IGlzIG5vdCBuZWNl c3NhcmlseSBpbiBmbHVzaCB3aXRoIHRoZSBsaW5lIGJveC4KVGhlICJsb2dpY2FsIiBwcmVmaXgg YW5kICJpZ25vcmluZ0lubGluZURpcmVjdGlvbiIgcG9zdGZpeCBmb2xsb3dzIHRoZSBpdGVyYXRv ciBuYW1pbmcgY29udmVudGlvbiB3aGVyZSAibG9naWNhbCIgbWVhbnMgbm90IGFwcGx5aW5nIHdy aXRpbmcgbW9kZQp3aGlsZSAiaWdub3JpbmdJbmxpbmVEaXJlY3Rpb24iIG1lYW5zIHRyZWF0IHRo aXMgdmFsdWUgYXMgaWYgdGhlIGlubGluZSBkaXJlY3Rpb24gd2FzIGxlZnQtdG8tcmlnaHQgKGku ZS4gaW4gY2FzZSBvZiAid3JpdGluZy1tb2RlOiBob3Jpem9udGFsLXRiIiwgYW5kIHJlZ2FyZGxl c3Mgb2YgImRpciIgdmFsdWUsIHRoaXMgaXMgdGhlIHZpc3VhbCBsZWZ0LCBidXQgd2UgY2FuJ3Qg dXNlIHRoZSAidmlzdWFsIiBwcmVmaXggaGVyZSkuCgpUaGlzIHBhdGNoIGFsc28gYWRkcyB0aGUg InRydWUiIGxvZ2ljYWwgY29udGVudCBvZmZzZXQgYXMgcHJlcGFyYXRpb24gZm9yIGZpeGluZyB0 YWIgd2lkdGggY29tcHV0YXRpb24gYXQgcGFpbnRpbmcgdGltZS4KCiogU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5Q29u dGVudEJ1aWxkZXIuY3BwOgooV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVEaXNwbGF5Q29udGVudEJ1 aWxkZXI6OnByb2Nlc3NCaWRpQ29udGVudCk6CiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5TGluZS5oOgooV2ViQ29y ZTo6SW5saW5lRGlzcGxheTo6TGluZTo6Y29udGVudExvZ2ljYWxMZWZ0IGNvbnN0KToKKFdlYkNv cmU6OklubGluZURpc3BsYXk6OkxpbmU6OmNvbnRlbnRMb2dpY2FsTGVmdElnbm9yaW5nSW5saW5l RGlyZWN0aW9uIGNvbnN0KToKKFdlYkNvcmU6OklubGluZURpc3BsYXk6OkxpbmU6OkxpbmUpOgoo V2ViQ29yZTo6SW5saW5lRGlzcGxheTo6TGluZTo6Y29udGVudFZpc3VhbE9mZnNldEluSW5saW5l RGlyZWN0aW9uIGNvbnN0KTogRGVsZXRlZC4KKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlMaW5lQnVpbGRlci5jcHA6 CihXZWJDb3JlOjpMYXlvdXQ6OklubGluZURpc3BsYXlMaW5lQnVpbGRlcjo6YnVpbGQgY29uc3Qp OgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9pbmxpbmUvSW5saW5lSXRlcmF0 b3JCb3hNb2Rlcm5QYXRoLmg6CihXZWJDb3JlOjpJbmxpbmVJdGVyYXRvcjo6Qm94TW9kZXJuUGF0 aDo6dGV4dFJ1biBjb25zdCk6CiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL2lu bGluZS9JbmxpbmVJdGVyYXRvckxpbmVCb3hNb2Rlcm5QYXRoLmg6CihXZWJDb3JlOjpJbmxpbmVJ dGVyYXRvcjo6TGluZUJveEl0ZXJhdG9yTW9kZXJuUGF0aDo6Y29udGVudExvZ2ljYWxMZWZ0IGNv bnN0KToKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0xheW91dElu dGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuY3BwOgooV2ViQ29yZTo6TGF5b3V0SW50ZWdy YXRpb246OklubGluZUNvbnRlbnRCdWlsZGVyOjpjcmVhdGVEaXNwbGF5TGluZXMgY29uc3QpOgoq IFNvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9pbmxpbmUvTGF5b3V0SW50ZWdyYXRp b25MaW5lLmg6CihXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6TGluZTo6TGluZSk6CihXZWJD b3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6TGluZTo6Y29udGVudExvZ2ljYWxMZWZ0IGNvbnN0KToK KFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpMaW5lOjpjb250ZW50TG9naWNhbExlZnRJZ25v cmluZ0lubGluZURpcmVjdGlvbiBjb25zdCk6CihXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6 TGluZTo6Y29udGVudFZpc3VhbE9mZnNldEluSW5saW5lRGlyZWN0aW9uIGNvbnN0KTogRGVsZXRl ZC4KKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0xheW91dEludGVn cmF0aW9uUGFnaW5hdGlvbi5jcHA6CihXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6bWFrZUFk anVzdGVkQ29udGVudCk6Ci0tLQogLi4uL2Rpc3BsYXkvSW5saW5lRGlzcGxheUNvbnRlbnRCdWls ZGVyLmNwcCAgICAgICB8ICA0ICsrLS0KIC4uLi9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5 TGluZS5oICAgICAgICAgICAgfCAxNSArKysrKysrKysrLS0tLS0KIC4uLi9pbmxpbmUvZGlzcGxh eS9JbmxpbmVEaXNwbGF5TGluZUJ1aWxkZXIuY3BwICAgfCAgMSArCiAuLi4vaW5saW5lL0lubGlu ZUl0ZXJhdG9yQm94TW9kZXJuUGF0aC5oICAgICAgICAgIHwgIDIgKy0KIC4uLi9pbmxpbmUvSW5s aW5lSXRlcmF0b3JMaW5lQm94TW9kZXJuUGF0aC5oICAgICAgfCAgMiArLQogLi4uL0xheW91dElu dGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuY3BwICAgICB8ICAyICstCiAuLi4vaW50ZWdy YXRpb24vaW5saW5lL0xheW91dEludGVncmF0aW9uTGluZS5oICAgIHwgMTMgKysrKysrKysrLS0t LQogLi4uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvblBhZ2luYXRpb24uY3BwICAgICAgICB8ICAz ICsrLQogOCBmaWxlcyBjaGFuZ2VkLCAyNyBpbnNlcnRpb25zKCspLCAxNSBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3Bs YXlDb250ZW50QnVpbGRlci5jcHAKaW5kZXggMmE4MTdlMDUwZjExLi5hZDk5ZTU3YmE3MGEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L2Rpc3BsYXkvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3Bs YXlDb250ZW50QnVpbGRlci5jcHAKQEAgLTY1OCwxMiArNjU4LDEyIEBAIHZvaWQgSW5saW5lRGlz cGxheUNvbnRlbnRCdWlsZGVyOjpwcm9jZXNzQmlkaUNvbnRlbnQoY29uc3QgTGluZUJ1aWxkZXI6 OkxpbmVDb250CiAKICAgICBhdXRvIGxpbmVMb2dpY2FsVG9wID0gaXNIb3Jpem9udGFsV3JpdGlu Z01vZGUgPyBkaXNwbGF5TGluZS50b3AoKSA6IGRpc3BsYXlMaW5lLmxlZnQoKTsKICAgICBhdXRv IGxpbmVMb2dpY2FsTGVmdCA9IGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlID8gZGlzcGxheUxpbmUu bGVmdCgpIDogZGlzcGxheUxpbmUudG9wKCk7Ci0gICAgYXV0byBjb250ZW50U3RhcnRJbklubGlu ZURpcmVjdGlvblZpc3VhbE9yZGVyID0gbGluZUxvZ2ljYWxMZWZ0ICsgZGlzcGxheUxpbmUuY29u dGVudFZpc3VhbE9mZnNldEluSW5saW5lRGlyZWN0aW9uKCk7CisgICAgYXV0byBjb250ZW50U3Rh cnRJbklubGluZURpcmVjdGlvblZpc3VhbE9yZGVyID0gbGluZUxvZ2ljYWxMZWZ0ICsgZGlzcGxh eUxpbmUuY29udGVudExvZ2ljYWxMZWZ0SWdub3JpbmdJbmxpbmVEaXJlY3Rpb24oKTsKICAgICBh dXRvIGhhc0lubGluZUJveCA9IGZhbHNlOwogICAgIGF1dG8gY3JlYXRlRGlzcGxheUJveGVzSW5W aXN1YWxPcmRlciA9IFsmXSB7CiAKICAgICAgICAgYXV0byByb290SW5saW5lQm94Vmlkc3VhbFJl Y3RJbklubGluZURpcmVjdGlvbiA9IGxpbmVCb3gubG9naWNhbFJlY3RGb3JSb290SW5saW5lQm94 KCk7Ci0gICAgICAgIHJvb3RJbmxpbmVCb3hWaWRzdWFsUmVjdEluSW5saW5lRGlyZWN0aW9uLnNl dExlZnQoZGlzcGxheUxpbmUuY29udGVudFZpc3VhbE9mZnNldEluSW5saW5lRGlyZWN0aW9uKCkp OworICAgICAgICByb290SW5saW5lQm94Vmlkc3VhbFJlY3RJbklubGluZURpcmVjdGlvbi5zZXRM ZWZ0KGRpc3BsYXlMaW5lLmNvbnRlbnRMb2dpY2FsTGVmdElnbm9yaW5nSW5saW5lRGlyZWN0aW9u KCkpOwogICAgICAgICBhcHBlbmRSb290SW5saW5lQm94RGlzcGxheUJveChmbGlwUm9vdElubGlu ZUJveFJlY3RUb1Zpc3VhbEZvcldyaXRpbmdNb2RlKHJvb3RJbmxpbmVCb3hWaWRzdWFsUmVjdElu SW5saW5lRGlyZWN0aW9uLCBkaXNwbGF5TGluZSwgcm9vdCgpLnN0eWxlKCkud3JpdGluZ01vZGUo KSksIGxpbmVCb3gucm9vdElubGluZUJveCgpLmhhc0NvbnRlbnQoKSwgYm94ZXMpOwogCiAgICAg ICAgIGF1dG8gY29udGVudFJpZ2h0SW5JbmxpbmVEaXJlY3Rpb25WaXN1YWxPcmRlciA9IGNvbnRl bnRTdGFydEluSW5saW5lRGlyZWN0aW9uVmlzdWFsT3JkZXI7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURp c3BsYXlMaW5lLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlMaW5lLmgKaW5kZXggNDAzZGUzZjcwZjVmLi42YjZh NGU4ODIwYWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUxpbmUuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3Bs YXlMaW5lLmgKQEAgLTM5LDcgKzM5LDcgQEAgcHVibGljOgogICAgICAgICBmbG9hdCB0b3AgeyAw IH07CiAgICAgICAgIGZsb2F0IGJvdHRvbSB7IDAgfTsKICAgICB9OwotICAgIExpbmUoY29uc3Qg RmxvYXRSZWN0JiBsaW5lQm94TG9naWNhbFJlY3QsIGNvbnN0IEZsb2F0UmVjdCYgbGluZUJveFJl Y3QsIGNvbnN0IEZsb2F0UmVjdCYgc2Nyb2xsYWJsZU92ZXJmbG93LCBFbmNsb3NpbmdUb3BBbmRC b3R0b20sIGZsb2F0IGFsaWdtZW50QmFzZWxpbmUsIEZvbnRCYXNlbGluZSBiYXNlbGluZVR5cGUs IGZsb2F0IGNvbnRlbnRWaXN1YWxPZmZzZXRJbklubGluZURpcmVjdGlvbiwgZmxvYXQgY29udGVu dExvZ2ljYWxXaWR0aCwgYm9vbCBpc0hvcml6b250YWwsIHN0ZDo6b3B0aW9uYWw8RmxvYXRSZWN0 PiBlbGxpcHNpc1Zpc3VhbFJlY3QpOworICAgIExpbmUoY29uc3QgRmxvYXRSZWN0JiBsaW5lQm94 TG9naWNhbFJlY3QsIGNvbnN0IEZsb2F0UmVjdCYgbGluZUJveFJlY3QsIGNvbnN0IEZsb2F0UmVj dCYgc2Nyb2xsYWJsZU92ZXJmbG93LCBFbmNsb3NpbmdUb3BBbmRCb3R0b20sIGZsb2F0IGFsaWdt ZW50QmFzZWxpbmUsIEZvbnRCYXNlbGluZSBiYXNlbGluZVR5cGUsIGZsb2F0IGNvbnRlbnRMb2dp Y2FsTGVmdCwgZmxvYXQgY29udGVudExvZ2ljYWxMZWZ0SWdub3JpbmdJbmxpbmVEaXJlY3Rpb24s IGZsb2F0IGNvbnRlbnRMb2dpY2FsV2lkdGgsIGJvb2wgaXNIb3Jpem9udGFsLCBzdGQ6Om9wdGlv bmFsPEZsb2F0UmVjdD4gZWxsaXBzaXNWaXN1YWxSZWN0KTsKIAogICAgIGZsb2F0IGxlZnQoKSBj b25zdCB7IHJldHVybiBtX2xpbmVCb3hSZWN0LngoKTsgfQogICAgIGZsb2F0IHJpZ2h0KCkgY29u c3QgeyByZXR1cm4gbV9saW5lQm94UmVjdC5tYXhYKCk7IH0KQEAgLTYxLDcgKzYxLDkgQEAgcHVi bGljOgogCiAgICAgc3RkOjpvcHRpb25hbDxGbG9hdFJlY3Q+IGVsbGlwc2lzVmlzdWFsUmVjdCgp IGNvbnN0IHsgcmV0dXJuIG1fZWxsaXBzaXNWaXN1YWxSZWN0OyB9CiAKLSAgICBmbG9hdCBjb250 ZW50VmlzdWFsT2Zmc2V0SW5JbmxpbmVEaXJlY3Rpb24oKSBjb25zdCB7IHJldHVybiBtX2NvbnRl bnRWaXN1YWxPZmZzZXRJbklubGluZURpcmVjdGlvbjsgfQorICAgIGZsb2F0IGNvbnRlbnRMb2dp Y2FsTGVmdCgpIGNvbnN0IHsgcmV0dXJuIG1fY29udGVudExvZ2ljYWxMZWZ0OyB9CisgICAgLy8g VGhpcyBpcyAidmlzdWFsIiBsZWZ0IGluIGlubGluZSBkaXJlY3Rpb24gKGl0IGlzIHN0aWxsIGNv bnNpZGVyZWQgbG9naWNhbCBhcyB0aGVyZSdzIG5vIGZsaXAgZm9yIHdyaXRpbmcgbW9kZSkuCisg ICAgZmxvYXQgY29udGVudExvZ2ljYWxMZWZ0SWdub3JpbmdJbmxpbmVEaXJlY3Rpb24oKSBjb25z dCB7IHJldHVybiBtX2NvbnRlbnRMb2dpY2FsTGVmdElnbm9yaW5nSW5saW5lRGlyZWN0aW9uOyB9 CiAgICAgZmxvYXQgY29udGVudExvZ2ljYWxXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1fY29udGVu dExvZ2ljYWxXaWR0aDsgfQogCiAgICAgdm9pZCBtb3ZlVmVydGljYWxseShmbG9hdCBvZmZzZXQp IHsgbV9saW5lQm94UmVjdC5tb3ZlKHsgeyB9LCBvZmZzZXQgfSk7IH0KQEAgLTc2LDcgKzc4LDkg QEAgcHJpdmF0ZToKICAgICAvLyB0aGUgbGF5b3V0IGJvdW5kcyBvZiB0aGUgaW5saW5lIGxldmVs IGJveGVzIHdoaWNoIG1heSBiZSBkaWZmZXJlbnQgd2hlbiBsaW5lLWhlaWdodCBpcyBwcmVzZW50 LgogICAgIEVuY2xvc2luZ1RvcEFuZEJvdHRvbSBtX2VuY2xvc2luZ0xvZ2ljYWxUb3BBbmRCb3R0 b207CiAgICAgZmxvYXQgbV9hbGlnbWVudEJhc2VsaW5lIHsgMC5mIH07Ci0gICAgZmxvYXQgbV9j b250ZW50VmlzdWFsT2Zmc2V0SW5JbmxpbmVEaXJlY3Rpb24geyAwLmYgfTsKKyAgICAvLyBDb250 ZW50IGlzIG1vc3RseSBpbiBmbHVzaCB3aXRoIHRoZSBsaW5lIGJveCBlZGdlIGV4Y2VwdCBmb3Ig Y2FzZXMgbGlrZSB0ZXh0LWFsaWduLgorICAgIGZsb2F0IG1fY29udGVudExvZ2ljYWxMZWZ0IHsg MC5mIH07CisgICAgZmxvYXQgbV9jb250ZW50TG9naWNhbExlZnRJZ25vcmluZ0lubGluZURpcmVj dGlvbiB7IDAuZiB9OwogICAgIGZsb2F0IG1fY29udGVudExvZ2ljYWxXaWR0aCB7IDAuZiB9Owog ICAgIEZvbnRCYXNlbGluZSBtX2Jhc2VsaW5lVHlwZSB7IEFscGhhYmV0aWNCYXNlbGluZSB9Owog ICAgIGJvb2wgbV9pc0hvcml6b250YWwgeyB0cnVlIH07CkBAIC04NCwxMyArODgsMTQgQEAgcHJp dmF0ZToKICAgICBzdGQ6Om9wdGlvbmFsPEZsb2F0UmVjdD4gbV9lbGxpcHNpc1Zpc3VhbFJlY3Qg eyB9OwogfTsKIAotaW5saW5lIExpbmU6OkxpbmUoY29uc3QgRmxvYXRSZWN0JiBsaW5lQm94TG9n aWNhbFJlY3QsIGNvbnN0IEZsb2F0UmVjdCYgbGluZUJveFJlY3QsIGNvbnN0IEZsb2F0UmVjdCYg c2Nyb2xsYWJsZU92ZXJmbG93LCBFbmNsb3NpbmdUb3BBbmRCb3R0b20gZW5jbG9zaW5nTG9naWNh bFRvcEFuZEJvdHRvbSwgZmxvYXQgYWxpZ21lbnRCYXNlbGluZSwgRm9udEJhc2VsaW5lIGJhc2Vs aW5lVHlwZSwgZmxvYXQgY29udGVudFZpc3VhbE9mZnNldEluSW5saW5lRGlyZWN0aW9uLCBmbG9h dCBjb250ZW50TG9naWNhbFdpZHRoLCBib29sIGlzSG9yaXpvbnRhbCwgc3RkOjpvcHRpb25hbDxG bG9hdFJlY3Q+IGVsbGlwc2lzVmlzdWFsUmVjdCkKK2lubGluZSBMaW5lOjpMaW5lKGNvbnN0IEZs b2F0UmVjdCYgbGluZUJveExvZ2ljYWxSZWN0LCBjb25zdCBGbG9hdFJlY3QmIGxpbmVCb3hSZWN0 LCBjb25zdCBGbG9hdFJlY3QmIHNjcm9sbGFibGVPdmVyZmxvdywgRW5jbG9zaW5nVG9wQW5kQm90 dG9tIGVuY2xvc2luZ0xvZ2ljYWxUb3BBbmRCb3R0b20sIGZsb2F0IGFsaWdtZW50QmFzZWxpbmUs IEZvbnRCYXNlbGluZSBiYXNlbGluZVR5cGUsIGZsb2F0IGNvbnRlbnRMb2dpY2FsTGVmdCwgZmxv YXQgY29udGVudExvZ2ljYWxMZWZ0SWdub3JpbmdJbmxpbmVEaXJlY3Rpb24sIGZsb2F0IGNvbnRl bnRMb2dpY2FsV2lkdGgsIGJvb2wgaXNIb3Jpem9udGFsLCBzdGQ6Om9wdGlvbmFsPEZsb2F0UmVj dD4gZWxsaXBzaXNWaXN1YWxSZWN0KQogICAgIDogbV9saW5lQm94UmVjdChsaW5lQm94UmVjdCkK ICAgICAsIG1fbGluZUJveExvZ2ljYWxSZWN0KGxpbmVCb3hMb2dpY2FsUmVjdCkKICAgICAsIG1f c2Nyb2xsYWJsZU92ZXJmbG93KHNjcm9sbGFibGVPdmVyZmxvdykKICAgICAsIG1fZW5jbG9zaW5n TG9naWNhbFRvcEFuZEJvdHRvbShlbmNsb3NpbmdMb2dpY2FsVG9wQW5kQm90dG9tKQogICAgICwg bV9hbGlnbWVudEJhc2VsaW5lKGFsaWdtZW50QmFzZWxpbmUpCi0gICAgLCBtX2NvbnRlbnRWaXN1 YWxPZmZzZXRJbklubGluZURpcmVjdGlvbihjb250ZW50VmlzdWFsT2Zmc2V0SW5JbmxpbmVEaXJl Y3Rpb24pCisgICAgLCBtX2NvbnRlbnRMb2dpY2FsTGVmdChjb250ZW50TG9naWNhbExlZnQpCisg ICAgLCBtX2NvbnRlbnRMb2dpY2FsTGVmdElnbm9yaW5nSW5saW5lRGlyZWN0aW9uKGNvbnRlbnRM b2dpY2FsTGVmdElnbm9yaW5nSW5saW5lRGlyZWN0aW9uKQogICAgICwgbV9jb250ZW50TG9naWNh bFdpZHRoKGNvbnRlbnRMb2dpY2FsV2lkdGgpCiAgICAgLCBtX2Jhc2VsaW5lVHlwZShiYXNlbGlu ZVR5cGUpCiAgICAgLCBtX2lzSG9yaXpvbnRhbChpc0hvcml6b250YWwpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lu bGluZURpc3BsYXlMaW5lQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlMaW5lQnVpbGRlci5jcHAK aW5kZXggY2U2YTM2MGY0YWJlLi5lODM0YTk4ZWZjODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxh eUxpbmVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlMaW5lQnVpbGRlci5jcHAKQEAgLTEx Nyw2ICsxMTcsNyBAQCBJbmxpbmVEaXNwbGF5OjpMaW5lIElubGluZURpc3BsYXlMaW5lQnVpbGRl cjo6YnVpbGQoY29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDb250ZQogICAgICAgICAsIGVuY2xvc2lu Z0xpbmVHZW9tZXRyeS5lbmNsb3NpbmdUb3BBbmRCb3R0b20KICAgICAgICAgLCByb290SW5saW5l Qm94LmxvZ2ljYWxUb3AoKSArIHJvb3RJbmxpbmVCb3guYXNjZW50KCkKICAgICAgICAgLCBsaW5l Qm94LmJhc2VsaW5lVHlwZSgpCisgICAgICAgICwgcm9vdElubGluZUJveFJlY3QubGVmdCgpCiAg ICAgICAgICwgY29udGVudFZpc3VhbE9mZnNldEluSW5saW5lRGlyZWN0aW9uCiAgICAgICAgICwg cm9vdElubGluZUJveC5sb2dpY2FsV2lkdGgoKQogICAgICAgICAsIGxpbmVCb3guaXNIb3Jpem9u dGFsKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9pbmxp bmUvSW5saW5lSXRlcmF0b3JCb3hNb2Rlcm5QYXRoLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW50ZWdyYXRpb24vaW5saW5lL0lubGluZUl0ZXJhdG9yQm94TW9kZXJuUGF0aC5oCmluZGV4IGRl NGY5NWE1Y2Y2ZS4uZDQzN2RhZWJlZGVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW50ZWdyYXRpb24vaW5saW5lL0lubGluZUl0ZXJhdG9yQm94TW9kZXJuUGF0aC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9pbmxpbmUvSW5saW5lSXRlcmF0b3JC b3hNb2Rlcm5QYXRoLmgKQEAgLTkzLDcgKzkzLDcgQEAgcHVibGljOgogICAgICAgICBhdXRvJiBz dHlsZSA9IGJveCgpLnN0eWxlKCk7CiAgICAgICAgIGF1dG8gZXhwYW5zaW9uID0gYm94KCkuZXhw YW5zaW9uKCk7CiAgICAgICAgIGF1dG8gcmVjdCA9IHRoaXMtPnZpc3VhbFJlY3RJZ25vcmluZ0Js b2NrRGlyZWN0aW9uKCk7Ci0gICAgICAgIGF1dG8geFBvcyA9IHJlY3QueCgpIC0gKGxpbmUoKS5s aW5lQm94TGVmdCgpICsgbGluZSgpLmNvbnRlbnRWaXN1YWxPZmZzZXRJbklubGluZURpcmVjdGlv bigpKTsKKyAgICAgICAgYXV0byB4UG9zID0gcmVjdC54KCkgLSAobGluZSgpLmxpbmVCb3hMZWZ0 KCkgKyBsaW5lKCkuY29udGVudExvZ2ljYWxMZWZ0SWdub3JpbmdJbmxpbmVEaXJlY3Rpb24oKSk7 CiAgICAgICAgIGF1dG8gY2hhcmFjdGVyU2NhbkZvckNvZGVQYXRoID0gaXNUZXh0KCkgJiYgIXJl bmRlclRleHQoKS5jYW5Vc2VTaW1wbGVGb250Q29kZVBhdGgoKTsKICAgICAgICAgYXV0byB0ZXh0 UnVuID0gVGV4dFJ1biB7IG1vZGUgPT0gVGV4dFJ1bk1vZGU6OkVkaXRpbmcgPyBvcmlnaW5hbFRl eHQoKSA6IGJveCgpLnRleHQoKS0+cmVuZGVyZWRDb250ZW50KCksIHhQb3MsIGV4cGFuc2lvbi5o b3Jpem9udGFsRXhwYW5zaW9uLCBleHBhbnNpb24uYmVoYXZpb3IsIGRpcmVjdGlvbigpLCBzdHls ZS5ydGxPcmRlcmluZygpID09IE9yZGVyOjpWaXN1YWwsIGNoYXJhY3RlclNjYW5Gb3JDb2RlUGF0 aCB9OwogICAgICAgICB0ZXh0UnVuLnNldFRhYlNpemUoIXN0eWxlLmNvbGxhcHNlV2hpdGVTcGFj ZSgpLCBzdHlsZS50YWJTaXplKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2ludGVncmF0aW9uL2lubGluZS9JbmxpbmVJdGVyYXRvckxpbmVCb3hNb2Rlcm5QYXRoLmggYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0lubGluZUl0ZXJhdG9yTGlu ZUJveE1vZGVyblBhdGguaAppbmRleCA1ZGU0Nzc2YzViYWYuLmMwMDY2OTY2MTUzMSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL2lubGluZS9JbmxpbmVJdGVy YXRvckxpbmVCb3hNb2Rlcm5QYXRoLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVn cmF0aW9uL2lubGluZS9JbmxpbmVJdGVyYXRvckxpbmVCb3hNb2Rlcm5QYXRoLmgKQEAgLTYzLDcg KzYzLDcgQEAgcHVibGljOgogICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQuCiAgICAgZmxvYXQgY29u dGVudExvZ2ljYWxCb3R0b21BZGp1c3RlZEZvckZvbGxvd2luZ0xpbmVCb3goKSBjb25zdCB7IHJl dHVybiBjb250ZW50TG9naWNhbEJvdHRvbSgpOyB9CiAKLSAgICBmbG9hdCBjb250ZW50TG9naWNh bExlZnQoKSBjb25zdCB7IHJldHVybiBsaW5lKCkubGluZUJveExlZnQoKSArIGxpbmUoKS5jb250 ZW50VmlzdWFsT2Zmc2V0SW5JbmxpbmVEaXJlY3Rpb24oKTsgfQorICAgIGZsb2F0IGNvbnRlbnRM b2dpY2FsTGVmdCgpIGNvbnN0IHsgcmV0dXJuIGxpbmUoKS5saW5lQm94TGVmdCgpICsgbGluZSgp LmNvbnRlbnRMb2dpY2FsTGVmdElnbm9yaW5nSW5saW5lRGlyZWN0aW9uKCk7IH0KICAgICBmbG9h dCBjb250ZW50TG9naWNhbFJpZ2h0KCkgY29uc3QgeyByZXR1cm4gY29udGVudExvZ2ljYWxMZWZ0 KCkgKyBsaW5lKCkuY29udGVudExvZ2ljYWxXaWR0aCgpOyB9CiAgICAgYm9vbCBpc0hvcml6b250 YWwoKSBjb25zdCB7IHJldHVybiBsaW5lKCkuaXNIb3Jpem9udGFsKCk7IH0KICAgICBGb250QmFz ZWxpbmUgYmFzZWxpbmVUeXBlKCkgY29uc3QgeyByZXR1cm4gbGluZSgpLmJhc2VsaW5lVHlwZSgp OyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5l L0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2ludGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRl bnRCdWlsZGVyLmNwcAppbmRleCBlZjNmNTdmNjUwMjUuLmM2NzI3NDEyOGEyZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3Jh dGlvbklubGluZUNvbnRlbnRCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW50ZWdyYXRpb24vaW5saW5lL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIu Y3BwCkBAIC0xNTUsNyArMTU1LDcgQEAgdm9pZCBJbmxpbmVDb250ZW50QnVpbGRlcjo6Y3JlYXRl RGlzcGxheUxpbmVzKExheW91dDo6SW5saW5lRm9ybWF0dGluZ1N0YXRlJiBpbmwKICAgICAgICAg YXV0byBlbGxpcHNpcyA9IHN0ZDo6b3B0aW9uYWw8TGluZTo6RWxsaXBzaXM+IHsgfTsKICAgICAg ICAgaWYgKGF1dG8gZWxsaXBzaXNWaXN1YWxSZWN0ID0gbGluZS5lbGxpcHNpc1Zpc3VhbFJlY3Qo KSkKICAgICAgICAgICAgIGVsbGlwc2lzID0geyAqZWxsaXBzaXNWaXN1YWxSZWN0LCByb290Qm94 U3R5bGUuaXNMZWZ0VG9SaWdodERpcmVjdGlvbigpIH07Ci0gICAgICAgIGlubGluZUNvbnRlbnQu bGluZXMuYXBwZW5kKHsgZmlyc3RCb3hJbmRleCwgYm94Q291bnQsIGxpbmUubGluZUJveExvZ2lj YWxSZWN0KCksIGxpbmUubGluZUJveFJlY3QoKSwgbGluZS5lbmNsb3NpbmdMb2dpY2FsVG9wQW5k Qm90dG9tKCkudG9wLCBsaW5lLmVuY2xvc2luZ0xvZ2ljYWxUb3BBbmRCb3R0b20oKS5ib3R0b20s IHNjcm9sbGFibGVPdmVyZmxvd1JlY3QsIGxpbmVJbmtPdmVyZmxvd1JlY3QsIGxpbmUuYmFzZWxp bmUoKSwgbGluZS5iYXNlbGluZVR5cGUoKSwgbGluZS5jb250ZW50VmlzdWFsT2Zmc2V0SW5Jbmxp bmVEaXJlY3Rpb24oKSwgbGluZS5jb250ZW50TG9naWNhbFdpZHRoKCksIGxpbmUuaXNIb3Jpem9u dGFsKCksIGVsbGlwc2lzIH0pOworICAgICAgICBpbmxpbmVDb250ZW50LmxpbmVzLmFwcGVuZCh7 IGZpcnN0Qm94SW5kZXgsIGJveENvdW50LCBsaW5lLmxpbmVCb3hMb2dpY2FsUmVjdCgpLCBsaW5l LmxpbmVCb3hSZWN0KCksIGxpbmUuZW5jbG9zaW5nTG9naWNhbFRvcEFuZEJvdHRvbSgpLnRvcCwg bGluZS5lbmNsb3NpbmdMb2dpY2FsVG9wQW5kQm90dG9tKCkuYm90dG9tLCBzY3JvbGxhYmxlT3Zl cmZsb3dSZWN0LCBsaW5lSW5rT3ZlcmZsb3dSZWN0LCBsaW5lLmJhc2VsaW5lKCksIGxpbmUuYmFz ZWxpbmVUeXBlKCksIGxpbmUuY29udGVudExvZ2ljYWxMZWZ0KCksIGxpbmUuY29udGVudExvZ2lj YWxMZWZ0SWdub3JpbmdJbmxpbmVEaXJlY3Rpb24oKSwgbGluZS5jb250ZW50TG9naWNhbFdpZHRo KCksIGxpbmUuaXNIb3Jpem9udGFsKCksIGVsbGlwc2lzIH0pOwogICAgIH0KIH0KIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRl Z3JhdGlvbkxpbmUuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9pbmxpbmUv TGF5b3V0SW50ZWdyYXRpb25MaW5lLmgKaW5kZXggMTYxMWViMWFkNzcxLi40NzNhNThiOTI1ZGYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9pbmxpbmUvTGF5 b3V0SW50ZWdyYXRpb25MaW5lLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0 aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbkxpbmUuaApAQCAtNDEsNyArNDEsNyBAQCBwdWJs aWM6CiAgICAgICAgIEZsb2F0UmVjdCB2aXN1YWxSZWN0OwogICAgICAgICBib29sIGlzTGVmdFBv c2l0aW9uZWQgeyB0cnVlIH07CiAgICAgfTsKLSAgICBMaW5lKHNpemVfdCBmaXJzdEJveEluZGV4 LCBzaXplX3QgYm94Q291bnQsIGNvbnN0IEZsb2F0UmVjdCYgbGluZUJveExvZ2ljYWxSZWN0LCBj b25zdCBGbG9hdFJlY3QmIGxpbmVCb3hSZWN0LCBmbG9hdCBlbmNsb3NpbmdDb250ZW50TG9naWNh bFRvcCwgZmxvYXQgZW5jbG9zaW5nQ29udGVudExvZ2ljYWxCb3R0b20sIGNvbnN0IEZsb2F0UmVj dCYgc2Nyb2xsYWJsZU92ZXJmbG93LCBjb25zdCBGbG9hdFJlY3QmIGlua092ZXJmbG93LCBmbG9h dCBiYXNlbGluZSwgRm9udEJhc2VsaW5lIGJhc2VsaW5lVHlwZSwgZmxvYXQgY29udGVudFZpc3Vh bE9mZnNldEluSW5saW5lRGlyZWN0aW9uLCBmbG9hdCBjb250ZW50TG9naWNhbFdpZHRoLCBib29s IGlzSG9yaXpvbnRhbCwgc3RkOjpvcHRpb25hbDxFbGxpcHNpcz4gZWxsaXBzaXMsIGJvb2wgaXNG aXJzdEFmdGVyUGFnZUJyZWFrID0gZmFsc2UpCisgICAgTGluZShzaXplX3QgZmlyc3RCb3hJbmRl eCwgc2l6ZV90IGJveENvdW50LCBjb25zdCBGbG9hdFJlY3QmIGxpbmVCb3hMb2dpY2FsUmVjdCwg Y29uc3QgRmxvYXRSZWN0JiBsaW5lQm94UmVjdCwgZmxvYXQgZW5jbG9zaW5nQ29udGVudExvZ2lj YWxUb3AsIGZsb2F0IGVuY2xvc2luZ0NvbnRlbnRMb2dpY2FsQm90dG9tLCBjb25zdCBGbG9hdFJl Y3QmIHNjcm9sbGFibGVPdmVyZmxvdywgY29uc3QgRmxvYXRSZWN0JiBpbmtPdmVyZmxvdywgZmxv YXQgYmFzZWxpbmUsIEZvbnRCYXNlbGluZSBiYXNlbGluZVR5cGUsIGZsb2F0IGNvbnRlbnRMb2dp Y2FsTGVmdCwgZmxvYXQgY29udGVudExvZ2ljYWxMZWZ0SWdub3JpbmdJbmxpbmVEaXJlY3Rpb24s IGZsb2F0IGNvbnRlbnRMb2dpY2FsV2lkdGgsIGJvb2wgaXNIb3Jpem9udGFsLCBzdGQ6Om9wdGlv bmFsPEVsbGlwc2lzPiBlbGxpcHNpcywgYm9vbCBpc0ZpcnN0QWZ0ZXJQYWdlQnJlYWsgPSBmYWxz ZSkKICAgICAgICAgOiBtX2ZpcnN0Qm94SW5kZXgoZmlyc3RCb3hJbmRleCkKICAgICAgICAgLCBt X2JveENvdW50KGJveENvdW50KQogICAgICAgICAsIG1fbGluZUJveFJlY3QobGluZUJveFJlY3Qp CkBAIC01MSw3ICs1MSw4IEBAIHB1YmxpYzoKICAgICAgICAgLCBtX3Njcm9sbGFibGVPdmVyZmxv dyhzY3JvbGxhYmxlT3ZlcmZsb3cpCiAgICAgICAgICwgbV9pbmtPdmVyZmxvdyhpbmtPdmVyZmxv dykKICAgICAgICAgLCBtX2Jhc2VsaW5lKGJhc2VsaW5lKQotICAgICAgICAsIG1fY29udGVudFZp c3VhbE9mZnNldEluSW5saW5lRGlyZWN0aW9uKGNvbnRlbnRWaXN1YWxPZmZzZXRJbklubGluZURp cmVjdGlvbikKKyAgICAgICAgLCBtX2NvbnRlbnRMb2dpY2FsTGVmdChjb250ZW50TG9naWNhbExl ZnQpCisgICAgICAgICwgbV9jb250ZW50TG9naWNhbExlZnRJZ25vcmluZ0lubGluZURpcmVjdGlv bihjb250ZW50TG9naWNhbExlZnRJZ25vcmluZ0lubGluZURpcmVjdGlvbikKICAgICAgICAgLCBt X2NvbnRlbnRMb2dpY2FsV2lkdGgoY29udGVudExvZ2ljYWxXaWR0aCkKICAgICAgICAgLCBtX2Jh c2VsaW5lVHlwZShiYXNlbGluZVR5cGUpCiAgICAgICAgICwgbV9pc0hvcml6b250YWwoaXNIb3Jp em9udGFsKQpAQCAtODgsOCArODksMTAgQEAgcHVibGljOgogCiAgICAgYm9vbCBpc0hvcml6b250 YWwoKSBjb25zdCB7IHJldHVybiBtX2lzSG9yaXpvbnRhbDsgfQogCi0gICAgZmxvYXQgY29udGVu dFZpc3VhbE9mZnNldEluSW5saW5lRGlyZWN0aW9uKCkgY29uc3QgeyByZXR1cm4gbV9jb250ZW50 VmlzdWFsT2Zmc2V0SW5JbmxpbmVEaXJlY3Rpb247IH0KICAgICBmbG9hdCBjb250ZW50TG9naWNh bFdpZHRoKCkgY29uc3QgeyByZXR1cm4gbV9jb250ZW50TG9naWNhbFdpZHRoOyB9CisgICAgZmxv YXQgY29udGVudExvZ2ljYWxMZWZ0KCkgY29uc3QgeyByZXR1cm4gbV9jb250ZW50TG9naWNhbExl ZnQ7IH0KKyAgICAvLyBUaGlzIGlzICJ2aXN1YWwiIGxlZnQgaW4gaW5saW5lIGRpcmVjdGlvbiAo aXQgaXMgc3RpbGwgY29uc2lkZXJlZCBsb2dpY2FsIGFzIHRoZXJlJ3Mgbm8gZmxpcCBmb3Igd3Jp dGluZyBtb2RlKS4KKyAgICBmbG9hdCBjb250ZW50TG9naWNhbExlZnRJZ25vcmluZ0lubGluZURp cmVjdGlvbigpIGNvbnN0IHsgcmV0dXJuIG1fY29udGVudExvZ2ljYWxMZWZ0SWdub3JpbmdJbmxp bmVEaXJlY3Rpb247IH0KIAogICAgIGJvb2wgaXNGaXJzdEFmdGVyUGFnZUJyZWFrKCkgY29uc3Qg eyByZXR1cm4gbV9pc0ZpcnN0QWZ0ZXJQYWdlQnJlYWs7IH0KIApAQCAtMTA3LDcgKzExMCw5IEBA IHByaXZhdGU6CiAgICAgRmxvYXRSZWN0IG1fc2Nyb2xsYWJsZU92ZXJmbG93OwogICAgIEZsb2F0 UmVjdCBtX2lua092ZXJmbG93OwogICAgIGZsb2F0IG1fYmFzZWxpbmUgeyAwLmYgfTsKLSAgICBm bG9hdCBtX2NvbnRlbnRWaXN1YWxPZmZzZXRJbklubGluZURpcmVjdGlvbiB7IDAuZiB9OworICAg IC8vIENvbnRlbnQgaXMgbW9zdGx5IGluIGZsdXNoIHdpdGggdGhlIGxpbmUgYm94IGVkZ2UgZXhj ZXB0IGZvciBjYXNlcyBsaWtlIHRleHQtYWxpZ24uCisgICAgZmxvYXQgbV9jb250ZW50TG9naWNh bExlZnQgeyAwLmYgfTsKKyAgICBmbG9hdCBtX2NvbnRlbnRMb2dpY2FsTGVmdElnbm9yaW5nSW5s aW5lRGlyZWN0aW9uIHsgMC5mIH07CiAgICAgZmxvYXQgbV9jb250ZW50TG9naWNhbFdpZHRoIHsg MC5mIH07CiAgICAgRm9udEJhc2VsaW5lIG1fYmFzZWxpbmVUeXBlIHsgQWxwaGFiZXRpY0Jhc2Vs aW5lIH07CiAgICAgYm9vbCBtX2lzSG9yaXpvbnRhbCB7IHRydWUgfTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9pbmxpbmUvTGF5b3V0SW50ZWdyYXRpb25Q YWdpbmF0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9pbmxpbmUv TGF5b3V0SW50ZWdyYXRpb25QYWdpbmF0aW9uLmNwcAppbmRleCA5NGU1YzcyODI3MGUuLjZjYzlk MmIyZjE3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL2lu bGluZS9MYXlvdXRJbnRlZ3JhdGlvblBhZ2luYXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbnRlZ3JhdGlvbi9pbmxpbmUvTGF5b3V0SW50ZWdyYXRpb25QYWdpbmF0aW9uLmNw cApAQCAtMTM5LDcgKzEzOSw4IEBAIHN0YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8SW5saW5lQ29udGVu dD4gbWFrZUFkanVzdGVkQ29udGVudChjb25zdCBJbmxpbmVDb250ZW50JiBpCiAgICAgICAgICAg ICBtb3ZlVmVydGljYWxseShsaW5lLmlua092ZXJmbG93KCksIG9mZnNldCksCiAgICAgICAgICAg ICBsaW5lLmJhc2VsaW5lKCksCiAgICAgICAgICAgICBsaW5lLmJhc2VsaW5lVHlwZSgpLAotICAg ICAgICAgICAgbGluZS5jb250ZW50VmlzdWFsT2Zmc2V0SW5JbmxpbmVEaXJlY3Rpb24oKSwKKyAg ICAgICAgICAgIGxpbmUuY29udGVudExvZ2ljYWxMZWZ0KCksCisgICAgICAgICAgICBsaW5lLmNv bnRlbnRMb2dpY2FsTGVmdElnbm9yaW5nSW5saW5lRGlyZWN0aW9uKCksCiAgICAgICAgICAgICBs aW5lLmNvbnRlbnRMb2dpY2FsV2lkdGgoKSwKICAgICAgICAgICAgIGxpbmUuaXNIb3Jpem9udGFs KCksCiAgICAgICAgICAgICB7IH0sCg==