217404 2020-10-06 13:59:36 -0700 [LFC] FormattingContext::Geometry::contentHeightForFormattingContextRoot should take a const ContainerBox& 2020-10-06 17:24:18 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham simon.fraser webkit-bug-importer zalan oldest_to_newest 1695303 0 zalan 2020-10-06 13:59:36 -0700 and not a Box& since all FC roots are container boxes. 1695304 1 410692 zalan 2020-10-06 14:01:40 -0700 Created attachment 410692 Patch 1695401 2 ews-feeder 2020-10-06 17:23:22 -0700 Committed r268099: <https://trac.webkit.org/changeset/268099> All reviewed patches have been landed. Closing bug and clearing flags on attachment 410692. 1695402 3 webkit-bug-importer 2020-10-06 17:24:18 -0700 <rdar://problem/70025087> 410692 2020-10-06 14:01:40 -0700 2020-10-06 17:23:23 -0700 Patch bug-217404-20201006140139.patch text/plain 14868 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3OTczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzVjMTdhMDkwMmQ1ZmNk NGE4ZmRkZGU4ZDk5YmVlNDY4YjU0OTg5MS4uN2Y5MzJmM2EzOTAzNzkwODhiZmRjZGRhMzUxOTZj MmFlNzIyOTFkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIwLTEwLTA2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gRm9ybWF0dGluZ0Nv bnRleHQ6Okdlb21ldHJ5Ojpjb250ZW50SGVpZ2h0Rm9yRm9ybWF0dGluZ0NvbnRleHRSb290IHNo b3VsZCB0YWtlIGEgY29uc3QgQ29udGFpbmVyQm94JgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE3NDA0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQSBmb3JtYXR0aW5nIGNvbnRleHQgcm9vdCBpcyBhbHdh eXMgYSBMYXlvdXQ6OkNvbnRhaW5lckJveCAoYW5kIG5vdCBqdXN0IGEgTGF5b3V0OjpCb3gpLgor CisgICAgICAgICogbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0Lmg6CisgICAgICAgICogbGF5b3V0 L0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 OjpGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmNvbnRlbnRIZWlnaHRGb3JGb3JtYXR0aW5n Q29udGV4dFJvb3QgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5n Q29udGV4dDo6R2VvbWV0cnk6Om91dE9mRmxvd05vblJlcGxhY2VkVmVydGljYWxHZW9tZXRyeSBj b25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdDb250ZXh0OjpHZW9t ZXRyeTo6b3V0T2ZGbG93Tm9uUmVwbGFjZWRIb3Jpem9udGFsR2VvbWV0cnkpOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmNvbXBsaWNhdGVk Q2FzZXMgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4 dDo6R2VvbWV0cnk6Om91dE9mRmxvd1ZlcnRpY2FsR2VvbWV0cnkgY29uc3QpOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Om91dE9mRmxvd0hv cml6b250YWxHZW9tZXRyeSk6CisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9j a0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6aW5GbG93Tm9uUmVwbGFjZWRIZWln aHRBbmRNYXJnaW4pOgorICAgICAgICAqIGxheW91dC9sYXlvdXR0cmVlL0xheW91dFRyZWVCdWls ZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VHJlZUJ1aWxkZXI6OmNyZWF0ZUxh eW91dEJveCk6CisKIDIwMjAtMTAtMDYgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4K IAogICAgICAgICBbTEZDXVtCRkNdIE1vdmUgZG9jdW1lbnQgYm94IHNwZWNpYWwgaGVpZ2h0IGNv bXB1dGF0aW9uIG91dCBvZiBjb250ZW50SGVpZ2h0Rm9yRm9ybWF0dGluZ0NvbnRleHRSb290CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuaCBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5oCmluZGV4IDQxY2JmZTZiMGYy OGRlNmQ3YjgyZDZjOTc5YTUyNDFmMGNhZTg5MTAuLmJjOGU4NDIxMWIwZjZlYjk1ZDg0OWEwNmE4 MTExZDUyMDJkMTkyOGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0 aW5nQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4 dC5oCkBAIC0xNTQsNyArMTU0LDcgQEAgcHJvdGVjdGVkOgogCiAgICAgICAgIEZvcm1hdHRpbmdD b250ZXh0OjpJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzIGNvbnN0cmFpbkJ5TWluTWF4V2lkdGgo Y29uc3QgQm94JiwgSW50cmluc2ljV2lkdGhDb25zdHJhaW50cykgY29uc3Q7CiAKLSAgICAgICAg TGF5b3V0VW5pdCBjb250ZW50SGVpZ2h0Rm9yRm9ybWF0dGluZ0NvbnRleHRSb290KGNvbnN0IEJv eCYpIGNvbnN0OworICAgICAgICBMYXlvdXRVbml0IGNvbnRlbnRIZWlnaHRGb3JGb3JtYXR0aW5n Q29udGV4dFJvb3QoY29uc3QgQ29udGFpbmVyQm94JikgY29uc3Q7CiAKICAgICAgICAgQ29uc3Ry YWludHNGb3JPdXRPZkZsb3dDb250ZW50IGNvbnN0cmFpbnRzRm9yT3V0T2ZGbG93Q29udGVudChj b25zdCBDb250YWluZXJCb3gmKTsKICAgICAgICAgQ29uc3RyYWludHNGb3JJbkZsb3dDb250ZW50 IGNvbnN0cmFpbnRzRm9ySW5GbG93Q29udGVudChjb25zdCBDb250YWluZXJCb3gmLCBPcHRpb25h bDxFc2NhcGVSZWFzb24+ID0gV1RGOjpudWxsb3B0KTsKQEAgLTE3NCw4ICsxNzQsOCBAQCBwcm90 ZWN0ZWQ6CiAgICAgICAgIFZlcnRpY2FsR2VvbWV0cnkgb3V0T2ZGbG93UmVwbGFjZWRWZXJ0aWNh bEdlb21ldHJ5KGNvbnN0IFJlcGxhY2VkQm94JiwgY29uc3QgSG9yaXpvbnRhbENvbnN0cmFpbnRz JiwgY29uc3QgVmVydGljYWxDb25zdHJhaW50cyYsIGNvbnN0IE92ZXJyaWRlVmVydGljYWxWYWx1 ZXMmKSBjb25zdDsKICAgICAgICAgSG9yaXpvbnRhbEdlb21ldHJ5IG91dE9mRmxvd1JlcGxhY2Vk SG9yaXpvbnRhbEdlb21ldHJ5KGNvbnN0IFJlcGxhY2VkQm94JiwgY29uc3QgSG9yaXpvbnRhbENv bnN0cmFpbnRzJiwgY29uc3QgVmVydGljYWxDb25zdHJhaW50cyYsIGNvbnN0IE92ZXJyaWRlSG9y aXpvbnRhbFZhbHVlcyYpOwogCi0gICAgICAgIFZlcnRpY2FsR2VvbWV0cnkgb3V0T2ZGbG93Tm9u UmVwbGFjZWRWZXJ0aWNhbEdlb21ldHJ5KGNvbnN0IEJveCYsIGNvbnN0IEhvcml6b250YWxDb25z dHJhaW50cyYsIGNvbnN0IFZlcnRpY2FsQ29uc3RyYWludHMmLCBjb25zdCBPdmVycmlkZVZlcnRp Y2FsVmFsdWVzJikgY29uc3Q7Ci0gICAgICAgIEhvcml6b250YWxHZW9tZXRyeSBvdXRPZkZsb3dO b25SZXBsYWNlZEhvcml6b250YWxHZW9tZXRyeShjb25zdCBCb3gmLCBjb25zdCBIb3Jpem9udGFs Q29uc3RyYWludHMmLCBjb25zdCBPdmVycmlkZUhvcml6b250YWxWYWx1ZXMmKTsKKyAgICAgICAg VmVydGljYWxHZW9tZXRyeSBvdXRPZkZsb3dOb25SZXBsYWNlZFZlcnRpY2FsR2VvbWV0cnkoY29u c3QgQ29udGFpbmVyQm94JiwgY29uc3QgSG9yaXpvbnRhbENvbnN0cmFpbnRzJiwgY29uc3QgVmVy dGljYWxDb25zdHJhaW50cyYsIGNvbnN0IE92ZXJyaWRlVmVydGljYWxWYWx1ZXMmKSBjb25zdDsK KyAgICAgICAgSG9yaXpvbnRhbEdlb21ldHJ5IG91dE9mRmxvd05vblJlcGxhY2VkSG9yaXpvbnRh bEdlb21ldHJ5KGNvbnN0IENvbnRhaW5lckJveCYsIGNvbnN0IEhvcml6b250YWxDb25zdHJhaW50 cyYsIGNvbnN0IE92ZXJyaWRlSG9yaXpvbnRhbFZhbHVlcyYpOwogCiAgICAgICAgIENvbnRlbnRI ZWlnaHRBbmRNYXJnaW4gZmxvYXRpbmdSZXBsYWNlZEhlaWdodEFuZE1hcmdpbihjb25zdCBSZXBs YWNlZEJveCYsIGNvbnN0IEhvcml6b250YWxDb25zdHJhaW50cyYsIGNvbnN0IE92ZXJyaWRlVmVy dGljYWxWYWx1ZXMmKSBjb25zdDsKICAgICAgICAgQ29udGVudFdpZHRoQW5kTWFyZ2luIGZsb2F0 aW5nUmVwbGFjZWRXaWR0aEFuZE1hcmdpbihjb25zdCBSZXBsYWNlZEJveCYsIGNvbnN0IEhvcml6 b250YWxDb25zdHJhaW50cyYsIGNvbnN0IE92ZXJyaWRlSG9yaXpvbnRhbFZhbHVlcyYpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnku Y3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3Bw CmluZGV4IDU5NmZiMjk2OTJjYjcwN2FjZGQ2NjA4OTA5ODQ2OTNkZTFhODk2YjMuLjE0YmUxYTRl ZTZmMDE0MTg4NDllMjRjYWU3NDMwNzkwZDU2MmVhNzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKQEAgLTE2OCwxMCArMTY4 LDEwIEBAIE9wdGlvbmFsPExheW91dFVuaXQ+IEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6 Y29tcHV0ZWRXaWR0aChjb25zdCBCb3gmIGxheW91CiAgICAgcmV0dXJuIHsgfTsKIH0KIAotTGF5 b3V0VW5pdCBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmNvbnRlbnRIZWlnaHRGb3JGb3Jt YXR0aW5nQ29udGV4dFJvb3QoY29uc3QgQm94JiBsYXlvdXRCb3gpIGNvbnN0CitMYXlvdXRVbml0 IEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6Y29udGVudEhlaWdodEZvckZvcm1hdHRpbmdD b250ZXh0Um9vdChjb25zdCBDb250YWluZXJCb3gmIGZvcm1hdHRpbmdDb250ZXh0Um9vdCkgY29u c3QKIHsKLSAgICBBU1NFUlQobGF5b3V0Qm94LmVzdGFibGlzaGVzRm9ybWF0dGluZ0NvbnRleHQo KSk7Ci0gICAgQVNTRVJUKGlzSGVpZ2h0QXV0byhsYXlvdXRCb3gpIHx8IGxheW91dEJveC5lc3Rh Ymxpc2hlc1RhYmxlRm9ybWF0dGluZ0NvbnRleHQoKSB8fCBsYXlvdXRCb3guaXNUYWJsZUNlbGwo KSk7CisgICAgQVNTRVJUKGZvcm1hdHRpbmdDb250ZXh0Um9vdC5lc3RhYmxpc2hlc0Zvcm1hdHRp bmdDb250ZXh0KCkpOworICAgIEFTU0VSVChpc0hlaWdodEF1dG8oZm9ybWF0dGluZ0NvbnRleHRS b290KSB8fCBmb3JtYXR0aW5nQ29udGV4dFJvb3QuZXN0YWJsaXNoZXNUYWJsZUZvcm1hdHRpbmdD b250ZXh0KCkgfHwgZm9ybWF0dGluZ0NvbnRleHRSb290LmlzVGFibGVDZWxsKCkpOwogCiAgICAg Ly8gMTAuNi43ICdBdXRvJyBoZWlnaHRzIGZvciBibG9jayBmb3JtYXR0aW5nIGNvbnRleHQgcm9v dHMKIApAQCAtMTgyLDQ5ICsxODIsNDggQEAgTGF5b3V0VW5pdCBGb3JtYXR0aW5nQ29udGV4dDo6 R2VvbWV0cnk6OmNvbnRlbnRIZWlnaHRGb3JGb3JtYXR0aW5nQ29udGV4dFJvb3QoY28KICAgICAv LyBJbiBhZGRpdGlvbiwgaWYgdGhlIGVsZW1lbnQgaGFzIGFueSBmbG9hdGluZyBkZXNjZW5kYW50 cyB3aG9zZSBib3R0b20gbWFyZ2luIGVkZ2UgaXMgYmVsb3cgdGhlIGVsZW1lbnQncyBib3R0b20g Y29udGVudCBlZGdlLAogICAgIC8vIHRoZW4gdGhlIGhlaWdodCBpcyBpbmNyZWFzZWQgdG8gaW5j bHVkZSB0aG9zZSBlZGdlcy4gT25seSBmbG9hdHMgdGhhdCBwYXJ0aWNpcGF0ZSBpbiB0aGlzIGJs b2NrIGZvcm1hdHRpbmcgY29udGV4dCBhcmUgdGFrZW4KICAgICAvLyBpbnRvIGFjY291bnQsIGUu Zy4sIGZsb2F0cyBpbnNpZGUgYWJzb2x1dGVseSBwb3NpdGlvbmVkIGRlc2NlbmRhbnRzIG9yIG90 aGVyIGZsb2F0cyBhcmUgbm90LgotICAgIGlmICghaXM8Q29udGFpbmVyQm94PihsYXlvdXRCb3gp IHx8ICFkb3duY2FzdDxDb250YWluZXJCb3g+KGxheW91dEJveCkuaGFzSW5GbG93T3JGbG9hdGlu Z0NoaWxkKCkpCisgICAgaWYgKCFmb3JtYXR0aW5nQ29udGV4dFJvb3QuaGFzSW5GbG93T3JGbG9h dGluZ0NoaWxkKCkpCiAgICAgICAgIHJldHVybiB7IH07CiAKICAgICBhdXRvJiBsYXlvdXRTdGF0 ZSA9IHRoaXMtPmxheW91dFN0YXRlKCk7CiAgICAgYXV0byYgZm9ybWF0dGluZ0NvbnRleHQgPSB0 aGlzLT5mb3JtYXR0aW5nQ29udGV4dCgpOwotICAgIGF1dG8mIGJveEdlb21ldHJ5ID0gZm9ybWF0 dGluZ0NvbnRleHQuZ2VvbWV0cnlGb3JCb3gobGF5b3V0Qm94KTsKKyAgICBhdXRvJiBib3hHZW9t ZXRyeSA9IGZvcm1hdHRpbmdDb250ZXh0Lmdlb21ldHJ5Rm9yQm94KGZvcm1hdHRpbmdDb250ZXh0 Um9vdCk7CiAgICAgYXV0byBib3JkZXJBbmRQYWRkaW5nVG9wID0gYm94R2VvbWV0cnkuYm9yZGVy VG9wKCkgKyBib3hHZW9tZXRyeS5wYWRkaW5nVG9wKCkudmFsdWVPcigwKTsKICAgICBhdXRvIHRv cCA9IGJvcmRlckFuZFBhZGRpbmdUb3A7CiAgICAgYXV0byBib3R0b20gPSBib3JkZXJBbmRQYWRk aW5nVG9wOwotICAgIGF1dG8mIGZvcm1hdHRpbmdSb290Q29udGFpbmVyID0gZG93bmNhc3Q8Q29u dGFpbmVyQm94PihsYXlvdXRCb3gpOwotICAgIGlmIChmb3JtYXR0aW5nUm9vdENvbnRhaW5lci5l c3RhYmxpc2hlc0lubGluZUZvcm1hdHRpbmdDb250ZXh0KCkpIHsKLSAgICAgICAgYXV0byYgbGlu ZXMgPSBsYXlvdXRTdGF0ZS5lc3RhYmxpc2hlZElubGluZUZvcm1hdHRpbmdTdGF0ZShmb3JtYXR0 aW5nUm9vdENvbnRhaW5lcikubGluZXMoKTsKKyAgICBpZiAoZm9ybWF0dGluZ0NvbnRleHRSb290 LmVzdGFibGlzaGVzSW5saW5lRm9ybWF0dGluZ0NvbnRleHQoKSkgeworICAgICAgICBhdXRvJiBs aW5lcyA9IGxheW91dFN0YXRlLmVzdGFibGlzaGVkSW5saW5lRm9ybWF0dGluZ1N0YXRlKGZvcm1h dHRpbmdDb250ZXh0Um9vdCkubGluZXMoKTsKICAgICAgICAgLy8gRXZlbiBlbXB0eSBjb250YWlu ZXJzIGdlbmVyYXRlIG9uZSBsaW5lLiAKICAgICAgICAgQVNTRVJUKCFsaW5lcy5pc0VtcHR5KCkp OwogICAgICAgICB0b3AgPSBsaW5lcy5maXJzdCgpLmxvZ2ljYWxUb3AoKTsKICAgICAgICAgYm90 dG9tID0gbGluZXMubGFzdCgpLmxvZ2ljYWxCb3R0b20oKTsKLSAgICB9IGVsc2UgaWYgKGZvcm1h dHRpbmdSb290Q29udGFpbmVyLmVzdGFibGlzaGVzRmxleEZvcm1hdHRpbmdDb250ZXh0KCkpIHsK LSAgICAgICAgYXV0byYgbGluZXMgPSBsYXlvdXRTdGF0ZS5lc3RhYmxpc2hlZEZsZXhGb3JtYXR0 aW5nU3RhdGUoZm9ybWF0dGluZ1Jvb3RDb250YWluZXIpLmxpbmVzKCk7CisgICAgfSBlbHNlIGlm IChmb3JtYXR0aW5nQ29udGV4dFJvb3QuZXN0YWJsaXNoZXNGbGV4Rm9ybWF0dGluZ0NvbnRleHQo KSkgeworICAgICAgICBhdXRvJiBsaW5lcyA9IGxheW91dFN0YXRlLmVzdGFibGlzaGVkRmxleEZv cm1hdHRpbmdTdGF0ZShmb3JtYXR0aW5nQ29udGV4dFJvb3QpLmxpbmVzKCk7CiAgICAgICAgIEFT U0VSVCghbGluZXMuaXNFbXB0eSgpKTsKICAgICAgICAgLy8gRklYTUU6IE1vdmUgZmxleCBvdmVy IHRvIGxheW91dCBnZW9tZXRyeS4KICAgICAgICAgdG9wID0gbGluZXMuZmlyc3QoKS50b3AoKTsK ICAgICAgICAgYm90dG9tID0gbGluZXMubGFzdCgpLmJvdHRvbSgpOwotICAgIH0gZWxzZSBpZiAo Zm9ybWF0dGluZ1Jvb3RDb250YWluZXIuZXN0YWJsaXNoZXNCbG9ja0Zvcm1hdHRpbmdDb250ZXh0 KCkgfHwgZm9ybWF0dGluZ1Jvb3RDb250YWluZXIuZXN0YWJsaXNoZXNUYWJsZUZvcm1hdHRpbmdD b250ZXh0KCkpIHsKLSAgICAgICAgaWYgKGZvcm1hdHRpbmdSb290Q29udGFpbmVyLmhhc0luRmxv d0NoaWxkKCkpIHsKLSAgICAgICAgICAgIGF1dG8mIGZpcnN0Qm94R2VvbWV0cnkgPSBmb3JtYXR0 aW5nQ29udGV4dC5nZW9tZXRyeUZvckJveCgqZm9ybWF0dGluZ1Jvb3RDb250YWluZXIuZmlyc3RJ bkZsb3dDaGlsZCgpLCBFc2NhcGVSZWFzb246Ok5lZWRzR2VvbWV0cnlGcm9tRXN0YWJsaXNoZWRG b3JtYXR0aW5nQ29udGV4dCk7Ci0gICAgICAgICAgICBhdXRvJiBsYXN0Qm94R2VvbWV0cnkgPSBm b3JtYXR0aW5nQ29udGV4dC5nZW9tZXRyeUZvckJveCgqZm9ybWF0dGluZ1Jvb3RDb250YWluZXIu bGFzdEluRmxvd0NoaWxkKCksIEVzY2FwZVJlYXNvbjo6TmVlZHNHZW9tZXRyeUZyb21Fc3RhYmxp c2hlZEZvcm1hdHRpbmdDb250ZXh0KTsKKyAgICB9IGVsc2UgaWYgKGZvcm1hdHRpbmdDb250ZXh0 Um9vdC5lc3RhYmxpc2hlc0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQoKSB8fCBmb3JtYXR0aW5nQ29u dGV4dFJvb3QuZXN0YWJsaXNoZXNUYWJsZUZvcm1hdHRpbmdDb250ZXh0KCkpIHsKKyAgICAgICAg aWYgKGZvcm1hdHRpbmdDb250ZXh0Um9vdC5oYXNJbkZsb3dDaGlsZCgpKSB7CisgICAgICAgICAg ICBhdXRvJiBmaXJzdEJveEdlb21ldHJ5ID0gZm9ybWF0dGluZ0NvbnRleHQuZ2VvbWV0cnlGb3JC b3goKmZvcm1hdHRpbmdDb250ZXh0Um9vdC5maXJzdEluRmxvd0NoaWxkKCksIEVzY2FwZVJlYXNv bjo6TmVlZHNHZW9tZXRyeUZyb21Fc3RhYmxpc2hlZEZvcm1hdHRpbmdDb250ZXh0KTsKKyAgICAg ICAgICAgIGF1dG8mIGxhc3RCb3hHZW9tZXRyeSA9IGZvcm1hdHRpbmdDb250ZXh0Lmdlb21ldHJ5 Rm9yQm94KCpmb3JtYXR0aW5nQ29udGV4dFJvb3QubGFzdEluRmxvd0NoaWxkKCksIEVzY2FwZVJl YXNvbjo6TmVlZHNHZW9tZXRyeUZyb21Fc3RhYmxpc2hlZEZvcm1hdHRpbmdDb250ZXh0KTsKICAg ICAgICAgICAgIHRvcCA9IGZpcnN0Qm94R2VvbWV0cnkubG9naWNhbFJlY3RXaXRoTWFyZ2luKCku dG9wKCk7CiAgICAgICAgICAgICBib3R0b20gPSBsYXN0Qm94R2VvbWV0cnkubG9naWNhbFJlY3RX aXRoTWFyZ2luKCkuYm90dG9tKCk7CiAgICAgICAgIH0KICAgICB9IGVsc2UKICAgICAgICAgQVNT RVJUX05PVF9SRUFDSEVEKCk7CiAKLSAgICBhdXRvJiBmbG9hdGluZ1N0YXRlID0gbGF5b3V0U3Rh dGUuZXN0YWJsaXNoZWRGb3JtYXR0aW5nU3RhdGUoZm9ybWF0dGluZ1Jvb3RDb250YWluZXIpLmZs b2F0aW5nU3RhdGUoKTsKLSAgICBhdXRvIGZsb2F0Qm90dG9tID0gZmxvYXRpbmdTdGF0ZS5ib3R0 b20oZm9ybWF0dGluZ1Jvb3RDb250YWluZXIpOworICAgIGF1dG8mIGZsb2F0aW5nU3RhdGUgPSBs YXlvdXRTdGF0ZS5lc3RhYmxpc2hlZEZvcm1hdHRpbmdTdGF0ZShmb3JtYXR0aW5nQ29udGV4dFJv b3QpLmZsb2F0aW5nU3RhdGUoKTsKKyAgICBhdXRvIGZsb2F0Qm90dG9tID0gZmxvYXRpbmdTdGF0 ZS5ib3R0b20oZm9ybWF0dGluZ0NvbnRleHRSb290KTsKICAgICBpZiAoZmxvYXRCb3R0b20pIHsK ICAgICAgICAgYm90dG9tID0gc3RkOjptYXg8TGF5b3V0VW5pdD4oKmZsb2F0Qm90dG9tLCBib3R0 b20pOwotICAgICAgICBhdXRvIGZsb2F0VG9wID0gZmxvYXRpbmdTdGF0ZS50b3AoZm9ybWF0dGlu Z1Jvb3RDb250YWluZXIpOworICAgICAgICBhdXRvIGZsb2F0VG9wID0gZmxvYXRpbmdTdGF0ZS50 b3AoZm9ybWF0dGluZ0NvbnRleHRSb290KTsKICAgICAgICAgQVNTRVJUKGZsb2F0VG9wKTsKICAg ICAgICAgdG9wID0gc3RkOjptaW48TGF5b3V0VW5pdD4oKmZsb2F0VG9wLCB0b3ApOwogICAgIH0K LQogICAgIGF1dG8gY29tcHV0ZWRIZWlnaHQgPSBib3R0b20gLSB0b3A7Ci0gICAgTE9HX1dJVEhf U1RSRUFNKEZvcm1hdHRpbmdDb250ZXh0TGF5b3V0LCBzdHJlYW0gPDwgIltIZWlnaHRdIC0+IGNv bnRlbnQgaGVpZ2h0IGZvciBmb3JtYXR0aW5nIGNvbnRleHQgcm9vdCAtPiBoZWlnaHQoIiA8PCBj b21wdXRlZEhlaWdodCA8PCAicHgpIGxheW91dEJveCgiPDwgJmxheW91dEJveCA8PCAiKSIpOwor CisgICAgTE9HX1dJVEhfU1RSRUFNKEZvcm1hdHRpbmdDb250ZXh0TGF5b3V0LCBzdHJlYW0gPDwg IltIZWlnaHRdIC0+IGNvbnRlbnQgaGVpZ2h0IGZvciBmb3JtYXR0aW5nIGNvbnRleHQgcm9vdCAt PiBoZWlnaHQoIiA8PCBjb21wdXRlZEhlaWdodCA8PCAicHgpIGxheW91dEJveCgiPDwgJmZvcm1h dHRpbmdDb250ZXh0Um9vdCA8PCAiKSIpOwogICAgIHJldHVybiBjb21wdXRlZEhlaWdodDsKIH0K IApAQCAtMzUxLDcgKzM1MCw3IEBAIExheW91dFVuaXQgRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21l dHJ5OjpzaHJpbmtUb0ZpdFdpZHRoKGNvbnN0IEJveCYgZm9ybWF0dGluZ1JvCiAgICAgcmV0dXJu IHN0ZDo6bWluKHN0ZDo6bWF4KGludHJpbnNpY1dpZHRoQ29uc3RyYWludHMubWluaW11bSwgYXZh aWxhYmxlV2lkdGgpLCBpbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzLm1heGltdW0pOwogfQogCi1W ZXJ0aWNhbEdlb21ldHJ5IEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6b3V0T2ZGbG93Tm9u UmVwbGFjZWRWZXJ0aWNhbEdlb21ldHJ5KGNvbnN0IEJveCYgbGF5b3V0Qm94LCBjb25zdCBIb3Jp em9udGFsQ29uc3RyYWludHMmIGhvcml6b250YWxDb25zdHJhaW50cywgY29uc3QgVmVydGljYWxD b25zdHJhaW50cyYgdmVydGljYWxDb25zdHJhaW50cywgY29uc3QgT3ZlcnJpZGVWZXJ0aWNhbFZh bHVlcyYgb3ZlcnJpZGVWZXJ0aWNhbFZhbHVlcykgY29uc3QKK1ZlcnRpY2FsR2VvbWV0cnkgRm9y bWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpvdXRPZkZsb3dOb25SZXBsYWNlZFZlcnRpY2FsR2Vv bWV0cnkoY29uc3QgQ29udGFpbmVyQm94JiBsYXlvdXRCb3gsIGNvbnN0IEhvcml6b250YWxDb25z dHJhaW50cyYgaG9yaXpvbnRhbENvbnN0cmFpbnRzLCBjb25zdCBWZXJ0aWNhbENvbnN0cmFpbnRz JiB2ZXJ0aWNhbENvbnN0cmFpbnRzLCBjb25zdCBPdmVycmlkZVZlcnRpY2FsVmFsdWVzJiBvdmVy cmlkZVZlcnRpY2FsVmFsdWVzKSBjb25zdAogewogICAgIEFTU0VSVChsYXlvdXRCb3guaXNPdXRP ZkZsb3dQb3NpdGlvbmVkKCkgJiYgIWxheW91dEJveC5pc1JlcGxhY2VkQm94KCkpOwogICAgIEFT U0VSVCh2ZXJ0aWNhbENvbnN0cmFpbnRzLmxvZ2ljYWxIZWlnaHQpOwpAQCAtNDcwLDcgKzQ2OSw3 IEBAIFZlcnRpY2FsR2VvbWV0cnkgRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpvdXRPZkZs b3dOb25SZXBsYWNlZFZlcnRpY2FsR2VvbWV0CiAgICAgcmV0dXJuIHsgKnRvcCwgKmJvdHRvbSwg eyAqaGVpZ2h0LCB1c2VkVmVydGljYWxNYXJnaW4gfSB9OwogfQogCi1Ib3Jpem9udGFsR2VvbWV0 cnkgRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpvdXRPZkZsb3dOb25SZXBsYWNlZEhvcml6 b250YWxHZW9tZXRyeShjb25zdCBCb3gmIGxheW91dEJveCwgY29uc3QgSG9yaXpvbnRhbENvbnN0 cmFpbnRzJiBob3Jpem9udGFsQ29uc3RyYWludHMsIGNvbnN0IE92ZXJyaWRlSG9yaXpvbnRhbFZh bHVlcyYgb3ZlcnJpZGVIb3Jpem9udGFsVmFsdWVzKQorSG9yaXpvbnRhbEdlb21ldHJ5IEZvcm1h dHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6b3V0T2ZGbG93Tm9uUmVwbGFjZWRIb3Jpem9udGFsR2Vv bWV0cnkoY29uc3QgQ29udGFpbmVyQm94JiBsYXlvdXRCb3gsIGNvbnN0IEhvcml6b250YWxDb25z dHJhaW50cyYgaG9yaXpvbnRhbENvbnN0cmFpbnRzLCBjb25zdCBPdmVycmlkZUhvcml6b250YWxW YWx1ZXMmIG92ZXJyaWRlSG9yaXpvbnRhbFZhbHVlcykKIHsKICAgICBBU1NFUlQobGF5b3V0Qm94 LmlzT3V0T2ZGbG93UG9zaXRpb25lZCgpICYmICFsYXlvdXRCb3guaXNSZXBsYWNlZEJveCgpKTsK ICAgICAKQEAgLTg0MCw3ICs4MzksNyBAQCBDb250ZW50SGVpZ2h0QW5kTWFyZ2luIEZvcm1hdHRp bmdDb250ZXh0OjpHZW9tZXRyeTo6Y29tcGxpY2F0ZWRDYXNlcyhjb25zdCBCb3gmCiAgICAgICAg ICAgICBoZWlnaHQgPSBib3R0b20gLSB0b3A7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAg ICBBU1NFUlQobGF5b3V0Qm94LmVzdGFibGlzaGVzRm9ybWF0dGluZ0NvbnRleHQoKSk7Ci0gICAg ICAgICAgICBoZWlnaHQgPSBjb250ZW50SGVpZ2h0Rm9yRm9ybWF0dGluZ0NvbnRleHRSb290KGxh eW91dEJveCk7CisgICAgICAgICAgICBoZWlnaHQgPSBjb250ZW50SGVpZ2h0Rm9yRm9ybWF0dGlu Z0NvbnRleHRSb290KGRvd25jYXN0PENvbnRhaW5lckJveD4obGF5b3V0Qm94KSk7CiAgICAgICAg IH0KICAgICB9CiAKQEAgLTkwMiw3ICs5MDEsNyBAQCBWZXJ0aWNhbEdlb21ldHJ5IEZvcm1hdHRp bmdDb250ZXh0OjpHZW9tZXRyeTo6b3V0T2ZGbG93VmVydGljYWxHZW9tZXRyeShjb25zdCBCbwog ICAgIEFTU0VSVChsYXlvdXRCb3guaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkpOwogCiAgICAgaWYg KCFsYXlvdXRCb3guaXNSZXBsYWNlZEJveCgpKQotICAgICAgICByZXR1cm4gb3V0T2ZGbG93Tm9u UmVwbGFjZWRWZXJ0aWNhbEdlb21ldHJ5KGxheW91dEJveCwgaG9yaXpvbnRhbENvbnN0cmFpbnRz LCB2ZXJ0aWNhbENvbnN0cmFpbnRzLCBvdmVycmlkZVZlcnRpY2FsVmFsdWVzKTsKKyAgICAgICAg cmV0dXJuIG91dE9mRmxvd05vblJlcGxhY2VkVmVydGljYWxHZW9tZXRyeShkb3duY2FzdDxDb250 YWluZXJCb3g+KGxheW91dEJveCksIGhvcml6b250YWxDb25zdHJhaW50cywgdmVydGljYWxDb25z dHJhaW50cywgb3ZlcnJpZGVWZXJ0aWNhbFZhbHVlcyk7CiAgICAgcmV0dXJuIG91dE9mRmxvd1Jl cGxhY2VkVmVydGljYWxHZW9tZXRyeShkb3duY2FzdDxSZXBsYWNlZEJveD4obGF5b3V0Qm94KSwg aG9yaXpvbnRhbENvbnN0cmFpbnRzLCB2ZXJ0aWNhbENvbnN0cmFpbnRzLCBvdmVycmlkZVZlcnRp Y2FsVmFsdWVzKTsKIH0KIApAQCAtOTExLDcgKzkxMCw3IEBAIEhvcml6b250YWxHZW9tZXRyeSBG b3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Om91dE9mRmxvd0hvcml6b250YWxHZW9tZXRyeShj b25zCiAgICAgQVNTRVJUKGxheW91dEJveC5pc091dE9mRmxvd1Bvc2l0aW9uZWQoKSk7CiAKICAg ICBpZiAoIWxheW91dEJveC5pc1JlcGxhY2VkQm94KCkpCi0gICAgICAgIHJldHVybiBvdXRPZkZs b3dOb25SZXBsYWNlZEhvcml6b250YWxHZW9tZXRyeShsYXlvdXRCb3gsIGhvcml6b250YWxDb25z dHJhaW50cywgb3ZlcnJpZGVIb3Jpem9udGFsVmFsdWVzKTsKKyAgICAgICAgcmV0dXJuIG91dE9m Rmxvd05vblJlcGxhY2VkSG9yaXpvbnRhbEdlb21ldHJ5KGRvd25jYXN0PENvbnRhaW5lckJveD4o bGF5b3V0Qm94KSwgaG9yaXpvbnRhbENvbnN0cmFpbnRzLCBvdmVycmlkZUhvcml6b250YWxWYWx1 ZXMpOwogICAgIHJldHVybiBvdXRPZkZsb3dSZXBsYWNlZEhvcml6b250YWxHZW9tZXRyeShkb3du Y2FzdDxSZXBsYWNlZEJveD4obGF5b3V0Qm94KSwgaG9yaXpvbnRhbENvbnN0cmFpbnRzLCB2ZXJ0 aWNhbENvbnN0cmFpbnRzLCBvdmVycmlkZUhvcml6b250YWxWYWx1ZXMpOwogfQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGlu Z0NvbnRleHRHZW9tZXRyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0 aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKaW5kZXggYzIxZTUyNDNmMjhk ZDJlMmNkNDQ0YWRlZjlkMzI3ODk4NTFhODlmMS4uMzM1MGI0YWYyODkxZTQzM2EyNmI0ODYwMDJj YTM5NzhlZjUxMGVkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9y bWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dEdlb21l dHJ5LmNwcApAQCAtMTA3LDcgKzEwNyw3IEBAIENvbnRlbnRIZWlnaHRBbmRNYXJnaW4gQmxvY2tG b3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmluRmxvd05vblJlcGxhY2VkSGVpZ2h0CiAgICAg Ly8gMTAuNi43ICdBdXRvJyBoZWlnaHRzIGZvciBibG9jay1sZXZlbCBmb3JtYXR0aW5nIGNvbnRl eHQgYm94ZXMuCiAgICAgYXV0byBpc0F1dG9IZWlnaHQgPSAhb3ZlcnJpZGVWZXJ0aWNhbFZhbHVl cy5oZWlnaHQgJiYgIWNvbXB1dGVkSGVpZ2h0KGxheW91dEJveCk7CiAgICAgaWYgKGlzQXV0b0hl aWdodCAmJiAobGF5b3V0Qm94LmVzdGFibGlzaGVzRm9ybWF0dGluZ0NvbnRleHQoKSAmJiAhbGF5 b3V0Qm94LmVzdGFibGlzaGVzSW5saW5lRm9ybWF0dGluZ0NvbnRleHQoKSkpCi0gICAgICAgIHJl dHVybiBjb21wdXRlKCBPdmVycmlkZVZlcnRpY2FsVmFsdWVzIHsgY29udGVudEhlaWdodEZvckZv cm1hdHRpbmdDb250ZXh0Um9vdChsYXlvdXRCb3gpIH0pOworICAgICAgICByZXR1cm4gY29tcHV0 ZSggT3ZlcnJpZGVWZXJ0aWNhbFZhbHVlcyB7IGNvbnRlbnRIZWlnaHRGb3JGb3JtYXR0aW5nQ29u dGV4dFJvb3QoZG93bmNhc3Q8Q29udGFpbmVyQm94PihsYXlvdXRCb3gpKSB9KTsKICAgICByZXR1 cm4gY29tcHV0ZShvdmVycmlkZVZlcnRpY2FsVmFsdWVzKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0VHJlZUJ1aWxkZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0VHJlZUJ1aWxkZXIuY3BwCmluZGV4 IDM3Y2NjZTYxMGFlYjQ5MTk1NTRmNWJjYjEyMjYyY2JhOTJjYTQ1Y2IuLjJkZTA2MmY1OTBhZGI3 MjRiYWRhODdiOTgzY2MwZjY2MDUwNzAxMzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9sYXlvdXR0cmVlL0xheW91dFRyZWVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRUcmVlQnVpbGRlci5jcHAKQEAgLTIwMCw2ICsyMDAs NyBAQCBCb3gqIFRyZWVCdWlsZGVyOjpjcmVhdGVMYXlvdXRCb3goY29uc3QgQ29udGFpbmVyQm94 JiBwYXJlbnRDb250YWluZXIsIGNvbnN0IFJlbgogICAgICAgICBpZiAoaXM8UmVuZGVyTGluZUJy ZWFrPihyZW5kZXJlcikpIHsKICAgICAgICAgICAgIGNsb25lZFN0eWxlLnNldERpc3BsYXkoRGlz cGxheVR5cGU6OklubGluZSk7CiAgICAgICAgICAgICBjbG9uZWRTdHlsZS5zZXRGbG9hdGluZyhG bG9hdDo6Tm8pOworICAgICAgICAgICAgY2xvbmVkU3R5bGUuc2V0UG9zaXRpb24oUG9zaXRpb25U eXBlOjpTdGF0aWMpOwogICAgICAgICAgICAgY2hpbGRMYXlvdXRCb3ggPSAmY3JlYXRlTGluZUJy ZWFrQm94KGRvd25jYXN0PFJlbmRlckxpbmVCcmVhaz4oY2hpbGRSZW5kZXJlcikuaXNXQlIoKSwg V1RGTW92ZShjbG9uZWRTdHlsZSkpOwogICAgICAgICB9IGVsc2UgaWYgKGlzPFJlbmRlclRhYmxl PihyZW5kZXJlcikpIHsKICAgICAgICAgICAgIC8vIENvbnN0cnVjdCB0aGUgcHJpbmNpcGFsIHRh YmxlIHdyYXBwZXIgYm94IChhbmQgbm90IHRoZSB0YWJsZSBib3ggaXRzZWxmKS4K