222559 2021-03-01 09:42:08 -0800 [LFC][IFC] Do not try to run simplified alignment when line-height is set 2021-03-01 19:38:14 -0800 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 1734462 0 zalan 2021-03-01 09:42:08 -0800 ssia 1734463 1 421836 zalan 2021-03-01 09:43:39 -0800 Created attachment 421836 Patch 1734466 2 421838 zalan 2021-03-01 09:47:28 -0800 Created attachment 421838 Patch 1734720 3 421894 zalan 2021-03-01 18:24:14 -0800 Created attachment 421894 Patch 1734728 4 ews-feeder 2021-03-01 19:37:23 -0800 Committed r273719: <https://commits.webkit.org/r273719> All reviewed patches have been landed. Closing bug and clearing flags on attachment 421894. 1734730 5 webkit-bug-importer 2021-03-01 19:38:14 -0800 <rdar://problem/74906302> 421836 2021-03-01 09:43:39 -0800 2021-03-01 09:44:09 -0800 Patch bug-222559-20210301094338.patch text/plain 5741 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjczNjUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWUwNWU0OGMzYTQxODM1 OTg4NmQ2MDhlMjliMzFjZGU3MjM3Y2Q4Yi4uZGYzNWIwNjIyNTUyYzBiMWQ2MWVmZTY4ZTMyYTYz NTI5Y2YxNjJmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTAzLTAxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBDaGFuZ2Ug TGluZUJveEJ1aWxkZXI6Om1faW5saW5lTGV2ZWxCb3hlc05lZWRWZXJ0aWNhbEFsaWdubWVudCB0 byBtX3VzZVNpbXBsaWZpZWRWZXJ0aWNhbEFsaWdubWVudAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIyNTU2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgbV91c2VTaW1wbGlmaWVkVmVydGljYWxBbGlnbm1l bnQgaXMgbW9yZSBkZXNjcmlwdGl2ZS4gSXQncyBhbHNvIGluIHByZXBhcmF0aW9uIGZvciBleHBh bmRpbmcgdGhlIHNpbXBsaWZpZWQgdmVydGljYWwgYWxpZ25tZW50IGNvdmVyYWdlLgorCisgICAg ICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9t ZXRyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjpMaW5l Qm94QnVpbGRlcik6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjpi dWlsZCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjpjb25zdHJ1 Y3RJbmxpbmVMZXZlbEJveGVzKToKKwogMjAyMS0wMy0wMSAgQ2hyaXMgTG9yZCAgPGNsb3JkQGln YWxpYS5jb20+CiAKICAgICAgICAgQ1NTRm9udEZhY2Ugc2hvdWxkIG5vdCBuZWVkIGl0cyBtX2Zv bnRTZWxlY3RvciBkYXRhIG1lbWJlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29u dGV4dEdlb21ldHJ5LmNwcAppbmRleCBlMGZmMTlmMDBkMTljZjg2ODdiZDFiNWIxZTExODQxNGIy ZTZiNTYyLi43MmU3MjdjMjk4ODZmMjhjNTM5MTQyYzEyMjI4YTdlYWZhMDIzNzE1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0 aW5nQ29udGV4dEdlb21ldHJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcApAQCAtNTcsNyAr NTcsNyBAQCBwcml2YXRlOgogCiBwcml2YXRlOgogICAgIGNvbnN0IElubGluZUZvcm1hdHRpbmdD b250ZXh0JiBtX2lubGluZUZvcm1hdHRpbmdDb250ZXh0OwotICAgIGJvb2wgbV9pbmxpbmVMZXZl bEJveGVzTmVlZFZlcnRpY2FsQWxpZ25tZW50IHsgZmFsc2UgfTsKKyAgICBib29sIG1fdXNlU2lt cGxpZmllZFZlcnRpY2FsQWxpZ25tZW50IHsgdHJ1ZSB9OwogfTsKIAogc3RydWN0IEhhbmdpbmdU cmFpbGluZ1doaXRlc3BhY2VDb250ZW50IHsKQEAgLTE0OCw3ICsxNDgsNyBAQCBzdGF0aWMgT3B0 aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gaG9yaXpvbnRhbEFsaWdubWVudE9mZnNldChjb25zdCBM aW5lOjpSdW5MaXN0JgogCiBMaW5lQm94QnVpbGRlcjo6TGluZUJveEJ1aWxkZXIoY29uc3QgSW5s aW5lRm9ybWF0dGluZ0NvbnRleHQmIGlubGluZUZvcm1hdHRpbmdDb250ZXh0KQogICAgIDogbV9p bmxpbmVGb3JtYXR0aW5nQ29udGV4dChpbmxpbmVGb3JtYXR0aW5nQ29udGV4dCkKLSAgICAsIG1f aW5saW5lTGV2ZWxCb3hlc05lZWRWZXJ0aWNhbEFsaWdubWVudCghaW5saW5lRm9ybWF0dGluZ0Nv bnRleHQubGF5b3V0U3RhdGUoKS5pblN0YW5kYXJkc01vZGUoKSkKKyAgICAsIG1fdXNlU2ltcGxp ZmllZFZlcnRpY2FsQWxpZ25tZW50KGlubGluZUZvcm1hdHRpbmdDb250ZXh0LmxheW91dFN0YXRl KCkuaW5TdGFuZGFyZHNNb2RlKCkpCiB7CiB9CiAKQEAgLTE2MSw3ICsxNjEsNyBAQCBMaW5lQm94 IExpbmVCb3hCdWlsZGVyOjpidWlsZChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQmIGxp bmVDb250ZW50KQogICAgIGF1dG8gbGluZUJveCA9IExpbmVCb3ggeyByb290Qm94KCksIGxpbmVD b250ZW50LmxvZ2ljYWxUb3BMZWZ0LCBsaW5lTG9naWNhbFdpZHRoLCBob3Jpem9udGFsQWxpZ25t ZW50T2Zmc2V0LnZhbHVlT3IoSW5saW5lTGF5b3V0VW5pdCB7IH0pLCBjb250ZW50TG9naWNhbFdp ZHRoLCBydW5zLnNpemUoKSB9OwogCiAgICAgY29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyhsaW5l Qm94LCBydW5zKTsKLSAgICBpZiAobV9pbmxpbmVMZXZlbEJveGVzTmVlZFZlcnRpY2FsQWxpZ25t ZW50KQorICAgIGlmICghbV91c2VTaW1wbGlmaWVkVmVydGljYWxBbGlnbm1lbnQpCiAgICAgICAg IGNvbXB1dGVMaW5lQm94SGVpZ2h0QW5kQWxpZ25JbmxpbmVMZXZlbEJveGVzVmVydGljYWxseShs aW5lQm94KTsKICAgICByZXR1cm4gbGluZUJveDsKIH0KQEAgLTI5OCw3ICsyOTgsNyBAQCB2b2lk IExpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJbmxpbmVMZXZlbEJveGVzKExpbmVCb3gmIGxpbmVC b3gsIGNvbnN0IExpbmU6OlJ1bgogICAgICAgICAgICAgYXRvbWljSW5saW5lTGV2ZWxCb3gtPnNl dExheW91dEJvdW5kcyhMaW5lQm94OjpJbmxpbmVMZXZlbEJveDo6TGF5b3V0Qm91bmRzIHsgYXNj ZW50LCBtYXJnaW5Cb3hIZWlnaHQgLSBhc2NlbnQgfSk7CiAgICAgICAgICAgICAvLyBMZXQncyBw cmUtY29tcHV0ZSB0aGUgbG9naWNhbCB0b3Agc28gdGhhdCB3ZSBjYW4gYXZvaWQgcnVubmluZyB0 aGUgYWxpZ25tZW50IG9uIHNpbXBsZSBpbmxpbmUgYm94ZXMuCiAgICAgICAgICAgICBhdXRvIGFs aWduSW5saW5lQm94SWZFbGlnaWJsZSA9IFsmXSB7Ci0gICAgICAgICAgICAgICAgaWYgKG1faW5s aW5lTGV2ZWxCb3hlc05lZWRWZXJ0aWNhbEFsaWdubWVudCkKKyAgICAgICAgICAgICAgICBpZiAo IW1fdXNlU2ltcGxpZmllZFZlcnRpY2FsQWxpZ25tZW50KQogICAgICAgICAgICAgICAgICAgICBy ZXR1cm47CiAgICAgICAgICAgICAgICAgLy8gQmFzZWxpbmUgYWxpZ25lZCwgbm9uLXN0cmV0Y2h5 IGRpcmVjdCBjaGlsZHJlbiBhcmUgY29uc2lkZXJlZCB0byBiZSBzaW1wbGUgZm9yIG5vdy4KICAg ICAgICAgICAgICAgICBhdXRvIGlzQ29uc2lkZXJlZFNpbXBsZSA9ICZsYXlvdXRCb3gucGFyZW50 KCkgPT0gJnJvb3RCb3goKQpAQCAtMzA3LDcgKzMwNyw3IEBAIHZvaWQgTGluZUJveEJ1aWxkZXI6 OmNvbnN0cnVjdElubGluZUxldmVsQm94ZXMoTGluZUJveCYgbGluZUJveCwgY29uc3QgTGluZTo6 UnVuCiAgICAgICAgICAgICAgICAgICAgICYmICFpbmxpbmVMZXZlbEJveEdlb21ldHJ5Lm1hcmdp bkFmdGVyKCkKICAgICAgICAgICAgICAgICAgICAgJiYgbWFyZ2luQm94SGVpZ2h0IDw9IHJvb3RJ bmxpbmVCb3guYmFzZWxpbmUoKTsKICAgICAgICAgICAgICAgICBpZiAoIWlzQ29uc2lkZXJlZFNp bXBsZSkgewotICAgICAgICAgICAgICAgICAgICBtX2lubGluZUxldmVsQm94ZXNOZWVkVmVydGlj YWxBbGlnbm1lbnQgPSB0cnVlOworICAgICAgICAgICAgICAgICAgICBtX3VzZVNpbXBsaWZpZWRW ZXJ0aWNhbEFsaWdubWVudCA9IGZhbHNlOwogICAgICAgICAgICAgICAgICAgICByZXR1cm47CiAg ICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIC8vIE9ubHkgYmFzZWxpbmUgYWxpZ25t ZW50IGZvciBub3cuCkBAIC0zMjUsNyArMzI1LDcgQEAgdm9pZCBMaW5lQm94QnVpbGRlcjo6Y29u c3RydWN0SW5saW5lTGV2ZWxCb3hlcyhMaW5lQm94JiBsaW5lQm94LCBjb25zdCBMaW5lOjpSdW4K ICAgICAgICAgLy8gRklYTUU6IEFkZCBzdXBwb3J0IGZvciBzaW1wbGUgaW5saW5lIGJveGVzIHRv by4KICAgICAgICAgLy8gV2UgY2FuIGRvIHNpbXBsaWZpZWQgdmVydGljYWwgYWxpZ25tZW50IHdp dGggbm9uLWF0b21pYyBpbmxpbmUgYm94ZXMgYXMgbG9uZyBhcyB0aGUgbGluZSBoYXMgbm8gY29u dGVudC4KICAgICAgICAgLy8gZS5nLiA8ZGl2PjxzcGFuPjwvc3Bhbj48c3Bhbj48L3NwYW4+PC9k aXY+IGlzIHN0aWxsIG9rYXkuCi0gICAgICAgIG1faW5saW5lTGV2ZWxCb3hlc05lZWRWZXJ0aWNh bEFsaWdubWVudCA9IG1faW5saW5lTGV2ZWxCb3hlc05lZWRWZXJ0aWNhbEFsaWdubWVudCB8fCBs aW5lSGFzQ29udGVudDsKKyAgICAgICAgbV91c2VTaW1wbGlmaWVkVmVydGljYWxBbGlnbm1lbnQg PSAhbGluZUhhc0NvbnRlbnQ7CiAgICAgICAgIGlmIChydW4uaXNJbmxpbmVCb3hTdGFydCgpKSB7 CiAgICAgICAgICAgICAvLyBBdCB0aGlzIHBvaW50IHdlIGRvbid0IGtub3cgeWV0IGhvdyB3aWRl IHRoaXMgaW5saW5lIGJveCBpcy4gTGV0J3MgYXNzdW1lIGl0J3MgYXMgbG9uZyBhcyB0aGUgbGlu ZSBpcwogICAgICAgICAgICAgLy8gYW5kIGFkanVzdCBpdCBsYXRlciBpZiB3ZSBjb21lIGFjcm9z cyBhbiBpbmxpbmVCb3hFbmQgcnVuIChzZWUgYmVsb3cpLgpAQCAtMzcxLDEzICszNzEsMTMgQEAg dm9pZCBMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyhMaW5lQm94JiBs aW5lQm94LCBjb25zdCBMaW5lOjpSdW4KICAgICBsaW5lQm94LnNldEhhc0NvbnRlbnQobGluZUhh c0NvbnRlbnQpOwogICAgIGlmICghbGluZUhhc0NvbnRlbnQpIHsKICAgICAgICAgLy8gV2Ugc2hv dWxkIGFsd2F5cyBiZSBhYmxlIHRvIGV4ZXJjaXNlIHRoZSBmYXN0IHBhdGggd2hlbiB0aGUgbGlu ZSBoYXMgbm8gY29udGVudCBhdCBhbGwuCi0gICAgICAgIG1faW5saW5lTGV2ZWxCb3hlc05lZWRW ZXJ0aWNhbEFsaWdubWVudCA9IGZhbHNlOwotICAgIH0gZWxzZSBpZiAoIW1faW5saW5lTGV2ZWxC b3hlc05lZWRWZXJ0aWNhbEFsaWdubWVudCkgeworICAgICAgICBtX3VzZVNpbXBsaWZpZWRWZXJ0 aWNhbEFsaWdubWVudCA9IHRydWU7CisgICAgfSBlbHNlIGlmIChtX3VzZVNpbXBsaWZpZWRWZXJ0 aWNhbEFsaWdubWVudCkgewogICAgICAgICAvLyBGSVhNRTogQWRkIGZhc3QgcGF0aCBzdXBwb3J0 IGZvciBsaW5lLWhlaWdodCBjb250ZW50LgotICAgICAgICBtX2lubGluZUxldmVsQm94ZXNOZWVk VmVydGljYWxBbGlnbm1lbnQgPSAhcm9vdEJveCgpLnN0eWxlKCkubGluZUhlaWdodCgpLmlzTmVn YXRpdmUoKTsKKyAgICAgICAgbV91c2VTaW1wbGlmaWVkVmVydGljYWxBbGlnbm1lbnQgPSByb290 Qm94KCkuc3R5bGUoKS5saW5lSGVpZ2h0KCkuaXNOZWdhdGl2ZSgpOwogICAgIH0KIAotICAgIGlm ICghbV9pbmxpbmVMZXZlbEJveGVzTmVlZFZlcnRpY2FsQWxpZ25tZW50KSB7CisgICAgaWYgKG1f dXNlU2ltcGxpZmllZFZlcnRpY2FsQWxpZ25tZW50KSB7CiAgICAgICAgIGlmICghbGluZUhhc0Nv bnRlbnQpIHsKICAgICAgICAgICAgIHNpbXBsaWZpZWRWZXJ0aWNhbEFsaWdubWVudC5yb290SW5s aW5lQm94VG9wID0gLXJvb3RJbmxpbmVCb3guYmFzZWxpbmUoKTsKICAgICAgICAgICAgIHNpbXBs aWZpZWRWZXJ0aWNhbEFsaWdubWVudC5saW5lQm94VG9wID0geyB9Owo= 421838 2021-03-01 09:47:28 -0800 2021-03-01 18:46:31 -0800 Patch bug-222559-20210301094727.patch text/plain 3842 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjczNjUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGYzNWIwNjIyNTUyYzBi MWQ2MWVmZTY4ZTMyYTYzNTI5Y2YxNjJmYi4uODgyMTk3ZTNjMDI5NTZiNzJmODYxOGVhZmU5NDc5 YmE5M2I2N2VjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTAzLTAxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBEbyBub3Qg dHJ5IHRvIHJ1biBzaW1wbGlmaWVkIGFsaWdubWVudCB3aGVuIGxpbmUtaGVpZ2h0IGlzIHNldAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIyNTU5CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBsYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveEJ1aWxkZXI6OkxpbmVCb3hCdWlsZGVyKToK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdElubGlu ZUxldmVsQm94ZXMpOgorCiAyMDIxLTAzLTAxICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5j b20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBDaGFuZ2UgTGluZUJveEJ1aWxkZXI6Om1faW5saW5l TGV2ZWxCb3hlc05lZWRWZXJ0aWNhbEFsaWdubWVudCB0byBtX3VzZVNpbXBsaWZpZWRWZXJ0aWNh bEFsaWdubWVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5 LmNwcAppbmRleCA3MmU3MjdjMjk4ODZmMjhjNTM5MTQyYzEyMjI4YTdlYWZhMDIzNzE1Li4yZmJh ZGNkYTE3NDE0YTA2MGQwNmE0MDU0ZjYxZDM0Y2FmNDI5MTQxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdl b21ldHJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcApAQCAtMTQ4LDcgKzE0OCw4IEBAIHN0 YXRpYyBPcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiBob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0 KGNvbnN0IExpbmU6OlJ1bkxpc3QmCiAKIExpbmVCb3hCdWlsZGVyOjpMaW5lQm94QnVpbGRlcihj b25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgaW5saW5lRm9ybWF0dGluZ0NvbnRleHQpCiAg ICAgOiBtX2lubGluZUZvcm1hdHRpbmdDb250ZXh0KGlubGluZUZvcm1hdHRpbmdDb250ZXh0KQot ICAgICwgbV91c2VTaW1wbGlmaWVkVmVydGljYWxBbGlnbm1lbnQoaW5saW5lRm9ybWF0dGluZ0Nv bnRleHQubGF5b3V0U3RhdGUoKS5pblN0YW5kYXJkc01vZGUoKSkKKyAgICAvLyBGSVhNRTogQWRk IGZhc3QgcGF0aCBzdXBwb3J0IGZvciBsaW5lLWhlaWdodCBjb250ZW50LgorICAgICwgbV91c2VT aW1wbGlmaWVkVmVydGljYWxBbGlnbm1lbnQoaW5saW5lRm9ybWF0dGluZ0NvbnRleHQubGF5b3V0 U3RhdGUoKS5pblN0YW5kYXJkc01vZGUoKSAmJiByb290Qm94KCkuc3R5bGUoKS5saW5lSGVpZ2h0 KCkuaXNOZWdhdGl2ZSgpKQogewogfQogCkBAIC0yMDYsNiArMjA3LDggQEAgdm9pZCBMaW5lQm94 QnVpbGRlcjo6Y29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyhMaW5lQm94JiBsaW5lQm94LCBjb25z dCBMaW5lOjpSdW4KICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBsaW5lQm94VG9wIHsgMCB9Owog ICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGxpbmVCb3hCb3R0b20geyAwIH07CiAgICAgICAgIElu bGluZUxheW91dFVuaXQgcm9vdElubGluZUJveFRvcCB7IDAgfTsKKworICAgICAgICBJbmxpbmVM YXlvdXRVbml0IGxpbmVCb3hIZWlnaHQoKSBjb25zdCB7IHJldHVybiBsaW5lQm94Qm90dG9tIC0g bGluZUJveFRvcDsgfQogICAgIH07CiAgICAgYXV0byYgcm9vdElubGluZUJveCA9IGxpbmVCb3gu cm9vdElubGluZUJveCgpOwogICAgIHNldFZlcnRpY2FsR2VvbWV0cnlGb3JJbmxpbmVCb3gocm9v dElubGluZUJveCk7CkBAIC0zNjksMjIgKzM3MiwxMSBAQCB2b2lkIExpbmVCb3hCdWlsZGVyOjpj b25zdHJ1Y3RJbmxpbmVMZXZlbEJveGVzKExpbmVCb3gmIGxpbmVCb3gsIGNvbnN0IExpbmU6OlJ1 bgogICAgIH0KIAogICAgIGxpbmVCb3guc2V0SGFzQ29udGVudChsaW5lSGFzQ29udGVudCk7Ci0g ICAgaWYgKCFsaW5lSGFzQ29udGVudCkgewotICAgICAgICAvLyBXZSBzaG91bGQgYWx3YXlzIGJl IGFibGUgdG8gZXhlcmNpc2UgdGhlIGZhc3QgcGF0aCB3aGVuIHRoZSBsaW5lIGhhcyBubyBjb250 ZW50IGF0IGFsbC4KLSAgICAgICAgbV91c2VTaW1wbGlmaWVkVmVydGljYWxBbGlnbm1lbnQgPSB0 cnVlOwotICAgIH0gZWxzZSBpZiAobV91c2VTaW1wbGlmaWVkVmVydGljYWxBbGlnbm1lbnQpIHsK LSAgICAgICAgLy8gRklYTUU6IEFkZCBmYXN0IHBhdGggc3VwcG9ydCBmb3IgbGluZS1oZWlnaHQg Y29udGVudC4KLSAgICAgICAgbV91c2VTaW1wbGlmaWVkVmVydGljYWxBbGlnbm1lbnQgPSByb290 Qm94KCkuc3R5bGUoKS5saW5lSGVpZ2h0KCkuaXNOZWdhdGl2ZSgpOwotICAgIH0KLQorICAgIC8v IFdlIHNob3VsZCBhbHdheXMgYmUgYWJsZSB0byBleGVyY2lzZSB0aGUgZmFzdCBwYXRoIHdoZW4g dGhlIGxpbmUgaGFzIG5vIGNvbnRlbnQgYXQgYWxsLCBldmVuIGluIG5vbi1zdGFuZGFyZHMgbW9k ZSBvciB3aXRoIGxpbmUtaGVpZ2h0IHNldC4KKyAgICBtX3VzZVNpbXBsaWZpZWRWZXJ0aWNhbEFs aWdubWVudCA9IG1fdXNlU2ltcGxpZmllZFZlcnRpY2FsQWxpZ25tZW50IHx8ICFsaW5lSGFzQ29u dGVudDsKICAgICBpZiAobV91c2VTaW1wbGlmaWVkVmVydGljYWxBbGlnbm1lbnQpIHsKLSAgICAg ICAgaWYgKCFsaW5lSGFzQ29udGVudCkgewotICAgICAgICAgICAgc2ltcGxpZmllZFZlcnRpY2Fs QWxpZ25tZW50LnJvb3RJbmxpbmVCb3hUb3AgPSAtcm9vdElubGluZUJveC5iYXNlbGluZSgpOwot ICAgICAgICAgICAgc2ltcGxpZmllZFZlcnRpY2FsQWxpZ25tZW50LmxpbmVCb3hUb3AgPSB7IH07 Ci0gICAgICAgICAgICBzaW1wbGlmaWVkVmVydGljYWxBbGlnbm1lbnQubGluZUJveEJvdHRvbSA9 IHsgfTsKLSAgICAgICAgfQotICAgICAgICByb290SW5saW5lQm94LnNldExvZ2ljYWxUb3Aoc2lt cGxpZmllZFZlcnRpY2FsQWxpZ25tZW50LnJvb3RJbmxpbmVCb3hUb3ApOwotICAgICAgICBsaW5l Qm94LnNldExvZ2ljYWxIZWlnaHQoc2ltcGxpZmllZFZlcnRpY2FsQWxpZ25tZW50LmxpbmVCb3hC b3R0b20gLSBzaW1wbGlmaWVkVmVydGljYWxBbGlnbm1lbnQubGluZUJveFRvcCk7CisgICAgICAg IHJvb3RJbmxpbmVCb3guc2V0TG9naWNhbFRvcChsaW5lSGFzQ29udGVudCA/IHNpbXBsaWZpZWRW ZXJ0aWNhbEFsaWdubWVudC5yb290SW5saW5lQm94VG9wIDogLXJvb3RJbmxpbmVCb3guYmFzZWxp bmUoKSk7CisgICAgICAgIGxpbmVCb3guc2V0TG9naWNhbEhlaWdodChsaW5lSGFzQ29udGVudCA/ IHNpbXBsaWZpZWRWZXJ0aWNhbEFsaWdubWVudC5saW5lQm94SGVpZ2h0KCkgOiBJbmxpbmVMYXlv dXRVbml0KCkpOwogICAgIH0KIH0KIAo= 421894 2021-03-01 18:24:14 -0800 2021-03-01 19:37:24 -0800 Patch bug-222559-20210301182413.patch text/plain 3766 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjczNzAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDNjMDNjMTMwMjUzYjY5 NjA0YmE3ODM1MmEwNjQ5ZTA0NTNkMjFlMy4uOTFmZTQwMzQyMDg4ZmMwN2Q4Mzc1YzIyNzg5MWFj M2MxYjBiZTM4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTAzLTAxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBEbyBub3Qg dHJ5IHRvIHJ1biBzaW1wbGlmaWVkIGFsaWdubWVudCB3aGVuIGxpbmUtaGVpZ2h0IGlzIHNldAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIyNTU5CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgQW50dGkgS29pdmlzdG8uCisKKyAgICAgICAgKiBsYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveEJ1aWxkZXI6OkxpbmVCb3hCdWlsZGVyKToK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdElubGlu ZUxldmVsQm94ZXMpOgorCiAyMDIxLTAzLTAxICBUcnVpdHQgU2F2ZWxsICA8dHNhdmVsbEBhcHBs ZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcmV2ZXJ0aW5nIHIyNzM2NTUuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0 aW5nQ29udGV4dEdlb21ldHJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCmluZGV4IDcyZTcyN2My OTg4NmYyOGM1MzkxNDJjMTIyMjhhN2VhZmEwMjM3MTUuLjJmYmFkY2RhMTc0MTRhMDYwZDA2YTQw NTRmNjFkMzRjYWY0MjkxNDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250 ZXh0R2VvbWV0cnkuY3BwCkBAIC0xNDgsNyArMTQ4LDggQEAgc3RhdGljIE9wdGlvbmFsPElubGlu ZUxheW91dFVuaXQ+IGhvcml6b250YWxBbGlnbm1lbnRPZmZzZXQoY29uc3QgTGluZTo6UnVuTGlz dCYKIAogTGluZUJveEJ1aWxkZXI6OkxpbmVCb3hCdWlsZGVyKGNvbnN0IElubGluZUZvcm1hdHRp bmdDb250ZXh0JiBpbmxpbmVGb3JtYXR0aW5nQ29udGV4dCkKICAgICA6IG1faW5saW5lRm9ybWF0 dGluZ0NvbnRleHQoaW5saW5lRm9ybWF0dGluZ0NvbnRleHQpCi0gICAgLCBtX3VzZVNpbXBsaWZp ZWRWZXJ0aWNhbEFsaWdubWVudChpbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5sYXlvdXRTdGF0ZSgp LmluU3RhbmRhcmRzTW9kZSgpKQorICAgIC8vIEZJWE1FOiBBZGQgZmFzdCBwYXRoIHN1cHBvcnQg Zm9yIGxpbmUtaGVpZ2h0IGNvbnRlbnQuCisgICAgLCBtX3VzZVNpbXBsaWZpZWRWZXJ0aWNhbEFs aWdubWVudChpbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5sYXlvdXRTdGF0ZSgpLmluU3RhbmRhcmRz TW9kZSgpICYmIHJvb3RCb3goKS5zdHlsZSgpLmxpbmVIZWlnaHQoKS5pc05lZ2F0aXZlKCkpCiB7 CiB9CiAKQEAgLTIwNiw2ICsyMDcsOCBAQCB2b2lkIExpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJ bmxpbmVMZXZlbEJveGVzKExpbmVCb3gmIGxpbmVCb3gsIGNvbnN0IExpbmU6OlJ1bgogICAgICAg ICBJbmxpbmVMYXlvdXRVbml0IGxpbmVCb3hUb3AgeyAwIH07CiAgICAgICAgIElubGluZUxheW91 dFVuaXQgbGluZUJveEJvdHRvbSB7IDAgfTsKICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCByb290 SW5saW5lQm94VG9wIHsgMCB9OworCisgICAgICAgIElubGluZUxheW91dFVuaXQgbGluZUJveEhl aWdodCgpIGNvbnN0IHsgcmV0dXJuIGxpbmVCb3hCb3R0b20gLSBsaW5lQm94VG9wOyB9CiAgICAg fTsKICAgICBhdXRvJiByb290SW5saW5lQm94ID0gbGluZUJveC5yb290SW5saW5lQm94KCk7CiAg ICAgc2V0VmVydGljYWxHZW9tZXRyeUZvcklubGluZUJveChyb290SW5saW5lQm94KTsKQEAgLTM2 OSwyMiArMzcyLDExIEBAIHZvaWQgTGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdElubGluZUxldmVs Qm94ZXMoTGluZUJveCYgbGluZUJveCwgY29uc3QgTGluZTo6UnVuCiAgICAgfQogCiAgICAgbGlu ZUJveC5zZXRIYXNDb250ZW50KGxpbmVIYXNDb250ZW50KTsKLSAgICBpZiAoIWxpbmVIYXNDb250 ZW50KSB7Ci0gICAgICAgIC8vIFdlIHNob3VsZCBhbHdheXMgYmUgYWJsZSB0byBleGVyY2lzZSB0 aGUgZmFzdCBwYXRoIHdoZW4gdGhlIGxpbmUgaGFzIG5vIGNvbnRlbnQgYXQgYWxsLgotICAgICAg ICBtX3VzZVNpbXBsaWZpZWRWZXJ0aWNhbEFsaWdubWVudCA9IHRydWU7Ci0gICAgfSBlbHNlIGlm IChtX3VzZVNpbXBsaWZpZWRWZXJ0aWNhbEFsaWdubWVudCkgewotICAgICAgICAvLyBGSVhNRTog QWRkIGZhc3QgcGF0aCBzdXBwb3J0IGZvciBsaW5lLWhlaWdodCBjb250ZW50LgotICAgICAgICBt X3VzZVNpbXBsaWZpZWRWZXJ0aWNhbEFsaWdubWVudCA9IHJvb3RCb3goKS5zdHlsZSgpLmxpbmVI ZWlnaHQoKS5pc05lZ2F0aXZlKCk7Ci0gICAgfQotCisgICAgLy8gV2Ugc2hvdWxkIGFsd2F5cyBi ZSBhYmxlIHRvIGV4ZXJjaXNlIHRoZSBmYXN0IHBhdGggd2hlbiB0aGUgbGluZSBoYXMgbm8gY29u dGVudCBhdCBhbGwsIGV2ZW4gaW4gbm9uLXN0YW5kYXJkcyBtb2RlIG9yIHdpdGggbGluZS1oZWln aHQgc2V0LgorICAgIG1fdXNlU2ltcGxpZmllZFZlcnRpY2FsQWxpZ25tZW50ID0gbV91c2VTaW1w bGlmaWVkVmVydGljYWxBbGlnbm1lbnQgfHwgIWxpbmVIYXNDb250ZW50OwogICAgIGlmIChtX3Vz ZVNpbXBsaWZpZWRWZXJ0aWNhbEFsaWdubWVudCkgewotICAgICAgICBpZiAoIWxpbmVIYXNDb250 ZW50KSB7Ci0gICAgICAgICAgICBzaW1wbGlmaWVkVmVydGljYWxBbGlnbm1lbnQucm9vdElubGlu ZUJveFRvcCA9IC1yb290SW5saW5lQm94LmJhc2VsaW5lKCk7Ci0gICAgICAgICAgICBzaW1wbGlm aWVkVmVydGljYWxBbGlnbm1lbnQubGluZUJveFRvcCA9IHsgfTsKLSAgICAgICAgICAgIHNpbXBs aWZpZWRWZXJ0aWNhbEFsaWdubWVudC5saW5lQm94Qm90dG9tID0geyB9OwotICAgICAgICB9Ci0g ICAgICAgIHJvb3RJbmxpbmVCb3guc2V0TG9naWNhbFRvcChzaW1wbGlmaWVkVmVydGljYWxBbGln bm1lbnQucm9vdElubGluZUJveFRvcCk7Ci0gICAgICAgIGxpbmVCb3guc2V0TG9naWNhbEhlaWdo dChzaW1wbGlmaWVkVmVydGljYWxBbGlnbm1lbnQubGluZUJveEJvdHRvbSAtIHNpbXBsaWZpZWRW ZXJ0aWNhbEFsaWdubWVudC5saW5lQm94VG9wKTsKKyAgICAgICAgcm9vdElubGluZUJveC5zZXRM b2dpY2FsVG9wKGxpbmVIYXNDb250ZW50ID8gc2ltcGxpZmllZFZlcnRpY2FsQWxpZ25tZW50LnJv b3RJbmxpbmVCb3hUb3AgOiAtcm9vdElubGluZUJveC5iYXNlbGluZSgpKTsKKyAgICAgICAgbGlu ZUJveC5zZXRMb2dpY2FsSGVpZ2h0KGxpbmVIYXNDb250ZW50ID8gc2ltcGxpZmllZFZlcnRpY2Fs QWxpZ25tZW50LmxpbmVCb3hIZWlnaHQoKSA6IElubGluZUxheW91dFVuaXQoKSk7CiAgICAgfQog fQogCg==