222521 2021-02-27 16:00:01 -0800 [LFC][IFC] LineBox's horizontalAlignmentOffset is the root inline box's logical left 2021-02-28 11:59:13 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham sam simon.fraser webkit-bug-importer zalan oldest_to_newest 1734242 0 zalan 2021-02-27 16:00:01 -0800 that's where the line content starts 1734243 1 421762 zalan 2021-02-27 16:02:38 -0800 Created attachment 421762 Patch 1734286 2 421777 zalan 2021-02-28 10:16:51 -0800 Created attachment 421777 Patch 1734291 3 ews-feeder 2021-02-28 11:58:29 -0800 Committed r273638: <https://commits.webkit.org/r273638> All reviewed patches have been landed. Closing bug and clearing flags on attachment 421777. 1734292 4 webkit-bug-importer 2021-02-28 11:59:13 -0800 <rdar://problem/74841426> 421762 2021-02-27 16:02:38 -0800 2021-02-28 10:16:49 -0800 Patch bug-222521-20210227160237.patch text/plain 7864 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjczNTk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2Q4MzExZDE2Y2M2ODEz MzVlMzY5N2M0NzVjZWJhMmUxYTkxNjIyZC4uYWI1ZmQ0Y2UzZjg5ODQzZjQ4OTQyNTljNDhkZDdk YzYzMTMzZGI1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIxLTAyLTI3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBMaW5lQm94 J3MgaG9yaXpvbnRhbEFsaWdubWVudE9mZnNldCBpcyB0aGUgcm9vdCBpbmxpbmUgYm94J3MgbG9n aWNhbCBsZWZ0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMjI1MjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBUaGF0J3Mgd2hlcmUgdGhlIGxpbmUgY29udGVudCBzdGFydHMuCisKKyAgICAgICAgKiBsYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlR2VvbWV0 cnlGb3JMaW5lQ29udGVudCk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OkxpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJbmxpbmVMZXZlbEJveGVzKToKKyAgICAgICAg KiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkxheW91dDo6bV9jb250ZW50TG9naWNhbFdpZHRoKToKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6TGluZUJveDo6bG9naWNhbFJlY3RGb3JUZXh0UnVuIGNvbnN0KToKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6bV9ob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0KTogRGVsZXRlZC4K KyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94Lmg6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OnNldExvZ2ljYWxIZWlnaHQpOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94Ojpob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0IGNv bnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveDo6c2V0SG9y aXpvbnRhbEFsaWdubWVudE9mZnNldCk6IERlbGV0ZWQuCisKIDIwMjEtMDItMjcgIFphbGFuIEJ1 anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIEV2ZXJ5IGxpbmUg Ym94IG11c3QgaGF2ZSBhIHJvb3QgaW5saW5lIGJveApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0Nv bnRleHQuY3BwCmluZGV4IDQyNDBhMDRkOWE0NjA3OWE3ZmE0MDQ0NjNlNzg5YmJiMDI0NmU4OTIu LjdjZDM5ODU5MWQyN2Y4OWNkMDQyOWRhMmU5YmNkYTY3MTE3ODZkZTcgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250 ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTU4NSw3ICs1ODUsNyBAQCBJbmxpbmVSZWN0IElu bGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlR2VvbWV0cnlGb3JMaW5lQ29udGVudChjb25z dCBMaW5lQnVpbAogICAgIHVwZGF0ZUJveEdlb21ldHJ5Rm9ySW5saW5lQm94ZXMoKTsKIAogICAg IGF1dG8gY29uc3RydWN0TGluZUdlb21ldHJ5ID0gWyZdIHsKLSAgICAgICAgZm9ybWF0dGluZ1N0 YXRlLmFkZExpbmUoeyBsaW5lQm94TG9naWNhbFJlY3QsIGVuY2xvc2luZ1RvcEFuZEJvdHRvbSwg bGluZUJveC5hbGlnbm1lbnRCYXNlbGluZSgpLCBsaW5lQm94Lmhvcml6b250YWxBbGlnbm1lbnRP ZmZzZXQoKS52YWx1ZU9yKElubGluZUxheW91dFVuaXQgeyB9KSwgbGluZUNvbnRlbnQuY29udGVu dExvZ2ljYWxXaWR0aCB9KTsKKyAgICAgICAgZm9ybWF0dGluZ1N0YXRlLmFkZExpbmUoeyBsaW5l Qm94TG9naWNhbFJlY3QsIGVuY2xvc2luZ1RvcEFuZEJvdHRvbSwgbGluZUJveC5hbGlnbm1lbnRC YXNlbGluZSgpLCByb290SW5saW5lQm94TG9naWNhbFJlY3QubGVmdCgpLCBsaW5lQ29udGVudC5j b250ZW50TG9naWNhbFdpZHRoIH0pOwogICAgIH07CiAgICAgY29uc3RydWN0TGluZUdlb21ldHJ5 KCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAK aW5kZXggMjIyYjVjNjBjZTQ1MzFmY2RiYTIyMDE0NzViNjNjOGYyMDJlOThlOC4uZDZkMTJmYThk OWMwNDFlOTE0Yzc2ZDgyZmViMGJhNmZhYmQ2NjdmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRy eS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l Rm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKQEAgLTIwMiw3ICsyMDIsNiBAQCB2b2lkIExp bmVCb3hCdWlsZGVyOjpzZXRWZXJ0aWNhbEdlb21ldHJ5Rm9ySW5saW5lQm94KExpbmVCb3g6Oklu bGluZUxldmVsQm94JiBpbgogCiB2b2lkIExpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJbmxpbmVM ZXZlbEJveGVzKExpbmVCb3gmIGxpbmVCb3gsIGNvbnN0IExpbmU6OlJ1bkxpc3QmIHJ1bnMpCiB7 Ci0gICAgYXV0byBob3Jpem9udGFsQWxpZ21lbnRPZmZzZXQgPSBsaW5lQm94Lmhvcml6b250YWxB bGlnbm1lbnRPZmZzZXQoKS52YWx1ZU9yKElubGluZUxheW91dFVuaXQgeyB9KTsKICAgICBzdHJ1 Y3QgU2ltcGxpZmllZFZlcnRpY2FsQWxpZ25tZW50IHsKICAgICAgICAgSW5saW5lTGF5b3V0VW5p dCBsaW5lQm94VG9wIHsgMCB9OwogICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGxpbmVCb3hCb3R0 b20geyAwIH07CkBAIC0yNDEsNyArMjQwLDcgQEAgdm9pZCBMaW5lQm94QnVpbGRlcjo6Y29uc3Ry dWN0SW5saW5lTGV2ZWxCb3hlcyhMaW5lQm94JiBsaW5lQm94LCBjb25zdCBMaW5lOjpSdW4KICAg ICAgICAgfQogICAgICAgICAvLyBDb25zdHJ1Y3QgdGhlIG1pc3NpbmcgTGluZUJveDo6SW5saW5l Qm94ZXMgc3RhcnRpbmcgd2l0aCB0aGUgdG9wbW9zdCBsYXlvdXQgYm94LgogICAgICAgICBmb3Ig KGF1dG8qIGxheW91dEJveCA6IFdURjo6bWFrZVJldmVyc2VkUmFuZ2UobGF5b3V0Qm94ZXNXaXRo b3V0SW5saW5lQm94ZXMpKSB7Ci0gICAgICAgICAgICBhdXRvIGlubGluZUJveCA9IExpbmVCb3g6 OklubGluZUxldmVsQm94OjpjcmVhdGVJbmxpbmVCb3goKmxheW91dEJveCwgaG9yaXpvbnRhbEFs aWdtZW50T2Zmc2V0LCBsaW5lQm94LmNvbnRlbnRMb2dpY2FsV2lkdGgoKSk7CisgICAgICAgICAg ICBhdXRvIGlubGluZUJveCA9IExpbmVCb3g6OklubGluZUxldmVsQm94OjpjcmVhdGVJbmxpbmVC b3goKmxheW91dEJveCwgcm9vdElubGluZUJveC5sb2dpY2FsTGVmdCgpLCBsaW5lQm94LmNvbnRl bnRMb2dpY2FsV2lkdGgoKSk7CiAgICAgICAgICAgICBzZXRWZXJ0aWNhbEdlb21ldHJ5Rm9ySW5s aW5lQm94KCppbmxpbmVCb3gpOwogICAgICAgICAgICAgbGluZUJveC5hZGRJbmxpbmVMZXZlbEJv eChXVEZNb3ZlKGlubGluZUJveCkpOwogICAgICAgICB9CkBAIC0yNjgsNyArMjY3LDcgQEAgdm9p ZCBMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyhMaW5lQm94JiBsaW5l Qm94LCBjb25zdCBMaW5lOjpSdW4KICAgICAgICAgfTsKICAgICAgICAgbGluZUhhc0NvbnRlbnQg PSBsaW5lSGFzQ29udGVudCB8fCBydW5IYXNDb250ZW50KCk7CiAKLSAgICAgICAgYXV0byBsb2dp Y2FsTGVmdCA9IGhvcml6b250YWxBbGlnbWVudE9mZnNldCArIHJ1bi5sb2dpY2FsTGVmdCgpOwor ICAgICAgICBhdXRvIGxvZ2ljYWxMZWZ0ID0gcm9vdElubGluZUJveC5sb2dpY2FsTGVmdCgpICsg cnVuLmxvZ2ljYWxMZWZ0KCk7CiAgICAgICAgIGlmIChydW4uaXNCb3goKSkgewogICAgICAgICAg ICAgYXV0byYgaW5saW5lTGV2ZWxCb3hHZW9tZXRyeSA9IGZvcm1hdHRpbmdDb250ZXh0KCkuZ2Vv bWV0cnlGb3JCb3gobGF5b3V0Qm94KTsKICAgICAgICAgICAgIGF1dG8gbWFyZ2luQm94SGVpZ2h0 ID0gaW5saW5lTGV2ZWxCb3hHZW9tZXRyeS5tYXJnaW5Cb3hIZWlnaHQoKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guY3Bw IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5j cHAKaW5kZXggYjRkYTMyNzdlZTkyYjYxMzg4NjQwMDNkNTI1YTA2YTZmZmVkNDY1YS4uYmMyYjQx ZDdhNzEyNjliNGMxZjY4MzI1NTUxOTA0ZWY1YjFmNWQ1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5jcHAKQEAg LTg2LDcgKzg2LDYgQEAgYm9vbCBMaW5lQm94OjpJbmxpbmVMZXZlbEJveDo6aGFzTGluZUJveFJl bGF0aXZlQWxpZ25tZW50KCkgY29uc3QKIExpbmVCb3g6OkxpbmVCb3goY29uc3QgQm94JiByb290 TGF5b3V0Qm94LCBjb25zdCBJbmxpbmVMYXlvdXRQb2ludCYgbG9naWNhbFRvcGxlZnQsIElubGlu ZUxheW91dFVuaXQgbGluZUxvZ2ljYWxXaWR0aCwgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9n aWNhbFdpZHRoLCBPcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiBob3Jpem9udGFsQWxpZ25tZW50 T2Zmc2V0LCBzaXplX3QgbnVtYmVyT2ZSdW5zKQogICAgIDogbV9sb2dpY2FsUmVjdChsb2dpY2Fs VG9wbGVmdCwgSW5saW5lTGF5b3V0U2l6ZSB7IGxpbmVMb2dpY2FsV2lkdGgsIHsgfSB9KQogICAg ICwgbV9jb250ZW50TG9naWNhbFdpZHRoKGNvbnRlbnRMb2dpY2FsV2lkdGgpCi0gICAgLCBtX2hv cml6b250YWxBbGlnbm1lbnRPZmZzZXQoaG9yaXpvbnRhbEFsaWdubWVudE9mZnNldCkKIHsKICAg ICBtX3Jvb3RJbmxpbmVCb3ggPSBtYWtlVW5pcXVlPExpbmVCb3g6OklubGluZUxldmVsQm94Pihy b290TGF5b3V0Qm94LCBob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0LnZhbHVlT3IoSW5saW5lTGF5 b3V0VW5pdCB7IH0pLCBJbmxpbmVMYXlvdXRTaXplIHsgY29udGVudExvZ2ljYWxXaWR0aCwgeyB9 IH0sIElubGluZUxldmVsQm94OjpUeXBlOjpSb290SW5saW5lQm94KTsKICAgICBtX25vblJvb3RJ bmxpbmVMZXZlbEJveExpc3QucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShudW1iZXJPZlJ1bnMpOwpA QCAtMTE1LDcgKzExNCw3IEBAIElubGluZVJlY3QgTGluZUJveDo6bG9naWNhbFJlY3RGb3JUZXh0 UnVuKGNvbnN0IExpbmU6OlJ1biYgcnVuKSBjb25zdAogICAgICAgICBydW5sb2dpY2FsVG9wICs9 IHBhcmVudElubGluZUJveC0+bG9naWNhbFRvcCgpOwogICAgIH0KICAgICBJbmxpbmVMYXlvdXRV bml0IGxvZ2ljYWxIZWlnaHQgPSBmb250TWV0cmljcy5oZWlnaHQoKTsKLSAgICByZXR1cm4geyBy dW5sb2dpY2FsVG9wLCBtX2hvcml6b250YWxBbGlnbm1lbnRPZmZzZXQudmFsdWVPcihJbmxpbmVM YXlvdXRVbml0IHsgfSkgKyBydW4ubG9naWNhbExlZnQoKSwgcnVuLmxvZ2ljYWxXaWR0aCgpLCBs b2dpY2FsSGVpZ2h0IH07CisgICAgcmV0dXJuIHsgcnVubG9naWNhbFRvcCwgbV9yb290SW5saW5l Qm94LT5sb2dpY2FsTGVmdCgpICsgcnVuLmxvZ2ljYWxMZWZ0KCksIHJ1bi5sb2dpY2FsV2lkdGgo KSwgbG9naWNhbEhlaWdodCB9OwogfQogCiBJbmxpbmVSZWN0IExpbmVCb3g6OmxvZ2ljYWxSZWN0 Rm9yTGluZUJyZWFrQm94KGNvbnN0IEJveCYgbGF5b3V0Qm94KSBjb25zdApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oCmlu ZGV4IGU2MWJmM2E4NzY1NjgzMjg3YmE3N2VlZGZiNmE4YWU4YmFlMDlkMjYuLjA2ODNlYzY2YmJh M2Q2NTYzODExMmQxMjYzYWE1NTAxMGJhODdhZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmgKQEAgLTEzOSw4ICsx MzksNiBAQCBwdWJsaWM6CiAgICAgSW5saW5lTGF5b3V0U2l6ZSBsb2dpY2FsU2l6ZSgpIGNvbnN0 IHsgcmV0dXJuIGxvZ2ljYWxSZWN0KCkuc2l6ZSgpOyB9CiAgICAgSW5saW5lTGF5b3V0VW5pdCBj b250ZW50TG9naWNhbFdpZHRoKCkgY29uc3QgeyByZXR1cm4gbV9jb250ZW50TG9naWNhbFdpZHRo OyB9CiAKLSAgICBPcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiBob3Jpem9udGFsQWxpZ25tZW50 T2Zmc2V0KCkgY29uc3QgeyByZXR1cm4gbV9ob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0OyB9Ci0K ICAgICAvLyBOb3RlIHRoYXQgdGhlIGxpbmUgY2FuIGhhdmUgbWFueSBpbmxpbmUgYm94ZXMgYW5k IGJlICJlbXB0eSIgdGhlIHNhbWUgdGltZSBlLmcuIDxkaXY+PHNwYW4+PC9zcGFuPjxzcGFuPjwv c3Bhbj48L2Rpdj4KICAgICBib29sIGhhc0NvbnRlbnQoKSBjb25zdCB7IHJldHVybiBtX2hhc0Nv bnRlbnQ7IH0KICAgICBib29sIGhhc0lubGluZUJveCgpIGNvbnN0IHsgcmV0dXJuIG1fYm94VHlw ZXMuY29udGFpbnMoSW5saW5lTGV2ZWxCb3g6OlR5cGU6OklubGluZUJveCk7IH0KQEAgLTE2NSw3 ICsxNjMsNiBAQCBwcml2YXRlOgogICAgIGZyaWVuZCBjbGFzcyBMaW5lQm94QnVpbGRlcjsKIAog ICAgIHZvaWQgc2V0TG9naWNhbEhlaWdodChJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQp IHsgbV9sb2dpY2FsUmVjdC5zZXRIZWlnaHQobG9naWNhbEhlaWdodCk7IH0KLSAgICB2b2lkIHNl dEhvcml6b250YWxBbGlnbm1lbnRPZmZzZXQoSW5saW5lTGF5b3V0VW5pdCBob3Jpem9udGFsQWxp Z25tZW50T2Zmc2V0KSB7IG1faG9yaXpvbnRhbEFsaWdubWVudE9mZnNldCA9IGhvcml6b250YWxB bGlnbm1lbnRPZmZzZXQ7IH0KIAogICAgIHZvaWQgYWRkSW5saW5lTGV2ZWxCb3goc3RkOjp1bmlx dWVfcHRyPElubGluZUxldmVsQm94PiYmKTsKIApAQCAtMTgwLDcgKzE3Nyw2IEBAIHByaXZhdGU6 CiAgICAgSW5saW5lUmVjdCBtX2xvZ2ljYWxSZWN0OwogICAgIElubGluZUxheW91dFVuaXQgbV9j b250ZW50TG9naWNhbFdpZHRoIHsgMCB9OwogICAgIGJvb2wgbV9oYXNDb250ZW50IHsgZmFsc2Ug fTsKLSAgICBPcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiBtX2hvcml6b250YWxBbGlnbm1lbnRP ZmZzZXQ7CiAgICAgT3B0aW9uU2V0PElubGluZUxldmVsQm94OjpUeXBlPiBtX2JveFR5cGVzOwog CiAgICAgc3RkOjp1bmlxdWVfcHRyPElubGluZUxldmVsQm94PiBtX3Jvb3RJbmxpbmVCb3g7Cg== 421777 2021-02-28 10:16:51 -0800 2021-02-28 11:58:30 -0800 Patch bug-222521-20210228101650.patch text/plain 7857 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjczNjM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTdiNWNjZWJkMjJjY2Y4 NWEyNjE4MGJiOWE1NTMxYjE5MjEwZWUzOC4uYThlMzFjZjczZjVhYWM0MzE1NzY5M2JhMzU4ZmRm MWY2MTNkNzFiMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIxLTAyLTI4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBMaW5lQm94 J3MgaG9yaXpvbnRhbEFsaWdubWVudE9mZnNldCBpcyB0aGUgcm9vdCBpbmxpbmUgYm94J3MgbG9n aWNhbCBsZWZ0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMjI1MjEKKworICAgICAgICBSZXZpZXdlZCBieSBTYW0gV2VpbmlnLgorCisgICAgICAgIFRo YXQncyB3aGVyZSB0aGUgbGluZSBjb250ZW50IHN0YXJ0cy4KKworICAgICAgICAqIGxheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVHZW9tZXRyeUZv ckxpbmVDb250ZW50KToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVG b3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 TGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdElubGluZUxldmVsQm94ZXMpOgorICAgICAgICAqIGxh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guY3BwOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjptX2NvbnRlbnRMb2dpY2FsV2lkdGgpOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpMaW5lQm94Ojpsb2dpY2FsUmVjdEZvclRleHRSdW4gY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjptX2hvcml6b250YWxBbGlnbm1lbnRPZmZzZXQpOiBEZWxldGVkLgorICAg ICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guaDoKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6TGluZUJveDo6c2V0TG9naWNhbEhlaWdodCk6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6Omhvcml6b250YWxBbGlnbm1lbnRPZmZzZXQgY29uc3Qp OiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94OjpzZXRIb3Jpem9u dGFsQWxpZ25tZW50T2Zmc2V0KTogRGVsZXRlZC4KKwogMjAyMS0wMi0yOCAgWmFsYW4gQnVqdGFz ICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gRXZlcnkgbGluZSBib3gg bXVzdCBoYXZlIGEgcm9vdCBpbmxpbmUgYm94CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4 dC5jcHAKaW5kZXggNDI0MGEwNGQ5YTQ2MDc5YTdmYTQwNDQ2M2U3ODliYmIwMjQ2ZTg5Mi4uN2Nk Mzk4NTkxZDI3Zjg5Y2QwNDI5ZGEyZTliY2RhNjcxMTc4NmRlNyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZv cm1hdHRpbmdDb250ZXh0LmNwcApAQCAtNTg1LDcgKzU4NSw3IEBAIElubGluZVJlY3QgSW5saW5l Rm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVHZW9tZXRyeUZvckxpbmVDb250ZW50KGNvbnN0IExp bmVCdWlsCiAgICAgdXBkYXRlQm94R2VvbWV0cnlGb3JJbmxpbmVCb3hlcygpOwogCiAgICAgYXV0 byBjb25zdHJ1Y3RMaW5lR2VvbWV0cnkgPSBbJl0gewotICAgICAgICBmb3JtYXR0aW5nU3RhdGUu YWRkTGluZSh7IGxpbmVCb3hMb2dpY2FsUmVjdCwgZW5jbG9zaW5nVG9wQW5kQm90dG9tLCBsaW5l Qm94LmFsaWdubWVudEJhc2VsaW5lKCksIGxpbmVCb3guaG9yaXpvbnRhbEFsaWdubWVudE9mZnNl dCgpLnZhbHVlT3IoSW5saW5lTGF5b3V0VW5pdCB7IH0pLCBsaW5lQ29udGVudC5jb250ZW50TG9n aWNhbFdpZHRoIH0pOworICAgICAgICBmb3JtYXR0aW5nU3RhdGUuYWRkTGluZSh7IGxpbmVCb3hM b2dpY2FsUmVjdCwgZW5jbG9zaW5nVG9wQW5kQm90dG9tLCBsaW5lQm94LmFsaWdubWVudEJhc2Vs aW5lKCksIHJvb3RJbmxpbmVCb3hMb2dpY2FsUmVjdC5sZWZ0KCksIGxpbmVDb250ZW50LmNvbnRl bnRMb2dpY2FsV2lkdGggfSk7CiAgICAgfTsKICAgICBjb25zdHJ1Y3RMaW5lR2VvbWV0cnkoKTsK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAppbmRl eCAyMjJiNWM2MGNlNDUzMWZjZGJhMjIwMTQ3NWI2M2M4ZjIwMmU5OGU4Li5kNmQxMmZhOGQ5YzA0 MWU5MTRjNzZkODJmZWIwYmE2ZmFiZDY2N2ZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3Jt YXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcApAQCAtMjAyLDcgKzIwMiw2IEBAIHZvaWQgTGluZUJv eEJ1aWxkZXI6OnNldFZlcnRpY2FsR2VvbWV0cnlGb3JJbmxpbmVCb3goTGluZUJveDo6SW5saW5l TGV2ZWxCb3gmIGluCiAKIHZvaWQgTGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdElubGluZUxldmVs Qm94ZXMoTGluZUJveCYgbGluZUJveCwgY29uc3QgTGluZTo6UnVuTGlzdCYgcnVucykKIHsKLSAg ICBhdXRvIGhvcml6b250YWxBbGlnbWVudE9mZnNldCA9IGxpbmVCb3guaG9yaXpvbnRhbEFsaWdu bWVudE9mZnNldCgpLnZhbHVlT3IoSW5saW5lTGF5b3V0VW5pdCB7IH0pOwogICAgIHN0cnVjdCBT aW1wbGlmaWVkVmVydGljYWxBbGlnbm1lbnQgewogICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGxp bmVCb3hUb3AgeyAwIH07CiAgICAgICAgIElubGluZUxheW91dFVuaXQgbGluZUJveEJvdHRvbSB7 IDAgfTsKQEAgLTI0MSw3ICsyNDAsNyBAQCB2b2lkIExpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJ bmxpbmVMZXZlbEJveGVzKExpbmVCb3gmIGxpbmVCb3gsIGNvbnN0IExpbmU6OlJ1bgogICAgICAg ICB9CiAgICAgICAgIC8vIENvbnN0cnVjdCB0aGUgbWlzc2luZyBMaW5lQm94OjpJbmxpbmVCb3hl cyBzdGFydGluZyB3aXRoIHRoZSB0b3Btb3N0IGxheW91dCBib3guCiAgICAgICAgIGZvciAoYXV0 byogbGF5b3V0Qm94IDogV1RGOjptYWtlUmV2ZXJzZWRSYW5nZShsYXlvdXRCb3hlc1dpdGhvdXRJ bmxpbmVCb3hlcykpIHsKLSAgICAgICAgICAgIGF1dG8gaW5saW5lQm94ID0gTGluZUJveDo6SW5s aW5lTGV2ZWxCb3g6OmNyZWF0ZUlubGluZUJveCgqbGF5b3V0Qm94LCBob3Jpem9udGFsQWxpZ21l bnRPZmZzZXQsIGxpbmVCb3guY29udGVudExvZ2ljYWxXaWR0aCgpKTsKKyAgICAgICAgICAgIGF1 dG8gaW5saW5lQm94ID0gTGluZUJveDo6SW5saW5lTGV2ZWxCb3g6OmNyZWF0ZUlubGluZUJveCgq bGF5b3V0Qm94LCByb290SW5saW5lQm94LmxvZ2ljYWxMZWZ0KCksIGxpbmVCb3guY29udGVudExv Z2ljYWxXaWR0aCgpKTsKICAgICAgICAgICAgIHNldFZlcnRpY2FsR2VvbWV0cnlGb3JJbmxpbmVC b3goKmlubGluZUJveCk7CiAgICAgICAgICAgICBsaW5lQm94LmFkZElubGluZUxldmVsQm94KFdU Rk1vdmUoaW5saW5lQm94KSk7CiAgICAgICAgIH0KQEAgLTI2OCw3ICsyNjcsNyBAQCB2b2lkIExp bmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJbmxpbmVMZXZlbEJveGVzKExpbmVCb3gmIGxpbmVCb3gs IGNvbnN0IExpbmU6OlJ1bgogICAgICAgICB9OwogICAgICAgICBsaW5lSGFzQ29udGVudCA9IGxp bmVIYXNDb250ZW50IHx8IHJ1bkhhc0NvbnRlbnQoKTsKIAotICAgICAgICBhdXRvIGxvZ2ljYWxM ZWZ0ID0gaG9yaXpvbnRhbEFsaWdtZW50T2Zmc2V0ICsgcnVuLmxvZ2ljYWxMZWZ0KCk7CisgICAg ICAgIGF1dG8gbG9naWNhbExlZnQgPSByb290SW5saW5lQm94LmxvZ2ljYWxMZWZ0KCkgKyBydW4u bG9naWNhbExlZnQoKTsKICAgICAgICAgaWYgKHJ1bi5pc0JveCgpKSB7CiAgICAgICAgICAgICBh dXRvJiBpbmxpbmVMZXZlbEJveEdlb21ldHJ5ID0gZm9ybWF0dGluZ0NvbnRleHQoKS5nZW9tZXRy eUZvckJveChsYXlvdXRCb3gpOwogICAgICAgICAgICAgYXV0byBtYXJnaW5Cb3hIZWlnaHQgPSBp bmxpbmVMZXZlbEJveEdlb21ldHJ5Lm1hcmdpbkJveEhlaWdodCgpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmNwcApp bmRleCA1MDBiNmRhNTE2YzcyZjdkMDdkODk1MDY4MGE3NGYwMjNkNWI0OTllLi4wYWI1M2ZlOTlj MzQ3ZTRmNzdkYTZkMGI5YTEwMTI4YjdiNTMxMThjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmNwcApAQCAtODYs NyArODYsNiBAQCBib29sIExpbmVCb3g6OklubGluZUxldmVsQm94OjpoYXNMaW5lQm94UmVsYXRp dmVBbGlnbm1lbnQoKSBjb25zdAogTGluZUJveDo6TGluZUJveChjb25zdCBCb3gmIHJvb3RMYXlv dXRCb3gsIGNvbnN0IElubGluZUxheW91dFBvaW50JiBsb2dpY2FsVG9wbGVmdCwgSW5saW5lTGF5 b3V0VW5pdCBsaW5lTG9naWNhbFdpZHRoLCBJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2Fs V2lkdGgsIE9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IGhvcml6b250YWxBbGlnbm1lbnRPZmZz ZXQsIHNpemVfdCBudW1iZXJPZlJ1bnMpCiAgICAgOiBtX2xvZ2ljYWxSZWN0KGxvZ2ljYWxUb3Bs ZWZ0LCBJbmxpbmVMYXlvdXRTaXplIHsgbGluZUxvZ2ljYWxXaWR0aCwgeyB9IH0pCiAgICAgLCBt X2NvbnRlbnRMb2dpY2FsV2lkdGgoY29udGVudExvZ2ljYWxXaWR0aCkKLSAgICAsIG1faG9yaXpv bnRhbEFsaWdubWVudE9mZnNldChob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0KQogICAgICwgbV9y b290SW5saW5lQm94KG1ha2VVbmlxdWVSZWY8TGluZUJveDo6SW5saW5lTGV2ZWxCb3g+KHJvb3RM YXlvdXRCb3gsIGhvcml6b250YWxBbGlnbm1lbnRPZmZzZXQudmFsdWVPcihJbmxpbmVMYXlvdXRV bml0IHsgfSksIElubGluZUxheW91dFNpemUgeyBjb250ZW50TG9naWNhbFdpZHRoLCB7IH0gfSwg SW5saW5lTGV2ZWxCb3g6OlR5cGU6OlJvb3RJbmxpbmVCb3gpKQogewogICAgIG1fbm9uUm9vdElu bGluZUxldmVsQm94TGlzdC5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KG51bWJlck9mUnVucyk7CkBA IC0xMTUsNyArMTE0LDcgQEAgSW5saW5lUmVjdCBMaW5lQm94Ojpsb2dpY2FsUmVjdEZvclRleHRS dW4oY29uc3QgTGluZTo6UnVuJiBydW4pIGNvbnN0CiAgICAgICAgIHJ1bmxvZ2ljYWxUb3AgKz0g cGFyZW50SW5saW5lQm94LT5sb2dpY2FsVG9wKCk7CiAgICAgfQogICAgIElubGluZUxheW91dFVu aXQgbG9naWNhbEhlaWdodCA9IGZvbnRNZXRyaWNzLmhlaWdodCgpOwotICAgIHJldHVybiB7IHJ1 bmxvZ2ljYWxUb3AsIG1faG9yaXpvbnRhbEFsaWdubWVudE9mZnNldC52YWx1ZU9yKElubGluZUxh eW91dFVuaXQgeyB9KSArIHJ1bi5sb2dpY2FsTGVmdCgpLCBydW4ubG9naWNhbFdpZHRoKCksIGxv Z2ljYWxIZWlnaHQgfTsKKyAgICByZXR1cm4geyBydW5sb2dpY2FsVG9wLCBtX3Jvb3RJbmxpbmVC b3gtPmxvZ2ljYWxMZWZ0KCkgKyBydW4ubG9naWNhbExlZnQoKSwgcnVuLmxvZ2ljYWxXaWR0aCgp LCBsb2dpY2FsSGVpZ2h0IH07CiB9CiAKIElubGluZVJlY3QgTGluZUJveDo6bG9naWNhbFJlY3RG b3JMaW5lQnJlYWtCb3goY29uc3QgQm94JiBsYXlvdXRCb3gpIGNvbnN0CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmggYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmgKaW5k ZXggOTYzYzg0ZDg4YzZmYTE3NmIyOTM3M2MzMmU5OTYyMjIwNjlmYzI3MC4uMWI3YmZjN2M5MDVj MDk3YzUzODcxMTllNTc3ZDFmN2E1ZDFhNzFlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guaApAQCAtMTQwLDggKzE0 MCw2IEBAIHB1YmxpYzoKICAgICBJbmxpbmVMYXlvdXRTaXplIGxvZ2ljYWxTaXplKCkgY29uc3Qg eyByZXR1cm4gbG9naWNhbFJlY3QoKS5zaXplKCk7IH0KICAgICBJbmxpbmVMYXlvdXRVbml0IGNv bnRlbnRMb2dpY2FsV2lkdGgoKSBjb25zdCB7IHJldHVybiBtX2NvbnRlbnRMb2dpY2FsV2lkdGg7 IH0KIAotICAgIE9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IGhvcml6b250YWxBbGlnbm1lbnRP ZmZzZXQoKSBjb25zdCB7IHJldHVybiBtX2hvcml6b250YWxBbGlnbm1lbnRPZmZzZXQ7IH0KLQog ICAgIC8vIE5vdGUgdGhhdCB0aGUgbGluZSBjYW4gaGF2ZSBtYW55IGlubGluZSBib3hlcyBhbmQg YmUgImVtcHR5IiB0aGUgc2FtZSB0aW1lIGUuZy4gPGRpdj48c3Bhbj48L3NwYW4+PHNwYW4+PC9z cGFuPjwvZGl2PgogICAgIGJvb2wgaGFzQ29udGVudCgpIGNvbnN0IHsgcmV0dXJuIG1faGFzQ29u dGVudDsgfQogICAgIGJvb2wgaGFzSW5saW5lQm94KCkgY29uc3QgeyByZXR1cm4gbV9ib3hUeXBl cy5jb250YWlucyhJbmxpbmVMZXZlbEJveDo6VHlwZTo6SW5saW5lQm94KTsgfQpAQCAtMTY2LDcg KzE2NCw2IEBAIHByaXZhdGU6CiAgICAgZnJpZW5kIGNsYXNzIExpbmVCb3hCdWlsZGVyOwogCiAg ICAgdm9pZCBzZXRMb2dpY2FsSGVpZ2h0KElubGluZUxheW91dFVuaXQgbG9naWNhbEhlaWdodCkg eyBtX2xvZ2ljYWxSZWN0LnNldEhlaWdodChsb2dpY2FsSGVpZ2h0KTsgfQotICAgIHZvaWQgc2V0 SG9yaXpvbnRhbEFsaWdubWVudE9mZnNldChJbmxpbmVMYXlvdXRVbml0IGhvcml6b250YWxBbGln bm1lbnRPZmZzZXQpIHsgbV9ob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0ID0gaG9yaXpvbnRhbEFs aWdubWVudE9mZnNldDsgfQogCiAgICAgdm9pZCBhZGRJbmxpbmVMZXZlbEJveChzdGQ6OnVuaXF1 ZV9wdHI8SW5saW5lTGV2ZWxCb3g+JiYpOwogCkBAIC0xODEsNyArMTc4LDYgQEAgcHJpdmF0ZToK ICAgICBJbmxpbmVSZWN0IG1fbG9naWNhbFJlY3Q7CiAgICAgSW5saW5lTGF5b3V0VW5pdCBtX2Nv bnRlbnRMb2dpY2FsV2lkdGggeyAwIH07CiAgICAgYm9vbCBtX2hhc0NvbnRlbnQgeyBmYWxzZSB9 OwotICAgIE9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IG1faG9yaXpvbnRhbEFsaWdubWVudE9m ZnNldDsKICAgICBPcHRpb25TZXQ8SW5saW5lTGV2ZWxCb3g6OlR5cGU+IG1fYm94VHlwZXM7CiAK ICAgICBVbmlxdWVSZWY8SW5saW5lTGV2ZWxCb3g+IG1fcm9vdElubGluZUJveDsK