221725 2021-02-10 16:00:27 -0800 [LFC][IFC] Introduce dedicated logical rect getter for each inline level box type 2021-02-11 06:57:15 -0800 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 1727857 0 zalan 2021-02-10 16:00:27 -0800 ssia 1727922 1 419937 zalan 2021-02-10 19:05:28 -0800 Created attachment 419937 Patch 1728057 2 419937 koivisto 2021-02-11 06:25:48 -0800 Comment on attachment 419937 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=419937&action=review > Source/WebCore/layout/integration/LayoutIntegrationInlineContentBuilder.cpp:344 > - auto inlineBoxRect = lineBox.logicalMarginRectForInlineLevelBox(layoutBox, boxGeometry); > + auto inlineBoxRect = lineBox.logicalRectForInlineBox(layoutBox, boxGeometry); nice! 1728068 3 ews-feeder 2021-02-11 06:56:23 -0800 Committed r272725: <https://commits.webkit.org/r272725> All reviewed patches have been landed. Closing bug and clearing flags on attachment 419937. 1728070 4 webkit-bug-importer 2021-02-11 06:57:15 -0800 <rdar://problem/74232636> 419937 2021-02-10 19:05:28 -0800 2021-02-11 06:56:24 -0800 Patch bug-221725-20210210190527.patch text/plain 16721 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyNzAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzc5M2FhMjQ3MWQyMjI1 MTRmZjcyNTc0ZDg5ZTYzOWE3YTQ3YWRjOS4uNzQ3YmU5YTY1MGYzNTQyYWU3YTA4MDY0NzhlYzVm NDNmYTlhZjI3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIxLTAyLTEwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBJbnRyb2R1 Y2UgZGVkaWNhdGVkIGxvZ2ljYWwgcmVjdCBnZXR0ZXIgZm9yIGVhY2ggaW5saW5lIGxldmVsIGJv eCB0eXBlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MjE3MjUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU aGlzIGhlbHBzIHdoZW4gZGlmZmVyZW50IHR5cGUgb2YgcmVjdHMgKG1hcmdpbiB2cy4gYm9yZGVy KSBhcmUgcmV0dXJuZWQgZm9yIGRpZmZlcmVudCB0eXBlIG9mIGJveGVzLgorCisgICAgICAgICog bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUdl b21ldHJ5Rm9yTGluZUNvbnRlbnQpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUxpbmVCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94Ojps b2dpY2FsUmVjdEZvclRleHRSdW4gY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpM aW5lQm94Ojpsb2dpY2FsUmVjdEZvckxpbmVCcmVha0JveCBjb25zdCk6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OkxpbmVCb3g6OmxvZ2ljYWxSZWN0Rm9ySW5saW5lTGV2ZWxCb3ggY29uc3Qp OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94Ojpsb2dpY2FsTWFyZ2luUmVjdEZv ckF0b21pY0lubGluZUxldmVsQm94IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 TGluZUJveDo6bG9naWNhbFJlY3RGb3JJbmxpbmVCb3ggY29uc3QpOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpMaW5lQm94Ojpsb2dpY2FsTWFyZ2luUmVjdEZvcklubGluZUxldmVsQm94IGNv bnN0KTogRGVsZXRlZC4KKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVM aW5lQm94Lmg6CisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9u SW5saW5lQ29udGVudEJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdy YXRpb246OklubGluZUNvbnRlbnRCdWlsZGVyOjpjcmVhdGVEaXNwbGF5Tm9uUm9vdElubGluZUJv eGVzIGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRUcmVlQnVpbGRl ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OnNob3dJbmxpbmVUcmVlQW5kUnVucyk6 CisKIDIwMjEtMDItMTAgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAg ICBbTEZDXVtJRkNdIExvZ2ljYWwgd2lkdGggb2YgYSBsaW5lIGJveCBpcyBlcXVhbCB0byB0aGUg aW5uZXIgbG9naWNhbCB3aWR0aCBvZiBpdHMgY29udGFpbmluZyBibG9jawpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0Nv bnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l Rm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IGFhYjhlYzM0YzQ0NjcxNzZlOWU3MzFjYjg0NmYx NzE4Zjg3NmI4Y2QuLjhmZjNlZDI4NzIwMzEyNGJlM2I0Y2NiN2NmNGIzNWUwMjY3NDljODEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZv cm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9y bWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTQ2NCw3ICs0NjQsNyBAQCBJ bmxpbmVSZWN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlR2VvbWV0cnlGb3JMaW5l Q29udGVudChjb25zdCBMaW5lQnVpbAogICAgICAgICAgICAgfQogICAgICAgICAgICAgZm9yIChh dXRvKiBsYXlvdXRCb3ggOiBsYXlvdXRCb3hMaXN0KSB7CiAgICAgICAgICAgICAgICAgYXV0byYg Ym94R2VvbWV0cnkgPSBmb3JtYXR0aW5nU3RhdGUuYm94R2VvbWV0cnkoKmxheW91dEJveCk7Ci0g ICAgICAgICAgICAgICAgYXV0byBpbmxpbmVCb3hMb2dpY2FsSGVpZ2h0ID0gTGF5b3V0VW5pdDo6 ZnJvbUZsb2F0Q2VpbChsaW5lQm94LmxvZ2ljYWxNYXJnaW5SZWN0Rm9ySW5saW5lTGV2ZWxCb3go KmxheW91dEJveCwgYm94R2VvbWV0cnkpLmhlaWdodCgpKTsKKyAgICAgICAgICAgICAgICBhdXRv IGlubGluZUJveExvZ2ljYWxIZWlnaHQgPSBMYXlvdXRVbml0Ojpmcm9tRmxvYXRDZWlsKGxpbmVC b3gubG9naWNhbFJlY3RGb3JJbmxpbmVCb3goKmxheW91dEJveCwgYm94R2VvbWV0cnkpLmhlaWdo dCgpKTsKICAgICAgICAgICAgICAgICBib3hHZW9tZXRyeS5zZXRDb250ZW50Qm94SGVpZ2h0KGlu bGluZUJveExvZ2ljYWxIZWlnaHQpOwogICAgICAgICAgICAgICAgIGJveEdlb21ldHJ5LnNldENv bnRlbnRCb3hXaWR0aCh7IH0pOwogICAgICAgICAgICAgICAgIGJveEdlb21ldHJ5LnNldExvZ2lj YWxUb3BMZWZ0KHRvTGF5b3V0UG9pbnQobGluZUJveExvZ2ljYWxSZWN0LnRvcExlZnQoKSkpOwpA QCAtNDkwLDI1ICs0OTAsMjYgQEAgSW5saW5lUmVjdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6 Y29tcHV0ZUdlb21ldHJ5Rm9yTGluZUNvbnRlbnQoY29uc3QgTGluZUJ1aWwKICAgICAgICAgICAg ICAgICBjb250aW51ZTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGlmIChsaW5lUnVuLmlz TGluZUJyZWFrKCkpIHsKLSAgICAgICAgICAgICAgICBhdXRvIGxpbmVCcmVha0JveFJlY3QgPSBs aW5lQm94LmxvZ2ljYWxSZWN0Rm9yVGV4dFJ1bihsaW5lUnVuKTsKLSAgICAgICAgICAgICAgICBm b3JtYXR0aW5nU3RhdGUuYWRkTGluZVJ1bih7IGxpbmVJbmRleCwgbGF5b3V0Qm94LCBsaW5lQnJl YWtCb3hSZWN0LCBsaW5lUnVuLmV4cGFuc2lvbigpLCBsaW5lUnVuLnRleHRDb250ZW50KCkgfSk7 Ci0KICAgICAgICAgICAgICAgICBpZiAobGF5b3V0Qm94LmlzTGluZUJyZWFrQm94KCkpIHsKICAg ICAgICAgICAgICAgICAgICAgLy8gT25seSBoYXJkIGxpbmVicmVha3MgaGF2ZSBhc3NvY2lhdGVk IGxheW91dCBib3hlcy4KKyAgICAgICAgICAgICAgICAgICAgYXV0byBsaW5lQnJlYWtCb3hSZWN0 ID0gbGluZUJveC5sb2dpY2FsUmVjdEZvckxpbmVCcmVha0JveChsYXlvdXRCb3gpOworICAgICAg ICAgICAgICAgICAgICBmb3JtYXR0aW5nU3RhdGUuYWRkTGluZVJ1bih7IGxpbmVJbmRleCwgbGF5 b3V0Qm94LCBsaW5lQnJlYWtCb3hSZWN0LCBsaW5lUnVuLmV4cGFuc2lvbigpLCB7IH0gfSk7CisK ICAgICAgICAgICAgICAgICAgICAgYXV0byYgYm94R2VvbWV0cnkgPSBmb3JtYXR0aW5nU3RhdGUu Ym94R2VvbWV0cnkobGF5b3V0Qm94KTsKICAgICAgICAgICAgICAgICAgICAgbGluZUJyZWFrQm94 UmVjdC5tb3ZlQnkobGluZUJveExvZ2ljYWxSZWN0LnRvcExlZnQoKSk7CiAgICAgICAgICAgICAg ICAgICAgIGJveEdlb21ldHJ5LnNldExvZ2ljYWxUb3BMZWZ0KHRvTGF5b3V0UG9pbnQobGluZUJy ZWFrQm94UmVjdC50b3BMZWZ0KCkpKTsKICAgICAgICAgICAgICAgICAgICAgYm94R2VvbWV0cnku c2V0Q29udGVudEJveEhlaWdodCh0b0xheW91dFVuaXQobGluZUJyZWFrQm94UmVjdC5oZWlnaHQo KSkpOwotICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICB9IGVsc2UgCisgICAgICAg ICAgICAgICAgICAgIGZvcm1hdHRpbmdTdGF0ZS5hZGRMaW5lUnVuKHsgbGluZUluZGV4LCBsYXlv dXRCb3gsIGxpbmVCb3gubG9naWNhbFJlY3RGb3JUZXh0UnVuKGxpbmVSdW4pLCBsaW5lUnVuLmV4 cGFuc2lvbigpLCBsaW5lUnVuLnRleHRDb250ZW50KCkgfSk7CiAgICAgICAgICAgICAgICAgY29u dGludWU7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBpZiAobGluZVJ1bi5pc0JveCgpKSB7 CiAgICAgICAgICAgICAgICAgQVNTRVJUKGxheW91dEJveC5pc0F0b21pY0lubGluZUxldmVsQm94 KCkpOwotICAgICAgICAgICAgICAgIGF1dG8mIGJveEdlb21ldHJ5ID0gZm9ybWF0dGluZ1N0YXRl LmJveEdlb21ldHJ5KGxheW91dEJveCk7Ci0gICAgICAgICAgICAgICAgYXV0byBsb2dpY2FsTWFy Z2luUmVjdCA9IGxpbmVCb3gubG9naWNhbE1hcmdpblJlY3RGb3JJbmxpbmVMZXZlbEJveChsYXlv dXRCb3gsIGJveEdlb21ldHJ5KTsKKyAgICAgICAgICAgICAgICBhdXRvIGxvZ2ljYWxNYXJnaW5S ZWN0ID0gbGluZUJveC5sb2dpY2FsTWFyZ2luUmVjdEZvckF0b21pY0lubGluZUxldmVsQm94KGxh eW91dEJveCk7CiAgICAgICAgICAgICAgICAgZm9ybWF0dGluZ1N0YXRlLmFkZExpbmVSdW4oeyBs aW5lSW5kZXgsIGxheW91dEJveCwgbG9naWNhbE1hcmdpblJlY3QsIGxpbmVSdW4uZXhwYW5zaW9u KCksIHsgfSB9KTsKIAogICAgICAgICAgICAgICAgIGF1dG8gYm9yZGVyQm94TG9naWNhbFRvcExl ZnQgPSBsb2dpY2FsTWFyZ2luUmVjdC50b3BMZWZ0KCk7CisgICAgICAgICAgICAgICAgYXV0byYg Ym94R2VvbWV0cnkgPSBmb3JtYXR0aW5nU3RhdGUuYm94R2VvbWV0cnkobGF5b3V0Qm94KTsKICAg ICAgICAgICAgICAgICBib3JkZXJCb3hMb2dpY2FsVG9wTGVmdC5tb3ZlKHN0ZDo6bWF4KDBfbHUs IGJveEdlb21ldHJ5Lm1hcmdpblN0YXJ0KCkpLCBzdGQ6Om1heCgwX2x1LCBib3hHZW9tZXRyeS5t YXJnaW5CZWZvcmUoKSkpOwogICAgICAgICAgICAgICAgIC8vIE5vdGUgdGhhdCBpbmxpbmUgYm94 ZXMgYXJlIHJlbGF0aXZlIHRvIHRoZSBsaW5lIGFuZCB0aGVpciB0b3AgcG9zaXRpb24gY2FuIGJl IG5lZ2F0aXZlLgogICAgICAgICAgICAgICAgIGJvcmRlckJveExvZ2ljYWxUb3BMZWZ0Lm1vdmVC eShsaW5lQm94TG9naWNhbFJlY3QudG9wTGVmdCgpKTsKQEAgLTUyNSw3ICs1MjYsNyBAQCBJbmxp bmVSZWN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlR2VvbWV0cnlGb3JMaW5lQ29u dGVudChjb25zdCBMaW5lQnVpbAogICAgICAgICAgICAgfQogICAgICAgICAgICAgaWYgKGxpbmVS dW4uaXNJbmxpbmVCb3hTdGFydCgpKSB7CiAgICAgICAgICAgICAgICAgYXV0byYgYm94R2VvbWV0 cnkgPSBmb3JtYXR0aW5nU3RhdGUuYm94R2VvbWV0cnkobGF5b3V0Qm94KTsKLSAgICAgICAgICAg ICAgICBhdXRvIGlubGluZUJveExvZ2ljYWxSZWN0ID0gbGluZUJveC5sb2dpY2FsTWFyZ2luUmVj dEZvcklubGluZUxldmVsQm94KGxheW91dEJveCwgYm94R2VvbWV0cnkpOworICAgICAgICAgICAg ICAgIGF1dG8gaW5saW5lQm94TG9naWNhbFJlY3QgPSBsaW5lQm94LmxvZ2ljYWxSZWN0Rm9ySW5s aW5lQm94KGxheW91dEJveCwgYm94R2VvbWV0cnkpOwogICAgICAgICAgICAgICAgIGZvcm1hdHRp bmdTdGF0ZS5hZGRMaW5lUnVuKHsgbGluZUluZGV4LCBsYXlvdXRCb3gsIGlubGluZUJveExvZ2lj YWxSZWN0LCBsaW5lUnVuLmV4cGFuc2lvbigpLCB7IH0gfSk7CiAgICAgICAgICAgICAgICAgaW5s aW5lQm94U3RhcnRTZXQuYWRkKCZsYXlvdXRCb3gpOwogICAgICAgICAgICAgICAgIGVuY2xvc2lu Z1RvcEFuZEJvdHRvbS50b3AgPSBzdGQ6Om1pbihlbmNsb3NpbmdUb3BBbmRCb3R0b20udG9wLCBp bmxpbmVCb3hMb2dpY2FsUmVjdC50b3AoKSk7CkBAIC01MzMsNyArNTM0LDcgQEAgSW5saW5lUmVj dCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUdlb21ldHJ5Rm9yTGluZUNvbnRlbnQo Y29uc3QgTGluZUJ1aWwKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGlmIChsaW5lUnVuLmlz SW5saW5lQm94RW5kKCkpIHsKICAgICAgICAgICAgICAgICBpbmxpbmVCb3hFbmRTZXQuYWRkKCZs YXlvdXRCb3gpOwotICAgICAgICAgICAgICAgIGF1dG8gaW5saW5lQm94TG9naWNhbFJlY3QgPSBs aW5lQm94LmxvZ2ljYWxNYXJnaW5SZWN0Rm9ySW5saW5lTGV2ZWxCb3gobGF5b3V0Qm94LCBmb3Jt YXR0aW5nU3RhdGUuYm94R2VvbWV0cnkobGF5b3V0Qm94KSk7CisgICAgICAgICAgICAgICAgYXV0 byBpbmxpbmVCb3hMb2dpY2FsUmVjdCA9IGxpbmVCb3gubG9naWNhbFJlY3RGb3JJbmxpbmVCb3go bGF5b3V0Qm94LCBmb3JtYXR0aW5nU3RhdGUuYm94R2VvbWV0cnkobGF5b3V0Qm94KSk7CiAgICAg ICAgICAgICAgICAgZW5jbG9zaW5nVG9wQW5kQm90dG9tLmJvdHRvbSA9IHN0ZDo6bWF4KGVuY2xv c2luZ1RvcEFuZEJvdHRvbS5ib3R0b20sIGlubGluZUJveExvZ2ljYWxSZWN0LmJvdHRvbSgpKTsK ICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgIH0KQEAgLTU1NCw3ICs1NTUs NyBAQCBJbmxpbmVSZWN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlR2VvbWV0cnlG b3JMaW5lQ29udGVudChjb25zdCBMaW5lQnVpbAogICAgICAgICAgICAgYXV0byYgbGF5b3V0Qm94 ID0gaW5saW5lTGV2ZWxCb3gtPmxheW91dEJveCgpOwogICAgICAgICAgICAgYXV0byYgYm94R2Vv bWV0cnkgPSBmb3JtYXR0aW5nU3RhdGUuYm94R2VvbWV0cnkobGF5b3V0Qm94KTsKICAgICAgICAg ICAgIC8vIElubGluZSBib3hlcyBtYXkgb3IgbWF5IG5vdCBiZSB3cmFwcGVkIGFuZCBoYXZlIHJ1 bnMgb24gbXVsdGlwbGUgbGluZXMgKGUuZy4gPHNwYW4+Zmlyc3QgbGluZTxicj5zZWNvbmQgbGlu ZTxicj50aGlyZCBsaW5lPC9zcGFuPikKLSAgICAgICAgICAgIGF1dG8gaW5saW5lQm94TWFyZ2lu UmVjdCA9IGxpbmVCb3gubG9naWNhbE1hcmdpblJlY3RGb3JJbmxpbmVMZXZlbEJveChsYXlvdXRC b3gsIGJveEdlb21ldHJ5KTsKKyAgICAgICAgICAgIGF1dG8gaW5saW5lQm94TWFyZ2luUmVjdCA9 IGxpbmVCb3gubG9naWNhbFJlY3RGb3JJbmxpbmVCb3gobGF5b3V0Qm94LCBib3hHZW9tZXRyeSk7 CiAgICAgICAgICAgICBhdXRvIGlubGluZUJveFNpemUgPSBMYXlvdXRTaXplIHsgTGF5b3V0VW5p dDo6ZnJvbUZsb2F0Q2VpbChpbmxpbmVCb3hNYXJnaW5SZWN0LndpZHRoKCkpLCBMYXlvdXRVbml0 Ojpmcm9tRmxvYXRDZWlsKGlubGluZUJveE1hcmdpblJlY3QuaGVpZ2h0KCkpIH07CiAgICAgICAg ICAgICBhdXRvIGxvZ2ljYWxSZWN0ID0gUmVjdCB7IExheW91dFBvaW50IHsgaW5saW5lQm94TWFy Z2luUmVjdC50b3BMZWZ0KCkgfSwgaW5saW5lQm94U2l6ZSB9OwogICAgICAgICAgICAgbG9naWNh bFJlY3QubW92ZUJ5KExheW91dFBvaW50IHsgbGluZUJveExvZ2ljYWxSZWN0LnRvcExlZnQoKSB9 KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUxpbmVCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv SW5saW5lTGluZUJveC5jcHAKaW5kZXggZDNiOGFkMmRmNDFjZjI3MWJhODViZjAwZDFmYjAxMzlj Zjc1Y2RiZC4uNTgyZjI3MGFkZDI1NWM5ZGMwZDg1ZmRlYzE1M2Q3MmUyNGNlOGM1MyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJv eC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l TGluZUJveC5jcHAKQEAgLTEwNiw3ICsxMDYsNyBAQCB2b2lkIExpbmVCb3g6OmFkZElubGluZUxl dmVsQm94KHN0ZDo6dW5pcXVlX3B0cjxJbmxpbmVMZXZlbEJveD4mJiBpbmxpbmVMZXZlbEJveAog CiBJbmxpbmVSZWN0IExpbmVCb3g6OmxvZ2ljYWxSZWN0Rm9yVGV4dFJ1bihjb25zdCBMaW5lOjpS dW4mIHJ1bikgY29uc3QKIHsKLSAgICBBU1NFUlQocnVuLmlzVGV4dCgpIHx8IHJ1bi5pc0xpbmVC cmVhaygpKTsKKyAgICBBU1NFUlQocnVuLmlzVGV4dCgpIHx8IHJ1bi5pc1NvZnRMaW5lQnJlYWso KSk7CiAgICAgYXV0byogcGFyZW50SW5saW5lQm94ID0gJmlubGluZUxldmVsQm94Rm9yTGF5b3V0 Qm94KHJ1bi5sYXlvdXRCb3goKS5wYXJlbnQoKSk7CiAgICAgQVNTRVJUKHBhcmVudElubGluZUJv eC0+aXNJbmxpbmVCb3goKSk7CiAgICAgYXV0byYgZm9udE1ldHJpY3MgPSBwYXJlbnRJbmxpbmVC b3gtPnN0eWxlKCkuZm9udE1ldHJpY3MoKTsKQEAgLTEyMSwzMCArMTIxLDQ2IEBAIElubGluZVJl Y3QgTGluZUJveDo6bG9naWNhbFJlY3RGb3JUZXh0UnVuKGNvbnN0IExpbmU6OlJ1biYgcnVuKSBj b25zdAogICAgIHJldHVybiB7IHJ1bmxvZ2ljYWxUb3AsIG1faG9yaXpvbnRhbEFsaWdubWVudE9m ZnNldC52YWx1ZU9yKElubGluZUxheW91dFVuaXQgeyB9KSArIHJ1bi5sb2dpY2FsTGVmdCgpLCBy dW4ubG9naWNhbFdpZHRoKCksIGxvZ2ljYWxIZWlnaHQgfTsKIH0KIAotSW5saW5lUmVjdCBMaW5l Qm94Ojpsb2dpY2FsTWFyZ2luUmVjdEZvcklubGluZUxldmVsQm94KGNvbnN0IEJveCYgbGF5b3V0 Qm94LCBjb25zdCBCb3hHZW9tZXRyeSYgYm94R2VvbWV0cnkpIGNvbnN0CitJbmxpbmVSZWN0IExp bmVCb3g6OmxvZ2ljYWxSZWN0Rm9yTGluZUJyZWFrQm94KGNvbnN0IEJveCYgbGF5b3V0Qm94KSBj b25zdAogewotICAgIGF1dG8gbG9naWNhbFJlY3QgPSBbJl0gewotICAgICAgICBhdXRvKiBpbmxp bmVCb3ggPSAmaW5saW5lTGV2ZWxCb3hGb3JMYXlvdXRCb3gobGF5b3V0Qm94KTsKLSAgICAgICAg YXV0byBpbmxpbmVCb3hMb2dpY2FsUmVjdCA9IGlubGluZUJveC0+bG9naWNhbFJlY3QoKTsKLSAg ICAgICAgaWYgKGlubGluZUJveC0+aGFzTGluZUJveFJlbGF0aXZlQWxpZ25tZW50KCkpCi0gICAg ICAgICAgICByZXR1cm4gaW5saW5lQm94TG9naWNhbFJlY3Q7CisgICAgQVNTRVJUKGxheW91dEJv eC5pc0xpbmVCcmVha0JveCgpKTsKKyAgICByZXR1cm4gbG9naWNhbFJlY3RGb3JJbmxpbmVMZXZl bEJveChsYXlvdXRCb3gpOworfQogCi0gICAgICAgIGlmICgmbGF5b3V0Qm94LnBhcmVudCgpID09 ICZtX3Jvb3RJbmxpbmVCb3gtPmxheW91dEJveCgpKSB7Ci0gICAgICAgICAgICBpbmxpbmVCb3hM b2dpY2FsUmVjdC5tb3ZlVmVydGljYWxseShtX3Jvb3RJbmxpbmVCb3gtPmxvZ2ljYWxUb3AoKSk7 Ci0gICAgICAgICAgICByZXR1cm4gaW5saW5lQm94TG9naWNhbFJlY3Q7Ci0gICAgICAgIH0KK0lu bGluZVJlY3QgTGluZUJveDo6bG9naWNhbFJlY3RGb3JJbmxpbmVMZXZlbEJveChjb25zdCBCb3gm IGxheW91dEJveCkgY29uc3QKK3sKKyAgICBBU1NFUlQobGF5b3V0Qm94LmlzSW5saW5lTGV2ZWxC b3goKSB8fCBsYXlvdXRCb3guaXNMaW5lQnJlYWtCb3goKSk7CisgICAgLy8gSW5saW5lIGxldmVs IGJveGVzIGFyZSByZWxhdGl2ZSB0byB0aGVpciBwYXJlbnQgdW5sZXNzIHRoZSB2ZXJ0aWNhbCBh bGlnbm1lbnQgbWFrZXMgdGhlbSByZWxhdGl2ZSB0byB0aGUgbGluZSBib3ggKGUuZy4gdG9wLCBi b3R0b20pLgorICAgIGF1dG8qIGlubGluZUJveCA9ICZpbmxpbmVMZXZlbEJveEZvckxheW91dEJv eChsYXlvdXRCb3gpOworICAgIGF1dG8gaW5saW5lQm94TG9naWNhbFJlY3QgPSBpbmxpbmVCb3gt PmxvZ2ljYWxSZWN0KCk7CisgICAgaWYgKGlubGluZUJveC0+aGFzTGluZUJveFJlbGF0aXZlQWxp Z25tZW50KCkpCisgICAgICAgIHJldHVybiBpbmxpbmVCb3hMb2dpY2FsUmVjdDsKKworICAgIC8v IEZhc3QgcGF0aCBmb3IgaW5saW5lIGxldmVsIGJveGVzIG9uIHRoZSByb290IGlubGluZSBib3gg KGUuZyA8ZGl2PjxpbWc+PC9kaXY+KS4KKyAgICBpZiAoJmxheW91dEJveC5wYXJlbnQoKSA9PSAm bV9yb290SW5saW5lQm94LT5sYXlvdXRCb3goKSkgeworICAgICAgICBpbmxpbmVCb3hMb2dpY2Fs UmVjdC5tb3ZlVmVydGljYWxseShtX3Jvb3RJbmxpbmVCb3gtPmxvZ2ljYWxUb3AoKSk7CisgICAg ICAgIHJldHVybiBpbmxpbmVCb3hMb2dpY2FsUmVjdDsKKyAgICB9CiAKLSAgICAgICAgYXV0byBp bmxpbmVCb3hBYnNvbHV0ZWxvZ2ljYWxUb3AgPSBpbmxpbmVCb3hMb2dpY2FsUmVjdC50b3AoKTsK LSAgICAgICAgd2hpbGUgKGlubGluZUJveCAhPSBtX3Jvb3RJbmxpbmVCb3guZ2V0KCkgJiYgIWlu bGluZUJveC0+aGFzTGluZUJveFJlbGF0aXZlQWxpZ25tZW50KCkpIHsKLSAgICAgICAgICAgIGlu bGluZUJveCA9ICZpbmxpbmVMZXZlbEJveEZvckxheW91dEJveChpbmxpbmVCb3gtPmxheW91dEJv eCgpLnBhcmVudCgpKTsKLSAgICAgICAgICAgIEFTU0VSVChpbmxpbmVCb3gtPmlzSW5saW5lQm94 KCkpOwotICAgICAgICAgICAgaW5saW5lQm94QWJzb2x1dGVsb2dpY2FsVG9wICs9IGlubGluZUJv eC0+bG9naWNhbFRvcCgpOwotICAgICAgICB9Ci0gICAgICAgIHJldHVybiBJbmxpbmVSZWN0IHsg aW5saW5lQm94QWJzb2x1dGVsb2dpY2FsVG9wLCBpbmxpbmVCb3hMb2dpY2FsUmVjdC5sZWZ0KCks IGlubGluZUJveExvZ2ljYWxSZWN0LndpZHRoKCksIGlubGluZUJveExvZ2ljYWxSZWN0LmhlaWdo dCgpIH07Ci0gICAgfSgpOwotICAgIGlmICghbGF5b3V0Qm94LmlzSW5saW5lQm94KCkpCi0gICAg ICAgIHJldHVybiBsb2dpY2FsUmVjdDsKKyAgICAvLyBlLmcgPGRpdj48c3Bhbj48aW1nPjwvc3Bh bj48L2Rpdj4KKyAgICBhdXRvIGlubGluZUJveEFic29sdXRlbG9naWNhbFRvcCA9IGlubGluZUJv eExvZ2ljYWxSZWN0LnRvcCgpOworICAgIHdoaWxlIChpbmxpbmVCb3ggIT0gbV9yb290SW5saW5l Qm94LmdldCgpICYmICFpbmxpbmVCb3gtPmhhc0xpbmVCb3hSZWxhdGl2ZUFsaWdubWVudCgpKSB7 CisgICAgICAgIGlubGluZUJveCA9ICZpbmxpbmVMZXZlbEJveEZvckxheW91dEJveChpbmxpbmVC b3gtPmxheW91dEJveCgpLnBhcmVudCgpKTsKKyAgICAgICAgQVNTRVJUKGlubGluZUJveC0+aXNJ bmxpbmVCb3goKSk7CisgICAgICAgIGlubGluZUJveEFic29sdXRlbG9naWNhbFRvcCArPSBpbmxp bmVCb3gtPmxvZ2ljYWxUb3AoKTsKKyAgICB9CisgICAgcmV0dXJuIElubGluZVJlY3QgeyBpbmxp bmVCb3hBYnNvbHV0ZWxvZ2ljYWxUb3AsIGlubGluZUJveExvZ2ljYWxSZWN0LmxlZnQoKSwgaW5s aW5lQm94TG9naWNhbFJlY3Qud2lkdGgoKSwgaW5saW5lQm94TG9naWNhbFJlY3QuaGVpZ2h0KCkg fTsKK30KIAorSW5saW5lUmVjdCBMaW5lQm94Ojpsb2dpY2FsTWFyZ2luUmVjdEZvckF0b21pY0lu bGluZUxldmVsQm94KGNvbnN0IEJveCYgbGF5b3V0Qm94KSBjb25zdAoreworICAgIEFTU0VSVChs YXlvdXRCb3guaXNBdG9taWNJbmxpbmVMZXZlbEJveCgpKTsKKyAgICByZXR1cm4gbG9naWNhbFJl Y3RGb3JJbmxpbmVMZXZlbEJveChsYXlvdXRCb3gpOworfQorCitJbmxpbmVSZWN0IExpbmVCb3g6 OmxvZ2ljYWxSZWN0Rm9ySW5saW5lQm94KGNvbnN0IEJveCYgbGF5b3V0Qm94LCBjb25zdCBCb3hH ZW9tZXRyeSYgYm94R2VvbWV0cnkpIGNvbnN0Cit7CisgICAgYXV0byBsb2dpY2FsUmVjdCA9IGxv Z2ljYWxSZWN0Rm9ySW5saW5lTGV2ZWxCb3gobGF5b3V0Qm94KTsKICAgICAvLyBUaGlzIGxvZ2lj YWwgcmVjdCBpcyBhcyB0YWxsIGFzIHRoZSAidGV4dCIgY29udGVudCBpcy4gTGV0J3MgYWRqdXN0 IHdpdGggdmVydGljYWwgYm9yZGVyIGFuZCBwYWRkaW5nIC12ZXJ0aWNhbCBtYXJnaW4gaXMgaWdu b3JlZC4KICAgICBhdXRvIHZlcnRpY2FsQm9yZGVyQW5kUGFkZGluZyA9IGJveEdlb21ldHJ5LnZl cnRpY2FsQm9yZGVyKCkgKyBib3hHZW9tZXRyeS52ZXJ0aWNhbFBhZGRpbmcoKS52YWx1ZU9yKDBf bHUpOwogICAgIGxvZ2ljYWxSZWN0LmV4cGFuZFZlcnRpY2FsbHkodmVydGljYWxCb3JkZXJBbmRQ YWRkaW5nKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUxpbmVCb3guaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUxpbmVCb3guaAppbmRleCBlNGY3OTlkZTZlMjQwM2MyZWMwYzVlZGUwZjBmNDcy MzdjZDBlMGY0Li5jZjIyMzJjZjNhYjc5ODA0MDdjNjY3NDQ5NGNmZDJmZGZmNzZmMzhjIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5l Qm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l TGluZUJveC5oCkBAIC0xNTAsOCArMTUwLDEwIEBAIHB1YmxpYzoKICAgICBjb25zdCBJbmxpbmVM ZXZlbEJveCYgaW5saW5lTGV2ZWxCb3hGb3JMYXlvdXRCb3goY29uc3QgQm94JiBsYXlvdXRCb3gp IGNvbnN0IHsgcmV0dXJuICptX2lubGluZUxldmVsQm94UmVjdE1hcC5nZXQoJmxheW91dEJveCk7 IH0KIAogICAgIElubGluZVJlY3QgbG9naWNhbFJlY3RGb3JUZXh0UnVuKGNvbnN0IExpbmU6OlJ1 biYpIGNvbnN0OworICAgIElubGluZVJlY3QgbG9naWNhbFJlY3RGb3JMaW5lQnJlYWtCb3goY29u c3QgQm94JikgY29uc3Q7CisgICAgSW5saW5lUmVjdCBsb2dpY2FsTWFyZ2luUmVjdEZvckF0b21p Y0lubGluZUxldmVsQm94KGNvbnN0IEJveCYpIGNvbnN0OwogICAgIElubGluZVJlY3QgbG9naWNh bFJlY3RGb3JSb290SW5saW5lQm94KCkgY29uc3QgeyByZXR1cm4gbV9yb290SW5saW5lQm94LT5s b2dpY2FsUmVjdCgpOyB9Ci0gICAgSW5saW5lUmVjdCBsb2dpY2FsTWFyZ2luUmVjdEZvcklubGlu ZUxldmVsQm94KGNvbnN0IEJveCYsIGNvbnN0IEJveEdlb21ldHJ5JikgY29uc3Q7CisgICAgSW5s aW5lUmVjdCBsb2dpY2FsUmVjdEZvcklubGluZUJveChjb25zdCBCb3gmLCBjb25zdCBCb3hHZW9t ZXRyeSYpIGNvbnN0OwogCiAgICAgY29uc3QgSW5saW5lTGV2ZWxCb3gmIHJvb3RJbmxpbmVCb3go KSBjb25zdCB7IHJldHVybiAqbV9yb290SW5saW5lQm94OyB9CiAgICAgdXNpbmcgSW5saW5lTGV2 ZWxCb3hMaXN0ID0gVmVjdG9yPHN0ZDo6dW5pcXVlX3B0cjxJbmxpbmVMZXZlbEJveD4+OwpAQCAt MTcxLDYgKzE3Myw3IEBAIHByaXZhdGU6CiAgICAgSW5saW5lTGV2ZWxCb3gmIHJvb3RJbmxpbmVC b3goKSB7IHJldHVybiAqbV9yb290SW5saW5lQm94OyB9CiAKICAgICBJbmxpbmVMZXZlbEJveCYg aW5saW5lTGV2ZWxCb3hGb3JMYXlvdXRCb3goY29uc3QgQm94JiBsYXlvdXRCb3gpIHsgcmV0dXJu ICptX2lubGluZUxldmVsQm94UmVjdE1hcC5nZXQoJmxheW91dEJveCk7IH0KKyAgICBJbmxpbmVS ZWN0IGxvZ2ljYWxSZWN0Rm9ySW5saW5lTGV2ZWxCb3goY29uc3QgQm94JiBsYXlvdXRCb3gpIGNv bnN0OwogCiAgICAgdm9pZCBzZXRIYXNDb250ZW50KGJvb2wgaGFzQ29udGVudCkgeyBtX2hhc0Nv bnRlbnQgPSBoYXNDb250ZW50OyB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnRCdWlsZGVyLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGlu ZUNvbnRlbnRCdWlsZGVyLmNwcAppbmRleCA2MzJmMDRiMmMzMTQ4MzgyNTYzMWU5Y2FlYjg3YjMw NGFlMzNjNDFjLi44MTNjNDY1NDk2NzM5NWY3ZGEzZTA0ZTRlMjA4NjBiNTc0Y2M1NWVmIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRp b25JbmxpbmVDb250ZW50QnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu dGVncmF0aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuY3BwCkBAIC0z NDEsNyArMzQxLDcgQEAgdm9pZCBJbmxpbmVDb250ZW50QnVpbGRlcjo6Y3JlYXRlRGlzcGxheU5v blJvb3RJbmxpbmVCb3hlcyhjb25zdCBMYXlvdXQ6OklubGluZUYKICAgICAgICAgICAgICAgICBj b250aW51ZTsKICAgICAgICAgICAgIGF1dG8mIGxheW91dEJveCA9IGlubGluZUxldmVsQm94LT5s YXlvdXRCb3goKTsKICAgICAgICAgICAgIGF1dG8mIGJveEdlb21ldHJ5ID0gbV9sYXlvdXRTdGF0 ZS5nZW9tZXRyeUZvckJveChsYXlvdXRCb3gpOwotICAgICAgICAgICAgYXV0byBpbmxpbmVCb3hS ZWN0ID0gbGluZUJveC5sb2dpY2FsTWFyZ2luUmVjdEZvcklubGluZUxldmVsQm94KGxheW91dEJv eCwgYm94R2VvbWV0cnkpOworICAgICAgICAgICAgYXV0byBpbmxpbmVCb3hSZWN0ID0gbGluZUJv eC5sb2dpY2FsUmVjdEZvcklubGluZUJveChsYXlvdXRCb3gsIGJveEdlb21ldHJ5KTsKICAgICAg ICAgICAgIGlubGluZUJveFJlY3QubW92ZUJ5KGxpbmVCb3hMb2dpY2FsUmVjdC50b3BMZWZ0KCkp OwogCiAgICAgICAgICAgICBpbmxpbmVDb250ZW50Lm5vblJvb3RJbmxpbmVCb3hlcy5hcHBlbmQo eyBsaW5lSW5kZXgsIGxheW91dEJveCwgaW5saW5lQm94UmVjdCB9KTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dFRyZWVCdWlsZGVyLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dFRyZWVCdWlsZGVyLmNwcAppbmRl eCAwYmQwYzNhMzVjM2NmMTIwNDViNjkxN2ZiZGUwYTNlMjY1MmUzYmM2Li5lYzIyOTE2NDJkNGYw Nzk0YmY1MzFhZGJiYjBlYWIwYTcyZTI1OTA5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRUcmVlQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0VHJlZUJ1aWxkZXIuY3BwCkBAIC00MDYsMTggKzQw NiwyMiBAQCB2b2lkIHNob3dJbmxpbmVUcmVlQW5kUnVucyhUZXh0U3RyZWFtJiBzdHJlYW0sIGNv bnN0IExheW91dFN0YXRlJiBsYXlvdXRTdGF0ZSwgYwogICAgICAgICBhdXRvIG91dHB1dElubGlu ZUxldmVsQm94ID0gWyZdKGNvbnN0IGF1dG8mIGlubGluZUxldmVsQm94KSB7CiAgICAgICAgICAg ICBhZGRTcGFjaW5nKCk7CiAgICAgICAgICAgICBzdHJlYW0gPDwgIiAgICAiOwotICAgICAgICAg ICAgaWYgKGlubGluZUxldmVsQm94LmlzUm9vdElubGluZUJveCgpKQorICAgICAgICAgICAgYXV0 byBsb2dpY2FsUmVjdCA9IElubGluZVJlY3QgeyB9OworICAgICAgICAgICAgYXV0byYgbGF5b3V0 Qm94ID0gaW5saW5lTGV2ZWxCb3gubGF5b3V0Qm94KCk7CisgICAgICAgICAgICBpZiAoaW5saW5l TGV2ZWxCb3guaXNSb290SW5saW5lQm94KCkpIHsKICAgICAgICAgICAgICAgICBzdHJlYW0gPDwg IlJvb3QgaW5saW5lIGJveCI7Ci0gICAgICAgICAgICBlbHNlIGlmIChpbmxpbmVMZXZlbEJveC5p c0F0b21pY0lubGluZUxldmVsQm94KCkpCisgICAgICAgICAgICAgICAgbG9naWNhbFJlY3QgPSBs aW5lQm94LmxvZ2ljYWxSZWN0Rm9yUm9vdElubGluZUJveCgpOworICAgICAgICAgICAgfSBlbHNl IGlmIChpbmxpbmVMZXZlbEJveC5pc0F0b21pY0lubGluZUxldmVsQm94KCkpIHsKICAgICAgICAg ICAgICAgICBzdHJlYW0gPDwgIkF0b21pYyBpbmxpbmUgbGV2ZWwgYm94IjsKLSAgICAgICAgICAg IGVsc2UgaWYgKGlubGluZUxldmVsQm94LmlzTGluZUJyZWFrQm94KCkpCisgICAgICAgICAgICAg ICAgbG9naWNhbFJlY3QgPSBsaW5lQm94LmxvZ2ljYWxNYXJnaW5SZWN0Rm9yQXRvbWljSW5saW5l TGV2ZWxCb3gobGF5b3V0Qm94KTsKKyAgICAgICAgICAgIH0gZWxzZSBpZiAoaW5saW5lTGV2ZWxC b3guaXNMaW5lQnJlYWtCb3goKSkgewogICAgICAgICAgICAgICAgIHN0cmVhbSA8PCAiTGluZSBi cmVhayBib3giOwotICAgICAgICAgICAgZWxzZSBpZiAoaW5saW5lTGV2ZWxCb3guaXNJbmxpbmVC b3goKSkKLSAgICAgICAgICAgICAgICBzdHJlYW0gPDwgIkdlbmVyaWMgaW5saW5lIGJveCI7Ci0g ICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgbG9naWNhbFJlY3QgPSBsaW5lQm94Lmxv Z2ljYWxSZWN0Rm9yTGluZUJyZWFrQm94KGxheW91dEJveCk7CisgICAgICAgICAgICB9IGVsc2Ug aWYgKGlubGluZUxldmVsQm94LmlzSW5saW5lQm94KCkpIHsKKyAgICAgICAgICAgICAgICBzdHJl YW0gPDwgIklubGluZSBib3giOworICAgICAgICAgICAgICAgIGxvZ2ljYWxSZWN0ID0gbGluZUJv eC5sb2dpY2FsUmVjdEZvcklubGluZUJveChsYXlvdXRCb3gsIGxheW91dFN0YXRlLmdlb21ldHJ5 Rm9yQm94KGxheW91dEJveCkpOworICAgICAgICAgICAgfSBlbHNlCiAgICAgICAgICAgICAgICAg c3RyZWFtIDw8ICJHZW5lcmljIGlubGluZSBsZXZlbCBib3giOwotICAgICAgICAgICAgYXV0byYg bGF5b3V0Qm94ID0gaW5saW5lTGV2ZWxCb3gubGF5b3V0Qm94KCk7Ci0gICAgICAgICAgICBhdXRv IGxvZ2ljYWxSZWN0ID0gbGluZUJveC5sb2dpY2FsTWFyZ2luUmVjdEZvcklubGluZUxldmVsQm94 KGxheW91dEJveCwgbGF5b3V0U3RhdGUuZ2VvbWV0cnlGb3JCb3gobGF5b3V0Qm94KSk7CiAgICAg ICAgICAgICBzdHJlYW0KICAgICAgICAgICAgICAgICA8PCAiIGF0ICgiIDw8IGxvZ2ljYWxSZWN0 LmxlZnQoKSA8PCAiLCIgPDwgbG9naWNhbFJlY3QudG9wKCkgPDwgIikiCiAgICAgICAgICAgICAg ICAgPDwgIiBzaXplICgiIDw8IGxvZ2ljYWxSZWN0LndpZHRoKCkgPDwgIngiIDw8IGxvZ2ljYWxS ZWN0LmhlaWdodCgpIDw8ICIpIgo=