186556 2018-06-11 20:52:49 -0700 [LFC] Replace HorizontalGeometry::width and margin with WidthAndMargin (Vertical too) 2018-06-11 22:41:22 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan webkit-unassigned bfulgham commit-queue koivisto sam simon.fraser webkit-bug-importer zalan oldest_to_newest 1432197 0 zalan 2018-06-11 20:52:49 -0700 ssia 1432199 1 342512 zalan 2018-06-11 20:56:13 -0700 Created attachment 342512 Patch 1432210 2 342512 commit-queue 2018-06-11 22:40:57 -0700 Comment on attachment 342512 Patch Clearing flags on attachment: 342512 Committed r232743: <https://trac.webkit.org/changeset/232743> 1432211 3 commit-queue 2018-06-11 22:40:58 -0700 All reviewed patches have been landed. Closing bug. 1432212 4 webkit-bug-importer 2018-06-11 22:41:22 -0700 <rdar://problem/41033843> 342512 2018-06-11 20:56:13 -0700 2018-06-11 22:40:57 -0700 Patch bug-186556-20180611205612.patch text/plain 8439 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyNzE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWU3ZjAxYWIyYzBlYTFh OTY3YjY5ODg2MzI5NWYxMDk2YzUwNGQzZC4uYmYzZWQxZTkzNDhjYTE3NTU4MTY2OWFhNTg5ZmM5 YmZkYjk5MmM4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE4LTA2LTExICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gUmVwbGFjZSBIb3Jp em9udGFsR2VvbWV0cnk6OndpZHRoIGFuZCBtYXJnaW4gd2l0aCBXaWR0aEFuZE1hcmdpbiAoVmVy dGljYWwgdG9vKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTg2NTU2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgSG9yaXpvbnRhbEdlb21ldHJ5Ojp3aWR0aCBhbmQgbWFyZ2luIC0+IFdpZHRoQW5kTWFyZ2lu CisgICAgICAgIFZlcnRpY2FsR2VvbWV0cnk6OmhlaWdodCBhbmQgbWFyZ2luIC0+IEhlaWdodEFu ZE1hcmdpbgorCisgICAgICAgICogbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVPdXRPZkZsb3dI b3Jpem9udGFsR2VvbWV0cnkgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGb3Jt YXR0aW5nQ29udGV4dDo6Y29tcHV0ZU91dE9mRmxvd1ZlcnRpY2FsR2VvbWV0cnkgY29uc3QpOgor ICAgICAgICAqIGxheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5oOgorICAgICAgICAqIGxheW91dC9G b3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 Rm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpvdXRPZkZsb3dOb25SZXBsYWNlZFZlcnRpY2Fs R2VvbWV0cnkpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6 R2VvbWV0cnk6Om91dE9mRmxvd05vblJlcGxhY2VkSG9yaXpvbnRhbEdlb21ldHJ5KToKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpvdXRPZkZs b3dSZXBsYWNlZFZlcnRpY2FsR2VvbWV0cnkpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpG b3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Om91dE9mRmxvd1JlcGxhY2VkSG9yaXpvbnRhbEdl b21ldHJ5KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6Okdl b21ldHJ5OjppbmxpbmVSZXBsYWNlZFdpZHRoQW5kTWFyZ2luKToKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5Ojpjb21wdXRlZE5vbkNvbGxhcHNl ZEhvcml6b250YWxNYXJnaW5WYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1h dHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6Y29tcHV0ZWROb25Db2xsYXBzZWRWZXJ0aWNhbE1hcmdp blZhbHVlKToKKwogMjAxOC0wNi0xMSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgog CiAgICAgICAgIFtMRkNdIFJlbW92ZSByZWR1bmRhbnQgcG9zaXRpb24gZnVuY3Rpb25zIGZvciBv dXQtb2YtZmxvdyBlbGVtZW50cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zv cm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29u dGV4dC5jcHAKaW5kZXggOTkzMGRjOGQzZTk0OTAzMGE4ZTEyMTdkMjY2ZjdlZWFlZDdkOGNhZC4u NzNhNTA0YTJmOTU2NDYxYmNiOWZlZDk2OWRkM2UyYTk2NmVkMTI2NCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC02NywxOCArNjcsMTggQEAgdm9p ZCBGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZU91dE9mRmxvd0hvcml6b250YWxHZW9tZXRyeShM YXlvdXRDb250ZXh0JiBsYXlvdXQKIHsKICAgICBhdXRvIGhvcml6b250YWxHZW9tZXRyeSA9IEdl b21ldHJ5OjpvdXRPZkZsb3dIb3Jpem9udGFsR2VvbWV0cnkobGF5b3V0Q29udGV4dCwgbGF5b3V0 Qm94KTsKICAgICBkaXNwbGF5Qm94LnNldExlZnQoaG9yaXpvbnRhbEdlb21ldHJ5LmxlZnQpOwot ICAgIGRpc3BsYXlCb3guc2V0V2lkdGgoaG9yaXpvbnRhbEdlb21ldHJ5LndpZHRoKTsKLSAgICBB U1NFUlQoaG9yaXpvbnRhbEdlb21ldHJ5LmxlZnQgKyBob3Jpem9udGFsR2VvbWV0cnkud2lkdGgg PT0gaG9yaXpvbnRhbEdlb21ldHJ5LnJpZ2h0KTsKLSAgICBkaXNwbGF5Qm94LnNldEhvcml6b250 YWxNYXJnaW4oaG9yaXpvbnRhbEdlb21ldHJ5Lm1hcmdpbik7CisgICAgZGlzcGxheUJveC5zZXRX aWR0aChob3Jpem9udGFsR2VvbWV0cnkud2lkdGhBbmRNYXJnaW4ud2lkdGgpOworICAgIEFTU0VS VChob3Jpem9udGFsR2VvbWV0cnkubGVmdCArIGhvcml6b250YWxHZW9tZXRyeS53aWR0aEFuZE1h cmdpbi53aWR0aCA9PSBob3Jpem9udGFsR2VvbWV0cnkucmlnaHQpOworICAgIGRpc3BsYXlCb3gu c2V0SG9yaXpvbnRhbE1hcmdpbihob3Jpem9udGFsR2VvbWV0cnkud2lkdGhBbmRNYXJnaW4ubWFy Z2luKTsKIH0KIAogdm9pZCBGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZU91dE9mRmxvd1ZlcnRp Y2FsR2VvbWV0cnkoTGF5b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4dCwgY29uc3QgQm94JiBsYXlv dXRCb3gsIERpc3BsYXk6OkJveCYgZGlzcGxheUJveCkgY29uc3QKIHsKICAgICBhdXRvIHZlcnRp Y2FsR2VvbWV0cnkgPSBHZW9tZXRyeTo6b3V0T2ZGbG93VmVydGljYWxHZW9tZXRyeShsYXlvdXRD b250ZXh0LCBsYXlvdXRCb3gpOwogICAgIGRpc3BsYXlCb3guc2V0VG9wKHZlcnRpY2FsR2VvbWV0 cnkudG9wKTsKLSAgICBkaXNwbGF5Qm94LnNldEhlaWdodCh2ZXJ0aWNhbEdlb21ldHJ5LmhlaWdo dCk7Ci0gICAgQVNTRVJUKHZlcnRpY2FsR2VvbWV0cnkudG9wICsgdmVydGljYWxHZW9tZXRyeS5o ZWlnaHQgPT0gdmVydGljYWxHZW9tZXRyeS5ib3R0b20pOwotICAgIGRpc3BsYXlCb3guc2V0VmVy dGljYWxNYXJnaW4odmVydGljYWxHZW9tZXRyeS5tYXJnaW4pOworICAgIGRpc3BsYXlCb3guc2V0 SGVpZ2h0KHZlcnRpY2FsR2VvbWV0cnkuaGVpZ2h0QW5kTWFyZ2luLmhlaWdodCk7CisgICAgQVNT RVJUKHZlcnRpY2FsR2VvbWV0cnkudG9wICsgdmVydGljYWxHZW9tZXRyeS5oZWlnaHRBbmRNYXJn aW4uaGVpZ2h0ID09IHZlcnRpY2FsR2VvbWV0cnkuYm90dG9tKTsKKyAgICBkaXNwbGF5Qm94LnNl dFZlcnRpY2FsTWFyZ2luKHZlcnRpY2FsR2VvbWV0cnkuaGVpZ2h0QW5kTWFyZ2luLm1hcmdpbik7 CiB9CiAKIHZvaWQgRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVCb3JkZXJBbmRQYWRkaW5nKExh eW91dENvbnRleHQmIGxheW91dENvbnRleHQsIGNvbnN0IEJveCYgbGF5b3V0Qm94LCBEaXNwbGF5 OjpCb3gmIGRpc3BsYXlCb3gpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvRm9ybWF0dGluZ0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5n Q29udGV4dC5oCmluZGV4IDM1M2JlYzFhZWQ0M2U2MTMzYTk5MWY5NGU1NjA1OTc5NDY3NTc3MmYu LjUzZTJjMWU5OTdlMDlkZDEzYWExNDAxOTZhMWYzMmYzODEyNDg3MzMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5oCkBAIC05MiwxNyArOTIsMTUgQEAgcHJvdGVj dGVkOgogICAgICAgICB9OwogCiAgICAgICAgICBzdHJ1Y3QgSG9yaXpvbnRhbEdlb21ldHJ5IHsK LSAgICAgICAgICAgICBMYXlvdXRVbml0IGxlZnQ7Ci0gICAgICAgICAgICAgTGF5b3V0VW5pdCBy aWdodDsKLSAgICAgICAgICAgICBMYXlvdXRVbml0IHdpZHRoOwotICAgICAgICAgICAgIERpc3Bs YXk6OkJveDo6SG9yaXpvbnRhbEVkZ2VzIG1hcmdpbjsKKyAgICAgICAgICAgIExheW91dFVuaXQg bGVmdDsKKyAgICAgICAgICAgIExheW91dFVuaXQgcmlnaHQ7CisgICAgICAgICAgICBXaWR0aEFu ZE1hcmdpbiB3aWR0aEFuZE1hcmdpbjsKICAgICAgICAgIH07CiAKICAgICAgICAgc3RydWN0IFZl cnRpY2FsR2VvbWV0cnkgewogICAgICAgICAgICAgTGF5b3V0VW5pdCB0b3A7CiAgICAgICAgICAg ICBMYXlvdXRVbml0IGJvdHRvbTsKLSAgICAgICAgICAgIExheW91dFVuaXQgaGVpZ2h0OwotICAg ICAgICAgICAgRGlzcGxheTo6Qm94OjpWZXJ0aWNhbEVkZ2VzIG1hcmdpbjsKKyAgICAgICAgICAg IEhlaWdodEFuZE1hcmdpbiBoZWlnaHRBbmRNYXJnaW47CiAgICAgICAgIH07CiAKICAgICAgICAg c3RhdGljIFZlcnRpY2FsR2VvbWV0cnkgb3V0T2ZGbG93VmVydGljYWxHZW9tZXRyeShMYXlvdXRD b250ZXh0JiwgY29uc3QgQm94Jik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv Rm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9y bWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKaW5kZXggZDU0NTE4ZTk1YzJmZDcyZjU5OTQwOTBj OWNhM2RjYzVmMzYwZmM2MS4uY2VlNDYwNmVkNmZmYTg3OTc1ZmE0MWY0MzJiOTkzMDhhNzgyMTI5 MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0R2Vv bWV0cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdl b21ldHJ5LmNwcApAQCAtMTgzLDcgKzE4Myw3IEBAIEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRy eTo6VmVydGljYWxHZW9tZXRyeSBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Om91dE9mCiAg ICAgQVNTRVJUKG1hcmdpblRvcCk7CiAgICAgQVNTRVJUKG1hcmdpbkJvdHRvbSk7CiAKLSAgICBy ZXR1cm4geyAqdG9wLCAqYm90dG9tLCAqaGVpZ2h0LCB7ICptYXJnaW5Ub3AsICptYXJnaW5Cb3R0 b219IH07CisgICAgcmV0dXJuIHsgKnRvcCwgKmJvdHRvbSwgeyAqaGVpZ2h0LCB7ICptYXJnaW5U b3AsICptYXJnaW5Cb3R0b219IH0gfTsKIH0KIAogRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5 OjpIb3Jpem9udGFsR2VvbWV0cnkgRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpvdXRPZkZs b3dOb25SZXBsYWNlZEhvcml6b250YWxHZW9tZXRyeShMYXlvdXRDb250ZXh0JiBsYXlvdXRDb250 ZXh0LCBjb25zdCBCb3gmIGxheW91dEJveCkKQEAgLTMyNCw3ICszMjQsNyBAQCBGb3JtYXR0aW5n Q29udGV4dDo6R2VvbWV0cnk6Okhvcml6b250YWxHZW9tZXRyeSBGb3JtYXR0aW5nQ29udGV4dDo6 R2VvbWV0cnk6Om91dAogICAgIEFTU0VSVChtYXJnaW5MZWZ0KTsKICAgICBBU1NFUlQobWFyZ2lu UmlnaHQpOwogCi0gICAgcmV0dXJuIEhvcml6b250YWxHZW9tZXRyeSB7ICpsZWZ0LCAqcmlnaHQs ICp3aWR0aCwgeyAqbWFyZ2luTGVmdCwgKm1hcmdpblJpZ2h0IH0gfTsKKyAgICByZXR1cm4geyAq bGVmdCwgKnJpZ2h0LCB7ICp3aWR0aCwgeyAqbWFyZ2luTGVmdCwgKm1hcmdpblJpZ2h0IH0gfSB9 OwogfQogCiBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OlZlcnRpY2FsR2VvbWV0cnkgRm9y bWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpvdXRPZkZsb3dSZXBsYWNlZFZlcnRpY2FsR2VvbWV0 cnkoTGF5b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4dCwgY29uc3QgQm94JiBsYXlvdXRCb3gpCkBA IC0zOTEsNyArMzkxLDcgQEAgRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpWZXJ0aWNhbEdl b21ldHJ5IEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6b3V0T2YKICAgICBpZiAoYm94SGVp Z2h0ID4gY29udGFpbmluZ0Jsb2NrSGVpZ2h0KQogICAgICAgICBib3R0b20gPSBjb250YWluaW5n QmxvY2tIZWlnaHQgLSAoKnRvcCArICptYXJnaW5Ub3AgKyBib3JkZXJUb3AgKyBwYWRkaW5nVG9w ICsgaGVpZ2h0ICsgcGFkZGluZ0JvdHRvbSArIGJvcmRlckJvdHRvbSArICptYXJnaW5Cb3R0b20p OyAKIAotICAgIHJldHVybiB7ICp0b3AsICpib3R0b20sIGhlaWdodCwgeyAqbWFyZ2luVG9wLCAq bWFyZ2luQm90dG9tIH0gfTsKKyAgICByZXR1cm4geyAqdG9wLCAqYm90dG9tLCB7IGhlaWdodCwg eyAqbWFyZ2luVG9wLCAqbWFyZ2luQm90dG9tIH0gfSB9OwogfQogCiBGb3JtYXR0aW5nQ29udGV4 dDo6R2VvbWV0cnk6Okhvcml6b250YWxHZW9tZXRyeSBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0 cnk6Om91dE9mRmxvd1JlcGxhY2VkSG9yaXpvbnRhbEdlb21ldHJ5KExheW91dENvbnRleHQmIGxh eW91dENvbnRleHQsIGNvbnN0IEJveCYgbGF5b3V0Qm94KQpAQCAtNDg0LDcgKzQ4NCw3IEBAIEZv cm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6SG9yaXpvbnRhbEdlb21ldHJ5IEZvcm1hdHRpbmdD b250ZXh0OjpHZW9tZXRyeTo6b3V0CiAgICAgQVNTRVJUKG1hcmdpbkxlZnQpOwogICAgIEFTU0VS VChtYXJnaW5SaWdodCk7CiAKLSAgICByZXR1cm4geyAqbGVmdCwgKnJpZ2h0LCB3aWR0aCwgeyAq bWFyZ2luTGVmdCwgKm1hcmdpblJpZ2h0IH0gfTsKKyAgICByZXR1cm4geyAqbGVmdCwgKnJpZ2h0 LCB7IHdpZHRoLCB7ICptYXJnaW5MZWZ0LCAqbWFyZ2luUmlnaHQgfSB9IH07CiB9CiAKIEZvcm1h dHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6SGVpZ2h0QW5kTWFyZ2luIEZvcm1hdHRpbmdDb250ZXh0 OjpHZW9tZXRyeTo6ZmxvYXRpbmdOb25SZXBsYWNlZEhlaWdodEFuZE1hcmdpbihMYXlvdXRDb250 ZXh0JiBsYXlvdXRDb250ZXh0LCBjb25zdCBCb3gmIGxheW91dEJveCkKQEAgLTY4MCw3ICs2ODAs NyBAQCBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OldpZHRoQW5kTWFyZ2luIEZvcm1hdHRp bmdDb250ZXh0OjpHZW9tZXRyeTo6aW5saW5lUgogICAgICAgICBjb21wdXRlZFdpZHRoVmFsdWUg PSAzMDA7CiAgICAgfQogCi0gICAgcmV0dXJuIFdpZHRoQW5kTWFyZ2luIHsgY29tcHV0ZWRXaWR0 aFZhbHVlLCB7IGNvbXB1dGVkTWFyZ2luTGVmdFZhbHVlLCBjb21wdXRlZE1hcmdpblJpZ2h0VmFs dWUgfSB9OworICAgIHJldHVybiB7IGNvbXB1dGVkV2lkdGhWYWx1ZSwgeyBjb21wdXRlZE1hcmdp bkxlZnRWYWx1ZSwgY29tcHV0ZWRNYXJnaW5SaWdodFZhbHVlIH0gfTsKIH0KIAogRGlzcGxheTo6 Qm94OjpFZGdlcyBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmNvbXB1dGVkQm9yZGVyKExh eW91dENvbnRleHQmLCBjb25zdCBCb3gmIGxheW91dEJveCkKQEAgLTcxMiw3ICs3MTIsNyBAQCBE aXNwbGF5OjpCb3g6Okhvcml6b250YWxFZGdlcyBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6 OmNvbXB1dGVkTm9uQ29sbGFwc2VkSAogICAgIGF1dG8gbWFyZ2luUmlnaHQgPSBzdHlsZS5tYXJn aW5SaWdodCgpOwogCiAgICAgYXV0byBjb250YWluaW5nQmxvY2tXaWR0aCA9IGxheW91dENvbnRl eHQuZGlzcGxheUJveEZvckxheW91dEJveCgqbGF5b3V0Qm94LmNvbnRhaW5pbmdCbG9jaygpKS0+ d2lkdGgoKTsKLSAgICByZXR1cm4gRGlzcGxheTo6Qm94OjpIb3Jpem9udGFsRWRnZXMgeworICAg IHJldHVybiB7CiAgICAgICAgIG1hcmdpbkxlZnQuaXNBdXRvKCkgPyBMYXlvdXRVbml0IHsgMCB9 IDogdmFsdWVGb3JMZW5ndGgobWFyZ2luTGVmdCwgY29udGFpbmluZ0Jsb2NrV2lkdGgpLAogICAg ICAgICBtYXJnaW5SaWdodC5pc0F1dG8oKSA/IExheW91dFVuaXQgeyAwIH0gOiB2YWx1ZUZvckxl bmd0aChtYXJnaW5SaWdodCwgY29udGFpbmluZ0Jsb2NrV2lkdGgpCiAgICAgfTsKQEAgLTcyNSw3 ICs3MjUsNyBAQCBEaXNwbGF5OjpCb3g6OlZlcnRpY2FsRWRnZXMgRm9ybWF0dGluZ0NvbnRleHQ6 Okdlb21ldHJ5Ojpjb21wdXRlZE5vbkNvbGxhcHNlZFZlcgogICAgIGF1dG8gbWFyZ2luQm90dG9t ID0gc3R5bGUubWFyZ2luQm90dG9tKCk7CiAKICAgICBhdXRvIGNvbnRhaW5pbmdCbG9ja1dpZHRo ID0gbGF5b3V0Q29udGV4dC5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KCpsYXlvdXRCb3guY29udGFp bmluZ0Jsb2NrKCkpLT53aWR0aCgpOwotICAgIHJldHVybiBEaXNwbGF5OjpCb3g6OlZlcnRpY2Fs RWRnZXMgeworICAgIHJldHVybiB7CiAgICAgICAgIG1hcmdpblRvcC5pc0F1dG8oKSA/IExheW91 dFVuaXQgeyAwIH0gOiB2YWx1ZUZvckxlbmd0aChtYXJnaW5Ub3AsIGNvbnRhaW5pbmdCbG9ja1dp ZHRoKSwKICAgICAgICAgbWFyZ2luQm90dG9tLmlzQXV0bygpID8gTGF5b3V0VW5pdCB7IDAgfSA6 IHZhbHVlRm9yTGVuZ3RoKG1hcmdpbkJvdHRvbSwgY29udGFpbmluZ0Jsb2NrV2lkdGgpCiAgICAg fTsK