221522 2021-02-06 11:50:05 -0800 [LFC][IFC] Incorrect line box height when line-height is set on an empty root inline box 2021-02-10 14:36:55 -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 1726412 0 zalan 2021-02-06 11:50:05 -0800 <style> div { line-height: 100px; } </style> <div><span>empty root inline box</span></div> ^^this should produce a ~100px tall line box. 1726413 1 419513 zalan 2021-02-06 11:54:30 -0800 Created attachment 419513 Patch 1726423 2 419515 zalan 2021-02-06 14:27:57 -0800 Created attachment 419515 Patch 1726442 3 419521 zalan 2021-02-06 19:48:00 -0800 Created attachment 419521 Patch 1726449 4 ews-feeder 2021-02-06 21:08:20 -0800 Committed r272468: <https://commits.webkit.org/r272468> All reviewed patches have been landed. Closing bug and clearing flags on attachment 419521. 1727804 5 webkit-bug-importer 2021-02-10 14:36:55 -0800 <rdar://problem/74206819> 419513 2021-02-06 11:54:30 -0800 2021-02-06 15:10:49 -0800 Patch bug-221522-20210206115429.patch text/plain 2619 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyNDYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjNkN2VjODZiMmU4Yjkw ZjkyNDg2NWIzOWI1ZDc1ODFmNzUxNmNkZC4uMGJhMjczMjkzNmYxNmFmZWFjNzk2ZDNiMjUyZjUz MWViY2VkM2U2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTAyLTA2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBJbmNvcnJl Y3QgbGluZSBib3ggaGVpZ2h0IHdoZW4gbGluZS1oZWlnaHQgaXMgc2V0IG9uIGFuIGVtcHR5IHJv b3QgaW5saW5lIGJveAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjIxNTIyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgVGhlIHJvb3QgaW5saW5lIGJveCB3aXRoIG5vbi1pbml0aWFsIGxpbmUgaGVpZ2h0IHZh bHVlIHN0cmV0Y2hlcyB0aGUgbGluZSBib3ggZXZlbiB3aGVuIHJvb3QgaGFzIG5vIGNvbnRlbnQu CisgICAgICAgIAorICAgICAgICBlLmcuIDxkaXYgc3R5bGU9ImxpbmUtaGVpZ2h0OiAxMDBweDsi PjxzcGFuPmNvbnRlbnQ8L3NwYW4+PC9kaXY+CisgICAgICAgIFRoaXMgY29udGVudCBwcm9kdWNl cyBhIH4xMDBweCB0YWxsIGxpbmUgYm94LgorCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRRdWlya3MuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6UXVpcmtzOjppbmxpbmVMZXZlbEJv eEFmZmVjdHNMaW5lQm94IGNvbnN0KToKKwogMjAyMS0wMi0wNiAgWmFsYW4gQnVqdGFzICA8emFs YW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gQ29udGludWF0aW9uIHByZSBhbmQg cG9zdCBibG9jayBpbmxpbmUgYm94ZXMgc2hvdWxkIG5vdCBoYXZlIGJvdGggdGhlIHN0YXJ0IGFu ZCBlbmQgZGVjb3JhdGlvbnMgb2YgdGhlIG9yaWdpbmFsIGlubGluZSBib3gKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdD b250ZXh0UXVpcmtzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcAppbmRleCAwY2ZhNDI2MzQyNmRkM2Vh Y2VmMzU3MGFhOTZhODc5ZmQ1ZjUzNjRjLi5iMTM0ZTQ0NzhmMmRlZmE5MDlkZjUxZTA5NDcyYWQ0 ZjZmMTU1Y2Q3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0 dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRRdWlya3Mu Y3BwCkBAIC03MSw3ICs3MSwxMyBAQCBib29sIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpRdWly a3M6OmlubGluZUxldmVsQm94QWZmZWN0c0xpbmVCb3goY29uc3QgTGluZUJveAogICAgICAgICAv LyBJbmxpbmUgYm94ZXMgKGUuZy4gcm9vdCBpbmxpbmUgYm94IG9yIDxzcGFuPikgYWZmZWN0cyBs aW5lIGJveGVzIGVpdGhlciB0aHJvdWdoIHRoZSBzdHJ1dCBvciBhY3R1YWwgY29udGVudC4KICAg ICAgICAgaWYgKGlubGluZUxldmVsQm94Lmhhc0NvbnRlbnQoKSkKICAgICAgICAgICAgIHJldHVy biB0cnVlOwotICAgICAgICBpZiAoIWlubGluZUxldmVsQm94LmlzUm9vdElubGluZUJveCgpKSB7 CisgICAgICAgIGlmIChpbmxpbmVMZXZlbEJveC5pc1Jvb3RJbmxpbmVCb3goKSkgeworICAgICAg ICAgICAgaWYgKCFpbmxpbmVMZXZlbEJveC5sYXlvdXRCb3goKS5zdHlsZSgpLmxpbmVIZWlnaHQo KS5pc05lZ2F0aXZlKCkpIHsKKyAgICAgICAgICAgICAgICAvLyBUaGUgcm9vdCBpbmxpbmUgYm94 IHdpdGggbm9uLWluaXRpYWwgbGluZSBoZWlnaHQgdmFsdWUgc3RyZXRjaGVzIHRoZSBsaW5lIGJv eCBldmVuIHdoZW4gcm9vdCBoYXMgbm8gY29udGVudC4KKyAgICAgICAgICAgICAgICAvLyBlLmcu IDxkaXYgc3R5bGU9ImxpbmUtaGVpZ2h0OiAxMDBweDsiPjxzcGFuPmNvbnRlbnQ8L3NwYW4+PC9k aXY+CisgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgICAgICB9CisgICAgICAg IH0gZWxzZSB7CiAgICAgICAgICAgICBhdXRvJiBib3hHZW9tZXRyeSA9IGZvcm1hdHRpbmdDb250 ZXh0KCkuZ2VvbWV0cnlGb3JCb3goaW5saW5lTGV2ZWxCb3gubGF5b3V0Qm94KCkpOwogICAgICAg ICAgICAgaWYgKGJveEdlb21ldHJ5Lmhvcml6b250YWxCb3JkZXIoKSB8fCBib3hHZW9tZXRyeS5o b3Jpem9udGFsUGFkZGluZygpLnZhbHVlT3IoMF9sdSkpIHsKICAgICAgICAgICAgICAgICAvLyBI b3Jpem9udGFsIGJvcmRlciBhbmQgcGFkZGluZyBtYWtlIHRoZSBpbmxpbmUgYm94IHN0cmV0Y2gg dGhlIGxpbmUgKGUuZy4gPHNwYW4gc3R5bGU9InBhZGRpbmc6IDEwcHg7Ij48L3NwYW4+KS4K 419515 2021-02-06 14:27:57 -0800 2021-02-06 15:00:56 -0800 Patch bug-221522-20210206142756.patch text/plain 4893 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyNDYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjNkN2VjODZiMmU4Yjkw ZjkyNDg2NWIzOWI1ZDc1ODFmNzUxNmNkZC4uZjlkOWE0OTE0MTUwODI2OGY1MmVkNzFmOTQ3Y2I1 YzEwMDkyN2MxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTAyLTA2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBJbmNvcnJl Y3QgbGluZSBib3ggaGVpZ2h0IHdoZW4gbGluZS1oZWlnaHQgaXMgc2V0IG9uIGFuIGVtcHR5IHJv b3QgaW5saW5lIGJveAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjIxNTIyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQW50dGkgS29pdmlzdG8uCisKKyAg ICAgICAgVGhlIHJvb3QgaW5saW5lIGJveCB3aXRoIG5vbi1pbml0aWFsIGxpbmUgaGVpZ2h0IHZh bHVlIHN0cmV0Y2hlcyB0aGUgbGluZSBib3ggZXZlbiB3aGVuIHJvb3QgaGFzIG5vIGNvbnRlbnQu CisgICAgICAgIAorICAgICAgICBlLmcuIDxkaXYgc3R5bGU9ImxpbmUtaGVpZ2h0OiAxMDBweDsi PjxzcGFuPmNvbnRlbnQ8L3NwYW4+PC9kaXY+CisgICAgICAgIFRoaXMgY29udGVudCBwcm9kdWNl cyBhIH4xMDBweCB0YWxsIGxpbmUgYm94LgorCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRRdWlya3MuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6UXVpcmtzOjppbmxpbmVMZXZlbEJv eEFmZmVjdHNMaW5lQm94IGNvbnN0KToKKwogMjAyMS0wMi0wNiAgWmFsYW4gQnVqdGFzICA8emFs YW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gQ29udGludWF0aW9uIHByZSBhbmQg cG9zdCBibG9jayBpbmxpbmUgYm94ZXMgc2hvdWxkIG5vdCBoYXZlIGJvdGggdGhlIHN0YXJ0IGFu ZCBlbmQgZGVjb3JhdGlvbnMgb2YgdGhlIG9yaWdpbmFsIGlubGluZSBib3gKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdD b250ZXh0R2VvbWV0cnkuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKaW5kZXggNzE1MmFkOTY5YWIz MWFmNjVkNzE4MzQ2ZTc0OWZkNzg5ZGY1ZDU5Yy4uZDU3YWFjNTc0ODI5YmJkN2FlMWM2ZTlkNGI0 NzQ2NzI2YzU1MjYzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZv cm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRH ZW9tZXRyeS5jcHAKQEAgLTIxNCw2ICsyMTQsOCBAQCB2b2lkIExpbmVCb3hCdWlsZGVyOjpjb25z dHJ1Y3RJbmxpbmVMZXZlbEJveGVzKExpbmVCb3gmIGxpbmVCb3gsIGNvbnN0IExpbmU6OlJ1bgog ICAgIGF1dG8gY3JlYXRlUm9vdElubGluZUJveCA9IFsmXSB7CiAgICAgICAgIGF1dG8gcm9vdElu bGluZUJveCA9IExpbmVCb3g6OklubGluZUxldmVsQm94OjpjcmVhdGVSb290SW5saW5lQm94KHJv b3RCb3goKSwgaG9yaXpvbnRhbEFsaWdtZW50T2Zmc2V0LCBsaW5lQm94LmxvZ2ljYWxXaWR0aCgp KTsKICAgICAgICAgc2V0VmVydGljYWxHZW9tZXRyeUZvcklubGluZUJveCgqcm9vdElubGluZUJv eCk7CisgICAgICAgIC8vIEZJWE1FOiBBZGQgZmFzdCBwYXRoIHN1cHBvcnQgZm9yIGxpbmUtaGVp Z2h0IGNvbnRlbnQuCisgICAgICAgIG1faW5saW5lTGV2ZWxCb3hlc05lZWRWZXJ0aWNhbEFsaWdu bWVudCA9ICFyb290Qm94KCkuc3R5bGUoKS5saW5lSGVpZ2h0KCkuaXNOZWdhdGl2ZSgpOwogICAg ICAgICBzaW1wbGlmaWVkVmVydGljYWxBbGlnbm1lbnQgPSB7IHsgfSAsIHJvb3RJbmxpbmVCb3gt PmxheW91dEJvdW5kcygpLmhlaWdodCgpLCByb290SW5saW5lQm94LT5sYXlvdXRCb3VuZHMoKS5h c2NlbnQgLSByb290SW5saW5lQm94LT5iYXNlbGluZSgpIH07CiAgICAgICAgIGxpbmVCb3guYWRk Um9vdElubGluZUJveChXVEZNb3ZlKHJvb3RJbmxpbmVCb3gpKTsKICAgICB9OwpAQCAtMzMzLDcg KzMzNSw3IEBAIHZvaWQgTGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdElubGluZUxldmVsQm94ZXMo TGluZUJveCYgbGluZUJveCwgY29uc3QgTGluZTo6UnVuCiAgICAgICAgIC8vIEZJWE1FOiBBZGQg c3VwcG9ydCBmb3Igc2ltcGxlIGlubGluZSBib3hlcyB0b28uCiAgICAgICAgIC8vIFdlIGNhbiBk byBzaW1wbGlmaWVkIHZlcnRpY2FsIGFsaWdubWVudCB3aXRoIG5vbi1hdG9taWMgaW5saW5lIGJv eGVzIGFzIGxvbmcgYXMgdGhlIGxpbmUgaGFzIG5vIGNvbnRlbnQuCiAgICAgICAgIC8vIGUuZy4g PGRpdj48c3Bhbj48L3NwYW4+PHNwYW4+PC9zcGFuPjwvZGl2PiBpcyBzdGlsbCBva2F5LgotICAg ICAgICBtX2lubGluZUxldmVsQm94ZXNOZWVkVmVydGljYWxBbGlnbm1lbnQgPSBsaW5lSGFzQ29u dGVudDsKKyAgICAgICAgbV9pbmxpbmVMZXZlbEJveGVzTmVlZFZlcnRpY2FsQWxpZ25tZW50ID0g bV9pbmxpbmVMZXZlbEJveGVzTmVlZFZlcnRpY2FsQWxpZ25tZW50IHx8IGxpbmVIYXNDb250ZW50 OwogICAgICAgICBpZiAocnVuLmlzSW5saW5lQm94U3RhcnQoKSkgewogICAgICAgICAgICAgYXV0 byBpbml0aWFsTG9naWNhbFdpZHRoID0gbGluZUJveC5sb2dpY2FsV2lkdGgoKSAtIHJ1bi5sb2dp Y2FsTGVmdCgpOwogICAgICAgICAgICAgQVNTRVJUKGluaXRpYWxMb2dpY2FsV2lkdGggPj0gMCk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5s aW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAKaW5kZXggMGNm YTQyNjM0MjZkZDNlYWNlZjM1NzBhYTk2YTg3OWZkNWY1MzY0Yy4uMTk3NjgxNWQ3ZDlhNDI5ZWZh ZjVlN2VjMjc5MmRlN2Y1YmUxMzhkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRRdWlya3MuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdD b250ZXh0UXVpcmtzLmNwcApAQCAtNzEsNyArNzEsMjIgQEAgYm9vbCBJbmxpbmVGb3JtYXR0aW5n Q29udGV4dDo6UXVpcmtzOjppbmxpbmVMZXZlbEJveEFmZmVjdHNMaW5lQm94KGNvbnN0IExpbmVC b3gKICAgICAgICAgLy8gSW5saW5lIGJveGVzIChlLmcuIHJvb3QgaW5saW5lIGJveCBvciA8c3Bh bj4pIGFmZmVjdHMgbGluZSBib3hlcyBlaXRoZXIgdGhyb3VnaCB0aGUgc3RydXQgb3IgYWN0dWFs IGNvbnRlbnQuCiAgICAgICAgIGlmIChpbmxpbmVMZXZlbEJveC5oYXNDb250ZW50KCkpCiAgICAg ICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICAgICAgaWYgKCFpbmxpbmVMZXZlbEJveC5pc1Jvb3RJ bmxpbmVCb3goKSkgeworICAgICAgICBpZiAoaW5saW5lTGV2ZWxCb3guaXNSb290SW5saW5lQm94 KCkpIHsKKyAgICAgICAgICAgIGlmICghaW5saW5lTGV2ZWxCb3gubGF5b3V0Qm94KCkuc3R5bGUo KS5saW5lSGVpZ2h0KCkuaXNOZWdhdGl2ZSgpKSB7CisgICAgICAgICAgICAgICAgLy8gVGhlIHJv b3QgaW5saW5lIGJveCB3aXRoIG5vbi1pbml0aWFsIGxpbmUgaGVpZ2h0IHZhbHVlIHN0cmV0Y2hl cyB0aGUgbGluZSBib3ggZXZlbiB3aGVuIHJvb3QgaGFzIG5vIGNvbnRlbnQKKyAgICAgICAgICAg ICAgICAvLyBidXQgdGhlcmUncyBhdCBsZWFzdCBvbmUgaW5saW5lIGJveCB3aXRoIGNvbnRlbnQu CisgICAgICAgICAgICAgICAgLy8gZS5nLiA8ZGl2IHN0eWxlPSJsaW5lLWhlaWdodDogMTAwcHg7 Ij48c3Bhbj5jb250ZW50PC9zcGFuPjwvZGl2PgorICAgICAgICAgICAgICAgIGlmICghbGluZUJv eC5oYXNJbmxpbmVCb3goKSkKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAg ICAgICAgICAgICAgIGZvciAoYXV0byYgaW5saW5lTGV2ZWxCb3ggOiBsaW5lQm94Lm5vblJvb3RJ bmxpbmVMZXZlbEJveGVzKCkpIHsKKyAgICAgICAgICAgICAgICAgICAgaWYgKCFpbmxpbmVMZXZl bEJveC0+aXNJbmxpbmVCb3goKSkKKyAgICAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwor ICAgICAgICAgICAgICAgICAgICBpZiAoaW5saW5lTGV2ZWxCb3gtPmhhc0NvbnRlbnQoKSkKKyAg ICAgICAgICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICAgICAgICAgIH0KKyAg ICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgICAgICB9CisgICAgICAgIH0gZWxz ZSB7CiAgICAgICAgICAgICBhdXRvJiBib3hHZW9tZXRyeSA9IGZvcm1hdHRpbmdDb250ZXh0KCku Z2VvbWV0cnlGb3JCb3goaW5saW5lTGV2ZWxCb3gubGF5b3V0Qm94KCkpOwogICAgICAgICAgICAg aWYgKGJveEdlb21ldHJ5Lmhvcml6b250YWxCb3JkZXIoKSB8fCBib3hHZW9tZXRyeS5ob3Jpem9u dGFsUGFkZGluZygpLnZhbHVlT3IoMF9sdSkpIHsKICAgICAgICAgICAgICAgICAvLyBIb3Jpem9u dGFsIGJvcmRlciBhbmQgcGFkZGluZyBtYWtlIHRoZSBpbmxpbmUgYm94IHN0cmV0Y2ggdGhlIGxp bmUgKGUuZy4gPHNwYW4gc3R5bGU9InBhZGRpbmc6IDEwcHg7Ij48L3NwYW4+KS4K 419521 2021-02-06 19:48:00 -0800 2021-02-06 21:08:21 -0800 Patch bug-221522-20210206194759.patch text/plain 5809 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyNDYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjNkN2VjODZiMmU4Yjkw ZjkyNDg2NWIzOWI1ZDc1ODFmNzUxNmNkZC4uYzU2MjkxZjY2YzY3YTAzNjBhOGRiOGY3ZDZjMGFj MzQxNjU4NDVhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTAyLTA2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBJbmNvcnJl Y3QgbGluZSBib3ggaGVpZ2h0IHdoZW4gbGluZS1oZWlnaHQgaXMgc2V0IG9uIGFuIGVtcHR5IHJv b3QgaW5saW5lIGJveAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjIxNTIyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQW50dGkgS29pdmlzdG8uCisKKyAg ICAgICAgVGhlIHJvb3QgaW5saW5lIGJveCB3aXRoIG5vbi1pbml0aWFsIGxpbmUgaGVpZ2h0IHZh bHVlIHN0cmV0Y2hlcyB0aGUgbGluZSBib3ggZXZlbiB3aGVuIHJvb3QgaGFzIG5vIGNvbnRlbnQu CisKKyAgICAgICAgZS5nLiA8ZGl2IHN0eWxlPSJsaW5lLWhlaWdodDogMTAwcHg7Ij48c3Bhbj5j b250ZW50PC9zcGFuPjwvZGl2PgorICAgICAgICBUaGlzIGNvbnRlbnQgcHJvZHVjZXMgYSB+MTAw cHggdGFsbCBsaW5lIGJveC4KKworICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OlF1aXJrczo6aW5saW5lTGV2ZWxCb3hBZmZlY3Rz TGluZUJveCBjb25zdCk6CisKIDIwMjEtMDItMDYgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxl LmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIENvbnRpbnVhdGlvbiBwcmUgYW5kIHBvc3QgYmxv Y2sgaW5saW5lIGJveGVzIHNob3VsZCBub3QgaGF2ZSBib3RoIHRoZSBzdGFydCBhbmQgZW5kIGRl Y29yYXRpb25zIG9mIHRoZSBvcmlnaW5hbCBpbmxpbmUgYm94CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdl b21ldHJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGlu ZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCmluZGV4IDcxNTJhZDk2OWFiMzFhZjY1ZDcx ODM0NmU3NDlmZDc4OWRmNWQ1OWMuLjFjZjliZjg3ZmIzNGRkNTFhZTAxYWQ4ZjIyOTJkNThhZjI4 YmQ0ODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnku Y3BwCkBAIC0zMzMsNyArMzMzLDcgQEAgdm9pZCBMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0SW5s aW5lTGV2ZWxCb3hlcyhMaW5lQm94JiBsaW5lQm94LCBjb25zdCBMaW5lOjpSdW4KICAgICAgICAg Ly8gRklYTUU6IEFkZCBzdXBwb3J0IGZvciBzaW1wbGUgaW5saW5lIGJveGVzIHRvby4KICAgICAg ICAgLy8gV2UgY2FuIGRvIHNpbXBsaWZpZWQgdmVydGljYWwgYWxpZ25tZW50IHdpdGggbm9uLWF0 b21pYyBpbmxpbmUgYm94ZXMgYXMgbG9uZyBhcyB0aGUgbGluZSBoYXMgbm8gY29udGVudC4KICAg ICAgICAgLy8gZS5nLiA8ZGl2PjxzcGFuPjwvc3Bhbj48c3Bhbj48L3NwYW4+PC9kaXY+IGlzIHN0 aWxsIG9rYXkuCi0gICAgICAgIG1faW5saW5lTGV2ZWxCb3hlc05lZWRWZXJ0aWNhbEFsaWdubWVu dCA9IGxpbmVIYXNDb250ZW50OworICAgICAgICBtX2lubGluZUxldmVsQm94ZXNOZWVkVmVydGlj YWxBbGlnbm1lbnQgPSBtX2lubGluZUxldmVsQm94ZXNOZWVkVmVydGljYWxBbGlnbm1lbnQgfHwg bGluZUhhc0NvbnRlbnQ7CiAgICAgICAgIGlmIChydW4uaXNJbmxpbmVCb3hTdGFydCgpKSB7CiAg ICAgICAgICAgICBhdXRvIGluaXRpYWxMb2dpY2FsV2lkdGggPSBsaW5lQm94LmxvZ2ljYWxXaWR0 aCgpIC0gcnVuLmxvZ2ljYWxMZWZ0KCk7CiAgICAgICAgICAgICBBU1NFUlQoaW5pdGlhbExvZ2lj YWxXaWR0aCA+PSAwKTsKQEAgLTM2OSw2ICszNjksMTEgQEAgdm9pZCBMaW5lQm94QnVpbGRlcjo6 Y29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyhMaW5lQm94JiBsaW5lQm94LCBjb25zdCBMaW5lOjpS dW4KICAgICB9CiAKICAgICBsaW5lQm94LnNldEhhc0NvbnRlbnQobGluZUhhc0NvbnRlbnQpOwor ICAgIGlmIChsaW5lSGFzQ29udGVudCAmJiAhbV9pbmxpbmVMZXZlbEJveGVzTmVlZFZlcnRpY2Fs QWxpZ25tZW50KSB7CisgICAgICAgIC8vIEZJWE1FOiBBZGQgZmFzdCBwYXRoIHN1cHBvcnQgZm9y IGxpbmUtaGVpZ2h0IGNvbnRlbnQuCisgICAgICAgIG1faW5saW5lTGV2ZWxCb3hlc05lZWRWZXJ0 aWNhbEFsaWdubWVudCA9ICFyb290Qm94KCkuc3R5bGUoKS5saW5lSGVpZ2h0KCkuaXNOZWdhdGl2 ZSgpOworICAgIH0KKwogICAgIGlmICghbV9pbmxpbmVMZXZlbEJveGVzTmVlZFZlcnRpY2FsQWxp Z25tZW50KSB7CiAgICAgICAgIGlmICghbGluZUhhc0NvbnRlbnQpIHsKICAgICAgICAgICAgIHNp bXBsaWZpZWRWZXJ0aWNhbEFsaWdubWVudC5yb290SW5saW5lQm94VG9wID0gLXJvb3RJbmxpbmVC b3guYmFzZWxpbmUoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtz LmNwcAppbmRleCAwY2ZhNDI2MzQyNmRkM2VhY2VmMzU3MGFhOTZhODc5ZmQ1ZjUzNjRjLi44ZDNj NjY4YmY4ZDA5ZDIyMDA1NTQ2MjcwOWRhYjAyMzc3NmQyZmNmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1 aXJrcy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lRm9ybWF0dGluZ0NvbnRleHRRdWlya3MuY3BwCkBAIC02OSwxNyArNjksMzUgQEAgYm9vbCBJ bmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6UXVpcmtzOjppbmxpbmVMZXZlbEJveEFmZmVjdHNMaW5l Qm94KGNvbnN0IExpbmVCb3gKICAgICB9CiAgICAgaWYgKGlubGluZUxldmVsQm94LmlzSW5saW5l Qm94KCkpIHsKICAgICAgICAgLy8gSW5saW5lIGJveGVzIChlLmcuIHJvb3QgaW5saW5lIGJveCBv ciA8c3Bhbj4pIGFmZmVjdHMgbGluZSBib3hlcyBlaXRoZXIgdGhyb3VnaCB0aGUgc3RydXQgb3Ig YWN0dWFsIGNvbnRlbnQuCi0gICAgICAgIGlmIChpbmxpbmVMZXZlbEJveC5oYXNDb250ZW50KCkp CisgICAgICAgIGF1dG8gaW5saW5lQm94SGFzSW1hZ2luYXJ5U3RydXQgPSBsYXlvdXRTdGF0ZSgp LmluU3RhbmRhcmRzTW9kZSgpOworICAgICAgICBpZiAoaW5saW5lTGV2ZWxCb3guaGFzQ29udGVu dCgpIHx8IGlubGluZUJveEhhc0ltYWdpbmFyeVN0cnV0KQogICAgICAgICAgICAgcmV0dXJuIHRy dWU7Ci0gICAgICAgIGlmICghaW5saW5lTGV2ZWxCb3guaXNSb290SW5saW5lQm94KCkpIHsKLSAg ICAgICAgICAgIGF1dG8mIGJveEdlb21ldHJ5ID0gZm9ybWF0dGluZ0NvbnRleHQoKS5nZW9tZXRy eUZvckJveChpbmxpbmVMZXZlbEJveC5sYXlvdXRCb3goKSk7Ci0gICAgICAgICAgICBpZiAoYm94 R2VvbWV0cnkuaG9yaXpvbnRhbEJvcmRlcigpIHx8IGJveEdlb21ldHJ5Lmhvcml6b250YWxQYWRk aW5nKCkudmFsdWVPcigwX2x1KSkgewotICAgICAgICAgICAgICAgIC8vIEhvcml6b250YWwgYm9y ZGVyIGFuZCBwYWRkaW5nIG1ha2UgdGhlIGlubGluZSBib3ggc3RyZXRjaCB0aGUgbGluZSAoZS5n LiA8c3BhbiBzdHlsZT0icGFkZGluZzogMTBweDsiPjwvc3Bhbj4pLgotICAgICAgICAgICAgICAg IHJldHVybiB0cnVlOwotICAgICAgICAgICAgfQorICAgICAgICBpZiAoaW5saW5lTGV2ZWxCb3gu aXNSb290SW5saW5lQm94KCkpIHsKKyAgICAgICAgICAgIGF1dG8gc2hvdWxkUm9vdElubGluZUJv eFdpdGhOb0NvbnRlbnRTdHJldGNoTGluZUJveCA9IFsmXSB7CisgICAgICAgICAgICAgICAgaWYg KGlubGluZUxldmVsQm94LmxheW91dEJveCgpLnN0eWxlKCkubGluZUhlaWdodCgpLmlzTmVnYXRp dmUoKSkKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICAgICAgICAg IC8vIFRoZSByb290IGlubGluZSBib3ggd2l0aCBub24taW5pdGlhbCBsaW5lIGhlaWdodCB2YWx1 ZSBzdHJldGNoZXMgdGhlIGxpbmUgYm94IGV2ZW4gd2hlbiByb290IGhhcyBubyBjb250ZW50Cisg ICAgICAgICAgICAgICAgLy8gYnV0IHRoZXJlJ3MgYXQgbGVhc3Qgb25lIGlubGluZSBib3ggd2l0 aCBjb250ZW50LgorICAgICAgICAgICAgICAgIC8vIGUuZy4gPGRpdiBzdHlsZT0ibGluZS1oZWln aHQ6IDEwMHB4OyI+PHNwYW4+Y29udGVudDwvc3Bhbj48L2Rpdj4KKyAgICAgICAgICAgICAgICBp ZiAoIWxpbmVCb3guaGFzSW5saW5lQm94KCkpCisgICAgICAgICAgICAgICAgICAgIHJldHVybiBm YWxzZTsKKyAgICAgICAgICAgICAgICBmb3IgKGF1dG8mIGlubGluZUxldmVsQm94IDogbGluZUJv eC5ub25Sb290SW5saW5lTGV2ZWxCb3hlcygpKSB7CisgICAgICAgICAgICAgICAgICAgIGlmICgh aW5saW5lTGV2ZWxCb3gtPmlzSW5saW5lQm94KCkpCisgICAgICAgICAgICAgICAgICAgICAgICBj b250aW51ZTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKGlubGluZUxldmVsQm94LT5oYXNDb250 ZW50KCkpCisgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgICAg ICAgICB9CisgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICAgICAgfTsKKyAg ICAgICAgICAgIHJldHVybiBzaG91bGRSb290SW5saW5lQm94V2l0aE5vQ29udGVudFN0cmV0Y2hM aW5lQm94KCk7CiAgICAgICAgIH0KLSAgICAgICAgYXV0byBpbmxpbmVCb3hIYXNJbWFnaW5hcnlT dHJ1dCA9IGxheW91dFN0YXRlKCkuaW5TdGFuZGFyZHNNb2RlKCk7Ci0gICAgICAgIHJldHVybiBp bmxpbmVCb3hIYXNJbWFnaW5hcnlTdHJ1dDsKKyAgICAgICAgLy8gTm9uLXJvb3QgaW5saW5lIGJv eGVzIChlLmcuIDxzcGFuPikuCisgICAgICAgIGF1dG8mIGJveEdlb21ldHJ5ID0gZm9ybWF0dGlu Z0NvbnRleHQoKS5nZW9tZXRyeUZvckJveChpbmxpbmVMZXZlbEJveC5sYXlvdXRCb3goKSk7Cisg ICAgICAgIGlmIChib3hHZW9tZXRyeS5ob3Jpem9udGFsQm9yZGVyKCkgfHwgYm94R2VvbWV0cnku aG9yaXpvbnRhbFBhZGRpbmcoKS52YWx1ZU9yKDBfbHUpKSB7CisgICAgICAgICAgICAvLyBIb3Jp em9udGFsIGJvcmRlciBhbmQgcGFkZGluZyBtYWtlIHRoZSBpbmxpbmUgYm94IHN0cmV0Y2ggdGhl IGxpbmUgKGUuZy4gPHNwYW4gc3R5bGU9InBhZGRpbmc6IDEwcHg7Ij48L3NwYW4+KS4KKyAgICAg ICAgICAgIHJldHVybiB0cnVlOworICAgICAgICB9CisgICAgICAgIHJldHVybiBmYWxzZTsKICAg ICB9CiAgICAgaWYgKGlubGluZUxldmVsQm94LmlzQXRvbWljSW5saW5lTGV2ZWxCb3goKSkgewog ICAgICAgICBpZiAoaW5saW5lTGV2ZWxCb3gubGF5b3V0Qm91bmRzKCkuaGVpZ2h0KCkpCg==