186476 2018-06-10 21:53:08 -0700 [LFC] Merge top, bottom, height and vertical margin computation for out-of-flow non-replaced elements 2018-06-11 07:28:22 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto sam simon.fraser webkit-bug-importer zalan oldest_to_newest 1431708 0 zalan 2018-06-10 21:53:08 -0700 10.6.4 Absolutely positioned, non-replaced elements 1431709 1 342409 zalan 2018-06-10 21:56:05 -0700 Created attachment 342409 Patch 1431883 2 zalan 2018-06-11 07:27:57 -0700 Committed r232710: <https://trac.webkit.org/changeset/232710> 1431884 3 webkit-bug-importer 2018-06-11 07:28:22 -0700 <rdar://problem/41003517> 342409 2018-06-10 21:56:05 -0700 2018-06-11 07:22:45 -0700 Patch bug-186476-20180610215604.patch text/plain 15582 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyNjY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTNjOWNkYjRhOTU4MWVl YjQ1ZDY1MjRiMGM4M2E5MWIyYjZmYjViMi4uNTBmOTMxZTM4NjRlZTU1Y2NiNjg3NGM5OTc4OTY2 OWQxMDE3NTZhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE4LTA2LTEwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gTWVyZ2UgdG9wLCBi b3R0b20sIGhlaWdodCBhbmQgdmVydGljYWwgbWFyZ2luIGNvbXB1dGF0aW9uIGZvciBvdXQtb2Yt ZmxvdyBub24tcmVwbGFjZWQgZWxlbWVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE4NjQ3NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEltcGxlbWVudCBodHRwczovL3d3dy53My5vcmcvVFIvQ1NTMjIv dmlzdWRldC5odG1sI2Ficy1ub24tcmVwbGFjZWQtaGVpZ2h0CisgICAgICAgICgxMC42LjQgQWJz b2x1dGVseSBwb3NpdGlvbmVkLCBub24tcmVwbGFjZWQgZWxlbWVudHMpCisKKyAgICAgICAgKiBs YXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpG b3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZU91dE9mRmxvd1ZlcnRpY2FsR2VvbWV0cnkgY29uc3Qp OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0T3V0 T2ZGbG93RGVzY2VuZGFudHMgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGb3Jt YXR0aW5nQ29udGV4dDo6Y29tcHV0ZU91dE9mRmxvd0hlaWdodCBjb25zdCk6IERlbGV0ZWQuCisg ICAgICAgICogbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0Lmg6CisgICAgICAgICogbGF5b3V0L0Zv cm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0Ojpj b21wdXRlZFZhbHVlSWZOb3RBdXRvKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0 dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpvdXRPZkZsb3dOb25SZXBsYWNlZFZlcnRpY2FsR2VvbWV0 cnkpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0 cnk6Om91dE9mRmxvd1JlcGxhY2VkVmVydGljYWxHZW9tZXRyeSk6CisgICAgICAgIChXZWJDb3Jl OjpMYXlvdXQ6OkZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6b3V0T2ZGbG93VmVydGljYWxH ZW9tZXRyeSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdDb250ZXh0OjpH ZW9tZXRyeTo6b3V0T2ZGbG93Tm9uUmVwbGFjZWRIZWlnaHRBbmRNYXJnaW4pOiBEZWxldGVkLgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Om91 dE9mRmxvd1JlcGxhY2VkSGVpZ2h0QW5kTWFyZ2luKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpvdXRPZkZsb3dIZWlnaHRB bmRNYXJnaW4pOiBEZWxldGVkLgorCiAyMDE4LTA2LTEwICBNaWNoYWVsIENhdGFuemFybyAgPG1j YXRhbnphcm9AaWdhbGlhLmNvbT4KIAogICAgICAgICBbV1BFXVtHVEtdIHBheXBhbC5jb20gcmVx dWlyZXMgdXNlciBhZ2VudCBxdWlyawpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L0Zvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5n Q29udGV4dC5jcHAKaW5kZXggNTFjMjYyM2IzYzZjOTMwZjdjNWM2ZjU4ODA1OTcwZWFmYjQwMzk2 MC4uOTJjMzlkODJjMTc3ODFiNTZlZTBiNDhlMmE5MTFkMTY0OTNmMDYwMiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC03NSwxMSArNzUsMTMgQEAg dm9pZCBGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZU91dE9mRmxvd1dpZHRoQW5kTWFyZ2luKExh eW91dENvbnRleHQmIGxheW91dENvbnQKICAgICBkaXNwbGF5Qm94LnNldEhvcml6b250YWxNYXJn aW4od2lkdGhBbmRNYXJnaW4ubWFyZ2luKTsKIH0KIAotdm9pZCBGb3JtYXR0aW5nQ29udGV4dDo6 Y29tcHV0ZU91dE9mRmxvd0hlaWdodChMYXlvdXRDb250ZXh0JiBsYXlvdXRDb250ZXh0LCBjb25z dCBCb3gmIGxheW91dEJveCwgRGlzcGxheTo6Qm94JiBkaXNwbGF5Qm94KSBjb25zdAordm9pZCBG b3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZU91dE9mRmxvd1ZlcnRpY2FsR2VvbWV0cnkoTGF5b3V0 Q29udGV4dCYgbGF5b3V0Q29udGV4dCwgY29uc3QgQm94JiBsYXlvdXRCb3gsIERpc3BsYXk6OkJv eCYgZGlzcGxheUJveCkgY29uc3QKIHsKLSAgICBhdXRvIGhlaWdodEFuZE1hcmdpbiA9IEdlb21l dHJ5OjpvdXRPZkZsb3dIZWlnaHRBbmRNYXJnaW4obGF5b3V0Q29udGV4dCwgbGF5b3V0Qm94KTsK LSAgICBkaXNwbGF5Qm94LnNldEhlaWdodChoZWlnaHRBbmRNYXJnaW4uaGVpZ2h0KTsKLSAgICBk aXNwbGF5Qm94LnNldFZlcnRpY2FsTWFyZ2luKGhlaWdodEFuZE1hcmdpbi5tYXJnaW4pOworICAg IGF1dG8gdmVydGljYWxHZW9tZXRyeSA9IEdlb21ldHJ5OjpvdXRPZkZsb3dWZXJ0aWNhbEdlb21l dHJ5KGxheW91dENvbnRleHQsIGxheW91dEJveCk7CisgICAgZGlzcGxheUJveC5zZXRUb3AodmVy dGljYWxHZW9tZXRyeS50b3ApOworICAgIGRpc3BsYXlCb3guc2V0SGVpZ2h0KHZlcnRpY2FsR2Vv bWV0cnkuaGVpZ2h0KTsKKyAgICBBU1NFUlQodmVydGljYWxHZW9tZXRyeS50b3AgKyB2ZXJ0aWNh bEdlb21ldHJ5LmhlaWdodCA9PSB2ZXJ0aWNhbEdlb21ldHJ5LmJvdHRvbSk7CisgICAgZGlzcGxh eUJveC5zZXRWZXJ0aWNhbE1hcmdpbih2ZXJ0aWNhbEdlb21ldHJ5Lm1hcmdpbik7CiB9CiAKIHZv aWQgRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVCb3JkZXJBbmRQYWRkaW5nKExheW91dENvbnRl eHQmIGxheW91dENvbnRleHQsIGNvbnN0IEJveCYgbGF5b3V0Qm94LCBEaXNwbGF5OjpCb3gmIGRp c3BsYXlCb3gpIGNvbnN0CkBAIC0xMjEsNyArMTIzLDcgQEAgdm9pZCBGb3JtYXR0aW5nQ29udGV4 dDo6bGF5b3V0T3V0T2ZGbG93RGVzY2VuZGFudHMoTGF5b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4 dCkKICAgICAgICAgYXV0byBmb3JtYXR0aW5nQ29udGV4dCA9IGxheW91dENvbnRleHQuZm9ybWF0 dGluZ0NvbnRleHQobGF5b3V0Qm94KTsKICAgICAgICAgZm9ybWF0dGluZ0NvbnRleHQtPmxheW91 dChsYXlvdXRDb250ZXh0LCBsYXlvdXRDb250ZXh0LmVzdGFibGlzaGVkRm9ybWF0dGluZ1N0YXRl KGxheW91dEJveCwgKmZvcm1hdHRpbmdDb250ZXh0KSk7CiAKLSAgICAgICAgY29tcHV0ZU91dE9m Rmxvd0hlaWdodChsYXlvdXRDb250ZXh0LCBsYXlvdXRCb3gsIGRpc3BsYXlCb3gpOworICAgICAg ICBjb21wdXRlT3V0T2ZGbG93VmVydGljYWxHZW9tZXRyeShsYXlvdXRDb250ZXh0LCBsYXlvdXRC b3gsIGRpc3BsYXlCb3gpOwogICAgICAgICBjb21wdXRlT3V0T2ZGbG93UG9zaXRpb24obGF5b3V0 Q29udGV4dCwgbGF5b3V0Qm94LCBkaXNwbGF5Qm94KTsKICAgICB9CiB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5oCmluZGV4IDlkMjMwZjIxODg4ZDBiNjVhYTQ1MjBl M2VhMWY2YzdhM2RhNWUwM2IuLjNjNmFjZjQzOTFjNGI5MWFkNDIwZDIwNDI2NjYwZjM3M2VkODM0 MzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5oCkBAIC05MSw3 ICs5MSwxNCBAQCBwcm90ZWN0ZWQ6CiAgICAgICAgICAgICBEaXNwbGF5OjpCb3g6OlZlcnRpY2Fs RWRnZXMgbWFyZ2luOwogICAgICAgICB9OwogCi0gICAgICAgIHN0YXRpYyBIZWlnaHRBbmRNYXJn aW4gb3V0T2ZGbG93SGVpZ2h0QW5kTWFyZ2luKExheW91dENvbnRleHQmLCBjb25zdCBCb3gmKTsK KyAgICAgICAgc3RydWN0IFZlcnRpY2FsR2VvbWV0cnkgeworICAgICAgICAgICAgTGF5b3V0VW5p dCB0b3A7CisgICAgICAgICAgICBMYXlvdXRVbml0IGJvdHRvbTsKKyAgICAgICAgICAgIExheW91 dFVuaXQgaGVpZ2h0OworICAgICAgICAgICAgRGlzcGxheTo6Qm94OjpWZXJ0aWNhbEVkZ2VzIG1h cmdpbjsKKyAgICAgICAgfTsKKworICAgICAgICBzdGF0aWMgVmVydGljYWxHZW9tZXRyeSBvdXRP ZkZsb3dWZXJ0aWNhbEdlb21ldHJ5KExheW91dENvbnRleHQmLCBjb25zdCBCb3gmKTsKICAgICAg ICAgc3RhdGljIFdpZHRoQW5kTWFyZ2luIG91dE9mRmxvd1dpZHRoQW5kTWFyZ2luKExheW91dENv bnRleHQmLCBjb25zdCBCb3gmKTsKIAogICAgICAgICBzdGF0aWMgSGVpZ2h0QW5kTWFyZ2luIGZs b2F0aW5nSGVpZ2h0QW5kTWFyZ2luKExheW91dENvbnRleHQmLCBjb25zdCBCb3gmKTsKQEAgLTEx MCwxMCArMTE3LDEwIEBAIHByb3RlY3RlZDoKICAgICAgICAgc3RhdGljIERpc3BsYXk6OkJveDo6 VmVydGljYWxFZGdlcyBjb21wdXRlZE5vbkNvbGxhcHNlZFZlcnRpY2FsTWFyZ2luVmFsdWUoY29u c3QgTGF5b3V0Q29udGV4dCYsIGNvbnN0IEJveCYpOwogCiAgICAgcHJpdmF0ZToKLSAgICAgICAg c3RhdGljIEhlaWdodEFuZE1hcmdpbiBvdXRPZkZsb3dSZXBsYWNlZEhlaWdodEFuZE1hcmdpbihM YXlvdXRDb250ZXh0JiwgY29uc3QgQm94Jik7CisgICAgICAgIHN0YXRpYyBWZXJ0aWNhbEdlb21l dHJ5IG91dE9mRmxvd1JlcGxhY2VkVmVydGljYWxHZW9tZXRyeShMYXlvdXRDb250ZXh0JiwgY29u c3QgQm94Jik7CiAgICAgICAgIHN0YXRpYyBXaWR0aEFuZE1hcmdpbiBvdXRPZkZsb3dSZXBsYWNl ZFdpZHRoQW5kTWFyZ2luKExheW91dENvbnRleHQmLCBjb25zdCBCb3gmKTsKIAotICAgICAgICBz dGF0aWMgSGVpZ2h0QW5kTWFyZ2luIG91dE9mRmxvd05vblJlcGxhY2VkSGVpZ2h0QW5kTWFyZ2lu KExheW91dENvbnRleHQmLCBjb25zdCBCb3gmKTsKKyAgICAgICAgc3RhdGljIFZlcnRpY2FsR2Vv bWV0cnkgb3V0T2ZGbG93Tm9uUmVwbGFjZWRWZXJ0aWNhbEdlb21ldHJ5KExheW91dENvbnRleHQm LCBjb25zdCBCb3gmKTsKICAgICAgICAgc3RhdGljIFdpZHRoQW5kTWFyZ2luIG91dE9mRmxvd05v blJlcGxhY2VkV2lkdGhBbmRNYXJnaW4oTGF5b3V0Q29udGV4dCYsIGNvbnN0IEJveCYpOwogCiAg ICAgICAgIHN0YXRpYyBIZWlnaHRBbmRNYXJnaW4gZmxvYXRpbmdSZXBsYWNlZEhlaWdodEFuZE1h cmdpbihMYXlvdXRDb250ZXh0JiwgY29uc3QgQm94Jik7CkBAIC0xMjUsNyArMTMyLDcgQEAgcHJv dGVjdGVkOgogCiBwcml2YXRlOgogICAgIHZvaWQgY29tcHV0ZU91dE9mRmxvd1Bvc2l0aW9uKExh eW91dENvbnRleHQmLCBjb25zdCBCb3gmLCBEaXNwbGF5OjpCb3gmKSBjb25zdDsKLSAgICB2b2lk IGNvbXB1dGVPdXRPZkZsb3dIZWlnaHQoTGF5b3V0Q29udGV4dCYsIGNvbnN0IEJveCYsIERpc3Bs YXk6OkJveCYpIGNvbnN0OworICAgIHZvaWQgY29tcHV0ZU91dE9mRmxvd1ZlcnRpY2FsR2VvbWV0 cnkoTGF5b3V0Q29udGV4dCYsIGNvbnN0IEJveCYsIERpc3BsYXk6OkJveCYpIGNvbnN0OwogICAg IHZvaWQgY29tcHV0ZU91dE9mRmxvd1dpZHRoQW5kTWFyZ2luKExheW91dENvbnRleHQmLCBjb25z dCBCb3gmLCBEaXNwbGF5OjpCb3gmKSBjb25zdDsKIAogICAgIFdlYWtQdHI8Qm94PiBtX3Jvb3Q7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHRHZW9t ZXRyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRy eS5jcHAKaW5kZXggYTQwYzQzZDA3YjIzYWVhZGQ3NTUwNzlmYzFhYzAyMmMyZjYzZWZkMC4uMGI2 NjE2ODM5Y2JiZWM1YWIxNWE4ZmY1NTdmZjNiNDk3NjlmNWQ2MyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcApAQCAtNjQsNyAr NjQsMTQgQEAgc3RhdGljIExheW91dFVuaXQgc2hyaW5rVG9GaXRXaWR0aChMYXlvdXRDb250ZXh0 JiwgY29uc3QgQm94JikKICAgICByZXR1cm4geyB9OwogfQogCi1Gb3JtYXR0aW5nQ29udGV4dDo6 R2VvbWV0cnk6OkhlaWdodEFuZE1hcmdpbiBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Om91 dE9mRmxvd05vblJlcGxhY2VkSGVpZ2h0QW5kTWFyZ2luKExheW91dENvbnRleHQmIGxheW91dENv bnRleHQsIGNvbnN0IEJveCYgbGF5b3V0Qm94KQorc3RhdGljIHN0ZDo6b3B0aW9uYWw8TGF5b3V0 VW5pdD4gY29tcHV0ZWRWYWx1ZUlmTm90QXV0byhjb25zdCBMZW5ndGgmIGdlb21ldHJ5UHJvcGVy dHksIExheW91dFVuaXQgY29udGFpbmluZ0Jsb2NrV2lkdGgpCit7CisgICAgaWYgKGdlb21ldHJ5 UHJvcGVydHkuaXNBdXRvKCkpCisgICAgICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7CisgICAgcmV0 dXJuIHZhbHVlRm9yTGVuZ3RoKGdlb21ldHJ5UHJvcGVydHksIGNvbnRhaW5pbmdCbG9ja1dpZHRo KTsKK30KKworRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpWZXJ0aWNhbEdlb21ldHJ5IEZv cm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6b3V0T2ZGbG93Tm9uUmVwbGFjZWRWZXJ0aWNhbEdl b21ldHJ5KExheW91dENvbnRleHQmIGxheW91dENvbnRleHQsIGNvbnN0IEJveCYgbGF5b3V0Qm94 KQogewogICAgIEFTU0VSVChsYXlvdXRCb3guaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkgJiYgIWxh eW91dEJveC5yZXBsYWNlZCgpKTsKIApAQCAtOTEsNDEgKzk4LDkyIEBAIEZvcm1hdHRpbmdDb250 ZXh0OjpHZW9tZXRyeTo6SGVpZ2h0QW5kTWFyZ2luIEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRy eTo6b3V0T2ZGCiAgICAgLy8gNC4gJ3RvcCcgaXMgJ2F1dG8nLCAnaGVpZ2h0JyBhbmQgJ2JvdHRv bScgYXJlIG5vdCAnYXV0bycsIHRoZW4gc2V0ICdhdXRvJyB2YWx1ZXMgZm9yICdtYXJnaW4tdG9w JyBhbmQgJ21hcmdpbi1ib3R0b20nIHRvIDAsIGFuZCBzb2x2ZSBmb3IgJ3RvcCcKICAgICAvLyA1 LiAnaGVpZ2h0JyBpcyAnYXV0bycsICd0b3AnIGFuZCAnYm90dG9tJyBhcmUgbm90ICdhdXRvJywg dGhlbiAnYXV0bycgdmFsdWVzIGZvciAnbWFyZ2luLXRvcCcgYW5kICdtYXJnaW4tYm90dG9tJyBh cmUgc2V0IHRvIDAgYW5kIHNvbHZlIGZvciAnaGVpZ2h0JwogICAgIC8vIDYuICdib3R0b20nIGlz ICdhdXRvJywgJ3RvcCcgYW5kICdoZWlnaHQnIGFyZSBub3QgJ2F1dG8nLCB0aGVuIHNldCAnYXV0 bycgdmFsdWVzIGZvciAnbWFyZ2luLXRvcCcgYW5kICdtYXJnaW4tYm90dG9tJyB0byAwIGFuZCBz b2x2ZSBmb3IgJ2JvdHRvbScKKwogICAgIGF1dG8mIHN0eWxlID0gbGF5b3V0Qm94LnN0eWxlKCk7 Ci0gICAgYXV0byB0b3AgPSBzdHlsZS5sb2dpY2FsVG9wKCk7Ci0gICAgYXV0byBib3R0b20gPSBz dHlsZS5sb2dpY2FsQm90dG9tKCk7Ci0gICAgYXV0byBoZWlnaHQgPSBzdHlsZS5sb2dpY2FsSGVp Z2h0KCk7IAorICAgIGF1dG8mIGRpc3BsYXlCb3ggPSAqbGF5b3V0Q29udGV4dC5kaXNwbGF5Qm94 Rm9yTGF5b3V0Qm94KGxheW91dEJveCk7CisgICAgYXV0byYgY29udGFpbmluZ0Jsb2NrID0gKmxh eW91dEJveC5jb250YWluaW5nQmxvY2soKTsKKyAgICBhdXRvIGNvbnRhaW5pbmdCbG9ja0hlaWdo dCA9IGxheW91dENvbnRleHQuZGlzcGxheUJveEZvckxheW91dEJveChjb250YWluaW5nQmxvY2sp LT5oZWlnaHQoKTsKKyAgICBhdXRvIGNvbnRhaW5pbmdCbG9ja1dpZHRoID0gbGF5b3V0Q29udGV4 dC5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KGNvbnRhaW5pbmdCbG9jayktPndpZHRoKCk7CisKKyAg ICBhdXRvIHRvcCA9IGNvbXB1dGVkVmFsdWVJZk5vdEF1dG8oc3R5bGUubG9naWNhbFRvcCgpLCBj b250YWluaW5nQmxvY2tXaWR0aCk7CisgICAgYXV0byBib3R0b20gPSBjb21wdXRlZFZhbHVlSWZO b3RBdXRvKHN0eWxlLmxvZ2ljYWxCb3R0b20oKSwgY29udGFpbmluZ0Jsb2NrV2lkdGgpOworICAg IGF1dG8gaGVpZ2h0ID0gY29tcHV0ZWRWYWx1ZUlmTm90QXV0byhzdHlsZS5sb2dpY2FsSGVpZ2h0 KCksIGNvbnRhaW5pbmdCbG9ja1dpZHRoKTsKKyAgICBhdXRvIG1hcmdpblRvcCA9IGNvbXB1dGVk VmFsdWVJZk5vdEF1dG8oc3R5bGUubWFyZ2luVG9wKCksIGNvbnRhaW5pbmdCbG9ja1dpZHRoKTsK KyAgICBhdXRvIG1hcmdpbkJvdHRvbSA9IGNvbXB1dGVkVmFsdWVJZk5vdEF1dG8oc3R5bGUubWFy Z2luQm90dG9tKCksIGNvbnRhaW5pbmdCbG9ja1dpZHRoKTsKKyAgICBhdXRvIHBhZGRpbmdUb3Ag PSBkaXNwbGF5Qm94LnBhZGRpbmdUb3AoKTsKKyAgICBhdXRvIHBhZGRpbmdCb3R0b20gPSBkaXNw bGF5Qm94LnBhZGRpbmdCb3R0b20oKTsKKyAgICBhdXRvIGJvcmRlclRvcCA9IGRpc3BsYXlCb3gu Ym9yZGVyVG9wKCk7CisgICAgYXV0byBib3JkZXJCb3R0b20gPSBkaXNwbGF5Qm94LmJvcmRlckJv dHRvbSgpOworCisgICAgaWYgKCF0b3AgJiYgIWhlaWdodCAmJiAhYm90dG9tKQorICAgICAgICB0 b3AgPSBkaXNwbGF5Qm94LnRvcCgpOworCisgICAgaWYgKHRvcCAmJiBoZWlnaHQgJiYgYm90dG9t KSB7CisgICAgICAgIGlmICghbWFyZ2luVG9wICYmICFtYXJnaW5Cb3R0b20pIHsKKyAgICAgICAg ICAgIGF1dG8gbWFyZ2luVG9wQW5kQm90dG9tID0gY29udGFpbmluZ0Jsb2NrSGVpZ2h0IC0gKCp0 b3AgKyBib3JkZXJUb3AgKyBwYWRkaW5nVG9wICsgKmhlaWdodCArIHBhZGRpbmdCb3R0b20gKyBi b3JkZXJCb3R0b20gKyAqYm90dG9tKTsKKyAgICAgICAgICAgIG1hcmdpblRvcCA9IG1hcmdpbkJv dHRvbSA9IG1hcmdpblRvcEFuZEJvdHRvbSAvIDI7CisgICAgICAgIH0gZWxzZSBpZiAoIW1hcmdp blRvcCkKKyAgICAgICAgICAgIG1hcmdpblRvcCA9IGNvbnRhaW5pbmdCbG9ja0hlaWdodCAtICgq dG9wICsgYm9yZGVyVG9wICsgcGFkZGluZ1RvcCArICpoZWlnaHQgKyBwYWRkaW5nQm90dG9tICsg Ym9yZGVyQm90dG9tICsgKm1hcmdpbkJvdHRvbSArICpib3R0b20pOworICAgICAgICBlbHNlCisg ICAgICAgICAgICBtYXJnaW5Cb3R0b20gPSBjb250YWluaW5nQmxvY2tIZWlnaHQgLSAoKnRvcCAr ICptYXJnaW5Ub3AgKyBib3JkZXJUb3AgKyBwYWRkaW5nVG9wICsgKmhlaWdodCArIHBhZGRpbmdC b3R0b20gKyBib3JkZXJCb3R0b20gKyAqYm90dG9tKTsKKyAgICAgICAgLy8gT3Zlci1jb25zdHJh aW5lZD8KKyAgICAgICAgYXV0byBib3hIZWlnaHQgPSAqdG9wICsgKm1hcmdpblRvcCArIGJvcmRl clRvcCArIHBhZGRpbmdUb3AgKyAqaGVpZ2h0ICsgcGFkZGluZ0JvdHRvbSArIGJvcmRlckJvdHRv bSArICptYXJnaW5Cb3R0b20gKyAqYm90dG9tOworICAgICAgICBpZiAoYm94SGVpZ2h0ID4gY29u dGFpbmluZ0Jsb2NrSGVpZ2h0KQorICAgICAgICAgICAgYm90dG9tID0gY29udGFpbmluZ0Jsb2Nr SGVpZ2h0IC0gKCp0b3AgKyAqbWFyZ2luVG9wICsgYm9yZGVyVG9wICsgcGFkZGluZ1RvcCArICpo ZWlnaHQgKyBwYWRkaW5nQm90dG9tICsgYm9yZGVyQm90dG9tICsgKm1hcmdpbkJvdHRvbSk7IAor ICAgIH0KIAotICAgIGF1dG8gY29udGFpbmluZ0Jsb2NrSGVpZ2h0ID0gbGF5b3V0Q29udGV4dC5k aXNwbGF5Qm94Rm9yTGF5b3V0Qm94KCpsYXlvdXRCb3guY29udGFpbmluZ0Jsb2NrKCkpLT5oZWln aHQoKTsKLSAgICBMYXlvdXRVbml0IGNvbXB1dGVkSGVpZ2h0VmFsdWU7CisgICAgaWYgKCF0b3Ag JiYgIWhlaWdodCAmJiBib3R0b20pIHsKKyAgICAgICAgLy8gIzEKKyAgICAgICAgaGVpZ2h0ID0g Y29udGVudEhlaWdodEZvckZvcm1hdHRpbmdDb250ZXh0Um9vdChsYXlvdXRDb250ZXh0LCBsYXlv dXRCb3gpOworICAgICAgICBtYXJnaW5Ub3AgPSBtYXJnaW5Ub3AudmFsdWVfb3IoMCk7CisgICAg ICAgIG1hcmdpbkJvdHRvbSA9IG1hcmdpbkJvdHRvbS52YWx1ZV9vcigwKTsKKyAgICAgICAgdG9w ID0gY29udGFpbmluZ0Jsb2NrSGVpZ2h0IC0gKCptYXJnaW5Ub3AgKyBib3JkZXJUb3AgKyBwYWRk aW5nVG9wICsgKmhlaWdodCArIHBhZGRpbmdCb3R0b20gKyBib3JkZXJCb3R0b20gKyAqbWFyZ2lu Qm90dG9tICsgKmJvdHRvbSk7IAorICAgIH0KIAotICAgIGlmICghaGVpZ2h0LmlzQXV0bygpKQot ICAgICAgICBjb21wdXRlZEhlaWdodFZhbHVlID0gdmFsdWVGb3JMZW5ndGgoaGVpZ2h0LCBjb250 YWluaW5nQmxvY2tIZWlnaHQpOwotICAgIGVsc2UgaWYgKCh0b3AuaXNBdXRvKCkgJiYgYm90dG9t LmlzQXV0bygpKQotICAgICAgICB8fCAodG9wLmlzQXV0bygpICYmICFib3R0b20uaXNBdXRvKCkp Ci0gICAgICAgIHx8ICghdG9wLmlzQXV0bygpICYmIGJvdHRvbS5pc0F1dG8oKSkpIHsKLSAgICAg ICAgLy8gQWxsIGF1dG8gKCMzKSwgIzEgYW5kICMzCi0gICAgICAgIGNvbXB1dGVkSGVpZ2h0VmFs dWUgPSBjb250ZW50SGVpZ2h0Rm9yRm9ybWF0dGluZ0NvbnRleHRSb290KGxheW91dENvbnRleHQs IGxheW91dEJveCk7Ci0gICAgfSBlbHNlIGlmICghdG9wLmlzQXV0bygpICYmICFib3R0b20uaXNB dXRvKCkpIHsKLSAgICAgICAgLy8gIzUKLSAgICAgICAgYXV0byYgZGlzcGxheUJveCA9ICpsYXlv dXRDb250ZXh0LmRpc3BsYXlCb3hGb3JMYXlvdXRCb3gobGF5b3V0Qm94KTsKKyAgICBpZiAoIXRv cCAmJiAhYm90dG9tICYmIGhlaWdodCkgeworICAgICAgICAvLyAjMgorICAgICAgICB0b3AgPSBk aXNwbGF5Qm94LnRvcCgpOworICAgICAgICBtYXJnaW5Ub3AgPSBtYXJnaW5Ub3AudmFsdWVfb3Io MCk7CisgICAgICAgIG1hcmdpbkJvdHRvbSA9IG1hcmdpbkJvdHRvbS52YWx1ZV9vcigwKTsKKyAg ICAgICAgYm90dG9tID0gY29udGFpbmluZ0Jsb2NrSGVpZ2h0IC0gKCp0b3AgKyAqbWFyZ2luVG9w ICsgYm9yZGVyVG9wICsgcGFkZGluZ1RvcCArICpoZWlnaHQgKyBwYWRkaW5nQm90dG9tICsgYm9y ZGVyQm90dG9tICsgKm1hcmdpbkJvdHRvbSk7IAorICAgIH0KIAotICAgICAgICBhdXRvIG1hcmdp blRvcCA9IGRpc3BsYXlCb3gubWFyZ2luVG9wKCk7Ci0gICAgICAgIGF1dG8gbWFyZ2luQm90dG9t ID0gZGlzcGxheUJveC5tYXJnaW5Cb3R0b20oKTsKLSAgICAKLSAgICAgICAgYXV0byBwYWRkaW5n VG9wID0gZGlzcGxheUJveC5wYWRkaW5nVG9wKCk7Ci0gICAgICAgIGF1dG8gcGFkZGluZ0JvdHRv bSA9IGRpc3BsYXlCb3gucGFkZGluZ0JvdHRvbSgpOworICAgIGlmICghaGVpZ2h0ICYmICFib3R0 b20gJiYgdG9wKSB7CisgICAgICAgIC8vICMzCisgICAgICAgIGhlaWdodCA9IGNvbnRlbnRIZWln aHRGb3JGb3JtYXR0aW5nQ29udGV4dFJvb3QobGF5b3V0Q29udGV4dCwgbGF5b3V0Qm94KTsKKyAg ICAgICAgbWFyZ2luVG9wID0gbWFyZ2luVG9wLnZhbHVlX29yKDApOworICAgICAgICBtYXJnaW5C b3R0b20gPSBtYXJnaW5Cb3R0b20udmFsdWVfb3IoMCk7CisgICAgICAgIGJvdHRvbSA9IGNvbnRh aW5pbmdCbG9ja0hlaWdodCAtICgqdG9wICsgKm1hcmdpblRvcCArIGJvcmRlclRvcCArIHBhZGRp bmdUb3AgKyAqaGVpZ2h0ICsgcGFkZGluZ0JvdHRvbSArIGJvcmRlckJvdHRvbSArICptYXJnaW5C b3R0b20pOyAKKyAgICB9CiAKLSAgICAgICAgYXV0byBib3JkZXJUb3AgPSBkaXNwbGF5Qm94LmJv cmRlclRvcCgpOwotICAgICAgICBhdXRvIGJvcmRlckJvdHRvbSA9IGRpc3BsYXlCb3guYm9yZGVy Qm90dG9tKCk7CisgICAgaWYgKCF0b3AgJiYgaGVpZ2h0ICYmIGJvdHRvbSkgeworICAgICAgICAv LyAjNAorICAgICAgICBtYXJnaW5Ub3AgPSBtYXJnaW5Ub3AudmFsdWVfb3IoMCk7CisgICAgICAg IG1hcmdpbkJvdHRvbSA9IG1hcmdpbkJvdHRvbS52YWx1ZV9vcigwKTsKKyAgICAgICAgdG9wID0g Y29udGFpbmluZ0Jsb2NrSGVpZ2h0IC0gKCptYXJnaW5Ub3AgKyBib3JkZXJUb3AgKyBwYWRkaW5n VG9wICsgKmhlaWdodCArIHBhZGRpbmdCb3R0b20gKyBib3JkZXJCb3R0b20gKyAqbWFyZ2luQm90 dG9tICsgKmJvdHRvbSk7IAorICAgIH0KIAotICAgICAgICBjb21wdXRlZEhlaWdodFZhbHVlID0g Y29udGFpbmluZ0Jsb2NrSGVpZ2h0IC0gKHRvcC52YWx1ZSgpICsgbWFyZ2luVG9wICsgYm9yZGVy VG9wICsgcGFkZGluZ1RvcCArIHBhZGRpbmdCb3R0b20gKyBib3JkZXJCb3R0b20gKyBtYXJnaW5C b3R0b20gKyBib3R0b20udmFsdWUoKSk7Ci0gICAgfSBlbHNlIHsKLSAgICAgICAgLy8gIzIgIzQg IzYgaGF2ZSBoZWlnaHQgIT0gYXV0bwotICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAg ICBpZiAoIWhlaWdodCAmJiB0b3AgJiYgYm90dG9tKSB7CisgICAgICAgIC8vICM1CisgICAgICAg IG1hcmdpblRvcCA9IG1hcmdpblRvcC52YWx1ZV9vcigwKTsKKyAgICAgICAgbWFyZ2luQm90dG9t ID0gbWFyZ2luQm90dG9tLnZhbHVlX29yKDApOworICAgICAgICBoZWlnaHQgPSBjb250YWluaW5n QmxvY2tIZWlnaHQgLSAoKnRvcCArICptYXJnaW5Ub3AgKyBib3JkZXJUb3AgKyBwYWRkaW5nVG9w ICsgcGFkZGluZ0JvdHRvbSArIGJvcmRlckJvdHRvbSArICptYXJnaW5Cb3R0b20gKyAqYm90dG9t KTsgCiAgICAgfQogCi0gICAgcmV0dXJuIHsgY29tcHV0ZWRIZWlnaHRWYWx1ZSwgeyB9IH07Cisg ICAgaWYgKCFib3R0b20gJiYgdG9wICYmIGhlaWdodCkgeworICAgICAgICAvLyAjNgorICAgICAg ICBtYXJnaW5Ub3AgPSBtYXJnaW5Ub3AudmFsdWVfb3IoMCk7CisgICAgICAgIG1hcmdpbkJvdHRv bSA9IG1hcmdpbkJvdHRvbS52YWx1ZV9vcigwKTsKKyAgICAgICAgYm90dG9tID0gY29udGFpbmlu Z0Jsb2NrSGVpZ2h0IC0gKCp0b3AgKyAqbWFyZ2luVG9wICsgYm9yZGVyVG9wICsgcGFkZGluZ1Rv cCArICpoZWlnaHQgKyBwYWRkaW5nQm90dG9tICsgYm9yZGVyQm90dG9tICsgKm1hcmdpbkJvdHRv bSk7IAorICAgIH0KKworICAgIEFTU0VSVCh0b3ApOworICAgIEFTU0VSVChib3R0b20pOworICAg IEFTU0VSVChoZWlnaHQpOworICAgIEFTU0VSVChtYXJnaW5Ub3ApOworICAgIEFTU0VSVChtYXJn aW5Cb3R0b20pOworCisgICAgcmV0dXJuIHsgKnRvcCwgKmJvdHRvbSwgKmhlaWdodCwgeyAqbWFy Z2luVG9wLCAqbWFyZ2luQm90dG9tfSB9OwogfQogCiBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0 cnk6OldpZHRoQW5kTWFyZ2luIEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6b3V0T2ZGbG93 Tm9uUmVwbGFjZWRXaWR0aEFuZE1hcmdpbihMYXlvdXRDb250ZXh0JiBsYXlvdXRDb250ZXh0LCBj b25zdCBCb3gmIGxheW91dEJveCkKQEAgLTE4NiwxMyArMjQ0LDE0IEBAIEZvcm1hdHRpbmdDb250 ZXh0OjpHZW9tZXRyeTo6V2lkdGhBbmRNYXJnaW4gRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5 OjpvdXRPZkZsCiAgICAgcmV0dXJuIFdpZHRoQW5kTWFyZ2luIHsgY29tcHV0ZWRXaWR0aFZhbHVl LCB7IH0gfTsKIH0KIAotRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpIZWlnaHRBbmRNYXJn aW4gRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpvdXRPZkZsb3dSZXBsYWNlZEhlaWdodEFu ZE1hcmdpbihMYXlvdXRDb250ZXh0JiBsYXlvdXRDb250ZXh0LCBjb25zdCBCb3gmIGxheW91dEJv eCkKK0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6VmVydGljYWxHZW9tZXRyeSBGb3JtYXR0 aW5nQ29udGV4dDo6R2VvbWV0cnk6Om91dE9mRmxvd1JlcGxhY2VkVmVydGljYWxHZW9tZXRyeShM YXlvdXRDb250ZXh0JiBsYXlvdXRDb250ZXh0LCBjb25zdCBCb3gmIGxheW91dEJveCkKIHsKICAg ICBBU1NFUlQobGF5b3V0Qm94LmlzT3V0T2ZGbG93UG9zaXRpb25lZCgpICYmIGxheW91dEJveC5y ZXBsYWNlZCgpKTsKICAgICAvLyAxMC42LjUgQWJzb2x1dGVseSBwb3NpdGlvbmVkLCByZXBsYWNl ZCBlbGVtZW50cwogICAgIC8vCiAgICAgLy8gVGhlIHVzZWQgdmFsdWUgb2YgJ2hlaWdodCcgaXMg ZGV0ZXJtaW5lZCBhcyBmb3IgaW5saW5lIHJlcGxhY2VkIGVsZW1lbnRzLgotICAgIHJldHVybiBp bmxpbmVSZXBsYWNlZEhlaWdodEFuZE1hcmdpbihsYXlvdXRDb250ZXh0LCBsYXlvdXRCb3gpOwor ICAgIGF1dG8gaGVpZ2h0QW5kTWFyZ2luID0gaW5saW5lUmVwbGFjZWRIZWlnaHRBbmRNYXJnaW4o bGF5b3V0Q29udGV4dCwgbGF5b3V0Qm94KTsKKyAgICByZXR1cm4geyB7IH0sIHsgfSwgaGVpZ2h0 QW5kTWFyZ2luLmhlaWdodCwgaGVpZ2h0QW5kTWFyZ2luLm1hcmdpbiB9OwogfQogCiBGb3JtYXR0 aW5nQ29udGV4dDo6R2VvbWV0cnk6OldpZHRoQW5kTWFyZ2luIEZvcm1hdHRpbmdDb250ZXh0OjpH ZW9tZXRyeTo6b3V0T2ZGbG93UmVwbGFjZWRXaWR0aEFuZE1hcmdpbihMYXlvdXRDb250ZXh0JiBs YXlvdXRDb250ZXh0LCBjb25zdCBCb3gmIGxheW91dEJveCkKQEAgLTQ0MCwxMyArNDk5LDEzIEBA IHN0YXRpYyBMYXlvdXRQb2ludCBvdXRPZkZsb3dSZXBsYWNlZFBvc2l0aW9uKExheW91dENvbnRl eHQmIGxheW91dENvbnRleHQsIGNvbnN0CiAgICAgcmV0dXJuIHsgY29tcHV0ZWRMZWZ0VmFsdWUs IGNvbXB1dGVkVG9wVmFsdWUgfTsKIH0KIAotRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpI ZWlnaHRBbmRNYXJnaW4gRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpvdXRPZkZsb3dIZWln aHRBbmRNYXJnaW4oTGF5b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4dCwgY29uc3QgQm94JiBsYXlv dXRCb3gpCitGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OlZlcnRpY2FsR2VvbWV0cnkgRm9y bWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpvdXRPZkZsb3dWZXJ0aWNhbEdlb21ldHJ5KExheW91 dENvbnRleHQmIGxheW91dENvbnRleHQsIGNvbnN0IEJveCYgbGF5b3V0Qm94KQogewogICAgIEFT U0VSVChsYXlvdXRCb3guaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkpOwogCiAgICAgaWYgKCFsYXlv dXRCb3gucmVwbGFjZWQoKSkKLSAgICAgICAgcmV0dXJuIG91dE9mRmxvd05vblJlcGxhY2VkSGVp Z2h0QW5kTWFyZ2luKGxheW91dENvbnRleHQsIGxheW91dEJveCk7Ci0gICAgcmV0dXJuIG91dE9m Rmxvd1JlcGxhY2VkSGVpZ2h0QW5kTWFyZ2luKGxheW91dENvbnRleHQsIGxheW91dEJveCk7Cisg ICAgICAgIHJldHVybiBvdXRPZkZsb3dOb25SZXBsYWNlZFZlcnRpY2FsR2VvbWV0cnkobGF5b3V0 Q29udGV4dCwgbGF5b3V0Qm94KTsKKyAgICByZXR1cm4gb3V0T2ZGbG93UmVwbGFjZWRWZXJ0aWNh bEdlb21ldHJ5KGxheW91dENvbnRleHQsIGxheW91dEJveCk7CiB9CiAKIEZvcm1hdHRpbmdDb250 ZXh0OjpHZW9tZXRyeTo6V2lkdGhBbmRNYXJnaW4gRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5 OjpvdXRPZkZsb3dXaWR0aEFuZE1hcmdpbihMYXlvdXRDb250ZXh0JiBsYXlvdXRDb250ZXh0LCBj b25zdCBCb3gmIGxheW91dEJveCkK