216153 2020-09-03 16:28:56 -0700 [LFC][IFC] Horizontal alignment should move the inline boxes and not the line box 2020-09-04 05:39:17 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1685485 0 zalan 2020-09-03 16:28:56 -0700 ssia 1685486 1 407928 zalan 2020-09-03 16:38:02 -0700 Created attachment 407928 Patch 1685612 2 ews-feeder 2020-09-04 05:38:18 -0700 Committed r266600: <https://trac.webkit.org/changeset/266600> All reviewed patches have been landed. Closing bug and clearing flags on attachment 407928. 1685613 3 webkit-bug-importer 2020-09-04 05:39:17 -0700 <rdar://problem/68340648> 407928 2020-09-03 16:38:02 -0700 2020-09-04 05:38:19 -0700 Patch bug-216153-20200903163801.patch text/plain 9957 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2NTE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjJjM2UzZmQ2NzQzNTI3 ZWRjODE5OWZjYzA1NjUwMjFmZjM0NTk2My4uMjY2MjY1YTY2YmYzYzhjNGMzOWVkYTRjMjkwZDZj MGU2NzJlNGNjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIwLTA5LTAzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBIb3Jpem9u dGFsIGFsaWdubWVudCBzaG91bGQgbW92ZSB0aGUgaW5saW5lIGJveGVzIGFuZCBub3QgdGhlIGxp bmUgYm94CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MTYxNTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBX aGVuIHRoZSAidGV4dC1hbGlnbiIgcHJvcGVydHkgdHJpZ2dlcnMgaG9yaXpvbnRhbCBhbGlnbm1l bnQsIHRoZSBsaW5lIGNvbnRlbnQgKGlubGluZSBib3hlcyBhbmQgcnVucykgc2hvdWxkCisgICAg ICAgIGJlIG1vdmVkIGhvcml6b250YWxseSB3aGlsZSB0aGUgbGluZSBib3ggc2hvdWxkIHN0YXkg YXQgdGhlIGluaXRpYWwgdG9wL2xlZnQgcG9zaXRpb24uCisgICAgICAgIFRoaXMgcGF0Y2ggaXMg YWxzbyBhIHByZXBhcmF0aW9uIGZvciBtYWtpbmcgdGhlIExpbmVCb3ggbW9yZSBhbGlnbmVkIHdp dGggdGhlIHNwZWMuICAKKworICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGlu ZUZvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5l Rm9ybWF0dGluZ0NvbnRleHQ6OnNldERpc3BsYXlCb3hlc0ZvckxpbmUpOgorICAgICAgICAqIGxh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guY3BwOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjptX2lubGluZUZvcm1hdHRpbmdDb250ZXh0KToKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6TGluZUJveDo6aW5saW5lUmVjdEZvclRleHRSdW4gY29uc3QpOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94Ojpjb25zdHJ1Y3RJbmxpbmVCb3hlcyk6CisgICAgICAg ICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpMaW5lQm94Ojpob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0IGNvbnN0KToK KwogMjAyMC0wOS0wMyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAg IFtMRkNdW0lGQ10gQWRkIHN1cHBvcnQgZm9yIHZlcnRpY2FsLWFsaWduOiB0ZXh0LWJvdHRvbQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l Rm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IDc2ZTc2ZjI0ZWEwMjRlOTk2 OGVlMDk1OWVhZWJmYjU2YjA5MjkwOGIuLmFlYWFiMjdmNzY0MGNiYzUyZDZjMjE5NjkzNDQ5ZTUx NTA3OWY0NDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTU2Miw3 ICs1NjIsMTYgQEAgdm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6c2V0RGlzcGxheUJveGVz Rm9yTGluZShjb25zdCBMaW5lTGF5b3V0Q29udGV4dDo6TGkKICAgICAgICAgfQogICAgIH0KICAg ICAvLyBGSVhNRTogVGhpcyBpcyB3aGVyZSB0aGUgbG9naWNhbCB0byBwaHlzaWNhbCB0cmFuc2xh dGUgc2hvdWxkIGhhcHBlbi4KLSAgICBpbmxpbmVDb250ZW50LmxpbmVCb3hlcy5hcHBlbmQoeyBs aW5lQm94LmxvZ2ljYWxSZWN0KCksIGxpbmVCb3guc2Nyb2xsYWJsZU92ZXJmbG93KCksIGxpbmVJ bmtPdmVyZmxvdywgbGluZUJveC5hbGlnbm1lbnRCYXNlbGluZSgpIH0pOworICAgIGF1dG8gY29u c3RydWN0RGlzcGxheUxpbmUgPSBbJl0geworICAgICAgICAvLyBGSVhNRTogTGF5b3V0OjpMaW5l Qm94IHNob3VsZCBjb250YWluIGFsbCBpbmxpbmUgYm94ZXMgYW5kIGl0IHNob3VsZCBub3QgaGF2 ZSBuZWl0aGVyIHRvcC9sZWZ0IGdlb21ldHJ5IG5vciBvdmVyZmxvdy4gCisgICAgICAgIGF1dG8g bGluZVJlY3QgPSBsaW5lQm94LmxvZ2ljYWxSZWN0KCk7CisgICAgICAgIGlmIChhdXRvIGhvcml6 b250YWxBbGlnbm1lbnRPZmZzZXQgPSBsaW5lQm94Lmhvcml6b250YWxBbGlnbm1lbnRPZmZzZXQo KSkgeworICAgICAgICAgICAgLy8gUGFpbnRpbmcgY29kZSAoc3BlY2lmaWNhbGx5IFRleHRSdW4n cyB4UG9zKSBuZWVkcyB0aGUgYWxpZ25lZCBvZmZzZXQgdG8gYmUgYWJsZSB0byBjb21wdXRlIHRh YiBwb3NpdGlvbnMuCisgICAgICAgICAgICBsaW5lUmVjdC5tb3ZlSG9yaXpvbnRhbGx5KCpob3Jp em9udGFsQWxpZ25tZW50T2Zmc2V0KTsKKyAgICAgICAgfQorICAgICAgICBpbmxpbmVDb250ZW50 LmxpbmVCb3hlcy5hcHBlbmQoeyBsaW5lUmVjdCwgbGluZUJveC5zY3JvbGxhYmxlT3ZlcmZsb3co KSwgbGluZUlua092ZXJmbG93LCBsaW5lQm94LmFsaWdubWVudEJhc2VsaW5lKCkgfSk7CisgICAg fTsKKyAgICBjb25zdHJ1Y3REaXNwbGF5TGluZSgpOwogfQogCiB2b2lkIElubGluZUZvcm1hdHRp bmdDb250ZXh0OjppbnZhbGlkYXRlRm9ybWF0dGluZ1N0YXRlKGNvbnN0IEludmFsaWRhdGlvblN0 YXRlJikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUxpbmVCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lTGluZUJveC5jcHAKaW5kZXggNjJjZGI3ODM4MzY4NDRlMGY2YmQ2NTAzN2MwMzk5 YWQ3OTc3OTBhMy4uMWVhN2UxYmYyMzk0ZmUxZjc3NTgxYmZjOWY0ZTk3ZmI4NDVhYTQ4ZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGlu ZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lTGluZUJveC5jcHAKQEAgLTE0OCwxMSArMTQ4LDcgQEAgTGluZUJveDo6TGluZUJveChjb25z dCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgaW5saW5lRm9ybWF0dGluZ0NvbnRleHQsIGNvbnN0 IEkKICAgICAsIG1fY29udGVudExvZ2ljYWxXaWR0aChjb250ZW50TG9naWNhbFdpZHRoKQogICAg ICwgbV9pbmxpbmVGb3JtYXR0aW5nQ29udGV4dChpbmxpbmVGb3JtYXR0aW5nQ29udGV4dCkKIHsK LSAgICBtX2xpbmVBbGlnbm1lbnRPZmZzZXQgPSBob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0KHJ1 bnMsIHJvb3QoKS5zdHlsZSgpLnRleHRBbGlnbigpLCBsb2dpY2FsV2lkdGgsIGNvbnRlbnRMb2dp Y2FsV2lkdGgsIGlzTGFzdExpbmVXaXRoSW5saW5lQ29udGVudCk7Ci0gICAgaWYgKG1fbGluZUFs aWdubWVudE9mZnNldCkgewotICAgICAgICAvLyBGSVhNRTogbGluZSBib3ggc2hvdWxkIG5vdCBu ZWVkIHRvIGJlIG1vdmVkLCBvbmx5IHRoZSBpbmxpbmUgYm94ZXMuCi0gICAgICAgIG1fcmVjdC5t b3ZlSG9yaXpvbnRhbGx5KCptX2xpbmVBbGlnbm1lbnRPZmZzZXQpOwotICAgIH0KKyAgICBtX2hv cml6b250YWxBbGlnbm1lbnRPZmZzZXQgPSBMYXlvdXQ6Omhvcml6b250YWxBbGlnbm1lbnRPZmZz ZXQocnVucywgcm9vdCgpLnN0eWxlKCkudGV4dEFsaWduKCksIGxvZ2ljYWxXaWR0aCwgY29udGVu dExvZ2ljYWxXaWR0aCwgaXNMYXN0TGluZVdpdGhJbmxpbmVDb250ZW50KTsKICAgICBjb25zdHJ1 Y3RJbmxpbmVCb3hlcyhydW5zLCBpc0xpbmVWaXN1YWxseUVtcHR5KTsKICAgICBjb21wdXRlSW5s aW5lQm94ZXNMb2dpY2FsSGVpZ2h0KCk7CiAgICAgYWxpZ25JbmxpbmVCb3hlc1ZlcnRpY2FsbHlB bmRDb21wdXRlTGluZUJveEhlaWdodChpc0xpbmVWaXN1YWxseUVtcHR5KTsKQEAgLTE2OSw3ICsx NjUsNyBAQCBEaXNwbGF5OjpJbmxpbmVSZWN0IExpbmVCb3g6OmlubGluZVJlY3RGb3JUZXh0UnVu KGNvbnN0IExpbmVCdWlsZGVyOjpSdW4mIHJ1bikgYwogICAgIEFTU0VSVChydW4uaXNUZXh0KCkg fHwgcnVuLmlzTGluZUJyZWFrKCkpOwogICAgIGF1dG8mIHBhcmVudElubGluZUJveCA9IGlubGlu ZUJveEZvckxheW91dEJveChydW4ubGF5b3V0Qm94KCkucGFyZW50KCkpOwogICAgIGF1dG8gaW5s aW5lQm94UmVjdCA9IHBhcmVudElubGluZUJveC5sb2dpY2FsUmVjdCgpOwotICAgIHJldHVybiB7 IGlubGluZUJveFJlY3QudG9wKCksIHJ1bi5sb2dpY2FsTGVmdCgpLCBydW4ubG9naWNhbFdpZHRo KCksIGlubGluZUJveFJlY3QuaGVpZ2h0KCkgfTsKKyAgICByZXR1cm4geyBpbmxpbmVCb3hSZWN0 LnRvcCgpLCBtX2hvcml6b250YWxBbGlnbm1lbnRPZmZzZXQudmFsdWVPcihJbmxpbmVMYXlvdXRV bml0IHsgfSkgKyBydW4ubG9naWNhbExlZnQoKSwgcnVuLmxvZ2ljYWxXaWR0aCgpLCBpbmxpbmVC b3hSZWN0LmhlaWdodCgpIH07CiB9CiAKIHZvaWQgTGluZUJveDo6Y29uc3RydWN0SW5saW5lQm94 ZXMoY29uc3QgTGluZUJ1aWxkZXI6OlJ1bkxpc3QmIHJ1bnMsIElzTGluZVZpc3VhbGx5RW1wdHkg aXNMaW5lVmlzdWFsbHlFbXB0eSkKQEAgLTE3Nyw3ICsxNzMsNyBAQCB2b2lkIExpbmVCb3g6OmNv bnN0cnVjdElubGluZUJveGVzKGNvbnN0IExpbmVCdWlsZGVyOjpSdW5MaXN0JiBydW5zLCBJc0xp bmVWaXN1YQogICAgIGF1dG8gY29uc3RydWN0Um9vdElubGluZUJveCA9IFsmXSB7CiAgICAgICAg IGF1dG8mIGZvbnRNZXRyaWNzID0gcm9vdCgpLnN0eWxlKCkuZm9udE1ldHJpY3MoKTsKICAgICAg ICAgSW5saW5lTGF5b3V0VW5pdCByb290SW5saW5lQm94SGVpZ2h0ID0gZm9udE1ldHJpY3MuaGVp Z2h0KCk7Ci0gICAgICAgIGF1dG8gcm9vdElubGluZUJveFJlY3QgPSBEaXNwbGF5OjpJbmxpbmVS ZWN0IHsgeyB9LCB7IH0sIGNvbnRlbnRMb2dpY2FsV2lkdGgoKSwgcm9vdElubGluZUJveEhlaWdo dCB9OworICAgICAgICBhdXRvIHJvb3RJbmxpbmVCb3hSZWN0ID0gRGlzcGxheTo6SW5saW5lUmVj dCB7IHsgfSwgbV9ob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0LnZhbHVlT3IoSW5saW5lTGF5b3V0 VW5pdCB7IH0pLCBjb250ZW50TG9naWNhbFdpZHRoKCksIHJvb3RJbmxpbmVCb3hIZWlnaHQgfTsK ICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCByb290SW5saW5lQm94QmFzZWxpbmUgPSBmb250TWV0 cmljcy5hc2NlbnQoKTsKICAgICAgICAgYXV0byByb290SW5saW5lQm94RGVzY2VudCA9IHJvb3RJ bmxpbmVCb3hIZWlnaHQgLSByb290SW5saW5lQm94QmFzZWxpbmU7CiAgICAgICAgIGF1dG8gbGlu ZUhhc0ltYWdpbmFyeVN0cnV0ID0gIWxheW91dFN0YXRlKCkuaW5RdWlya3NNb2RlKCk7CkBAIC0x OTIsNiArMTg4LDcgQEAgdm9pZCBMaW5lQm94Ojpjb25zdHJ1Y3RJbmxpbmVCb3hlcyhjb25zdCBM aW5lQnVpbGRlcjo6UnVuTGlzdCYgcnVucywgSXNMaW5lVmlzdWEKICAgICAgICAgYXV0byYgbGF5 b3V0Qm94ID0gcnVuLmxheW91dEJveCgpOwogICAgICAgICBpZiAocnVuLmlzQm94KCkpIHsKICAg ICAgICAgICAgIGF1dG8mIGJveEdlb21ldHJ5ID0gZm9ybWF0dGluZ0NvbnRleHQoKS5nZW9tZXRy eUZvckJveChsYXlvdXRCb3gpOworICAgICAgICAgICAgYXV0byBpbmxpbmVCb3hMb2dpY2FsTGVm dCA9IG1faG9yaXpvbnRhbEFsaWdubWVudE9mZnNldC52YWx1ZU9yKElubGluZUxheW91dFVuaXQg eyB9KSArIHJ1bi5sb2dpY2FsTGVmdCgpOwogICAgICAgICAgICAgaWYgKGxheW91dEJveC5pc0lu bGluZUJsb2NrQm94KCkgJiYgbGF5b3V0Qm94LmVzdGFibGlzaGVzSW5saW5lRm9ybWF0dGluZ0Nv bnRleHQoKSkgewogICAgICAgICAgICAgICAgIGF1dG8mIGZvcm1hdHRpbmdTdGF0ZSA9IGxheW91 dFN0YXRlKCkuZXN0YWJsaXNoZWRJbmxpbmVGb3JtYXR0aW5nU3RhdGUoZG93bmNhc3Q8Q29udGFp bmVyQm94PihsYXlvdXRCb3gpKTsKICAgICAgICAgICAgICAgICAvLyBTcGVjIG1ha2VzIHVzIGdl bmVyYXRlIGF0IGxlYXN0IG9uZSBsaW5lIC1ldmVuIGlmIGl0IGlzIGVtcHR5LgpAQCAtMjEwLDI0 ICsyMDcsMjUgQEAgdm9pZCBMaW5lQm94Ojpjb25zdHJ1Y3RJbmxpbmVCb3hlcyhjb25zdCBMaW5l QnVpbGRlcjo6UnVuTGlzdCYgcnVucywgSXNMaW5lVmlzdWEKICAgICAgICAgICAgICAgICAvLyAg ICAgLS0tLS18LXwtfC0tLS0tLS0tLS0gPC0gYmFzZWxpbmUKICAgICAgICAgICAgICAgICAvLwog ICAgICAgICAgICAgICAgIGF1dG8gYWRqdXN0ZWRCYXNlbGluZSA9IGJveEdlb21ldHJ5Lm1hcmdp bkJlZm9yZSgpICsgYm94R2VvbWV0cnkuYm9yZGVyVG9wKCkgKyBib3hHZW9tZXRyeS5wYWRkaW5n VG9wKCkudmFsdWVPcigwKSArIGlubGluZUJsb2NrQmFzZWxpbmU7Ci0gICAgICAgICAgICAgICAg YXV0byBpbmxpbmVCb3hSZWN0ID0gRGlzcGxheTo6SW5saW5lUmVjdCB7IHsgfSwgcnVuLmxvZ2lj YWxMZWZ0KCksIHJ1bi5sb2dpY2FsV2lkdGgoKSwgYm94R2VvbWV0cnkubWFyZ2luQm94SGVpZ2h0 KCkgfTsKKyAgICAgICAgICAgICAgICBhdXRvIGlubGluZUJveFJlY3QgPSBEaXNwbGF5OjpJbmxp bmVSZWN0IHsgeyB9LCBpbmxpbmVCb3hMb2dpY2FsTGVmdCwgcnVuLmxvZ2ljYWxXaWR0aCgpLCBi b3hHZW9tZXRyeS5tYXJnaW5Cb3hIZWlnaHQoKSB9OwogICAgICAgICAgICAgICAgIGF1dG8gaW5s aW5lQm94ID0gbWFrZVVuaXF1ZTxJbmxpbmVCb3g+KGxheW91dEJveCwgaW5saW5lQm94UmVjdCwg YWRqdXN0ZWRCYXNlbGluZSwgSW5saW5lTGF5b3V0VW5pdCB7IH0sIElubGluZUJveDo6SXNDb25z aWRlcmVkRW1wdHk6Ok5vKTsKICAgICAgICAgICAgICAgICBtX2lubGluZUJveFJlY3RNYXAuc2V0 KCZsYXlvdXRCb3gsIGlubGluZUJveC5nZXQoKSk7CiAgICAgICAgICAgICAgICAgbV9pbmxpbmVC b3hMaXN0LmFwcGVuZChXVEZNb3ZlKGlubGluZUJveCkpOwogICAgICAgICAgICAgfSBlbHNlIHsK ICAgICAgICAgICAgICAgICBhdXRvIHJ1bkhlaWdodCA9IGJveEdlb21ldHJ5Lm1hcmdpbkJveEhl aWdodCgpOwotICAgICAgICAgICAgICAgIGF1dG8gaW5saW5lQm94UmVjdCA9IERpc3BsYXk6Oklu bGluZVJlY3QgeyB7IH0sIHJ1bi5sb2dpY2FsTGVmdCgpLCBydW4ubG9naWNhbFdpZHRoKCksIHJ1 bkhlaWdodCB9OworICAgICAgICAgICAgICAgIGF1dG8gaW5saW5lQm94UmVjdCA9IERpc3BsYXk6 OklubGluZVJlY3QgeyB7IH0sIGlubGluZUJveExvZ2ljYWxMZWZ0LCBydW4ubG9naWNhbFdpZHRo KCksIHJ1bkhlaWdodCB9OwogICAgICAgICAgICAgICAgIGF1dG8gaW5saW5lQm94ID0gbWFrZVVu aXF1ZTxJbmxpbmVCb3g+KGxheW91dEJveCwgaW5saW5lQm94UmVjdCwgcnVuSGVpZ2h0LCBJbmxp bmVMYXlvdXRVbml0IHsgfSwgSW5saW5lQm94OjpJc0NvbnNpZGVyZWRFbXB0eTo6Tm8pOwogICAg ICAgICAgICAgICAgIG1faW5saW5lQm94UmVjdE1hcC5zZXQoJmxheW91dEJveCwgaW5saW5lQm94 LmdldCgpKTsKICAgICAgICAgICAgICAgICBtX2lubGluZUJveExpc3QuYXBwZW5kKFdURk1vdmUo aW5saW5lQm94KSk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0gZWxzZSBpZiAocnVuLmlzQ29u dGFpbmVyU3RhcnQoKSkgewogICAgICAgICAgICAgYXV0byBpbml0aWFsV2lkdGggPSBjb250ZW50 TG9naWNhbFdpZHRoKCkgLSBydW4ubG9naWNhbExlZnQoKTsKKyAgICAgICAgICAgIGF1dG8gaW5s aW5lQm94TG9naWNhbExlZnQgPSBtX2hvcml6b250YWxBbGlnbm1lbnRPZmZzZXQudmFsdWVPcihJ bmxpbmVMYXlvdXRVbml0IHsgfSkgKyBydW4ubG9naWNhbExlZnQoKTsKICAgICAgICAgICAgIEFT U0VSVChpbml0aWFsV2lkdGggPj0gMCk7CiAgICAgICAgICAgICBhdXRvJiBmb250TWV0cmljcyA9 IGxheW91dEJveC5zdHlsZSgpLmZvbnRNZXRyaWNzKCk7CiAgICAgICAgICAgICBJbmxpbmVMYXlv dXRVbml0IGxvZ2ljYWxIZWlnaHQgPSBmb250TWV0cmljcy5oZWlnaHQoKTsKICAgICAgICAgICAg IElubGluZUxheW91dFVuaXQgYmFzZWxpbmUgPSBmb250TWV0cmljcy5hc2NlbnQoKTsKLSAgICAg ICAgICAgIGF1dG8gaW5saW5lQm94UmVjdCA9IERpc3BsYXk6OklubGluZVJlY3QgeyB7IH0sIHJ1 bi5sb2dpY2FsTGVmdCgpLCBpbml0aWFsV2lkdGgsIGxvZ2ljYWxIZWlnaHQgfTsKKyAgICAgICAg ICAgIGF1dG8gaW5saW5lQm94UmVjdCA9IERpc3BsYXk6OklubGluZVJlY3QgeyB7IH0sIGlubGlu ZUJveExvZ2ljYWxMZWZ0LCBpbml0aWFsV2lkdGgsIGxvZ2ljYWxIZWlnaHQgfTsKICAgICAgICAg ICAgIGF1dG8gaW5saW5lQm94ID0gbWFrZVVuaXF1ZTxJbmxpbmVCb3g+KGxheW91dEJveCwgaW5s aW5lQm94UmVjdCwgYmFzZWxpbmUsIGxvZ2ljYWxIZWlnaHQgLSBiYXNlbGluZSwgSW5saW5lQm94 OjpJc0NvbnNpZGVyZWRFbXB0eTo6WWVzKTsKICAgICAgICAgICAgIG1faW5saW5lQm94UmVjdE1h cC5zZXQoJmxheW91dEJveCwgaW5saW5lQm94LmdldCgpKTsKICAgICAgICAgICAgIG1faW5saW5l Qm94TGlzdC5hcHBlbmQoV1RGTW92ZShpbmxpbmVCb3gpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guaCBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guaAppbmRleCBhNWJk MzUwNDMwZDBlNjJmOGQ3N2E4MWM2ZjBiNjBiMTI3ZTU4MDFkLi44MjU4MDc1YjczODhmZTY2OGI5 MDI1Nzg0MTZjMzcyOTE2ZWQ0YzMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oCkBAIC05Miw2ICs5Miw4IEBAIHB1 YmxpYzoKICAgICBjb25zdCBEaXNwbGF5OjpJbmxpbmVSZWN0JiBsb2dpY2FsUmVjdCgpIGNvbnN0 IHsgcmV0dXJuIG1fcmVjdDsgfQogICAgIGNvbnN0IERpc3BsYXk6OklubGluZVJlY3QmIHNjcm9s bGFibGVPdmVyZmxvdygpIGNvbnN0IHsgcmV0dXJuIG1fc2Nyb2xsYWJsZU92ZXJmbG93OyB9CiAK KyAgICBPcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiBob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0 KCkgY29uc3QgeyByZXR1cm4gbV9ob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0OyB9CisKICAgICBj b25zdCBJbmxpbmVCb3gmIGlubGluZUJveEZvckxheW91dEJveChjb25zdCBCb3gmIGxheW91dEJv eCkgY29uc3QgeyByZXR1cm4gKm1faW5saW5lQm94UmVjdE1hcC5nZXQoJmxheW91dEJveCk7IH0K ICAgICBEaXNwbGF5OjpJbmxpbmVSZWN0IGlubGluZVJlY3RGb3JUZXh0UnVuKGNvbnN0IExpbmVC dWlsZGVyOjpSdW4mKSBjb25zdDsKIApAQCAtMTMyLDcgKzEzNCw3IEBAIHByaXZhdGU6CiAKICAg ICBJbmxpbmVCb3ggbV9yb290SW5saW5lQm94OwogCi0gICAgT3B0aW9uYWw8SW5saW5lTGF5b3V0 VW5pdD4gbV9saW5lQWxpZ25tZW50T2Zmc2V0OworICAgIE9wdGlvbmFsPElubGluZUxheW91dFVu aXQ+IG1faG9yaXpvbnRhbEFsaWdubWVudE9mZnNldDsKICAgICBIYXNoTWFwPGNvbnN0IEJveCos IElubGluZUJveCo+IG1faW5saW5lQm94UmVjdE1hcDsKICAgICBWZWN0b3I8c3RkOjp1bmlxdWVf cHRyPElubGluZUJveD4+IG1faW5saW5lQm94TGlzdDsKICAgICBjb25zdCBJbmxpbmVGb3JtYXR0 aW5nQ29udGV4dCYgbV9pbmxpbmVGb3JtYXR0aW5nQ29udGV4dDsK