240442 2022-05-15 21:44:21 -0700 [LFC][FFC] Add support for logical ordering 2022-05-16 10:38:41 -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 1869125 0 zalan 2022-05-15 21:44:21 -0700 order property 1869128 1 459389 zalan 2022-05-15 21:48:08 -0700 Created attachment 459389 Patch 1869206 2 459419 zalan 2022-05-16 06:09:31 -0700 Created attachment 459419 Patch 1869275 3 459429 zalan 2022-05-16 09:36:18 -0700 Created attachment 459429 Patch 1869282 4 459429 koivisto 2022-05-16 09:46:50 -0700 Comment on attachment 459429 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=459429&action=review > Source/WebCore/layout/formattingContexts/flex/FlexFormattingContext.cpp:170 > + std::sort(logicalFlexItemList.begin(), logicalFlexItemList.end(), [&] (auto& a, auto& b) { Probably std::stable_sort? Otherwise identical items get ordered randomly. 1869287 5 zalan 2022-05-16 09:53:12 -0700 (In reply to Antti Koivisto from comment #4) > Comment on attachment 459429 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=459429&action=review > > > Source/WebCore/layout/formattingContexts/flex/FlexFormattingContext.cpp:170 > > + std::sort(logicalFlexItemList.begin(), logicalFlexItemList.end(), [&] (auto& a, auto& b) { > > Probably std::stable_sort? Otherwise identical items get ordered randomly. good point! 1869288 6 459432 zalan 2022-05-16 09:53:27 -0700 Created attachment 459432 Patch 1869308 7 ews-feeder 2022-05-16 10:36:51 -0700 Committed r294240 (250598@main): <https://commits.webkit.org/250598@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 459432. 1869309 8 webkit-bug-importer 2022-05-16 10:37:23 -0700 <rdar://problem/93355697> 459389 2022-05-15 21:48:08 -0700 2022-05-16 06:09:29 -0700 Patch bug-240442-20220515214807.patch text/plain 4258 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjk0MDg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWQzNTBhMWRhZmRkN2Yw MTkyYmM3OTUyMjYwNmQ1MTk0MWVhNTA0NS4uY2NkYWUxZGJmMGM5YjQxYzFiZDBkMzMzMjFlNTBm NjQyMDJhNjhiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIyLTA1LTE1ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtGRkNdIEFkZCBzdXBw b3J0IGZvciBsb2dpY2FsIG9yZGVyaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yNDA0NDIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBMZXQncyByZW9yZGVyIHRoZSBsb2dpY2FsRmxleEl0ZW1MaXN0IHdo ZW4gdGhlICdvcmRlcicgcHJvcGVydHkgaGFzIGEgbm9uLWluaXRpYWwgdmFsdWUuCisKKyAgICAg ICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxleEZvcm1hdHRpbmdDb250ZXh0 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6RmxleEZvcm1hdHRpbmdDb250ZXh0Ojps YXlvdXRJbkZsb3dDb250ZW50Rm9ySW50ZWdyYXRpb24pOgorCiAyMDIyLTA1LTE1ICBBbGFuIEJ1 anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtGRkNdIEFkZCAiZmxleC1k aXJlY3Rpb246IGNvbHVtbi1yZXZlcnNlIiBiYXNpYyB2aXN1YWwvbG9naWNhbCBjb252ZXJzaW9u CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2Zs ZXgvRmxleEZvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvZmxleC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IDVjZGMx MjRmZmYzMzExNGNiYTkwYTc3MmViMjBkMGYyODE4ODQ1ZjguLjc3ZDZiN2RhMzA1ZjJiMGZhNTYx YmFmMzYxZjg4OWNlODY0NWEwMmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4Rm9ybWF0dGlu Z0NvbnRleHQuY3BwCkBAIC0xMjEsMTggKzEyMSwyMSBAQCB2b2lkIEZsZXhGb3JtYXR0aW5nQ29u dGV4dDo6Y29tcHV0ZUludHJpbnNpY1dpZHRoQ29uc3RyYWludHNGb3JGbGV4SXRlbXMoKQogCiBz dHJ1Y3QgRmxleEl0ZW1Mb2dpY2FsQm94IHsKICAgICBGbGV4UmVjdCByZWN0OwotICAgIGNvbnN0 IENvbnRhaW5lckJveCYgZmxleEl0ZW07CisgICAgQ2hlY2tlZFB0cjxjb25zdCBDb250YWluZXJC b3g+IGZsZXhJdGVtOwogfTsKIAogdm9pZCBGbGV4Rm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dElu Rmxvd0NvbnRlbnRGb3JJbnRlZ3JhdGlvbihjb25zdCBDb25zdHJhaW50c0ZvckluRmxvd0NvbnRl bnQmIGNvbnN0cmFpbnRzKQogewogICAgIGF1dG8mIGZvcm1hdHRpbmdTdGF0ZSA9IHRoaXMtPmZv cm1hdHRpbmdTdGF0ZSgpOwogICAgIFZlY3RvcjxGbGV4SXRlbUxvZ2ljYWxCb3g+IGxvZ2ljYWxG bGV4SXRlbUxpc3Q7Ci0KKyAgICBWZWN0b3I8c3RkOjpwYWlyPGludCwgc2l6ZV90Pj4gZmxleEl0 ZW1zT3JkZXI7CisgICAgYXV0byBmbGV4SXRlbXNOZWVkUmVvcmRlcmluZyA9IGZhbHNlOwogCiAg ICAgYXV0byBjb252ZXJ0VmlzdWFsVG9Mb2dpY2FsID0gWyZdIHsKICAgICAgICAgLy8gRklYTUU6 IENvbnZlcnQgdmlzdWFsIChyb3cvY29sdW1uKSBkaXJlY3Rpb24gdG8gbG9naWNhbC4KICAgICAg ICAgYXV0byBkaXJlY3Rpb24gPSByb290KCkuc3R5bGUoKS5mbGV4RGlyZWN0aW9uKCk7CisgICAg ICAgIGF1dG8gcHJldmlvdXNPcmRlciA9IHN0ZDo6b3B0aW9uYWw8aW50PiB7IH07CisgICAgICAg IHNpemVfdCBjdXJyZW50RmxleEl0ZW1JbmRleCA9IDA7CiAKICAgICAgICAgZm9yIChhdXRvJiBm bGV4SXRlbSA6IGNoaWxkcmVuT2ZUeXBlPENvbnRhaW5lckJveD4ocm9vdCgpKSkgewogICAgICAg ICAgICAgYXV0byYgZmxleEl0ZW1HZW9tZXRyeSA9IGZvcm1hdHRpbmdTdGF0ZS5ib3hHZW9tZXRy eShmbGV4SXRlbSk7CkBAIC0xNTEsMTEgKzE1NCwzNCBAQCB2b2lkIEZsZXhGb3JtYXR0aW5nQ29u dGV4dDo6bGF5b3V0SW5GbG93Q29udGVudEZvckludGVncmF0aW9uKGNvbnN0IENvbnN0cmFpbnRz RgogICAgICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgICAgICAgICAgICAg IGJyZWFrOwogICAgICAgICAgICAgfQotICAgICAgICAgICAgbG9naWNhbEZsZXhJdGVtTGlzdC5h cHBlbmQoeyB7IGxvZ2ljYWxTaXplIH0sIGZsZXhJdGVtIH0pOworICAgICAgICAgICAgbG9naWNh bEZsZXhJdGVtTGlzdC5hcHBlbmQoeyB7IGxvZ2ljYWxTaXplIH0sICZmbGV4SXRlbSB9KTsKKwor ICAgICAgICAgICAgYXV0byBmbGV4SXRlbU9yZGVyID0gZmxleEl0ZW0uc3R5bGUoKS5vcmRlcigp OworICAgICAgICAgICAgZmxleEl0ZW1zTmVlZFJlb3JkZXJpbmcgPSBmbGV4SXRlbXNOZWVkUmVv cmRlcmluZyB8fCAgZmxleEl0ZW1PcmRlciAhPSBwcmV2aW91c09yZGVyLnZhbHVlX29yKDApOwor ICAgICAgICAgICAgcHJldmlvdXNPcmRlciA9IGZsZXhJdGVtT3JkZXI7CisgICAgICAgICAgICBm bGV4SXRlbXNPcmRlci5hcHBlbmQoeyBmbGV4SXRlbU9yZGVyLCBjdXJyZW50RmxleEl0ZW1JbmRl eCsrIH0pOwogICAgICAgICB9CiAgICAgfTsKICAgICBjb252ZXJ0VmlzdWFsVG9Mb2dpY2FsKCk7 CiAKKyAgICBhdXRvIHJlb3JkZXJGbGV4SXRlbXNJZkFwcGxpY2FibGUgPSBbJl0geworICAgICAg ICBpZiAoIWZsZXhJdGVtc05lZWRSZW9yZGVyaW5nKQorICAgICAgICAgICAgcmV0dXJuOworCisg ICAgICAgIHN0ZDo6c29ydChmbGV4SXRlbXNPcmRlci5iZWdpbigpLCBmbGV4SXRlbXNPcmRlci5l bmQoKSwgWyZdIChhdXRvJiBhLCBhdXRvJiBiKSB7CisgICAgICAgICAgICByZXR1cm4gYS5maXJz dCA8IGIuZmlyc3Q7CisgICAgICAgIH0pOworCisgICAgICAgIGF1dG8gbG9naWNhbEZsZXhJdGVt TGlzdENvcHkgPSBsb2dpY2FsRmxleEl0ZW1MaXN0OworICAgICAgICBmb3IgKHNpemVfdCBpbmRl eCA9IDA7IGluZGV4IDwgZmxleEl0ZW1zT3JkZXIuc2l6ZSgpOyArK2luZGV4KSB7CisgICAgICAg ICAgICBhdXRvIGZsZXhJdGVtT3JkZXIgPSBmbGV4SXRlbXNPcmRlcltpbmRleF07CisgICAgICAg ICAgICBpZiAoaW5kZXggPT0gZmxleEl0ZW1PcmRlci5zZWNvbmQpCisgICAgICAgICAgICAgICAg Y29udGludWU7CisgICAgICAgICAgICBsb2dpY2FsRmxleEl0ZW1MaXN0W2luZGV4XSA9IGxvZ2lj YWxGbGV4SXRlbUxpc3RDb3B5W2ZsZXhJdGVtT3JkZXIuc2Vjb25kXTsKKyAgICAgICAgfQorICAg IH07CisgICAgcmVvcmRlckZsZXhJdGVtc0lmQXBwbGljYWJsZSgpOworCiAgICAgYXV0byBsb2dp Y2FsTGVmdCA9IExheW91dFVuaXQgeyB9OwogICAgIGF1dG8gbG9naWNhbFRvcCA9IExheW91dFVu aXQgeyB9OwogCkBAIC0xNjksNyArMTk1LDcgQEAgdm9pZCBGbGV4Rm9ybWF0dGluZ0NvbnRleHQ6 OmxheW91dEluRmxvd0NvbnRlbnRGb3JJbnRlZ3JhdGlvbihjb25zdCBDb25zdHJhaW50c0YKICAg ICAgICAgYXV0byBsb2dpY2FsV2lkdGggPSBsb2dpY2FsRmxleEl0ZW1MaXN0Lmxhc3QoKS5yZWN0 LnJpZ2h0KCkgLSBsb2dpY2FsRmxleEl0ZW1MaXN0LmZpcnN0KCkucmVjdC5sZWZ0KCk7CiAgICAg ICAgIGF1dG8gZGlyZWN0aW9uID0gcm9vdCgpLnN0eWxlKCkuZmxleERpcmVjdGlvbigpOwogICAg ICAgICBmb3IgKGF1dG8mIGxvZ2ljYWxGbGV4SXRlbSA6IGxvZ2ljYWxGbGV4SXRlbUxpc3QpIHsK LSAgICAgICAgICAgIGF1dG8mIGZsZXhJdGVtR2VvbWV0cnkgPSBmb3JtYXR0aW5nU3RhdGUuYm94 R2VvbWV0cnkobG9naWNhbEZsZXhJdGVtLmZsZXhJdGVtKTsKKyAgICAgICAgICAgIGF1dG8mIGZs ZXhJdGVtR2VvbWV0cnkgPSBmb3JtYXR0aW5nU3RhdGUuYm94R2VvbWV0cnkoKmxvZ2ljYWxGbGV4 SXRlbS5mbGV4SXRlbSk7CiAgICAgICAgICAgICBhdXRvIHRvcExlZnQgPSBMYXlvdXRQb2ludCB7 IH07CiAKICAgICAgICAgICAgIHN3aXRjaCAoZGlyZWN0aW9uKSB7Cg== 459419 2022-05-16 06:09:31 -0700 2022-05-16 09:36:16 -0700 Patch bug-240442-20220516060930.patch text/plain 4257 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjk0MDg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWQzNTBhMWRhZmRkN2Yw MTkyYmM3OTUyMjYwNmQ1MTk0MWVhNTA0NS4uY2NkYWUxZGJmMGM5YjQxYzFiZDBkMzMzMjFlNTBm NjQyMDJhNjhiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIyLTA1LTE1ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtGRkNdIEFkZCBzdXBw b3J0IGZvciBsb2dpY2FsIG9yZGVyaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yNDA0NDIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBMZXQncyByZW9yZGVyIHRoZSBsb2dpY2FsRmxleEl0ZW1MaXN0IHdo ZW4gdGhlICdvcmRlcicgcHJvcGVydHkgaGFzIGEgbm9uLWluaXRpYWwgdmFsdWUuCisKKyAgICAg ICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxleEZvcm1hdHRpbmdDb250ZXh0 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6RmxleEZvcm1hdHRpbmdDb250ZXh0Ojps YXlvdXRJbkZsb3dDb250ZW50Rm9ySW50ZWdyYXRpb24pOgorCiAyMDIyLTA1LTE1ICBBbGFuIEJ1 anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtGRkNdIEFkZCAiZmxleC1k aXJlY3Rpb246IGNvbHVtbi1yZXZlcnNlIiBiYXNpYyB2aXN1YWwvbG9naWNhbCBjb252ZXJzaW9u CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2Zs ZXgvRmxleEZvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvZmxleC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IDVjZGMx MjRmZmYzMzExNGNiYTkwYTc3MmViMjBkMGYyODE4ODQ1ZjguLjI2M2E0NDdmMjA5OTMzMDgwNTMz ZTMxOTU2OWYzNTNkNmNmM2FiYjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4Rm9ybWF0dGlu Z0NvbnRleHQuY3BwCkBAIC0xMjEsMTggKzEyMSwyMSBAQCB2b2lkIEZsZXhGb3JtYXR0aW5nQ29u dGV4dDo6Y29tcHV0ZUludHJpbnNpY1dpZHRoQ29uc3RyYWludHNGb3JGbGV4SXRlbXMoKQogCiBz dHJ1Y3QgRmxleEl0ZW1Mb2dpY2FsQm94IHsKICAgICBGbGV4UmVjdCByZWN0OwotICAgIGNvbnN0 IENvbnRhaW5lckJveCYgZmxleEl0ZW07CisgICAgQ2hlY2tlZFB0cjxjb25zdCBDb250YWluZXJC b3g+IGZsZXhJdGVtOwogfTsKIAogdm9pZCBGbGV4Rm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dElu Rmxvd0NvbnRlbnRGb3JJbnRlZ3JhdGlvbihjb25zdCBDb25zdHJhaW50c0ZvckluRmxvd0NvbnRl bnQmIGNvbnN0cmFpbnRzKQogewogICAgIGF1dG8mIGZvcm1hdHRpbmdTdGF0ZSA9IHRoaXMtPmZv cm1hdHRpbmdTdGF0ZSgpOwogICAgIFZlY3RvcjxGbGV4SXRlbUxvZ2ljYWxCb3g+IGxvZ2ljYWxG bGV4SXRlbUxpc3Q7Ci0KKyAgICBWZWN0b3I8c3RkOjpwYWlyPGludCwgc2l6ZV90Pj4gZmxleEl0 ZW1zT3JkZXI7CisgICAgYXV0byBmbGV4SXRlbXNOZWVkUmVvcmRlcmluZyA9IGZhbHNlOwogCiAg ICAgYXV0byBjb252ZXJ0VmlzdWFsVG9Mb2dpY2FsID0gWyZdIHsKICAgICAgICAgLy8gRklYTUU6 IENvbnZlcnQgdmlzdWFsIChyb3cvY29sdW1uKSBkaXJlY3Rpb24gdG8gbG9naWNhbC4KICAgICAg ICAgYXV0byBkaXJlY3Rpb24gPSByb290KCkuc3R5bGUoKS5mbGV4RGlyZWN0aW9uKCk7CisgICAg ICAgIGF1dG8gcHJldmlvdXNPcmRlciA9IHN0ZDo6b3B0aW9uYWw8aW50PiB7IH07CisgICAgICAg IHNpemVfdCBjdXJyZW50RmxleEl0ZW1JbmRleCA9IDA7CiAKICAgICAgICAgZm9yIChhdXRvJiBm bGV4SXRlbSA6IGNoaWxkcmVuT2ZUeXBlPENvbnRhaW5lckJveD4ocm9vdCgpKSkgewogICAgICAg ICAgICAgYXV0byYgZmxleEl0ZW1HZW9tZXRyeSA9IGZvcm1hdHRpbmdTdGF0ZS5ib3hHZW9tZXRy eShmbGV4SXRlbSk7CkBAIC0xNTEsMTEgKzE1NCwzNCBAQCB2b2lkIEZsZXhGb3JtYXR0aW5nQ29u dGV4dDo6bGF5b3V0SW5GbG93Q29udGVudEZvckludGVncmF0aW9uKGNvbnN0IENvbnN0cmFpbnRz RgogICAgICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgICAgICAgICAgICAg IGJyZWFrOwogICAgICAgICAgICAgfQotICAgICAgICAgICAgbG9naWNhbEZsZXhJdGVtTGlzdC5h cHBlbmQoeyB7IGxvZ2ljYWxTaXplIH0sIGZsZXhJdGVtIH0pOworICAgICAgICAgICAgbG9naWNh bEZsZXhJdGVtTGlzdC5hcHBlbmQoeyB7IGxvZ2ljYWxTaXplIH0sICZmbGV4SXRlbSB9KTsKKwor ICAgICAgICAgICAgYXV0byBmbGV4SXRlbU9yZGVyID0gZmxleEl0ZW0uc3R5bGUoKS5vcmRlcigp OworICAgICAgICAgICAgZmxleEl0ZW1zTmVlZFJlb3JkZXJpbmcgPSBmbGV4SXRlbXNOZWVkUmVv cmRlcmluZyB8fCBmbGV4SXRlbU9yZGVyICE9IHByZXZpb3VzT3JkZXIudmFsdWVfb3IoMCk7Cisg ICAgICAgICAgICBwcmV2aW91c09yZGVyID0gZmxleEl0ZW1PcmRlcjsKKyAgICAgICAgICAgIGZs ZXhJdGVtc09yZGVyLmFwcGVuZCh7IGZsZXhJdGVtT3JkZXIsIGN1cnJlbnRGbGV4SXRlbUluZGV4 KysgfSk7CiAgICAgICAgIH0KICAgICB9OwogICAgIGNvbnZlcnRWaXN1YWxUb0xvZ2ljYWwoKTsK IAorICAgIGF1dG8gcmVvcmRlckZsZXhJdGVtc0lmQXBwbGljYWJsZSA9IFsmXSB7CisgICAgICAg IGlmICghZmxleEl0ZW1zTmVlZFJlb3JkZXJpbmcpCisgICAgICAgICAgICByZXR1cm47CisKKyAg ICAgICAgc3RkOjpzb3J0KGZsZXhJdGVtc09yZGVyLmJlZ2luKCksIGZsZXhJdGVtc09yZGVyLmVu ZCgpLCBbJl0gKGF1dG8mIGEsIGF1dG8mIGIpIHsKKyAgICAgICAgICAgIHJldHVybiBhLmZpcnN0 IDwgYi5maXJzdDsKKyAgICAgICAgfSk7CisKKyAgICAgICAgYXV0byBsb2dpY2FsRmxleEl0ZW1M aXN0Q29weSA9IGxvZ2ljYWxGbGV4SXRlbUxpc3Q7CisgICAgICAgIGZvciAoc2l6ZV90IGluZGV4 ID0gMDsgaW5kZXggPCBmbGV4SXRlbXNPcmRlci5zaXplKCk7ICsraW5kZXgpIHsKKyAgICAgICAg ICAgIGF1dG8gZmxleEl0ZW1PcmRlciA9IGZsZXhJdGVtc09yZGVyW2luZGV4XTsKKyAgICAgICAg ICAgIGlmIChpbmRleCA9PSBmbGV4SXRlbU9yZGVyLnNlY29uZCkKKyAgICAgICAgICAgICAgICBj b250aW51ZTsKKyAgICAgICAgICAgIGxvZ2ljYWxGbGV4SXRlbUxpc3RbaW5kZXhdID0gbG9naWNh bEZsZXhJdGVtTGlzdENvcHlbZmxleEl0ZW1PcmRlci5zZWNvbmRdOworICAgICAgICB9CisgICAg fTsKKyAgICByZW9yZGVyRmxleEl0ZW1zSWZBcHBsaWNhYmxlKCk7CisKICAgICBhdXRvIGxvZ2lj YWxMZWZ0ID0gTGF5b3V0VW5pdCB7IH07CiAgICAgYXV0byBsb2dpY2FsVG9wID0gTGF5b3V0VW5p dCB7IH07CiAKQEAgLTE2OSw3ICsxOTUsNyBAQCB2b2lkIEZsZXhGb3JtYXR0aW5nQ29udGV4dDo6 bGF5b3V0SW5GbG93Q29udGVudEZvckludGVncmF0aW9uKGNvbnN0IENvbnN0cmFpbnRzRgogICAg ICAgICBhdXRvIGxvZ2ljYWxXaWR0aCA9IGxvZ2ljYWxGbGV4SXRlbUxpc3QubGFzdCgpLnJlY3Qu cmlnaHQoKSAtIGxvZ2ljYWxGbGV4SXRlbUxpc3QuZmlyc3QoKS5yZWN0LmxlZnQoKTsKICAgICAg ICAgYXV0byBkaXJlY3Rpb24gPSByb290KCkuc3R5bGUoKS5mbGV4RGlyZWN0aW9uKCk7CiAgICAg ICAgIGZvciAoYXV0byYgbG9naWNhbEZsZXhJdGVtIDogbG9naWNhbEZsZXhJdGVtTGlzdCkgewot ICAgICAgICAgICAgYXV0byYgZmxleEl0ZW1HZW9tZXRyeSA9IGZvcm1hdHRpbmdTdGF0ZS5ib3hH ZW9tZXRyeShsb2dpY2FsRmxleEl0ZW0uZmxleEl0ZW0pOworICAgICAgICAgICAgYXV0byYgZmxl eEl0ZW1HZW9tZXRyeSA9IGZvcm1hdHRpbmdTdGF0ZS5ib3hHZW9tZXRyeSgqbG9naWNhbEZsZXhJ dGVtLmZsZXhJdGVtKTsKICAgICAgICAgICAgIGF1dG8gdG9wTGVmdCA9IExheW91dFBvaW50IHsg fTsKIAogICAgICAgICAgICAgc3dpdGNoIChkaXJlY3Rpb24pIHsK 459429 2022-05-16 09:36:18 -0700 2022-05-16 10:38:41 -0700 Patch bug-240442-20220516093617.patch text/plain 3806 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjk0MDg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWQzNTBhMWRhZmRkN2Yw MTkyYmM3OTUyMjYwNmQ1MTk0MWVhNTA0NS4uY2NkYWUxZGJmMGM5YjQxYzFiZDBkMzMzMjFlNTBm NjQyMDJhNjhiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIyLTA1LTE1ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtGRkNdIEFkZCBzdXBw b3J0IGZvciBsb2dpY2FsIG9yZGVyaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yNDA0NDIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBMZXQncyByZW9yZGVyIHRoZSBsb2dpY2FsRmxleEl0ZW1MaXN0IHdo ZW4gdGhlICdvcmRlcicgcHJvcGVydHkgaGFzIGEgbm9uLWluaXRpYWwgdmFsdWUuCisKKyAgICAg ICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxleEZvcm1hdHRpbmdDb250ZXh0 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6RmxleEZvcm1hdHRpbmdDb250ZXh0Ojps YXlvdXRJbkZsb3dDb250ZW50Rm9ySW50ZWdyYXRpb24pOgorCiAyMDIyLTA1LTE1ICBBbGFuIEJ1 anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtGRkNdIEFkZCAiZmxleC1k aXJlY3Rpb246IGNvbHVtbi1yZXZlcnNlIiBiYXNpYyB2aXN1YWwvbG9naWNhbCBjb252ZXJzaW9u CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2Zs ZXgvRmxleEZvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvZmxleC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IDVjZGMx MjRmZmYzMzExNGNiYTkwYTc3MmViMjBkMGYyODE4ODQ1ZjguLjYxYjJiZWZmMmM2ZDY4NmMzZTYx MGQ3MzFhYmRkYjQ4MTA2ZTY3YjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4Rm9ybWF0dGlu Z0NvbnRleHQuY3BwCkBAIC0xMjEsMTggKzEyMSwyMCBAQCB2b2lkIEZsZXhGb3JtYXR0aW5nQ29u dGV4dDo6Y29tcHV0ZUludHJpbnNpY1dpZHRoQ29uc3RyYWludHNGb3JGbGV4SXRlbXMoKQogCiBz dHJ1Y3QgRmxleEl0ZW1Mb2dpY2FsQm94IHsKICAgICBGbGV4UmVjdCByZWN0OwotICAgIGNvbnN0 IENvbnRhaW5lckJveCYgZmxleEl0ZW07CisgICAgaW50IGxvZ2ljYWxPcmRlciB7IDAgfTsKKyAg ICBDaGVja2VkUHRyPGNvbnN0IENvbnRhaW5lckJveD4gZmxleEl0ZW07CiB9OwogCiB2b2lkIEZs ZXhGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0SW5GbG93Q29udGVudEZvckludGVncmF0aW9uKGNv bnN0IENvbnN0cmFpbnRzRm9ySW5GbG93Q29udGVudCYgY29uc3RyYWludHMpCiB7CiAgICAgYXV0 byYgZm9ybWF0dGluZ1N0YXRlID0gdGhpcy0+Zm9ybWF0dGluZ1N0YXRlKCk7CiAgICAgVmVjdG9y PEZsZXhJdGVtTG9naWNhbEJveD4gbG9naWNhbEZsZXhJdGVtTGlzdDsKLQorICAgIGF1dG8gZmxl eEl0ZW1zTmVlZFJlb3JkZXJpbmcgPSBmYWxzZTsKIAogICAgIGF1dG8gY29udmVydFZpc3VhbFRv TG9naWNhbCA9IFsmXSB7CiAgICAgICAgIC8vIEZJWE1FOiBDb252ZXJ0IHZpc3VhbCAocm93L2Nv bHVtbikgZGlyZWN0aW9uIHRvIGxvZ2ljYWwuCiAgICAgICAgIGF1dG8gZGlyZWN0aW9uID0gcm9v dCgpLnN0eWxlKCkuZmxleERpcmVjdGlvbigpOworICAgICAgICBhdXRvIHByZXZpb3VzTG9naWNh bE9yZGVyID0gc3RkOjpvcHRpb25hbDxpbnQ+IHsgfTsKIAogICAgICAgICBmb3IgKGF1dG8mIGZs ZXhJdGVtIDogY2hpbGRyZW5PZlR5cGU8Q29udGFpbmVyQm94Pihyb290KCkpKSB7CiAgICAgICAg ICAgICBhdXRvJiBmbGV4SXRlbUdlb21ldHJ5ID0gZm9ybWF0dGluZ1N0YXRlLmJveEdlb21ldHJ5 KGZsZXhJdGVtKTsKQEAgLTE1MSwxMSArMTUzLDI2IEBAIHZvaWQgRmxleEZvcm1hdHRpbmdDb250 ZXh0OjpsYXlvdXRJbkZsb3dDb250ZW50Rm9ySW50ZWdyYXRpb24oY29uc3QgQ29uc3RyYWludHNG CiAgICAgICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAgICAgICAgICAg YnJlYWs7CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICBsb2dpY2FsRmxleEl0ZW1MaXN0LmFw cGVuZCh7IHsgbG9naWNhbFNpemUgfSwgZmxleEl0ZW0gfSk7CisgICAgICAgICAgICBhdXRvIGZs ZXhJdGVtT3JkZXIgPSBmbGV4SXRlbS5zdHlsZSgpLm9yZGVyKCk7CisgICAgICAgICAgICBmbGV4 SXRlbXNOZWVkUmVvcmRlcmluZyA9IGZsZXhJdGVtc05lZWRSZW9yZGVyaW5nIHx8IGZsZXhJdGVt T3JkZXIgIT0gcHJldmlvdXNMb2dpY2FsT3JkZXIudmFsdWVfb3IoMCk7CisgICAgICAgICAgICBw cmV2aW91c0xvZ2ljYWxPcmRlciA9IGZsZXhJdGVtT3JkZXI7CisKKyAgICAgICAgICAgIGxvZ2lj YWxGbGV4SXRlbUxpc3QuYXBwZW5kKHsgeyBsb2dpY2FsU2l6ZSB9LCBmbGV4SXRlbU9yZGVyLCAm ZmxleEl0ZW0gfSk7CisKICAgICAgICAgfQogICAgIH07CiAgICAgY29udmVydFZpc3VhbFRvTG9n aWNhbCgpOwogCisgICAgYXV0byByZW9yZGVyRmxleEl0ZW1zSWZBcHBsaWNhYmxlID0gWyZdIHsK KyAgICAgICAgaWYgKCFmbGV4SXRlbXNOZWVkUmVvcmRlcmluZykKKyAgICAgICAgICAgIHJldHVy bjsKKworICAgICAgICBzdGQ6OnNvcnQobG9naWNhbEZsZXhJdGVtTGlzdC5iZWdpbigpLCBsb2dp Y2FsRmxleEl0ZW1MaXN0LmVuZCgpLCBbJl0gKGF1dG8mIGEsIGF1dG8mIGIpIHsKKyAgICAgICAg ICAgIHJldHVybiBhLmxvZ2ljYWxPcmRlciA8IGIubG9naWNhbE9yZGVyOworICAgICAgICB9KTsK KyAgICB9OworICAgIHJlb3JkZXJGbGV4SXRlbXNJZkFwcGxpY2FibGUoKTsKKwogICAgIGF1dG8g bG9naWNhbExlZnQgPSBMYXlvdXRVbml0IHsgfTsKICAgICBhdXRvIGxvZ2ljYWxUb3AgPSBMYXlv dXRVbml0IHsgfTsKIApAQCAtMTY5LDcgKzE4Niw3IEBAIHZvaWQgRmxleEZvcm1hdHRpbmdDb250 ZXh0OjpsYXlvdXRJbkZsb3dDb250ZW50Rm9ySW50ZWdyYXRpb24oY29uc3QgQ29uc3RyYWludHNG CiAgICAgICAgIGF1dG8gbG9naWNhbFdpZHRoID0gbG9naWNhbEZsZXhJdGVtTGlzdC5sYXN0KCku cmVjdC5yaWdodCgpIC0gbG9naWNhbEZsZXhJdGVtTGlzdC5maXJzdCgpLnJlY3QubGVmdCgpOwog ICAgICAgICBhdXRvIGRpcmVjdGlvbiA9IHJvb3QoKS5zdHlsZSgpLmZsZXhEaXJlY3Rpb24oKTsK ICAgICAgICAgZm9yIChhdXRvJiBsb2dpY2FsRmxleEl0ZW0gOiBsb2dpY2FsRmxleEl0ZW1MaXN0 KSB7Ci0gICAgICAgICAgICBhdXRvJiBmbGV4SXRlbUdlb21ldHJ5ID0gZm9ybWF0dGluZ1N0YXRl LmJveEdlb21ldHJ5KGxvZ2ljYWxGbGV4SXRlbS5mbGV4SXRlbSk7CisgICAgICAgICAgICBhdXRv JiBmbGV4SXRlbUdlb21ldHJ5ID0gZm9ybWF0dGluZ1N0YXRlLmJveEdlb21ldHJ5KCpsb2dpY2Fs RmxleEl0ZW0uZmxleEl0ZW0pOwogICAgICAgICAgICAgYXV0byB0b3BMZWZ0ID0gTGF5b3V0UG9p bnQgeyB9OwogCiAgICAgICAgICAgICBzd2l0Y2ggKGRpcmVjdGlvbikgewo= 459432 2022-05-16 09:53:27 -0700 2022-05-16 10:36:53 -0700 Patch bug-240442-20220516095327.patch text/plain 3813 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjk0MDg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWQzNTBhMWRhZmRkN2Yw MTkyYmM3OTUyMjYwNmQ1MTk0MWVhNTA0NS4uMjE0YTJhM2E0MmQwM2NmYzczZDNlMzY2ZTg0NzFk YWM3NmM0ZGE2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIyLTA1LTE1ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtGRkNdIEFkZCBzdXBw b3J0IGZvciBsb2dpY2FsIG9yZGVyaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yNDA0NDIKKworICAgICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2 aXN0by4KKworICAgICAgICBMZXQncyByZW9yZGVyIHRoZSBsb2dpY2FsRmxleEl0ZW1MaXN0IHdo ZW4gdGhlICdvcmRlcicgcHJvcGVydHkgaGFzIGEgbm9uLWluaXRpYWwgdmFsdWUuCisKKyAgICAg ICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxleEZvcm1hdHRpbmdDb250ZXh0 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6RmxleEZvcm1hdHRpbmdDb250ZXh0Ojps YXlvdXRJbkZsb3dDb250ZW50Rm9ySW50ZWdyYXRpb24pOgorCiAyMDIyLTA1LTE1ICBBbGFuIEJ1 anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtGRkNdIEFkZCAiZmxleC1k aXJlY3Rpb246IGNvbHVtbi1yZXZlcnNlIiBiYXNpYyB2aXN1YWwvbG9naWNhbCBjb252ZXJzaW9u CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2Zs ZXgvRmxleEZvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvZmxleC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IDVjZGMx MjRmZmYzMzExNGNiYTkwYTc3MmViMjBkMGYyODE4ODQ1ZjguLjFmMGYzNzFiNzA4NjUzODY0YjM2 YTlkMjQ4YzNiYTUyOTU5NmU0YmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4Rm9ybWF0dGlu Z0NvbnRleHQuY3BwCkBAIC0xMjEsMTggKzEyMSwyMCBAQCB2b2lkIEZsZXhGb3JtYXR0aW5nQ29u dGV4dDo6Y29tcHV0ZUludHJpbnNpY1dpZHRoQ29uc3RyYWludHNGb3JGbGV4SXRlbXMoKQogCiBz dHJ1Y3QgRmxleEl0ZW1Mb2dpY2FsQm94IHsKICAgICBGbGV4UmVjdCByZWN0OwotICAgIGNvbnN0 IENvbnRhaW5lckJveCYgZmxleEl0ZW07CisgICAgaW50IGxvZ2ljYWxPcmRlciB7IDAgfTsKKyAg ICBDaGVja2VkUHRyPGNvbnN0IENvbnRhaW5lckJveD4gZmxleEl0ZW07CiB9OwogCiB2b2lkIEZs ZXhGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0SW5GbG93Q29udGVudEZvckludGVncmF0aW9uKGNv bnN0IENvbnN0cmFpbnRzRm9ySW5GbG93Q29udGVudCYgY29uc3RyYWludHMpCiB7CiAgICAgYXV0 byYgZm9ybWF0dGluZ1N0YXRlID0gdGhpcy0+Zm9ybWF0dGluZ1N0YXRlKCk7CiAgICAgVmVjdG9y PEZsZXhJdGVtTG9naWNhbEJveD4gbG9naWNhbEZsZXhJdGVtTGlzdDsKLQorICAgIGF1dG8gZmxl eEl0ZW1zTmVlZFJlb3JkZXJpbmcgPSBmYWxzZTsKIAogICAgIGF1dG8gY29udmVydFZpc3VhbFRv TG9naWNhbCA9IFsmXSB7CiAgICAgICAgIC8vIEZJWE1FOiBDb252ZXJ0IHZpc3VhbCAocm93L2Nv bHVtbikgZGlyZWN0aW9uIHRvIGxvZ2ljYWwuCiAgICAgICAgIGF1dG8gZGlyZWN0aW9uID0gcm9v dCgpLnN0eWxlKCkuZmxleERpcmVjdGlvbigpOworICAgICAgICBhdXRvIHByZXZpb3VzTG9naWNh bE9yZGVyID0gc3RkOjpvcHRpb25hbDxpbnQ+IHsgfTsKIAogICAgICAgICBmb3IgKGF1dG8mIGZs ZXhJdGVtIDogY2hpbGRyZW5PZlR5cGU8Q29udGFpbmVyQm94Pihyb290KCkpKSB7CiAgICAgICAg ICAgICBhdXRvJiBmbGV4SXRlbUdlb21ldHJ5ID0gZm9ybWF0dGluZ1N0YXRlLmJveEdlb21ldHJ5 KGZsZXhJdGVtKTsKQEAgLTE1MSwxMSArMTUzLDI2IEBAIHZvaWQgRmxleEZvcm1hdHRpbmdDb250 ZXh0OjpsYXlvdXRJbkZsb3dDb250ZW50Rm9ySW50ZWdyYXRpb24oY29uc3QgQ29uc3RyYWludHNG CiAgICAgICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAgICAgICAgICAg YnJlYWs7CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICBsb2dpY2FsRmxleEl0ZW1MaXN0LmFw cGVuZCh7IHsgbG9naWNhbFNpemUgfSwgZmxleEl0ZW0gfSk7CisgICAgICAgICAgICBhdXRvIGZs ZXhJdGVtT3JkZXIgPSBmbGV4SXRlbS5zdHlsZSgpLm9yZGVyKCk7CisgICAgICAgICAgICBmbGV4 SXRlbXNOZWVkUmVvcmRlcmluZyA9IGZsZXhJdGVtc05lZWRSZW9yZGVyaW5nIHx8IGZsZXhJdGVt T3JkZXIgIT0gcHJldmlvdXNMb2dpY2FsT3JkZXIudmFsdWVfb3IoMCk7CisgICAgICAgICAgICBw cmV2aW91c0xvZ2ljYWxPcmRlciA9IGZsZXhJdGVtT3JkZXI7CisKKyAgICAgICAgICAgIGxvZ2lj YWxGbGV4SXRlbUxpc3QuYXBwZW5kKHsgeyBsb2dpY2FsU2l6ZSB9LCBmbGV4SXRlbU9yZGVyLCAm ZmxleEl0ZW0gfSk7CisKICAgICAgICAgfQogICAgIH07CiAgICAgY29udmVydFZpc3VhbFRvTG9n aWNhbCgpOwogCisgICAgYXV0byByZW9yZGVyRmxleEl0ZW1zSWZBcHBsaWNhYmxlID0gWyZdIHsK KyAgICAgICAgaWYgKCFmbGV4SXRlbXNOZWVkUmVvcmRlcmluZykKKyAgICAgICAgICAgIHJldHVy bjsKKworICAgICAgICBzdGQ6OnN0YWJsZV9zb3J0KGxvZ2ljYWxGbGV4SXRlbUxpc3QuYmVnaW4o KSwgbG9naWNhbEZsZXhJdGVtTGlzdC5lbmQoKSwgWyZdIChhdXRvJiBhLCBhdXRvJiBiKSB7Cisg ICAgICAgICAgICByZXR1cm4gYS5sb2dpY2FsT3JkZXIgPCBiLmxvZ2ljYWxPcmRlcjsKKyAgICAg ICAgfSk7CisgICAgfTsKKyAgICByZW9yZGVyRmxleEl0ZW1zSWZBcHBsaWNhYmxlKCk7CisKICAg ICBhdXRvIGxvZ2ljYWxMZWZ0ID0gTGF5b3V0VW5pdCB7IH07CiAgICAgYXV0byBsb2dpY2FsVG9w ID0gTGF5b3V0VW5pdCB7IH07CiAKQEAgLTE2OSw3ICsxODYsNyBAQCB2b2lkIEZsZXhGb3JtYXR0 aW5nQ29udGV4dDo6bGF5b3V0SW5GbG93Q29udGVudEZvckludGVncmF0aW9uKGNvbnN0IENvbnN0 cmFpbnRzRgogICAgICAgICBhdXRvIGxvZ2ljYWxXaWR0aCA9IGxvZ2ljYWxGbGV4SXRlbUxpc3Qu bGFzdCgpLnJlY3QucmlnaHQoKSAtIGxvZ2ljYWxGbGV4SXRlbUxpc3QuZmlyc3QoKS5yZWN0Lmxl ZnQoKTsKICAgICAgICAgYXV0byBkaXJlY3Rpb24gPSByb290KCkuc3R5bGUoKS5mbGV4RGlyZWN0 aW9uKCk7CiAgICAgICAgIGZvciAoYXV0byYgbG9naWNhbEZsZXhJdGVtIDogbG9naWNhbEZsZXhJ dGVtTGlzdCkgewotICAgICAgICAgICAgYXV0byYgZmxleEl0ZW1HZW9tZXRyeSA9IGZvcm1hdHRp bmdTdGF0ZS5ib3hHZW9tZXRyeShsb2dpY2FsRmxleEl0ZW0uZmxleEl0ZW0pOworICAgICAgICAg ICAgYXV0byYgZmxleEl0ZW1HZW9tZXRyeSA9IGZvcm1hdHRpbmdTdGF0ZS5ib3hHZW9tZXRyeSgq bG9naWNhbEZsZXhJdGVtLmZsZXhJdGVtKTsKICAgICAgICAgICAgIGF1dG8gdG9wTGVmdCA9IExh eW91dFBvaW50IHsgfTsKIAogICAgICAgICAgICAgc3dpdGNoIChkaXJlY3Rpb24pIHsK