241310 2022-06-04 16:26:53 -0700 [LFC][FFC] FlexLayout should only take logical values 2022-06-05 22:58:06 -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 1874156 0 zalan 2022-06-04 16:26:53 -0700 ssia 1874157 1 460031 zalan 2022-06-04 16:29:29 -0700 Created attachment 460031 Patch 1874191 2 460040 zalan 2022-06-05 10:20:32 -0700 Created attachment 460040 [fast-cq]Patch 1874192 3 460040 koivisto 2022-06-05 12:16:15 -0700 Comment on attachment 460040 [fast-cq]Patch View in context: https://bugs.webkit.org/attachment.cgi?id=460040&action=review > Source/WebCore/layout/formattingContexts/flex/FlexLayout.h:84 > + struct LogicalConstraints { > + std::optional<LayoutUnit> verticalSpace; > + std::optional<LayoutUnit> horizontalSpace; > + }; nice 1874228 4 ews-feeder 2022-06-05 20:51:33 -0700 Committed r295276 (251322@main): <https://commits.webkit.org/251322@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 460040. 1874229 5 webkit-bug-importer 2022-06-05 20:52:13 -0700 <rdar://problem/94416379> 460031 2022-06-04 16:29:29 -0700 2022-06-05 10:20:31 -0700 Patch bug-241310-20220604162928.patch text/plain 9873 zalan RnJvbSBjYjMzZjI2NDFkN2RiMjlmMjM3NTk4NDVhNTVlY2RmMzJiNjZiNjZhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJ1anRhcyA8emFsYW5AYXBwbGUuY29tPgpEYXRlOiBT YXQsIDQgSnVuIDIwMjIgMTY6Mjc6MDQgLTA3MDAKU3ViamVjdDogW1BBVENIXSBbTEZDXVtGRkNd IEZsZXhMYXlvdXQgc2hvdWxkIG9ubHkgdGFrZSBsb2dpY2FsIHZhbHVlcwogaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0MTMxMAoKUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCgpUdXJuIENvbnN0cmFpbnRzRm9yRmxleENvbnRlbnQgaW50byBMb2dpY2FsQ29uc3Ry YWludHMuCgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9G bGV4Rm9ybWF0dGluZ0NvbnRleHQuY3BwOgooV2ViQ29yZTo6TGF5b3V0OjpGbGV4Rm9ybWF0dGlu Z0NvbnRleHQ6OmxheW91dEluRmxvd0NvbnRlbnRGb3JJbnRlZ3JhdGlvbik6CiogU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4 dC5oOgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4 TGF5b3V0LmNwcDoKKFdlYkNvcmU6OkxheW91dDo6RmxleExheW91dDo6Y29tcHV0ZUF2YWlsYWJs ZUxvZ2ljYWxWZXJ0aWNhbFNwYWNlIGNvbnN0KToKKFdlYkNvcmU6OkxheW91dDo6RmxleExheW91 dDo6Y29tcHV0ZUF2YWlsYWJsZUxvZ2ljYWxIb3Jpem9udGFsU3BhY2UgY29uc3QpOgooV2ViQ29y ZTo6TGF5b3V0OjpGbGV4TGF5b3V0OjpsYXlvdXQpOgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4TGF5b3V0Lmg6Ci0tLQogLi4uL2ZsZXgvRmxleEZv cm1hdHRpbmdDb250ZXh0LmNwcCAgICAgICAgICAgIHwgMTggKysrKysrKystLS0KIC4uLi9mbGV4 L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5oICAgICAgICAgICAgICB8ICAyICstCiAuLi4vZm9ybWF0 dGluZ0NvbnRleHRzL2ZsZXgvRmxleExheW91dC5jcHAgICAgfCAzMSArKysrKy0tLS0tLS0tLS0t LS0tCiAuLi4vZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxleExheW91dC5oICAgICAgfCAxMyAr KysrKy0tLQogNCBmaWxlcyBjaGFuZ2VkLCAzMSBpbnNlcnRpb25zKCspLCAzMyBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2ZsZXgvRmxleEZvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IDFk NGJlYmE3NDM3Ny4uNDk4YTI4NDlkMmI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxleEZvcm1hdHRpbmdDb250ZXh0LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxleEZvcm1h dHRpbmdDb250ZXh0LmNwcApAQCAtMjg1LDEzICsyODUsMjEgQEAgdm9pZCBGbGV4Rm9ybWF0dGlu Z0NvbnRleHQ6OnNldEZsZXhJdGVtc0dlb21ldHJ5KGNvbnN0IEZsZXhMYXlvdXQ6OkxvZ2ljYWxG bGV4SXQKICAgICB9CiB9CiAKLXZvaWQgRmxleEZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRJbkZs b3dDb250ZW50Rm9ySW50ZWdyYXRpb24oY29uc3QgQ29uc3RyYWludHNGb3JJbkZsb3dDb250ZW50 JiBjb25zdHJhaW50cykKK3ZvaWQgRmxleEZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRJbkZsb3dD b250ZW50Rm9ySW50ZWdyYXRpb24oY29uc3QgQ29uc3RyYWludHNGb3JGbGV4Q29udGVudCYgY29u c3RyYWludHMpCiB7Ci0gICAgYXV0byBmbGV4Q29uc3RyYWludHMgPSBkb3duY2FzdDxDb25zdHJh aW50c0ZvckZsZXhDb250ZW50Pihjb25zdHJhaW50cyk7Ci0gICAgYXV0byBsb2dpY2FsRmxleEl0 ZW1zID0gY29udmVydEZsZXhJdGVtc1RvTG9naWNhbFNwYWNlKGZsZXhDb25zdHJhaW50cyk7Cisg ICAgYXV0byBsb2dpY2FsRmxleEl0ZW1zID0gY29udmVydEZsZXhJdGVtc1RvTG9naWNhbFNwYWNl KGNvbnN0cmFpbnRzKTsKICAgICBhdXRvIGZsZXhMYXlvdXQgPSBGbGV4TGF5b3V0IHsgcm9vdCgp LnN0eWxlKCkgfTsKLSAgICBmbGV4TGF5b3V0LmxheW91dChmbGV4Q29uc3RyYWludHMsIGxvZ2lj YWxGbGV4SXRlbXMpOwotICAgIHNldEZsZXhJdGVtc0dlb21ldHJ5KGxvZ2ljYWxGbGV4SXRlbXMs IGZsZXhDb25zdHJhaW50cyk7CisKKyAgICBhdXRvIGxvZ2ljYWxGbGV4Q29uc3RyYWludHMgPSBb Jl0geworICAgICAgICBhdXRvIGZsZXhEaXJlY3Rpb24gPSByb290KCkuc3R5bGUoKS5mbGV4RGly ZWN0aW9uKCk7CisgICAgICAgIGF1dG8gZmxleERpcmVjdGlvbklzSW5saW5lQXhpcyA9IGZsZXhE aXJlY3Rpb24gPT0gRmxleERpcmVjdGlvbjo6Um93IHx8IGZsZXhEaXJlY3Rpb24gPT0gRmxleERp cmVjdGlvbjo6Um93UmV2ZXJzZTsKKyAgICAgICAgaWYgKGZsZXhEaXJlY3Rpb25Jc0lubGluZUF4 aXMpCisgICAgICAgICAgICByZXR1cm4gRmxleExheW91dDo6TG9naWNhbENvbnN0cmFpbnRzIHsg Y29uc3RyYWludHMubG9naWNhbFRvcCgpLCBjb25zdHJhaW50cy5hdmFpbGFibGVWZXJ0aWNhbFNw YWNlKCksIGNvbnN0cmFpbnRzLmhvcml6b250YWwoKS5sb2dpY2FsV2lkdGggfTsKKyAgICAgICAg cmV0dXJuIEZsZXhMYXlvdXQ6OkxvZ2ljYWxDb25zdHJhaW50cyB7IGNvbnN0cmFpbnRzLmxvZ2lj YWxUb3AoKSwgY29uc3RyYWludHMuaG9yaXpvbnRhbCgpLmxvZ2ljYWxXaWR0aCwgY29uc3RyYWlu dHMuYXZhaWxhYmxlVmVydGljYWxTcGFjZSgpIH07CisgICAgfTsKKworICAgIGZsZXhMYXlvdXQu bGF5b3V0KGxvZ2ljYWxGbGV4Q29uc3RyYWludHMoKSwgbG9naWNhbEZsZXhJdGVtcyk7CisgICAg c2V0RmxleEl0ZW1zR2VvbWV0cnkobG9naWNhbEZsZXhJdGVtcywgY29uc3RyYWludHMpOwogfQog CiBJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzIEZsZXhGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0 ZWRJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzRm9ySW50ZWdyYXRpb24oKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0 aW5nQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9m bGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5oCmluZGV4IDFmMTc2M2JmMDJiYS4uNTQ3YzdhZjhh YTBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2ZsZXgvRmxleEZvcm1hdHRpbmdDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5oCkBAIC01MSw3 ICs1MSw3IEBAIHB1YmxpYzoKICAgICBjb25zdCBGbGV4Rm9ybWF0dGluZ0dlb21ldHJ5JiBmb3Jt YXR0aW5nR2VvbWV0cnkoKSBjb25zdCBmaW5hbCB7IHJldHVybiBtX2ZsZXhGb3JtYXR0aW5nR2Vv bWV0cnk7IH0KICAgICBjb25zdCBGb3JtYXR0aW5nUXVpcmtzJiBmb3JtYXR0aW5nUXVpcmtzKCkg Y29uc3QgZmluYWwgeyByZXR1cm4gbV9mbGV4Rm9ybWF0dGluZ1F1aXJrczsgfQogCi0gICAgdm9p ZCBsYXlvdXRJbkZsb3dDb250ZW50Rm9ySW50ZWdyYXRpb24oY29uc3QgQ29uc3RyYWludHNGb3JJ bkZsb3dDb250ZW50Jik7CisgICAgdm9pZCBsYXlvdXRJbkZsb3dDb250ZW50Rm9ySW50ZWdyYXRp b24oY29uc3QgQ29uc3RyYWludHNGb3JGbGV4Q29udGVudCYpOwogICAgIEludHJpbnNpY1dpZHRo Q29uc3RyYWludHMgY29tcHV0ZWRJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzRm9ySW50ZWdyYXRp b24oKTsKIAogcHJpdmF0ZToKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvZmxleC9GbGV4TGF5b3V0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4TGF5b3V0LmNwcAppbmRleCAwMDVhMDg5NjU3 ZGEuLjJiNmJlNzE3NTIzYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhMYXlvdXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4TGF5b3V0LmNwcApAQCAtMzksNyArMzks NyBAQCBGbGV4TGF5b3V0OjpGbGV4TGF5b3V0KGNvbnN0IFJlbmRlclN0eWxlJiBmbGV4Qm94U3R5 bGUpCiB7CiB9CiAKLUZsZXhMYXlvdXQ6OkxpbmVIZWlnaHRMaXN0IEZsZXhMYXlvdXQ6OmNvbXB1 dGVBdmFpbGFibGVMb2dpY2FsVmVydGljYWxTcGFjZShjb25zdCBMb2dpY2FsRmxleEl0ZW1zJiBm bGV4SXRlbXMsIGNvbnN0IFdyYXBwaW5nUG9zaXRpb25zJiB3cmFwcGluZ0luZGV4TGlzdCwgY29u c3QgQ29uc3RyYWludHNGb3JGbGV4Q29udGVudCYgZmxleENvbnN0cmFpbnRzKSBjb25zdAorRmxl eExheW91dDo6TGluZUhlaWdodExpc3QgRmxleExheW91dDo6Y29tcHV0ZUF2YWlsYWJsZUxvZ2lj YWxWZXJ0aWNhbFNwYWNlKGNvbnN0IExvZ2ljYWxGbGV4SXRlbXMmIGZsZXhJdGVtcywgY29uc3Qg V3JhcHBpbmdQb3NpdGlvbnMmIHdyYXBwaW5nSW5kZXhMaXN0LCBjb25zdCBMb2dpY2FsQ29uc3Ry YWludHMmIGZsZXhDb25zdHJhaW50cykgY29uc3QKIHsKICAgICBhdXRvIGxpbmVIZWlnaHRMaXN0 ID0gTGluZUhlaWdodExpc3Qod3JhcHBpbmdJbmRleExpc3Quc2l6ZSgpKTsKICAgICBhdXRvIGxp bmVSYW5nZSA9IFJhbmdlPHNpemVfdD4geyB9OwpAQCAtNTYsMzMgKzU2LDE4IEBAIEZsZXhMYXlv dXQ6OkxpbmVIZWlnaHRMaXN0IEZsZXhMYXlvdXQ6OmNvbXB1dGVBdmFpbGFibGVMb2dpY2FsVmVy dGljYWxTcGFjZShjb25zCiAgICAgICAgIGFjY3VtdWxhdGVkQ29udGVudEhlaWdodCArPSBsaW5l SGVpZ2h0TGlzdFtpbmRleF07CiAgICAgfQogCi0gICAgYXV0byBhdmFpbGFibGVMb2dpY2FsVmVy dGljYWxTcGFjZUZyb21Db25zdHJhaW50ID0gWyZdIHsKLSAgICAgICAgYXV0byBmbGV4RGlyZWN0 aW9uID0gZmxleEJveFN0eWxlKCkuZmxleERpcmVjdGlvbigpOwotICAgICAgICBhdXRvIGZsZXhE aXJlY3Rpb25Jc0lubGluZUF4aXMgPSBmbGV4RGlyZWN0aW9uID09IEZsZXhEaXJlY3Rpb246OlJv dyB8fCBmbGV4RGlyZWN0aW9uID09IEZsZXhEaXJlY3Rpb246OlJvd1JldmVyc2U7Ci0gICAgICAg IGlmIChmbGV4RGlyZWN0aW9uSXNJbmxpbmVBeGlzKQotICAgICAgICAgICAgcmV0dXJuIGZsZXhD b25zdHJhaW50cy5hdmFpbGFibGVWZXJ0aWNhbFNwYWNlKCk7Ci0gICAgICAgIHJldHVybiBzdGQ6 Om9wdGlvbmFsPExheW91dFVuaXQ+IHsgZmxleENvbnN0cmFpbnRzLmhvcml6b250YWwoKS5sb2dp Y2FsV2lkdGggfTsKLSAgICB9OwotICAgIGlmIChhdXRvIGF2YWlsYWJsZVNwYWNlID0gYXZhaWxh YmxlTG9naWNhbFZlcnRpY2FsU3BhY2VGcm9tQ29uc3RyYWludCgpOyBhdmFpbGFibGVTcGFjZSAm JiBhY2N1bXVsYXRlZENvbnRlbnRIZWlnaHQgPCAqYXZhaWxhYmxlU3BhY2UpIHsKLSAgICAgICAg YXV0byBleHRyYVNwYWNlUGVyTGluZSA9ICgqYXZhaWxhYmxlU3BhY2UgLSBhY2N1bXVsYXRlZENv bnRlbnRIZWlnaHQpIC8gbGluZUhlaWdodExpc3Quc2l6ZSgpOworICAgIGlmIChmbGV4Q29uc3Ry YWludHMudmVydGljYWxTcGFjZSAmJiBhY2N1bXVsYXRlZENvbnRlbnRIZWlnaHQgPCAqZmxleENv bnN0cmFpbnRzLnZlcnRpY2FsU3BhY2UpIHsKKyAgICAgICAgYXV0byBleHRyYVNwYWNlUGVyTGlu ZSA9ICgqZmxleENvbnN0cmFpbnRzLnZlcnRpY2FsU3BhY2UgLSBhY2N1bXVsYXRlZENvbnRlbnRI ZWlnaHQpIC8gbGluZUhlaWdodExpc3Quc2l6ZSgpOwogICAgICAgICBmb3IgKHNpemVfdCBpbmRl eCA9IDA7IGluZGV4IDwgbGluZUhlaWdodExpc3Quc2l6ZSgpOyArK2luZGV4KQogICAgICAgICAg ICAgbGluZUhlaWdodExpc3RbaW5kZXhdICs9IGV4dHJhU3BhY2VQZXJMaW5lOwogICAgIH0KICAg ICByZXR1cm4gbGluZUhlaWdodExpc3Q7CiB9CiAKLUxheW91dFVuaXQgRmxleExheW91dDo6Y29t cHV0ZUF2YWlsYWJsZUxvZ2ljYWxIb3Jpem9udGFsU3BhY2UoY29uc3QgTG9naWNhbEZsZXhJdGVt cyYgZmxleEl0ZW1zLCBjb25zdCBDb25zdHJhaW50c0ZvckZsZXhDb250ZW50JiBmbGV4Q29uc3Ry YWludHMpIGNvbnN0CitMYXlvdXRVbml0IEZsZXhMYXlvdXQ6OmNvbXB1dGVBdmFpbGFibGVMb2dp Y2FsSG9yaXpvbnRhbFNwYWNlKGNvbnN0IExvZ2ljYWxGbGV4SXRlbXMmIGZsZXhJdGVtcywgY29u c3QgTG9naWNhbENvbnN0cmFpbnRzJiBmbGV4Q29uc3RyYWludHMpIGNvbnN0CiB7Ci0gICAgYXV0 byBhdmFpbGFibGVMb2dpY2FsSG9yaXpvbnRhbFNwYWNlRnJvbUNvbnN0cmFpbnQgPSBbJl0gewot ICAgICAgICBhdXRvIGZsZXhEaXJlY3Rpb24gPSBmbGV4Qm94U3R5bGUoKS5mbGV4RGlyZWN0aW9u KCk7Ci0gICAgICAgIGF1dG8gZmxleERpcmVjdGlvbklzSW5saW5lQXhpcyA9IGZsZXhEaXJlY3Rp b24gPT0gRmxleERpcmVjdGlvbjo6Um93IHx8IGZsZXhEaXJlY3Rpb24gPT0gRmxleERpcmVjdGlv bjo6Um93UmV2ZXJzZTsKLSAgICAgICAgaWYgKGZsZXhEaXJlY3Rpb25Jc0lubGluZUF4aXMpCi0g ICAgICAgICAgICByZXR1cm4gc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0PiB7IGZsZXhDb25zdHJh aW50cy5ob3Jpem9udGFsKCkubG9naWNhbFdpZHRoIH07IAotICAgICAgICByZXR1cm4gZmxleENv bnN0cmFpbnRzLmF2YWlsYWJsZVZlcnRpY2FsU3BhY2UoKTsKLSAgICB9OwotCi0gICAgaWYgKGF1 dG8gYXZhaWxhYmxlU3BhY2UgPSBhdmFpbGFibGVMb2dpY2FsSG9yaXpvbnRhbFNwYWNlRnJvbUNv bnN0cmFpbnQoKSkKLSAgICAgICAgcmV0dXJuICphdmFpbGFibGVTcGFjZTsKKyAgICBpZiAoZmxl eENvbnN0cmFpbnRzLmhvcml6b250YWxTcGFjZSkKKyAgICAgICAgcmV0dXJuICpmbGV4Q29uc3Ry YWludHMuaG9yaXpvbnRhbFNwYWNlOwogCiAgICAgYXV0byBhdmFpbGFibGVTcGFjZSA9IExheW91 dFVuaXQgeyB9OwogICAgIGZvciAoYXV0byYgZmxleEl0ZW0gOiBmbGV4SXRlbXMpCkBAIC00MTMs MTQgKzM5OCwxNCBAQCB2b2lkIEZsZXhMYXlvdXQ6Omp1c3RpZnlGbGV4SXRlbXMoTG9naWNhbEZs ZXhJdGVtcyYgZmxleEl0ZW1zLCBjb25zdCBMaW5lUmFuZ2UmCiAgICAgfQogfQogCi12b2lkIEZs ZXhMYXlvdXQ6OmxheW91dChjb25zdCBDb25zdHJhaW50c0ZvckZsZXhDb250ZW50JiBjb25zdHJh aW50cywgTG9naWNhbEZsZXhJdGVtcyYgZmxleEl0ZW1zKQordm9pZCBGbGV4TGF5b3V0OjpsYXlv dXQoY29uc3QgTG9naWNhbENvbnN0cmFpbnRzJiBjb25zdHJhaW50cywgTG9naWNhbEZsZXhJdGVt cyYgZmxleEl0ZW1zKQogewogICAgIGF1dG8gYXZhaWxhYmxlTG9naWNhbEhvcml6b250YWxTcGFj ZSA9IGNvbXB1dGVBdmFpbGFibGVMb2dpY2FsSG9yaXpvbnRhbFNwYWNlKGZsZXhJdGVtcywgY29u c3RyYWludHMpOwogICAgIGF1dG8gd3JhcHBpbmdJbmRleExpc3QgPSBjb21wdXRlV3JhcHBpbmdQ b3NpdGlvbnMoZmxleEl0ZW1zLCBhdmFpbGFibGVMb2dpY2FsSG9yaXpvbnRhbFNwYWNlKTsKICAg ICBhdXRvIGxpbmVIZWlnaHRMaXN0ID0gY29tcHV0ZUF2YWlsYWJsZUxvZ2ljYWxWZXJ0aWNhbFNw YWNlKGZsZXhJdGVtcywgd3JhcHBpbmdJbmRleExpc3QsIGNvbnN0cmFpbnRzKTsKIAogICAgIGF1 dG8gbGluZVJhbmdlID0gUmFuZ2U8c2l6ZV90PiB7IH07Ci0gICAgYXV0byBsaW5lVG9wID0gY29u c3RyYWludHMubG9naWNhbFRvcCgpOworICAgIGF1dG8gbGluZVRvcCA9IGNvbnN0cmFpbnRzLnRv cDsKICAgICBmb3IgKHNpemVfdCBpbmRleCA9IDA7IGluZGV4IDwgd3JhcHBpbmdJbmRleExpc3Qu c2l6ZSgpOyArK2luZGV4KSB7CiAgICAgICAgIGxpbmVSYW5nZSA9IHsgbGluZVJhbmdlLmVuZCgp LCB3cmFwcGluZ0luZGV4TGlzdFtpbmRleF0gfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhMYXlvdXQuaCBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4TGF5b3V0LmgKaW5kZXgg MTJkNzhiMDcyNmEzLi5iMzVkOWQ3YjIzM2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4TGF5b3V0LmgKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhMYXlvdXQuaApAQCAtNzcs OCArNzcsMTMgQEAgcHVibGljOgogICAgICAgICBJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzIG1f aW50cmluc2ljV2lkdGhDb25zdHJhaW50cyB7IH07CiAgICAgICAgIENoZWNrZWRQdHI8Y29uc3Qg Q29udGFpbmVyQm94PiBtX2xheW91dEJveDsgICAgICAgIAogICAgIH07Ci0gICAgdXNpbmcgTG9n aWNhbEZsZXhJdGVtcyA9IFZlY3RvcjxMb2dpY2FsRmxleEl0ZW0+OyAgICAKLSAgICB2b2lkIGxh eW91dChjb25zdCBDb25zdHJhaW50c0ZvckZsZXhDb250ZW50JiwgTG9naWNhbEZsZXhJdGVtcyYp OworICAgIHVzaW5nIExvZ2ljYWxGbGV4SXRlbXMgPSBWZWN0b3I8TG9naWNhbEZsZXhJdGVtPjsK KyAgICBzdHJ1Y3QgTG9naWNhbENvbnN0cmFpbnRzIHsKKyAgICAgICAgTGF5b3V0VW5pdCB0b3A7 CisgICAgICAgIHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdD4gdmVydGljYWxTcGFjZTsKKyAgICAg ICAgc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0PiBob3Jpem9udGFsU3BhY2U7CisgICAgfTsKKyAg ICB2b2lkIGxheW91dChjb25zdCBMb2dpY2FsQ29uc3RyYWludHMmLCBMb2dpY2FsRmxleEl0ZW1z Jik7CiAKIHByaXZhdGU6CiAgICAgdXNpbmcgTGluZVJhbmdlID0gV1RGOjpSYW5nZTxzaXplX3Q+ OwpAQCAtOTEsMTAgKzk2LDEwIEBAIHByaXZhdGU6CiAKICAgICB1c2luZyBXcmFwcGluZ1Bvc2l0 aW9ucyA9IFZlY3RvcjxzaXplX3Q+OwogICAgIFdyYXBwaW5nUG9zaXRpb25zIGNvbXB1dGVXcmFw cGluZ1Bvc2l0aW9ucyhjb25zdCBMb2dpY2FsRmxleEl0ZW1zJiwgTGF5b3V0VW5pdCBhdmFpbGFi bGVTcGFjZSkgY29uc3Q7Ci0gICAgTGF5b3V0VW5pdCBjb21wdXRlQXZhaWxhYmxlTG9naWNhbEhv cml6b250YWxTcGFjZShjb25zdCBMb2dpY2FsRmxleEl0ZW1zJiwgY29uc3QgQ29uc3RyYWludHNG b3JGbGV4Q29udGVudCYpIGNvbnN0OworICAgIExheW91dFVuaXQgY29tcHV0ZUF2YWlsYWJsZUxv Z2ljYWxIb3Jpem9udGFsU3BhY2UoY29uc3QgTG9naWNhbEZsZXhJdGVtcyYsIGNvbnN0IExvZ2lj YWxDb25zdHJhaW50cyYpIGNvbnN0OwogCiAgICAgdXNpbmcgTGluZUhlaWdodExpc3QgPSBWZWN0 b3I8TGF5b3V0VW5pdD47Ci0gICAgTGluZUhlaWdodExpc3QgY29tcHV0ZUF2YWlsYWJsZUxvZ2lj YWxWZXJ0aWNhbFNwYWNlKGNvbnN0IExvZ2ljYWxGbGV4SXRlbXMmLCBjb25zdCBXcmFwcGluZ1Bv c2l0aW9ucyYsIGNvbnN0IENvbnN0cmFpbnRzRm9yRmxleENvbnRlbnQmKSBjb25zdDsKKyAgICBM aW5lSGVpZ2h0TGlzdCBjb21wdXRlQXZhaWxhYmxlTG9naWNhbFZlcnRpY2FsU3BhY2UoY29uc3Qg TG9naWNhbEZsZXhJdGVtcyYsIGNvbnN0IFdyYXBwaW5nUG9zaXRpb25zJiwgY29uc3QgTG9naWNh bENvbnN0cmFpbnRzJikgY29uc3Q7CiAKICAgICBjb25zdCBSZW5kZXJTdHlsZSYgZmxleEJveFN0 eWxlKCkgY29uc3QgeyByZXR1cm4gbV9mbGV4Qm94U3R5bGU7IH0KIAotLSAKMi4zMi4wIChBcHBs ZSBHaXQtMTMyKQoK 460040 2022-06-05 10:20:32 -0700 2022-06-05 22:58:06 -0700 [fast-cq]Patch bug-241310-20220605102032.patch text/plain 9919 zalan RnJvbSA3NDhhNWUzODk4NzcxYzk3MGNiYzJmOWY2MThhNzVhNGEyYzFmYTY5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJ1anRhcyA8emFsYW5AYXBwbGUuY29tPgpEYXRlOiBT YXQsIDQgSnVuIDIwMjIgMTY6Mjc6MDQgLTA3MDAKU3ViamVjdDogW1BBVENIXSBbTEZDXVtGRkNd IEZsZXhMYXlvdXQgc2hvdWxkIG9ubHkgdGFrZSBsb2dpY2FsIHZhbHVlcwogaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0MTMxMAoKUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCgpUdXJuIENvbnN0cmFpbnRzRm9yRmxleENvbnRlbnQgaW50byBMb2dpY2FsQ29uc3Ry YWludHMuCgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9G bGV4Rm9ybWF0dGluZ0NvbnRleHQuY3BwOgooV2ViQ29yZTo6TGF5b3V0OjpGbGV4Rm9ybWF0dGlu Z0NvbnRleHQ6OmxheW91dEluRmxvd0NvbnRlbnRGb3JJbnRlZ3JhdGlvbik6CiogU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4 dC5oOgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4 TGF5b3V0LmNwcDoKKFdlYkNvcmU6OkxheW91dDo6RmxleExheW91dDo6Y29tcHV0ZUF2YWlsYWJs ZUxvZ2ljYWxWZXJ0aWNhbFNwYWNlIGNvbnN0KToKKFdlYkNvcmU6OkxheW91dDo6RmxleExheW91 dDo6Y29tcHV0ZUF2YWlsYWJsZUxvZ2ljYWxIb3Jpem9udGFsU3BhY2UgY29uc3QpOgooV2ViQ29y ZTo6TGF5b3V0OjpGbGV4TGF5b3V0OjpsYXlvdXQpOgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4TGF5b3V0Lmg6Ci0tLQogLi4uL2ZsZXgvRmxleEZv cm1hdHRpbmdDb250ZXh0LmNwcCAgICAgICAgICAgIHwgMTggKysrKysrKystLS0KIC4uLi9mbGV4 L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5oICAgICAgICAgICAgICB8ICAyICstCiAuLi4vZm9ybWF0 dGluZ0NvbnRleHRzL2ZsZXgvRmxleExheW91dC5jcHAgICAgfCAzMSArKysrKy0tLS0tLS0tLS0t LS0tCiAuLi4vZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxleExheW91dC5oICAgICAgfCAxMiAr KysrLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDMwIGluc2VydGlvbnMoKyksIDMzIGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv ZmxleC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggMWQ0 YmViYTc0Mzc3Li42NmM3YzlkOGVlNzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4Rm9ybWF0 dGluZ0NvbnRleHQuY3BwCkBAIC0yODUsMTMgKzI4NSwyMSBAQCB2b2lkIEZsZXhGb3JtYXR0aW5n Q29udGV4dDo6c2V0RmxleEl0ZW1zR2VvbWV0cnkoY29uc3QgRmxleExheW91dDo6TG9naWNhbEZs ZXhJdAogICAgIH0KIH0KIAotdm9pZCBGbGV4Rm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dEluRmxv d0NvbnRlbnRGb3JJbnRlZ3JhdGlvbihjb25zdCBDb25zdHJhaW50c0ZvckluRmxvd0NvbnRlbnQm IGNvbnN0cmFpbnRzKQordm9pZCBGbGV4Rm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dEluRmxvd0Nv bnRlbnRGb3JJbnRlZ3JhdGlvbihjb25zdCBDb25zdHJhaW50c0ZvckZsZXhDb250ZW50JiBjb25z dHJhaW50cykKIHsKLSAgICBhdXRvIGZsZXhDb25zdHJhaW50cyA9IGRvd25jYXN0PENvbnN0cmFp bnRzRm9yRmxleENvbnRlbnQ+KGNvbnN0cmFpbnRzKTsKLSAgICBhdXRvIGxvZ2ljYWxGbGV4SXRl bXMgPSBjb252ZXJ0RmxleEl0ZW1zVG9Mb2dpY2FsU3BhY2UoZmxleENvbnN0cmFpbnRzKTsKKyAg ICBhdXRvIGxvZ2ljYWxGbGV4SXRlbXMgPSBjb252ZXJ0RmxleEl0ZW1zVG9Mb2dpY2FsU3BhY2Uo Y29uc3RyYWludHMpOwogICAgIGF1dG8gZmxleExheW91dCA9IEZsZXhMYXlvdXQgeyByb290KCku c3R5bGUoKSB9OwotICAgIGZsZXhMYXlvdXQubGF5b3V0KGZsZXhDb25zdHJhaW50cywgbG9naWNh bEZsZXhJdGVtcyk7Ci0gICAgc2V0RmxleEl0ZW1zR2VvbWV0cnkobG9naWNhbEZsZXhJdGVtcywg ZmxleENvbnN0cmFpbnRzKTsKKworICAgIGF1dG8gbG9naWNhbEZsZXhDb25zdHJhaW50cyA9IFsm XSB7CisgICAgICAgIGF1dG8gZmxleERpcmVjdGlvbiA9IHJvb3QoKS5zdHlsZSgpLmZsZXhEaXJl Y3Rpb24oKTsKKyAgICAgICAgYXV0byBmbGV4RGlyZWN0aW9uSXNJbmxpbmVBeGlzID0gZmxleERp cmVjdGlvbiA9PSBGbGV4RGlyZWN0aW9uOjpSb3cgfHwgZmxleERpcmVjdGlvbiA9PSBGbGV4RGly ZWN0aW9uOjpSb3dSZXZlcnNlOworICAgICAgICBhdXRvIGxvZ2ljYWxWZXJ0aWNhbFNhcGNlID0g ZmxleERpcmVjdGlvbklzSW5saW5lQXhpcyA/IGNvbnN0cmFpbnRzLmF2YWlsYWJsZVZlcnRpY2Fs U3BhY2UoKSA6IHN0ZDo6bWFrZV9vcHRpb25hbChjb25zdHJhaW50cy5ob3Jpem9udGFsKCkubG9n aWNhbFdpZHRoKTsKKyAgICAgICAgYXV0byBsb2dpY2FsSG9yaXpvbnRhbFNhcGNlID0gZmxleERp cmVjdGlvbklzSW5saW5lQXhpcyA/IHN0ZDo6bWFrZV9vcHRpb25hbChjb25zdHJhaW50cy5ob3Jp em9udGFsKCkubG9naWNhbFdpZHRoKSA6IGNvbnN0cmFpbnRzLmF2YWlsYWJsZVZlcnRpY2FsU3Bh Y2UoKTsKKyAgICAgICAgcmV0dXJuIEZsZXhMYXlvdXQ6OkxvZ2ljYWxDb25zdHJhaW50cyB7IGxv Z2ljYWxWZXJ0aWNhbFNhcGNlLCBsb2dpY2FsSG9yaXpvbnRhbFNhcGNlIH07CisgICAgfTsKKwor ICAgIGZsZXhMYXlvdXQubGF5b3V0KGxvZ2ljYWxGbGV4Q29uc3RyYWludHMoKSwgbG9naWNhbEZs ZXhJdGVtcyk7CisgICAgc2V0RmxleEl0ZW1zR2VvbWV0cnkobG9naWNhbEZsZXhJdGVtcywgY29u c3RyYWludHMpOwogfQogCiBJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzIEZsZXhGb3JtYXR0aW5n Q29udGV4dDo6Y29tcHV0ZWRJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzRm9ySW50ZWdyYXRpb24o KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9m bGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5oCmluZGV4IDFmMTc2M2Jm MDJiYS4uNTQ3YzdhZjhhYTBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxleEZvcm1hdHRpbmdDb250ZXh0LmgKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29u dGV4dC5oCkBAIC01MSw3ICs1MSw3IEBAIHB1YmxpYzoKICAgICBjb25zdCBGbGV4Rm9ybWF0dGlu Z0dlb21ldHJ5JiBmb3JtYXR0aW5nR2VvbWV0cnkoKSBjb25zdCBmaW5hbCB7IHJldHVybiBtX2Zs ZXhGb3JtYXR0aW5nR2VvbWV0cnk7IH0KICAgICBjb25zdCBGb3JtYXR0aW5nUXVpcmtzJiBmb3Jt YXR0aW5nUXVpcmtzKCkgY29uc3QgZmluYWwgeyByZXR1cm4gbV9mbGV4Rm9ybWF0dGluZ1F1aXJr czsgfQogCi0gICAgdm9pZCBsYXlvdXRJbkZsb3dDb250ZW50Rm9ySW50ZWdyYXRpb24oY29uc3Qg Q29uc3RyYWludHNGb3JJbkZsb3dDb250ZW50Jik7CisgICAgdm9pZCBsYXlvdXRJbkZsb3dDb250 ZW50Rm9ySW50ZWdyYXRpb24oY29uc3QgQ29uc3RyYWludHNGb3JGbGV4Q29udGVudCYpOwogICAg IEludHJpbnNpY1dpZHRoQ29uc3RyYWludHMgY29tcHV0ZWRJbnRyaW5zaWNXaWR0aENvbnN0cmFp bnRzRm9ySW50ZWdyYXRpb24oKTsKIAogcHJpdmF0ZToKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4TGF5b3V0LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4TGF5b3V0LmNwcApp bmRleCAwMDVhMDg5NjU3ZGEuLjQ1MTU3YTdjZTRhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhMYXlvdXQuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4TGF5b3V0LmNw cApAQCAtMzksNyArMzksNyBAQCBGbGV4TGF5b3V0OjpGbGV4TGF5b3V0KGNvbnN0IFJlbmRlclN0 eWxlJiBmbGV4Qm94U3R5bGUpCiB7CiB9CiAKLUZsZXhMYXlvdXQ6OkxpbmVIZWlnaHRMaXN0IEZs ZXhMYXlvdXQ6OmNvbXB1dGVBdmFpbGFibGVMb2dpY2FsVmVydGljYWxTcGFjZShjb25zdCBMb2dp Y2FsRmxleEl0ZW1zJiBmbGV4SXRlbXMsIGNvbnN0IFdyYXBwaW5nUG9zaXRpb25zJiB3cmFwcGlu Z0luZGV4TGlzdCwgY29uc3QgQ29uc3RyYWludHNGb3JGbGV4Q29udGVudCYgZmxleENvbnN0cmFp bnRzKSBjb25zdAorRmxleExheW91dDo6TGluZUhlaWdodExpc3QgRmxleExheW91dDo6Y29tcHV0 ZUF2YWlsYWJsZUxvZ2ljYWxWZXJ0aWNhbFNwYWNlKGNvbnN0IExvZ2ljYWxGbGV4SXRlbXMmIGZs ZXhJdGVtcywgY29uc3QgV3JhcHBpbmdQb3NpdGlvbnMmIHdyYXBwaW5nSW5kZXhMaXN0LCBjb25z dCBMb2dpY2FsQ29uc3RyYWludHMmIGZsZXhDb25zdHJhaW50cykgY29uc3QKIHsKICAgICBhdXRv IGxpbmVIZWlnaHRMaXN0ID0gTGluZUhlaWdodExpc3Qod3JhcHBpbmdJbmRleExpc3Quc2l6ZSgp KTsKICAgICBhdXRvIGxpbmVSYW5nZSA9IFJhbmdlPHNpemVfdD4geyB9OwpAQCAtNTYsMzMgKzU2 LDE4IEBAIEZsZXhMYXlvdXQ6OkxpbmVIZWlnaHRMaXN0IEZsZXhMYXlvdXQ6OmNvbXB1dGVBdmFp bGFibGVMb2dpY2FsVmVydGljYWxTcGFjZShjb25zCiAgICAgICAgIGFjY3VtdWxhdGVkQ29udGVu dEhlaWdodCArPSBsaW5lSGVpZ2h0TGlzdFtpbmRleF07CiAgICAgfQogCi0gICAgYXV0byBhdmFp bGFibGVMb2dpY2FsVmVydGljYWxTcGFjZUZyb21Db25zdHJhaW50ID0gWyZdIHsKLSAgICAgICAg YXV0byBmbGV4RGlyZWN0aW9uID0gZmxleEJveFN0eWxlKCkuZmxleERpcmVjdGlvbigpOwotICAg ICAgICBhdXRvIGZsZXhEaXJlY3Rpb25Jc0lubGluZUF4aXMgPSBmbGV4RGlyZWN0aW9uID09IEZs ZXhEaXJlY3Rpb246OlJvdyB8fCBmbGV4RGlyZWN0aW9uID09IEZsZXhEaXJlY3Rpb246OlJvd1Jl dmVyc2U7Ci0gICAgICAgIGlmIChmbGV4RGlyZWN0aW9uSXNJbmxpbmVBeGlzKQotICAgICAgICAg ICAgcmV0dXJuIGZsZXhDb25zdHJhaW50cy5hdmFpbGFibGVWZXJ0aWNhbFNwYWNlKCk7Ci0gICAg ICAgIHJldHVybiBzdGQ6Om9wdGlvbmFsPExheW91dFVuaXQ+IHsgZmxleENvbnN0cmFpbnRzLmhv cml6b250YWwoKS5sb2dpY2FsV2lkdGggfTsKLSAgICB9OwotICAgIGlmIChhdXRvIGF2YWlsYWJs ZVNwYWNlID0gYXZhaWxhYmxlTG9naWNhbFZlcnRpY2FsU3BhY2VGcm9tQ29uc3RyYWludCgpOyBh dmFpbGFibGVTcGFjZSAmJiBhY2N1bXVsYXRlZENvbnRlbnRIZWlnaHQgPCAqYXZhaWxhYmxlU3Bh Y2UpIHsKLSAgICAgICAgYXV0byBleHRyYVNwYWNlUGVyTGluZSA9ICgqYXZhaWxhYmxlU3BhY2Ug LSBhY2N1bXVsYXRlZENvbnRlbnRIZWlnaHQpIC8gbGluZUhlaWdodExpc3Quc2l6ZSgpOworICAg IGlmIChmbGV4Q29uc3RyYWludHMudmVydGljYWxTcGFjZSAmJiBhY2N1bXVsYXRlZENvbnRlbnRI ZWlnaHQgPCAqZmxleENvbnN0cmFpbnRzLnZlcnRpY2FsU3BhY2UpIHsKKyAgICAgICAgYXV0byBl eHRyYVNwYWNlUGVyTGluZSA9ICgqZmxleENvbnN0cmFpbnRzLnZlcnRpY2FsU3BhY2UgLSBhY2N1 bXVsYXRlZENvbnRlbnRIZWlnaHQpIC8gbGluZUhlaWdodExpc3Quc2l6ZSgpOwogICAgICAgICBm b3IgKHNpemVfdCBpbmRleCA9IDA7IGluZGV4IDwgbGluZUhlaWdodExpc3Quc2l6ZSgpOyArK2lu ZGV4KQogICAgICAgICAgICAgbGluZUhlaWdodExpc3RbaW5kZXhdICs9IGV4dHJhU3BhY2VQZXJM aW5lOwogICAgIH0KICAgICByZXR1cm4gbGluZUhlaWdodExpc3Q7CiB9CiAKLUxheW91dFVuaXQg RmxleExheW91dDo6Y29tcHV0ZUF2YWlsYWJsZUxvZ2ljYWxIb3Jpem9udGFsU3BhY2UoY29uc3Qg TG9naWNhbEZsZXhJdGVtcyYgZmxleEl0ZW1zLCBjb25zdCBDb25zdHJhaW50c0ZvckZsZXhDb250 ZW50JiBmbGV4Q29uc3RyYWludHMpIGNvbnN0CitMYXlvdXRVbml0IEZsZXhMYXlvdXQ6OmNvbXB1 dGVBdmFpbGFibGVMb2dpY2FsSG9yaXpvbnRhbFNwYWNlKGNvbnN0IExvZ2ljYWxGbGV4SXRlbXMm IGZsZXhJdGVtcywgY29uc3QgTG9naWNhbENvbnN0cmFpbnRzJiBmbGV4Q29uc3RyYWludHMpIGNv bnN0CiB7Ci0gICAgYXV0byBhdmFpbGFibGVMb2dpY2FsSG9yaXpvbnRhbFNwYWNlRnJvbUNvbnN0 cmFpbnQgPSBbJl0gewotICAgICAgICBhdXRvIGZsZXhEaXJlY3Rpb24gPSBmbGV4Qm94U3R5bGUo KS5mbGV4RGlyZWN0aW9uKCk7Ci0gICAgICAgIGF1dG8gZmxleERpcmVjdGlvbklzSW5saW5lQXhp cyA9IGZsZXhEaXJlY3Rpb24gPT0gRmxleERpcmVjdGlvbjo6Um93IHx8IGZsZXhEaXJlY3Rpb24g PT0gRmxleERpcmVjdGlvbjo6Um93UmV2ZXJzZTsKLSAgICAgICAgaWYgKGZsZXhEaXJlY3Rpb25J c0lubGluZUF4aXMpCi0gICAgICAgICAgICByZXR1cm4gc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0 PiB7IGZsZXhDb25zdHJhaW50cy5ob3Jpem9udGFsKCkubG9naWNhbFdpZHRoIH07IAotICAgICAg ICByZXR1cm4gZmxleENvbnN0cmFpbnRzLmF2YWlsYWJsZVZlcnRpY2FsU3BhY2UoKTsKLSAgICB9 OwotCi0gICAgaWYgKGF1dG8gYXZhaWxhYmxlU3BhY2UgPSBhdmFpbGFibGVMb2dpY2FsSG9yaXpv bnRhbFNwYWNlRnJvbUNvbnN0cmFpbnQoKSkKLSAgICAgICAgcmV0dXJuICphdmFpbGFibGVTcGFj ZTsKKyAgICBpZiAoZmxleENvbnN0cmFpbnRzLmhvcml6b250YWxTcGFjZSkKKyAgICAgICAgcmV0 dXJuICpmbGV4Q29uc3RyYWludHMuaG9yaXpvbnRhbFNwYWNlOwogCiAgICAgYXV0byBhdmFpbGFi bGVTcGFjZSA9IExheW91dFVuaXQgeyB9OwogICAgIGZvciAoYXV0byYgZmxleEl0ZW0gOiBmbGV4 SXRlbXMpCkBAIC00MTMsMTQgKzM5OCwxNCBAQCB2b2lkIEZsZXhMYXlvdXQ6Omp1c3RpZnlGbGV4 SXRlbXMoTG9naWNhbEZsZXhJdGVtcyYgZmxleEl0ZW1zLCBjb25zdCBMaW5lUmFuZ2UmCiAgICAg fQogfQogCi12b2lkIEZsZXhMYXlvdXQ6OmxheW91dChjb25zdCBDb25zdHJhaW50c0ZvckZsZXhD b250ZW50JiBjb25zdHJhaW50cywgTG9naWNhbEZsZXhJdGVtcyYgZmxleEl0ZW1zKQordm9pZCBG bGV4TGF5b3V0OjpsYXlvdXQoY29uc3QgTG9naWNhbENvbnN0cmFpbnRzJiBjb25zdHJhaW50cywg TG9naWNhbEZsZXhJdGVtcyYgZmxleEl0ZW1zKQogewogICAgIGF1dG8gYXZhaWxhYmxlTG9naWNh bEhvcml6b250YWxTcGFjZSA9IGNvbXB1dGVBdmFpbGFibGVMb2dpY2FsSG9yaXpvbnRhbFNwYWNl KGZsZXhJdGVtcywgY29uc3RyYWludHMpOwogICAgIGF1dG8gd3JhcHBpbmdJbmRleExpc3QgPSBj b21wdXRlV3JhcHBpbmdQb3NpdGlvbnMoZmxleEl0ZW1zLCBhdmFpbGFibGVMb2dpY2FsSG9yaXpv bnRhbFNwYWNlKTsKICAgICBhdXRvIGxpbmVIZWlnaHRMaXN0ID0gY29tcHV0ZUF2YWlsYWJsZUxv Z2ljYWxWZXJ0aWNhbFNwYWNlKGZsZXhJdGVtcywgd3JhcHBpbmdJbmRleExpc3QsIGNvbnN0cmFp bnRzKTsKIAogICAgIGF1dG8gbGluZVJhbmdlID0gUmFuZ2U8c2l6ZV90PiB7IH07Ci0gICAgYXV0 byBsaW5lVG9wID0gY29uc3RyYWludHMubG9naWNhbFRvcCgpOworICAgIGF1dG8gbGluZVRvcCA9 IExheW91dFVuaXQgeyB9OwogICAgIGZvciAoc2l6ZV90IGluZGV4ID0gMDsgaW5kZXggPCB3cmFw cGluZ0luZGV4TGlzdC5zaXplKCk7ICsraW5kZXgpIHsKICAgICAgICAgbGluZVJhbmdlID0geyBs aW5lUmFuZ2UuZW5kKCksIHdyYXBwaW5nSW5kZXhMaXN0W2luZGV4XSB9OwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxleExheW91 dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhM YXlvdXQuaAppbmRleCAxMmQ3OGIwNzI2YTMuLmVlMGFlOWQ0NjQ3MiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhMYXlvdXQuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxleExh eW91dC5oCkBAIC03Nyw4ICs3NywxMiBAQCBwdWJsaWM6CiAgICAgICAgIEludHJpbnNpY1dpZHRo Q29uc3RyYWludHMgbV9pbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzIHsgfTsKICAgICAgICAgQ2hl Y2tlZFB0cjxjb25zdCBDb250YWluZXJCb3g+IG1fbGF5b3V0Qm94OyAgICAgICAgCiAgICAgfTsK LSAgICB1c2luZyBMb2dpY2FsRmxleEl0ZW1zID0gVmVjdG9yPExvZ2ljYWxGbGV4SXRlbT47ICAg IAotICAgIHZvaWQgbGF5b3V0KGNvbnN0IENvbnN0cmFpbnRzRm9yRmxleENvbnRlbnQmLCBMb2dp Y2FsRmxleEl0ZW1zJik7CisgICAgdXNpbmcgTG9naWNhbEZsZXhJdGVtcyA9IFZlY3RvcjxMb2dp Y2FsRmxleEl0ZW0+OworICAgIHN0cnVjdCBMb2dpY2FsQ29uc3RyYWludHMgeworICAgICAgICBz dGQ6Om9wdGlvbmFsPExheW91dFVuaXQ+IHZlcnRpY2FsU3BhY2U7CisgICAgICAgIHN0ZDo6b3B0 aW9uYWw8TGF5b3V0VW5pdD4gaG9yaXpvbnRhbFNwYWNlOworICAgIH07CisgICAgdm9pZCBsYXlv dXQoY29uc3QgTG9naWNhbENvbnN0cmFpbnRzJiwgTG9naWNhbEZsZXhJdGVtcyYpOwogCiBwcml2 YXRlOgogICAgIHVzaW5nIExpbmVSYW5nZSA9IFdURjo6UmFuZ2U8c2l6ZV90PjsKQEAgLTkxLDEw ICs5NSwxMCBAQCBwcml2YXRlOgogCiAgICAgdXNpbmcgV3JhcHBpbmdQb3NpdGlvbnMgPSBWZWN0 b3I8c2l6ZV90PjsKICAgICBXcmFwcGluZ1Bvc2l0aW9ucyBjb21wdXRlV3JhcHBpbmdQb3NpdGlv bnMoY29uc3QgTG9naWNhbEZsZXhJdGVtcyYsIExheW91dFVuaXQgYXZhaWxhYmxlU3BhY2UpIGNv bnN0OwotICAgIExheW91dFVuaXQgY29tcHV0ZUF2YWlsYWJsZUxvZ2ljYWxIb3Jpem9udGFsU3Bh Y2UoY29uc3QgTG9naWNhbEZsZXhJdGVtcyYsIGNvbnN0IENvbnN0cmFpbnRzRm9yRmxleENvbnRl bnQmKSBjb25zdDsKKyAgICBMYXlvdXRVbml0IGNvbXB1dGVBdmFpbGFibGVMb2dpY2FsSG9yaXpv bnRhbFNwYWNlKGNvbnN0IExvZ2ljYWxGbGV4SXRlbXMmLCBjb25zdCBMb2dpY2FsQ29uc3RyYWlu dHMmKSBjb25zdDsKIAogICAgIHVzaW5nIExpbmVIZWlnaHRMaXN0ID0gVmVjdG9yPExheW91dFVu aXQ+OwotICAgIExpbmVIZWlnaHRMaXN0IGNvbXB1dGVBdmFpbGFibGVMb2dpY2FsVmVydGljYWxT cGFjZShjb25zdCBMb2dpY2FsRmxleEl0ZW1zJiwgY29uc3QgV3JhcHBpbmdQb3NpdGlvbnMmLCBj b25zdCBDb25zdHJhaW50c0ZvckZsZXhDb250ZW50JikgY29uc3Q7CisgICAgTGluZUhlaWdodExp c3QgY29tcHV0ZUF2YWlsYWJsZUxvZ2ljYWxWZXJ0aWNhbFNwYWNlKGNvbnN0IExvZ2ljYWxGbGV4 SXRlbXMmLCBjb25zdCBXcmFwcGluZ1Bvc2l0aW9ucyYsIGNvbnN0IExvZ2ljYWxDb25zdHJhaW50 cyYpIGNvbnN0OwogCiAgICAgY29uc3QgUmVuZGVyU3R5bGUmIGZsZXhCb3hTdHlsZSgpIGNvbnN0 IHsgcmV0dXJuIG1fZmxleEJveFN0eWxlOyB9CiAKLS0gCjIuMzIuMCAoQXBwbGUgR2l0LTEzMikK Cg==