233733 2021-12-01 16:20:39 -0800 [LFC][IFC] Introduce createDisplayBoxesInVisualOrderForContentRuns 2021-12-02 13:05:22 -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 1819461 0 zalan 2021-12-01 16:20:39 -0800 this is very similar to InlineDisplayContentBuilder::processNonBidiContent 1819462 1 445632 zalan 2021-12-01 16:24:32 -0800 Created attachment 445632 Patch 1819841 2 ews-feeder 2021-12-02 13:04:46 -0800 Committed r286446 (244788@main): <https://commits.webkit.org/244788@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 445632. 1819842 3 webkit-bug-importer 2021-12-02 13:05:22 -0800 <rdar://problem/85985463> 445632 2021-12-01 16:24:32 -0800 2021-12-02 13:04:47 -0800 Patch bug-233733-20211201162431.patch text/plain 12674 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2MzkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTliMmQwMjc2NGM3ZjFk NzQxNzhkNmEzNWRjNDkzZjZlNjY3ODhlYi4uNjU3ZGY3ZjYwOTViODhlNDgxODFlNTQzMTlkODZj YWNkZmNiM2JkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTEyLTAxICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIEludHJvZHVj ZSBjcmVhdGVEaXNwbGF5Qm94ZXNJblZpc3VhbE9yZGVyRm9yQ29udGVudFJ1bnMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMzczMworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJldmVydCBzb21lIG9mIHRo ZSBpbmxpbmUgYm94IHJlbGF0ZWQgYmlkaSBjaGFuZ2VzIGFuZCBzdGFydCB3aXRoCisgICAgICAg IGEgdmVyeSBzaW1wbGUgImxldCdzIGNyZWF0ZSB0aGUgZGlzcGxheSBib3hlcyBmb3IgYWxsIF9j b250ZW50XyBydW5zIGluIHZpc3VhbCBvcmRlciIuCisgICAgICAgIFRoaXMgaXMgdmVyeSBzaW1p bGFyIHRvIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6cHJvY2Vzc05vbkJpZGlDb250ZW50 KCkgd2hlcmUgd2UganVzdAorICAgICAgICBsb29wIHRocm91Z2ggdGhlIGNvbnRlbnQgYW5kIGNv bnN0cnVjdCBkaXNwbGF5IGJveGVzLgorICAgICAgICBUaGlzIGlzIGFsc28gaW4gcHJlcGFyYXRp b24gZm9yIGFkdmFuY2luZyB3aXRoIHRoZSBpbmxpbmUgYm94IGNhc2UuCisKKyAgICAgICAgKiBs YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxk ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVEaXNwbGF5Q29udGVudEJ1 aWxkZXI6OnByb2Nlc3NOb25CaWRpQ29udGVudCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6 OklubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6cHJvY2Vzc0JpZGlDb250ZW50KToKKwogMjAy MS0xMi0wMSAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11b SUZDXSBSZWR1bmRhbnQgbGluZSBydW4gdHlwZSBjaGVja2luZyBpbiBJbmxpbmVEaXNwbGF5Q29u dGVudEJ1aWxkZXI6OnByb2Nlc3NOb25CaWRpQ29udGVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRl bnRCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAKaW5kZXggMDE5NzM0YjM1ZWM4 NWI2ZjVjZWVmYmM2YTUwODQ1MzhmMzllYzdhYS4uOTBhMDNlM2JmMDc0NDE2ZmE2NTQ2YzdkYjQw NGNlYjA5MWVjM2UzYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNw bGF5Q29udGVudEJ1aWxkZXIuY3BwCkBAIC0yODIsNyArMjgyLDcgQEAgdm9pZCBJbmxpbmVEaXNw bGF5Q29udGVudEJ1aWxkZXI6OmFkanVzdElubGluZUJveERpc3BsYXlCb3hGb3JCaWRpQm91bmRh cnkoSW5saW4KICAgICBVTlVTRURfUEFSQU0oaW5saW5lQm94UmVjdCk7CiB9CiAKLXZvaWQgSW5s aW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpwcm9jZXNzTm9uQmlkaUNvbnRlbnQoY29uc3QgTGlu ZUJ1aWxkZXI6OkxpbmVDb250ZW50JiBsaW5lQ29udGVudCwgY29uc3QgTGluZUJveCYgbGluZUJv eCwgY29uc3QgSW5saW5lTGF5b3V0UG9pbnQmIGxpbmVCb3hMb2dpY2FsVG9wTGVmdCwgIERpc3Bs YXlCb3hlcyYgYm94ZXMpCit2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6cHJvY2Vz c05vbkJpZGlDb250ZW50KGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udGVudCYgbGluZUNvbnRl bnQsIGNvbnN0IExpbmVCb3gmIGxpbmVCb3gsIGNvbnN0IElubGluZUxheW91dFBvaW50JiBsaW5l Qm94TG9naWNhbFRvcExlZnQsIERpc3BsYXlCb3hlcyYgYm94ZXMpCiB7CiAgICAgLy8gQ3JlYXRl IHRoZSBpbmxpbmUgYm94ZXMgb24gdGhlIGN1cnJlbnQgbGluZS4gVGhpcyBpcyBtb3N0bHkgdGV4 dCBhbmQgYXRvbWljIGlubGluZSBib3hlcy4KICAgICBmb3IgKGF1dG8mIGxpbmVSdW4gOiBsaW5l Q29udGVudC5ydW5zKSB7CkBAIC0zMzgsMTE4ICszMzgsNjUgQEAgdm9pZCBJbmxpbmVEaXNwbGF5 Q29udGVudEJ1aWxkZXI6OnByb2Nlc3NOb25CaWRpQ29udGVudChjb25zdCBMaW5lQnVpbGRlcjo6 TGluZUMKIAogdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OnByb2Nlc3NCaWRpQ29u dGVudChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQmIGxpbmVDb250ZW50LCBjb25zdCBM aW5lQm94JiBsaW5lQm94LCBjb25zdCBJbmxpbmVMYXlvdXRQb2ludCYgbGluZUJveExvZ2ljYWxU b3BMZWZ0LCBEaXNwbGF5Qm94ZXMmIGJveGVzKQogewotICAgIC8vIENyZWF0ZSB0aGUgaW5saW5l IGJveGVzIG9uIHRoZSBjdXJyZW50IGxpbmUuIFRoaXMgaXMgbW9zdGx5IHRleHQgYW5kIGF0b21p YyBpbmxpbmUgYm94ZXMuCi0gICAgYXV0byYgcnVucyA9IGxpbmVDb250ZW50LnJ1bnM7Ci0gICAg QVNTRVJUKGxpbmVDb250ZW50LnZpc3VhbE9yZGVyTGlzdC5zaXplKCkgPT0gcnVucy5zaXplKCkp OwotCi0gICAgYXV0byByb290SW5saW5lQm94UmVjdCA9IGxpbmVCb3gubG9naWNhbFJlY3RGb3JS b290SW5saW5lQm94KCk7Ci0gICAgYXV0byBjb250ZW50UmlnaHRJblZpc3VhbE9yZGVyID0gbGlu ZUJveExvZ2ljYWxUb3BMZWZ0LngoKTsKLSAgICAvLyBGaXJzdCB2aXN1YWwgcnVuJ3MgaW5pdGlh bCBjb250ZW50IHBvc2l0aW9uIGRlcGVuZHMgb24gdGhlIGJsb2NrJ3MgaW5saW5lIGRpcmVjdGlv bi4KLSAgICBpZiAoIXJvb3QoKS5zdHlsZSgpLmlzTGVmdFRvUmlnaHREaXJlY3Rpb24oKSkgewot ICAgICAgICAvLyBGSVhNRTogVGhpcyBuZWVkcyB0aGUgYmxvY2sgZW5kIHBvc2l0aW9uIGluc3Rl YWQgb2YgdGhlIGxpbmVMb2dpY2FsV2lkdGguCi0gICAgICAgIGNvbnRlbnRSaWdodEluVmlzdWFs T3JkZXIgKz0gbGluZUNvbnRlbnQubGluZUxvZ2ljYWxXaWR0aCAtIHJvb3RJbmxpbmVCb3hSZWN0 LndpZHRoKCk7Ci0gICAgfQotICAgIC8vIEFkanVzdCB0aGUgY29udGVudCBzdGFydCBwb3NpdGlv biB3aXRoIHRoZSAodGV4dClhbGlnbm1lbnQgb2Zmc2V0IChyb290IGlubGluZSBib3ggaGFzIHRo ZSBhbGlnbm1lbnQgb2Zmc2V0IGFuZCBub3QgdGhlIGluZGl2aWR1YWwgcnVucykuCi0gICAgY29u dGVudFJpZ2h0SW5WaXN1YWxPcmRlciArPSByb290SW5saW5lQm94UmVjdC5sZWZ0KCk7Ci0gICAg VmVjdG9yPHNpemVfdD4gaW5saW5lQm94U3RhY2s7Ci0gICAgaW5saW5lQm94U3RhY2sucmVzZXJ2 ZUluaXRpYWxDYXBhY2l0eShsaW5lQm94Lm5vblJvb3RJbmxpbmVMZXZlbEJveGVzKCkuc2l6ZSgp KTsKKyAgICBBU1NFUlQobGluZUNvbnRlbnQudmlzdWFsT3JkZXJMaXN0LnNpemUoKSA9PSBsaW5l Q29udGVudC5ydW5zLnNpemUoKSk7CisKKyAgICBhdXRvIGNyZWF0ZURpc3BsYXlCb3hlc0luVmlz dWFsT3JkZXJGb3JDb250ZW50UnVucyA9IFsmXSB7CisgICAgICAgIGF1dG8gcm9vdElubGluZUJv eFJlY3QgPSBsaW5lQm94LmxvZ2ljYWxSZWN0Rm9yUm9vdElubGluZUJveCgpOworICAgICAgICBh dXRvIGNvbnRlbnRSaWdodEluVmlzdWFsT3JkZXIgPSBJbmxpbmVMYXlvdXRVbml0IHsgfTsKKyAg ICAgICAgLy8gRmlyc3QgdmlzdWFsIHJ1bidzIGluaXRpYWwgY29udGVudCBwb3NpdGlvbiBkZXBl bmRzIG9uIHRoZSBibG9jaydzIGlubGluZSBkaXJlY3Rpb24uCisgICAgICAgIGlmICghcm9vdCgp LnN0eWxlKCkuaXNMZWZ0VG9SaWdodERpcmVjdGlvbigpKSB7CisgICAgICAgICAgICAvLyBGSVhN RTogVGhpcyBuZWVkcyB0aGUgYmxvY2sgZW5kIHBvc2l0aW9uIGluc3RlYWQgb2YgdGhlIGxpbmVM b2dpY2FsV2lkdGguCisgICAgICAgICAgICBjb250ZW50UmlnaHRJblZpc3VhbE9yZGVyICs9IGxp bmVDb250ZW50LmxpbmVMb2dpY2FsV2lkdGggLSByb290SW5saW5lQm94UmVjdC53aWR0aCgpOwor ICAgICAgICB9CisgICAgICAgIC8vIEFkanVzdCB0aGUgY29udGVudCBzdGFydCBwb3NpdGlvbiB3 aXRoIHRoZSAodGV4dClhbGlnbm1lbnQgb2Zmc2V0IChyb290IGlubGluZSBib3ggaGFzIHRoZSBh bGlnbm1lbnQgb2Zmc2V0IGFuZCBub3QgdGhlIGluZGl2aWR1YWwgcnVucykuCisgICAgICAgIGNv bnRlbnRSaWdodEluVmlzdWFsT3JkZXIgKz0gcm9vdElubGluZUJveFJlY3QubGVmdCgpOwogCi0g ICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBydW5zLnNpemUoKTsgKytpKSB7Ci0gICAgICAgIGF1 dG8gdmlzdWFsSW5kZXggPSBsaW5lQ29udGVudC52aXN1YWxPcmRlckxpc3RbaV07Ci0gICAgICAg IGF1dG8mIGxpbmVSdW4gPSBydW5zW3Zpc3VhbEluZGV4XTsKKyAgICAgICAgYXV0byYgcnVucyA9 IGxpbmVDb250ZW50LnJ1bnM7CisgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgcnVucy5z aXplKCk7ICsraSkgeworICAgICAgICAgICAgYXV0byB2aXN1YWxJbmRleCA9IGxpbmVDb250ZW50 LnZpc3VhbE9yZGVyTGlzdFtpXTsKKyAgICAgICAgICAgIGF1dG8mIGxpbmVSdW4gPSBydW5zW3Zp c3VhbEluZGV4XTsKIAotICAgICAgICBhdXRvIGlzQ29udGVudFJ1biA9ICFsaW5lUnVuLmlzSW5s aW5lQm94U3RhcnQoKSAmJiAhbGluZVJ1bi5pc0xpbmVTcGFubmluZ0lubGluZUJveFN0YXJ0KCkg JiYgIWxpbmVSdW4uaXNJbmxpbmVCb3hFbmQoKSAmJiAhbGluZVJ1bi5pc1dvcmRCcmVha09wcG9y dHVuaXR5KCk7Ci0gICAgICAgIGlmICghaXNDb250ZW50UnVuKQotICAgICAgICAgICAgY29udGlu dWU7CisgICAgICAgICAgICBhdXRvIGlzQ29udGVudFJ1biA9ICFsaW5lUnVuLmlzSW5saW5lQm94 U3RhcnQoKSAmJiAhbGluZVJ1bi5pc0xpbmVTcGFubmluZ0lubGluZUJveFN0YXJ0KCkgJiYgIWxp bmVSdW4uaXNJbmxpbmVCb3hFbmQoKTsKKyAgICAgICAgICAgIGlmICghaXNDb250ZW50UnVuKSB7 CisgICAgICAgICAgICAgICAgLy8gRklYTUU6IEFkZCBzdXBwb3J0IGZvciBpbmxpbmUgYm94ZXMu CisgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICB9CiAKLSAgICAgICAgYXV0 byBkaXNwbGF5Qm94UmVjdCA9IFsmXSB7Ci0gICAgICAgICAgICBhdXRvJiBsYXlvdXRCb3ggPSBs aW5lUnVuLmxheW91dEJveCgpOwotICAgICAgICAgICAgYXV0byBsb2dpY2FsUmVjdCA9IElubGlu ZVJlY3QgeyB9OwotICAgICAgICAgICAgYXV0byBtYXJnaW5TdGFydCA9IHN0ZDo6b3B0aW9uYWw8 TGF5b3V0VW5pdD4geyB9OworICAgICAgICAgICAgYXV0byB2aXN1YWxSZWN0UmVsYXRpdmVUb1Jv b3QgPSBbJl0oYXV0byBsb2dpY2FsbFJlY3QpIHsKKyAgICAgICAgICAgICAgICBsb2dpY2FsbFJl Y3Quc2V0TGVmdChjb250ZW50UmlnaHRJblZpc3VhbE9yZGVyKTsKKyAgICAgICAgICAgICAgICBs b2dpY2FsbFJlY3QubW92ZUJ5KGxpbmVCb3hMb2dpY2FsVG9wTGVmdCk7CisgICAgICAgICAgICAg ICAgcmV0dXJuIGxvZ2ljYWxsUmVjdDsKKyAgICAgICAgICAgIH07CiAKLSAgICAgICAgICAgIGlm IChsaW5lUnVuLmlzVGV4dCgpIHx8IGxpbmVSdW4uaXNTb2Z0TGluZUJyZWFrKCkpCi0gICAgICAg ICAgICAgICAgbG9naWNhbFJlY3QgPSBsaW5lQm94LmxvZ2ljYWxSZWN0Rm9yVGV4dFJ1bihsaW5l UnVuKTsKLSAgICAgICAgICAgIGVsc2UgaWYgKGxpbmVSdW4uaXNIYXJkTGluZUJyZWFrKCkpCi0g ICAgICAgICAgICAgICAgbG9naWNhbFJlY3QgPSBsaW5lQm94LmxvZ2ljYWxSZWN0Rm9yTGluZUJy ZWFrQm94KGxheW91dEJveCk7Ci0gICAgICAgICAgICBlbHNlIHsKLSAgICAgICAgICAgICAgICBh dXRvJiBib3hHZW9tZXRyeSA9IGZvcm1hdHRpbmdTdGF0ZSgpLmJveEdlb21ldHJ5KGxheW91dEJv eCk7Ci0gICAgICAgICAgICAgICAgaWYgKGxpbmVSdW4uaXNCb3goKSkgewotICAgICAgICAgICAg ICAgICAgICBtYXJnaW5TdGFydCA9IGJveEdlb21ldHJ5Lm1hcmdpblN0YXJ0KCk7Ci0gICAgICAg ICAgICAgICAgICAgIGxvZ2ljYWxSZWN0ID0gbGluZUJveC5sb2dpY2FsQm9yZGVyQm94Rm9yQXRv bWljSW5saW5lTGV2ZWxCb3gobGF5b3V0Qm94LCBib3hHZW9tZXRyeSk7Ci0gICAgICAgICAgICAg ICAgfSBlbHNlCi0gICAgICAgICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAg ICAgICAgICAgaWYgKGxpbmVSdW4uaXNUZXh0KCkpIHsKKyAgICAgICAgICAgICAgICBhdXRvIHZp c3VhbFJlY3QgPSB2aXN1YWxSZWN0UmVsYXRpdmVUb1Jvb3QobGluZUJveC5sb2dpY2FsUmVjdEZv clRleHRSdW4obGluZVJ1bikpOworICAgICAgICAgICAgICAgIGFwcGVuZFRleHREaXNwbGF5Qm94 KGxpbmVSdW4sIHZpc3VhbFJlY3QsIGJveGVzKTsKKyAgICAgICAgICAgICAgICBjb250ZW50Umln aHRJblZpc3VhbE9yZGVyICs9IHZpc3VhbFJlY3Qud2lkdGgoKTsKKyAgICAgICAgICAgICAgICBj b250aW51ZTsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGxvZ2ljYWxSZWN0Lm1vdmVWZXJ0 aWNhbGx5KGxpbmVCb3hMb2dpY2FsVG9wTGVmdC55KCkpOwotICAgICAgICAgICAgLy8gVXNlIHRo ZSBkaXN0YW5jZSBmcm9tIHRoZSBsb2dpY2FsIHByZXZpb3VzIHJ1biB0byBwbGFjZSB0aGUgZGlz cGxheSBib3ggaG9yaXpvbnRhbGx5IGluIHZpc3VhbCB0ZXJtcy4KLSAgICAgICAgICAgIGF1dG8q IGxvZ2ljYWxQcmV2aW91c1J1biA9IHZpc3VhbEluZGV4ID8gJnJ1bnNbdmlzdWFsSW5kZXggLSAx XSA6IG51bGxwdHI7Ci0gICAgICAgICAgICAvLyBDZXJ0YWluIGNzcyBwcm9wZXJ0aWVzIChlLmcu IHdvcmQtc3BhY2luZykgbWF5IGludHJvZHVjZSBhIGdhcCBiZXR3ZWVuIHJ1bnMuCi0gICAgICAg ICAgICBhdXRvIGRpc3RhbmNlRnJvbUxvZ2ljYWxQcmV2aW91c1J1biA9IGxvZ2ljYWxQcmV2aW91 c1J1biA/IGxpbmVSdW4ubG9naWNhbExlZnQoKSAtIGxvZ2ljYWxQcmV2aW91c1J1bi0+bG9naWNh bFJpZ2h0KCkgOiBsaW5lUnVuLmxvZ2ljYWxMZWZ0KCk7Ci0gICAgICAgICAgICBhdXRvIHZpc3Vh bE9yZGVyUmVjdCA9IGxvZ2ljYWxSZWN0OwotICAgICAgICAgICAgYXV0byBjb250ZW50TGVmdCA9 IGNvbnRlbnRSaWdodEluVmlzdWFsT3JkZXIgKyBkaXN0YW5jZUZyb21Mb2dpY2FsUHJldmlvdXNS dW4gKyBtYXJnaW5TdGFydC52YWx1ZV9vcigwKTsKLSAgICAgICAgICAgIHZpc3VhbE9yZGVyUmVj dC5zZXRMZWZ0KGNvbnRlbnRMZWZ0KTsKLSAgICAgICAgICAgIHJldHVybiB2aXN1YWxPcmRlclJl Y3Q7Ci0gICAgICAgIH0oKTsKLQotICAgICAgICBhdXRvIGhhbmRsZUlubGluZUJveEJvdW5kYXJp ZXNJZkFwcGxpY2FibGUgPSBbJl0gewotICAgICAgICAgICAgLy8gVmlzdWFsIG9yZGVyIGNvdWxk IGludHJvZHVjZSBnYXBzIGFuZC9vciBpbmplY3QgcnVucyBvdXRzaWRlIGZyb20gdGhlIGN1cnJl bnQgaW5saW5lIGJveCBjb250ZW50LgotICAgICAgICAgICAgLy8gSW4gc3VjaCBjYXNlcywgd2Ug bmVlZCB0byAiY2xvc2UiIHRoZSBpbmxpbmUgYm94KGVzKSBhbmQgIm9wZW4iIGEgbmV3IG9uZShz KSB0byBhY2NvbW1vZGF0ZSB0aGUgY3VycmVudCBjb250ZW50LgotICAgICAgICAgICAgLy8gPGRp dj5hPHNwYW4gaWQ9Zmlyc3Q+YiYjODIzODtnPC9zcGFuPmY8c3BhbiBpZD1zZWNvbmQ+ZSYjODIz NztjPC9zcGFuPmQ8L2Rpdj4KLSAgICAgICAgICAgIC8vIHByb2R1Y2VzIHRoZSBmb2xsb3dpbmcg b3V0cHV0IChub3RlIHRoZSAjODIzODsgIzgyMzc7IFJUTC9MVFIgY29udHJvbCBjaGFyYWN0ZXJz KToKLSAgICAgICAgICAgIC8vIGFiY2RlZmcKLSAgICAgICAgICAgIC8vIHdpdGggdGhlIGZvbGxv d2luZywgZnJhZ21lbnRlZCBpbmxpbmUgYm94ZXMgOgotICAgICAgICAgICAgLy8gYVtmaXJzdCBv cGVuXWJbZmlyc3QgY2xvc2VdW3NlY29uZCBvcGVuXWNbc2Vjb25kIGNsb3NlXWRbc2Vjb25kIG9w ZW5dZVtzZWNvbmQgY2xvc2VdZltmaXJzdCBvcGVuXWdbZmlyc3QgY2xvc2VdIAotICAgICAgICAg ICAgYXV0byYgcGFyZW50Qm94ID0gbGluZVJ1bi5sYXlvdXRCb3goKS5wYXJlbnQoKTsKLSAgICAg ICAgICAgIEFTU0VSVChwYXJlbnRCb3guaXNJbmxpbmVCb3goKSB8fCAmcGFyZW50Qm94ID09ICZy b290KCkpOwotCi0gICAgICAgICAgICBhdXRvIHJ1blBhcmVudElzQ3VycmVudElubGluZUJveCA9 ICgmcGFyZW50Qm94ID09ICZyb290KCkgJiYgaW5saW5lQm94U3RhY2suaXNFbXB0eSgpKQotICAg ICAgICAgICAgICAgIHx8ICghaW5saW5lQm94U3RhY2suaXNFbXB0eSgpICYmICZwYXJlbnRCb3gg PT0gJmJveGVzW2lubGluZUJveFN0YWNrLmxhc3QoKV0ubGF5b3V0Qm94KCkpOwotICAgICAgICAg ICAgaWYgKHJ1blBhcmVudElzQ3VycmVudElubGluZUJveCkgewotICAgICAgICAgICAgICAgIC8v IFdlJ3ZlIGdvdCB0aGUgY29ycmVjdCBpbmxpbmUgYm94IGFzIHBhcmVudC4gTm90aGluZyB0byBk byBoZXJlLgotICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIGlmIChsaW5lUnVu LmlzU29mdExpbmVCcmVhaygpKSB7CisgICAgICAgICAgICAgICAgQVNTRVJUKCF2aXN1YWxSZWN0 UmVsYXRpdmVUb1Jvb3QobGluZUJveC5sb2dpY2FsUmVjdEZvclRleHRSdW4obGluZVJ1bikpLndp ZHRoKCkpOworICAgICAgICAgICAgICAgIGFwcGVuZFNvZnRMaW5lQnJlYWtEaXNwbGF5Qm94KGxp bmVSdW4sIHZpc3VhbFJlY3RSZWxhdGl2ZVRvUm9vdChsaW5lQm94LmxvZ2ljYWxSZWN0Rm9yVGV4 dFJ1bihsaW5lUnVuKSksIGJveGVzKTsKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAg ICAgICAgIH0KLSAgICAgICAgICAgIC8vIElmIHRoaXMgcnVuIGlzIG5vdCBuZXN0ZWQgaW5zaWRl IHRoZSBjdXJyZW50IGlubGluZSBib3ggKG1lYW5pbmcgaXQgdmlzdWFsbHkgZ290IGluamVjdGVk IGluLWJldHdlZW4gdGhlIGlubGluZSBib3ggY29udGVudCkKLSAgICAgICAgICAgIC8vIHdlIG5l ZWQgdG8gImNsb3NlIiBhbGwgdGhlIG5lc3RlZCBpbmxpbmUgYm94ZXMgZmlyc3QgKGUuZy4gc2Vl IHRoZSBleGFtcGxlIGFib3ZlOyByaWdodCBiZWZvcmUgYXBwZW5kaW5nICJjIikuCi0gICAgICAg ICAgICB3aGlsZSAoIWlubGluZUJveFN0YWNrLmlzRW1wdHkoKSkgewotICAgICAgICAgICAgICAg IGF1dG8mIGlubGluZUJveERpc3BsYXlCb3ggPSBib3hlc1tpbmxpbmVCb3hTdGFjay5sYXN0KCld OwotICAgICAgICAgICAgICAgIGlmICgmcGFyZW50Qm94ID09ICZpbmxpbmVCb3hEaXNwbGF5Qm94 LmxheW91dEJveCgpKQotICAgICAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgICAg ICBpbmxpbmVCb3hTdGFjay5yZW1vdmVMYXN0KCk7Ci0gICAgICAgICAgICAgICAgLy8gRklYTUU6 IENvbXB1dGUgZ2VvbWV0cnkgZm9yIHRoaXMgaW5saW5lIGJveCBmcmFnbWVudC4KLSAgICAgICAg ICAgICAgICBhZGp1c3RJbmxpbmVCb3hEaXNwbGF5Qm94Rm9yQmlkaUJvdW5kYXJ5KGlubGluZUJv eERpc3BsYXlCb3gsIHsgfSk7CisgICAgICAgICAgICBpZiAobGluZVJ1bi5pc0hhcmRMaW5lQnJl YWsoKSkgeworICAgICAgICAgICAgICAgIEFTU0VSVCghdmlzdWFsUmVjdFJlbGF0aXZlVG9Sb290 KGxpbmVCb3gubG9naWNhbFJlY3RGb3JMaW5lQnJlYWtCb3gobGluZVJ1bi5sYXlvdXRCb3goKSkp LndpZHRoKCkpOworICAgICAgICAgICAgICAgIGFwcGVuZEhhcmRMaW5lQnJlYWtEaXNwbGF5Qm94 KGxpbmVSdW4sIHZpc3VhbFJlY3RSZWxhdGl2ZVRvUm9vdChsaW5lQm94LmxvZ2ljYWxSZWN0Rm9y TGluZUJyZWFrQm94KGxpbmVSdW4ubGF5b3V0Qm94KCkpKSwgYm94ZXMpOworICAgICAgICAgICAg ICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgfQotCi0gICAgICAgICAgICAvLyBXZSBhbHNvIG1h eSBuZWVkIHRvICJvcGVuIiBuZXcgaW5saW5lIGJveGVzIGlmIHRoZSBjdXJyZW50IGNvbnRlbnQg aXMgbmVzdGVkIGluc2lkZSBpbmxpbmUgYm94ZXMgKGUuZy4gc2VlIHRoZSBleGFtcGxlIGFib3Zl OyByaWdodCBiZWZvcmUgImciKQotICAgICAgICAgICAgZm9yIChhdXRvKiBhbmNlc3RvciA9ICZw YXJlbnRCb3g7IGFuY2VzdG9yICE9ICZyb290KCk7IGFuY2VzdG9yID0gJmFuY2VzdG9yLT5wYXJl bnQoKSkgewotICAgICAgICAgICAgICAgIEFTU0VSVChhbmNlc3Rvci0+aXNJbmxpbmVCb3goKSk7 Ci0gICAgICAgICAgICAgICAgYXV0byYgaW5saW5lQm94ID0gKmFuY2VzdG9yOwotICAgICAgICAg ICAgICAgIGlubGluZUJveFN0YWNrLmFwcGVuZChib3hlcy5zaXplKCkpOwotICAgICAgICAgICAg ICAgIC8vIEZJWE1FOiBDb21wdXRlIGdlb21ldHJ5IGZvciB0aGlzIGlubGluZSBib3ggZnJhZ21l bnQuCi0gICAgICAgICAgICAgICAgYXBwZW5kSW5saW5lQm94RGlzcGxheUJveEZvckJpZGlCb3Vu ZGFyeShpbmxpbmVCb3gsIHsgfSwgYm94ZXMpOworICAgICAgICAgICAgaWYgKGxpbmVSdW4uaXNC b3goKSkgeworICAgICAgICAgICAgICAgIGF1dG8mIGxheW91dEJveCA9IGxpbmVSdW4ubGF5b3V0 Qm94KCk7CisgICAgICAgICAgICAgICAgYXV0byYgYm94R2VvbWV0cnkgPSBmb3JtYXR0aW5nU3Rh dGUoKS5ib3hHZW9tZXRyeShsYXlvdXRCb3gpOworICAgICAgICAgICAgICAgIGF1dG8gdmlzdWFs UmVjdCA9IHZpc3VhbFJlY3RSZWxhdGl2ZVRvUm9vdChsaW5lQm94LmxvZ2ljYWxCb3JkZXJCb3hG b3JBdG9taWNJbmxpbmVMZXZlbEJveChsYXlvdXRCb3gsIGJveEdlb21ldHJ5KSk7CisgICAgICAg ICAgICAgICAgdmlzdWFsUmVjdC5tb3ZlSG9yaXpvbnRhbGx5KGJveEdlb21ldHJ5Lm1hcmdpblN0 YXJ0KCkpOworICAgICAgICAgICAgICAgIGFwcGVuZEF0b21pY0lubGluZUxldmVsRGlzcGxheUJv eChsaW5lUnVuLCB2aXN1YWxSZWN0LCBib3hlcyk7CisgICAgICAgICAgICAgICAgY29udGVudFJp Z2h0SW5WaXN1YWxPcmRlciArPSBib3hHZW9tZXRyeS5tYXJnaW5TdGFydCgpICsgdmlzdWFsUmVj dC53aWR0aCgpICsgYm94R2VvbWV0cnkubWFyZ2luRW5kKCk7CisgICAgICAgICAgICAgICAgY29u dGludWU7CiAgICAgICAgICAgICB9Ci0gICAgICAgIH07Ci0gICAgICAgIGhhbmRsZUlubGluZUJv eEJvdW5kYXJpZXNJZkFwcGxpY2FibGUoKTsKLQotICAgICAgICBpZiAobGluZVJ1bi5pc1RleHQo KSkKLSAgICAgICAgICAgIGFwcGVuZFRleHREaXNwbGF5Qm94KGxpbmVSdW4sIGRpc3BsYXlCb3hS ZWN0LCBib3hlcyk7Ci0gICAgICAgIGVsc2UgaWYgKGxpbmVSdW4uaXNTb2Z0TGluZUJyZWFrKCkp Ci0gICAgICAgICAgICBhcHBlbmRTb2Z0TGluZUJyZWFrRGlzcGxheUJveChsaW5lUnVuLCBkaXNw bGF5Qm94UmVjdCwgYm94ZXMpOwotICAgICAgICBlbHNlIGlmIChsaW5lUnVuLmlzSGFyZExpbmVC cmVhaygpKQotICAgICAgICAgICAgYXBwZW5kSGFyZExpbmVCcmVha0Rpc3BsYXlCb3gobGluZVJ1 biwgZGlzcGxheUJveFJlY3QsIGJveGVzKTsKLSAgICAgICAgZWxzZSBpZiAobGluZVJ1bi5pc0Jv eCgpKQotICAgICAgICAgICAgYXBwZW5kQXRvbWljSW5saW5lTGV2ZWxEaXNwbGF5Qm94KGxpbmVS dW4sIGRpc3BsYXlCb3hSZWN0LCBib3hlcyk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIEFT U0VSVF9OT1RfUkVBQ0hFRCgpOwotCi0gICAgICAgIGNvbnRlbnRSaWdodEluVmlzdWFsT3JkZXIg PSBkaXNwbGF5Qm94UmVjdC5yaWdodCgpOwotICAgIH0KLQotICAgIC8vIENsb3NlIHRoZSByZW1h aW5pbmcgbmVzdGVkIGlubGluZSBib3hlcy4KLSAgICAvLyA8ZGl2PmE8c3Bhbj5iJiM4MjM4O2Q8 L3NwYW4+YzwvZGl2PgotICAgIC8vIEF0IHRoZSBlbmQgb2YgdGhlIHJ1biBsaXN0IGxvb3Agd2hl biB3ZSBmaW5pc2hlZCBwcm9jZXNzaW5nIFtkXSwgdGhlIGlubGluZSBib3ggKDxzcGFuPikgaXMg c3RpbGwgIm9wZW4iLgotICAgIGZvciAoYXV0byYgaW5saW5lQm94SW5kZXggOiBpbmxpbmVCb3hT dGFjaykgewotICAgICAgICAvLyBGSVhNRTogQ29tcHV0ZSBnZW9tZXRyeSBmb3IgdGhpcyBpbmxp bmUgYm94IGZyYWdtZW50LgotICAgICAgICBhZGp1c3RJbmxpbmVCb3hEaXNwbGF5Qm94Rm9yQmlk aUJvdW5kYXJ5KGJveGVzW2lubGluZUJveEluZGV4XSwgeyB9KTsKLSAgICB9CisgICAgICAgICAg ICBBU1NFUlQobGluZVJ1bi5pc1dvcmRCcmVha09wcG9ydHVuaXR5KCkpOworICAgICAgICB9Cisg ICAgfTsKKyAgICBjcmVhdGVEaXNwbGF5Qm94ZXNJblZpc3VhbE9yZGVyRm9yQ29udGVudFJ1bnMo KTsKIH0KIAogdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OnByb2Nlc3NPdmVyZmxv d25SdW5zRm9yRWxsaXBzaXMoRGlzcGxheUJveGVzJiBib3hlcywgSW5saW5lTGF5b3V0VW5pdCBs aW5lQm94TG9naWNhbFJpZ2h0KQo=