225749 2021-05-13 04:43:21 -0700 [LFC] Remove redundant public helpers from InlineFormattingContext 2021-05-15 20:05:16 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 225731 1 zalan zalan webkit-bug-importer oldest_to_newest 1759628 0 zalan 2021-05-13 04:43:21 -0700 This is part of bug 225731 activity. 1759657 1 428496 zalan 2021-05-13 05:39:04 -0700 Created attachment 428496 Patch 1760547 2 428768 zalan 2021-05-15 19:39:04 -0700 Created attachment 428768 [fast-cq] Patch 1760548 3 ews-feeder 2021-05-15 20:04:46 -0700 Committed r277559 (237787@main): <https://commits.webkit.org/237787@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 428768. 1760549 4 webkit-bug-importer 2021-05-15 20:05:16 -0700 <rdar://problem/78068143> 428496 2021-05-13 05:39:04 -0700 2021-05-15 19:39:03 -0700 Patch bug-225749-20210513053903.patch text/plain 5794 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3MDMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjE5ZDEyNDY2NTYyNDFh MTM2ZGYzNzJjYjQxZjMyZGViNWY0MzYwNy4uY2NkMTg3OTcxZTkwOWRhOWRmZDZkM2ZhMTVjNDdl MjI2MmY4NzMzOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA1LTEzICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXSBNYWtlIHJlZHVuZGFu dCBwdWJsaWMgaGVscGVycyBwcml2YXRlIGluIElubGluZUZvcm1hdHRpbmdDb250ZXh0CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjU3NDkKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGxheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdDb250ZXh0Lmg6CisgICAgICAg ICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0dlb21l dHJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveEJ1aWxkZXI6OmNvbXB1 dGVMaW5lQm94SGVpZ2h0QW5kQWxpZ25JbmxpbmVMZXZlbEJveGVzVmVydGljYWxseSk6CisgICAg ICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0Ojppc0F0U29mdFdyYXBPcHBvcnR1bml0eSk6 CisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29u dGVudEJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246Oklu bGluZUNvbnRlbnRCdWlsZGVyOjpjcmVhdGVEaXNwbGF5Tm9uUm9vdElubGluZUJveGVzIGNvbnN0 KToKKwogMjAyMS0wNS0wNSAgQWxpY2lhIEJveWEgR2FyY8OtYSAgPGFib3lhQGlnYWxpYS5jb20+ CiAKICAgICAgICAgW01TRV1bR1N0cmVhbWVyXSBXZWJLaXRNZWRpYVNyYyByZXdvcmsgdjIKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oCmluZGV4IGNkNzE4 M2NkNTQzNTA2MjM2NDQzOGQ4ZWEwMTAwNTAxZTRlMTI0ZWIuLmY3MzA2Yjk4NDY2NTQ0ZTc5MWQy MDcwODc2MDBlNGUzYzlkM2Q2MTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmgKKysrIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9y bWF0dGluZ0NvbnRleHQuaApAQCAtNDksOCArNDksNiBAQCBwdWJsaWM6CiAgICAgdm9pZCBsYXlv dXRJbkZsb3dDb250ZW50KEludmFsaWRhdGlvblN0YXRlJiwgY29uc3QgQ29uc3RyYWludHNGb3JJ bkZsb3dDb250ZW50Jikgb3ZlcnJpZGU7CiAgICAgTGF5b3V0VW5pdCB1c2VkQ29udGVudEhlaWdo dCgpIGNvbnN0IG92ZXJyaWRlOwogCi0gICAgSW5saW5lRm9ybWF0dGluZ1F1aXJrcyBxdWlya3Mo KSBjb25zdDsKLQogICAgIGNvbnN0IElubGluZUZvcm1hdHRpbmdTdGF0ZSYgZm9ybWF0dGluZ1N0 YXRlKCkgY29uc3QgeyByZXR1cm4gZG93bmNhc3Q8SW5saW5lRm9ybWF0dGluZ1N0YXRlPihGb3Jt YXR0aW5nQ29udGV4dDo6Zm9ybWF0dGluZ1N0YXRlKCkpOyB9CiAgICAgSW5saW5lRm9ybWF0dGlu Z1N0YXRlJiBmb3JtYXR0aW5nU3RhdGUoKSB7IHJldHVybiBkb3duY2FzdDxJbmxpbmVGb3JtYXR0 aW5nU3RhdGU+KEZvcm1hdHRpbmdDb250ZXh0Ojpmb3JtYXR0aW5nU3RhdGUoKSk7IH0KIApAQCAt NjAsNiArNTgsNyBAQCBwcml2YXRlOgogICAgIEludHJpbnNpY1dpZHRoQ29uc3RyYWludHMgY29t cHV0ZWRJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzKCkgb3ZlcnJpZGU7CiAKICAgICBJbmxpbmVG b3JtYXR0aW5nR2VvbWV0cnkgZ2VvbWV0cnkoKSBjb25zdDsKKyAgICBJbmxpbmVGb3JtYXR0aW5n UXVpcmtzIHF1aXJrcygpIGNvbnN0OwogCiAgICAgdm9pZCBsaW5lTGF5b3V0KElubGluZUl0ZW1z JiwgTGluZUJ1aWxkZXI6OklubGluZUl0ZW1SYW5nZSwgY29uc3QgQ29uc3RyYWludHNGb3JJbkZs b3dDb250ZW50Jik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdHZW9tZXRyeS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5n R2VvbWV0cnkuY3BwCmluZGV4IDczNzNkMWUyYmNmMzI4ZTdiNWFkNjNlMDcwZTAxZTAxZWVlOTg4 ZGEuLmQ1ZTMyMGY1MjdkNWVkYjY3ZTUwMTJmNDUxN2UzN2UwNDFjOGVlYzMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZv cm1hdHRpbmdHZW9tZXRyeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0dlb21ldHJ5LmNwcApAQCAtMzg5LDcg KzM4OSw3IEBAIHZvaWQgTGluZUJveEJ1aWxkZXI6OmNvbXB1dGVMaW5lQm94SGVpZ2h0QW5kQWxp Z25JbmxpbmVMZXZlbEJveGVzVmVydGljYWxseShMaW5lCiAgICAgLy8gMS4gQ29tcHV0ZSB0aGUg bGluZSBib3ggaGVpZ2h0IHVzaW5nIHRoZSBsYXlvdXQgYm91bmRzIGdlb21ldHJ5LiBUaGlzIGhl aWdodCBjb21wdXRhdGlvbiBzdHJpY3RseSB1c2VzIGxheW91dCBib3VuZHMgYW5kIG5vdCBub3Jt YWwgaW5saW5lIGxldmVsIGJveCBnZW9tZXRyaWVzLgogICAgIC8vIDIuIENvbXB1dGUgdGhlIGJh c2VsaW5lL2xvZ2ljYWwgdG9wIHBvc2l0aW9uIG9mIHRoZSByb290IGlubGluZSBib3guIEFsaWdu ZWQgYm94ZXMgcHVzaCB0aGUgcm9vdCBpbmxpbmUgYm94IGFyb3VuZCBpbnNpZGUgdGhlIGxpbmUg Ym94LgogICAgIC8vIDMuIEZpbmFsbHkgYWxpZ24gdGhlIGlubGluZSBsZXZlbCBib3hlcyB1c2lu ZyAobW9zdGx5KSBub3JtYWwgaW5saW5lIGxldmVsIGJveCBnZW9tZXRyaWVzLgotICAgIGF1dG8g cXVpcmtzID0gZm9ybWF0dGluZ0NvbnRleHQoKS5xdWlya3MoKTsKKyAgICBhdXRvIHF1aXJrcyA9 IElubGluZUZvcm1hdHRpbmdRdWlya3MgeyBmb3JtYXR0aW5nQ29udGV4dCgpIH07CiAgICAgYXV0 byYgcm9vdElubGluZUJveCA9IGxpbmVCb3gucm9vdElubGluZUJveCgpOwogCiAgICAgYXV0byBj b21wdXRlTGluZUJveExvZ2ljYWxIZWlnaHQgPSBbJl0gewpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5s aW5lTGluZUJ1aWxkZXIuY3BwCmluZGV4IDZjNjI2ZWEwZWU1YTYzYTRhOTYyYjE1NWNlNjEwNjUz MGZjZTIyZjIuLjE1ODAwYjE4YWY3MmFlYTVmYmFmOTg4NTIwYTJiZGMzMjk2NzY3OTEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lu bGluZUxpbmVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAKQEAgLTExMiw3ICsxMTIsNyBA QCBzdGF0aWMgaW5saW5lIGJvb2wgaXNBdFNvZnRXcmFwT3Bwb3J0dW5pdHkoY29uc3QgSW5saW5l Rm9ybWF0dGluZ0NvbnRleHQmIGlubGluZQogICAgIGlmIChjdXJyZW50LmlzQm94KCkgfHwgbmV4 dC5pc0JveCgpKSB7CiAgICAgICAgIGF1dG8gaXNJbWFnZUNvbnRlbnQgPSBjdXJyZW50LmxheW91 dEJveCgpLmlzSW1hZ2UoKSB8fCBuZXh0LmxheW91dEJveCgpLmlzSW1hZ2UoKTsKICAgICAgICAg aWYgKGlzSW1hZ2VDb250ZW50KQotICAgICAgICAgICAgcmV0dXJuIGlubGluZUZvcm1hdHRpbmdD b250ZXh0LnF1aXJrcygpLmhhc1NvZnRXcmFwT3Bwb3J0dW5pdHlBdEltYWdlKCk7CisgICAgICAg ICAgICByZXR1cm4gSW5saW5lRm9ybWF0dGluZ1F1aXJrcyhpbmxpbmVGb3JtYXR0aW5nQ29udGV4 dCkuaGFzU29mdFdyYXBPcHBvcnR1bml0eUF0SW1hZ2UoKTsKICAgICAgICAgLy8gW3RleHRdW2lu bGluZSBib3ggc3RhcnRdW2lubGluZSBib3ggZW5kXVtpbmxpbmUgYm94XSAodGV4dDxzcGFuPjwv c3Bhbj48aW1nPikgOiB0aGVyZSdzIGEgc29mdCB3cmFwIG9wcG9ydHVuaXR5IGJldHdlZW4gdGhl IFt0ZXh0XSBhbmQgW2ltZ10uCiAgICAgICAgIC8vIFRoZSBsaW5lIGJyZWFraW5nIGJlaGF2aW9y IG9mIGEgcmVwbGFjZWQgZWxlbWVudCBvciBvdGhlciBhdG9taWMgaW5saW5lIGlzIGVxdWl2YWxl bnQgdG8gYW4gaWRlb2dyYXBoaWMgY2hhcmFjdGVyLgogICAgICAgICByZXR1cm4gdHJ1ZTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3Jh dGlvbklubGluZUNvbnRlbnRCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRl Z3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnRCdWlsZGVyLmNwcAppbmRleCBl NDk0NThkYzM3YjJiNjhmYmIxOGZhMGFkNmUzYTI3NGZhOWI0ZjhkLi5kY2YzM2Q0ODQ4NDUyZmIz ZmFlMzUxYzAzZDYzNDBhZWI1MGVjMGJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50QnVpbGRlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9u SW5saW5lQ29udGVudEJ1aWxkZXIuY3BwCkBAIC0zNjcsNyArMzY3LDcgQEAgdm9pZCBJbmxpbmVD b250ZW50QnVpbGRlcjo6Y3JlYXRlRGlzcGxheUxpbmVzKGNvbnN0IExheW91dDo6SW5saW5lRm9y bWF0dGluZ1N0YXQKIHZvaWQgSW5saW5lQ29udGVudEJ1aWxkZXI6OmNyZWF0ZURpc3BsYXlOb25S b290SW5saW5lQm94ZXMoY29uc3QgTGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgaW5s aW5lRm9ybWF0dGluZ0NvbnRleHQsIElubGluZUNvbnRlbnQmIGlubGluZUNvbnRlbnQpIGNvbnN0 CiB7CiAgICAgYXV0byYgaW5saW5lRm9ybWF0dGluZ1N0YXRlID0gaW5saW5lRm9ybWF0dGluZ0Nv bnRleHQuZm9ybWF0dGluZ1N0YXRlKCk7Ci0gICAgYXV0byBpbmxpbmVRdWlya3MgPSBpbmxpbmVG b3JtYXR0aW5nQ29udGV4dC5xdWlya3MoKTsKKyAgICBhdXRvIGlubGluZVF1aXJrcyA9IExheW91 dDo6SW5saW5lRm9ybWF0dGluZ1F1aXJrcyB7IGlubGluZUZvcm1hdHRpbmdDb250ZXh0IH07CiAg ICAgZm9yIChzaXplX3QgbGluZUluZGV4ID0gMDsgbGluZUluZGV4IDwgaW5saW5lRm9ybWF0dGlu Z1N0YXRlLmxpbmVCb3hlcygpLnNpemUoKTsgKytsaW5lSW5kZXgpIHsKICAgICAgICAgYXV0byYg bGluZUJveCA9IGlubGluZUZvcm1hdHRpbmdTdGF0ZS5saW5lQm94ZXMoKVtsaW5lSW5kZXhdOwog ICAgICAgICBpZiAoIWxpbmVCb3guaGFzSW5saW5lQm94KCkpCg== 428768 2021-05-15 19:39:04 -0700 2021-05-15 20:04:46 -0700 [fast-cq] Patch bug-225749-20210515193903.patch text/plain 5813 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3NTU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTM4NzE0YWFlOThjMTkz ODk3ZGNiOTY1NzczNjI4NDhjMzRmOWI0Ny4uYzVmOTc3YzgwZDJjMDI1ODBlZmY0YzZlZmE2YWFm M2YzMmI0MTgyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA1LTE1ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXSBNYWtlIHJlZHVuZGFu dCBwdWJsaWMgaGVscGVycyBwcml2YXRlIGluIElubGluZUZvcm1hdHRpbmdDb250ZXh0CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjU3NDkKKworICAg ICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KKworICAgICAgICAqIGxheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdDb250ZXh0Lmg6CisgICAgICAg ICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0dlb21l dHJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveEJ1aWxkZXI6OmNvbXB1 dGVMaW5lQm94SGVpZ2h0QW5kQWxpZ25JbmxpbmVMZXZlbEJveGVzVmVydGljYWxseSk6CisgICAg ICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0Ojppc0F0U29mdFdyYXBPcHBvcnR1bml0eSk6 CisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29u dGVudEJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246Oklu bGluZUNvbnRlbnRCdWlsZGVyOjpjcmVhdGVEaXNwbGF5Tm9uUm9vdElubGluZUJveGVzIGNvbnN0 KToKKwogMjAyMS0wNS0xNSAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAg ICAgW0xGQ10gTWFrZSByZWR1bmRhbnQgcHVibGljIGhlbHBlcnMgcHJpdmF0ZSBpbiBCbG9ja0Zv cm1hdHRpbmdDb250ZXh0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0Nv bnRleHQuaAppbmRleCBjZDcxODNjZDU0MzUwNjIzNjQ0MzhkOGVhMDEwMDUwMWU0ZTEyNGViLi5m NzMwNmI5ODQ2NjU0NGU3OTFkMjA3MDg3NjAwZTRlM2M5ZDNkNjE0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0 aW5nQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmgKQEAgLTQ5LDggKzQ5LDYgQEAgcHVi bGljOgogICAgIHZvaWQgbGF5b3V0SW5GbG93Q29udGVudChJbnZhbGlkYXRpb25TdGF0ZSYsIGNv bnN0IENvbnN0cmFpbnRzRm9ySW5GbG93Q29udGVudCYpIG92ZXJyaWRlOwogICAgIExheW91dFVu aXQgdXNlZENvbnRlbnRIZWlnaHQoKSBjb25zdCBvdmVycmlkZTsKIAotICAgIElubGluZUZvcm1h dHRpbmdRdWlya3MgcXVpcmtzKCkgY29uc3Q7Ci0KICAgICBjb25zdCBJbmxpbmVGb3JtYXR0aW5n U3RhdGUmIGZvcm1hdHRpbmdTdGF0ZSgpIGNvbnN0IHsgcmV0dXJuIGRvd25jYXN0PElubGluZUZv cm1hdHRpbmdTdGF0ZT4oRm9ybWF0dGluZ0NvbnRleHQ6OmZvcm1hdHRpbmdTdGF0ZSgpKTsgfQog ICAgIElubGluZUZvcm1hdHRpbmdTdGF0ZSYgZm9ybWF0dGluZ1N0YXRlKCkgeyByZXR1cm4gZG93 bmNhc3Q8SW5saW5lRm9ybWF0dGluZ1N0YXRlPihGb3JtYXR0aW5nQ29udGV4dDo6Zm9ybWF0dGlu Z1N0YXRlKCkpOyB9CiAKQEAgLTYwLDYgKzU4LDcgQEAgcHJpdmF0ZToKICAgICBJbnRyaW5zaWNX aWR0aENvbnN0cmFpbnRzIGNvbXB1dGVkSW50cmluc2ljV2lkdGhDb25zdHJhaW50cygpIG92ZXJy aWRlOwogCiAgICAgSW5saW5lRm9ybWF0dGluZ0dlb21ldHJ5IGdlb21ldHJ5KCkgY29uc3Q7Cisg ICAgSW5saW5lRm9ybWF0dGluZ1F1aXJrcyBxdWlya3MoKSBjb25zdDsKIAogICAgIHZvaWQgbGlu ZUxheW91dChJbmxpbmVJdGVtcyYsIExpbmVCdWlsZGVyOjpJbmxpbmVJdGVtUmFuZ2UsIGNvbnN0 IENvbnN0cmFpbnRzRm9ySW5GbG93Q29udGVudCYpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nR2Vv bWV0cnkuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvSW5saW5lRm9ybWF0dGluZ0dlb21ldHJ5LmNwcAppbmRleCA3MzczZDFlMmJjZjMyOGU3YjVh ZDYzZTA3MGUwMWUwMWVlZTk4OGRhLi5kNWUzMjBmNTI3ZDVlZGI2N2U1MDEyZjQ1MTdlMzdlMDQx YzhlZWMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nR2VvbWV0cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdHZW9t ZXRyeS5jcHAKQEAgLTM4OSw3ICszODksNyBAQCB2b2lkIExpbmVCb3hCdWlsZGVyOjpjb21wdXRl TGluZUJveEhlaWdodEFuZEFsaWduSW5saW5lTGV2ZWxCb3hlc1ZlcnRpY2FsbHkoTGluZQogICAg IC8vIDEuIENvbXB1dGUgdGhlIGxpbmUgYm94IGhlaWdodCB1c2luZyB0aGUgbGF5b3V0IGJvdW5k cyBnZW9tZXRyeS4gVGhpcyBoZWlnaHQgY29tcHV0YXRpb24gc3RyaWN0bHkgdXNlcyBsYXlvdXQg Ym91bmRzIGFuZCBub3Qgbm9ybWFsIGlubGluZSBsZXZlbCBib3ggZ2VvbWV0cmllcy4KICAgICAv LyAyLiBDb21wdXRlIHRoZSBiYXNlbGluZS9sb2dpY2FsIHRvcCBwb3NpdGlvbiBvZiB0aGUgcm9v dCBpbmxpbmUgYm94LiBBbGlnbmVkIGJveGVzIHB1c2ggdGhlIHJvb3QgaW5saW5lIGJveCBhcm91 bmQgaW5zaWRlIHRoZSBsaW5lIGJveC4KICAgICAvLyAzLiBGaW5hbGx5IGFsaWduIHRoZSBpbmxp bmUgbGV2ZWwgYm94ZXMgdXNpbmcgKG1vc3RseSkgbm9ybWFsIGlubGluZSBsZXZlbCBib3ggZ2Vv bWV0cmllcy4KLSAgICBhdXRvIHF1aXJrcyA9IGZvcm1hdHRpbmdDb250ZXh0KCkucXVpcmtzKCk7 CisgICAgYXV0byBxdWlya3MgPSBJbmxpbmVGb3JtYXR0aW5nUXVpcmtzIHsgZm9ybWF0dGluZ0Nv bnRleHQoKSB9OwogICAgIGF1dG8mIHJvb3RJbmxpbmVCb3ggPSBsaW5lQm94LnJvb3RJbmxpbmVC b3goKTsKIAogICAgIGF1dG8gY29tcHV0ZUxpbmVCb3hMb2dpY2FsSGVpZ2h0ID0gWyZdIHsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0lubGluZUxpbmVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcAppbmRleCA2YzYyNmVhMGVlNWE2 M2E0YTk2MmIxNTVjZTYxMDY1MzBmY2UyMmYyLi4xNTgwMGIxOGFmNzJhZWE1ZmJhZjk4ODUyMGEy YmRjMzI5Njc2NzkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3Bw CkBAIC0xMTIsNyArMTEyLDcgQEAgc3RhdGljIGlubGluZSBib29sIGlzQXRTb2Z0V3JhcE9wcG9y dHVuaXR5KGNvbnN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0JiBpbmxpbmUKICAgICBpZiAoY3Vy cmVudC5pc0JveCgpIHx8IG5leHQuaXNCb3goKSkgewogICAgICAgICBhdXRvIGlzSW1hZ2VDb250 ZW50ID0gY3VycmVudC5sYXlvdXRCb3goKS5pc0ltYWdlKCkgfHwgbmV4dC5sYXlvdXRCb3goKS5p c0ltYWdlKCk7CiAgICAgICAgIGlmIChpc0ltYWdlQ29udGVudCkKLSAgICAgICAgICAgIHJldHVy biBpbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5xdWlya3MoKS5oYXNTb2Z0V3JhcE9wcG9ydHVuaXR5 QXRJbWFnZSgpOworICAgICAgICAgICAgcmV0dXJuIElubGluZUZvcm1hdHRpbmdRdWlya3MoaW5s aW5lRm9ybWF0dGluZ0NvbnRleHQpLmhhc1NvZnRXcmFwT3Bwb3J0dW5pdHlBdEltYWdlKCk7CiAg ICAgICAgIC8vIFt0ZXh0XVtpbmxpbmUgYm94IHN0YXJ0XVtpbmxpbmUgYm94IGVuZF1baW5saW5l IGJveF0gKHRleHQ8c3Bhbj48L3NwYW4+PGltZz4pIDogdGhlcmUncyBhIHNvZnQgd3JhcCBvcHBv cnR1bml0eSBiZXR3ZWVuIHRoZSBbdGV4dF0gYW5kIFtpbWddLgogICAgICAgICAvLyBUaGUgbGlu ZSBicmVha2luZyBiZWhhdmlvciBvZiBhIHJlcGxhY2VkIGVsZW1lbnQgb3Igb3RoZXIgYXRvbWlj IGlubGluZSBpcyBlcXVpdmFsZW50IHRvIGFuIGlkZW9ncmFwaGljIGNoYXJhY3Rlci4KICAgICAg ICAgcmV0dXJuIHRydWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdy YXRpb24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50QnVpbGRlci5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50 QnVpbGRlci5jcHAKaW5kZXggZTQ5NDU4ZGMzN2IyYjY4ZmJiMThmYTBhZDZlM2EyNzRmYTliNGY4 ZC4uZGNmMzNkNDg0ODQ1MmZiM2ZhZTM1MWMwM2Q2MzQwYWViNTBlYzBiYyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uSW5saW5l Q29udGVudEJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlv bi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnRCdWlsZGVyLmNwcApAQCAtMzY3LDcgKzM2 Nyw3IEBAIHZvaWQgSW5saW5lQ29udGVudEJ1aWxkZXI6OmNyZWF0ZURpc3BsYXlMaW5lcyhjb25z dCBMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdTdGF0CiB2b2lkIElubGluZUNvbnRlbnRCdWlsZGVy OjpjcmVhdGVEaXNwbGF5Tm9uUm9vdElubGluZUJveGVzKGNvbnN0IExheW91dDo6SW5saW5lRm9y bWF0dGluZ0NvbnRleHQmIGlubGluZUZvcm1hdHRpbmdDb250ZXh0LCBJbmxpbmVDb250ZW50JiBp bmxpbmVDb250ZW50KSBjb25zdAogewogICAgIGF1dG8mIGlubGluZUZvcm1hdHRpbmdTdGF0ZSA9 IGlubGluZUZvcm1hdHRpbmdDb250ZXh0LmZvcm1hdHRpbmdTdGF0ZSgpOwotICAgIGF1dG8gaW5s aW5lUXVpcmtzID0gaW5saW5lRm9ybWF0dGluZ0NvbnRleHQucXVpcmtzKCk7CisgICAgYXV0byBp bmxpbmVRdWlya3MgPSBMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdRdWlya3MgeyBpbmxpbmVGb3Jt YXR0aW5nQ29udGV4dCB9OwogICAgIGZvciAoc2l6ZV90IGxpbmVJbmRleCA9IDA7IGxpbmVJbmRl eCA8IGlubGluZUZvcm1hdHRpbmdTdGF0ZS5saW5lQm94ZXMoKS5zaXplKCk7ICsrbGluZUluZGV4 KSB7CiAgICAgICAgIGF1dG8mIGxpbmVCb3ggPSBpbmxpbmVGb3JtYXR0aW5nU3RhdGUubGluZUJv eGVzKClbbGluZUluZGV4XTsKICAgICAgICAgaWYgKCFsaW5lQm94Lmhhc0lubGluZUJveCgpKQo=