201880 2019-09-17 12:45:24 -0700 [LFC] FormattingContext::Geometry::computedHeight* functions need containingBlockHeight only. 2019-09-18 08:53:14 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 201795 1 zalan zalan bfulgham commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1571632 0 zalan 2019-09-17 12:45:24 -0700 and not all the UsedVerticalValues. 1571633 1 webkit-bug-importer 2019-09-17 12:45:55 -0700 <rdar://problem/55449623> 1571634 2 378980 zalan 2019-09-17 12:48:25 -0700 Created attachment 378980 Patch 1571910 3 378980 commit-queue 2019-09-18 08:53:12 -0700 Comment on attachment 378980 Patch Clearing flags on attachment: 378980 Committed r250035: <https://trac.webkit.org/changeset/250035> 1571911 4 commit-queue 2019-09-18 08:53:14 -0700 All reviewed patches have been landed. Closing bug. 378980 2019-09-17 12:48:25 -0700 2019-09-18 08:53:12 -0700 Patch bug-201880-20190917124824.patch text/plain 17185 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ5OTU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmZhZThjOGY4OTBiNThi OGMzNDMyYWU3MWFlMzU2ZjNmNzQwMGNjZS4uNWY1YmQ1OGI0MGI0NzAyMmFiYzY5YjhiOThkYzBi YWMyNjRlMmI5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE5LTA5LTE3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gRm9ybWF0dGluZ0Nv bnRleHQ6Okdlb21ldHJ5Ojpjb21wdXRlZEhlaWdodCogZnVuY3Rpb25zIG5lZWQgY29udGFpbmlu Z0Jsb2NrSGVpZ2h0IG9ubHkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMDE4ODAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU1NDQ5NjIzPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIExldCdzIHRpZ2h0 ZW4gdGhlIGluY29taW5nIHZlcnRpY2FsIHBhcmFtZXRlci4KKworICAgICAgICAqIGxheW91dC9G b3JtYXR0aW5nQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRp bmdDb250ZXh0Ojpjb21wdXRlT3V0T2ZGbG93SG9yaXpvbnRhbEdlb21ldHJ5KToKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVPdXRPZkZsb3dWZXJ0 aWNhbEdlb21ldHJ5KToKKyAgICAgICAgKiBsYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuaDoKKyAg ICAgICAgKiBsYXlvdXQvRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6Y29tcHV0ZWRIZWln aHRWYWx1ZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdDb250 ZXh0OjpHZW9tZXRyeTo6Y29tcHV0ZWRNYXhIZWlnaHQgY29uc3QpOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmNvbXB1dGVkTWluSGVpZ2h0 IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6Okdl b21ldHJ5OjpvdXRPZkZsb3dOb25SZXBsYWNlZFZlcnRpY2FsR2VvbWV0cnkgY29uc3QpOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Om91dE9m Rmxvd1JlcGxhY2VkSG9yaXpvbnRhbEdlb21ldHJ5IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpvdXRPZkZsb3dIb3Jpem9udGFs R2VvbWV0cnkpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6 R2VvbWV0cnk6OmlubGluZVJlcGxhY2VkSGVpZ2h0QW5kTWFyZ2luIGNvbnN0KToKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjppbmxpbmVSZXBs YWNlZFdpZHRoQW5kTWFyZ2luIGNvbnN0KToKKwogMjAxOS0wOS0xNyAgWmFsYW4gQnVqdGFzICA8 emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNbTWFyZ2luQ29sbGFwc2luZ10gTWFyZ2lu Q29sbGFwc2U6OmVzdGltYXRlZE1hcmdpbkJlZm9yZSBzaG91bGQgdGFrZSBwcmUtY29tcHV0ZWQg bm9uLWNvbGxhcHNlZCBtYXJnaW4gdmFsdWVzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3Jt YXR0aW5nQ29udGV4dC5jcHAKaW5kZXggZWUyMWI2MDQzZTc2NjkzZDE5ZGU4MWYxZTgwMDdhMmQ5 OTI2Y2JmMi4uY2VjODM0ZTk0Y2U0ZjQwNTczY2JmOThjNTU3ZDJiODk0NjM5MDJhNCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC02NywxMCArNjcs MTIgQEAgTGF5b3V0U3RhdGUmIEZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRTdGF0ZSgpIGNvbnN0 CiB2b2lkIEZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlT3V0T2ZGbG93SG9yaXpvbnRhbEdlb21l dHJ5KGNvbnN0IEJveCYgbGF5b3V0Qm94KQogewogICAgIGF1dG8gY29udGFpbmluZ0Jsb2NrV2lk dGggPSBnZW9tZXRyeUZvckJveCgqbGF5b3V0Qm94LmNvbnRhaW5pbmdCbG9jaygpKS5wYWRkaW5n Qm94V2lkdGgoKTsKKyAgICBhdXRvIGNvbnRhaW5pbmdCbG9ja0hlaWdodCA9IGdlb21ldHJ5Rm9y Qm94KCpsYXlvdXRCb3guY29udGFpbmluZ0Jsb2NrKCkpLnBhZGRpbmdCb3hIZWlnaHQoKTsKIAog ICAgIGF1dG8gY29tcHV0ZSA9IFsmXShPcHRpb25hbDxMYXlvdXRVbml0PiB1c2VkV2lkdGgpIHsK LSAgICAgICAgYXV0byB1c2VkVmFsdWVzID0gVXNlZEhvcml6b250YWxWYWx1ZXMgeyBjb250YWlu aW5nQmxvY2tXaWR0aCwgdXNlZFdpZHRoLCB7IH0gfTsKLSAgICAgICAgcmV0dXJuIGdlb21ldHJ5 KCkub3V0T2ZGbG93SG9yaXpvbnRhbEdlb21ldHJ5KGxheW91dEJveCwgdXNlZFZhbHVlcyk7Cisg ICAgICAgIGF1dG8gdXNlZEhvcml6b250YWxWYWx1ZXMgPSBVc2VkSG9yaXpvbnRhbFZhbHVlcyB7 IGNvbnRhaW5pbmdCbG9ja1dpZHRoLCB1c2VkV2lkdGgsIHsgfSB9OworICAgICAgICBhdXRvIHVz ZWRWZXJ0aWNhbFZhbHVlcyA9IFVzZWRWZXJ0aWNhbFZhbHVlcyB7IGNvbnRhaW5pbmdCbG9ja0hl aWdodCwgeyB9IH07CisgICAgICAgIHJldHVybiBnZW9tZXRyeSgpLm91dE9mRmxvd0hvcml6b250 YWxHZW9tZXRyeShsYXlvdXRCb3gsIHVzZWRIb3Jpem9udGFsVmFsdWVzLCB1c2VkVmVydGljYWxW YWx1ZXMpOwogICAgIH07CiAKICAgICBhdXRvIGhvcml6b250YWxHZW9tZXRyeSA9IGNvbXB1dGUo eyB9KTsKQEAgLTEwNiwxNCArMTA4LDE0IEBAIHZvaWQgRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1 dGVPdXRPZkZsb3dWZXJ0aWNhbEdlb21ldHJ5KGNvbnN0IEJveCYgbGF5b3V0Qm94KQogICAgIGF1 dG8gdXNlZEhvcml6b250YWxWYWx1ZXMgPSBVc2VkSG9yaXpvbnRhbFZhbHVlcyB7IGNvbnRhaW5p bmdCbG9ja1dpZHRoIH07CiAKICAgICBhdXRvIHZlcnRpY2FsR2VvbWV0cnkgPSBjb21wdXRlKHVz ZWRIb3Jpem9udGFsVmFsdWVzLCB1c2VkVmVydGljYWxWYWx1ZXNGb3JIZWlnaHQpOwotICAgIGlm IChhdXRvIG1heEhlaWdodCA9IGdlb21ldHJ5KCkuY29tcHV0ZWRNYXhIZWlnaHQobGF5b3V0Qm94 LCB1c2VkVmVydGljYWxWYWx1ZXNGb3JIZWlnaHQpKSB7CisgICAgaWYgKGF1dG8gbWF4SGVpZ2h0 ID0gZ2VvbWV0cnkoKS5jb21wdXRlZE1heEhlaWdodChsYXlvdXRCb3gsIGNvbnRhaW5pbmdCbG9j a0hlaWdodCkpIHsKICAgICAgICAgYXV0byB1c2VkVmFsdWVzRm9yTWF4SGVpZ2h0ID0gVXNlZFZl cnRpY2FsVmFsdWVzIHsgY29udGFpbmluZ0Jsb2NrSGVpZ2h0LCBtYXhIZWlnaHQgfTsKICAgICAg ICAgYXV0byBtYXhWZXJ0aWNhbEdlb21ldHJ5ID0gY29tcHV0ZSh1c2VkSG9yaXpvbnRhbFZhbHVl cywgdXNlZFZhbHVlc0Zvck1heEhlaWdodCk7CiAgICAgICAgIGlmICh2ZXJ0aWNhbEdlb21ldHJ5 LmhlaWdodEFuZE1hcmdpbi5oZWlnaHQgPiBtYXhWZXJ0aWNhbEdlb21ldHJ5LmhlaWdodEFuZE1h cmdpbi5oZWlnaHQpCiAgICAgICAgICAgICB2ZXJ0aWNhbEdlb21ldHJ5ID0gbWF4VmVydGljYWxH ZW9tZXRyeTsKICAgICB9CiAKLSAgICBpZiAoYXV0byBtaW5IZWlnaHQgPSBnZW9tZXRyeSgpLmNv bXB1dGVkTWluSGVpZ2h0KGxheW91dEJveCwgdXNlZFZlcnRpY2FsVmFsdWVzRm9ySGVpZ2h0KSkg eworICAgIGlmIChhdXRvIG1pbkhlaWdodCA9IGdlb21ldHJ5KCkuY29tcHV0ZWRNaW5IZWlnaHQo bGF5b3V0Qm94LCBjb250YWluaW5nQmxvY2tIZWlnaHQpKSB7CiAgICAgICAgIGF1dG8gdXNlZFZh bHVlc0Zvck1pbkhlaWdodCA9IFVzZWRWZXJ0aWNhbFZhbHVlcyB7IGNvbnRhaW5pbmdCbG9ja0hl aWdodCwgbWluSGVpZ2h0IH07CiAgICAgICAgIGF1dG8gbWluVmVydGljYWxHZW9tZXRyeSA9IGNv bXB1dGUodXNlZEhvcml6b250YWxWYWx1ZXMsIHVzZWRWYWx1ZXNGb3JNaW5IZWlnaHQpOwogICAg ICAgICBpZiAodmVydGljYWxHZW9tZXRyeS5oZWlnaHRBbmRNYXJnaW4uaGVpZ2h0IDwgbWluVmVy dGljYWxHZW9tZXRyeS5oZWlnaHRBbmRNYXJnaW4uaGVpZ2h0KQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvRm9ybWF0dGluZ0NvbnRleHQuaAppbmRleCBmZTRiMjgwOGViM2EyZDZmN2ZmMjA4YzVhYWRh OGE2NmEzNjk5ZjQ2Li5kZmVhZmFhNzRmM2NlMDk4YTJmYWRlYjlmMjA2ZTk5MGZhMjQ4NDAyIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuaApAQCAtOTQsMTMgKzk0 LDEzIEBAIHByb3RlY3RlZDoKICAgICBjbGFzcyBHZW9tZXRyeSB7CiAgICAgcHVibGljOgogICAg ICAgICBWZXJ0aWNhbEdlb21ldHJ5IG91dE9mRmxvd1ZlcnRpY2FsR2VvbWV0cnkoY29uc3QgQm94 JiwgVXNlZEhvcml6b250YWxWYWx1ZXMsIFVzZWRWZXJ0aWNhbFZhbHVlcykgY29uc3Q7Ci0gICAg ICAgIEhvcml6b250YWxHZW9tZXRyeSBvdXRPZkZsb3dIb3Jpem9udGFsR2VvbWV0cnkoY29uc3Qg Qm94JiwgVXNlZEhvcml6b250YWxWYWx1ZXMpOworICAgICAgICBIb3Jpem9udGFsR2VvbWV0cnkg b3V0T2ZGbG93SG9yaXpvbnRhbEdlb21ldHJ5KGNvbnN0IEJveCYsIFVzZWRIb3Jpem9udGFsVmFs dWVzLCBVc2VkVmVydGljYWxWYWx1ZXMpOwogCiAgICAgICAgIEhlaWdodEFuZE1hcmdpbiBmbG9h dGluZ0hlaWdodEFuZE1hcmdpbihjb25zdCBCb3gmLCBVc2VkSG9yaXpvbnRhbFZhbHVlcywgVXNl ZFZlcnRpY2FsVmFsdWVzKSBjb25zdDsKICAgICAgICAgV2lkdGhBbmRNYXJnaW4gZmxvYXRpbmdX aWR0aEFuZE1hcmdpbihjb25zdCBCb3gmLCBVc2VkSG9yaXpvbnRhbFZhbHVlcyk7CiAKICAgICAg ICAgSGVpZ2h0QW5kTWFyZ2luIGlubGluZVJlcGxhY2VkSGVpZ2h0QW5kTWFyZ2luKGNvbnN0IEJv eCYsIFVzZWRIb3Jpem9udGFsVmFsdWVzLCBVc2VkVmVydGljYWxWYWx1ZXMpIGNvbnN0OwotICAg ICAgICBXaWR0aEFuZE1hcmdpbiBpbmxpbmVSZXBsYWNlZFdpZHRoQW5kTWFyZ2luKGNvbnN0IEJv eCYsIFVzZWRIb3Jpem9udGFsVmFsdWVzKSBjb25zdDsKKyAgICAgICAgV2lkdGhBbmRNYXJnaW4g aW5saW5lUmVwbGFjZWRXaWR0aEFuZE1hcmdpbihjb25zdCBCb3gmLCBVc2VkSG9yaXpvbnRhbFZh bHVlcywgT3B0aW9uYWw8VXNlZFZlcnRpY2FsVmFsdWVzPiA9IFdURjo6bnVsbG9wdCkgY29uc3Q7 CiAKICAgICAgICAgTGF5b3V0U2l6ZSBpbkZsb3dQb3NpdGlvbmVkUG9zaXRpb25PZmZzZXQoY29u c3QgQm94JiwgVXNlZEhvcml6b250YWxWYWx1ZXMpIGNvbnN0OwogCkBAIC0xMTYsOCArMTE2LDgg QEAgcHJvdGVjdGVkOgogICAgICAgICBPcHRpb25hbDxMYXlvdXRVbml0PiBjb21wdXRlZFZhbHVl SWZOb3RBdXRvKGNvbnN0IExlbmd0aCYgZ2VvbWV0cnlQcm9wZXJ0eSwgTGF5b3V0VW5pdCBjb250 YWluaW5nQmxvY2tXaWR0aCkgY29uc3Q7CiAgICAgICAgIE9wdGlvbmFsPExheW91dFVuaXQ+IGZp eGVkVmFsdWUoY29uc3QgTGVuZ3RoJiBnZW9tZXRyeVByb3BlcnR5KSBjb25zdDsKIAotICAgICAg ICBPcHRpb25hbDxMYXlvdXRVbml0PiBjb21wdXRlZE1pbkhlaWdodChjb25zdCBCb3gmLCBPcHRp b25hbDxVc2VkVmVydGljYWxWYWx1ZXM+ID0gV1RGOjpudWxsb3B0KSBjb25zdDsKLSAgICAgICAg T3B0aW9uYWw8TGF5b3V0VW5pdD4gY29tcHV0ZWRNYXhIZWlnaHQoY29uc3QgQm94JiwgT3B0aW9u YWw8VXNlZFZlcnRpY2FsVmFsdWVzPiA9IFdURjo6bnVsbG9wdCkgY29uc3Q7CisgICAgICAgIE9w dGlvbmFsPExheW91dFVuaXQ+IGNvbXB1dGVkTWluSGVpZ2h0KGNvbnN0IEJveCYsIE9wdGlvbmFs PExheW91dFVuaXQ+IGNvbnRhaW5pbmdCbG9ja0hlaWdodCA9IFdURjo6bnVsbG9wdCkgY29uc3Q7 CisgICAgICAgIE9wdGlvbmFsPExheW91dFVuaXQ+IGNvbXB1dGVkTWF4SGVpZ2h0KGNvbnN0IEJv eCYsIE9wdGlvbmFsPExheW91dFVuaXQ+IGNvbnRhaW5pbmdCbG9ja0hlaWdodCA9IFdURjo6bnVs bG9wdCkgY29uc3Q7CiAKICAgICAgICAgRm9ybWF0dGluZ0NvbnRleHQ6OkludHJpbnNpY1dpZHRo Q29uc3RyYWludHMgY29uc3RyYWluQnlNaW5NYXhXaWR0aChjb25zdCBCb3gmLCBJbnRyaW5zaWNX aWR0aENvbnN0cmFpbnRzKSBjb25zdDsKIApAQCAtMTI4LDcgKzEyOCw3IEBAIHByb3RlY3RlZDoK ICAgICAgICAgR2VvbWV0cnkoY29uc3QgRm9ybWF0dGluZ0NvbnRleHQmKTsKIAogICAgICAgICBl bnVtIGNsYXNzIEhlaWdodFR5cGUgeyBNaW4sIE1heCwgTm9ybWFsIH07Ci0gICAgICAgIE9wdGlv bmFsPExheW91dFVuaXQ+IGNvbXB1dGVkSGVpZ2h0VmFsdWUoY29uc3QgQm94JiwgSGVpZ2h0VHlw ZSwgT3B0aW9uYWw8VXNlZFZlcnRpY2FsVmFsdWVzPiA9IFdURjo6bnVsbG9wdCkgY29uc3Q7Cisg ICAgICAgIE9wdGlvbmFsPExheW91dFVuaXQ+IGNvbXB1dGVkSGVpZ2h0VmFsdWUoY29uc3QgQm94 JiwgSGVpZ2h0VHlwZSwgT3B0aW9uYWw8TGF5b3V0VW5pdD4gY29udGFpbmluZ0Jsb2NrSGVpZ2h0 ID0gV1RGOjpudWxsb3B0KSBjb25zdDsKIAogICAgICAgICBjb25zdCBMYXlvdXRTdGF0ZSYgbGF5 b3V0U3RhdGUoKSBjb25zdCB7IHJldHVybiBtX2Zvcm1hdHRpbmdDb250ZXh0LmxheW91dFN0YXRl KCk7IH0KICAgICAgICAgTGF5b3V0U3RhdGUmIGxheW91dFN0YXRlKCkgeyByZXR1cm4gbV9mb3Jt YXR0aW5nQ29udGV4dC5sYXlvdXRTdGF0ZSgpOyB9CkBAIC0xMzYsNyArMTM2LDcgQEAgcHJvdGVj dGVkOgogCiAgICAgcHJpdmF0ZToKICAgICAgICAgVmVydGljYWxHZW9tZXRyeSBvdXRPZkZsb3dS ZXBsYWNlZFZlcnRpY2FsR2VvbWV0cnkoY29uc3QgQm94JiwgVXNlZEhvcml6b250YWxWYWx1ZXMs IFVzZWRWZXJ0aWNhbFZhbHVlcykgY29uc3Q7Ci0gICAgICAgIEhvcml6b250YWxHZW9tZXRyeSBv dXRPZkZsb3dSZXBsYWNlZEhvcml6b250YWxHZW9tZXRyeShjb25zdCBCb3gmLCBVc2VkSG9yaXpv bnRhbFZhbHVlcykgY29uc3Q7CisgICAgICAgIEhvcml6b250YWxHZW9tZXRyeSBvdXRPZkZsb3dS ZXBsYWNlZEhvcml6b250YWxHZW9tZXRyeShjb25zdCBCb3gmLCBVc2VkSG9yaXpvbnRhbFZhbHVl cywgVXNlZFZlcnRpY2FsVmFsdWVzKSBjb25zdDsKIAogICAgICAgICBWZXJ0aWNhbEdlb21ldHJ5 IG91dE9mRmxvd05vblJlcGxhY2VkVmVydGljYWxHZW9tZXRyeShjb25zdCBCb3gmLCBVc2VkSG9y aXpvbnRhbFZhbHVlcywgVXNlZFZlcnRpY2FsVmFsdWVzKSBjb25zdDsKICAgICAgICAgSG9yaXpv bnRhbEdlb21ldHJ5IG91dE9mRmxvd05vblJlcGxhY2VkSG9yaXpvbnRhbEdlb21ldHJ5KGNvbnN0 IEJveCYsIFVzZWRIb3Jpem9udGFsVmFsdWVzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAppbmRleCBjMTQ2YzVlNzg4MTUxNWNl MWVhZDQzYTllODI5Mjk2Y2UzNjBkYWUzLi44OTg4NGQ2YTM2ZTVmM2I1MjM3NGUzZTg5ODQ4NmUx YzRhMjNlNDdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0Nv bnRleHRHZW9tZXRyeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdD b250ZXh0R2VvbWV0cnkuY3BwCkBAIC01OSw3ICs1OSw3IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBp c0hlaWdodEF1dG8oY29uc3QgQm94JiBsYXlvdXRCb3gpCiAgICAgcmV0dXJuIGZhbHNlOwogfQog Ci1PcHRpb25hbDxMYXlvdXRVbml0PiBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmNvbXB1 dGVkSGVpZ2h0VmFsdWUoY29uc3QgQm94JiBsYXlvdXRCb3gsIEhlaWdodFR5cGUgaGVpZ2h0VHlw ZSwgT3B0aW9uYWw8VXNlZFZlcnRpY2FsVmFsdWVzPiB1c2VkVmVydGljYWxWYWx1ZXMpIGNvbnN0 CitPcHRpb25hbDxMYXlvdXRVbml0PiBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmNvbXB1 dGVkSGVpZ2h0VmFsdWUoY29uc3QgQm94JiBsYXlvdXRCb3gsIEhlaWdodFR5cGUgaGVpZ2h0VHlw ZSwgT3B0aW9uYWw8TGF5b3V0VW5pdD4gY29udGFpbmluZ0Jsb2NrSGVpZ2h0KSBjb25zdAogewog ICAgIGF1dG8mIHN0eWxlID0gbGF5b3V0Qm94LnN0eWxlKCk7CiAgICAgYXV0byBoZWlnaHQgPSBo ZWlnaHRUeXBlID09IEhlaWdodFR5cGU6Ok5vcm1hbCA/IHN0eWxlLmxvZ2ljYWxIZWlnaHQoKSA6 IGhlaWdodFR5cGUgPT0gSGVpZ2h0VHlwZTo6TWluID8gc3R5bGUubG9naWNhbE1pbkhlaWdodCgp IDogc3R5bGUubG9naWNhbE1heEhlaWdodCgpOwpAQCAtNjksMjUgKzY5LDIyIEBAIE9wdGlvbmFs PExheW91dFVuaXQ+IEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6Y29tcHV0ZWRIZWlnaHRW YWx1ZShjb25zdCBCb3gmCiAgICAgaWYgKGhlaWdodC5pc0ZpeGVkKCkpCiAgICAgICAgIHJldHVy biBMYXlvdXRVbml0IHsgaGVpZ2h0LnZhbHVlKCkgfTsKIAotICAgIE9wdGlvbmFsPExheW91dFVu aXQ+IGNvbnRhaW5pbmdCbG9ja0hlaWdodFZhbHVlOwotICAgIGlmICh1c2VkVmVydGljYWxWYWx1 ZXMgJiYgdXNlZFZlcnRpY2FsVmFsdWVzLT5jb250YWluaW5nQmxvY2tIZWlnaHQpIHsKLSAgICAg ICAgQVNTRVJUKGxheW91dEJveC5pc091dE9mRmxvd1Bvc2l0aW9uZWQoKSk7CisgICAgaWYgKCFj b250YWluaW5nQmxvY2tIZWlnaHQpIHsKICAgICAgICAgLy8gQ29udGFpbmluZyBibG9jaydzIGhl aWdodCBpcyBhbHJlYWR5IGNvbXB1dGVkIHNpbmNlIHdlIGxheW91dCB0aGUgb3V0LW9mLWZsb3cg Ym94ZXMgYXMgdGhlIGxhc3Qgc3RlcC4KLSAgICAgICAgY29udGFpbmluZ0Jsb2NrSGVpZ2h0VmFs dWUgPSAqdXNlZFZlcnRpY2FsVmFsdWVzLT5jb250YWluaW5nQmxvY2tIZWlnaHQ7Ci0gICAgfSBl bHNlIHsKKyAgICAgICAgQVNTRVJUKCFsYXlvdXRCb3guaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkp OwogICAgICAgICBpZiAobGF5b3V0U3RhdGUoKS5pblF1aXJrc01vZGUoKSkKLSAgICAgICAgICAg IGNvbnRhaW5pbmdCbG9ja0hlaWdodFZhbHVlID0gZm9ybWF0dGluZ0NvbnRleHQoKS5xdWlya3Mo KS5oZWlnaHRWYWx1ZU9mTmVhcmVzdENvbnRhaW5pbmdCbG9ja1dpdGhGaXhlZEhlaWdodChsYXlv dXRCb3gpOworICAgICAgICAgICAgY29udGFpbmluZ0Jsb2NrSGVpZ2h0ID0gZm9ybWF0dGluZ0Nv bnRleHQoKS5xdWlya3MoKS5oZWlnaHRWYWx1ZU9mTmVhcmVzdENvbnRhaW5pbmdCbG9ja1dpdGhG aXhlZEhlaWdodChsYXlvdXRCb3gpOwogICAgICAgICBlbHNlIHsKLSAgICAgICAgICAgIGF1dG8g Y29udGFpbmluZ0Jsb2NrSGVpZ2h0ID0gbGF5b3V0Qm94LmNvbnRhaW5pbmdCbG9jaygpLT5zdHls ZSgpLmxvZ2ljYWxIZWlnaHQoKTsKLSAgICAgICAgICAgIGlmIChjb250YWluaW5nQmxvY2tIZWln aHQuaXNGaXhlZCgpKQotICAgICAgICAgICAgICAgIGNvbnRhaW5pbmdCbG9ja0hlaWdodFZhbHVl ID0gTGF5b3V0VW5pdChjb250YWluaW5nQmxvY2tIZWlnaHQudmFsdWUoKSk7CisgICAgICAgICAg ICBhdXRvIGNvbnRhaW5pbmdCbG9ja0hlaWdodEZyb21TdHlsZSA9IGxheW91dEJveC5jb250YWlu aW5nQmxvY2soKS0+c3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCk7CisgICAgICAgICAgICBpZiAoY29u dGFpbmluZ0Jsb2NrSGVpZ2h0RnJvbVN0eWxlLmlzRml4ZWQoKSkKKyAgICAgICAgICAgICAgICBj b250YWluaW5nQmxvY2tIZWlnaHQgPSBMYXlvdXRVbml0IHsgY29udGFpbmluZ0Jsb2NrSGVpZ2h0 RnJvbVN0eWxlLnZhbHVlKCkgfTsKICAgICAgICAgfQogICAgIH0KIAotICAgIGlmICghY29udGFp bmluZ0Jsb2NrSGVpZ2h0VmFsdWUpCisgICAgaWYgKCFjb250YWluaW5nQmxvY2tIZWlnaHQpCiAg ICAgICAgIHJldHVybiB7IH07CiAKLSAgICByZXR1cm4gdmFsdWVGb3JMZW5ndGgoaGVpZ2h0LCAq Y29udGFpbmluZ0Jsb2NrSGVpZ2h0VmFsdWUpOworICAgIHJldHVybiB2YWx1ZUZvckxlbmd0aCho ZWlnaHQsICpjb250YWluaW5nQmxvY2tIZWlnaHQpOwogfQogCiBMYXlvdXRVbml0IEZvcm1hdHRp bmdDb250ZXh0OjpHZW9tZXRyeTo6Y29udGVudEhlaWdodEZvckZvcm1hdHRpbmdDb250ZXh0Um9v dChjb25zdCBCb3gmIGxheW91dEJveCkgY29uc3QKQEAgLTE3MiwxNCArMTY5LDE0IEBAIE9wdGlv bmFsPExheW91dFVuaXQ+IEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6Zml4ZWRWYWx1ZShj b25zdCBMZW5ndGgmIGdlb21lCiAvLyBTcGVjaWZpZXMgYSBwZXJjZW50YWdlIGZvciBkZXRlcm1p bmluZyB0aGUgdXNlZCB2YWx1ZS4gVGhlIHBlcmNlbnRhZ2UgaXMgY2FsY3VsYXRlZCB3aXRoIHJl c3BlY3QgdG8gdGhlIGhlaWdodCBvZiB0aGUgZ2VuZXJhdGVkIGJveCdzIGNvbnRhaW5pbmcgYmxv Y2suCiAvLyBJZiB0aGUgaGVpZ2h0IG9mIHRoZSBjb250YWluaW5nIGJsb2NrIGlzIG5vdCBzcGVj aWZpZWQgZXhwbGljaXRseSAoaS5lLiwgaXQgZGVwZW5kcyBvbiBjb250ZW50IGhlaWdodCksIGFu ZCB0aGlzIGVsZW1lbnQgaXMgbm90IGFic29sdXRlbHkgcG9zaXRpb25lZCwKIC8vIHRoZSBwZXJj ZW50YWdlIHZhbHVlIGlzIHRyZWF0ZWQgYXMgJzAnIChmb3IgJ21pbi1oZWlnaHQnKSBvciAnbm9u ZScgKGZvciAnbWF4LWhlaWdodCcpLgotT3B0aW9uYWw8TGF5b3V0VW5pdD4gRm9ybWF0dGluZ0Nv bnRleHQ6Okdlb21ldHJ5Ojpjb21wdXRlZE1heEhlaWdodChjb25zdCBCb3gmIGxheW91dEJveCwg T3B0aW9uYWw8VXNlZFZlcnRpY2FsVmFsdWVzPiB1c2VkVmVydGljYWxWYWx1ZXMpIGNvbnN0CitP cHRpb25hbDxMYXlvdXRVbml0PiBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmNvbXB1dGVk TWF4SGVpZ2h0KGNvbnN0IEJveCYgbGF5b3V0Qm94LCBPcHRpb25hbDxMYXlvdXRVbml0PiBjb250 YWluaW5nQmxvY2tIZWlnaHQpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIGNvbXB1dGVkSGVpZ2h0VmFs dWUobGF5b3V0Qm94LCBIZWlnaHRUeXBlOjpNYXgsIHVzZWRWZXJ0aWNhbFZhbHVlcyk7CisgICAg cmV0dXJuIGNvbXB1dGVkSGVpZ2h0VmFsdWUobGF5b3V0Qm94LCBIZWlnaHRUeXBlOjpNYXgsIGNv bnRhaW5pbmdCbG9ja0hlaWdodCk7CiB9CiAKLU9wdGlvbmFsPExheW91dFVuaXQ+IEZvcm1hdHRp bmdDb250ZXh0OjpHZW9tZXRyeTo6Y29tcHV0ZWRNaW5IZWlnaHQoY29uc3QgQm94JiBsYXlvdXRC b3gsIE9wdGlvbmFsPFVzZWRWZXJ0aWNhbFZhbHVlcz4gdXNlZFZlcnRpY2FsVmFsdWVzKSBjb25z dAorT3B0aW9uYWw8TGF5b3V0VW5pdD4gRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5Ojpjb21w dXRlZE1pbkhlaWdodChjb25zdCBCb3gmIGxheW91dEJveCwgT3B0aW9uYWw8TGF5b3V0VW5pdD4g Y29udGFpbmluZ0Jsb2NrSGVpZ2h0KSBjb25zdAogewotICAgIGlmIChhdXRvIG1pbkhlaWdodFZh bHVlID0gY29tcHV0ZWRIZWlnaHRWYWx1ZShsYXlvdXRCb3gsIEhlaWdodFR5cGU6Ok1pbiwgdXNl ZFZlcnRpY2FsVmFsdWVzKSkKKyAgICBpZiAoYXV0byBtaW5IZWlnaHRWYWx1ZSA9IGNvbXB1dGVk SGVpZ2h0VmFsdWUobGF5b3V0Qm94LCBIZWlnaHRUeXBlOjpNaW4sIGNvbnRhaW5pbmdCbG9ja0hl aWdodCkpCiAgICAgICAgIHJldHVybiBtaW5IZWlnaHRWYWx1ZTsKIAogICAgIHJldHVybiB7IExh eW91dFVuaXQgeyB9IH07CkBAIC0zMDgsNyArMzA1LDcgQEAgVmVydGljYWxHZW9tZXRyeSBGb3Jt YXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Om91dE9mRmxvd05vblJlcGxhY2VkVmVydGljYWxHZW9t ZXQKIAogICAgIGF1dG8gdG9wID0gY29tcHV0ZWRWYWx1ZUlmTm90QXV0byhzdHlsZS5sb2dpY2Fs VG9wKCksIGNvbnRhaW5pbmdCbG9ja1dpZHRoKTsKICAgICBhdXRvIGJvdHRvbSA9IGNvbXB1dGVk VmFsdWVJZk5vdEF1dG8oc3R5bGUubG9naWNhbEJvdHRvbSgpLCBjb250YWluaW5nQmxvY2tXaWR0 aCk7Ci0gICAgYXV0byBoZWlnaHQgPSB1c2VkVmVydGljYWxWYWx1ZXMuaGVpZ2h0ID8gdXNlZFZl cnRpY2FsVmFsdWVzLmhlaWdodC52YWx1ZSgpIDogY29tcHV0ZWRIZWlnaHRWYWx1ZShsYXlvdXRC b3gsIEhlaWdodFR5cGU6Ok5vcm1hbCwgdXNlZFZlcnRpY2FsVmFsdWVzKTsKKyAgICBhdXRvIGhl aWdodCA9IHVzZWRWZXJ0aWNhbFZhbHVlcy5oZWlnaHQgPyB1c2VkVmVydGljYWxWYWx1ZXMuaGVp Z2h0LnZhbHVlKCkgOiBjb21wdXRlZEhlaWdodFZhbHVlKGxheW91dEJveCwgSGVpZ2h0VHlwZTo6 Tm9ybWFsLCBjb250YWluaW5nQmxvY2tIZWlnaHQpOwogICAgIGF1dG8gY29tcHV0ZWRWZXJ0aWNh bE1hcmdpbiA9IEdlb21ldHJ5Ojpjb21wdXRlZFZlcnRpY2FsTWFyZ2luKGxheW91dEJveCwgdXNl ZEhvcml6b250YWxWYWx1ZXMpOwogICAgIFVzZWRWZXJ0aWNhbE1hcmdpbjo6Tm9uQ29sbGFwc2Vk VmFsdWVzIHVzZWRWZXJ0aWNhbE1hcmdpbjsgCiAgICAgYXV0byBwYWRkaW5nVG9wID0gYm94R2Vv bWV0cnkucGFkZGluZ1RvcCgpLnZhbHVlT3IoMCk7CkBAIC02MjQsNyArNjIxLDcgQEAgVmVydGlj YWxHZW9tZXRyeSBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Om91dE9mRmxvd1JlcGxhY2Vk VmVydGljYWxHZW9tZXRyeSgKICAgICByZXR1cm4geyAqdG9wLCAqYm90dG9tLCB7IGhlaWdodCwg eyAqdXNlZE1hcmdpbkJlZm9yZSwgKnVzZWRNYXJnaW5BZnRlciB9IH0gfTsKIH0KIAotSG9yaXpv bnRhbEdlb21ldHJ5IEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6b3V0T2ZGbG93UmVwbGFj ZWRIb3Jpem9udGFsR2VvbWV0cnkoY29uc3QgQm94JiBsYXlvdXRCb3gsIFVzZWRIb3Jpem9udGFs VmFsdWVzIHVzZWRIb3Jpem9udGFsVmFsdWVzKSBjb25zdAorSG9yaXpvbnRhbEdlb21ldHJ5IEZv cm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6b3V0T2ZGbG93UmVwbGFjZWRIb3Jpem9udGFsR2Vv bWV0cnkoY29uc3QgQm94JiBsYXlvdXRCb3gsIFVzZWRIb3Jpem9udGFsVmFsdWVzIHVzZWRIb3Jp em9udGFsVmFsdWVzLCBVc2VkVmVydGljYWxWYWx1ZXMgdXNlZFZlcnRpY2FsVmFsdWVzKSBjb25z dAogewogICAgIEFTU0VSVChsYXlvdXRCb3guaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkgJiYgbGF5 b3V0Qm94LnJlcGxhY2VkKCkpOwogCkBAIC02NTMsNyArNjUwLDcgQEAgSG9yaXpvbnRhbEdlb21l dHJ5IEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6b3V0T2ZGbG93UmVwbGFjZWRIb3Jpem9u dGFsR2VvbWUKICAgICBhdXRvIGNvbXB1dGVkSG9yaXpvbnRhbE1hcmdpbiA9IEdlb21ldHJ5Ojpj b21wdXRlZEhvcml6b250YWxNYXJnaW4obGF5b3V0Qm94LCB1c2VkSG9yaXpvbnRhbFZhbHVlcyk7 CiAgICAgT3B0aW9uYWw8TGF5b3V0VW5pdD4gdXNlZE1hcmdpblN0YXJ0ID0gY29tcHV0ZWRIb3Jp em9udGFsTWFyZ2luLnN0YXJ0OwogICAgIE9wdGlvbmFsPExheW91dFVuaXQ+IHVzZWRNYXJnaW5F bmQgPSBjb21wdXRlZEhvcml6b250YWxNYXJnaW4uZW5kOwotICAgIGF1dG8gd2lkdGggPSBpbmxp bmVSZXBsYWNlZFdpZHRoQW5kTWFyZ2luKGxheW91dEJveCwgdXNlZEhvcml6b250YWxWYWx1ZXMp LndpZHRoOworICAgIGF1dG8gd2lkdGggPSBpbmxpbmVSZXBsYWNlZFdpZHRoQW5kTWFyZ2luKGxh eW91dEJveCwgdXNlZEhvcml6b250YWxWYWx1ZXMsIHVzZWRWZXJ0aWNhbFZhbHVlcykud2lkdGg7 CiAgICAgYXV0byBwYWRkaW5nTGVmdCA9IGJveEdlb21ldHJ5LnBhZGRpbmdMZWZ0KCkudmFsdWVP cigwKTsKICAgICBhdXRvIHBhZGRpbmdSaWdodCA9IGJveEdlb21ldHJ5LnBhZGRpbmdSaWdodCgp LnZhbHVlT3IoMCk7CiAgICAgYXV0byBib3JkZXJMZWZ0ID0gYm94R2VvbWV0cnkuYm9yZGVyTGVm dCgpOwpAQCAtODE1LDEzICs4MTIsMTMgQEAgVmVydGljYWxHZW9tZXRyeSBGb3JtYXR0aW5nQ29u dGV4dDo6R2VvbWV0cnk6Om91dE9mRmxvd1ZlcnRpY2FsR2VvbWV0cnkoY29uc3QgQm8KICAgICBy ZXR1cm4gb3V0T2ZGbG93UmVwbGFjZWRWZXJ0aWNhbEdlb21ldHJ5KGxheW91dEJveCwgdXNlZEhv cml6b250YWxWYWx1ZXMsIHVzZWRWZXJ0aWNhbFZhbHVlcyk7CiB9CiAKLUhvcml6b250YWxHZW9t ZXRyeSBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Om91dE9mRmxvd0hvcml6b250YWxHZW9t ZXRyeShjb25zdCBCb3gmIGxheW91dEJveCwgVXNlZEhvcml6b250YWxWYWx1ZXMgdXNlZFZhbHVl cykKK0hvcml6b250YWxHZW9tZXRyeSBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Om91dE9m Rmxvd0hvcml6b250YWxHZW9tZXRyeShjb25zdCBCb3gmIGxheW91dEJveCwgVXNlZEhvcml6b250 YWxWYWx1ZXMgdXNlZEhvcml6b250YWxWYWx1ZXMsIFVzZWRWZXJ0aWNhbFZhbHVlcyB1c2VkVmVy dGljYWxWYWx1ZXMpCiB7CiAgICAgQVNTRVJUKGxheW91dEJveC5pc091dE9mRmxvd1Bvc2l0aW9u ZWQoKSk7CiAKICAgICBpZiAoIWxheW91dEJveC5yZXBsYWNlZCgpKQotICAgICAgICByZXR1cm4g b3V0T2ZGbG93Tm9uUmVwbGFjZWRIb3Jpem9udGFsR2VvbWV0cnkobGF5b3V0Qm94LCB1c2VkVmFs dWVzKTsKLSAgICByZXR1cm4gb3V0T2ZGbG93UmVwbGFjZWRIb3Jpem9udGFsR2VvbWV0cnkobGF5 b3V0Qm94LCB1c2VkVmFsdWVzKTsKKyAgICAgICAgcmV0dXJuIG91dE9mRmxvd05vblJlcGxhY2Vk SG9yaXpvbnRhbEdlb21ldHJ5KGxheW91dEJveCwgdXNlZEhvcml6b250YWxWYWx1ZXMpOworICAg IHJldHVybiBvdXRPZkZsb3dSZXBsYWNlZEhvcml6b250YWxHZW9tZXRyeShsYXlvdXRCb3gsIHVz ZWRIb3Jpem9udGFsVmFsdWVzLCB1c2VkVmVydGljYWxWYWx1ZXMpOwogfQogCiBIZWlnaHRBbmRN YXJnaW4gRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpmbG9hdGluZ0hlaWdodEFuZE1hcmdp bihjb25zdCBCb3gmIGxheW91dEJveCwgVXNlZEhvcml6b250YWxWYWx1ZXMgdXNlZEhvcml6b250 YWxWYWx1ZXMsIFVzZWRWZXJ0aWNhbFZhbHVlcyB1c2VkVmVydGljYWxWYWx1ZXMpIGNvbnN0CkBA IC04NjMsNyArODYwLDcgQEAgSGVpZ2h0QW5kTWFyZ2luIEZvcm1hdHRpbmdDb250ZXh0OjpHZW9t ZXRyeTo6aW5saW5lUmVwbGFjZWRIZWlnaHRBbmRNYXJnaW4oY29uc3QKICAgICBhdXRvJiBzdHls ZSA9IGxheW91dEJveC5zdHlsZSgpOwogICAgIGF1dG8gcmVwbGFjZWQgPSBsYXlvdXRCb3gucmVw bGFjZWQoKTsKIAotICAgIGF1dG8gaGVpZ2h0ID0gdXNlZFZlcnRpY2FsVmFsdWVzLmhlaWdodCA/ IHVzZWRWZXJ0aWNhbFZhbHVlcy5oZWlnaHQudmFsdWUoKSA6IGNvbXB1dGVkSGVpZ2h0VmFsdWUo bGF5b3V0Qm94LCBIZWlnaHRUeXBlOjpOb3JtYWwsIHVzZWRWZXJ0aWNhbFZhbHVlcyk7CisgICAg YXV0byBoZWlnaHQgPSB1c2VkVmVydGljYWxWYWx1ZXMuaGVpZ2h0ID8gdXNlZFZlcnRpY2FsVmFs dWVzLmhlaWdodC52YWx1ZSgpIDogY29tcHV0ZWRIZWlnaHRWYWx1ZShsYXlvdXRCb3gsIEhlaWdo dFR5cGU6Ok5vcm1hbCwgdXNlZFZlcnRpY2FsVmFsdWVzLmNvbnRhaW5pbmdCbG9ja0hlaWdodCk7 CiAgICAgYXV0byBoZWlnaHRJc0F1dG8gPSAhdXNlZFZlcnRpY2FsVmFsdWVzLmhlaWdodCAmJiBp c0hlaWdodEF1dG8obGF5b3V0Qm94KTsKICAgICBhdXRvIHdpZHRoSXNBdXRvID0gc3R5bGUubG9n aWNhbFdpZHRoKCkuaXNBdXRvKCk7CiAKQEAgLTg4OCw3ICs4ODUsNyBAQCBIZWlnaHRBbmRNYXJn aW4gRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjppbmxpbmVSZXBsYWNlZEhlaWdodEFuZE1h cmdpbihjb25zdAogICAgIHJldHVybiB7ICpoZWlnaHQsIHVzZWRWZXJ0aWNhbE1hcmdpbiB9Owog fQogCi1XaWR0aEFuZE1hcmdpbiBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmlubGluZVJl cGxhY2VkV2lkdGhBbmRNYXJnaW4oY29uc3QgQm94JiBsYXlvdXRCb3gsIFVzZWRIb3Jpem9udGFs VmFsdWVzIHVzZWRIb3Jpem9udGFsVmFsdWVzKSBjb25zdAorV2lkdGhBbmRNYXJnaW4gRm9ybWF0 dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjppbmxpbmVSZXBsYWNlZFdpZHRoQW5kTWFyZ2luKGNvbnN0 IEJveCYgbGF5b3V0Qm94LCBVc2VkSG9yaXpvbnRhbFZhbHVlcyB1c2VkSG9yaXpvbnRhbFZhbHVl cywgT3B0aW9uYWw8VXNlZFZlcnRpY2FsVmFsdWVzPiB1c2VkVmVydGljYWxWYWx1ZXMpIGNvbnN0 CiB7CiAgICAgQVNTRVJUKChsYXlvdXRCb3guaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkgfHwgbGF5 b3V0Qm94LmlzRmxvYXRpbmdQb3NpdGlvbmVkKCkgfHwgbGF5b3V0Qm94LmlzSW5GbG93KCkpICYm IGxheW91dEJveC5yZXBsYWNlZCgpKTsKIApAQCAtOTMyLDcgKzkyOSw3IEBAIFdpZHRoQW5kTWFy Z2luIEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6aW5saW5lUmVwbGFjZWRXaWR0aEFuZE1h cmdpbihjb25zdCBCCiAKICAgICBhdXRvIHdpZHRoID0gY29tcHV0ZWRWYWx1ZUlmTm90QXV0byh1 c2VkSG9yaXpvbnRhbFZhbHVlcy53aWR0aCA/IExlbmd0aCB7IHVzZWRIb3Jpem9udGFsVmFsdWVz LndpZHRoLnZhbHVlKCksIEZpeGVkIH0gOiBzdHlsZS5sb2dpY2FsV2lkdGgoKSwgY29udGFpbmlu Z0Jsb2NrV2lkdGgpOwogICAgIGF1dG8gaGVpZ2h0SXNBdXRvID0gaXNIZWlnaHRBdXRvKGxheW91 dEJveCk7Ci0gICAgYXV0byBoZWlnaHQgPSBjb21wdXRlZEhlaWdodFZhbHVlKGxheW91dEJveCwg SGVpZ2h0VHlwZTo6Tm9ybWFsKTsKKyAgICBhdXRvIGhlaWdodCA9IGNvbXB1dGVkSGVpZ2h0VmFs dWUobGF5b3V0Qm94LCBIZWlnaHRUeXBlOjpOb3JtYWwsIHVzZWRWZXJ0aWNhbFZhbHVlcyA/IHVz ZWRWZXJ0aWNhbFZhbHVlcy0+Y29udGFpbmluZ0Jsb2NrSGVpZ2h0IDogV1RGOjpudWxsb3B0KTsK IAogICAgIGlmICghd2lkdGggJiYgaGVpZ2h0SXNBdXRvICYmIHJlcGxhY2VkLT5oYXNJbnRyaW5z aWNXaWR0aCgpKSB7CiAgICAgICAgIC8vICMxCg==