186475 2018-06-10 19:56:47 -0700 [LFC] Merge left, right, width and horizontal margin computation for out-of-flow replaced elements 2018-06-11 07:52:18 -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 1431699 0 zalan 2018-06-10 19:56:47 -0700 10.3.8 Absolutely positioned, replaced elements 1431700 1 342404 zalan 2018-06-10 20:08:31 -0700 Created attachment 342404 Patch 1431891 2 zalan 2018-06-11 07:49:00 -0700 Committed r232714: <https://trac.webkit.org/changeset/232714> 1431892 3 webkit-bug-importer 2018-06-11 07:52:18 -0700 <rdar://problem/41004031> 342404 2018-06-10 20:08:31 -0700 2018-06-11 07:22:25 -0700 Patch bug-186475-20180610200830.patch text/plain 14773 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyNjYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTc0NGY5YjI3ZThmNjA1 MTA3OGMxNTdjZWY4MjNjNWI4YmZlMjNmYS4uYWVlYzA5MDA5NjYxZTUwYWM5MWQ0ZjhhOTE3ODE0 M2NhZDUzMWFhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE4LTA2LTEwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gTWVyZ2UgbGVmdCwg cmlnaHQsIHdpZHRoIGFuZCBob3Jpem9udGFsIG1hcmdpbiBjb21wdXRhdGlvbiBmb3Igb3V0LW9m LWZsb3cgcmVwbGFjZWQgZWxlbWVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE4NjQ3NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEltcGxlbWVudCBodHRwczovL3d3dy53My5vcmcvVFIvQ1NTMjIvdmlz dWRldC5odG1sI2Ficy1yZXBsYWNlZC13aWR0aAorICAgICAgICAoMTAuMy44IEFic29sdXRlbHkg cG9zaXRpb25lZCwgcmVwbGFjZWQgZWxlbWVudHMpCisKKyAgICAgICAgKiBsYXlvdXQvRm9ybWF0 dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29u dGV4dDo6Y29tcHV0ZU91dE9mRmxvd0hvcml6b250YWxHZW9tZXRyeSBjb25zdCk6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRPdXRPZkZsb3dEZXNj ZW5kYW50cyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdDb250 ZXh0Ojpjb21wdXRlT3V0T2ZGbG93V2lkdGhBbmRNYXJnaW4gY29uc3QpOiBEZWxldGVkLgorICAg ICAgICAqIGxheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5oOgorICAgICAgICAqIGxheW91dC9Gb3Jt YXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Rm9y bWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpvdXRPZkZsb3dOb25SZXBsYWNlZEhvcml6b250YWxH ZW9tZXRyeSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OmNvbXB1dGVkVmFsdWVJZk5vdEF1 dG8pOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0 cnk6Om91dE9mRmxvd1JlcGxhY2VkSG9yaXpvbnRhbEdlb21ldHJ5KToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpvdXRPZkZsb3dIb3Jpem9u dGFsR2VvbWV0cnkpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4 dDo6R2VvbWV0cnk6Om91dE9mRmxvd05vblJlcGxhY2VkV2lkdGhBbmRNYXJnaW4pOiBEZWxldGVk LgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6 Om91dE9mRmxvd1JlcGxhY2VkV2lkdGhBbmRNYXJnaW4pOiBEZWxldGVkLgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Om91dE9mRmxvd1dpZHRo QW5kTWFyZ2luKTogRGVsZXRlZC4KKwogMjAxOC0wNi0wOSAgWmFsYW4gQnVqdGFzICA8emFsYW5A YXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdIE1hcmdpbkNvbGxhcHNlIGZ1bmN0aW9ucyBzaG91 bGQgYmUgYWJsZSB0byByZXNvbHZlIG5vbi1maXhlZCBtYXJnaW4gdmFsdWVzCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCA1MWMyNjIzYjNjNmM5MzBm N2M1YzZmNTg4MDU5NzBlYWZiNDAzOTYwLi5iOTQ2ZGNkNGFmYmRjZmQ1YzQxOWNhZTIyYTJlYWUy ZDZiZGNiNmM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0Nv bnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5j cHAKQEAgLTY4LDExICs2OCwxMyBAQCB2b2lkIEZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlRmxv YXRpbmdXaWR0aEFuZE1hcmdpbihMYXlvdXRDb250ZXh0JiBsYXlvdXRDb250ZQogICAgIGRpc3Bs YXlCb3guc2V0SG9yaXpvbnRhbE1hcmdpbih3aWR0aEFuZE1hcmdpbi5tYXJnaW4pOwogfQogCi12 b2lkIEZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlT3V0T2ZGbG93V2lkdGhBbmRNYXJnaW4oTGF5 b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4dCwgY29uc3QgQm94JiBsYXlvdXRCb3gsIERpc3BsYXk6 OkJveCYgZGlzcGxheUJveCkgY29uc3QKK3ZvaWQgRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVP dXRPZkZsb3dIb3Jpem9udGFsR2VvbWV0cnkoTGF5b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4dCwg Y29uc3QgQm94JiBsYXlvdXRCb3gsIERpc3BsYXk6OkJveCYgZGlzcGxheUJveCkgY29uc3QKIHsK LSAgICBhdXRvIHdpZHRoQW5kTWFyZ2luID0gR2VvbWV0cnk6Om91dE9mRmxvd1dpZHRoQW5kTWFy Z2luKGxheW91dENvbnRleHQsIGxheW91dEJveCk7Ci0gICAgZGlzcGxheUJveC5zZXRXaWR0aCh3 aWR0aEFuZE1hcmdpbi53aWR0aCk7Ci0gICAgZGlzcGxheUJveC5zZXRIb3Jpem9udGFsTWFyZ2lu KHdpZHRoQW5kTWFyZ2luLm1hcmdpbik7CisgICAgYXV0byBob3Jpem9udGFsR2VvbWV0cnkgPSBH ZW9tZXRyeTo6b3V0T2ZGbG93SG9yaXpvbnRhbEdlb21ldHJ5KGxheW91dENvbnRleHQsIGxheW91 dEJveCk7CisgICAgZGlzcGxheUJveC5zZXRMZWZ0KGhvcml6b250YWxHZW9tZXRyeS5sZWZ0KTsK KyAgICBkaXNwbGF5Qm94LnNldFdpZHRoKGhvcml6b250YWxHZW9tZXRyeS53aWR0aCk7CisgICAg QVNTRVJUKGhvcml6b250YWxHZW9tZXRyeS5sZWZ0ICsgaG9yaXpvbnRhbEdlb21ldHJ5LndpZHRo ID09IGhvcml6b250YWxHZW9tZXRyeS5yaWdodCk7CisgICAgZGlzcGxheUJveC5zZXRIb3Jpem9u dGFsTWFyZ2luKGhvcml6b250YWxHZW9tZXRyeS5tYXJnaW4pOwogfQogCiB2b2lkIEZvcm1hdHRp bmdDb250ZXh0Ojpjb21wdXRlT3V0T2ZGbG93SGVpZ2h0KExheW91dENvbnRleHQmIGxheW91dENv bnRleHQsIGNvbnN0IEJveCYgbGF5b3V0Qm94LCBEaXNwbGF5OjpCb3gmIGRpc3BsYXlCb3gpIGNv bnN0CkBAIC0xMTUsNyArMTE3LDcgQEAgdm9pZCBGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0T3V0 T2ZGbG93RGVzY2VuZGFudHMoTGF5b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4dCkKICAgICAgICAg Ly8gb2YgYSBoeXBvdGhldGljYWwgYm94IHRoYXQgd291bGQgaGF2ZSBiZWVuIHRoZSBmaXJzdCBi b3ggb2YgdGhlIGVsZW1lbnQgaWYgaXRzIHNwZWNpZmllZCAncG9zaXRpb24nIHZhbHVlIGhhZCBi ZWVuICdzdGF0aWMnIGFuZAogICAgICAgICAvLyBpdHMgc3BlY2lmaWVkICdmbG9hdCcgaGFkIGJl ZW4gJ25vbmUnIGFuZCBpdHMgc3BlY2lmaWVkICdjbGVhcicgaGFkIGJlZW4gJ25vbmUnLgogICAg ICAgICBjb21wdXRlU3RhdGljUG9zaXRpb24obGF5b3V0Q29udGV4dCwgbGF5b3V0Qm94LCBkaXNw bGF5Qm94KTsKLSAgICAgICAgY29tcHV0ZU91dE9mRmxvd1dpZHRoQW5kTWFyZ2luKGxheW91dENv bnRleHQsIGxheW91dEJveCwgZGlzcGxheUJveCk7CisgICAgICAgIGNvbXB1dGVPdXRPZkZsb3dI b3Jpem9udGFsR2VvbWV0cnkobGF5b3V0Q29udGV4dCwgbGF5b3V0Qm94LCBkaXNwbGF5Qm94KTsK IAogICAgICAgICBBU1NFUlQobGF5b3V0Qm94LmVzdGFibGlzaGVzRm9ybWF0dGluZ0NvbnRleHQo KSk7CiAgICAgICAgIGF1dG8gZm9ybWF0dGluZ0NvbnRleHQgPSBsYXlvdXRDb250ZXh0LmZvcm1h dHRpbmdDb250ZXh0KGxheW91dEJveCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvRm9ybWF0dGluZ0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5n Q29udGV4dC5oCmluZGV4IDlkMjMwZjIxODg4ZDBiNjVhYTQ1MjBlM2VhMWY2YzdhM2RhNWUwM2Iu LjFjMDYwNDVlNjM5YzRhOThkNTcxMGY5YTIwODViNmI5OTA2YWIyZjAgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5oCkBAIC05MSw4ICs5MSwxNSBAQCBwcm90ZWN0 ZWQ6CiAgICAgICAgICAgICBEaXNwbGF5OjpCb3g6OlZlcnRpY2FsRWRnZXMgbWFyZ2luOwogICAg ICAgICB9OwogCisgICAgICAgIHN0cnVjdCBIb3Jpem9udGFsR2VvbWV0cnkgeworICAgICAgICAg ICAgTGF5b3V0VW5pdCBsZWZ0OworICAgICAgICAgICAgTGF5b3V0VW5pdCByaWdodDsKKyAgICAg ICAgICAgIExheW91dFVuaXQgd2lkdGg7CisgICAgICAgICAgICBEaXNwbGF5OjpCb3g6Okhvcml6 b250YWxFZGdlcyBtYXJnaW47CisgICAgICAgIH07CisKICAgICAgICAgc3RhdGljIEhlaWdodEFu ZE1hcmdpbiBvdXRPZkZsb3dIZWlnaHRBbmRNYXJnaW4oTGF5b3V0Q29udGV4dCYsIGNvbnN0IEJv eCYpOwotICAgICAgICBzdGF0aWMgV2lkdGhBbmRNYXJnaW4gb3V0T2ZGbG93V2lkdGhBbmRNYXJn aW4oTGF5b3V0Q29udGV4dCYsIGNvbnN0IEJveCYpOworICAgICAgICBzdGF0aWMgSG9yaXpvbnRh bEdlb21ldHJ5IG91dE9mRmxvd0hvcml6b250YWxHZW9tZXRyeShMYXlvdXRDb250ZXh0JiwgY29u c3QgQm94Jik7CiAKICAgICAgICAgc3RhdGljIEhlaWdodEFuZE1hcmdpbiBmbG9hdGluZ0hlaWdo dEFuZE1hcmdpbihMYXlvdXRDb250ZXh0JiwgY29uc3QgQm94Jik7CiAgICAgICAgIHN0YXRpYyBX aWR0aEFuZE1hcmdpbiBmbG9hdGluZ1dpZHRoQW5kTWFyZ2luKExheW91dENvbnRleHQmLCBjb25z dCBCb3gmKTsKQEAgLTExMSwxMCArMTE4LDEwIEBAIHByb3RlY3RlZDoKIAogICAgIHByaXZhdGU6 CiAgICAgICAgIHN0YXRpYyBIZWlnaHRBbmRNYXJnaW4gb3V0T2ZGbG93UmVwbGFjZWRIZWlnaHRB bmRNYXJnaW4oTGF5b3V0Q29udGV4dCYsIGNvbnN0IEJveCYpOwotICAgICAgICBzdGF0aWMgV2lk dGhBbmRNYXJnaW4gb3V0T2ZGbG93UmVwbGFjZWRXaWR0aEFuZE1hcmdpbihMYXlvdXRDb250ZXh0 JiwgY29uc3QgQm94Jik7CisgICAgICAgIHN0YXRpYyBIb3Jpem9udGFsR2VvbWV0cnkgb3V0T2ZG bG93UmVwbGFjZWRIb3Jpem9udGFsR2VvbWV0cnkoTGF5b3V0Q29udGV4dCYsIGNvbnN0IEJveCYp OwogCiAgICAgICAgIHN0YXRpYyBIZWlnaHRBbmRNYXJnaW4gb3V0T2ZGbG93Tm9uUmVwbGFjZWRI ZWlnaHRBbmRNYXJnaW4oTGF5b3V0Q29udGV4dCYsIGNvbnN0IEJveCYpOwotICAgICAgICBzdGF0 aWMgV2lkdGhBbmRNYXJnaW4gb3V0T2ZGbG93Tm9uUmVwbGFjZWRXaWR0aEFuZE1hcmdpbihMYXlv dXRDb250ZXh0JiwgY29uc3QgQm94Jik7CisgICAgICAgIHN0YXRpYyBIb3Jpem9udGFsR2VvbWV0 cnkgb3V0T2ZGbG93Tm9uUmVwbGFjZWRIb3Jpem9udGFsR2VvbWV0cnkoTGF5b3V0Q29udGV4dCYs IGNvbnN0IEJveCYpOwogCiAgICAgICAgIHN0YXRpYyBIZWlnaHRBbmRNYXJnaW4gZmxvYXRpbmdS ZXBsYWNlZEhlaWdodEFuZE1hcmdpbihMYXlvdXRDb250ZXh0JiwgY29uc3QgQm94Jik7CiAgICAg ICAgIHN0YXRpYyBXaWR0aEFuZE1hcmdpbiBmbG9hdGluZ1JlcGxhY2VkV2lkdGhBbmRNYXJnaW4o TGF5b3V0Q29udGV4dCYsIGNvbnN0IEJveCYpOwpAQCAtMTI2LDcgKzEzMyw3IEBAIHByb3RlY3Rl ZDoKIHByaXZhdGU6CiAgICAgdm9pZCBjb21wdXRlT3V0T2ZGbG93UG9zaXRpb24oTGF5b3V0Q29u dGV4dCYsIGNvbnN0IEJveCYsIERpc3BsYXk6OkJveCYpIGNvbnN0OwogICAgIHZvaWQgY29tcHV0 ZU91dE9mRmxvd0hlaWdodChMYXlvdXRDb250ZXh0JiwgY29uc3QgQm94JiwgRGlzcGxheTo6Qm94 JikgY29uc3Q7Ci0gICAgdm9pZCBjb21wdXRlT3V0T2ZGbG93V2lkdGhBbmRNYXJnaW4oTGF5b3V0 Q29udGV4dCYsIGNvbnN0IEJveCYsIERpc3BsYXk6OkJveCYpIGNvbnN0OworICAgIHZvaWQgY29t cHV0ZU91dE9mRmxvd0hvcml6b250YWxHZW9tZXRyeShMYXlvdXRDb250ZXh0JiwgY29uc3QgQm94 JiwgRGlzcGxheTo6Qm94JikgY29uc3Q7CiAKICAgICBXZWFrUHRyPEJveD4gbV9yb290OwogfTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21l dHJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5 LmNwcAppbmRleCBhNDBjNDNkMDdiMjNhZWFkZDc1NTA3OWZjMWFjMDIyYzJmNjNlZmQwLi4yYTA5 ZTJkNjQxMDEwYjdmYjAyOGI5NWFmZGI3NGM5MmRjZGY1MzA3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCkBAIC0xMjgsNyAr MTI4LDcgQEAgRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpIZWlnaHRBbmRNYXJnaW4gRm9y bWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpvdXRPZkYKICAgICByZXR1cm4geyBjb21wdXRlZEhl aWdodFZhbHVlLCB7IH0gfTsKIH0KIAotRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpXaWR0 aEFuZE1hcmdpbiBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Om91dE9mRmxvd05vblJlcGxh Y2VkV2lkdGhBbmRNYXJnaW4oTGF5b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4dCwgY29uc3QgQm94 JiBsYXlvdXRCb3gpCitGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Okhvcml6b250YWxHZW9t ZXRyeSBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Om91dE9mRmxvd05vblJlcGxhY2VkSG9y aXpvbnRhbEdlb21ldHJ5KExheW91dENvbnRleHQmIGxheW91dENvbnRleHQsIGNvbnN0IEJveCYg bGF5b3V0Qm94KQogewogICAgIEFTU0VSVChsYXlvdXRCb3guaXNPdXRPZkZsb3dQb3NpdGlvbmVk KCkgJiYgIWxheW91dEJveC5yZXBsYWNlZCgpKTsKICAgICAKQEAgLTE4Myw3ICsxODMsNyBAQCBG b3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OldpZHRoQW5kTWFyZ2luIEZvcm1hdHRpbmdDb250 ZXh0OjpHZW9tZXRyeTo6b3V0T2ZGbAogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAg ICB9CiAKLSAgICByZXR1cm4gV2lkdGhBbmRNYXJnaW4geyBjb21wdXRlZFdpZHRoVmFsdWUsIHsg fSB9OworICAgIHJldHVybiBIb3Jpem9udGFsR2VvbWV0cnkgeyB7IH0sIHsgfSwgY29tcHV0ZWRX aWR0aFZhbHVlLCB7IH0gfTsKIH0KIAogRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpIZWln aHRBbmRNYXJnaW4gRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpvdXRPZkZsb3dSZXBsYWNl ZEhlaWdodEFuZE1hcmdpbihMYXlvdXRDb250ZXh0JiBsYXlvdXRDb250ZXh0LCBjb25zdCBCb3gm IGxheW91dEJveCkKQEAgLTE5NSwxMyArMTk1LDEwMyBAQCBGb3JtYXR0aW5nQ29udGV4dDo6R2Vv bWV0cnk6OkhlaWdodEFuZE1hcmdpbiBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Om91dE9m RgogICAgIHJldHVybiBpbmxpbmVSZXBsYWNlZEhlaWdodEFuZE1hcmdpbihsYXlvdXRDb250ZXh0 LCBsYXlvdXRCb3gpOwogfQogCi1Gb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OldpZHRoQW5k TWFyZ2luIEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6b3V0T2ZGbG93UmVwbGFjZWRXaWR0 aEFuZE1hcmdpbihMYXlvdXRDb250ZXh0JiBsYXlvdXRDb250ZXh0LCBjb25zdCBCb3gmIGxheW91 dEJveCkKK3N0YXRpYyBzdGQ6Om9wdGlvbmFsPExheW91dFVuaXQ+IGNvbXB1dGVkVmFsdWVJZk5v dEF1dG8oY29uc3QgTGVuZ3RoJiBnZW9tZXRyeVByb3BlcnR5LCBMYXlvdXRVbml0IGNvbnRhaW5p bmdCbG9ja1dpZHRoKQoreworICAgIGlmIChnZW9tZXRyeVByb3BlcnR5LmlzQXV0bygpKQorICAg ICAgICByZXR1cm4gc3RkOjpudWxsb3B0OworICAgIHJldHVybiB2YWx1ZUZvckxlbmd0aChnZW9t ZXRyeVByb3BlcnR5LCBjb250YWluaW5nQmxvY2tXaWR0aCk7Cit9CisKK0Zvcm1hdHRpbmdDb250 ZXh0OjpHZW9tZXRyeTo6SG9yaXpvbnRhbEdlb21ldHJ5IEZvcm1hdHRpbmdDb250ZXh0OjpHZW9t ZXRyeTo6b3V0T2ZGbG93UmVwbGFjZWRIb3Jpem9udGFsR2VvbWV0cnkoTGF5b3V0Q29udGV4dCYg bGF5b3V0Q29udGV4dCwgY29uc3QgQm94JiBsYXlvdXRCb3gpCiB7CiAgICAgQVNTRVJUKGxheW91 dEJveC5pc091dE9mRmxvd1Bvc2l0aW9uZWQoKSAmJiBsYXlvdXRCb3gucmVwbGFjZWQoKSk7Ci0g ICAgLy8gMTAuMy44IEFic29sdXRlbHkgcG9zaXRpb25lZCwgcmVwbGFjZWQgZWxlbWVudHMKKyAg ICAvLyBJbiB0aGlzIGNhc2UsIHNlY3Rpb24gMTAuMy43IGFwcGxpZXMgdXAgdGhyb3VnaCBhbmQg aW5jbHVkaW5nIHRoZSBjb25zdHJhaW50IGVxdWF0aW9uLCBidXQgdGhlIHJlc3Qgb2Ygc2VjdGlv biAxMC4zLjcgaXMgcmVwbGFjZWQgYnkgdGhlIGZvbGxvd2luZyBydWxlczoKICAgICAvLwotICAg IC8vIFRoZSB1c2VkIHZhbHVlIG9mICd3aWR0aCcgaXMgZGV0ZXJtaW5lZCBhcyBmb3IgaW5saW5l IHJlcGxhY2VkIGVsZW1lbnRzLgotICAgIHJldHVybiBpbmxpbmVSZXBsYWNlZFdpZHRoQW5kTWFy Z2luKGxheW91dENvbnRleHQsIGxheW91dEJveCk7CisgICAgLy8gVGhlIHVzZWQgdmFsdWUgb2Yg J3dpZHRoJyBpcyBkZXRlcm1pbmVkIGFzIGZvciBpbmxpbmUgcmVwbGFjZWQgZWxlbWVudHMuIElm ICdtYXJnaW4tbGVmdCcgb3IgJ21hcmdpbi1yaWdodCcgaXMgc3BlY2lmaWVkIGFzICdhdXRvJyBp dHMgdXNlZCB2YWx1ZSBpcyBkZXRlcm1pbmVkIGJ5IHRoZSBydWxlcyBiZWxvdy4KKyAgICAvLyAx LiBJZiBib3RoICdsZWZ0JyBhbmQgJ3JpZ2h0JyBoYXZlIHRoZSB2YWx1ZSAnYXV0bycsIHRoZW4g aWYgdGhlICdkaXJlY3Rpb24nIHByb3BlcnR5IG9mIHRoZSBlbGVtZW50IGVzdGFibGlzaGluZyB0 aGUgc3RhdGljLXBvc2l0aW9uIGNvbnRhaW5pbmcgYmxvY2sgaXMgJ2x0cicsCisgICAgLy8gICBz ZXQgJ2xlZnQnIHRvIHRoZSBzdGF0aWMgcG9zaXRpb247IGVsc2UgaWYgJ2RpcmVjdGlvbicgaXMg J3J0bCcsIHNldCAncmlnaHQnIHRvIHRoZSBzdGF0aWMgcG9zaXRpb24uCisgICAgLy8gMi4gSWYg J2xlZnQnIG9yICdyaWdodCcgYXJlICdhdXRvJywgcmVwbGFjZSBhbnkgJ2F1dG8nIG9uICdtYXJn aW4tbGVmdCcgb3IgJ21hcmdpbi1yaWdodCcgd2l0aCAnMCcuCisgICAgLy8gMy4gSWYgYXQgdGhp cyBwb2ludCBib3RoICdtYXJnaW4tbGVmdCcgYW5kICdtYXJnaW4tcmlnaHQnIGFyZSBzdGlsbCAn YXV0bycsIHNvbHZlIHRoZSBlcXVhdGlvbiB1bmRlciB0aGUgZXh0cmEgY29uc3RyYWludCB0aGF0 IHRoZSB0d28gbWFyZ2lucyBtdXN0IGdldCBlcXVhbCB2YWx1ZXMsCisgICAgLy8gICB1bmxlc3Mg dGhpcyB3b3VsZCBtYWtlIHRoZW0gbmVnYXRpdmUsIGluIHdoaWNoIGNhc2Ugd2hlbiB0aGUgZGly ZWN0aW9uIG9mIHRoZSBjb250YWluaW5nIGJsb2NrIGlzICdsdHInICgncnRsJyksIHNldCAnbWFy Z2luLWxlZnQnICgnbWFyZ2luLXJpZ2h0JykgdG8gemVybyBhbmQKKyAgICAvLyAgIHNvbHZlIGZv ciAnbWFyZ2luLXJpZ2h0JyAoJ21hcmdpbi1sZWZ0JykuCisgICAgLy8gNC4gSWYgYXQgdGhpcyBw b2ludCB0aGVyZSBpcyBhbiAnYXV0bycgbGVmdCwgc29sdmUgdGhlIGVxdWF0aW9uIGZvciB0aGF0 IHZhbHVlLgorICAgIC8vIDUuIElmIGF0IHRoaXMgcG9pbnQgdGhlIHZhbHVlcyBhcmUgb3Zlci1j b25zdHJhaW5lZCwgaWdub3JlIHRoZSB2YWx1ZSBmb3IgZWl0aGVyICdsZWZ0JyAoaW4gY2FzZSB0 aGUgJ2RpcmVjdGlvbicgcHJvcGVydHkgb2YgdGhlIGNvbnRhaW5pbmcgYmxvY2sgaXMgJ3J0bCcp IG9yCisgICAgLy8gICAncmlnaHQnIChpbiBjYXNlICdkaXJlY3Rpb24nIGlzICdsdHInKSBhbmQg c29sdmUgZm9yIHRoYXQgdmFsdWUuCisKKyAgICBhdXRvJiBzdHlsZSA9IGxheW91dEJveC5zdHls ZSgpOworICAgIGF1dG8mIGRpc3BsYXlCb3ggPSAqbGF5b3V0Q29udGV4dC5kaXNwbGF5Qm94Rm9y TGF5b3V0Qm94KGxheW91dEJveCk7CisgICAgYXV0byYgY29udGFpbmluZ0Jsb2NrID0gKmxheW91 dEJveC5jb250YWluaW5nQmxvY2soKTsKKyAgICBhdXRvIGNvbnRhaW5pbmdCbG9ja1dpZHRoID0g bGF5b3V0Q29udGV4dC5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KGNvbnRhaW5pbmdCbG9jayktPndp ZHRoKCk7CisgICAgYXV0byBpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uID0gY29udGFpbmluZ0Jsb2Nr LnN0eWxlKCkuaXNMZWZ0VG9SaWdodERpcmVjdGlvbigpOworCisgICAgYXV0byBsZWZ0ID0gY29t cHV0ZWRWYWx1ZUlmTm90QXV0byhzdHlsZS5sb2dpY2FsTGVmdCgpLCBjb250YWluaW5nQmxvY2tX aWR0aCk7CisgICAgYXV0byByaWdodCA9IGNvbXB1dGVkVmFsdWVJZk5vdEF1dG8oc3R5bGUubG9n aWNhbFJpZ2h0KCksIGNvbnRhaW5pbmdCbG9ja1dpZHRoKTsKKyAgICBhdXRvIG1hcmdpbkxlZnQg PSBjb21wdXRlZFZhbHVlSWZOb3RBdXRvKHN0eWxlLm1hcmdpbkxlZnQoKSwgY29udGFpbmluZ0Js b2NrV2lkdGgpOworICAgIGF1dG8gbWFyZ2luUmlnaHQgPSBjb21wdXRlZFZhbHVlSWZOb3RBdXRv KHN0eWxlLm1hcmdpblJpZ2h0KCksIGNvbnRhaW5pbmdCbG9ja1dpZHRoKTsKKyAgICBhdXRvIHdp ZHRoID0gaW5saW5lUmVwbGFjZWRXaWR0aEFuZE1hcmdpbihsYXlvdXRDb250ZXh0LCBsYXlvdXRC b3gpLndpZHRoOworICAgIGF1dG8gcGFkZGluZ0xlZnQgPSBkaXNwbGF5Qm94LnBhZGRpbmdMZWZ0 KCk7CisgICAgYXV0byBwYWRkaW5nUmlnaHQgPSBkaXNwbGF5Qm94LnBhZGRpbmdSaWdodCgpOwor ICAgIGF1dG8gYm9yZGVyTGVmdCA9IGRpc3BsYXlCb3guYm9yZGVyTGVmdCgpOworICAgIGF1dG8g Ym9yZGVyUmlnaHQgPSBkaXNwbGF5Qm94LmJvcmRlclJpZ2h0KCk7CisKKyAgICBpZiAoIWxlZnQg JiYgIXJpZ2h0KSB7CisgICAgICAgIC8vICMxCisgICAgICAgIGlmIChpc0xlZnRUb1JpZ2h0RGly ZWN0aW9uKQorICAgICAgICAgICAgbGVmdCA9IGRpc3BsYXlCb3gubGVmdCgpOworICAgICAgICBl bHNlCisgICAgICAgICAgICByaWdodCA9IGRpc3BsYXlCb3gucmlnaHQoKTsKKyAgICB9CisKKyAg ICBpZiAoIWxlZnQgfHwgIXJpZ2h0KSB7CisgICAgICAgIC8vICMyCisgICAgICAgIG1hcmdpbkxl ZnQgPSBtYXJnaW5MZWZ0LnZhbHVlX29yKDApOyAKKyAgICAgICAgbWFyZ2luUmlnaHQgPSBtYXJn aW5SaWdodC52YWx1ZV9vcigwKTsgCisgICAgfQorCisgICAgaWYgKCFtYXJnaW5MZWZ0ICYmICFt YXJnaW5SaWdodCkgeworICAgICAgICAvLyAjMworICAgICAgICBhdXRvIG1hcmdpbkxlZnRBbmRS aWdodCA9IGNvbnRhaW5pbmdCbG9ja1dpZHRoIC0gKCpsZWZ0ICsgYm9yZGVyTGVmdCArIHBhZGRp bmdMZWZ0ICsgd2lkdGggKyBwYWRkaW5nUmlnaHQgKyBib3JkZXJSaWdodCArICpyaWdodCk7Cisg ICAgICAgIGlmIChtYXJnaW5MZWZ0QW5kUmlnaHQgPj0gMCkKKyAgICAgICAgICAgIG1hcmdpbkxl ZnQgPSBtYXJnaW5SaWdodCA9IG1hcmdpbkxlZnRBbmRSaWdodCAvIDI7CisgICAgICAgIGVsc2Ug eworICAgICAgICAgICAgaWYgKGlzTGVmdFRvUmlnaHREaXJlY3Rpb24pIHsKKyAgICAgICAgICAg ICAgICBtYXJnaW5MZWZ0ID0gTGF5b3V0VW5pdCB7IDAgfTsKKyAgICAgICAgICAgICAgICBtYXJn aW5SaWdodCA9IGNvbnRhaW5pbmdCbG9ja1dpZHRoIC0gKCpsZWZ0ICsgKm1hcmdpbkxlZnQgKyBi b3JkZXJMZWZ0ICsgcGFkZGluZ0xlZnQgKyB3aWR0aCArIHBhZGRpbmdSaWdodCArIGJvcmRlclJp Z2h0ICsgKnJpZ2h0KTsKKyAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgICAgbWFy Z2luUmlnaHQgPSBMYXlvdXRVbml0IHsgMCB9OworICAgICAgICAgICAgICAgIG1hcmdpbkxlZnQg PSBjb250YWluaW5nQmxvY2tXaWR0aCAtICgqbGVmdCArIGJvcmRlckxlZnQgKyBwYWRkaW5nTGVm dCArIHdpZHRoICsgcGFkZGluZ1JpZ2h0ICsgYm9yZGVyUmlnaHQgKyAqbWFyZ2luUmlnaHQgKyAq cmlnaHQpOworICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgfQorCisgICAgLy8gIzQKKyAg ICBpZiAoIWxlZnQpCisgICAgICAgIGxlZnQgPSBjb250YWluaW5nQmxvY2tXaWR0aCAtICgqbWFy Z2luTGVmdCArIGJvcmRlckxlZnQgKyBwYWRkaW5nTGVmdCArIHdpZHRoICsgcGFkZGluZ1JpZ2h0 ICsgYm9yZGVyUmlnaHQgKyAqbWFyZ2luUmlnaHQgKyAqcmlnaHQpOworCisgICAgaWYgKCFyaWdo dCkKKyAgICAgICAgcmlnaHQgPSBjb250YWluaW5nQmxvY2tXaWR0aCAtICgqbGVmdCArICptYXJn aW5MZWZ0ICsgYm9yZGVyTGVmdCArIHBhZGRpbmdMZWZ0ICsgd2lkdGggKyBwYWRkaW5nUmlnaHQg KyBib3JkZXJSaWdodCArICptYXJnaW5SaWdodCk7CisKKyAgICBpZiAoIW1hcmdpbkxlZnQpCisg ICAgICAgIG1hcmdpbkxlZnQgPSBjb250YWluaW5nQmxvY2tXaWR0aCAtICgqbGVmdCArIGJvcmRl ckxlZnQgKyBwYWRkaW5nTGVmdCArIHdpZHRoICsgcGFkZGluZ1JpZ2h0ICsgYm9yZGVyUmlnaHQg KyAqbWFyZ2luUmlnaHQgKyAqcmlnaHQpOworCisgICAgaWYgKCFtYXJnaW5SaWdodCkKKyAgICAg ICAgbWFyZ2luUmlnaHQgPSBjb250YWluaW5nQmxvY2tXaWR0aCAtICgqbGVmdCArICptYXJnaW5M ZWZ0ICsgYm9yZGVyTGVmdCArIHBhZGRpbmdMZWZ0ICsgd2lkdGggKyBwYWRkaW5nUmlnaHQgKyBi b3JkZXJSaWdodCArICpyaWdodCk7CisKKyAgICBhdXRvIGJveFdpZHRoID0gKCpsZWZ0ICsgKm1h cmdpbkxlZnQgKyBib3JkZXJMZWZ0ICsgcGFkZGluZ0xlZnQgKyB3aWR0aCArIHBhZGRpbmdSaWdo dCArIGJvcmRlclJpZ2h0ICsgKm1hcmdpblJpZ2h0ICsgKnJpZ2h0KTsKKyAgICBpZiAoYm94V2lk dGggPiBjb250YWluaW5nQmxvY2tXaWR0aCkgeworICAgICAgICAvLyAjNSBPdmVyLWNvbnN0cmFp bmVkPworICAgICAgICBpZiAoaXNMZWZ0VG9SaWdodERpcmVjdGlvbikKKyAgICAgICAgICAgIHJp Z2h0ID0gY29udGFpbmluZ0Jsb2NrV2lkdGggLSAoKmxlZnQgKyAqbWFyZ2luTGVmdCArIGJvcmRl ckxlZnQgKyBwYWRkaW5nTGVmdCArIHdpZHRoICsgcGFkZGluZ1JpZ2h0ICsgYm9yZGVyUmlnaHQg KyAqbWFyZ2luUmlnaHQpOworICAgICAgICBlbHNlCisgICAgICAgICAgICBsZWZ0ID0gY29udGFp bmluZ0Jsb2NrV2lkdGggLSAoKm1hcmdpbkxlZnQgKyBib3JkZXJMZWZ0ICsgcGFkZGluZ0xlZnQg KyB3aWR0aCArIHBhZGRpbmdSaWdodCArIGJvcmRlclJpZ2h0ICsgKm1hcmdpblJpZ2h0ICsgKnJp Z2h0KTsKKyAgICB9CisKKyAgICBBU1NFUlQobGVmdCk7CisgICAgQVNTRVJUKHJpZ2h0KTsKKyAg ICBBU1NFUlQobWFyZ2luTGVmdCk7CisgICAgQVNTRVJUKG1hcmdpblJpZ2h0KTsKKworICAgIHJl dHVybiB7ICpsZWZ0LCAqcmlnaHQsIHdpZHRoLCB7ICptYXJnaW5MZWZ0LCAqbWFyZ2luUmlnaHQg fSB9OwogfQogCiBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OkhlaWdodEFuZE1hcmdpbiBG b3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmZsb2F0aW5nTm9uUmVwbGFjZWRIZWlnaHRBbmRN YXJnaW4oTGF5b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4dCwgY29uc3QgQm94JiBsYXlvdXRCb3gp CkBAIC00NDksMTMgKzUzOSwxMyBAQCBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OkhlaWdo dEFuZE1hcmdpbiBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Om91dE9mRgogICAgIHJldHVy biBvdXRPZkZsb3dSZXBsYWNlZEhlaWdodEFuZE1hcmdpbihsYXlvdXRDb250ZXh0LCBsYXlvdXRC b3gpOwogfQogCi1Gb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OldpZHRoQW5kTWFyZ2luIEZv cm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6b3V0T2ZGbG93V2lkdGhBbmRNYXJnaW4oTGF5b3V0 Q29udGV4dCYgbGF5b3V0Q29udGV4dCwgY29uc3QgQm94JiBsYXlvdXRCb3gpCitGb3JtYXR0aW5n Q29udGV4dDo6R2VvbWV0cnk6Okhvcml6b250YWxHZW9tZXRyeSBGb3JtYXR0aW5nQ29udGV4dDo6 R2VvbWV0cnk6Om91dE9mRmxvd0hvcml6b250YWxHZW9tZXRyeShMYXlvdXRDb250ZXh0JiBsYXlv dXRDb250ZXh0LCBjb25zdCBCb3gmIGxheW91dEJveCkKIHsKICAgICBBU1NFUlQobGF5b3V0Qm94 LmlzT3V0T2ZGbG93UG9zaXRpb25lZCgpKTsKIAogICAgIGlmICghbGF5b3V0Qm94LnJlcGxhY2Vk KCkpCi0gICAgICAgIHJldHVybiBvdXRPZkZsb3dOb25SZXBsYWNlZFdpZHRoQW5kTWFyZ2luKGxh eW91dENvbnRleHQsIGxheW91dEJveCk7Ci0gICAgcmV0dXJuIG91dE9mRmxvd1JlcGxhY2VkV2lk dGhBbmRNYXJnaW4obGF5b3V0Q29udGV4dCwgbGF5b3V0Qm94KTsKKyAgICAgICAgcmV0dXJuIG91 dE9mRmxvd05vblJlcGxhY2VkSG9yaXpvbnRhbEdlb21ldHJ5KGxheW91dENvbnRleHQsIGxheW91 dEJveCk7CisgICAgcmV0dXJuIG91dE9mRmxvd1JlcGxhY2VkSG9yaXpvbnRhbEdlb21ldHJ5KGxh eW91dENvbnRleHQsIGxheW91dEJveCk7CiB9CiAKIEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRy eTo6SGVpZ2h0QW5kTWFyZ2luIEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6ZmxvYXRpbmdI ZWlnaHRBbmRNYXJnaW4oTGF5b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4dCwgY29uc3QgQm94JiBs YXlvdXRCb3gpCg==