212867 2020-06-06 07:21:05 -0700 [LFC] FormattingContext::Geometry::computedValue should not try to resolve values when layout is required 2020-06-06 08:03:19 -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 1659954 0 zalan 2020-06-06 07:21:05 -0700 In general, the computed value resolves the specified value as far as possible without laying out the content. 1659955 1 401256 zalan 2020-06-06 07:23:05 -0700 Created attachment 401256 Patch 1659958 2 ews-feeder 2020-06-06 08:02:52 -0700 Committed r262679: <https://trac.webkit.org/changeset/262679> All reviewed patches have been landed. Closing bug and clearing flags on attachment 401256. 1659959 3 webkit-bug-importer 2020-06-06 08:03:19 -0700 <rdar://problem/64068904> 401256 2020-06-06 07:23:05 -0700 2020-06-06 08:02:52 -0700 Patch bug-212867-20200606072304.patch text/plain 12955 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNDE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzEwYzQxMWRmNzlmZDE0 ZDExZjIzNTYwMDk4NzBhMjQzZTVlNzYxMy4uOTcwODVlYjM0MDY5MzdmMTI4NDQ2OTcwOTZjYTBj ZWQ0YWRhODkwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIwLTA2LTA2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gRm9ybWF0dGluZ0Nv bnRleHQ6Okdlb21ldHJ5Ojpjb21wdXRlZFZhbHVlIHNob3VsZCBub3QgdHJ5IHRvIHJlc29sdmUg dmFsdWVzIHdoZW4gbGF5b3V0IGlzIHJlcXVpcmVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTI4NjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIGluIHByZXBhcmF0aW9uIGZvciBhZGRpbmcg bWluL21heC9maXQtY29udGVudCBzdXBwb3J0LgorCisgICAgICAgICogbGF5b3V0L0Zvcm1hdHRp bmdDb250ZXh0Lmg6CisgICAgICAgICogbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnku Y3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0 cnk6OmNvbXB1dGVkV2lkdGggY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGb3Jt YXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmNvbXB1dGVkVmFsdWUgY29uc3QpOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmNvbXB1dGVkTWlu V2lkdGggY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4 dDo6R2VvbWV0cnk6OmNvbXB1dGVkTWF4V2lkdGggY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Om91dE9mRmxvd05vblJlcGxhY2Vk VmVydGljYWxHZW9tZXRyeSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1h dHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6b3V0T2ZGbG93Tm9uUmVwbGFjZWRIb3Jpem9udGFsR2Vv bWV0cnkpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6R2Vv bWV0cnk6Om91dE9mRmxvd1JlcGxhY2VkVmVydGljYWxHZW9tZXRyeSBjb25zdCk6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6b3V0T2ZGbG93 UmVwbGFjZWRIb3Jpem9udGFsR2VvbWV0cnkgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmluRmxvd1Bvc2l0aW9uZWRQb3NpdGlv bk9mZnNldCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdDb250 ZXh0OjpHZW9tZXRyeTo6Y29tcHV0ZWRIb3Jpem9udGFsTWFyZ2luIGNvbnN0KToKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5Ojpjb21wdXRlZFZl cnRpY2FsTWFyZ2luIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0dGlu Z0NvbnRleHQ6Okdlb21ldHJ5Ojpjb21wdXRlZFZhbHVlSWZOb3RBdXRvIGNvbnN0KTogRGVsZXRl ZC4KKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29u dGV4dEdlb21ldHJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0 dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjppbmxpbmVCbG9ja1dpZHRoQW5kTWFyZ2luKToKKwogMjAy MC0wNi0wMiAgTWFyayBMYW0gIDxtYXJrLmxhbUBhcHBsZS5jb20+CiAKICAgICAgICAgRml4IGJy b2tlbiBXaW5kb3dzIGJ1aWxkLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zv cm1hdHRpbmdDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRl eHQuaAppbmRleCAwMGI4NzVjYWMwOWU3ZjE0NDQ4MDc4MDg5NWUzZmUzMDljN2U5ODk0Li5hZTg3 YTNlMWVkNmNiZWU0YjExYTAzNDk3NmZmMzU2NzVlNjI2NDBjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuaApAQCAtMTQ0LDcgKzE0NCw3IEBAIHByb3RlY3RlZDoK ICAgICAgICAgQ29tcHV0ZWRIb3Jpem9udGFsTWFyZ2luIGNvbXB1dGVkSG9yaXpvbnRhbE1hcmdp bihjb25zdCBCb3gmLCBjb25zdCBIb3Jpem9udGFsQ29uc3RyYWludHMmKSBjb25zdDsKICAgICAg ICAgQ29tcHV0ZWRWZXJ0aWNhbE1hcmdpbiBjb21wdXRlZFZlcnRpY2FsTWFyZ2luKGNvbnN0IEJv eCYsIGNvbnN0IEhvcml6b250YWxDb25zdHJhaW50cyYpIGNvbnN0OwogCi0gICAgICAgIE9wdGlv bmFsPExheW91dFVuaXQ+IGNvbXB1dGVkVmFsdWVJZk5vdEF1dG8oY29uc3QgTGVuZ3RoJiBnZW9t ZXRyeVByb3BlcnR5LCBMYXlvdXRVbml0IGNvbnRhaW5pbmdCbG9ja1dpZHRoKSBjb25zdDsKKyAg ICAgICAgT3B0aW9uYWw8TGF5b3V0VW5pdD4gY29tcHV0ZWRWYWx1ZShjb25zdCBMZW5ndGgmIGdl b21ldHJ5UHJvcGVydHksIExheW91dFVuaXQgY29udGFpbmluZ0Jsb2NrV2lkdGgpIGNvbnN0Owog ICAgICAgICBPcHRpb25hbDxMYXlvdXRVbml0PiBmaXhlZFZhbHVlKGNvbnN0IExlbmd0aCYgZ2Vv bWV0cnlQcm9wZXJ0eSkgY29uc3Q7CiAKICAgICAgICAgT3B0aW9uYWw8TGF5b3V0VW5pdD4gY29t cHV0ZWRNaW5IZWlnaHQoY29uc3QgQm94JiwgT3B0aW9uYWw8TGF5b3V0VW5pdD4gY29udGFpbmlu Z0Jsb2NrSGVpZ2h0ID0gV1RGOjpudWxsb3B0KSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcCBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAppbmRleCBkNmM2MTZjNmNj OTRlOThmMWJmYzUyNzA2ODAzYjU3OGJlM2QzOWQwLi43YTI1Mjc1MjM1YjNiODIzN2U2ZDYzMmIy NjE3ZTAyNTYzN2MzM2MzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0 dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1h dHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCkBAIC0xMDEsNyArMTAxLDcgQEAgT3B0aW9uYWw8TGF5 b3V0VW5pdD4gRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5Ojpjb21wdXRlZEhlaWdodChjb25z dCBCb3gmIGxheW8KIAogT3B0aW9uYWw8TGF5b3V0VW5pdD4gRm9ybWF0dGluZ0NvbnRleHQ6Okdl b21ldHJ5Ojpjb21wdXRlZFdpZHRoKGNvbnN0IEJveCYgbGF5b3V0Qm94LCBMYXlvdXRVbml0IGNv bnRhaW5pbmdCbG9ja1dpZHRoKSBjb25zdAogewotICAgIGlmIChhdXRvIHdpZHRoID0gY29tcHV0 ZWRWYWx1ZUlmTm90QXV0byhsYXlvdXRCb3guc3R5bGUoKS5sb2dpY2FsV2lkdGgoKSwgY29udGFp bmluZ0Jsb2NrV2lkdGgpKSB7CisgICAgaWYgKGF1dG8gd2lkdGggPSBjb21wdXRlZFZhbHVlKGxh eW91dEJveC5zdHlsZSgpLmxvZ2ljYWxXaWR0aCgpLCBjb250YWluaW5nQmxvY2tXaWR0aCkpIHsK ICAgICAgICAgaWYgKGxheW91dEJveC5zdHlsZSgpLmJveFNpemluZygpID09IEJveFNpemluZzo6 Q29udGVudEJveCkKICAgICAgICAgICAgIHJldHVybiB3aWR0aDsKICAgICAgICAgYXV0byYgYm94 R2VvbWV0cnkgPSBmb3JtYXR0aW5nQ29udGV4dCgpLmdlb21ldHJ5Rm9yQm94KGxheW91dEJveCk7 CkBAIC0xNzAsMTUgKzE3MCwxMiBAQCBMYXlvdXRVbml0IEZvcm1hdHRpbmdDb250ZXh0OjpHZW9t ZXRyeTo6Y29udGVudEhlaWdodEZvckZvcm1hdHRpbmdDb250ZXh0Um9vdChjbwogICAgIHJldHVy biBjb21wdXRlZEhlaWdodDsKIH0KIAotT3B0aW9uYWw8TGF5b3V0VW5pdD4gRm9ybWF0dGluZ0Nv bnRleHQ6Okdlb21ldHJ5Ojpjb21wdXRlZFZhbHVlSWZOb3RBdXRvKGNvbnN0IExlbmd0aCYgZ2Vv bWV0cnlQcm9wZXJ0eSwgTGF5b3V0VW5pdCBjb250YWluaW5nQmxvY2tXaWR0aCkgY29uc3QKK09w dGlvbmFsPExheW91dFVuaXQ+IEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6Y29tcHV0ZWRW YWx1ZShjb25zdCBMZW5ndGgmIGdlb21ldHJ5UHJvcGVydHksIExheW91dFVuaXQgY29udGFpbmlu Z0Jsb2NrV2lkdGgpIGNvbnN0CiB7Ci0gICAgaWYgKGdlb21ldHJ5UHJvcGVydHkuaXNVbmRlZmlu ZWQoKSkKLSAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKLQotICAgIGlmIChnZW9tZXRyeVBy b3BlcnR5LmlzQXV0bygpKQotICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwotCi0gICAgcmV0 dXJuIHZhbHVlRm9yTGVuZ3RoKGdlb21ldHJ5UHJvcGVydHksIGNvbnRhaW5pbmdCbG9ja1dpZHRo KTsKKyAgICAvLyAgSW4gZ2VuZXJhbCwgdGhlIGNvbXB1dGVkIHZhbHVlIHJlc29sdmVzIHRoZSBz cGVjaWZpZWQgdmFsdWUgYXMgZmFyIGFzIHBvc3NpYmxlIHdpdGhvdXQgbGF5aW5nIG91dCB0aGUg Y29udGVudC4KKyAgICBpZiAoZ2VvbWV0cnlQcm9wZXJ0eS5pc0ZpeGVkKCkgfHwgZ2VvbWV0cnlQ cm9wZXJ0eS5pc1BlcmNlbnQoKSB8fCBnZW9tZXRyeVByb3BlcnR5LmlzQ2FsY3VsYXRlZCgpKQor ICAgICAgICByZXR1cm4gdmFsdWVGb3JMZW5ndGgoZ2VvbWV0cnlQcm9wZXJ0eSwgY29udGFpbmlu Z0Jsb2NrV2lkdGgpOworICAgIHJldHVybiB7IH07CiB9CiAKIE9wdGlvbmFsPExheW91dFVuaXQ+ IEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6Zml4ZWRWYWx1ZShjb25zdCBMZW5ndGgmIGdl b21ldHJ5UHJvcGVydHkpIGNvbnN0CkBAIC0yMDQsMTIgKzIwMSwxMiBAQCBPcHRpb25hbDxMYXlv dXRVbml0PiBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmNvbXB1dGVkTWluSGVpZ2h0KGNv bnN0IEJveCYgbAogCiBPcHRpb25hbDxMYXlvdXRVbml0PiBGb3JtYXR0aW5nQ29udGV4dDo6R2Vv bWV0cnk6OmNvbXB1dGVkTWluV2lkdGgoY29uc3QgQm94JiBsYXlvdXRCb3gsIExheW91dFVuaXQg Y29udGFpbmluZ0Jsb2NrV2lkdGgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIGNvbXB1dGVkVmFsdWVJ Zk5vdEF1dG8obGF5b3V0Qm94LnN0eWxlKCkubG9naWNhbE1pbldpZHRoKCksIGNvbnRhaW5pbmdC bG9ja1dpZHRoKTsKKyAgICByZXR1cm4gY29tcHV0ZWRWYWx1ZShsYXlvdXRCb3guc3R5bGUoKS5s b2dpY2FsTWluV2lkdGgoKSwgY29udGFpbmluZ0Jsb2NrV2lkdGgpOwogfQogCiBPcHRpb25hbDxM YXlvdXRVbml0PiBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmNvbXB1dGVkTWF4V2lkdGgo Y29uc3QgQm94JiBsYXlvdXRCb3gsIExheW91dFVuaXQgY29udGFpbmluZ0Jsb2NrV2lkdGgpIGNv bnN0CiB7Ci0gICAgcmV0dXJuIGNvbXB1dGVkVmFsdWVJZk5vdEF1dG8obGF5b3V0Qm94LnN0eWxl KCkubG9naWNhbE1heFdpZHRoKCksIGNvbnRhaW5pbmdCbG9ja1dpZHRoKTsKKyAgICByZXR1cm4g Y29tcHV0ZWRWYWx1ZShsYXlvdXRCb3guc3R5bGUoKS5sb2dpY2FsTWF4V2lkdGgoKSwgY29udGFp bmluZ0Jsb2NrV2lkdGgpOwogfQogCiBMYXlvdXRVbml0IEZvcm1hdHRpbmdDb250ZXh0OjpHZW9t ZXRyeTo6c3RhdGljVmVydGljYWxQb3NpdGlvbkZvck91dE9mRmxvd1Bvc2l0aW9uZWQoY29uc3Qg Qm94JiBsYXlvdXRCb3gsIGNvbnN0IFZlcnRpY2FsQ29uc3RyYWludHMmIHZlcnRpY2FsQ29uc3Ry YWludHMpIGNvbnN0CkBAIC0zMjcsOCArMzI0LDggQEAgVmVydGljYWxHZW9tZXRyeSBGb3JtYXR0 aW5nQ29udGV4dDo6R2VvbWV0cnk6Om91dE9mRmxvd05vblJlcGxhY2VkVmVydGljYWxHZW9tZXQK ICAgICBhdXRvIGNvbnRhaW5pbmdCbG9ja0hlaWdodCA9ICp2ZXJ0aWNhbENvbnN0cmFpbnRzLmxv Z2ljYWxIZWlnaHQ7CiAgICAgYXV0byBjb250YWluaW5nQmxvY2tXaWR0aCA9IGhvcml6b250YWxD b25zdHJhaW50cy5sb2dpY2FsV2lkdGg7CiAKLSAgICBhdXRvIHRvcCA9IGNvbXB1dGVkVmFsdWVJ Zk5vdEF1dG8oc3R5bGUubG9naWNhbFRvcCgpLCBjb250YWluaW5nQmxvY2tXaWR0aCk7Ci0gICAg YXV0byBib3R0b20gPSBjb21wdXRlZFZhbHVlSWZOb3RBdXRvKHN0eWxlLmxvZ2ljYWxCb3R0b20o KSwgY29udGFpbmluZ0Jsb2NrV2lkdGgpOworICAgIGF1dG8gdG9wID0gY29tcHV0ZWRWYWx1ZShz dHlsZS5sb2dpY2FsVG9wKCksIGNvbnRhaW5pbmdCbG9ja1dpZHRoKTsKKyAgICBhdXRvIGJvdHRv bSA9IGNvbXB1dGVkVmFsdWUoc3R5bGUubG9naWNhbEJvdHRvbSgpLCBjb250YWluaW5nQmxvY2tX aWR0aCk7CiAgICAgYXV0byBoZWlnaHQgPSBvdmVycmlkZVZlcnRpY2FsVmFsdWVzLmhlaWdodCA/ IG92ZXJyaWRlVmVydGljYWxWYWx1ZXMuaGVpZ2h0LnZhbHVlKCkgOiBjb21wdXRlZEhlaWdodChs YXlvdXRCb3gsIGNvbnRhaW5pbmdCbG9ja0hlaWdodCk7CiAgICAgYXV0byBjb21wdXRlZFZlcnRp Y2FsTWFyZ2luID0gR2VvbWV0cnk6OmNvbXB1dGVkVmVydGljYWxNYXJnaW4obGF5b3V0Qm94LCBo b3Jpem9udGFsQ29uc3RyYWludHMpOwogICAgIFVzZWRWZXJ0aWNhbE1hcmdpbjo6Tm9uQ29sbGFw c2VkVmFsdWVzIHVzZWRWZXJ0aWNhbE1hcmdpbjsgCkBAIC00NDcsOCArNDQ0LDggQEAgSG9yaXpv bnRhbEdlb21ldHJ5IEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6b3V0T2ZGbG93Tm9uUmVw bGFjZWRIb3Jpem9udGFsR2UKICAgICBhdXRvIGNvbnRhaW5pbmdCbG9ja1dpZHRoID0gaG9yaXpv bnRhbENvbnN0cmFpbnRzLmxvZ2ljYWxXaWR0aDsKICAgICBhdXRvIGlzTGVmdFRvUmlnaHREaXJl Y3Rpb24gPSBsYXlvdXRCb3guY29udGFpbmluZ0Jsb2NrKCkuc3R5bGUoKS5pc0xlZnRUb1JpZ2h0 RGlyZWN0aW9uKCk7CiAgICAgCi0gICAgYXV0byBsZWZ0ID0gY29tcHV0ZWRWYWx1ZUlmTm90QXV0 byhzdHlsZS5sb2dpY2FsTGVmdCgpLCBjb250YWluaW5nQmxvY2tXaWR0aCk7Ci0gICAgYXV0byBy aWdodCA9IGNvbXB1dGVkVmFsdWVJZk5vdEF1dG8oc3R5bGUubG9naWNhbFJpZ2h0KCksIGNvbnRh aW5pbmdCbG9ja1dpZHRoKTsKKyAgICBhdXRvIGxlZnQgPSBjb21wdXRlZFZhbHVlKHN0eWxlLmxv Z2ljYWxMZWZ0KCksIGNvbnRhaW5pbmdCbG9ja1dpZHRoKTsKKyAgICBhdXRvIHJpZ2h0ID0gY29t cHV0ZWRWYWx1ZShzdHlsZS5sb2dpY2FsUmlnaHQoKSwgY29udGFpbmluZ0Jsb2NrV2lkdGgpOwog ICAgIGF1dG8gd2lkdGggPSBvdmVycmlkZUhvcml6b250YWxWYWx1ZXMud2lkdGggPyBvdmVycmlk ZUhvcml6b250YWxWYWx1ZXMud2lkdGggOiBjb21wdXRlZFdpZHRoKGxheW91dEJveCwgY29udGFp bmluZ0Jsb2NrV2lkdGgpOwogICAgIGF1dG8gY29tcHV0ZWRIb3Jpem9udGFsTWFyZ2luID0gR2Vv bWV0cnk6OmNvbXB1dGVkSG9yaXpvbnRhbE1hcmdpbihsYXlvdXRCb3gsIGhvcml6b250YWxDb25z dHJhaW50cyk7CiAgICAgVXNlZEhvcml6b250YWxNYXJnaW4gdXNlZEhvcml6b250YWxNYXJnaW47 CkBAIC01NzUsOCArNTcyLDggQEAgVmVydGljYWxHZW9tZXRyeSBGb3JtYXR0aW5nQ29udGV4dDo6 R2VvbWV0cnk6Om91dE9mRmxvd1JlcGxhY2VkVmVydGljYWxHZW9tZXRyeSgKICAgICBhdXRvIGNv bnRhaW5pbmdCbG9ja0hlaWdodCA9ICp2ZXJ0aWNhbENvbnN0cmFpbnRzLmxvZ2ljYWxIZWlnaHQ7 CiAgICAgYXV0byBjb250YWluaW5nQmxvY2tXaWR0aCA9IGhvcml6b250YWxDb25zdHJhaW50cy5s b2dpY2FsV2lkdGg7CiAKLSAgICBhdXRvIHRvcCA9IGNvbXB1dGVkVmFsdWVJZk5vdEF1dG8oc3R5 bGUubG9naWNhbFRvcCgpLCBjb250YWluaW5nQmxvY2tXaWR0aCk7Ci0gICAgYXV0byBib3R0b20g PSBjb21wdXRlZFZhbHVlSWZOb3RBdXRvKHN0eWxlLmxvZ2ljYWxCb3R0b20oKSwgY29udGFpbmlu Z0Jsb2NrV2lkdGgpOworICAgIGF1dG8gdG9wID0gY29tcHV0ZWRWYWx1ZShzdHlsZS5sb2dpY2Fs VG9wKCksIGNvbnRhaW5pbmdCbG9ja1dpZHRoKTsKKyAgICBhdXRvIGJvdHRvbSA9IGNvbXB1dGVk VmFsdWUoc3R5bGUubG9naWNhbEJvdHRvbSgpLCBjb250YWluaW5nQmxvY2tXaWR0aCk7CiAgICAg YXV0byBoZWlnaHQgPSBpbmxpbmVSZXBsYWNlZEhlaWdodEFuZE1hcmdpbihyZXBsYWNlZEJveCwg aG9yaXpvbnRhbENvbnN0cmFpbnRzLCB2ZXJ0aWNhbENvbnN0cmFpbnRzLCBvdmVycmlkZVZlcnRp Y2FsVmFsdWVzKS5jb250ZW50SGVpZ2h0OwogICAgIGF1dG8gY29tcHV0ZWRWZXJ0aWNhbE1hcmdp biA9IEdlb21ldHJ5Ojpjb21wdXRlZFZlcnRpY2FsTWFyZ2luKHJlcGxhY2VkQm94LCBob3Jpem9u dGFsQ29uc3RyYWludHMpOwogICAgIE9wdGlvbmFsPExheW91dFVuaXQ+IHVzZWRNYXJnaW5CZWZv cmUgPSBjb21wdXRlZFZlcnRpY2FsTWFyZ2luLmJlZm9yZTsKQEAgLTY2MCw4ICs2NTcsOCBAQCBI b3Jpem9udGFsR2VvbWV0cnkgRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpvdXRPZkZsb3dS ZXBsYWNlZEhvcml6b250YWxHZW9tZQogICAgIGF1dG8gY29udGFpbmluZ0Jsb2NrV2lkdGggPSBo b3Jpem9udGFsQ29uc3RyYWludHMubG9naWNhbFdpZHRoOwogICAgIGF1dG8gaXNMZWZ0VG9SaWdo dERpcmVjdGlvbiA9IHJlcGxhY2VkQm94LmNvbnRhaW5pbmdCbG9jaygpLnN0eWxlKCkuaXNMZWZ0 VG9SaWdodERpcmVjdGlvbigpOwogCi0gICAgYXV0byBsZWZ0ID0gY29tcHV0ZWRWYWx1ZUlmTm90 QXV0byhzdHlsZS5sb2dpY2FsTGVmdCgpLCBjb250YWluaW5nQmxvY2tXaWR0aCk7Ci0gICAgYXV0 byByaWdodCA9IGNvbXB1dGVkVmFsdWVJZk5vdEF1dG8oc3R5bGUubG9naWNhbFJpZ2h0KCksIGNv bnRhaW5pbmdCbG9ja1dpZHRoKTsKKyAgICBhdXRvIGxlZnQgPSBjb21wdXRlZFZhbHVlKHN0eWxl LmxvZ2ljYWxMZWZ0KCksIGNvbnRhaW5pbmdCbG9ja1dpZHRoKTsKKyAgICBhdXRvIHJpZ2h0ID0g Y29tcHV0ZWRWYWx1ZShzdHlsZS5sb2dpY2FsUmlnaHQoKSwgY29udGFpbmluZ0Jsb2NrV2lkdGgp OwogICAgIGF1dG8gY29tcHV0ZWRIb3Jpem9udGFsTWFyZ2luID0gR2VvbWV0cnk6OmNvbXB1dGVk SG9yaXpvbnRhbE1hcmdpbihyZXBsYWNlZEJveCwgaG9yaXpvbnRhbENvbnN0cmFpbnRzKTsKICAg ICBPcHRpb25hbDxMYXlvdXRVbml0PiB1c2VkTWFyZ2luU3RhcnQgPSBjb21wdXRlZEhvcml6b250 YWxNYXJnaW4uc3RhcnQ7CiAgICAgT3B0aW9uYWw8TGF5b3V0VW5pdD4gdXNlZE1hcmdpbkVuZCA9 IGNvbXB1dGVkSG9yaXpvbnRhbE1hcmdpbi5lbmQ7CkBAIC05NzcsOCArOTc0LDggQEAgTGF5b3V0 U2l6ZSBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmluRmxvd1Bvc2l0aW9uZWRQb3NpdGlv bk9mZnNldChjb25zdCBCb3gKICAgICBhdXRvJiBzdHlsZSA9IGxheW91dEJveC5zdHlsZSgpOwog ICAgIGF1dG8gY29udGFpbmluZ0Jsb2NrV2lkdGggPSBob3Jpem9udGFsQ29uc3RyYWludHMubG9n aWNhbFdpZHRoOwogCi0gICAgYXV0byB0b3AgPSBjb21wdXRlZFZhbHVlSWZOb3RBdXRvKHN0eWxl LmxvZ2ljYWxUb3AoKSwgY29udGFpbmluZ0Jsb2NrV2lkdGgpOwotICAgIGF1dG8gYm90dG9tID0g Y29tcHV0ZWRWYWx1ZUlmTm90QXV0byhzdHlsZS5sb2dpY2FsQm90dG9tKCksIGNvbnRhaW5pbmdC bG9ja1dpZHRoKTsKKyAgICBhdXRvIHRvcCA9IGNvbXB1dGVkVmFsdWUoc3R5bGUubG9naWNhbFRv cCgpLCBjb250YWluaW5nQmxvY2tXaWR0aCk7CisgICAgYXV0byBib3R0b20gPSBjb21wdXRlZFZh bHVlKHN0eWxlLmxvZ2ljYWxCb3R0b20oKSwgY29udGFpbmluZ0Jsb2NrV2lkdGgpOwogCiAgICAg aWYgKCF0b3AgJiYgIWJvdHRvbSkgewogICAgICAgICAvLyAjMQpAQCAtMTAwNSw4ICsxMDAyLDgg QEAgTGF5b3V0U2l6ZSBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmluRmxvd1Bvc2l0aW9u ZWRQb3NpdGlvbk9mZnNldChjb25zdCBCb3gKICAgICAvLyAgICBJZiB0aGUgJ2RpcmVjdGlvbicg cHJvcGVydHkgb2YgdGhlIGNvbnRhaW5pbmcgYmxvY2sgaXMgJ2x0cicsIHRoZSB2YWx1ZSBvZiAn bGVmdCcgd2lucyBhbmQgJ3JpZ2h0JyBiZWNvbWVzIC0nbGVmdCcuCiAgICAgLy8gICAgSWYgJ2Rp cmVjdGlvbicgb2YgdGhlIGNvbnRhaW5pbmcgYmxvY2sgaXMgJ3J0bCcsICdyaWdodCcgd2lucyBh bmQgJ2xlZnQnIGlzIGlnbm9yZWQuCiAKLSAgICBhdXRvIGxlZnQgPSBjb21wdXRlZFZhbHVlSWZO b3RBdXRvKHN0eWxlLmxvZ2ljYWxMZWZ0KCksIGNvbnRhaW5pbmdCbG9ja1dpZHRoKTsKLSAgICBh dXRvIHJpZ2h0ID0gY29tcHV0ZWRWYWx1ZUlmTm90QXV0byhzdHlsZS5sb2dpY2FsUmlnaHQoKSwg Y29udGFpbmluZ0Jsb2NrV2lkdGgpOworICAgIGF1dG8gbGVmdCA9IGNvbXB1dGVkVmFsdWUoc3R5 bGUubG9naWNhbExlZnQoKSwgY29udGFpbmluZ0Jsb2NrV2lkdGgpOworICAgIGF1dG8gcmlnaHQg PSBjb21wdXRlZFZhbHVlKHN0eWxlLmxvZ2ljYWxSaWdodCgpLCBjb250YWluaW5nQmxvY2tXaWR0 aCk7CiAKICAgICBpZiAoIWxlZnQgJiYgIXJpZ2h0KSB7CiAgICAgICAgIC8vICMxCkBAIC0xMDYz LDE0ICsxMDYwLDE0IEBAIENvbXB1dGVkSG9yaXpvbnRhbE1hcmdpbiBGb3JtYXR0aW5nQ29udGV4 dDo6R2VvbWV0cnk6OmNvbXB1dGVkSG9yaXpvbnRhbE1hcmdpbihjCiB7CiAgICAgYXV0byYgc3R5 bGUgPSBsYXlvdXRCb3guc3R5bGUoKTsKICAgICBhdXRvIGNvbnRhaW5pbmdCbG9ja1dpZHRoID0g aG9yaXpvbnRhbENvbnN0cmFpbnRzLmxvZ2ljYWxXaWR0aDsKLSAgICByZXR1cm4geyBjb21wdXRl ZFZhbHVlSWZOb3RBdXRvKHN0eWxlLm1hcmdpblN0YXJ0KCksIGNvbnRhaW5pbmdCbG9ja1dpZHRo KSwgY29tcHV0ZWRWYWx1ZUlmTm90QXV0byhzdHlsZS5tYXJnaW5FbmQoKSwgY29udGFpbmluZ0Js b2NrV2lkdGgpIH07CisgICAgcmV0dXJuIHsgY29tcHV0ZWRWYWx1ZShzdHlsZS5tYXJnaW5TdGFy dCgpLCBjb250YWluaW5nQmxvY2tXaWR0aCksIGNvbXB1dGVkVmFsdWUoc3R5bGUubWFyZ2luRW5k KCksIGNvbnRhaW5pbmdCbG9ja1dpZHRoKSB9OwogfQogCiBDb21wdXRlZFZlcnRpY2FsTWFyZ2lu IEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6Y29tcHV0ZWRWZXJ0aWNhbE1hcmdpbihjb25z dCBCb3gmIGxheW91dEJveCwgY29uc3QgSG9yaXpvbnRhbENvbnN0cmFpbnRzJiBob3Jpem9udGFs Q29uc3RyYWludHMpIGNvbnN0CiB7CiAgICAgYXV0byYgc3R5bGUgPSBsYXlvdXRCb3guc3R5bGUo KTsKICAgICBhdXRvIGNvbnRhaW5pbmdCbG9ja1dpZHRoID0gaG9yaXpvbnRhbENvbnN0cmFpbnRz LmxvZ2ljYWxXaWR0aDsKLSAgICByZXR1cm4geyBjb21wdXRlZFZhbHVlSWZOb3RBdXRvKHN0eWxl Lm1hcmdpbkJlZm9yZSgpLCBjb250YWluaW5nQmxvY2tXaWR0aCksIGNvbXB1dGVkVmFsdWVJZk5v dEF1dG8oc3R5bGUubWFyZ2luQWZ0ZXIoKSwgY29udGFpbmluZ0Jsb2NrV2lkdGgpIH07CisgICAg cmV0dXJuIHsgY29tcHV0ZWRWYWx1ZShzdHlsZS5tYXJnaW5CZWZvcmUoKSwgY29udGFpbmluZ0Js b2NrV2lkdGgpLCBjb21wdXRlZFZhbHVlKHN0eWxlLm1hcmdpbkFmdGVyKCksIGNvbnRhaW5pbmdC bG9ja1dpZHRoKSB9OwogfQogCiBGb3JtYXR0aW5nQ29udGV4dDo6SW50cmluc2ljV2lkdGhDb25z dHJhaW50cyBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmNvbnN0cmFpbkJ5TWluTWF4V2lk dGgoY29uc3QgQm94JiBsYXlvdXRCb3gsIEludHJpbnNpY1dpZHRoQ29uc3RyYWludHMgaW50cmlu c2ljV2lkdGgpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2Vv bWV0cnkuY3BwCmluZGV4IGFkOTFmOTg1Zjk3Mjk1OTdjNDA3Njc5NzNiZmQ2MmJiOWIyMTJmZjUu LjEyYWIyYmJjNDM3MmZlNzI5YTU0YjEzZjg0NWRhNDNjM2QyNzVlOWYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250 ZXh0R2VvbWV0cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCkBAIC01Miw3ICs1Miw3IEBA IENvbnRlbnRXaWR0aEFuZE1hcmdpbiBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6 OmlubGluZUJsb2NrV2lkdGhBbmRNYXJnCiAgICAgLy8gSWYgJ3dpZHRoJyBpcyAnYXV0bycsIHRo ZSB1c2VkIHZhbHVlIGlzIHRoZSBzaHJpbmstdG8tZml0IHdpZHRoIGFzIGZvciBmbG9hdGluZyBl bGVtZW50cy4KICAgICAvLyBBIGNvbXB1dGVkIHZhbHVlIG9mICdhdXRvJyBmb3IgJ21hcmdpbi1s ZWZ0JyBvciAnbWFyZ2luLXJpZ2h0JyBiZWNvbWVzIGEgdXNlZCB2YWx1ZSBvZiAnMCcuCiAgICAg Ly8gIzEKLSAgICBhdXRvIHdpZHRoID0gY29tcHV0ZWRWYWx1ZUlmTm90QXV0byhmb3JtYXR0aW5n Q29udGV4dFJvb3Quc3R5bGUoKS5sb2dpY2FsV2lkdGgoKSwgaG9yaXpvbnRhbENvbnN0cmFpbnRz LmxvZ2ljYWxXaWR0aCk7CisgICAgYXV0byB3aWR0aCA9IGNvbXB1dGVkVmFsdWUoZm9ybWF0dGlu Z0NvbnRleHRSb290LnN0eWxlKCkubG9naWNhbFdpZHRoKCksIGhvcml6b250YWxDb25zdHJhaW50 cy5sb2dpY2FsV2lkdGgpOwogICAgIGlmICghd2lkdGgpCiAgICAgICAgIHdpZHRoID0gc2hyaW5r VG9GaXRXaWR0aChmb3JtYXR0aW5nQ29udGV4dFJvb3QsIGhvcml6b250YWxDb25zdHJhaW50cy5s b2dpY2FsV2lkdGgpOwogCg==