186432 2018-06-08 08:36:29 -0700 [LFC] Add vertical margin computation for inline, block-level, inline-block and floating replaced elements 2018-06-08 09:36:31 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto sam simon.fraser webkit-bug-importer zalan oldest_to_newest 1431234 0 zalan 2018-06-08 08:36:29 -0700 10.6.2 Inline replaced elements, block-level replaced elements in normal flow, 'inline-block' replaced elements in normal flow and floating replaced elements 1431238 1 342271 zalan 2018-06-08 08:42:28 -0700 Created attachment 342271 Patch 1431258 2 342271 commit-queue 2018-06-08 09:35:41 -0700 Comment on attachment 342271 Patch Clearing flags on attachment: 342271 Committed r232620: <https://trac.webkit.org/changeset/232620> 1431259 3 commit-queue 2018-06-08 09:35:42 -0700 All reviewed patches have been landed. Closing bug. 1431261 4 webkit-bug-importer 2018-06-08 09:36:31 -0700 <rdar://problem/40939376> 342271 2018-06-08 08:42:28 -0700 2018-06-08 09:35:41 -0700 Patch bug-186432-20180608084227.patch text/plain 10433 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyNTgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODI0ZGQ3YzY4ZjkwYjNj MWMxYWVkYzUxODI4MTE2MjU2NzI3Y2IyZC4uNDgzNTU5NGRlZDZlNTBjMTViOWEyODNlZGRmOTdh ZTg3ZTE4YTMwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE4LTA2LTA4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gQWRkIHZlcnRpY2Fs IG1hcmdpbiBjb21wdXRhdGlvbiBmb3IgaW5saW5lLCBibG9jay1sZXZlbCwgaW5saW5lLWJsb2Nr IGFuZCBmbG9hdGluZyByZXBsYWNlZCBlbGVtZW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg2NDMyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBsYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuaDoKKyAg ICAgICAgKiBsYXlvdXQvRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6ZmxvYXRpbmdOb25S ZXBsYWNlZFdpZHRoQW5kTWFyZ2luKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0 dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpmbG9hdGluZ1JlcGxhY2VkV2lkdGhBbmRNYXJnaW4pOiBV c2UgdGhlIGNvbXB1dGVkIG5vbi1hdXRvIHZhbHVlcyB3aGVuIG1hcmdpbiBpcyBub3QgYXV0by4K KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5Ojpp bmxpbmVSZXBsYWNlZEhlaWdodEFuZE1hcmdpbik6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6 OkZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6Y29tcHV0ZWROb25Db2xsYXBzZWRIb3Jpem9u dGFsTWFyZ2luVmFsdWUpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29u dGV4dDo6R2VvbWV0cnk6OmNvbXB1dGVkTm9uQ29sbGFwc2VkVmVydGljYWxNYXJnaW5WYWx1ZSk6 CisKIDIwMTgtMDYtMDcgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAg ICBbTEZDXSBNZXJnZSBoZWlnaHQgYW5kIHZlcnRpY2FsIG1hcmdpbiBjb21wdXRhdGlvbgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmggYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuaAppbmRleCA3MzYzNzZjYTlkNDg3 OGNhODhkYmUzNjdiNmY1NzY3YWFlMmU2ZjE0Li45ZDIzMGYyMTg4OGQwYjY1YWE0NTIwZTNlYTFm NmM3YTNkYTVlMDNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGlu Z0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQu aApAQCAtMTA2LDYgKzEwNiw5IEBAIHByb3RlY3RlZDoKICAgICAgICAgc3RhdGljIERpc3BsYXk6 OkJveDo6RWRnZXMgY29tcHV0ZWRCb3JkZXIoTGF5b3V0Q29udGV4dCYsIGNvbnN0IEJveCYpOwog ICAgICAgICBzdGF0aWMgc3RkOjpvcHRpb25hbDxEaXNwbGF5OjpCb3g6OkVkZ2VzPiBjb21wdXRl ZFBhZGRpbmcoTGF5b3V0Q29udGV4dCYsIGNvbnN0IEJveCYpOwogCisgICAgICAgIHN0YXRpYyBE aXNwbGF5OjpCb3g6Okhvcml6b250YWxFZGdlcyBjb21wdXRlZE5vbkNvbGxhcHNlZEhvcml6b250 YWxNYXJnaW5WYWx1ZShjb25zdCBMYXlvdXRDb250ZXh0JiwgY29uc3QgQm94Jik7CisgICAgICAg IHN0YXRpYyBEaXNwbGF5OjpCb3g6OlZlcnRpY2FsRWRnZXMgY29tcHV0ZWROb25Db2xsYXBzZWRW ZXJ0aWNhbE1hcmdpblZhbHVlKGNvbnN0IExheW91dENvbnRleHQmLCBjb25zdCBCb3gmKTsKKwog ICAgIHByaXZhdGU6CiAgICAgICAgIHN0YXRpYyBIZWlnaHRBbmRNYXJnaW4gb3V0T2ZGbG93UmVw bGFjZWRIZWlnaHRBbmRNYXJnaW4oTGF5b3V0Q29udGV4dCYsIGNvbnN0IEJveCYpOwogICAgICAg ICBzdGF0aWMgV2lkdGhBbmRNYXJnaW4gb3V0T2ZGbG93UmVwbGFjZWRXaWR0aEFuZE1hcmdpbihM YXlvdXRDb250ZXh0JiwgY29uc3QgQm94Jik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKaW5kZXggNmE0ZmZmMGNmY2VmZTgxOGY0 MTZlMGU2N2IyOGU3NTIzN2MxMGM3OC4uYTQwYzQzZDA3YjIzYWVhZGQ3NTUwNzlmYzFhYzAyMmMy ZjYzZWZkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250 ZXh0R2VvbWV0cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29u dGV4dEdlb21ldHJ5LmNwcApAQCAtMjI2LDIxICsyMjYsMTEgQEAgRm9ybWF0dGluZ0NvbnRleHQ6 Okdlb21ldHJ5OjpXaWR0aEFuZE1hcmdpbiBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmZs b2F0aW4KICAgICAvLyAyLiBJZiAnd2lkdGgnIGlzIGNvbXB1dGVkIGFzICdhdXRvJywgdGhlIHVz ZWQgdmFsdWUgaXMgdGhlICJzaHJpbmstdG8tZml0IiB3aWR0aC4KICAgICBhdXRvJiBzdHlsZSA9 IGxheW91dEJveC5zdHlsZSgpOwogICAgIGF1dG8gd2lkdGggPSBzdHlsZS5sb2dpY2FsV2lkdGgo KTsKLSAgICBMYXlvdXRVbml0IGNvbXB1dGVkTWFyZ2luTGVmdFZhbHVlOwotICAgIExheW91dFVu aXQgY29tcHV0ZWRNYXJnaW5SaWdodFZhbHVlOwotCi0gICAgewotICAgICAgICBhdXRvIG1hcmdp bkxlZnQgPSBzdHlsZS5tYXJnaW5MZWZ0KCk7Ci0gICAgICAgIGF1dG8gbWFyZ2luUmlnaHQgPSBz dHlsZS5tYXJnaW5SaWdodCgpOwotICAgICAgICBhdXRvIGNvbnRhaW5pbmdCbG9ja1dpZHRoID0g bGF5b3V0Q29udGV4dC5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KCpsYXlvdXRCb3guY29udGFpbmlu Z0Jsb2NrKCkpLT53aWR0aCgpOwotICAgICAgICAvLyAjMQotICAgICAgICBjb21wdXRlZE1hcmdp bkxlZnRWYWx1ZSA9IG1hcmdpbkxlZnQuaXNBdXRvKCkgPyBMYXlvdXRVbml0KDApIDogdmFsdWVG b3JMZW5ndGgobWFyZ2luTGVmdCwgY29udGFpbmluZ0Jsb2NrV2lkdGgpOwotICAgICAgICBjb21w dXRlZE1hcmdpblJpZ2h0VmFsdWUgPSBtYXJnaW5SaWdodC5pc0F1dG8oKSA/IExheW91dFVuaXQo MCkgOiB2YWx1ZUZvckxlbmd0aChtYXJnaW5SaWdodCwgY29udGFpbmluZ0Jsb2NrV2lkdGgpOwot ICAgIH0KLQorICAgIC8vICMxCisgICAgYXV0byBjb21wdXRlZE5vbkNvbGxhcHNlZEhvcml6b250 YWxNYXJnaW5WYWx1ZXMgPSBjb21wdXRlZE5vbkNvbGxhcHNlZEhvcml6b250YWxNYXJnaW5WYWx1 ZShsYXlvdXRDb250ZXh0LCBsYXlvdXRCb3gpOwogICAgIC8vICMyCiAgICAgYXV0byBjb21wdXRl ZFdpZHRoVmFsdWUgPSB3aWR0aC5pc0F1dG8oKSA/IHNocmlua1RvRml0V2lkdGgobGF5b3V0Q29u dGV4dCwgbGF5b3V0Qm94KSA6IExheW91dFVuaXQod2lkdGgudmFsdWUoKSk7Ci0gICAgcmV0dXJu IEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6V2lkdGhBbmRNYXJnaW4geyBjb21wdXRlZFdp ZHRoVmFsdWUsIHsgY29tcHV0ZWRNYXJnaW5MZWZ0VmFsdWUsIGNvbXB1dGVkTWFyZ2luUmlnaHRW YWx1ZSB9IH07CisgICAgcmV0dXJuIEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6V2lkdGhB bmRNYXJnaW4geyBjb21wdXRlZFdpZHRoVmFsdWUsIGNvbXB1dGVkTm9uQ29sbGFwc2VkSG9yaXpv bnRhbE1hcmdpblZhbHVlcyB9OwogfQogCiBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Okhl aWdodEFuZE1hcmdpbiBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmZsb2F0aW5nUmVwbGFj ZWRIZWlnaHRBbmRNYXJnaW4oTGF5b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4dCwgY29uc3QgQm94 JiBsYXlvdXRCb3gpCkBAIC0yNTgsMTYgKzI0OCw4IEBAIEZvcm1hdHRpbmdDb250ZXh0OjpHZW9t ZXRyeTo6V2lkdGhBbmRNYXJnaW4gRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpmbG9hdGlu CiAgICAgLy8KICAgICAvLyAxLiBJZiAnbWFyZ2luLWxlZnQnIG9yICdtYXJnaW4tcmlnaHQnIGFy ZSBjb21wdXRlZCBhcyAnYXV0bycsIHRoZWlyIHVzZWQgdmFsdWUgaXMgJzAnLgogICAgIC8vIDIu IFRoZSB1c2VkIHZhbHVlIG9mICd3aWR0aCcgaXMgZGV0ZXJtaW5lZCBhcyBmb3IgaW5saW5lIHJl cGxhY2VkIGVsZW1lbnRzLgotICAgIGF1dG8mIHN0eWxlID0gbGF5b3V0Qm94LnN0eWxlKCk7Ci0g ICAgc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0PiBjb21wdXRlZE1hcmdpbkxlZnRWYWx1ZTsKLSAg ICBzdGQ6Om9wdGlvbmFsPExheW91dFVuaXQ+IGNvbXB1dGVkTWFyZ2luUmlnaHRWYWx1ZTsKLQot ICAgIGlmIChzdHlsZS5tYXJnaW5MZWZ0KCkuaXNBdXRvKCkpCi0gICAgICAgIGNvbXB1dGVkTWFy Z2luTGVmdFZhbHVlID0gTGF5b3V0VW5pdCB7IDAgfTsKLSAgICBpZiAoc3R5bGUubWFyZ2luUmln aHQoKS5pc0F1dG8oKSkKLSAgICAgICAgY29tcHV0ZWRNYXJnaW5SaWdodFZhbHVlID0gTGF5b3V0 VW5pdCB7IDAgfTsKLQotICAgIHJldHVybiBpbmxpbmVSZXBsYWNlZFdpZHRoQW5kTWFyZ2luKGxh eW91dENvbnRleHQsIGxheW91dEJveCwgY29tcHV0ZWRNYXJnaW5MZWZ0VmFsdWUsIGNvbXB1dGVk TWFyZ2luUmlnaHRWYWx1ZSk7CisgICAgYXV0byBjb21wdXRlZE5vbkNvbGxhcHNlZEhvcml6b250 YWxNYXJnaW5WYWx1ZXMgPSBjb21wdXRlZE5vbkNvbGxhcHNlZEhvcml6b250YWxNYXJnaW5WYWx1 ZShsYXlvdXRDb250ZXh0LCBsYXlvdXRCb3gpOworICAgIHJldHVybiBpbmxpbmVSZXBsYWNlZFdp ZHRoQW5kTWFyZ2luKGxheW91dENvbnRleHQsIGxheW91dEJveCwgY29tcHV0ZWROb25Db2xsYXBz ZWRIb3Jpem9udGFsTWFyZ2luVmFsdWVzLmxlZnQsIGNvbXB1dGVkTm9uQ29sbGFwc2VkSG9yaXpv bnRhbE1hcmdpblZhbHVlcy5yaWdodCk7CiB9CiAKIHN0YXRpYyBMYXlvdXRQb2ludCBvdXRPZkZs b3dOb25SZXBsYWNlZFBvc2l0aW9uKExheW91dENvbnRleHQmIGxheW91dENvbnRleHQsIGNvbnN0 IEJveCYgbGF5b3V0Qm94KQpAQCAtNTAzLDQ2ICs0ODUsNDYgQEAgTGF5b3V0UG9pbnQgRm9ybWF0 dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpvdXRPZkZsb3dQb3NpdGlvbihMYXlvdXRDb250ZXh0JiBs YXlvdXQKICAgICByZXR1cm4gb3V0T2ZGbG93UmVwbGFjZWRQb3NpdGlvbihsYXlvdXRDb250ZXh0 LCBsYXlvdXRCb3gpOwogfQogCi1Gb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OkhlaWdodEFu ZE1hcmdpbiBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmlubGluZVJlcGxhY2VkSGVpZ2h0 QW5kTWFyZ2luKExheW91dENvbnRleHQmLCBjb25zdCBCb3gmIGxheW91dEJveCkKK0Zvcm1hdHRp bmdDb250ZXh0OjpHZW9tZXRyeTo6SGVpZ2h0QW5kTWFyZ2luIEZvcm1hdHRpbmdDb250ZXh0OjpH ZW9tZXRyeTo6aW5saW5lUmVwbGFjZWRIZWlnaHRBbmRNYXJnaW4oTGF5b3V0Q29udGV4dCYgbGF5 b3V0Q29udGV4dCwgY29uc3QgQm94JiBsYXlvdXRCb3gpCiB7CiAgICAgQVNTRVJUKChsYXlvdXRC b3guaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkgfHwgbGF5b3V0Qm94LmlzRmxvYXRpbmdQb3NpdGlv bmVkKCkgfHwgbGF5b3V0Qm94LmlzSW5GbG93KCkpICYmIGxheW91dEJveC5yZXBsYWNlZCgpKTsK ICAgICAvLyAxMC42LjIgSW5saW5lIHJlcGxhY2VkIGVsZW1lbnRzLCBibG9jay1sZXZlbCByZXBs YWNlZCBlbGVtZW50cyBpbiBub3JtYWwgZmxvdywgJ2lubGluZS1ibG9jaycgcmVwbGFjZWQgZWxl bWVudHMgaW4gbm9ybWFsIGZsb3cgYW5kIGZsb2F0aW5nIHJlcGxhY2VkIGVsZW1lbnRzCiAgICAg Ly8KLSAgICAvLyAxLiBJZiAnaGVpZ2h0JyBhbmQgJ3dpZHRoJyBib3RoIGhhdmUgY29tcHV0ZWQg dmFsdWVzIG9mICdhdXRvJyBhbmQgdGhlIGVsZW1lbnQgYWxzbyBoYXMgYW4gaW50cmluc2ljIGhl aWdodCwgdGhlbiB0aGF0IGludHJpbnNpYyBoZWlnaHQgaXMgdGhlIHVzZWQgdmFsdWUgb2YgJ2hl aWdodCcuCi0gICAgLy8KLSAgICAvLyAyLiBPdGhlcndpc2UsIGlmICdoZWlnaHQnIGhhcyBhIGNv bXB1dGVkIHZhbHVlIG9mICdhdXRvJywgYW5kIHRoZSBlbGVtZW50IGhhcyBhbiBpbnRyaW5zaWMg cmF0aW8gdGhlbiB0aGUgdXNlZCB2YWx1ZSBvZiAnaGVpZ2h0JyBpczoKKyAgICAvLyAxLiBJZiAn bWFyZ2luLXRvcCcsIG9yICdtYXJnaW4tYm90dG9tJyBhcmUgJ2F1dG8nLCB0aGVpciB1c2VkIHZh bHVlIGlzIDAuCisgICAgLy8gMi4gSWYgJ2hlaWdodCcgYW5kICd3aWR0aCcgYm90aCBoYXZlIGNv bXB1dGVkIHZhbHVlcyBvZiAnYXV0bycgYW5kIHRoZSBlbGVtZW50IGFsc28gaGFzIGFuIGludHJp bnNpYyBoZWlnaHQsIHRoZW4gdGhhdCBpbnRyaW5zaWMgaGVpZ2h0IGlzIHRoZSB1c2VkIHZhbHVl IG9mICdoZWlnaHQnLgorICAgIC8vIDMuIE90aGVyd2lzZSwgaWYgJ2hlaWdodCcgaGFzIGEgY29t cHV0ZWQgdmFsdWUgb2YgJ2F1dG8nLCBhbmQgdGhlIGVsZW1lbnQgaGFzIGFuIGludHJpbnNpYyBy YXRpbyB0aGVuIHRoZSB1c2VkIHZhbHVlIG9mICdoZWlnaHQnIGlzOgogICAgIC8vICAgICh1c2Vk IHdpZHRoKSAvIChpbnRyaW5zaWMgcmF0aW8pCi0gICAgLy8KLSAgICAvLyAzLiBPdGhlcndpc2Us IGlmICdoZWlnaHQnIGhhcyBhIGNvbXB1dGVkIHZhbHVlIG9mICdhdXRvJywgYW5kIHRoZSBlbGVt ZW50IGhhcyBhbiBpbnRyaW5zaWMgaGVpZ2h0LCB0aGVuIHRoYXQgaW50cmluc2ljIGhlaWdodCBp cyB0aGUgdXNlZCB2YWx1ZSBvZiAnaGVpZ2h0Jy4KLSAgICAvLwotICAgIC8vIDQuIE90aGVyd2lz ZSwgaWYgJ2hlaWdodCcgaGFzIGEgY29tcHV0ZWQgdmFsdWUgb2YgJ2F1dG8nLCBidXQgbm9uZSBv ZiB0aGUgY29uZGl0aW9ucyBhYm92ZSBhcmUgbWV0LCB0aGVuIHRoZSB1c2VkIHZhbHVlIG9mICdo ZWlnaHQnIG11c3QgYmUgc2V0IHRvCisgICAgLy8gNC4gT3RoZXJ3aXNlLCBpZiAnaGVpZ2h0JyBo YXMgYSBjb21wdXRlZCB2YWx1ZSBvZiAnYXV0bycsIGFuZCB0aGUgZWxlbWVudCBoYXMgYW4gaW50 cmluc2ljIGhlaWdodCwgdGhlbiB0aGF0IGludHJpbnNpYyBoZWlnaHQgaXMgdGhlIHVzZWQgdmFs dWUgb2YgJ2hlaWdodCcuCisgICAgLy8gNS4gT3RoZXJ3aXNlLCBpZiAnaGVpZ2h0JyBoYXMgYSBj b21wdXRlZCB2YWx1ZSBvZiAnYXV0bycsIGJ1dCBub25lIG9mIHRoZSBjb25kaXRpb25zIGFib3Zl IGFyZSBtZXQsIHRoZW4gdGhlIHVzZWQgdmFsdWUgb2YgJ2hlaWdodCcgbXVzdCBiZSBzZXQgdG8K ICAgICAvLyAgICB0aGUgaGVpZ2h0IG9mIHRoZSBsYXJnZXN0IHJlY3RhbmdsZSB0aGF0IGhhcyBh IDI6MSByYXRpbywgaGFzIGEgaGVpZ2h0IG5vdCBncmVhdGVyIHRoYW4gMTUwcHgsIGFuZCBoYXMg YSB3aWR0aCBub3QgZ3JlYXRlciB0aGFuIHRoZSBkZXZpY2Ugd2lkdGguCisKKyAgICAvLyAjMQor ICAgIGF1dG8gY29tcHV0ZWROb25Db2xsYXBzZWRWZXJ0aWNhbE1hcmdpblZhbHVlcyA9IGNvbXB1 dGVkTm9uQ29sbGFwc2VkVmVydGljYWxNYXJnaW5WYWx1ZShsYXlvdXRDb250ZXh0LCBsYXlvdXRC b3gpOworCiAgICAgYXV0byYgc3R5bGUgPSBsYXlvdXRCb3guc3R5bGUoKTsKLSAgICBhdXRvIHdp ZHRoID0gc3R5bGUubG9naWNhbFdpZHRoKCk7CiAgICAgYXV0byBoZWlnaHQgPSBzdHlsZS5sb2dp Y2FsSGVpZ2h0KCk7Ci0KICAgICBMYXlvdXRVbml0IGNvbXB1dGVkSGVpZ2h0VmFsdWU7Ci0gICAg YXV0byByZXBsYWNlZCA9IGxheW91dEJveC5yZXBsYWNlZCgpOwotICAgIEFTU0VSVChyZXBsYWNl ZCk7Ci0KICAgICBpZiAoaGVpZ2h0LmlzQXV0bygpKSB7CisgICAgICAgIGF1dG8gd2lkdGggPSBz dHlsZS5sb2dpY2FsV2lkdGgoKTsKKyAgICAgICAgYXV0byByZXBsYWNlZCA9IGxheW91dEJveC5y ZXBsYWNlZCgpOworCiAgICAgICAgIGlmICh3aWR0aC5pc0F1dG8oKSAmJiByZXBsYWNlZC0+aGFz SW50cmluc2ljSGVpZ2h0KCkpIHsKLSAgICAgICAgICAgIC8vICMxCisgICAgICAgICAgICAvLyAj MgogICAgICAgICAgICAgY29tcHV0ZWRIZWlnaHRWYWx1ZSA9IHJlcGxhY2VkLT5pbnRyaW5zaWNI ZWlnaHQoKTsKICAgICAgICAgfSBlbHNlIGlmIChyZXBsYWNlZC0+aGFzSW50cmluc2ljUmF0aW8o KSkgewotICAgICAgICAgICAgLy8gIzIKKyAgICAgICAgICAgIC8vICMzCiAgICAgICAgICAgICBj b21wdXRlZEhlaWdodFZhbHVlID0gd2lkdGgudmFsdWUoKSAvIHJlcGxhY2VkLT5pbnRyaW5zaWNS YXRpbygpOwogICAgICAgICB9IGVsc2UgaWYgKHJlcGxhY2VkLT5oYXNJbnRyaW5zaWNIZWlnaHQo KSkgewotICAgICAgICAgICAgLy8gIzMKKyAgICAgICAgICAgIC8vICM0CiAgICAgICAgICAgICBj b21wdXRlZEhlaWdodFZhbHVlID0gcmVwbGFjZWQtPmludHJpbnNpY0hlaWdodCgpOwogICAgICAg ICB9IGVsc2UgewotICAgICAgICAgICAgLy8gIzQKKyAgICAgICAgICAgIC8vICM1CiAgICAgICAg ICAgICBjb21wdXRlZEhlaWdodFZhbHVlID0gMTUwOwogICAgICAgICB9CiAgICAgfSBlbHNlCiAg ICAgICAgIGNvbXB1dGVkSGVpZ2h0VmFsdWUgPSBoZWlnaHQudmFsdWUoKTsKIAotICAgIHJldHVy biB7IGNvbXB1dGVkSGVpZ2h0VmFsdWUsIHsgfSB9OworICAgIHJldHVybiB7IGNvbXB1dGVkSGVp Z2h0VmFsdWUsIGNvbXB1dGVkTm9uQ29sbGFwc2VkVmVydGljYWxNYXJnaW5WYWx1ZXMgfTsKIH0K IAogRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpXaWR0aEFuZE1hcmdpbiBGb3JtYXR0aW5n Q29udGV4dDo6R2VvbWV0cnk6OmlubGluZVJlcGxhY2VkV2lkdGhBbmRNYXJnaW4oTGF5b3V0Q29u dGV4dCYgbGF5b3V0Q29udGV4dCwgY29uc3QgQm94JiBsYXlvdXRCb3gsCkBAIC02MzcsNiArNjE5 LDMyIEBAIHN0ZDo6b3B0aW9uYWw8RGlzcGxheTo6Qm94OjpFZGdlcz4gRm9ybWF0dGluZ0NvbnRl eHQ6Okdlb21ldHJ5Ojpjb21wdXRlZFBhZGRpbmcoCiAgICAgfTsKIH0KIAorRGlzcGxheTo6Qm94 OjpIb3Jpem9udGFsRWRnZXMgRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5Ojpjb21wdXRlZE5v bkNvbGxhcHNlZEhvcml6b250YWxNYXJnaW5WYWx1ZShjb25zdCBMYXlvdXRDb250ZXh0JiBsYXlv dXRDb250ZXh0LCBjb25zdCBCb3gmIGxheW91dEJveCkKK3sKKyAgICBhdXRvJiBzdHlsZSA9IGxh eW91dEJveC5zdHlsZSgpOworICAgIGF1dG8gbWFyZ2luTGVmdCA9IHN0eWxlLm1hcmdpbkxlZnQo KTsKKyAgICBhdXRvIG1hcmdpblJpZ2h0ID0gc3R5bGUubWFyZ2luUmlnaHQoKTsKKworICAgIGF1 dG8gY29udGFpbmluZ0Jsb2NrV2lkdGggPSBsYXlvdXRDb250ZXh0LmRpc3BsYXlCb3hGb3JMYXlv dXRCb3goKmxheW91dEJveC5jb250YWluaW5nQmxvY2soKSktPndpZHRoKCk7CisgICAgcmV0dXJu IERpc3BsYXk6OkJveDo6SG9yaXpvbnRhbEVkZ2VzIHsKKyAgICAgICAgbWFyZ2luTGVmdC5pc0F1 dG8oKSA/IExheW91dFVuaXQgeyAwIH0gOiB2YWx1ZUZvckxlbmd0aChtYXJnaW5MZWZ0LCBjb250 YWluaW5nQmxvY2tXaWR0aCksCisgICAgICAgIG1hcmdpblJpZ2h0LmlzQXV0bygpID8gTGF5b3V0 VW5pdCB7IDAgfSA6IHZhbHVlRm9yTGVuZ3RoKG1hcmdpblJpZ2h0LCBjb250YWluaW5nQmxvY2tX aWR0aCkKKyAgICB9OworfQorCitEaXNwbGF5OjpCb3g6OlZlcnRpY2FsRWRnZXMgRm9ybWF0dGlu Z0NvbnRleHQ6Okdlb21ldHJ5Ojpjb21wdXRlZE5vbkNvbGxhcHNlZFZlcnRpY2FsTWFyZ2luVmFs dWUoY29uc3QgTGF5b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4dCwgY29uc3QgQm94JiBsYXlvdXRC b3gpCit7CisgICAgYXV0byYgc3R5bGUgPSBsYXlvdXRCb3guc3R5bGUoKTsKKyAgICBhdXRvIG1h cmdpblRvcCA9IHN0eWxlLm1hcmdpblRvcCgpOworICAgIGF1dG8gbWFyZ2luQm90dG9tID0gc3R5 bGUubWFyZ2luQm90dG9tKCk7CisKKyAgICBhdXRvIGNvbnRhaW5pbmdCbG9ja1dpZHRoID0gbGF5 b3V0Q29udGV4dC5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KCpsYXlvdXRCb3guY29udGFpbmluZ0Js b2NrKCkpLT53aWR0aCgpOworICAgIHJldHVybiBEaXNwbGF5OjpCb3g6OlZlcnRpY2FsRWRnZXMg eworICAgICAgICBtYXJnaW5Ub3AuaXNBdXRvKCkgPyBMYXlvdXRVbml0IHsgMCB9IDogdmFsdWVG b3JMZW5ndGgobWFyZ2luVG9wLCBjb250YWluaW5nQmxvY2tXaWR0aCksCisgICAgICAgIG1hcmdp bkJvdHRvbS5pc0F1dG8oKSA/IExheW91dFVuaXQgeyAwIH0gOiB2YWx1ZUZvckxlbmd0aChtYXJn aW5Cb3R0b20sIGNvbnRhaW5pbmdCbG9ja1dpZHRoKQorICAgIH07Cit9CisKIH0KIH0KICNlbmRp Zgo=