211432 2020-05-04 21:49:05 -0700 [LFC] Rename computedContentHeight/Width to computedHeight/Width 2020-05-05 06:49:15 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham darin koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1648939 0 zalan 2020-05-04 21:49:05 -0700 computedContentHeight used to be the content box height but it changed with box-sizing. 1648941 1 398470 zalan 2020-05-04 21:53:11 -0700 Created attachment 398470 Patch 1649172 2 ews-feeder 2020-05-05 06:49:00 -0700 Committed r261164: <https://trac.webkit.org/changeset/261164> All reviewed patches have been landed. Closing bug and clearing flags on attachment 398470. 1649173 3 webkit-bug-importer 2020-05-05 06:49:15 -0700 <rdar://problem/62886483> 398470 2020-05-04 21:53:11 -0700 2020-05-05 06:49:00 -0700 Patch bug-211432-20200504215310.patch text/plain 17610 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwNTc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2Y5ZjAxNDQ3ZGM0NmYw Njg4YTVlZDVhYjUyNjdiMDA0YTUyM2ExMy4uMTA0NDg1ZDhlZjY0MjFmOWY5Mjk5MjkzYmJlMGZh ZjMxZGVmN2NhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDIwLTA1LTA0ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gUmVuYW1lIGNvbXB1 dGVkQ29udGVudEhlaWdodC9XaWR0aCB0byBjb21wdXRlZEhlaWdodC9XaWR0aAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjExNDMyCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlc2UgZnVuY3Rpb25zIHVz ZWQgdG8gcmV0dXJuIHRoZSBjb21wdXRlZCBjb250ZW50IGJveCBoZWlnaHQvd2lkdGggYnV0IHdp dGggYm94LXNpemluZworICAgICAgICBzdXBwb3J0IHRoZSBuYW1lIGlzIG5vdCBjb3JyZWN0IGFu eW1vcmUuIAorCisgICAgICAgICogbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0Lmg6CisgICAgICAg ICogbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmNvbXB1dGVkSGVpZ2h0IGNv bnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6Okdlb21l dHJ5Ojpjb21wdXRlZFdpZHRoIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Rm9y bWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5Ojpjb21wdXRlZE1pbkhlaWdodCBjb25zdCk6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6b3V0T2ZG bG93Tm9uUmVwbGFjZWRWZXJ0aWNhbEdlb21ldHJ5IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpvdXRPZkZsb3dOb25SZXBsYWNl ZEhvcml6b250YWxHZW9tZXRyeSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRp bmdDb250ZXh0OjpHZW9tZXRyeTo6Y29tcGxpY2F0ZWRDYXNlcyBjb25zdCk6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6ZmxvYXRpbmdOb25S ZXBsYWNlZFdpZHRoQW5kTWFyZ2luKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0 dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjppbmxpbmVSZXBsYWNlZEhlaWdodEFuZE1hcmdpbiBjb25z dCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRy eTo6aW5saW5lUmVwbGFjZWRXaWR0aEFuZE1hcmdpbiBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl OjpMYXlvdXQ6OkZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6Y29tcHV0ZWRDb250ZW50SGVp Z2h0IGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0dGlu Z0NvbnRleHQ6Okdlb21ldHJ5Ojpjb21wdXRlZENvbnRlbnRXaWR0aCBjb25zdCk6IERlbGV0ZWQu CisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0 R2VvbWV0cnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdD b250ZXh0OjpHZW9tZXRyeTo6aW5GbG93Tm9uUmVwbGFjZWRIZWlnaHRBbmRNYXJnaW4pOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6 aW5GbG93Tm9uUmVwbGFjZWRXaWR0aEFuZE1hcmdpbiBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl OjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjppbkZsb3dIZWlnaHRB bmRNYXJnaW4pOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250 ZXh0OjpHZW9tZXRyeTo6aW5GbG93V2lkdGhBbmRNYXJnaW4pOgorICAgICAgICAqIGxheW91dC90 YWJsZWZvcm1hdHRpbmcvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OlRhYmxlRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVBbmREaXN0cmlidXRl RXh0cmFWZXJ0aWNhbFNwYWNlKToKKyAgICAgICAgKiBsYXlvdXQvdGFibGVmb3JtYXR0aW5nL1Rh YmxlRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OlRhYmxlRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpjZWxsSGVpZ2ggY29uc3QpOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUYWJsZUZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRy eTo6Y29tcHV0ZWRDb2x1bW5XaWR0aCBjb25zdCk6CisKIDIwMjAtMDUtMDMgIFphbGFuIEJ1anRh cyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtURkNdIE92ZXJyaWRlIHRoZSB0 YWJsZSBjb21wdXRlZCBoZWlnaHQgd2hlbiBjb250ZW50IG5lZWRzIG1vcmUgc3BhY2UKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5oIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmgKaW5kZXggNTg5NzVjZThhNTU2ZWMy NzZkZGRmNzZkYWFiZTdmNzhlZDc0Zjk3Yi4uYWIwMjAzY2NhOGEzNzcwYWZmYWU0ZTRjNmVhZTgz NGVhY2M4MGZjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdD b250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmgK QEAgLTE2NCwxMCArMTY0LDggQEAgcHJvdGVjdGVkOgogICAgICAgICBmcmllbmQgY2xhc3MgRm9y bWF0dGluZ0NvbnRleHQ7CiAgICAgICAgIEdlb21ldHJ5KGNvbnN0IEZvcm1hdHRpbmdDb250ZXh0 Jik7CiAKLSAgICAgICAgZW51bSBjbGFzcyBIZWlnaHRUeXBlIHsgTWluLCBNYXgsIE5vcm1hbCB9 OwotICAgICAgICBPcHRpb25hbDxMYXlvdXRVbml0PiBjb21wdXRlZEhlaWdodFZhbHVlKGNvbnN0 IEJveCYsIEhlaWdodFR5cGUsIE9wdGlvbmFsPExheW91dFVuaXQ+IGNvbnRhaW5pbmdCbG9ja0hl aWdodCkgY29uc3Q7Ci0gICAgICAgIE9wdGlvbmFsPExheW91dFVuaXQ+IGNvbXB1dGVkQ29udGVu dEhlaWdodChjb25zdCBCb3gmLCBPcHRpb25hbDxMYXlvdXRVbml0PiBjb250YWluaW5nQmxvY2tI ZWlnaHQgPSBXVEY6Om51bGxvcHQpIGNvbnN0OwotICAgICAgICBPcHRpb25hbDxMYXlvdXRVbml0 PiBjb21wdXRlZENvbnRlbnRXaWR0aChjb25zdCBCb3gmLCBMYXlvdXRVbml0IGNvbnRhaW5pbmdC bG9ja1dpZHRoKSBjb25zdDsKKyAgICAgICAgT3B0aW9uYWw8TGF5b3V0VW5pdD4gY29tcHV0ZWRI ZWlnaHQoY29uc3QgQm94JiwgT3B0aW9uYWw8TGF5b3V0VW5pdD4gY29udGFpbmluZ0Jsb2NrSGVp Z2h0ID0gV1RGOjpudWxsb3B0KSBjb25zdDsKKyAgICAgICAgT3B0aW9uYWw8TGF5b3V0VW5pdD4g Y29tcHV0ZWRXaWR0aChjb25zdCBCb3gmLCBMYXlvdXRVbml0IGNvbnRhaW5pbmdCbG9ja1dpZHRo KSBjb25zdDsKIAogICAgICAgICBjb25zdCBMYXlvdXRTdGF0ZSYgbGF5b3V0U3RhdGUoKSBjb25z dCB7IHJldHVybiBtX2Zvcm1hdHRpbmdDb250ZXh0LmxheW91dFN0YXRlKCk7IH0KICAgICAgICAg TGF5b3V0U3RhdGUmIGxheW91dFN0YXRlKCkgeyByZXR1cm4gbV9mb3JtYXR0aW5nQ29udGV4dC5s YXlvdXRTdGF0ZSgpOyB9CkBAIC0xODgsNiArMTg2LDkgQEAgcHJvdGVjdGVkOgogICAgICAgICBM YXlvdXRVbml0IHN0YXRpY1ZlcnRpY2FsUG9zaXRpb25Gb3JPdXRPZkZsb3dQb3NpdGlvbmVkKGNv bnN0IEJveCYsIGNvbnN0IFZlcnRpY2FsQ29uc3RyYWludHMmKSBjb25zdDsKICAgICAgICAgTGF5 b3V0VW5pdCBzdGF0aWNIb3Jpem9udGFsUG9zaXRpb25Gb3JPdXRPZkZsb3dQb3NpdGlvbmVkKGNv bnN0IEJveCYsIGNvbnN0IEhvcml6b250YWxDb25zdHJhaW50cyYpIGNvbnN0OwogCisgICAgICAg IGVudW0gY2xhc3MgSGVpZ2h0VHlwZSB7IE1pbiwgTWF4LCBOb3JtYWwgfTsKKyAgICAgICAgT3B0 aW9uYWw8TGF5b3V0VW5pdD4gY29tcHV0ZWRIZWlnaHRWYWx1ZShjb25zdCBCb3gmLCBIZWlnaHRU eXBlLCBPcHRpb25hbDxMYXlvdXRVbml0PiBjb250YWluaW5nQmxvY2tIZWlnaHQpIGNvbnN0Owor CiAgICAgICAgIGNvbnN0IEZvcm1hdHRpbmdDb250ZXh0JiBtX2Zvcm1hdHRpbmdDb250ZXh0Owog ICAgIH07CiAgICAgRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5IGdlb21ldHJ5KCkgY29uc3Qg eyByZXR1cm4gR2VvbWV0cnkoKnRoaXMpOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKaW5kZXggZTYyNmVkYmUyNWU0MGVlMzYx YWZmYjNlNWNkMWY5ZDJmNGRhOTEzNC4uOTliZjU3YWMyNjYzY2M4YWE1OTBjZTc4YjkwZTNhNDI3 NTRhZjJiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250 ZXh0R2VvbWV0cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29u dGV4dEdlb21ldHJ5LmNwcApAQCAtODgsNyArODgsNyBAQCBPcHRpb25hbDxMYXlvdXRVbml0PiBG b3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmNvbXB1dGVkSGVpZ2h0VmFsdWUoY29uc3QgQm94 JgogICAgIHJldHVybiB2YWx1ZUZvckxlbmd0aChoZWlnaHQsICpjb250YWluaW5nQmxvY2tIZWln aHQpOwogfQogCi1PcHRpb25hbDxMYXlvdXRVbml0PiBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0 cnk6OmNvbXB1dGVkQ29udGVudEhlaWdodChjb25zdCBCb3gmIGxheW91dEJveCwgT3B0aW9uYWw8 TGF5b3V0VW5pdD4gY29udGFpbmluZ0Jsb2NrSGVpZ2h0KSBjb25zdAorT3B0aW9uYWw8TGF5b3V0 VW5pdD4gRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5Ojpjb21wdXRlZEhlaWdodChjb25zdCBC b3gmIGxheW91dEJveCwgT3B0aW9uYWw8TGF5b3V0VW5pdD4gY29udGFpbmluZ0Jsb2NrSGVpZ2h0 KSBjb25zdAogewogICAgIGlmIChhdXRvIGhlaWdodCA9IGNvbXB1dGVkSGVpZ2h0VmFsdWUobGF5 b3V0Qm94LCBIZWlnaHRUeXBlOjpOb3JtYWwsIGNvbnRhaW5pbmdCbG9ja0hlaWdodCkpIHsKICAg ICAgICAgaWYgKGxheW91dEJveC5zdHlsZSgpLmJveFNpemluZygpID09IEJveFNpemluZzo6Q29u dGVudEJveCkKQEAgLTk5LDcgKzk5LDcgQEAgT3B0aW9uYWw8TGF5b3V0VW5pdD4gRm9ybWF0dGlu Z0NvbnRleHQ6Okdlb21ldHJ5Ojpjb21wdXRlZENvbnRlbnRIZWlnaHQoY29uc3QgQm8KICAgICBy ZXR1cm4geyB9OwogfQogCi1PcHRpb25hbDxMYXlvdXRVbml0PiBGb3JtYXR0aW5nQ29udGV4dDo6 R2VvbWV0cnk6OmNvbXB1dGVkQ29udGVudFdpZHRoKGNvbnN0IEJveCYgbGF5b3V0Qm94LCBMYXlv dXRVbml0IGNvbnRhaW5pbmdCbG9ja1dpZHRoKSBjb25zdAorT3B0aW9uYWw8TGF5b3V0VW5pdD4g Rm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5Ojpjb21wdXRlZFdpZHRoKGNvbnN0IEJveCYgbGF5 b3V0Qm94LCBMYXlvdXRVbml0IGNvbnRhaW5pbmdCbG9ja1dpZHRoKSBjb25zdAogewogICAgIGlm IChhdXRvIHdpZHRoID0gY29tcHV0ZWRWYWx1ZUlmTm90QXV0byhsYXlvdXRCb3guc3R5bGUoKS5s b2dpY2FsV2lkdGgoKSwgY29udGFpbmluZ0Jsb2NrV2lkdGgpKSB7CiAgICAgICAgIGlmIChsYXlv dXRCb3guc3R5bGUoKS5ib3hTaXppbmcoKSA9PSBCb3hTaXppbmc6OkNvbnRlbnRCb3gpCkBAIC0x OTksMTAgKzE5OSw3IEBAIE9wdGlvbmFsPExheW91dFVuaXQ+IEZvcm1hdHRpbmdDb250ZXh0OjpH ZW9tZXRyeTo6Y29tcHV0ZWRNYXhIZWlnaHQoY29uc3QgQm94JiBsCiAKIE9wdGlvbmFsPExheW91 dFVuaXQ+IEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6Y29tcHV0ZWRNaW5IZWlnaHQoY29u c3QgQm94JiBsYXlvdXRCb3gsIE9wdGlvbmFsPExheW91dFVuaXQ+IGNvbnRhaW5pbmdCbG9ja0hl aWdodCkgY29uc3QKIHsKLSAgICBpZiAoYXV0byBtaW5IZWlnaHRWYWx1ZSA9IGNvbXB1dGVkSGVp Z2h0VmFsdWUobGF5b3V0Qm94LCBIZWlnaHRUeXBlOjpNaW4sIGNvbnRhaW5pbmdCbG9ja0hlaWdo dCkpCi0gICAgICAgIHJldHVybiBtaW5IZWlnaHRWYWx1ZTsKLQotICAgIHJldHVybiB7IExheW91 dFVuaXQgeyB9IH07CisgICAgcmV0dXJuIGNvbXB1dGVkSGVpZ2h0VmFsdWUobGF5b3V0Qm94LCBI ZWlnaHRUeXBlOjpNaW4sIGNvbnRhaW5pbmdCbG9ja0hlaWdodCk7CiB9CiAKIE9wdGlvbmFsPExh eW91dFVuaXQ+IEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6Y29tcHV0ZWRNaW5XaWR0aChj b25zdCBCb3gmIGxheW91dEJveCwgTGF5b3V0VW5pdCBjb250YWluaW5nQmxvY2tXaWR0aCkgY29u c3QKQEAgLTMzMiw3ICszMjksNyBAQCBWZXJ0aWNhbEdlb21ldHJ5IEZvcm1hdHRpbmdDb250ZXh0 OjpHZW9tZXRyeTo6b3V0T2ZGbG93Tm9uUmVwbGFjZWRWZXJ0aWNhbEdlb21ldAogCiAgICAgYXV0 byB0b3AgPSBjb21wdXRlZFZhbHVlSWZOb3RBdXRvKHN0eWxlLmxvZ2ljYWxUb3AoKSwgY29udGFp bmluZ0Jsb2NrV2lkdGgpOwogICAgIGF1dG8gYm90dG9tID0gY29tcHV0ZWRWYWx1ZUlmTm90QXV0 byhzdHlsZS5sb2dpY2FsQm90dG9tKCksIGNvbnRhaW5pbmdCbG9ja1dpZHRoKTsKLSAgICBhdXRv IGhlaWdodCA9IG92ZXJyaWRlVmVydGljYWxWYWx1ZXMuaGVpZ2h0ID8gb3ZlcnJpZGVWZXJ0aWNh bFZhbHVlcy5oZWlnaHQudmFsdWUoKSA6IGNvbXB1dGVkQ29udGVudEhlaWdodChsYXlvdXRCb3gs IGNvbnRhaW5pbmdCbG9ja0hlaWdodCk7CisgICAgYXV0byBoZWlnaHQgPSBvdmVycmlkZVZlcnRp Y2FsVmFsdWVzLmhlaWdodCA/IG92ZXJyaWRlVmVydGljYWxWYWx1ZXMuaGVpZ2h0LnZhbHVlKCkg OiBjb21wdXRlZEhlaWdodChsYXlvdXRCb3gsIGNvbnRhaW5pbmdCbG9ja0hlaWdodCk7CiAgICAg YXV0byBjb21wdXRlZFZlcnRpY2FsTWFyZ2luID0gR2VvbWV0cnk6OmNvbXB1dGVkVmVydGljYWxN YXJnaW4obGF5b3V0Qm94LCBob3Jpem9udGFsQ29uc3RyYWludHMpOwogICAgIFVzZWRWZXJ0aWNh bE1hcmdpbjo6Tm9uQ29sbGFwc2VkVmFsdWVzIHVzZWRWZXJ0aWNhbE1hcmdpbjsgCiAgICAgYXV0 byBwYWRkaW5nVG9wID0gYm94R2VvbWV0cnkucGFkZGluZ1RvcCgpLnZhbHVlT3IoMCk7CkBAIC00 NTIsNyArNDQ5LDcgQEAgSG9yaXpvbnRhbEdlb21ldHJ5IEZvcm1hdHRpbmdDb250ZXh0OjpHZW9t ZXRyeTo6b3V0T2ZGbG93Tm9uUmVwbGFjZWRIb3Jpem9udGFsR2UKICAgICAKICAgICBhdXRvIGxl ZnQgPSBjb21wdXRlZFZhbHVlSWZOb3RBdXRvKHN0eWxlLmxvZ2ljYWxMZWZ0KCksIGNvbnRhaW5p bmdCbG9ja1dpZHRoKTsKICAgICBhdXRvIHJpZ2h0ID0gY29tcHV0ZWRWYWx1ZUlmTm90QXV0byhz dHlsZS5sb2dpY2FsUmlnaHQoKSwgY29udGFpbmluZ0Jsb2NrV2lkdGgpOwotICAgIGF1dG8gd2lk dGggPSBvdmVycmlkZUhvcml6b250YWxWYWx1ZXMud2lkdGggPyBvdmVycmlkZUhvcml6b250YWxW YWx1ZXMud2lkdGggOiBjb21wdXRlZENvbnRlbnRXaWR0aChsYXlvdXRCb3gsIGNvbnRhaW5pbmdC bG9ja1dpZHRoKTsKKyAgICBhdXRvIHdpZHRoID0gb3ZlcnJpZGVIb3Jpem9udGFsVmFsdWVzLndp ZHRoID8gb3ZlcnJpZGVIb3Jpem9udGFsVmFsdWVzLndpZHRoIDogY29tcHV0ZWRXaWR0aChsYXlv dXRCb3gsIGNvbnRhaW5pbmdCbG9ja1dpZHRoKTsKICAgICBhdXRvIGNvbXB1dGVkSG9yaXpvbnRh bE1hcmdpbiA9IEdlb21ldHJ5Ojpjb21wdXRlZEhvcml6b250YWxNYXJnaW4obGF5b3V0Qm94LCBo b3Jpem9udGFsQ29uc3RyYWludHMpOwogICAgIFVzZWRIb3Jpem9udGFsTWFyZ2luIHVzZWRIb3Jp em9udGFsTWFyZ2luOwogICAgIGF1dG8gcGFkZGluZ0xlZnQgPSBib3hHZW9tZXRyeS5wYWRkaW5n TGVmdCgpLnZhbHVlT3IoMCk7CkBAIC03NTgsNyArNzU1LDcgQEAgQ29udGVudEhlaWdodEFuZE1h cmdpbiBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmNvbXBsaWNhdGVkQ2FzZXMoY29uc3Qg Qm94JgogICAgIC8vIDEuIElmICdtYXJnaW4tdG9wJywgb3IgJ21hcmdpbi1ib3R0b20nIGFyZSAn YXV0bycsIHRoZWlyIHVzZWQgdmFsdWUgaXMgMC4KICAgICAvLyAyLiBJZiAnaGVpZ2h0JyBpcyAn YXV0bycsIHRoZSBoZWlnaHQgZGVwZW5kcyBvbiB0aGUgZWxlbWVudCdzIGRlc2NlbmRhbnRzIHBl ciAxMC42LjcuCiAKLSAgICBhdXRvIGhlaWdodCA9IG92ZXJyaWRlVmVydGljYWxWYWx1ZXMuaGVp Z2h0ID8gb3ZlcnJpZGVWZXJ0aWNhbFZhbHVlcy5oZWlnaHQudmFsdWUoKSA6IGNvbXB1dGVkQ29u dGVudEhlaWdodChsYXlvdXRCb3gpOworICAgIGF1dG8gaGVpZ2h0ID0gb3ZlcnJpZGVWZXJ0aWNh bFZhbHVlcy5oZWlnaHQgPyBvdmVycmlkZVZlcnRpY2FsVmFsdWVzLmhlaWdodC52YWx1ZSgpIDog Y29tcHV0ZWRIZWlnaHQobGF5b3V0Qm94KTsKICAgICBhdXRvIGNvbXB1dGVkVmVydGljYWxNYXJn aW4gPSBHZW9tZXRyeTo6Y29tcHV0ZWRWZXJ0aWNhbE1hcmdpbihsYXlvdXRCb3gsIGhvcml6b250 YWxDb25zdHJhaW50cyk7CiAgICAgLy8gIzEKICAgICBhdXRvIHVzZWRWZXJ0aWNhbE1hcmdpbiA9 IFVzZWRWZXJ0aWNhbE1hcmdpbjo6Tm9uQ29sbGFwc2VkVmFsdWVzIHsgY29tcHV0ZWRWZXJ0aWNh bE1hcmdpbi5iZWZvcmUudmFsdWVPcigwKSwgY29tcHV0ZWRWZXJ0aWNhbE1hcmdpbi5hZnRlci52 YWx1ZU9yKDApIH07IApAQCAtNzg4LDcgKzc4NSw3IEBAIENvbnRlbnRXaWR0aEFuZE1hcmdpbiBG b3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmZsb2F0aW5nTm9uUmVwbGFjZWRXaWR0aEFuZE1h CiAgICAgLy8gIzEKICAgICBhdXRvIHVzZWRIb3Jpem9udGFsbE1hcmdpbiA9IFVzZWRIb3Jpem9u dGFsTWFyZ2luIHsgY29tcHV0ZWRIb3Jpem9udGFsTWFyZ2luLnN0YXJ0LnZhbHVlT3IoMCksIGNv bXB1dGVkSG9yaXpvbnRhbE1hcmdpbi5lbmQudmFsdWVPcigwKSB9OwogICAgIC8vICMyCi0gICAg YXV0byB3aWR0aCA9IG92ZXJyaWRlSG9yaXpvbnRhbFZhbHVlcy53aWR0aCA/IG92ZXJyaWRlSG9y aXpvbnRhbFZhbHVlcy53aWR0aCA6IGNvbXB1dGVkQ29udGVudFdpZHRoKGxheW91dEJveCwgaG9y aXpvbnRhbENvbnN0cmFpbnRzLmxvZ2ljYWxXaWR0aCk7CisgICAgYXV0byB3aWR0aCA9IG92ZXJy aWRlSG9yaXpvbnRhbFZhbHVlcy53aWR0aCA/IG92ZXJyaWRlSG9yaXpvbnRhbFZhbHVlcy53aWR0 aCA6IGNvbXB1dGVkV2lkdGgobGF5b3V0Qm94LCBob3Jpem9udGFsQ29uc3RyYWludHMubG9naWNh bFdpZHRoKTsKICAgICBpZiAoIXdpZHRoKQogICAgICAgICB3aWR0aCA9IHNocmlua1RvRml0V2lk dGgobGF5b3V0Qm94LCBob3Jpem9udGFsQ29uc3RyYWludHMubG9naWNhbFdpZHRoKTsKIApAQCAt ODc1LDcgKzg3Miw3IEBAIENvbnRlbnRIZWlnaHRBbmRNYXJnaW4gRm9ybWF0dGluZ0NvbnRleHQ6 Okdlb21ldHJ5OjppbmxpbmVSZXBsYWNlZEhlaWdodEFuZE1hcmdpCiAgICAgYXV0byB1c2VkVmVy dGljYWxNYXJnaW4gPSBVc2VkVmVydGljYWxNYXJnaW46Ok5vbkNvbGxhcHNlZFZhbHVlcyB7IGNv bXB1dGVkVmVydGljYWxNYXJnaW4uYmVmb3JlLnZhbHVlT3IoMCksIGNvbXB1dGVkVmVydGljYWxN YXJnaW4uYWZ0ZXIudmFsdWVPcigwKSB9OwogICAgIGF1dG8mIHN0eWxlID0gcmVwbGFjZWRCb3gu c3R5bGUoKTsKIAotICAgIGF1dG8gaGVpZ2h0ID0gb3ZlcnJpZGVWZXJ0aWNhbFZhbHVlcy5oZWln aHQgPyBvdmVycmlkZVZlcnRpY2FsVmFsdWVzLmhlaWdodC52YWx1ZSgpIDogY29tcHV0ZWRDb250 ZW50SGVpZ2h0KHJlcGxhY2VkQm94LCB2ZXJ0aWNhbENvbnN0cmFpbnRzID8gdmVydGljYWxDb25z dHJhaW50cy0+bG9naWNhbEhlaWdodCA6IFdURjo6bnVsbG9wdCk7CisgICAgYXV0byBoZWlnaHQg PSBvdmVycmlkZVZlcnRpY2FsVmFsdWVzLmhlaWdodCA/IG92ZXJyaWRlVmVydGljYWxWYWx1ZXMu aGVpZ2h0LnZhbHVlKCkgOiBjb21wdXRlZEhlaWdodChyZXBsYWNlZEJveCwgdmVydGljYWxDb25z dHJhaW50cyA/IHZlcnRpY2FsQ29uc3RyYWludHMtPmxvZ2ljYWxIZWlnaHQgOiBXVEY6Om51bGxv cHQpOwogICAgIGF1dG8gaGVpZ2h0SXNBdXRvID0gIW92ZXJyaWRlVmVydGljYWxWYWx1ZXMuaGVp Z2h0ICYmIGlzSGVpZ2h0QXV0byhyZXBsYWNlZEJveCk7CiAgICAgYXV0byB3aWR0aElzQXV0byA9 IHN0eWxlLmxvZ2ljYWxXaWR0aCgpLmlzQXV0bygpOwogCkBAIC05MzUsOSArOTMyLDkgQEAgQ29u dGVudFdpZHRoQW5kTWFyZ2luIEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6aW5saW5lUmVw bGFjZWRXaWR0aEFuZE1hcmdpbigKICAgICAgICAgcmV0dXJuIGNvbXB1dGVkSG9yaXpvbnRhbE1h cmdpbi5lbmQudmFsdWVPcigwX2x1KTsKICAgICB9OwogCi0gICAgYXV0byB3aWR0aCA9IG92ZXJy aWRlSG9yaXpvbnRhbFZhbHVlcy53aWR0aCA/IG92ZXJyaWRlSG9yaXpvbnRhbFZhbHVlcy53aWR0 aCA6IGNvbXB1dGVkQ29udGVudFdpZHRoKHJlcGxhY2VkQm94LCBob3Jpem9udGFsQ29uc3RyYWlu dHMubG9naWNhbFdpZHRoKTsKKyAgICBhdXRvIHdpZHRoID0gb3ZlcnJpZGVIb3Jpem9udGFsVmFs dWVzLndpZHRoID8gb3ZlcnJpZGVIb3Jpem9udGFsVmFsdWVzLndpZHRoIDogY29tcHV0ZWRXaWR0 aChyZXBsYWNlZEJveCwgaG9yaXpvbnRhbENvbnN0cmFpbnRzLmxvZ2ljYWxXaWR0aCk7CiAgICAg YXV0byBoZWlnaHRJc0F1dG8gPSBpc0hlaWdodEF1dG8ocmVwbGFjZWRCb3gpOwotICAgIGF1dG8g aGVpZ2h0ID0gY29tcHV0ZWRDb250ZW50SGVpZ2h0KHJlcGxhY2VkQm94LCB2ZXJ0aWNhbENvbnN0 cmFpbnRzID8gdmVydGljYWxDb25zdHJhaW50cy0+bG9naWNhbEhlaWdodCA6IFdURjo6bnVsbG9w dCk7CisgICAgYXV0byBoZWlnaHQgPSBjb21wdXRlZEhlaWdodChyZXBsYWNlZEJveCwgdmVydGlj YWxDb25zdHJhaW50cyA/IHZlcnRpY2FsQ29uc3RyYWludHMtPmxvZ2ljYWxIZWlnaHQgOiBXVEY6 Om51bGxvcHQpOwogCiAgICAgaWYgKCF3aWR0aCAmJiBoZWlnaHRJc0F1dG8gJiYgcmVwbGFjZWRC b3guaGFzSW50cmluc2ljV2lkdGgoKSkgewogICAgICAgICAvLyAjMQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0 R2VvbWV0cnkuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9j a0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCmluZGV4IGIxYzIwZTcxMTAwMTE0YzU5YTNm MWMzM2ZhMGY0NzkxYTJlMzAzOGQuLjAyNGM1MzgxODRhMDllZjBkY2I4NmQ1MzI2MjM2NmRhM2Zl MWE4ZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcv QmxvY2tGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAK QEAgLTY2LDcgKzY2LDcgQEAgQ29udGVudEhlaWdodEFuZE1hcmdpbiBCbG9ja0Zvcm1hdHRpbmdD b250ZXh0OjpHZW9tZXRyeTo6aW5GbG93Tm9uUmVwbGFjZWRIZWlnaHQKICAgICAgICAgYXV0byBj b21wdXRlZFZlcnRpY2FsTWFyZ2luID0gR2VvbWV0cnk6OmNvbXB1dGVkVmVydGljYWxNYXJnaW4o bGF5b3V0Qm94LCBob3Jpem9udGFsQ29uc3RyYWludHMpOwogICAgICAgICBhdXRvIG5vbkNvbGxh cHNlZE1hcmdpbiA9IFVzZWRWZXJ0aWNhbE1hcmdpbjo6Tm9uQ29sbGFwc2VkVmFsdWVzIHsgY29t cHV0ZWRWZXJ0aWNhbE1hcmdpbi5iZWZvcmUudmFsdWVPcigwKSwgY29tcHV0ZWRWZXJ0aWNhbE1h cmdpbi5hZnRlci52YWx1ZU9yKDApIH07IAogICAgICAgICBhdXRvIGJvcmRlckFuZFBhZGRpbmdU b3AgPSBib3hHZW9tZXRyeS5ib3JkZXJUb3AoKSArIGJveEdlb21ldHJ5LnBhZGRpbmdUb3AoKS52 YWx1ZU9yKDApOwotICAgICAgICBhdXRvIGhlaWdodCA9IG92ZXJyaWRlVmVydGljYWxWYWx1ZXMu aGVpZ2h0ID8gb3ZlcnJpZGVWZXJ0aWNhbFZhbHVlcy5oZWlnaHQudmFsdWUoKSA6IGNvbXB1dGVk Q29udGVudEhlaWdodChsYXlvdXRCb3gpOworICAgICAgICBhdXRvIGhlaWdodCA9IG92ZXJyaWRl VmVydGljYWxWYWx1ZXMuaGVpZ2h0ID8gb3ZlcnJpZGVWZXJ0aWNhbFZhbHVlcy5oZWlnaHQudmFs dWUoKSA6IGNvbXB1dGVkSGVpZ2h0KGxheW91dEJveCk7CiAKICAgICAgICAgaWYgKGhlaWdodCkK ICAgICAgICAgICAgIHJldHVybiB7ICpoZWlnaHQsIG5vbkNvbGxhcHNlZE1hcmdpbiB9OwpAQCAt MTA2LDcgKzEwNiw3IEBAIENvbnRlbnRIZWlnaHRBbmRNYXJnaW4gQmxvY2tGb3JtYXR0aW5nQ29u dGV4dDo6R2VvbWV0cnk6OmluRmxvd05vblJlcGxhY2VkSGVpZ2h0CiAgICAgfTsKIAogICAgIC8v IDEwLjYuNyAnQXV0bycgaGVpZ2h0cyBmb3IgYmxvY2sgZm9ybWF0dGluZyBjb250ZXh0IHJvb3Rz Ci0gICAgYXV0byBpc0F1dG9IZWlnaHQgPSAhb3ZlcnJpZGVWZXJ0aWNhbFZhbHVlcy5oZWlnaHQg JiYgIWNvbXB1dGVkQ29udGVudEhlaWdodChsYXlvdXRCb3gpOworICAgIGF1dG8gaXNBdXRvSGVp Z2h0ID0gIW92ZXJyaWRlVmVydGljYWxWYWx1ZXMuaGVpZ2h0ICYmICFjb21wdXRlZEhlaWdodChs YXlvdXRCb3gpOwogICAgIGlmIChpc0F1dG9IZWlnaHQgJiYgbGF5b3V0Qm94LmVzdGFibGlzaGVz QmxvY2tGb3JtYXR0aW5nQ29udGV4dCgpKQogICAgICAgICByZXR1cm4gY29tcHV0ZSggT3ZlcnJp ZGVWZXJ0aWNhbFZhbHVlcyB7IGNvbnRlbnRIZWlnaHRGb3JGb3JtYXR0aW5nQ29udGV4dFJvb3Qo bGF5b3V0Qm94KSB9KTsKICAgICByZXR1cm4gY29tcHV0ZShvdmVycmlkZVZlcnRpY2FsVmFsdWVz KTsKQEAgLTE0Miw3ICsxNDIsNyBAQCBDb250ZW50V2lkdGhBbmRNYXJnaW4gQmxvY2tGb3JtYXR0 aW5nQ29udGV4dDo6R2VvbWV0cnk6OmluRmxvd05vblJlcGxhY2VkV2lkdGhBbgogICAgICAgICBh dXRvIGNvbnRhaW5pbmdCbG9ja1dpZHRoID0gaG9yaXpvbnRhbENvbnN0cmFpbnRzLmxvZ2ljYWxX aWR0aDsKICAgICAgICAgYXV0byYgYm94R2VvbWV0cnkgPSBmb3JtYXR0aW5nQ29udGV4dCgpLmdl b21ldHJ5Rm9yQm94KGxheW91dEJveCk7CiAKLSAgICAgICAgYXV0byB3aWR0aCA9IG92ZXJyaWRl SG9yaXpvbnRhbFZhbHVlcy53aWR0aCA/IG92ZXJyaWRlSG9yaXpvbnRhbFZhbHVlcy53aWR0aCA6 IGNvbXB1dGVkQ29udGVudFdpZHRoKGxheW91dEJveCwgY29udGFpbmluZ0Jsb2NrV2lkdGgpOwor ICAgICAgICBhdXRvIHdpZHRoID0gb3ZlcnJpZGVIb3Jpem9udGFsVmFsdWVzLndpZHRoID8gb3Zl cnJpZGVIb3Jpem9udGFsVmFsdWVzLndpZHRoIDogY29tcHV0ZWRXaWR0aChsYXlvdXRCb3gsIGNv bnRhaW5pbmdCbG9ja1dpZHRoKTsKICAgICAgICAgYXV0byBjb21wdXRlZEhvcml6b250YWxNYXJn aW4gPSBHZW9tZXRyeTo6Y29tcHV0ZWRIb3Jpem9udGFsTWFyZ2luKGxheW91dEJveCwgaG9yaXpv bnRhbENvbnN0cmFpbnRzKTsKICAgICAgICAgVXNlZEhvcml6b250YWxNYXJnaW4gdXNlZEhvcml6 b250YWxNYXJnaW47CiAgICAgICAgIGF1dG8gYm9yZGVyTGVmdCA9IGJveEdlb21ldHJ5LmJvcmRl ckxlZnQoKTsKQEAgLTI1OCw3ICsyNTgsNyBAQCBDb250ZW50SGVpZ2h0QW5kTWFyZ2luIEJsb2Nr Rm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjppbkZsb3dIZWlnaHRBbmRNYXJnaW4oYwogICAg IC8vIEZJWE1FOiBMZXQncyBzcGVjaWFsIGNhc2UgdGhlIHRhYmxlIGhlaWdodCBjb21wdXRhdGlv biBmb3Igbm93IC0+IGZpZ3VyZSBvdXQgd2hldGhlciB0YWJsZXMgZmFsbCBpbnRvIHRoZSAiaW5G bG93Tm9uUmVwbGFjZWRIZWlnaHRBbmRNYXJnaW4iIGNhdGVnb3J5LgogICAgIGlmIChsYXlvdXRC b3guZXN0YWJsaXNoZXNUYWJsZUZvcm1hdHRpbmdDb250ZXh0KCkpIHsKICAgICAgICAgYXV0byYg dGFibGVCb3ggPSBkb3duY2FzdDxDb250YWluZXJCb3g+KGxheW91dEJveCk7Ci0gICAgICAgIGF1 dG8gY29tcHV0ZWRUYWJsZUhlaWdodCA9IGNvbXB1dGVkQ29udGVudEhlaWdodCh0YWJsZUJveCk7 CisgICAgICAgIGF1dG8gY29tcHV0ZWRUYWJsZUhlaWdodCA9IGNvbXB1dGVkSGVpZ2h0KHRhYmxl Qm94KTsKICAgICAgICAgYXV0byBjb250ZW50SGVpZ2h0ID0gY29udGVudEhlaWdodEZvckZvcm1h dHRpbmdDb250ZXh0Um9vdCh0YWJsZUJveCk7CiAgICAgICAgIGlmIChjb21wdXRlZFRhYmxlSGVp Z2h0ICYmIGNvbnRlbnRIZWlnaHQgPiBjb21wdXRlZFRhYmxlSGVpZ2h0KSB7CiAgICAgICAgICAg ICAvLyBUYWJsZSBjb250ZW50IG5lZWRzIG1vcmUgdmVydGljYWwgc3BhY2UgdGhhbiB0aGUgdGFi bGUgaGFzLgpAQCAtMzA0LDcgKzMwNCw3IEBAIENvbnRlbnRXaWR0aEFuZE1hcmdpbiBCbG9ja0Zv cm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6aW5GbG93V2lkdGhBbmRNYXJnaW4oY29uCiAgICAg ICAgICAgICBpbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzID0gKnByZWNvbXB1dGVkSW50cmluc2lj V2lkdGhDb25zdHJhaW50czsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgaW50cmluc2ljV2lk dGhDb25zdHJhaW50cyA9IExheW91dENvbnRleHQ6OmNyZWF0ZUZvcm1hdHRpbmdDb250ZXh0KHRh YmxlQm94LCBsYXlvdXRTdGF0ZSgpKS0+Y29tcHV0ZWRJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRz KCk7Ci0gICAgICAgIGF1dG8gY29tcHV0ZWRUYWJsZVdpZHRoID0gY29tcHV0ZWRDb250ZW50V2lk dGgodGFibGVCb3gsIGhvcml6b250YWxDb25zdHJhaW50cy5sb2dpY2FsV2lkdGgpOworICAgICAg ICBhdXRvIGNvbXB1dGVkVGFibGVXaWR0aCA9IGNvbXB1dGVkV2lkdGgodGFibGVCb3gsIGhvcml6 b250YWxDb25zdHJhaW50cy5sb2dpY2FsV2lkdGgpOwogICAgICAgICBhdXRvIHVzZWRXaWR0aCA9 IGNvbXB1dGVkVGFibGVXaWR0aDsKICAgICAgICAgaWYgKGNvbXB1dGVkVGFibGVXaWR0aCAmJiBp bnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzLm1pbmltdW0gPiBjb21wdXRlZFRhYmxlV2lkdGgpIHsK ICAgICAgICAgICAgIC8vIFRhYmxlIGNvbnRlbnQgbmVlZHMgbW9yZSBzcGFjZSB0aGFuIHRoZSB0 YWJsZSBoYXMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvdGFibGVmb3JtYXR0 aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L3Rh YmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCA1MTUzZjdlNjIz NGQ1MWEzN2E4YzVjYjlhMGEyMTFiYWIxMjdiNWY2Li5iNzA1YzYxMGMxYmY0ZWJlMGVlNmI2Nzgz MDQ3ZjQ4MDRjNGQxNDU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvdGFibGVm b3JtYXR0aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTU4 MCw3ICs1ODAsNyBAQCB2b2lkIFRhYmxlRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVBbmREaXN0 cmlidXRlRXh0cmFWZXJ0aWNhbFNwYWNlKExheW91dFVuaXQgYQogICAgIGF1dG8gZGlzdHJpYnV0 ZWRTcGFjZXMgPSBkaXN0cmlidXRlQXZhaWxhYmxlU3BhY2U8Um93U3Bhbj4oZ3JpZCwgc3BhY2VU b0Rpc3RyaWJ1dGUsIFsmXSAoY29uc3QgVGFibGVHcmlkOjpTbG90JiBzbG90LCBzaXplX3Qgcm93 SW5kZXgpIHsKICAgICAgICAgaWYgKHNsb3QuaGFzUm93U3BhbigpKQogICAgICAgICAgICAgcmV0 dXJuIGdlb21ldHJ5Rm9yQm94KHNsb3QuY2VsbCgpLmJveCgpKS5oZWlnaHQoKTsKLSAgICAgICAg YXV0byBjb21wdXRlZFJvd0hlaWdodCA9IGdlb21ldHJ5KCkuY29tcHV0ZWRDb250ZW50SGVpZ2h0 KHJvd3MubGlzdCgpW3Jvd0luZGV4XS5ib3goKSwgeyB9KTsKKyAgICAgICAgYXV0byBjb21wdXRl ZFJvd0hlaWdodCA9IGdlb21ldHJ5KCkuY29tcHV0ZWRIZWlnaHQocm93cy5saXN0KClbcm93SW5k ZXhdLmJveCgpLCB7IH0pOwogICAgICAgICByZXR1cm4gc3RkOjptYXgoTGF5b3V0VW5pdCB7IHJv d0hlaWdodFtyb3dJbmRleF0uaGVpZ2h0KCkgfSwgY29tcHV0ZWRSb3dIZWlnaHQudmFsdWVPcigw X2x1KSk7CiAgICAgfSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC90YWJs ZWZvcm1hdHRpbmcvVGFibGVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVGb3JtYXR0aW5nQ29udGV4dEdlb21l dHJ5LmNwcAppbmRleCAyNzFjNGM5MWIxNmNiYmU5Yzg0NjYxZTBkNzhhOTgzMGQ2MzQzNzc1Li4y ZGNlMjlhZTg3NDQyNWFlN2ZkZDQwZjgzNDc5Y2I4N2U0Yzc3NGU1IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHRH ZW9tZXRyeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9U YWJsZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCkBAIC0zOSw3ICszOSw3IEBAIG5hbWVz cGFjZSBMYXlvdXQgewogTGF5b3V0VW5pdCBUYWJsZUZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRy eTo6Y2VsbEhlaWdoKGNvbnN0IENvbnRhaW5lckJveCYgY2VsbEJveCkgY29uc3QKIHsKICAgICBB U1NFUlQoY2VsbEJveC5pc0luRmxvdygpKTsKLSAgICBpZiAoYXV0byBoZWlnaHQgPSBjb21wdXRl ZENvbnRlbnRIZWlnaHQoY2VsbEJveCkpCisgICAgaWYgKGF1dG8gaGVpZ2h0ID0gY29tcHV0ZWRI ZWlnaHQoY2VsbEJveCkpCiAgICAgICAgIHJldHVybiAqaGVpZ2h0OwogICAgIHJldHVybiBjb250 ZW50SGVpZ2h0Rm9yRm9ybWF0dGluZ0NvbnRleHRSb290KGNlbGxCb3gpOwogfQpAQCAtNDgsNyAr NDgsNyBAQCBPcHRpb25hbDxMYXlvdXRVbml0PiBUYWJsZUZvcm1hdHRpbmdDb250ZXh0OjpHZW9t ZXRyeTo6Y29tcHV0ZWRDb2x1bW5XaWR0aChjb25zdAogewogICAgIC8vIENoZWNrIGJvdGggc3R5 bGUgYW5kIDxjb2w+J3Mgd2lkdGggYXR0cmlidXRlLgogICAgIC8vIEZJWE1FOiBGaWd1cmUgb3V0 IHdoYXQgdG8gZG8gd2l0aCBjYWxjdWxhdGVkIHZhbHVlcywgbGlrZSA8Y29sIHN0eWxlPSJ3aWR0 aDogMTAlIj4uCi0gICAgaWYgKGF1dG8gY29tcHV0ZWRXaWR0aFZhbHVlID0gY29tcHV0ZWRDb250 ZW50V2lkdGgoY29sdW1uQm94LCB7IH0pKQorICAgIGlmIChhdXRvIGNvbXB1dGVkV2lkdGhWYWx1 ZSA9IGNvbXB1dGVkV2lkdGgoY29sdW1uQm94LCB7IH0pKQogICAgICAgICByZXR1cm4gY29tcHV0 ZWRXaWR0aFZhbHVlOwogICAgIHJldHVybiBjb2x1bW5Cb3guY29sdW1uV2lkdGgoKTsKIH0K