207832 2020-02-16 20:36:02 -0800 [LFC][Out-of-flow] FormattingContext::computeOutOfFlowHorizontalGeometry needs verticalConstraints 2020-02-17 13:11:11 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue dino koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1619568 0 zalan 2020-02-16 20:36:02 -0800 while figuring out computedContentHeight through inlineReplacedWidthAndMargin 1619570 1 webkit-bug-importer 2020-02-16 20:36:25 -0800 <rdar://problem/59499844> 1619573 2 390898 zalan 2020-02-16 21:08:06 -0800 Created attachment 390898 Patch 1619685 3 390898 dino 2020-02-17 09:30:09 -0800 Comment on attachment 390898 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=390898&action=review > Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp:286 > + contentWidthAndMargin = geometry().inlineReplacedWidthAndMargin(downcast<ReplacedBox>(layoutBox), horizontalConstraints, { }, usedWidth); Shouldn't the {}s be nullopts? 1619798 4 390898 commit-queue 2020-02-17 12:29:15 -0800 Comment on attachment 390898 Patch Clearing flags on attachment: 390898 Committed r256760: <https://trac.webkit.org/changeset/256760> 1619799 5 commit-queue 2020-02-17 12:29:16 -0800 All reviewed patches have been landed. Closing bug. 1619828 6 zalan 2020-02-17 13:11:11 -0800 (In reply to Dean Jackson from comment #3) > Comment on attachment 390898 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=390898&action=review > > > Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp:286 > > + contentWidthAndMargin = geometry().inlineReplacedWidthAndMargin(downcast<ReplacedBox>(layoutBox), horizontalConstraints, { }, usedWidth); > > Shouldn't the {}s be nullopts? {} is nullopt when the type is WTF::Optional. 390898 2020-02-16 21:08:06 -0800 2020-02-17 12:29:15 -0800 Patch bug-207832-20200216210805.patch text/plain 19863 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU2NzEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTM1OTFkZGNiZjZlY2M5 YjM4MmQ4NDY1N2M0MmVjN2IxNThjMmU0YS4uZWJjYjc5NGEwYzEwN2ZhNjc2MTU1MzIwMjFkMTk2 NTQ1ZDNmZThlYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDIwLTAyLTE2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bT3V0LW9mLWZsb3dd IEZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlT3V0T2ZGbG93SG9yaXpvbnRhbEdlb21ldHJ5IG5l ZWRzIHZlcnRpY2FsQ29uc3RyYWludHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIwNzgzMgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTk0OTk4NDQ+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVzdDog ZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC9zaW1wbGUtYWJzb2x1dGUtcG9zaXRpb25lZC1y ZXBsYWNlZC1pbmxpbmUtZWxlbWVudC13aXRoLXBlcmNlbnRhZ2UtaGVpZ2h0Lmh0bWwKKworICAg ICAgICBJbmxpbmUgcmVwbGFjZWQgd2lkdGggY29tcHV0YXRpb24gbmVlZHMgdGhlIHZhbHVlIG9m IHRoZSBjb21wdXRlZCBjb250ZW50IGhlaWdodC4gSW4gY2FzZSBvZiBwZXJjZW50YWdlIHZhbHVl LCBpbiBvcmRlciB0bworICAgICAgICByZXNvbHZlIGl0IHdlIG5lZWQgdGhlIGNvbnRhaW5pbmcg YmxvY2sncyBoZWlnaHQuIEF0IHRoaXMgcG9pbnQgdGhlIGNvbnRhaW5pbmcgYmxvY2sncyB2ZXJ0 aWNhbCB2YWx1ZXMgYXJlIHVzdWFsbHkgbm90CisgICAgICAgIGNvbXB1dGVkIHlldCwgdW5sZXNz IHRoZSBjdXJyZW50IGJveCBoYXBwZW5zIHRvIGJlIGFuIG91dC1vZi1mbG93LgorCisgICAgICAg ICogbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6Rm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVPdXRPZkZsb3dIb3Jpem9udGFsR2VvbWV0cnkp OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0T3V0 T2ZGbG93Q29udGVudCk6CisgICAgICAgICogbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0Lmg6Cisg ICAgICAgICogbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Om91dE9mRmxvd1Jl cGxhY2VkSG9yaXpvbnRhbEdlb21ldHJ5IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6Rm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpmbG9hdGluZ1JlcGxhY2VkV2lkdGhBbmRN YXJnaW4gY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4 dDo6R2VvbWV0cnk6Om91dE9mRmxvd0hvcml6b250YWxHZW9tZXRyeSk6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6aW5saW5lUmVwbGFjZWRX aWR0aEFuZE1hcmdpbiBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9C bG9ja0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6aW5GbG93UmVwbGFjZWRXaWR0 aEFuZE1hcmdpbiBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxp bmVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZVdpZHRoQW5kTWFyZ2luKToKKyAgICAgICAgKiBs YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6Okdl b21ldHJ5OjppbmxpbmVCbG9ja1dpZHRoQW5kTWFyZ2luKToKKwogMjAyMC0wMi0xNiAgWmFsYW4g QnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdIFJlbW92ZSBSZXBsYWNl ZEJveDo6bV9sYXlvdXRCb3gKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3Jt YXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRl eHQuY3BwCmluZGV4IDQ3NzQ1ZmFkZTIzNzEwYmYzODczNTU3MmE5ZTViZTVhMTBkYzIyODkuLjgy NTQ4ZWI5MWEyOWIxZjBlNzJhMDdkNzk2NWMwMmIwZGUyNjBkMzQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAtNjgsMTEgKzY4LDExIEBAIExheW91 dFN0YXRlJiBGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0U3RhdGUoKSBjb25zdAogICAgIHJldHVy biBtX2Zvcm1hdHRpbmdTdGF0ZS5sYXlvdXRTdGF0ZSgpOwogfQogCi12b2lkIEZvcm1hdHRpbmdD b250ZXh0Ojpjb21wdXRlT3V0T2ZGbG93SG9yaXpvbnRhbEdlb21ldHJ5KGNvbnN0IEJveCYgbGF5 b3V0Qm94LCBjb25zdCBIb3Jpem9udGFsQ29uc3RyYWludHMmIGhvcml6b250YWxDb25zdHJhaW50 cykKK3ZvaWQgRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVPdXRPZkZsb3dIb3Jpem9udGFsR2Vv bWV0cnkoY29uc3QgQm94JiBsYXlvdXRCb3gsIGNvbnN0IEhvcml6b250YWxDb25zdHJhaW50cyYg aG9yaXpvbnRhbENvbnN0cmFpbnRzLCBjb25zdCBWZXJ0aWNhbENvbnN0cmFpbnRzJiB2ZXJ0aWNh bENvbnN0cmFpbnRzKQogewogICAgIEFTU0VSVChsYXlvdXRCb3guaXNPdXRPZkZsb3dQb3NpdGlv bmVkKCkpOwogICAgIGF1dG8gY29tcHV0ZSA9IFsmXShPcHRpb25hbDxMYXlvdXRVbml0PiB1c2Vk V2lkdGgpIHsKLSAgICAgICAgcmV0dXJuIGdlb21ldHJ5KCkub3V0T2ZGbG93SG9yaXpvbnRhbEdl b21ldHJ5KGxheW91dEJveCwgaG9yaXpvbnRhbENvbnN0cmFpbnRzLCB7IHVzZWRXaWR0aCwgeyB9 IH0pOworICAgICAgICByZXR1cm4gZ2VvbWV0cnkoKS5vdXRPZkZsb3dIb3Jpem9udGFsR2VvbWV0 cnkobGF5b3V0Qm94LCBob3Jpem9udGFsQ29uc3RyYWludHMsIHZlcnRpY2FsQ29uc3RyYWludHMs IHsgdXNlZFdpZHRoLCB7IH0gfSk7CiAgICAgfTsKIAogICAgIGF1dG8gY29udGFpbmluZ0Jsb2Nr V2lkdGggPSBob3Jpem9udGFsQ29uc3RyYWludHMubG9naWNhbFdpZHRoOwpAQCAtMTY0LDcgKzE2 NCw4IEBAIHZvaWQgRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dE91dE9mRmxvd0NvbnRlbnQoSW52 YWxpZGF0aW9uU3RhdGUmIGludmFsaWRhdGlvblN0CiAgICAgICAgIGNvbXB1dGVCb3JkZXJBbmRQ YWRkaW5nKCpvdXRPZkZsb3dCb3gsIGhvcml6b250YWxDb25zdHJhaW50c0ZvckJvcmRlckFuZFBh ZGRpbmcpOwogCiAgICAgICAgIGF1dG8gaG9yaXpvbnRhbENvbnN0cmFpbnRzID0gb3V0T2ZGbG93 SG9yaXpvbnRhbENvbnN0cmFpbnRzLnZhbHVlOwotICAgICAgICBjb21wdXRlT3V0T2ZGbG93SG9y aXpvbnRhbEdlb21ldHJ5KCpvdXRPZkZsb3dCb3gsIGhvcml6b250YWxDb25zdHJhaW50cyk7Cisg ICAgICAgIGF1dG8gdmVydGljYWxDb25zdHJhaW50cyA9IHZlcnRpY2FsQ29uc3RyYWludHNGb3JM YXlvdXRCb3goKm91dE9mRmxvd0JveCk7CisgICAgICAgIGNvbXB1dGVPdXRPZkZsb3dIb3Jpem9u dGFsR2VvbWV0cnkoKm91dE9mRmxvd0JveCwgaG9yaXpvbnRhbENvbnN0cmFpbnRzLCB2ZXJ0aWNh bENvbnN0cmFpbnRzKTsKICAgICAgICAgaWYgKGlzPENvbnRhaW5lckJveD4oKm91dE9mRmxvd0Jv eCkpIHsKICAgICAgICAgICAgIGF1dG8mIGNvbnRhaW5lckJveCA9IGRvd25jYXN0PENvbnRhaW5l ckJveD4oKm91dE9mRmxvd0JveCk7CiAgICAgICAgICAgICBhdXRvJiBjb250YWluZXJEaXNwbGF5 Qm94ID0gZ2VvbWV0cnlGb3JCb3goY29udGFpbmVyQm94KTsKQEAgLTE3NSw3ICsxNzYsNyBAQCB2 b2lkIEZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRPdXRPZkZsb3dDb250ZW50KEludmFsaWRhdGlv blN0YXRlJiBpbnZhbGlkYXRpb25TdAogICAgICAgICAgICAgICAgIGF1dG8gZm9ybWF0dGluZ0Nv bnRleHQgPSBMYXlvdXRDb250ZXh0OjpjcmVhdGVGb3JtYXR0aW5nQ29udGV4dChjb250YWluZXJC b3gsIGxheW91dFN0YXRlKCkpOwogICAgICAgICAgICAgICAgIGZvcm1hdHRpbmdDb250ZXh0LT5s YXlvdXRJbkZsb3dDb250ZW50KGludmFsaWRhdGlvblN0YXRlLCBob3Jpem9udGFsQ29uc3RyYWlu dHNGb3JJbkZsb3dDb250ZW50LCB2ZXJ0aWNhbENvbnN0cmFpbnRzRm9ySW5GbG93Q29udGVudCk7 CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICBjb21wdXRlT3V0T2ZGbG93VmVydGljYWxHZW9t ZXRyeShjb250YWluZXJCb3gsIGhvcml6b250YWxDb25zdHJhaW50cywgdmVydGljYWxDb25zdHJh aW50c0ZvckxheW91dEJveChjb250YWluZXJCb3gpKTsKKyAgICAgICAgICAgIGNvbXB1dGVPdXRP ZkZsb3dWZXJ0aWNhbEdlb21ldHJ5KGNvbnRhaW5lckJveCwgaG9yaXpvbnRhbENvbnN0cmFpbnRz LCB2ZXJ0aWNhbENvbnN0cmFpbnRzKTsKICAgICAgICAgICAgIGlmIChjb250YWluZXJCb3guaGFz Q2hpbGQoKSkgewogICAgICAgICAgICAgICAgIGF1dG8gaG9yaXpvbnRhbENvbnN0cmFpbnRzRm9y T3V0T2ZGbG93Q29udGVudCA9ICBHZW9tZXRyeTo6aG9yaXpvbnRhbENvbnN0cmFpbnRzRm9yT3V0 T2ZGbG93KGNvbnRhaW5lckRpc3BsYXlCb3gpOwogICAgICAgICAgICAgICAgIGF1dG8gdmVydGlj YWxDb25zdHJhaW50c0Zvck91dE9mRmxvd0NvbnRlbnQgPSBHZW9tZXRyeTo6dmVydGljYWxDb25z dHJhaW50c0Zvck91dE9mRmxvdyhjb250YWluZXJEaXNwbGF5Qm94KTsKQEAgLTE4Myw3ICsxODQs NyBAQCB2b2lkIEZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRPdXRPZkZsb3dDb250ZW50KEludmFs aWRhdGlvblN0YXRlJiBpbnZhbGlkYXRpb25TdAogICAgICAgICAgICAgICAgIGZvcm1hdHRpbmdD b250ZXh0LT5sYXlvdXRPdXRPZkZsb3dDb250ZW50KGludmFsaWRhdGlvblN0YXRlLCBob3Jpem9u dGFsQ29uc3RyYWludHNGb3JPdXRPZkZsb3dDb250ZW50LCB2ZXJ0aWNhbENvbnN0cmFpbnRzRm9y T3V0T2ZGbG93Q29udGVudCk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0gZWxzZQotICAgICAg ICAgICAgY29tcHV0ZU91dE9mRmxvd1ZlcnRpY2FsR2VvbWV0cnkoKm91dE9mRmxvd0JveCwgaG9y aXpvbnRhbENvbnN0cmFpbnRzLCB2ZXJ0aWNhbENvbnN0cmFpbnRzRm9yTGF5b3V0Qm94KCpvdXRP ZkZsb3dCb3gpKTsKKyAgICAgICAgICAgIGNvbXB1dGVPdXRPZkZsb3dWZXJ0aWNhbEdlb21ldHJ5 KCpvdXRPZkZsb3dCb3gsIGhvcml6b250YWxDb25zdHJhaW50cywgdmVydGljYWxDb25zdHJhaW50 cyk7CiAgICAgfQogICAgIExPR19XSVRIX1NUUkVBTShGb3JtYXR0aW5nQ29udGV4dExheW91dCwg c3RyZWFtIDw8ICJFbmQ6IGxheW91dCBvdXQtb2YtZmxvdyBjb250ZW50IC0+IGNvbnRleHQ6ICIg PDwgJmxheW91dFN0YXRlKCkgPDwgIiByb290OiAiIDw8ICZyb290KCkpOwogfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmggYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuaAppbmRleCBlNzM2ZjBlOTU4ZTFmNGYxYzYw NzdkZWJmMjQ0MmM3YjdmOGI3YjJkLi44MThjZTA3MGI3NDcwNjFkNzlmZDM5NTVmMzRiMDg2NDg3 Nzg2OGU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRl eHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuaApAQCAt MTEwLDEzICsxMTAsMTMgQEAgcHJvdGVjdGVkOgogICAgIGNsYXNzIEdlb21ldHJ5IHsKICAgICBw dWJsaWM6CiAgICAgICAgIFZlcnRpY2FsR2VvbWV0cnkgb3V0T2ZGbG93VmVydGljYWxHZW9tZXRy eShjb25zdCBCb3gmLCBjb25zdCBIb3Jpem9udGFsQ29uc3RyYWludHMmLCBjb25zdCBWZXJ0aWNh bENvbnN0cmFpbnRzJiwgY29uc3QgT3ZlcnJpZGVWZXJ0aWNhbFZhbHVlcyYpIGNvbnN0OwotICAg ICAgICBIb3Jpem9udGFsR2VvbWV0cnkgb3V0T2ZGbG93SG9yaXpvbnRhbEdlb21ldHJ5KGNvbnN0 IEJveCYsIGNvbnN0IEhvcml6b250YWxDb25zdHJhaW50cyYsIGNvbnN0IE92ZXJyaWRlSG9yaXpv bnRhbFZhbHVlcyYpOworICAgICAgICBIb3Jpem9udGFsR2VvbWV0cnkgb3V0T2ZGbG93SG9yaXpv bnRhbEdlb21ldHJ5KGNvbnN0IEJveCYsIGNvbnN0IEhvcml6b250YWxDb25zdHJhaW50cyYsIGNv bnN0IFZlcnRpY2FsQ29uc3RyYWludHMmLCBjb25zdCBPdmVycmlkZUhvcml6b250YWxWYWx1ZXMm KTsKIAogICAgICAgICBDb250ZW50SGVpZ2h0QW5kTWFyZ2luIGZsb2F0aW5nSGVpZ2h0QW5kTWFy Z2luKGNvbnN0IEJveCYsIGNvbnN0IEhvcml6b250YWxDb25zdHJhaW50cyYsIGNvbnN0IE92ZXJy aWRlVmVydGljYWxWYWx1ZXMmKSBjb25zdDsKICAgICAgICAgQ29udGVudFdpZHRoQW5kTWFyZ2lu IGZsb2F0aW5nV2lkdGhBbmRNYXJnaW4oY29uc3QgQm94JiwgY29uc3QgSG9yaXpvbnRhbENvbnN0 cmFpbnRzJiwgY29uc3QgT3ZlcnJpZGVIb3Jpem9udGFsVmFsdWVzJik7CiAKICAgICAgICAgQ29u dGVudEhlaWdodEFuZE1hcmdpbiBpbmxpbmVSZXBsYWNlZEhlaWdodEFuZE1hcmdpbihjb25zdCBS ZXBsYWNlZEJveCYsIGNvbnN0IEhvcml6b250YWxDb25zdHJhaW50cyYsIE9wdGlvbmFsPFZlcnRp Y2FsQ29uc3RyYWludHM+LCBjb25zdCBPdmVycmlkZVZlcnRpY2FsVmFsdWVzJikgY29uc3Q7Ci0g ICAgICAgIENvbnRlbnRXaWR0aEFuZE1hcmdpbiBpbmxpbmVSZXBsYWNlZFdpZHRoQW5kTWFyZ2lu KGNvbnN0IFJlcGxhY2VkQm94JiwgY29uc3QgSG9yaXpvbnRhbENvbnN0cmFpbnRzJiwgY29uc3Qg T3ZlcnJpZGVIb3Jpem9udGFsVmFsdWVzJikgY29uc3Q7CisgICAgICAgIENvbnRlbnRXaWR0aEFu ZE1hcmdpbiBpbmxpbmVSZXBsYWNlZFdpZHRoQW5kTWFyZ2luKGNvbnN0IFJlcGxhY2VkQm94Jiwg Y29uc3QgSG9yaXpvbnRhbENvbnN0cmFpbnRzJiwgT3B0aW9uYWw8VmVydGljYWxDb25zdHJhaW50 cz4sIGNvbnN0IE92ZXJyaWRlSG9yaXpvbnRhbFZhbHVlcyYpIGNvbnN0OwogCiAgICAgICAgIExh eW91dFNpemUgaW5GbG93UG9zaXRpb25lZFBvc2l0aW9uT2Zmc2V0KGNvbnN0IEJveCYsIGNvbnN0 IEhvcml6b250YWxDb25zdHJhaW50cyYpIGNvbnN0OwogCkBAIC0xNjIsNyArMTYyLDcgQEAgcHJv dGVjdGVkOgogCiAgICAgcHJpdmF0ZToKICAgICAgICAgVmVydGljYWxHZW9tZXRyeSBvdXRPZkZs b3dSZXBsYWNlZFZlcnRpY2FsR2VvbWV0cnkoY29uc3QgUmVwbGFjZWRCb3gmLCBjb25zdCBIb3Jp em9udGFsQ29uc3RyYWludHMmLCBjb25zdCBWZXJ0aWNhbENvbnN0cmFpbnRzJiwgY29uc3QgT3Zl cnJpZGVWZXJ0aWNhbFZhbHVlcyYpIGNvbnN0OwotICAgICAgICBIb3Jpem9udGFsR2VvbWV0cnkg b3V0T2ZGbG93UmVwbGFjZWRIb3Jpem9udGFsR2VvbWV0cnkoY29uc3QgUmVwbGFjZWRCb3gmLCBj b25zdCBIb3Jpem9udGFsQ29uc3RyYWludHMmLCBjb25zdCBPdmVycmlkZUhvcml6b250YWxWYWx1 ZXMmKSBjb25zdDsKKyAgICAgICAgSG9yaXpvbnRhbEdlb21ldHJ5IG91dE9mRmxvd1JlcGxhY2Vk SG9yaXpvbnRhbEdlb21ldHJ5KGNvbnN0IFJlcGxhY2VkQm94JiwgY29uc3QgSG9yaXpvbnRhbENv bnN0cmFpbnRzJiwgY29uc3QgVmVydGljYWxDb25zdHJhaW50cyYsIGNvbnN0IE92ZXJyaWRlSG9y aXpvbnRhbFZhbHVlcyYpIGNvbnN0OwogCiAgICAgICAgIFZlcnRpY2FsR2VvbWV0cnkgb3V0T2ZG bG93Tm9uUmVwbGFjZWRWZXJ0aWNhbEdlb21ldHJ5KGNvbnN0IEJveCYsIGNvbnN0IEhvcml6b250 YWxDb25zdHJhaW50cyYsIGNvbnN0IFZlcnRpY2FsQ29uc3RyYWludHMmLCBjb25zdCBPdmVycmlk ZVZlcnRpY2FsVmFsdWVzJikgY29uc3Q7CiAgICAgICAgIEhvcml6b250YWxHZW9tZXRyeSBvdXRP ZkZsb3dOb25SZXBsYWNlZEhvcml6b250YWxHZW9tZXRyeShjb25zdCBCb3gmLCBjb25zdCBIb3Jp em9udGFsQ29uc3RyYWludHMmLCBjb25zdCBPdmVycmlkZUhvcml6b250YWxWYWx1ZXMmKTsKQEAg LTE5OCw3ICsxOTgsNyBAQCBwcm90ZWN0ZWQ6CiBwcml2YXRlOgogICAgIHZvaWQgY29sbGVjdE91 dE9mRmxvd0Rlc2NlbmRhbnRzSWZOZWVkZWQoKTsKICAgICB2b2lkIGNvbXB1dGVPdXRPZkZsb3dW ZXJ0aWNhbEdlb21ldHJ5KGNvbnN0IEJveCYsIGNvbnN0IEhvcml6b250YWxDb25zdHJhaW50cyYs IGNvbnN0IFZlcnRpY2FsQ29uc3RyYWludHMmKTsKLSAgICB2b2lkIGNvbXB1dGVPdXRPZkZsb3dI b3Jpem9udGFsR2VvbWV0cnkoY29uc3QgQm94JiwgY29uc3QgSG9yaXpvbnRhbENvbnN0cmFpbnRz Jik7CisgICAgdm9pZCBjb21wdXRlT3V0T2ZGbG93SG9yaXpvbnRhbEdlb21ldHJ5KGNvbnN0IEJv eCYsIGNvbnN0IEhvcml6b250YWxDb25zdHJhaW50cyYsIGNvbnN0IFZlcnRpY2FsQ29uc3RyYWlu dHMmKTsKIAogICAgIFdlYWtQdHI8Y29uc3QgQ29udGFpbmVyQm94PiBtX3Jvb3Q7CiAgICAgRm9y bWF0dGluZ1N0YXRlJiBtX2Zvcm1hdHRpbmdTdGF0ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAppbmRleCA5MWQ4MzZjNDQyNmNh MDVhZTY2NjU3OTIyYWYyYmFkN2QzNmI0NGMzLi5lNzk1OWE0Y2JhNzE5NWQyNTcwNTg1NTI2MjEz MzVjYzk5YjM1M2QyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGlu Z0NvbnRleHRHZW9tZXRyeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRp bmdDb250ZXh0R2VvbWV0cnkuY3BwCkBAIC02NDEsNyArNjQxLDcgQEAgVmVydGljYWxHZW9tZXRy eSBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Om91dE9mRmxvd1JlcGxhY2VkVmVydGljYWxH ZW9tZXRyeSgKICAgICByZXR1cm4geyAqdG9wLCAqYm90dG9tLCB7IGhlaWdodCwgeyAqdXNlZE1h cmdpbkJlZm9yZSwgKnVzZWRNYXJnaW5BZnRlciB9IH0gfTsKIH0KIAotSG9yaXpvbnRhbEdlb21l dHJ5IEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6b3V0T2ZGbG93UmVwbGFjZWRIb3Jpem9u dGFsR2VvbWV0cnkoY29uc3QgUmVwbGFjZWRCb3gmIHJlcGxhY2VkQm94LCBjb25zdCBIb3Jpem9u dGFsQ29uc3RyYWludHMmIGhvcml6b250YWxDb25zdHJhaW50cywgY29uc3QgT3ZlcnJpZGVIb3Jp em9udGFsVmFsdWVzJiBvdmVycmlkZUhvcml6b250YWxWYWx1ZXMpIGNvbnN0CitIb3Jpem9udGFs R2VvbWV0cnkgRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpvdXRPZkZsb3dSZXBsYWNlZEhv cml6b250YWxHZW9tZXRyeShjb25zdCBSZXBsYWNlZEJveCYgcmVwbGFjZWRCb3gsIGNvbnN0IEhv cml6b250YWxDb25zdHJhaW50cyYgaG9yaXpvbnRhbENvbnN0cmFpbnRzLCBjb25zdCBWZXJ0aWNh bENvbnN0cmFpbnRzJiB2ZXJ0aWNhbENvbnN0cmFpbnRzLCBjb25zdCBPdmVycmlkZUhvcml6b250 YWxWYWx1ZXMmIG92ZXJyaWRlSG9yaXpvbnRhbFZhbHVlcykgY29uc3QKIHsKICAgICBBU1NFUlQo cmVwbGFjZWRCb3guaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkpOwogCkBAIC02NzAsNyArNjcwLDcg QEAgSG9yaXpvbnRhbEdlb21ldHJ5IEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6b3V0T2ZG bG93UmVwbGFjZWRIb3Jpem9udGFsR2VvbWUKICAgICBhdXRvIGNvbXB1dGVkSG9yaXpvbnRhbE1h cmdpbiA9IEdlb21ldHJ5Ojpjb21wdXRlZEhvcml6b250YWxNYXJnaW4ocmVwbGFjZWRCb3gsIGhv cml6b250YWxDb25zdHJhaW50cyk7CiAgICAgT3B0aW9uYWw8TGF5b3V0VW5pdD4gdXNlZE1hcmdp blN0YXJ0ID0gY29tcHV0ZWRIb3Jpem9udGFsTWFyZ2luLnN0YXJ0OwogICAgIE9wdGlvbmFsPExh eW91dFVuaXQ+IHVzZWRNYXJnaW5FbmQgPSBjb21wdXRlZEhvcml6b250YWxNYXJnaW4uZW5kOwot ICAgIGF1dG8gd2lkdGggPSBpbmxpbmVSZXBsYWNlZFdpZHRoQW5kTWFyZ2luKHJlcGxhY2VkQm94 LCBob3Jpem9udGFsQ29uc3RyYWludHMsIG92ZXJyaWRlSG9yaXpvbnRhbFZhbHVlcykuY29udGVu dFdpZHRoOworICAgIGF1dG8gd2lkdGggPSBpbmxpbmVSZXBsYWNlZFdpZHRoQW5kTWFyZ2luKHJl cGxhY2VkQm94LCBob3Jpem9udGFsQ29uc3RyYWludHMsIHZlcnRpY2FsQ29uc3RyYWludHMsIG92 ZXJyaWRlSG9yaXpvbnRhbFZhbHVlcykuY29udGVudFdpZHRoOwogICAgIGF1dG8gcGFkZGluZ0xl ZnQgPSBib3hHZW9tZXRyeS5wYWRkaW5nTGVmdCgpLnZhbHVlT3IoMCk7CiAgICAgYXV0byBwYWRk aW5nUmlnaHQgPSBib3hHZW9tZXRyeS5wYWRkaW5nUmlnaHQoKS52YWx1ZU9yKDApOwogICAgIGF1 dG8gYm9yZGVyTGVmdCA9IGJveEdlb21ldHJ5LmJvcmRlckxlZnQoKTsKQEAgLTgyMCw3ICs4MjAs NyBAQCBDb250ZW50V2lkdGhBbmRNYXJnaW4gRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5Ojpm bG9hdGluZ1JlcGxhY2VkV2lkdGhBbmRNYXJnaQogCiAgICAgTE9HX1dJVEhfU1RSRUFNKEZvcm1h dHRpbmdDb250ZXh0TGF5b3V0LCBzdHJlYW0gPDwgIltIZWlnaHRdW01hcmdpbl0gLT4gZmxvYXRp bmcgcmVwbGFjZWQgLT4gcmVkaXJlY3RlZCB0byBpbmxpbmUgcmVwbGFjZWQiKTsKICAgICBhdXRv IHVzZWRNYXJnaW4gPSBVc2VkSG9yaXpvbnRhbE1hcmdpbiB7IGNvbXB1dGVkSG9yaXpvbnRhbE1h cmdpbi5zdGFydC52YWx1ZU9yKDApLCBjb21wdXRlZEhvcml6b250YWxNYXJnaW4uZW5kLnZhbHVl T3IoMCkgfTsKLSAgICByZXR1cm4gaW5saW5lUmVwbGFjZWRXaWR0aEFuZE1hcmdpbihyZXBsYWNl ZEJveCwgaG9yaXpvbnRhbENvbnN0cmFpbnRzLCB7IG92ZXJyaWRlSG9yaXpvbnRhbFZhbHVlcy53 aWR0aCwgdXNlZE1hcmdpbiB9KTsKKyAgICByZXR1cm4gaW5saW5lUmVwbGFjZWRXaWR0aEFuZE1h cmdpbihyZXBsYWNlZEJveCwgaG9yaXpvbnRhbENvbnN0cmFpbnRzLCB7IH0sIHsgb3ZlcnJpZGVI b3Jpem9udGFsVmFsdWVzLndpZHRoLCB1c2VkTWFyZ2luIH0pOwogfQogCiBWZXJ0aWNhbEdlb21l dHJ5IEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6b3V0T2ZGbG93VmVydGljYWxHZW9tZXRy eShjb25zdCBCb3gmIGxheW91dEJveCwgY29uc3QgSG9yaXpvbnRhbENvbnN0cmFpbnRzJiBob3Jp em9udGFsQ29uc3RyYWludHMsIGNvbnN0IFZlcnRpY2FsQ29uc3RyYWludHMmIHZlcnRpY2FsQ29u c3RyYWludHMsIGNvbnN0IE92ZXJyaWRlVmVydGljYWxWYWx1ZXMmIG92ZXJyaWRlVmVydGljYWxW YWx1ZXMpIGNvbnN0CkBAIC04MzIsMTMgKzgzMiwxMyBAQCBWZXJ0aWNhbEdlb21ldHJ5IEZvcm1h dHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6b3V0T2ZGbG93VmVydGljYWxHZW9tZXRyeShjb25zdCBC bwogICAgIHJldHVybiBvdXRPZkZsb3dSZXBsYWNlZFZlcnRpY2FsR2VvbWV0cnkoZG93bmNhc3Q8 UmVwbGFjZWRCb3g+KGxheW91dEJveCksIGhvcml6b250YWxDb25zdHJhaW50cywgdmVydGljYWxD b25zdHJhaW50cywgb3ZlcnJpZGVWZXJ0aWNhbFZhbHVlcyk7CiB9CiAKLUhvcml6b250YWxHZW9t ZXRyeSBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Om91dE9mRmxvd0hvcml6b250YWxHZW9t ZXRyeShjb25zdCBCb3gmIGxheW91dEJveCwgY29uc3QgSG9yaXpvbnRhbENvbnN0cmFpbnRzJiBo b3Jpem9udGFsQ29uc3RyYWludHMsIGNvbnN0IE92ZXJyaWRlSG9yaXpvbnRhbFZhbHVlcyYgb3Zl cnJpZGVIb3Jpem9udGFsVmFsdWVzKQorSG9yaXpvbnRhbEdlb21ldHJ5IEZvcm1hdHRpbmdDb250 ZXh0OjpHZW9tZXRyeTo6b3V0T2ZGbG93SG9yaXpvbnRhbEdlb21ldHJ5KGNvbnN0IEJveCYgbGF5 b3V0Qm94LCBjb25zdCBIb3Jpem9udGFsQ29uc3RyYWludHMmIGhvcml6b250YWxDb25zdHJhaW50 cywgY29uc3QgVmVydGljYWxDb25zdHJhaW50cyYgdmVydGljYWxDb25zdHJhaW50cywgY29uc3Qg T3ZlcnJpZGVIb3Jpem9udGFsVmFsdWVzJiBvdmVycmlkZUhvcml6b250YWxWYWx1ZXMpCiB7CiAg ICAgQVNTRVJUKGxheW91dEJveC5pc091dE9mRmxvd1Bvc2l0aW9uZWQoKSk7CiAKICAgICBpZiAo IWxheW91dEJveC5pc1JlcGxhY2VkQm94KCkpCiAgICAgICAgIHJldHVybiBvdXRPZkZsb3dOb25S ZXBsYWNlZEhvcml6b250YWxHZW9tZXRyeShsYXlvdXRCb3gsIGhvcml6b250YWxDb25zdHJhaW50 cywgb3ZlcnJpZGVIb3Jpem9udGFsVmFsdWVzKTsKLSAgICByZXR1cm4gb3V0T2ZGbG93UmVwbGFj ZWRIb3Jpem9udGFsR2VvbWV0cnkoZG93bmNhc3Q8UmVwbGFjZWRCb3g+KGxheW91dEJveCksIGhv cml6b250YWxDb25zdHJhaW50cywgb3ZlcnJpZGVIb3Jpem9udGFsVmFsdWVzKTsKKyAgICByZXR1 cm4gb3V0T2ZGbG93UmVwbGFjZWRIb3Jpem9udGFsR2VvbWV0cnkoZG93bmNhc3Q8UmVwbGFjZWRC b3g+KGxheW91dEJveCksIGhvcml6b250YWxDb25zdHJhaW50cywgdmVydGljYWxDb25zdHJhaW50 cywgb3ZlcnJpZGVIb3Jpem9udGFsVmFsdWVzKTsKIH0KIAogQ29udGVudEhlaWdodEFuZE1hcmdp biBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmZsb2F0aW5nSGVpZ2h0QW5kTWFyZ2luKGNv bnN0IEJveCYgbGF5b3V0Qm94LCBjb25zdCBIb3Jpem9udGFsQ29uc3RyYWludHMmIGhvcml6b250 YWxDb25zdHJhaW50cywgY29uc3QgT3ZlcnJpZGVWZXJ0aWNhbFZhbHVlcyYgb3ZlcnJpZGVWZXJ0 aWNhbFZhbHVlcykgY29uc3QKQEAgLTkwMiw3ICs5MDIsNyBAQCBDb250ZW50SGVpZ2h0QW5kTWFy Z2luIEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6aW5saW5lUmVwbGFjZWRIZWlnaHRBbmRN YXJnaQogICAgIHJldHVybiB7ICpoZWlnaHQsIHVzZWRWZXJ0aWNhbE1hcmdpbiB9OwogfQogCi1D b250ZW50V2lkdGhBbmRNYXJnaW4gRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjppbmxpbmVS ZXBsYWNlZFdpZHRoQW5kTWFyZ2luKGNvbnN0IFJlcGxhY2VkQm94JiByZXBsYWNlZEJveCwgY29u c3QgSG9yaXpvbnRhbENvbnN0cmFpbnRzJiBob3Jpem9udGFsQ29uc3RyYWludHMsIGNvbnN0IE92 ZXJyaWRlSG9yaXpvbnRhbFZhbHVlcyYgb3ZlcnJpZGVIb3Jpem9udGFsVmFsdWVzKSBjb25zdAor Q29udGVudFdpZHRoQW5kTWFyZ2luIEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6aW5saW5l UmVwbGFjZWRXaWR0aEFuZE1hcmdpbihjb25zdCBSZXBsYWNlZEJveCYgcmVwbGFjZWRCb3gsIGNv bnN0IEhvcml6b250YWxDb25zdHJhaW50cyYgaG9yaXpvbnRhbENvbnN0cmFpbnRzLCBPcHRpb25h bDxWZXJ0aWNhbENvbnN0cmFpbnRzPiB2ZXJ0aWNhbENvbnN0cmFpbnRzLCBjb25zdCBPdmVycmlk ZUhvcml6b250YWxWYWx1ZXMmIG92ZXJyaWRlSG9yaXpvbnRhbFZhbHVlcykgY29uc3QKIHsKICAg ICAvLyAxMC4zLjIgSW5saW5lLCByZXBsYWNlZCBlbGVtZW50cwogICAgIC8vCkBAIC05MzksNyAr OTM5LDcgQEAgQ29udGVudFdpZHRoQW5kTWFyZ2luIEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRy eTo6aW5saW5lUmVwbGFjZWRXaWR0aEFuZE1hcmdpbigKIAogICAgIGF1dG8gd2lkdGggPSBvdmVy cmlkZUhvcml6b250YWxWYWx1ZXMud2lkdGggPyBvdmVycmlkZUhvcml6b250YWxWYWx1ZXMud2lk dGggOiBjb21wdXRlZENvbnRlbnRXaWR0aChyZXBsYWNlZEJveCwgaG9yaXpvbnRhbENvbnN0cmFp bnRzLmxvZ2ljYWxXaWR0aCk7CiAgICAgYXV0byBoZWlnaHRJc0F1dG8gPSBpc0hlaWdodEF1dG8o cmVwbGFjZWRCb3gpOwotICAgIGF1dG8gaGVpZ2h0ID0gY29tcHV0ZWRDb250ZW50SGVpZ2h0KHJl cGxhY2VkQm94KTsKKyAgICBhdXRvIGhlaWdodCA9IGNvbXB1dGVkQ29udGVudEhlaWdodChyZXBs YWNlZEJveCwgdmVydGljYWxDb25zdHJhaW50cyA/IHZlcnRpY2FsQ29uc3RyYWludHMtPmxvZ2lj YWxIZWlnaHQgOiBXVEY6Om51bGxvcHQpOwogCiAgICAgaWYgKCF3aWR0aCAmJiBoZWlnaHRJc0F1 dG8gJiYgcmVwbGFjZWRCb3guaGFzSW50cmluc2ljV2lkdGgoKSkgewogICAgICAgICAvLyAjMQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zv cm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2Nr Zm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCmluZGV4IDQzODE3 YTRlY2FlMmExN2EwN2JmZTJhZDRmYWJjZTU1Njc2OWJiOTIuLjZkMjNiZjAwOWEwYmE2OTFkM2Jh MmM3ZDMyMzZmMWMzNWE1OGRhYWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9i bG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRl eHRHZW9tZXRyeS5jcHAKQEAgLTIxMSw3ICsyMTEsNyBAQCBDb250ZW50V2lkdGhBbmRNYXJnaW4g QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmluRmxvd1JlcGxhY2VkV2lkdGhBbmRN YQogICAgIC8vIDIuIFRoZW4gdGhlIHJ1bGVzIGZvciBub24tcmVwbGFjZWQgYmxvY2stbGV2ZWwg ZWxlbWVudHMgYXJlIGFwcGxpZWQgdG8gZGV0ZXJtaW5lIHRoZSBtYXJnaW5zLgogCiAgICAgLy8g IzEKLSAgICBhdXRvIHVzZWRXaWR0aCA9IGlubGluZVJlcGxhY2VkV2lkdGhBbmRNYXJnaW4ocmVw bGFjZWRCb3gsIGhvcml6b250YWxDb25zdHJhaW50cywgb3ZlcnJpZGVIb3Jpem9udGFsVmFsdWVz KS5jb250ZW50V2lkdGg7CisgICAgYXV0byB1c2VkV2lkdGggPSBpbmxpbmVSZXBsYWNlZFdpZHRo QW5kTWFyZ2luKHJlcGxhY2VkQm94LCBob3Jpem9udGFsQ29uc3RyYWludHMsIHsgfSwgb3ZlcnJp ZGVIb3Jpem9udGFsVmFsdWVzKS5jb250ZW50V2lkdGg7CiAgICAgLy8gIzIKICAgICBhdXRvIG5v blJlcGxhY2VkV2lkdGhBbmRNYXJnaW4gPSBpbkZsb3dOb25SZXBsYWNlZFdpZHRoQW5kTWFyZ2lu KHJlcGxhY2VkQm94LCBob3Jpem9udGFsQ29uc3RyYWludHMsIE92ZXJyaWRlSG9yaXpvbnRhbFZh bHVlcyB7IHVzZWRXaWR0aCwgb3ZlcnJpZGVIb3Jpem9udGFsVmFsdWVzLm1hcmdpbiB9KTsKIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l Rm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IDY0MzNjNjUzZTA5MzdlYTRl MzU1MTVjZjNkZGI5ZDc0OTg0OTg3MzAuLjJkYTE1Zjc4YjJjN2Q3NDQyMGI2MjE0ODlhZGIzN2Vj NTU1ZDdmYjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTI4Myw3 ICsyODMsNyBAQCB2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlV2lkdGhBbmRN YXJnaW4oY29uc3QgQm94JiBsYXlvdXRCb3gsIGNvbnN0CiAgICAgZWxzZSBpZiAobGF5b3V0Qm94 LmlzSW5saW5lQmxvY2tCb3goKSkKICAgICAgICAgY29udGVudFdpZHRoQW5kTWFyZ2luID0gZ2Vv bWV0cnkoKS5pbmxpbmVCbG9ja1dpZHRoQW5kTWFyZ2luKGxheW91dEJveCwgaG9yaXpvbnRhbENv bnN0cmFpbnRzLCB1c2VkV2lkdGgpOwogICAgIGVsc2UgaWYgKGxheW91dEJveC5pc1JlcGxhY2Vk Qm94KCkpCi0gICAgICAgIGNvbnRlbnRXaWR0aEFuZE1hcmdpbiA9IGdlb21ldHJ5KCkuaW5saW5l UmVwbGFjZWRXaWR0aEFuZE1hcmdpbihkb3duY2FzdDxSZXBsYWNlZEJveD4obGF5b3V0Qm94KSwg aG9yaXpvbnRhbENvbnN0cmFpbnRzLCB1c2VkV2lkdGgpOworICAgICAgICBjb250ZW50V2lkdGhB bmRNYXJnaW4gPSBnZW9tZXRyeSgpLmlubGluZVJlcGxhY2VkV2lkdGhBbmRNYXJnaW4oZG93bmNh c3Q8UmVwbGFjZWRCb3g+KGxheW91dEJveCksIGhvcml6b250YWxDb25zdHJhaW50cywgeyB9LCB1 c2VkV2lkdGgpOwogICAgIGVsc2UKICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZv cm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKaW5kZXggNWY0 ZDJlNGJlMTk3NTMwNzA3ZDc4MTNiOGZlNjQ1OWNjY2I1N2M5OS4uZTJjMTZlMDMzOWJkNjJmYWQ5 MzVmNDhjMWU1Y2QyODkzMTM2NDE3NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGlu Z0NvbnRleHRHZW9tZXRyeS5jcHAKQEAgLTQ0LDcgKzQ0LDcgQEAgQ29udGVudFdpZHRoQW5kTWFy Z2luIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6aW5saW5lQmxvY2tXaWR0aEFu ZE1hcmcKIAogICAgIC8vIEV4YWN0bHkgYXMgaW5saW5lIHJlcGxhY2VkIGVsZW1lbnRzLgogICAg IGlmIChmb3JtYXR0aW5nQ29udGV4dFJvb3QuaXNSZXBsYWNlZEJveCgpKQotICAgICAgICByZXR1 cm4gaW5saW5lUmVwbGFjZWRXaWR0aEFuZE1hcmdpbihkb3duY2FzdDxSZXBsYWNlZEJveD4oZm9y bWF0dGluZ0NvbnRleHRSb290KSwgaG9yaXpvbnRhbENvbnN0cmFpbnRzLCBvdmVycmlkZUhvcml6 b250YWxWYWx1ZXMpOworICAgICAgICByZXR1cm4gaW5saW5lUmVwbGFjZWRXaWR0aEFuZE1hcmdp bihkb3duY2FzdDxSZXBsYWNlZEJveD4oZm9ybWF0dGluZ0NvbnRleHRSb290KSwgaG9yaXpvbnRh bENvbnN0cmFpbnRzLCB7IH0sIG92ZXJyaWRlSG9yaXpvbnRhbFZhbHVlcyk7CiAKICAgICAvLyAx MC4zLjkgJ0lubGluZS1ibG9jaycsIG5vbi1yZXBsYWNlZCBlbGVtZW50cyBpbiBub3JtYWwgZmxv dwogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKaW5kZXggNjdiOTQ3YjY5ZDU5YmM4MWE3NjVjNGI4ZjUxNzRiMGQwZmQ4Mjg0MC4uMGZh Nzc4OWJmOWNiZDU0NTBjODlmYzM2Yzc0ZTc2ZGE5MzY2OWRiOSAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0 IEBACisyMDIwLTAyLTE2ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAg ICAgW0xGQ11bT3V0LW9mLWZsb3ddIEZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlT3V0T2ZGbG93 SG9yaXpvbnRhbEdlb21ldHJ5IG5lZWRzIHZlcnRpY2FsQ29uc3RyYWludHMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNzgzMgorICAgICAgICA8cmRh cjovL3Byb2JsZW0vNTk0OTk4NDQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBmYXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L3NpbXBsZS1hYnNv bHV0ZS1wb3NpdGlvbmVkLXJlcGxhY2VkLWlubGluZS1lbGVtZW50LXdpdGgtcGVyY2VudGFnZS1o ZWlnaHQtZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC9sYXlvdXRmb3JtYXR0 aW5nY29udGV4dC9zaW1wbGUtYWJzb2x1dGUtcG9zaXRpb25lZC1yZXBsYWNlZC1pbmxpbmUtZWxl bWVudC13aXRoLXBlcmNlbnRhZ2UtaGVpZ2h0Lmh0bWw6IEFkZGVkLgorCiAyMDIwLTAyLTE2ICBa YWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ10gUmVtb3ZlIFJl cGxhY2VkQm94OjptX2xheW91dEJveApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9sYXlv dXRmb3JtYXR0aW5nY29udGV4dC9zaW1wbGUtYWJzb2x1dGUtcG9zaXRpb25lZC1yZXBsYWNlZC1p bmxpbmUtZWxlbWVudC13aXRoLXBlcmNlbnRhZ2UtaGVpZ2h0LWV4cGVjdGVkLmh0bWwgYi9MYXlv dXRUZXN0cy9mYXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L3NpbXBsZS1hYnNvbHV0ZS1wb3Np dGlvbmVkLXJlcGxhY2VkLWlubGluZS1lbGVtZW50LXdpdGgtcGVyY2VudGFnZS1oZWlnaHQtZXhw ZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4wMGVkNmE0OGI1ZjdlZDFhMDY3OTYzN2Y2ZmY0N2NhZDgz NDMxYzM2Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9sYXlvdXRmb3JtYXR0 aW5nY29udGV4dC9zaW1wbGUtYWJzb2x1dGUtcG9zaXRpb25lZC1yZXBsYWNlZC1pbmxpbmUtZWxl bWVudC13aXRoLXBlcmNlbnRhZ2UtaGVpZ2h0LWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSw5IEBA Cis8IS0tIHdlYmtpdC10ZXN0LXJ1bm5lciBbIGludGVybmFsOkxheW91dEZvcm1hdHRpbmdDb250 ZXh0RW5hYmxlZD10cnVlIGludGVybmFsOkxheW91dEZvcm1hdHRpbmdDb250ZXh0SW50ZWdyYXRp b25FbmFibGVkPWZhbHNlIF0gLS0+Cis8c3R5bGU+CitkaXYgeworICAgIHdpZHRoOiAzMDBweDsK KyAgICBoZWlnaHQ6IDMwMHB4OworICAgIGJvcmRlcjogMXB4IHNvbGlkIGdyZWVuOworfQorPC9z dHlsZT4KKzxkaXY+PC9kaXY+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2xheW91dGZv cm1hdHRpbmdjb250ZXh0L3NpbXBsZS1hYnNvbHV0ZS1wb3NpdGlvbmVkLXJlcGxhY2VkLWlubGlu ZS1lbGVtZW50LXdpdGgtcGVyY2VudGFnZS1oZWlnaHQuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qv bGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvc2ltcGxlLWFic29sdXRlLXBvc2l0aW9uZWQtcmVwbGFj ZWQtaW5saW5lLWVsZW1lbnQtd2l0aC1wZXJjZW50YWdlLWhlaWdodC5odG1sCm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAu LmE1NjQzZThjZmY1YzNhNGQzMWY4ZWRhZmI5MWQyNjg0ZTFiMWNkYzgKLS0tIC9kZXYvbnVsbAor KysgYi9MYXlvdXRUZXN0cy9mYXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L3NpbXBsZS1hYnNv bHV0ZS1wb3NpdGlvbmVkLXJlcGxhY2VkLWlubGluZS1lbGVtZW50LXdpdGgtcGVyY2VudGFnZS1o ZWlnaHQuaHRtbApAQCAtMCwwICsxLDkgQEAKKzwhLS0gd2Via2l0LXRlc3QtcnVubmVyIFsgaW50 ZXJuYWw6TGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRFbmFibGVkPXRydWUgaW50ZXJuYWw6TGF5b3V0 Rm9ybWF0dGluZ0NvbnRleHRJbnRlZ3JhdGlvbkVuYWJsZWQ9ZmFsc2UgXSAtLT4KKzxzdHlsZT4K K2lmcmFtZSB7CisgICAgcG9zaXRpb246IGFic29sdXRlOworICAgIGhlaWdodDogNTAlOworICAg IGJvcmRlcjogMXB4IHNvbGlkIGdyZWVuOworfQorPC9zdHlsZT4KKzxkaXY+PGlmcmFtZSBmcmFt ZWJvcmRlcj1ubz48L2lmcmFtZT48L2Rpdj4K