230709 2021-09-23 11:55:32 -0700 [LFC][IFC] InlineDisplay::Box should be able to provide first-line style when applicable 2021-09-24 06:24:21 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1796610 0 zalan 2021-09-23 11:55:32 -0700 ssia 1796614 1 439078 zalan 2021-09-23 11:57:45 -0700 Created attachment 439078 Patch 1796860 2 ews-feeder 2021-09-24 06:23:56 -0700 Committed r283038 (242098@main): <https://commits.webkit.org/242098@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 439078. 1796861 3 webkit-bug-importer 2021-09-24 06:24:21 -0700 <rdar://problem/83494247> 439078 2021-09-23 11:57:45 -0700 2021-09-24 06:23:58 -0700 Patch bug-230709-20210923115744.patch text/plain 11595 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyOTYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjE0MWE5MjQ2NjgyMDk2 ZmUzODY3OGYzOThlZWZjMDA4YzBiZTUxNy4uMTBhMzkzNjQ5OTZlMDJkYTU0MzA2Zjk2OGI5NzEw MGEwN2MwNzQ1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTA5LTIzICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIElubGluZURp c3BsYXk6OkJveCBzaG91bGQgYmUgYWJsZSB0byBwcm92aWRlIGZpcnN0LWxpbmUgc3R5bGUgd2hl biBhcHBsaWNhYmxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMzA3MDkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBUaGlzIGlzIGluIHByZXBhcmF0aW9uIGZvciBzdXBwb3J0aW5nIGZpcnN0LWxpbmUgc3R5 bGUuIFRoZSBpZGVhIGhlcmUgaXMgdGhhdCB0aGUgcnVuL2JveCBvYmplY3RzIHdlIGNvbnN0cnVj dCBhZnRlciBsaW5lIGJyZWFraW5nIHNob3VsZAorICAgICAgICByZXRhaW4gdGhlIGFwcGxpY2Fi bGUgc3R5bGUuCisKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9J bmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 OjpJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmJ1aWxkKToKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6SW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpjcmVhdGVCb3hlc0FuZFVwZGF0 ZUdlb21ldHJ5Rm9yTGluZUNvbnRlbnQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxp bmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmNyZWF0ZUJveGVzQW5kVXBkYXRlR2VvbWV0cnlGb3JM aW5lU3Bhbm5pbmdJbmxpbmVCb3hlcyk6CisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5Qm94Lmg6CisgICAgICAgIChXZWJDb3Jl OjpJbmxpbmVEaXNwbGF5OjpCb3g6OnN0eWxlIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6Oklu bGluZURpc3BsYXk6OkJveDo6Qm94KToKKyAgICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vTGF5 b3V0SW50ZWdyYXRpb25QYWdpbmF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dElu dGVncmF0aW9uOjptYWtlQWRqdXN0ZWRDb250ZW50KToKKwogMjAyMS0wOS0yMyAgQWxhbiBCdWp0 YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBNb3ZlIExheW91dDo6 UnVuIHVuZGVyIElubGluZURpc3BsYXkgYW5kIHJlbmFtZSBpdCB0byBCb3gKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURp c3BsYXlDb250ZW50QnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwCmluZGV4IGM2 ZjA0MmU5OGYyNjk1YzEyZDBlMWYwMzk2ZjdhM2NhNDVlMmI2MGQuLjFlN2Y3N2UzYjE4OTAwZTgx OTQ3NzQ5NzI4M2ZjZDE0YTdhYzllNjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUv SW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcApAQCAtNTAsNyArNTAsNyBAQCBEaXNwbGF5 Qm94ZXMgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpidWlsZChjb25zdCBMaW5lQnVpbGRl cjo6TGluZUNvbnRlbnQmCiAgICAgLy8gRXZlcnkgbGluZSBzdGFydHMgd2l0aCBhIHJvb3QgYm94 LCBldmVuIHRoZSBlbXB0eSBvbmVzLgogICAgIGF1dG8gcm9vdElubGluZUJveFJlY3QgPSBsaW5l Qm94LmxvZ2ljYWxSZWN0Rm9yUm9vdElubGluZUJveCgpOwogICAgIHJvb3RJbmxpbmVCb3hSZWN0 Lm1vdmVCeShsaW5lQm94TG9naWNhbFRvcExlZnQpOwotICAgIGJveGVzLmFwcGVuZCh7IGxpbmVJ bmRleCwgSW5saW5lRGlzcGxheTo6Qm94OjpUeXBlOjpSb290SW5saW5lQm94LCByb290KCksIHJv b3RJbmxpbmVCb3hSZWN0LCByb290SW5saW5lQm94UmVjdCwgeyB9LCB7IH0sICBsaW5lQm94LnJv b3RJbmxpbmVCb3goKS5oYXNDb250ZW50KCl9KTsKKyAgICBib3hlcy5hcHBlbmQoeyBsaW5lSW5k ZXgsIElubGluZURpc3BsYXk6OkJveDo6VHlwZTo6Um9vdElubGluZUJveCwgcm9vdCgpLCByb290 KCkuc3R5bGUoKSwgcm9vdElubGluZUJveFJlY3QsIHJvb3RJbmxpbmVCb3hSZWN0LCB7IH0sIHsg fSwgIGxpbmVCb3gucm9vdElubGluZUJveCgpLmhhc0NvbnRlbnQoKX0pOwogCiAgICAgY3JlYXRl Qm94ZXNBbmRVcGRhdGVHZW9tZXRyeUZvckxpbmVTcGFubmluZ0lubGluZUJveGVzKGxpbmVCb3gs IGxpbmVCb3hMb2dpY2FsVG9wTGVmdCwgbGluZUluZGV4LCBib3hlcyk7CiAgICAgY3JlYXRlQm94 ZXNBbmRVcGRhdGVHZW9tZXRyeUZvckxpbmVDb250ZW50KGxpbmVDb250ZW50LCBsaW5lQm94LCBs aW5lQm94TG9naWNhbFRvcExlZnQsIGxpbmVJbmRleCwgYm94ZXMpOwpAQCAtNjQsMTIgKzY0LDE0 IEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpjcmVhdGVCb3hlc0FuZFVwZGF0 ZUdlb21ldHJ5Rm9yTGluZUNvbnRlbnQoY29uCiAgICAgLy8gQ3JlYXRlIHRoZSBpbmxpbmUgYm94 ZXMgb24gdGhlIGN1cnJlbnQgbGluZS4gVGhpcyBpcyBtb3N0bHkgdGV4dCBhbmQgYXRvbWljIGlu bGluZSBib3hlcy4KICAgICBmb3IgKGF1dG8mIGxpbmVSdW4gOiBsaW5lQ29udGVudC5ydW5zKSB7 CiAgICAgICAgIGF1dG8mIGxheW91dEJveCA9IGxpbmVSdW4ubGF5b3V0Qm94KCk7CisgICAgICAg IC8vIEZJWE1FOiBUaGlzIHNob3VsZCBiZSBsaW5lSW5kZXggZGVwZW5kZW50IHRvIHN1cHBvcnQg Zmlyc3QtbGluZSBzdHlsZS4KKyAgICAgICAgYXV0byYgc3R5bGUgPSBsYXlvdXRCb3guc3R5bGUo KTsKKwogICAgICAgICBzd2l0Y2ggKGxpbmVSdW4udHlwZSgpKSB7CiAgICAgICAgIGNhc2UgSW5s aW5lSXRlbTo6VHlwZTo6VGV4dDogewogICAgICAgICAgICAgYXV0byB0ZXh0UnVuUmVjdCA9IGxp bmVCb3gubG9naWNhbFJlY3RGb3JUZXh0UnVuKGxpbmVSdW4pOwogICAgICAgICAgICAgdGV4dFJ1 blJlY3QubW92ZUJ5KGxpbmVCb3hMb2dpY2FsVG9wTGVmdCk7CiAKLSAgICAgICAgICAgIGF1dG8m IHN0eWxlID0gbGF5b3V0Qm94LnN0eWxlKCk7CiAgICAgICAgICAgICBhdXRvIGlua092ZXJmbG93 ID0gWyZdIHsKICAgICAgICAgICAgICAgICBhdXRvIGluaXRpYWxDb250YWluZ0Jsb2NrU2l6ZSA9 IFJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OnNoYXJlZEZlYXR1cmVzKCkubGF5b3V0Rm9ybWF0dGlu Z0NvbnRleHRJbnRlZ3JhdGlvbkVuYWJsZWQoKQogICAgICAgICAgICAgICAgICAgICA/IGZvcm1h dHRpbmdTdGF0ZS5sYXlvdXRTdGF0ZSgpLnZpZXdwb3J0U2l6ZSgpCkBAIC05Myw2ICs5NSw3IEBA IHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpjcmVhdGVCb3hlc0FuZFVwZGF0ZUdl b21ldHJ5Rm9yTGluZUNvbnRlbnQoY29uCiAgICAgICAgICAgICBib3hlcy5hcHBlbmQoeyBsaW5l SW5kZXgKICAgICAgICAgICAgICAgICAsIElubGluZURpc3BsYXk6OkJveDo6VHlwZTo6VGV4dAog ICAgICAgICAgICAgICAgICwgbGF5b3V0Qm94CisgICAgICAgICAgICAgICAgLCBzdHlsZQogICAg ICAgICAgICAgICAgICwgdGV4dFJ1blJlY3QKICAgICAgICAgICAgICAgICAsIGlua092ZXJmbG93 KCkKICAgICAgICAgICAgICAgICAsIGxpbmVSdW4uZXhwYW5zaW9uKCkKQEAgLTEwOCw2ICsxMTEs NyBAQCB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6Y3JlYXRlQm94ZXNBbmRVcGRh dGVHZW9tZXRyeUZvckxpbmVDb250ZW50KGNvbgogICAgICAgICAgICAgYm94ZXMuYXBwZW5kKHsg bGluZUluZGV4CiAgICAgICAgICAgICAgICAgLCBJbmxpbmVEaXNwbGF5OjpCb3g6OlR5cGU6OlNv ZnRMaW5lQnJlYWsKICAgICAgICAgICAgICAgICAsIGxheW91dEJveAorICAgICAgICAgICAgICAg ICwgc3R5bGUKICAgICAgICAgICAgICAgICAsIHNvZnRMaW5lQnJlYWtSdW5SZWN0CiAgICAgICAg ICAgICAgICAgLCBzb2Z0TGluZUJyZWFrUnVuUmVjdAogICAgICAgICAgICAgICAgICwgbGluZVJ1 bi5leHBhbnNpb24oKQpAQCAtMTE4LDcgKzEyMiw3IEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRl bnRCdWlsZGVyOjpjcmVhdGVCb3hlc0FuZFVwZGF0ZUdlb21ldHJ5Rm9yTGluZUNvbnRlbnQoY29u CiAgICAgICAgICAgICAvLyBPbmx5IGhhcmQgbGluZWJyZWFrcyBoYXZlIGFzc29jaWF0ZWQgbGF5 b3V0IGJveGVzLgogICAgICAgICAgICAgYXV0byBsaW5lQnJlYWtCb3hSZWN0ID0gbGluZUJveC5s b2dpY2FsUmVjdEZvckxpbmVCcmVha0JveChsYXlvdXRCb3gpOwogICAgICAgICAgICAgbGluZUJy ZWFrQm94UmVjdC5tb3ZlQnkobGluZUJveExvZ2ljYWxUb3BMZWZ0KTsKLSAgICAgICAgICAgIGJv eGVzLmFwcGVuZCh7IGxpbmVJbmRleCwgSW5saW5lRGlzcGxheTo6Qm94OjpUeXBlOjpMaW5lQnJl YWtCb3gsIGxheW91dEJveCwgbGluZUJyZWFrQm94UmVjdCwgbGluZUJyZWFrQm94UmVjdCwgbGlu ZVJ1bi5leHBhbnNpb24oKSwgeyB9IH0pOworICAgICAgICAgICAgYm94ZXMuYXBwZW5kKHsgbGlu ZUluZGV4LCBJbmxpbmVEaXNwbGF5OjpCb3g6OlR5cGU6OkxpbmVCcmVha0JveCwgbGF5b3V0Qm94 LCBzdHlsZSwgbGluZUJyZWFrQm94UmVjdCwgbGluZUJyZWFrQm94UmVjdCwgbGluZVJ1bi5leHBh bnNpb24oKSwgeyB9IH0pOwogCiAgICAgICAgICAgICBhdXRvJiBib3hHZW9tZXRyeSA9IGZvcm1h dHRpbmdTdGF0ZS5ib3hHZW9tZXRyeShsYXlvdXRCb3gpOwogICAgICAgICAgICAgYm94R2VvbWV0 cnkuc2V0TG9naWNhbFRvcExlZnQodG9MYXlvdXRQb2ludChsaW5lQnJlYWtCb3hSZWN0LnRvcExl ZnQoKSkpOwpAQCAtMTMxLDcgKzEzNSw3IEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWls ZGVyOjpjcmVhdGVCb3hlc0FuZFVwZGF0ZUdlb21ldHJ5Rm9yTGluZUNvbnRlbnQoY29uCiAgICAg ICAgICAgICBhdXRvIGxvZ2ljYWxCb3JkZXJCb3ggPSBsaW5lQm94LmxvZ2ljYWxCb3JkZXJCb3hG b3JBdG9taWNJbmxpbmVMZXZlbEJveChsYXlvdXRCb3gsIGJveEdlb21ldHJ5KTsKICAgICAgICAg ICAgIGxvZ2ljYWxCb3JkZXJCb3gubW92ZUJ5KGxpbmVCb3hMb2dpY2FsVG9wTGVmdCk7CiAgICAg ICAgICAgICAvLyBGSVhNRTogQWRkIGluayBvdmVyZmxvdyBzdXBwb3J0IGZvciBhdG9taWMgaW5s aW5lIGxldmVsIGJveGVzIChlLmcuIGJveCBzaGFkb3cpLgotICAgICAgICAgICAgYm94ZXMuYXBw ZW5kKHsgbGluZUluZGV4LCBJbmxpbmVEaXNwbGF5OjpCb3g6OlR5cGU6OkF0b21pY0lubGluZUxl dmVsQm94LCBsYXlvdXRCb3gsIGxvZ2ljYWxCb3JkZXJCb3gsIGxvZ2ljYWxCb3JkZXJCb3gsIGxp bmVSdW4uZXhwYW5zaW9uKCksIHsgfSB9KTsKKyAgICAgICAgICAgIGJveGVzLmFwcGVuZCh7IGxp bmVJbmRleCwgSW5saW5lRGlzcGxheTo6Qm94OjpUeXBlOjpBdG9taWNJbmxpbmVMZXZlbEJveCwg bGF5b3V0Qm94LCBzdHlsZSwgbG9naWNhbEJvcmRlckJveCwgbG9naWNhbEJvcmRlckJveCwgbGlu ZVJ1bi5leHBhbnNpb24oKSwgeyB9IH0pOwogCiAgICAgICAgICAgICBhdXRvIGJvcmRlckJveExv Z2ljYWxUb3BMZWZ0ID0gbG9naWNhbEJvcmRlckJveC50b3BMZWZ0KCk7CiAgICAgICAgICAgICAv LyBOb3RlIHRoYXQgaW5saW5lIGJveGVzIGFyZSByZWxhdGl2ZSB0byB0aGUgbGluZSBhbmQgdGhl aXIgdG9wIHBvc2l0aW9uIGNhbiBiZSBuZWdhdGl2ZS4KQEAgLTE1OCw3ICsxNjIsNyBAQCB2b2lk IElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6Y3JlYXRlQm94ZXNBbmRVcGRhdGVHZW9tZXRy eUZvckxpbmVDb250ZW50KGNvbgogICAgICAgICAgICAgaWYgKGxpbmVCb3guaGFzQ29udGVudCgp KSB7CiAgICAgICAgICAgICAgICAgLy8gRklYTUU6IEl0J3MgZXhwZWN0ZWQgdG8gbm90IGhhdmUg YW55IGJveGVzIG9uIGVtcHR5IGxpbmVzLiBXZSBzaG91bGQgcmVjb25zaWRlciB0aGlzLgogICAg ICAgICAgICAgICAgIG1faW5saW5lQm94SW5kZXhNYXAuYWRkKCZsYXlvdXRCb3gsIGJveGVzLnNp emUoKSk7Ci0gICAgICAgICAgICAgICAgYm94ZXMuYXBwZW5kKHsgbGluZUluZGV4LCBJbmxpbmVE aXNwbGF5OjpCb3g6OlR5cGU6Ok5vblJvb3RJbmxpbmVCb3gsIGxheW91dEJveCwgaW5saW5lQm94 Qm9yZGVyQm94LCBpbmxpbmVCb3hCb3JkZXJCb3gsIHsgfSwgeyB9LCBsaW5lQm94LmlubGluZUxl dmVsQm94Rm9yTGF5b3V0Qm94KGxheW91dEJveCkuaGFzQ29udGVudCgpIH0pOworICAgICAgICAg ICAgICAgIGJveGVzLmFwcGVuZCh7IGxpbmVJbmRleCwgSW5saW5lRGlzcGxheTo6Qm94OjpUeXBl OjpOb25Sb290SW5saW5lQm94LCBsYXlvdXRCb3gsIHN0eWxlLCBpbmxpbmVCb3hCb3JkZXJCb3gs IGlubGluZUJveEJvcmRlckJveCwgeyB9LCB7IH0sIGxpbmVCb3guaW5saW5lTGV2ZWxCb3hGb3JM YXlvdXRCb3gobGF5b3V0Qm94KS5oYXNDb250ZW50KCkgfSk7CiAgICAgICAgICAgICB9CiAKICAg ICAgICAgICAgIGF1dG8gaW5saW5lQm94U2l6ZSA9IExheW91dFNpemUgeyBMYXlvdXRVbml0Ojpm cm9tRmxvYXRDZWlsKGlubGluZUJveEJvcmRlckJveC53aWR0aCgpKSwgTGF5b3V0VW5pdDo6ZnJv bUZsb2F0Q2VpbChpbmxpbmVCb3hCb3JkZXJCb3guaGVpZ2h0KCkpIH07CkBAIC0xOTEsMTMgKzE5 NSwxNSBAQCB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6Y3JlYXRlQm94ZXNBbmRV cGRhdGVHZW9tZXRyeUZvckxpbmVTcGFubmluZ0lubAogICAgICAgICBpZiAoIWlubGluZUxldmVs Qm94LmlzTGluZVNwYW5uaW5nSW5saW5lQm94KCkpCiAgICAgICAgICAgICBjb250aW51ZTsKICAg ICAgICAgYXV0byYgbGF5b3V0Qm94ID0gaW5saW5lTGV2ZWxCb3gubGF5b3V0Qm94KCk7CisgICAg ICAgIC8vIEZJWE1FOiBUaGlzIHNob3VsZCBiZSBsaW5lSW5kZXggZGVwZW5kZW50IHRvIHN1cHBv cnQgZmlyc3QtbGluZSBzdHlsZS4KKyAgICAgICAgYXV0byYgc3R5bGUgPSBsYXlvdXRCb3guc3R5 bGUoKTsKICAgICAgICAgYXV0byYgYm94R2VvbWV0cnkgPSBmb3JtYXR0aW5nU3RhdGUuYm94R2Vv bWV0cnkobGF5b3V0Qm94KTsKICAgICAgICAgLy8gSW5saW5lIGJveGVzIG1heSBvciBtYXkgbm90 IGJlIHdyYXBwZWQgYW5kIGhhdmUgYm94ZXMgb24gbXVsdGlwbGUgbGluZXMgKGUuZy4gPHNwYW4+ Zmlyc3QgbGluZTxicj5zZWNvbmQgbGluZTxicj50aGlyZCBsaW5lPC9zcGFuPikKICAgICAgICAg YXV0byBpbmxpbmVCb3hCb3JkZXJCb3ggPSBsaW5lQm94LmxvZ2ljYWxCb3JkZXJCb3hGb3JJbmxp bmVCb3gobGF5b3V0Qm94LCBib3hHZW9tZXRyeSk7CiAgICAgICAgIGlubGluZUJveEJvcmRlckJv eC5tb3ZlQnkobGluZUJveExvZ2ljYWxUb3BMZWZ0KTsKIAogICAgICAgICBtX2lubGluZUJveElu ZGV4TWFwLmFkZCgmbGF5b3V0Qm94LCBib3hlcy5zaXplKCkpOwotICAgICAgICBib3hlcy5hcHBl bmQoeyBsaW5lSW5kZXgsIElubGluZURpc3BsYXk6OkJveDo6VHlwZTo6Tm9uUm9vdElubGluZUJv eCwgbGF5b3V0Qm94LCBpbmxpbmVCb3hCb3JkZXJCb3gsIGlubGluZUJveEJvcmRlckJveCwgeyB9 LCB7IH0sIGlubGluZUxldmVsQm94Lmhhc0NvbnRlbnQoKSB9KTsKKyAgICAgICAgYm94ZXMuYXBw ZW5kKHsgbGluZUluZGV4LCBJbmxpbmVEaXNwbGF5OjpCb3g6OlR5cGU6Ok5vblJvb3RJbmxpbmVC b3gsIGxheW91dEJveCwgc3R5bGUsIGlubGluZUJveEJvcmRlckJveCwgaW5saW5lQm94Qm9yZGVy Qm94LCB7IH0sIHsgfSwgaW5saW5lTGV2ZWxCb3guaGFzQ29udGVudCgpIH0pOwogCiAgICAgICAg IGF1dG8gaW5saW5lQm94U2l6ZSA9IExheW91dFNpemUgeyBMYXlvdXRVbml0Ojpmcm9tRmxvYXRD ZWlsKGlubGluZUJveEJvcmRlckJveC53aWR0aCgpKSwgTGF5b3V0VW5pdDo6ZnJvbUZsb2F0Q2Vp bChpbmxpbmVCb3hCb3JkZXJCb3guaGVpZ2h0KCkpIH07CiAgICAgICAgIGF1dG8gbG9naWNhbFJl Y3QgPSBSZWN0IHsgTGF5b3V0UG9pbnQgeyBpbmxpbmVCb3hCb3JkZXJCb3gudG9wTGVmdCgpIH0s IGlubGluZUJveFNpemUgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUJveC5oIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVE aXNwbGF5Qm94LmgKaW5kZXggMDdjOTA0NTY5ODNmZmIzM2Y1ODZlYzAwMzVjM2JjZWZjNDViN2Y3 Ny4uNzA1NmU5N2M3MjRhZWJlNjBiMDNlODIxNWM1M2M2YjNjOTBhZGNkMCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9J bmxpbmVEaXNwbGF5Qm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5Qm94LmgKQEAgLTY3LDcgKzY3LDcg QEAgc3RydWN0IEJveCB7CiAgICAgICAgIEdlbmVyaWNJbmxpbmVMZXZlbEJveAogICAgIH07CiAg ICAgc3RydWN0IEV4cGFuc2lvbjsKLSAgICBCb3goc2l6ZV90IGxpbmVJbmRleCwgVHlwZSwgY29u c3QgTGF5b3V0OjpCb3gmLCBjb25zdCBMYXlvdXQ6OklubGluZVJlY3QmLCBjb25zdCBMYXlvdXQ6 OklubGluZVJlY3QmIGlua092ZXJmbG93LCBFeHBhbnNpb24sIHN0ZDo6b3B0aW9uYWw8VGV4dD4g PSBzdGQ6Om51bGxvcHQsIGJvb2wgaGFzQ29udGVudCA9IHRydWUpOworICAgIEJveChzaXplX3Qg bGluZUluZGV4LCBUeXBlLCBjb25zdCBMYXlvdXQ6OkJveCYsIGNvbnN0IFJlbmRlclN0eWxlJiwg Y29uc3QgTGF5b3V0OjpJbmxpbmVSZWN0JiwgY29uc3QgTGF5b3V0OjpJbmxpbmVSZWN0JiBpbmtP dmVyZmxvdywgRXhwYW5zaW9uLCBzdGQ6Om9wdGlvbmFsPFRleHQ+ID0gc3RkOjpudWxsb3B0LCBi b29sIGhhc0NvbnRlbnQgPSB0cnVlKTsKIAogICAgIGJvb2wgaXNUZXh0KCkgY29uc3QgeyByZXR1 cm4gbV90eXBlID09IFR5cGU6OlRleHQ7IH0KICAgICBib29sIGlzU29mdExpbmVCcmVhaygpIGNv bnN0IHsgcmV0dXJuIG1fdHlwZSA9PSBUeXBlOjpTb2Z0TGluZUJyZWFrOyB9CkBAIC0xMDgsNyAr MTA4LDcgQEAgc3RydWN0IEJveCB7CiAgICAgRXhwYW5zaW9uIGV4cGFuc2lvbigpIGNvbnN0IHsg cmV0dXJuIG1fZXhwYW5zaW9uOyB9CiAKICAgICBjb25zdCBMYXlvdXQ6OkJveCYgbGF5b3V0Qm94 KCkgY29uc3QgeyByZXR1cm4gKm1fbGF5b3V0Qm94OyB9Ci0gICAgY29uc3QgUmVuZGVyU3R5bGUm IHN0eWxlKCkgY29uc3QgeyByZXR1cm4gbGF5b3V0Qm94KCkuc3R5bGUoKTsgfQorICAgIGNvbnN0 IFJlbmRlclN0eWxlJiBzdHlsZSgpIGNvbnN0IHsgcmV0dXJuIG1fc3R5bGU7IH0KIAogICAgIHNp emVfdCBsaW5lSW5kZXgoKSBjb25zdCB7IHJldHVybiBtX2xpbmVJbmRleDsgfQogCkBAIC0xMTYs NiArMTE2LDcgQEAgcHJpdmF0ZToKICAgICBjb25zdCBzaXplX3QgbV9saW5lSW5kZXggeyAwIH07 CiAgICAgY29uc3QgVHlwZSBtX3R5cGUgeyBUeXBlOjpHZW5lcmljSW5saW5lTGV2ZWxCb3ggfTsK ICAgICBXZWFrUHRyPGNvbnN0IExheW91dDo6Qm94PiBtX2xheW91dEJveDsKKyAgICBjb25zdCBS ZW5kZXJTdHlsZSYgbV9zdHlsZTsKICAgICBMYXlvdXQ6OklubGluZVJlY3QgbV9sb2dpY2FsUmVj dDsKICAgICBMYXlvdXQ6OklubGluZVJlY3QgbV9pbmtPdmVyZmxvdzsKICAgICBib29sIG1faGFz Q29udGVudCB7IHRydWUgfTsKQEAgLTEyMywxMCArMTI0LDExIEBAIHByaXZhdGU6CiAgICAgc3Rk OjpvcHRpb25hbDxUZXh0PiBtX3RleHQ7CiB9OwogCi1pbmxpbmUgQm94OjpCb3goc2l6ZV90IGxp bmVJbmRleCwgVHlwZSB0eXBlLCBjb25zdCBMYXlvdXQ6OkJveCYgbGF5b3V0Qm94LCBjb25zdCBM YXlvdXQ6OklubGluZVJlY3QmIGxvZ2ljYWxSZWN0LCBjb25zdCBMYXlvdXQ6OklubGluZVJlY3Qm IGlua092ZXJmbG93LCBFeHBhbnNpb24gZXhwYW5zaW9uLCBzdGQ6Om9wdGlvbmFsPFRleHQ+IHRl eHQsIGJvb2wgaGFzQ29udGVudCkKK2lubGluZSBCb3g6OkJveChzaXplX3QgbGluZUluZGV4LCBU eXBlIHR5cGUsIGNvbnN0IExheW91dDo6Qm94JiBsYXlvdXRCb3gsIGNvbnN0IFJlbmRlclN0eWxl JiBzdHlsZSwgY29uc3QgTGF5b3V0OjpJbmxpbmVSZWN0JiBsb2dpY2FsUmVjdCwgY29uc3QgTGF5 b3V0OjpJbmxpbmVSZWN0JiBpbmtPdmVyZmxvdywgRXhwYW5zaW9uIGV4cGFuc2lvbiwgc3RkOjpv cHRpb25hbDxUZXh0PiB0ZXh0LCBib29sIGhhc0NvbnRlbnQpCiAgICAgOiBtX2xpbmVJbmRleChs aW5lSW5kZXgpCiAgICAgLCBtX3R5cGUodHlwZSkKICAgICAsIG1fbGF5b3V0Qm94KG1ha2VXZWFr UHRyKGxheW91dEJveCkpCisgICAgLCBtX3N0eWxlKHN0eWxlKQogICAgICwgbV9sb2dpY2FsUmVj dChsb2dpY2FsUmVjdCkKICAgICAsIG1faW5rT3ZlcmZsb3coaW5rT3ZlcmZsb3cpCiAgICAgLCBt X2hhc0NvbnRlbnQoaGFzQ29udGVudCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvblBhZ2luYXRpb24uY3BwIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uUGFnaW5hdGlvbi5jcHAK aW5kZXggOTI0ODhhMmJjZTdmY2EzODBhZTcyODIzODhhYmUwODRmZGYwMWUzMS4uZmYzNmE2MTdj NmQ1OTA4ZjQ3NDJiZjE1Y2M1MWFjMDE0M2UzM2JlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uUGFnaW5hdGlvbi5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uUGFn aW5hdGlvbi5jcHAKQEAgLTE0Niw2ICsxNDYsNyBAQCBzdGF0aWMgUmVmPElubGluZUNvbnRlbnQ+ IG1ha2VBZGp1c3RlZENvbnRlbnQoY29uc3QgSW5saW5lQ29udGVudCYgaW5saW5lQ29udGVudAog ICAgICAgICAgICAgYm94LmxpbmVJbmRleCgpLAogICAgICAgICAgICAgYm94LnR5cGUoKSwKICAg ICAgICAgICAgIGJveC5sYXlvdXRCb3goKSwKKyAgICAgICAgICAgIGJveC5zdHlsZSgpLAogICAg ICAgICAgICAgbW92ZVZlcnRpY2FsbHkoYm94LmxvZ2ljYWxSZWN0KCksIG9mZnNldCksCiAgICAg ICAgICAgICBtb3ZlVmVydGljYWxseShib3guaW5rT3ZlcmZsb3coKSwgb2Zmc2V0KSwKICAgICAg ICAgICAgIGJveC5leHBhbnNpb24oKSwK