233538 2021-11-27 14:20:21 -0800 [LFC][IFC] Visual ordering may require multiple display box instances for a single inline box 2021-11-28 10:34:20 -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 1818051 0 zalan 2021-11-27 14:20:21 -0800 ssia 1818052 1 445225 zalan 2021-11-27 15:02:18 -0800 Created attachment 445225 Patch 1818082 2 ews-feeder 2021-11-28 10:33:06 -0800 Committed r286195 (244577@main): <https://commits.webkit.org/244577@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 445225. 1818083 3 webkit-bug-importer 2021-11-28 10:34:20 -0800 <rdar://problem/85788801> 445225 2021-11-27 15:02:18 -0800 2021-11-28 10:33:07 -0800 Patch bug-233538-20211127150217.patch text/plain 16091 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2MTIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDc5NTY0ZDZlOGMyYTkx OWMyYmVmOTIxMzg3YWRjMzE5NTFmYTFmMC4uZjAyNTRiZDYzNzM0ZWY3ODU3Nzg5NzllYzk3NWE5 ZjExNGQ2YjFmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ3IEBACisyMDIxLTExLTI3ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIFZpc3VhbCBv cmRlcmluZyBtYXkgcmVxdWlyZSBtdWx0aXBsZSBkaXNwbGF5IGJveCBpbnN0YW5jZXMgZm9yIGEg c2luZ2xlIGlubGluZSBib3gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIzMzUzOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFRoaXMgcGF0Y2ggaW1wbGVtZW50cyB0aGUgbXVsdGlwbGUgZGlzcGxheSBib3gg c2V0dXAgZm9yIGNhc2VzIHdoZW4gdGhlIHZpc3VhbGx5IHJlLW9yZGVyZWQgY29udGVudCBlc2Nh cGVzCisgICAgICAgIHRoZSBsb2dpY2FsIGlubGluZSBib3ggYm91bmRhcmllcy4KKworICAgICAg ICAgICAgYTxzcGFuPmJnPC9zcGFuPmY8c3Bhbj5lYzwvc3Bhbj5kIC0+ICJhYmdmZWNkIgorCisg ICAgICAgIEludHJvZHVjZSBSVEwvTFRSIG92ZXJyaWRlczoKKworICAgICAgICAgICAgYTxzcGFu PmImIzgyMzg7Zzwvc3Bhbj5mPHNwYW4+ZSYjODIzNztjPC9zcGFuPmQgLT4gImFiY2RlZmciCisK KyAgICAgICAgY3VycmVudCBkaXJlY3Rpb246IGxlZnQtdG8tcmlnaHQuCisgICAgICAgIHRha2U6 ICdhJworICAgICAgICB0YWtlOiAnYicKKyAgICAgICAgdGFrZTogUlRMIG92ZXJyaWRlIChjdXJy ZW50IGRpcmVjdGlvbjogcmlnaHQtdG8tbGVmdCwgaWUganVtcCB0byB0aGUgcmlnaHQgZW5kIG9m IHRoZSBvdmVycmlkZSBjb250ZW50IHVubGVzcyB0aGVyZSdzIGEgbmVzdGVkIG92ZXJyaWRlKQor ICAgICAgICB0YWtlOiAobmVzdGVkKUxUUiBvdmVycmlkZSAoY3VycmVudCBkaXJlY3Rpb246IGxl ZnQtdG8tcmlnaHQsIGllIGp1bXAgdG8gdGhlIGxlZnQgZW5kIG9mIHRoZSBvdmVycmlkZSBjb250 ZW50KQorICAgICAgICB0YWtlOiAnYycKKyAgICAgICAgdGFrZTogJ2QnIChlbmQgb2YgbmVzdGVk IExUUiBvdmVycmlkZSkKKyAgICAgICAgdGFrZTogJ2UnIChpbiBSVEwgZGlyZWN0aW9uKQorICAg ICAgICB0YWtlOiAnZicKKyAgICAgICAgdGFrZTogJ2cnCisKKyAgICAgICAgQnkganVtcGluZyBi ZXR3ZWVuIHRoZXNlIGJpZGkgcnVucywgd2UgbWF5IGVuZCB1cCBnb2luZyBiYWNrIGFuZCBmb3J0 aCBiZXR3ZWVuIHZhcmlvdXMgaW5saW5lIGJveGVzLgorICAgICAgICBFYWNoIHRpbWUgd2UgImxl YXZlIiBhbiBpbmxpbmUgYm94IChlLmcuIGdvaW5nIGZyb20gJ2InIHRvICdjJyksIHdlIG5lZWQg dG8gY2xvc2UgdGhlIGN1cnJlbnQgaW5saW5lIGJveChlcykKKyAgICAgICAgYW5kICJvcGVuIiBu ZXcgb25lKHMpIGZvciB0aGUgY29udGVudC4KKyAgICAgICAgVGhpcyBwYXRjaCBpbXBsZW1lbnRz IHRoZSBqdW1waW5nIGxvZ2ljIGJ1dCBpdCBkb2VzIG5vdCB5ZXQgY29tcHV0ZSBnZW9tZXRyeSBm b3IgZWFjaCBvZiB0aGVzZSBmcmFnbWVudGVkIGlubGluZSBib3hlcy4KKworICAgICAgICAqIGxh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRl ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZURpc3BsYXlDb250ZW50QnVp bGRlcjo6YXBwZW5kSW5saW5lQm94RGlzcGxheUJveCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OklubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6YXBwZW5kU3Bhbm5pbmdJbmxpbmVCb3hE aXNwbGF5Qm94KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRGlzcGxheUNvbnRl bnRCdWlsZGVyOjphcHBlbmRJbmxpbmVCb3hEaXNwbGF5Qm94Rm9yQmlkaUJvdW5kYXJ5KToKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjphZGp1 c3RJbmxpbmVCb3hEaXNwbGF5Qm94Rm9yQmlkaUJvdW5kYXJ5KToKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6SW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpwcm9jZXNzTm9uQmlkaUNvbnRl bnQpOiAiT3BlbiIgYW5kICJjbG9zZSIgaW5saW5lIGJveGVzIGJhc2VkIG9uIHRoZSBjb250ZW50 CisgICAgICAgIGFuZCBub3QgYmFzZWQgb24gdGhlIFtpbmxpbmUgYm94IHN0YXJ0XS9baW5saW5l IGJveCBlbmRdIHJ1bnMgKGllIGNvbnRlbnQgd2hlcmUgbG9naWNhbCBvcmRlciA9PSB2aXN1YWwg b3JkZXIgY2FuIHVzZSB0aG9zZSBleHBsaWNpdCBtYXJrZXJzIHRvCisgICAgICAgIGNvbnN0cnVj dCB0aGUgYXNzb2NpYXRlZCBkaXNwbGF5IGJveGVzIGJ1dCB3aXRoIHJlLW9yZGVyaW5nIHdlIG5l ZWQgdG8gcmVseSBvbiB0aGUgY29udGVudCBpdHNlbGYpCisKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6SW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpwcm9jZXNzQmlkaUNvbnRlbnQpOgor ICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlD b250ZW50QnVpbGRlci5oOgorCiAyMDIxLTExLTI2ICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxl LmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIERlY291cGxlIGRpc3BsYXkgYm94IGNvbnN0cnVj dGlvbiBmb3IgYmlkaSBhbmQgbm9uLWJpZGkgY29udGVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRl bnRCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAKaW5kZXggYzRlMzU3Y2JiOGYw YjZmZjcxNTZjZGM0YjAwNjkzMzMxNjk3MzgyNC4uYjdkNjE2ZGMyNWM2ZDExMWE1OTgxYjE5MjQw MTk1M2UzNmRjMzExNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNw bGF5Q29udGVudEJ1aWxkZXIuY3BwCkBAIC0xOTQsOCArMTk0LDkgQEAgdm9pZCBJbmxpbmVEaXNw bGF5Q29udGVudEJ1aWxkZXI6OmFwcGVuZEF0b21pY0lubGluZUxldmVsRGlzcGxheUJveChjb25z dCBMaW5lOjoKIAogdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmFwcGVuZElubGlu ZUJveERpc3BsYXlCb3goY29uc3QgTGluZTo6UnVuJiBsaW5lUnVuLCBjb25zdCBJbmxpbmVMZXZl bEJveCYgaW5saW5lQm94LCBjb25zdCBJbmxpbmVSZWN0JiBpbmxpbmVCb3hCb3JkZXJCb3gsIGJv b2wgbGluZWhhc0NvbnRlbnQsIERpc3BsYXlCb3hlcyYgYm94ZXMpCiB7Ci0gICAgYXV0byYgbGF5 b3V0Qm94ID0gbGluZVJ1bi5sYXlvdXRCb3goKTsKKyAgICBBU1NFUlQobGluZVJ1bi5sYXlvdXRC b3goKS5pc0lubGluZUJveCgpKTsKIAorICAgIGF1dG8mIGxheW91dEJveCA9IGxpbmVSdW4ubGF5 b3V0Qm94KCk7CiAgICAgaWYgKGxpbmVoYXNDb250ZW50KSB7CiAgICAgICAgIGF1dG8gaW5rT3Zl cmZsb3cgPSBbJl0gewogICAgICAgICAgICAgYXV0byBpbmtPdmVyZmxvdyA9IGlubGluZUJveEJv cmRlckJveDsKQEAgLTIxOSw2ICsyMjAsNyBAQCB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVp bGRlcjo6YXBwZW5kSW5saW5lQm94RGlzcGxheUJveChjb25zdCBMaW5lOjpSdW4mIGxpbgogICAg ICAgICAgICAgLCBpc0ZpcnN0TGFzdEJveChpbmxpbmVCb3gpIH0pOwogICAgIH0KIAorICAgIC8v IFRoaXMgaW5saW5lIGJveCBzaG93ZWQgdXAgZmlyc3Qgb24gdGhpcyBsaW5lLgogICAgIGF1dG8g aW5saW5lQm94U2l6ZSA9IExheW91dFNpemUgeyBMYXlvdXRVbml0Ojpmcm9tRmxvYXRDZWlsKGlu bGluZUJveEJvcmRlckJveC53aWR0aCgpKSwgTGF5b3V0VW5pdDo6ZnJvbUZsb2F0Q2VpbChpbmxp bmVCb3hCb3JkZXJCb3guaGVpZ2h0KCkpIH07CiAgICAgYXV0byBsb2dpY2FsUmVjdCA9IFJlY3Qg eyBMYXlvdXRQb2ludCB7IGlubGluZUJveEJvcmRlckJveC50b3BMZWZ0KCkgfSwgaW5saW5lQm94 U2l6ZSB9OwogICAgIGF1dG8mIGJveEdlb21ldHJ5ID0gZm9ybWF0dGluZ1N0YXRlKCkuYm94R2Vv bWV0cnkobGF5b3V0Qm94KTsKQEAgLTIzMSw4ICsyMzMsOSBAQCB2b2lkIElubGluZURpc3BsYXlD b250ZW50QnVpbGRlcjo6YXBwZW5kSW5saW5lQm94RGlzcGxheUJveChjb25zdCBMaW5lOjpSdW4m IGxpbgogCiB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6YXBwZW5kU3Bhbm5pbmdJ bmxpbmVCb3hEaXNwbGF5Qm94KGNvbnN0IExpbmU6OlJ1biYgbGluZVJ1biwgY29uc3QgSW5saW5l TGV2ZWxCb3gmIGlubGluZUJveCwgY29uc3QgSW5saW5lUmVjdCYgaW5saW5lQm94Qm9yZGVyQm94 LCBEaXNwbGF5Qm94ZXMmIGJveGVzKQogewotICAgIGF1dG8mIGxheW91dEJveCA9IGxpbmVSdW4u bGF5b3V0Qm94KCk7CisgICAgQVNTRVJUKGxpbmVSdW4ubGF5b3V0Qm94KCkuaXNJbmxpbmVCb3go KSk7CiAKKyAgICBhdXRvJiBsYXlvdXRCb3ggPSBsaW5lUnVuLmxheW91dEJveCgpOwogICAgIG1f aW5saW5lQm94SW5kZXhNYXAuYWRkKCZsYXlvdXRCb3gsIGJveGVzLnNpemUoKSk7CiAKICAgICBh dXRvIGlua092ZXJmbG93ID0gWyZdIHsKQEAgLTI2NCw2ICsyNjcsMTkgQEAgdm9pZCBJbmxpbmVE aXNwbGF5Q29udGVudEJ1aWxkZXI6OmFwcGVuZFNwYW5uaW5nSW5saW5lQm94RGlzcGxheUJveChj b25zdCBMaW5lOjoKICAgICBib3hHZW9tZXRyeS5zZXRDb250ZW50Qm94V2lkdGgoZW5jbG9zaW5n Qm9yZGVyQm94UmVjdC53aWR0aCgpIC0gKGJveEdlb21ldHJ5Lmhvcml6b250YWxCb3JkZXIoKSAr IGJveEdlb21ldHJ5Lmhvcml6b250YWxQYWRkaW5nKCkudmFsdWVfb3IoMF9sdSkpKTsKIH0KIAor dm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmFwcGVuZElubGluZUJveERpc3BsYXlC b3hGb3JCaWRpQm91bmRhcnkoY29uc3QgQm94JiBsYXlvdXRCb3gsIGNvbnN0IElubGluZVJlY3Qm IGlubGluZUJveFJlY3QsIERpc3BsYXlCb3hlcyYgYm94ZXMpCit7CisgICAgVU5VU0VEX1BBUkFN KGxheW91dEJveCk7CisgICAgVU5VU0VEX1BBUkFNKGlubGluZUJveFJlY3QpOworICAgIFVOVVNF RF9QQVJBTShib3hlcyk7Cit9CisKK3ZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjph ZGp1c3RJbmxpbmVCb3hEaXNwbGF5Qm94Rm9yQmlkaUJvdW5kYXJ5KElubGluZURpc3BsYXk6OkJv eCYgZGlzcGxheUJveCwgY29uc3QgSW5saW5lUmVjdCYgaW5saW5lQm94UmVjdCkKK3sKKyAgICBV TlVTRURfUEFSQU0oZGlzcGxheUJveCk7CisgICAgVU5VU0VEX1BBUkFNKGlubGluZUJveFJlY3Qp OworfQorCiB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6cHJvY2Vzc05vbkJpZGlD b250ZW50KGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udGVudCYgbGluZUNvbnRlbnQsIGNvbnN0 IExpbmVCb3gmIGxpbmVCb3gsIGNvbnN0IElubGluZUxheW91dFBvaW50JiBsaW5lQm94TG9naWNh bFRvcExlZnQsICBEaXNwbGF5Qm94ZXMmIGJveGVzKQogewogICAgIC8vIENyZWF0ZSB0aGUgaW5s aW5lIGJveGVzIG9uIHRoZSBjdXJyZW50IGxpbmUuIFRoaXMgaXMgbW9zdGx5IHRleHQgYW5kIGF0 b21pYyBpbmxpbmUgYm94ZXMuCkBAIC0zMDQsNyArMzIwLDYgQEAgdm9pZCBJbmxpbmVEaXNwbGF5 Q29udGVudEJ1aWxkZXI6OnByb2Nlc3NOb25CaWRpQ29udGVudChjb25zdCBMaW5lQnVpbGRlcjo6 TGluZUMKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9CiAgICAgICAgIGlmIChsaW5l UnVuLmlzSW5saW5lQm94U3RhcnQoKSkgewotICAgICAgICAgICAgLy8gVGhpcyBpbmxpbmUgYm94 IHNob3dlZCB1cCBmaXJzdCBvbiB0aGlzIGxpbmUuCiAgICAgICAgICAgICBhcHBlbmRJbmxpbmVC b3hEaXNwbGF5Qm94KGxpbmVSdW4sIGxpbmVCb3guaW5saW5lTGV2ZWxCb3hGb3JMYXlvdXRCb3go bGluZVJ1bi5sYXlvdXRCb3goKSksIGRpc3BsYXlCb3hSZWN0KCksIGxpbmVCb3guaGFzQ29udGVu dCgpLCBib3hlcyk7CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQpAQCAtMzM1LDE1 ICszNTAsMjEgQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OnByb2Nlc3NCaWRp Q29udGVudChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnQKICAgICAgICAgLy8gRklYTUU6IFRo aXMgbmVlZHMgdGhlIGJsb2NrIGVuZCBwb3NpdGlvbiBpbnN0ZWFkIG9mIHRoZSBsaW5lTG9naWNh bFdpZHRoLgogICAgICAgICBjb250ZW50UmlnaHRJblZpc3VhbE9yZGVyICs9IGxpbmVDb250ZW50 LmxpbmVMb2dpY2FsV2lkdGggLSByb290SW5saW5lQm94UmVjdC53aWR0aCgpOwogICAgIH0KLSAg ICAvLyBBZGp1c3QgdGhlIGNvbnRlbnQgc3RhcnQgcG9zaXRpb24gd2l0aCB0aGUgKHRleHQpYWxp Z21lbnQgb2Zmc2V0IChyb290IGlubGluZSBib3ggaGFzIHRoZSBhbGlnbWVudCBvZmZzZXQgYW5k IG5vdCB0aGUgaW5kaXZpZHVhbCBydW5zKS4KKyAgICAvLyBBZGp1c3QgdGhlIGNvbnRlbnQgc3Rh cnQgcG9zaXRpb24gd2l0aCB0aGUgKHRleHQpYWxpZ25tZW50IG9mZnNldCAocm9vdCBpbmxpbmUg Ym94IGhhcyB0aGUgYWxpZ25tZW50IG9mZnNldCBhbmQgbm90IHRoZSBpbmRpdmlkdWFsIHJ1bnMp LgogICAgIGNvbnRlbnRSaWdodEluVmlzdWFsT3JkZXIgKz0gcm9vdElubGluZUJveFJlY3QubGVm dCgpOworICAgIFZlY3RvcjxzaXplX3Q+IGlubGluZUJveFN0YWNrOworICAgIGlubGluZUJveFN0 YWNrLnJlc2VydmVJbml0aWFsQ2FwYWNpdHkobGluZUJveC5ub25Sb290SW5saW5lTGV2ZWxCb3hl cygpLnNpemUoKSk7CiAKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHJ1bnMuc2l6ZSgpOyAr K2kpIHsKICAgICAgICAgYXV0byB2aXN1YWxJbmRleCA9IGxpbmVDb250ZW50LnZpc3VhbE9yZGVy TGlzdFtpXTsKICAgICAgICAgYXV0byYgbGluZVJ1biA9IHJ1bnNbdmlzdWFsSW5kZXhdOwotICAg ICAgICBhdXRvJiBsYXlvdXRCb3ggPSBsaW5lUnVuLmxheW91dEJveCgpOworCisgICAgICAgIGF1 dG8gaXNDb250ZW50UnVuID0gIWxpbmVSdW4uaXNJbmxpbmVCb3hTdGFydCgpICYmICFsaW5lUnVu LmlzTGluZVNwYW5uaW5nSW5saW5lQm94U3RhcnQoKSAmJiAhbGluZVJ1bi5pc0lubGluZUJveEVu ZCgpICYmICFsaW5lUnVuLmlzV29yZEJyZWFrT3Bwb3J0dW5pdHkoKTsKKyAgICAgICAgaWYgKCFp c0NvbnRlbnRSdW4pCisgICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICBhdXRvIGRpc3Bs YXlCb3hSZWN0ID0gWyZdIHsKKyAgICAgICAgICAgIGF1dG8mIGxheW91dEJveCA9IGxpbmVSdW4u bGF5b3V0Qm94KCk7CiAgICAgICAgICAgICBhdXRvIGxvZ2ljYWxSZWN0ID0gSW5saW5lUmVjdCB7 IH07CiAgICAgICAgICAgICBhdXRvIG1hcmdpblN0YXJ0ID0gc3RkOjpvcHRpb25hbDxMYXlvdXRV bml0PiB7IH07CiAKQEAgLTM1NiwxMiArMzc3LDcgQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVu dEJ1aWxkZXI6OnByb2Nlc3NCaWRpQ29udGVudChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnQK ICAgICAgICAgICAgICAgICBpZiAobGluZVJ1bi5pc0JveCgpKSB7CiAgICAgICAgICAgICAgICAg ICAgIG1hcmdpblN0YXJ0ID0gYm94R2VvbWV0cnkubWFyZ2luU3RhcnQoKTsKICAgICAgICAgICAg ICAgICAgICAgbG9naWNhbFJlY3QgPSBsaW5lQm94LmxvZ2ljYWxCb3JkZXJCb3hGb3JBdG9taWNJ bmxpbmVMZXZlbEJveChsYXlvdXRCb3gsIGJveEdlb21ldHJ5KTsKLSAgICAgICAgICAgICAgICB9 IGVsc2UgaWYgKGxpbmVSdW4uaXNJbmxpbmVCb3hTdGFydCgpKSB7Ci0gICAgICAgICAgICAgICAg ICAgIG1hcmdpblN0YXJ0ID0gYm94R2VvbWV0cnkubWFyZ2luU3RhcnQoKTsKLSAgICAgICAgICAg ICAgICAgICAgbG9naWNhbFJlY3QgPSBsaW5lQm94LmxvZ2ljYWxCb3JkZXJCb3hGb3JJbmxpbmVC b3gobGF5b3V0Qm94LCBib3hHZW9tZXRyeSk7Ci0gICAgICAgICAgICAgICAgfSBlbHNlIGlmIChs aW5lUnVuLmlzTGluZVNwYW5uaW5nSW5saW5lQm94U3RhcnQoKSkKLSAgICAgICAgICAgICAgICAg ICAgbG9naWNhbFJlY3QgPSBsaW5lQm94LmxvZ2ljYWxCb3JkZXJCb3hGb3JJbmxpbmVCb3gobGF5 b3V0Qm94LCBib3hHZW9tZXRyeSk7Ci0gICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAg ICAgIH0gZWxzZQogICAgICAgICAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAg ICAgICAgICAgIH0KICAgICAgICAgICAgIGxvZ2ljYWxSZWN0Lm1vdmVWZXJ0aWNhbGx5KGxpbmVC b3hMb2dpY2FsVG9wTGVmdC55KCkpOwpAQCAtMzczLDUzICszODksNzAgQEAgdm9pZCBJbmxpbmVE aXNwbGF5Q29udGVudEJ1aWxkZXI6OnByb2Nlc3NCaWRpQ29udGVudChjb25zdCBMaW5lQnVpbGRl cjo6TGluZUNvbnQKICAgICAgICAgICAgIGF1dG8gY29udGVudExlZnQgPSBjb250ZW50UmlnaHRJ blZpc3VhbE9yZGVyICsgZGlzdGFuY2VGcm9tTG9naWNhbFByZXZpb3VzUnVuICsgbWFyZ2luU3Rh cnQudmFsdWVfb3IoMCk7CiAgICAgICAgICAgICB2aXN1YWxPcmRlclJlY3Quc2V0TGVmdChjb250 ZW50TGVmdCk7CiAgICAgICAgICAgICByZXR1cm4gdmlzdWFsT3JkZXJSZWN0OwotICAgICAgICB9 OworICAgICAgICB9KCk7CisKKyAgICAgICAgYXV0byBoYW5kbGVJbmxpbmVCb3hCb3VuZGFyaWVz SWZBcHBsaWNhYmxlID0gWyZdIHsKKyAgICAgICAgICAgIC8vIFZpc3VhbCBvcmRlciBjb3VsZCBp bnRyb2R1Y2UgZ2FwcyBhbmQvb3IgaW5qZWN0IHJ1bnMgb3V0c2lkZSBmcm9tIHRoZSBjdXJyZW50 IGlubGluZSBib3ggY29udGVudC4KKyAgICAgICAgICAgIC8vIEluIHN1Y2ggY2FzZXMsIHdlIG5l ZWQgdG8gImNsb3NlIiB0aGUgaW5saW5lIGJveChlcykgYW5kICJvcGVuIiBhIG5ldyBvbmUocykg dG8gYWNjb21tb2RhdGUgdGhlIGN1cnJlbnQgY29udGVudC4KKyAgICAgICAgICAgIC8vIDxkaXY+ YTxzcGFuIGlkPWZpcnN0PmImIzgyMzg7Zzwvc3Bhbj5mPHNwYW4gaWQ9c2Vjb25kPmUmIzgyMzc7 Yzwvc3Bhbj5kPC9kaXY+CisgICAgICAgICAgICAvLyBwcm9kdWNlcyB0aGUgZm9sbG93aW5nIG91 dHB1dCAobm90ZSB0aGUgIzgyMzg7ICM4MjM3OyBSVEwvTFRSIGNvbnRyb2wgY2hhcmFjdGVycyk6 CisgICAgICAgICAgICAvLyBhYmNkZWZnCisgICAgICAgICAgICAvLyB3aXRoIHRoZSBmb2xsb3dp bmcsIGZyYWdtZW50ZWQgaW5saW5lIGJveGVzIDoKKyAgICAgICAgICAgIC8vIGFbZmlyc3Qgb3Bl bl1iW2ZpcnN0IGNsb3NlXVtzZWNvbmQgb3Blbl1jW3NlY29uZCBjbG9zZV1kW3NlY29uZCBvcGVu XWVbc2Vjb25kIGNsb3NlXWZbZmlyc3Qgb3Blbl1nW2ZpcnN0IGNsb3NlXSAKKyAgICAgICAgICAg IGF1dG8mIHBhcmVudEJveCA9IGxpbmVSdW4ubGF5b3V0Qm94KCkucGFyZW50KCk7CisgICAgICAg ICAgICBBU1NFUlQocGFyZW50Qm94LmlzSW5saW5lQm94KCkgfHwgJnBhcmVudEJveCA9PSAmcm9v dCgpKTsKKworICAgICAgICAgICAgYXV0byBydW5QYXJlbnRJc0N1cnJlbnRJbmxpbmVCb3ggPSAo JnBhcmVudEJveCA9PSAmcm9vdCgpICYmIGlubGluZUJveFN0YWNrLmlzRW1wdHkoKSkKKyAgICAg ICAgICAgICAgICB8fCAoIWlubGluZUJveFN0YWNrLmlzRW1wdHkoKSAmJiAmcGFyZW50Qm94ID09 ICZib3hlc1tpbmxpbmVCb3hTdGFjay5sYXN0KCldLmxheW91dEJveCgpKTsKKyAgICAgICAgICAg IGlmIChydW5QYXJlbnRJc0N1cnJlbnRJbmxpbmVCb3gpIHsKKyAgICAgICAgICAgICAgICAvLyBX ZSd2ZSBnb3QgdGhlIGNvcnJlY3QgaW5saW5lIGJveCBhcyBwYXJlbnQuIE5vdGhpbmcgdG8gZG8g aGVyZS4KKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9CisgICAgICAgICAg ICAvLyBJZiB0aGlzIHJ1biBpcyBub3QgbmVzdGVkIGluc2lkZSB0aGUgY3VycmVudCBpbmxpbmUg Ym94IChtZWFuaW5nIGl0IHZpc3VhbGx5IGdvdCBpbmplY3RlZCBpbi1iZXR3ZWVuIHRoZSBpbmxp bmUgYm94IGNvbnRlbnQpCisgICAgICAgICAgICAvLyB3ZSBuZWVkIHRvICJjbG9zZSIgYWxsIHRo ZSBuZXN0ZWQgaW5saW5lIGJveGVzIGZpcnN0IChlLmcuIHNlZSB0aGUgZXhhbXBsZSBhYm92ZTsg cmlnaHQgYmVmb3JlIGFwcGVuZGluZyAiYyIpLgorICAgICAgICAgICAgd2hpbGUgKCFpbmxpbmVC b3hTdGFjay5pc0VtcHR5KCkpIHsKKyAgICAgICAgICAgICAgICBhdXRvJiBpbmxpbmVCb3hEaXNw bGF5Qm94ID0gYm94ZXNbaW5saW5lQm94U3RhY2subGFzdCgpXTsKKyAgICAgICAgICAgICAgICBp ZiAoJnBhcmVudEJveCA9PSAmaW5saW5lQm94RGlzcGxheUJveC5sYXlvdXRCb3goKSkKKyAgICAg ICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgaW5saW5lQm94U3RhY2sucmVt b3ZlTGFzdCgpOworICAgICAgICAgICAgICAgIC8vIEZJWE1FOiBDb21wdXRlIGdlb21ldHJ5IGZv ciB0aGlzIGlubGluZSBib3ggZnJhZ21lbnQuCisgICAgICAgICAgICAgICAgYWRqdXN0SW5saW5l Qm94RGlzcGxheUJveEZvckJpZGlCb3VuZGFyeShpbmxpbmVCb3hEaXNwbGF5Qm94LCB7IH0pOwor ICAgICAgICAgICAgfQogCi0gICAgICAgIGlmIChsaW5lUnVuLmlzVGV4dCgpKSB7Ci0gICAgICAg ICAgICBhdXRvIHRleHRSdW5SZWN0ID0gZGlzcGxheUJveFJlY3QoKTsKLSAgICAgICAgICAgIGFw cGVuZFRleHREaXNwbGF5Qm94KGxpbmVSdW4sIHRleHRSdW5SZWN0LCBib3hlcyk7Ci0gICAgICAg ICAgICBjb250ZW50UmlnaHRJblZpc3VhbE9yZGVyID0gdGV4dFJ1blJlY3QucmlnaHQoKTsKLSAg ICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICB9Ci0gICAgICAgIGlmIChsaW5lUnVuLmlzU29m dExpbmVCcmVhaygpKSB7Ci0gICAgICAgICAgICBhcHBlbmRTb2Z0TGluZUJyZWFrRGlzcGxheUJv eChsaW5lUnVuLCBkaXNwbGF5Qm94UmVjdCgpLCBib3hlcyk7Ci0gICAgICAgICAgICBjb250aW51 ZTsKLSAgICAgICAgfQotICAgICAgICBpZiAobGluZVJ1bi5pc0hhcmRMaW5lQnJlYWsoKSkgewot ICAgICAgICAgICAgYXBwZW5kSGFyZExpbmVCcmVha0Rpc3BsYXlCb3gobGluZVJ1biwgZGlzcGxh eUJveFJlY3QoKSwgYm94ZXMpOwotICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgIH0KLSAg ICAgICAgaWYgKGxpbmVSdW4uaXNCb3goKSkgewotICAgICAgICAgICAgYXV0byBib3JkZXJCb3hS ZWN0ID0gZGlzcGxheUJveFJlY3QoKTsKLSAgICAgICAgICAgIGFwcGVuZEF0b21pY0lubGluZUxl dmVsRGlzcGxheUJveChsaW5lUnVuLCBib3JkZXJCb3hSZWN0LCBib3hlcyk7Ci0gICAgICAgICAg ICBjb250ZW50UmlnaHRJblZpc3VhbE9yZGVyID0gYm9yZGVyQm94UmVjdC5yaWdodCgpOwotICAg ICAgICAgICAgY29udGludWU7Ci0gICAgICAgIH0KLSAgICAgICAgaWYgKGxpbmVSdW4uaXNJbmxp bmVCb3hTdGFydCgpKSB7Ci0gICAgICAgICAgICAvLyBUaGlzIGlubGluZSBib3ggc2hvd2VkIHVw IGZpcnN0IG9uIHRoaXMgbGluZS4KLSAgICAgICAgICAgIGFwcGVuZElubGluZUJveERpc3BsYXlC b3gobGluZVJ1biwgbGluZUJveC5pbmxpbmVMZXZlbEJveEZvckxheW91dEJveChsaW5lUnVuLmxh eW91dEJveCgpKSwgZGlzcGxheUJveFJlY3QoKSwgbGluZUJveC5oYXNDb250ZW50KCksIGJveGVz KTsKLSAgICAgICAgICAgIGNvbnRlbnRSaWdodEluVmlzdWFsT3JkZXIgKz0gbGluZVJ1bi5sb2dp Y2FsV2lkdGgoKTsKLSAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICB9Ci0gICAgICAgIGlm IChsaW5lUnVuLmlzTGluZVNwYW5uaW5nSW5saW5lQm94U3RhcnQoKSkgewotICAgICAgICAgICAg aWYgKCFsaW5lQm94Lmhhc0NvbnRlbnQoKSkgewotICAgICAgICAgICAgICAgIC8vIFdoZW4gYSBz cGFubmluZyBpbmxpbmUgYm94IChlLmcuIDxkaXY+dGV4dDxzcGFuPjxicj48L3NwYW4+PC9kaXY+ KSBsYW5kcyBvbiBhbiBlbXB0eSBsaW5lCi0gICAgICAgICAgICAgICAgLy8gKGVtcHR5IGhlcmUg bWVhbnMgbm8gY29udGVudCBhdCBhbGwgaW5jbHVkaW5nIGxpbmUgYnJlYWtzLCBub3QganVzdCB2 aXN1YWxseSBlbXB0eSkgdGhlbiB3ZQotICAgICAgICAgICAgICAgIC8vIGRvbid0IGV4dGVuZCB0 aGUgc3Bhbm5pbmcgbGluZSBib3ggb3ZlciB0byB0aGlzIGxpbmUgLWFsc28gdGhlcmUgaXMgbm8g bmV4dCBsaW5lIGluIGNhc2VzIGxpa2UgdGhpcy4KLSAgICAgICAgICAgICAgICBjb250aW51ZTsK KyAgICAgICAgICAgIC8vIFdlIGFsc28gbWF5IG5lZWQgdG8gIm9wZW4iIG5ldyBpbmxpbmUgYm94 ZXMgaWYgdGhlIGN1cnJlbnQgY29udGVudCBpcyBuZXN0ZWQgaW5zaWRlIGlubGluZSBib3hlcyAo ZS5nLiBzZWUgdGhlIGV4YW1wbGUgYWJvdmU7IHJpZ2h0IGJlZm9yZSAiZyIpCisgICAgICAgICAg ICBmb3IgKGF1dG8qIGFuY2VzdG9yID0gJnBhcmVudEJveDsgYW5jZXN0b3IgIT0gJnJvb3QoKTsg YW5jZXN0b3IgPSAmYW5jZXN0b3ItPnBhcmVudCgpKSB7CisgICAgICAgICAgICAgICAgQVNTRVJU KGFuY2VzdG9yLT5pc0lubGluZUJveCgpKTsKKyAgICAgICAgICAgICAgICBhdXRvJiBpbmxpbmVC b3ggPSAqYW5jZXN0b3I7CisgICAgICAgICAgICAgICAgaW5saW5lQm94U3RhY2suYXBwZW5kKGJv eGVzLnNpemUoKSk7CisgICAgICAgICAgICAgICAgLy8gRklYTUU6IENvbXB1dGUgZ2VvbWV0cnkg Zm9yIHRoaXMgaW5saW5lIGJveCBmcmFnbWVudC4KKyAgICAgICAgICAgICAgICBhcHBlbmRJbmxp bmVCb3hEaXNwbGF5Qm94Rm9yQmlkaUJvdW5kYXJ5KGlubGluZUJveCwgeyB9LCBib3hlcyk7CiAg ICAgICAgICAgICB9Ci0gICAgICAgICAgICBhcHBlbmRTcGFubmluZ0lubGluZUJveERpc3BsYXlC b3gobGluZVJ1biwgbGluZUJveC5pbmxpbmVMZXZlbEJveEZvckxheW91dEJveChsaW5lUnVuLmxh eW91dEJveCgpKSwgZGlzcGxheUJveFJlY3QoKSwgYm94ZXMpOwotICAgICAgICAgICAgLy8gVGhl IGNvbnRlbnQgcmlnaHQgZWRnZSBzaG91bGQgbm90IGluY2x1ZGUgdGhlIGVudGlyZSBpbmxpbmUg Ym94IGhlcmUgKGluY2x1ZGluZyBpdHMgY29udGVudCBhbmQgcmlnaHQgZWRnZSkuCi0gICAgICAg ICAgICBjb250ZW50UmlnaHRJblZpc3VhbE9yZGVyICs9IGxpbmVSdW4ubG9naWNhbFdpZHRoKCk7 Ci0gICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgfQotICAgICAgICBpZiAobGluZVJ1bi5p c0lubGluZUJveEVuZCgpKSB7Ci0gICAgICAgICAgICBjb250ZW50UmlnaHRJblZpc3VhbE9yZGVy ICs9IGxpbmVSdW4ubG9naWNhbFdpZHRoKCk7Ci0gICAgICAgICAgICBjb250aW51ZTsKLSAgICAg ICAgfQotICAgICAgICBBU1NFUlQobGluZVJ1bi5pc1dvcmRCcmVha09wcG9ydHVuaXR5KCkpOwor ICAgICAgICB9OworICAgICAgICBoYW5kbGVJbmxpbmVCb3hCb3VuZGFyaWVzSWZBcHBsaWNhYmxl KCk7CisKKyAgICAgICAgaWYgKGxpbmVSdW4uaXNUZXh0KCkpCisgICAgICAgICAgICBhcHBlbmRU ZXh0RGlzcGxheUJveChsaW5lUnVuLCBkaXNwbGF5Qm94UmVjdCwgYm94ZXMpOworICAgICAgICBl bHNlIGlmIChsaW5lUnVuLmlzU29mdExpbmVCcmVhaygpKQorICAgICAgICAgICAgYXBwZW5kU29m dExpbmVCcmVha0Rpc3BsYXlCb3gobGluZVJ1biwgZGlzcGxheUJveFJlY3QsIGJveGVzKTsKKyAg ICAgICAgZWxzZSBpZiAobGluZVJ1bi5pc0hhcmRMaW5lQnJlYWsoKSkKKyAgICAgICAgICAgIGFw cGVuZEhhcmRMaW5lQnJlYWtEaXNwbGF5Qm94KGxpbmVSdW4sIGRpc3BsYXlCb3hSZWN0LCBib3hl cyk7CisgICAgICAgIGVsc2UgaWYgKGxpbmVSdW4uaXNCb3goKSkKKyAgICAgICAgICAgIGFwcGVu ZEF0b21pY0lubGluZUxldmVsRGlzcGxheUJveChsaW5lUnVuLCBkaXNwbGF5Qm94UmVjdCwgYm94 ZXMpOworICAgICAgICBlbHNlCisgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKwor ICAgICAgICBjb250ZW50UmlnaHRJblZpc3VhbE9yZGVyID0gZGlzcGxheUJveFJlY3QucmlnaHQo KTsKKyAgICB9CisKKyAgICAvLyBDbG9zZSB0aGUgcmVtYWluaW5nIG5lc3RlZCBpbmxpbmUgYm94 ZXMuCisgICAgLy8gPGRpdj5hPHNwYW4+YiYjODIzODtkPC9zcGFuPmM8L2Rpdj4KKyAgICAvLyBB dCB0aGUgZW5kIG9mIHRoZSBydW4gbGlzdCBsb29wIHdoZW4gd2UgZmluaXNoZWQgcHJvY2Vzc2lu ZyBbZF0sIHRoZSBpbmxpbmUgYm94ICg8c3Bhbj4pIGlzIHN0aWxsICJvcGVuIi4KKyAgICBmb3Ig KGF1dG8mIGlubGluZUJveEluZGV4IDogaW5saW5lQm94U3RhY2spIHsKKyAgICAgICAgLy8gRklY TUU6IENvbXB1dGUgZ2VvbWV0cnkgZm9yIHRoaXMgaW5saW5lIGJveCBmcmFnbWVudC4KKyAgICAg ICAgYWRqdXN0SW5saW5lQm94RGlzcGxheUJveEZvckJpZGlCb3VuZGFyeShib3hlc1tpbmxpbmVC b3hJbmRleF0sIHsgfSk7CiAgICAgfQogfQorCiB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVp bGRlcjo6cHJvY2Vzc092ZXJmbG93blJ1bnNGb3JFbGxpcHNpcyhEaXNwbGF5Qm94ZXMmIGJveGVz LCBJbmxpbmVMYXlvdXRVbml0IGxpbmVCb3hMb2dpY2FsUmlnaHQpCiB7CiAgICAgaWYgKHJvb3Qo KS5zdHlsZSgpLnRleHRPdmVyZmxvdygpICE9IFRleHRPdmVyZmxvdzo6RWxsaXBzaXMpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9J bmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5oCmluZGV4 IDliNzc0OWVkOGZmYWYxMGFjOTM2ZTllZmFiODM5ZTE1OGQzYWI4YjguLjMyYzk0NzM0Mzg5NmVi YjQyNWEzNTIwNDNjZmI2Mzk1OGNmMzRkZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRl ci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5oCkBAIC01NSw2ICs1NSw4IEBAIHByaXZhdGU6 CiAgICAgdm9pZCBhcHBlbmRBdG9taWNJbmxpbmVMZXZlbERpc3BsYXlCb3goY29uc3QgTGluZTo6 UnVuJiwgY29uc3QgSW5saW5lUmVjdCYgLCBEaXNwbGF5Qm94ZXMmKTsKICAgICB2b2lkIGFwcGVu ZElubGluZUJveERpc3BsYXlCb3goY29uc3QgTGluZTo6UnVuJiwgY29uc3QgSW5saW5lTGV2ZWxC b3gmLCBjb25zdCBJbmxpbmVSZWN0JiwgYm9vbCBsaW5laGFzQ29udGVudCwgRGlzcGxheUJveGVz Jik7CiAgICAgdm9pZCBhcHBlbmRTcGFubmluZ0lubGluZUJveERpc3BsYXlCb3goY29uc3QgTGlu ZTo6UnVuJiwgY29uc3QgSW5saW5lTGV2ZWxCb3gmLCBjb25zdCBJbmxpbmVSZWN0JiwgRGlzcGxh eUJveGVzJik7CisgICAgdm9pZCBhcHBlbmRJbmxpbmVCb3hEaXNwbGF5Qm94Rm9yQmlkaUJvdW5k YXJ5KGNvbnN0IEJveCYsIGNvbnN0IElubGluZVJlY3QmLCBEaXNwbGF5Qm94ZXMmKTsKKyAgICB2 b2lkIGFkanVzdElubGluZUJveERpc3BsYXlCb3hGb3JCaWRpQm91bmRhcnkoSW5saW5lRGlzcGxh eTo6Qm94JiwgY29uc3QgSW5saW5lUmVjdCYpOwogCiAgICAgY29uc3QgQ29udGFpbmVyQm94JiBy b290KCkgY29uc3QgeyByZXR1cm4gbV9mb3JtYXR0aW5nQ29udGV4dFJvb3Q7IH0KICAgICBJbmxp bmVGb3JtYXR0aW5nU3RhdGUmIGZvcm1hdHRpbmdTdGF0ZSgpIGNvbnN0IHsgcmV0dXJuIG1fZm9y bWF0dGluZ1N0YXRlOyB9IAo=