214784 2020-07-25 05:11:20 -0700 [LFC][IFC] Rename LineBox::baseline to alignment baseline 2020-08-24 09:22:11 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 215087 215752 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1675001 0 zalan 2020-07-25 05:11:20 -0700 https://www.w3.org/TR/css-inline-3/#alignment-baseline 1675002 1 405227 zalan 2020-07-25 05:17:20 -0700 Created attachment 405227 Patch 1677114 2 webkit-bug-importer 2020-08-01 05:12:18 -0700 <rdar://problem/66422103> 1682339 3 407105 zalan 2020-08-24 08:48:59 -0700 Created attachment 407105 Patch 1682347 4 ews-feeder 2020-08-24 09:22:10 -0700 Committed r266062: <https://trac.webkit.org/changeset/266062> All reviewed patches have been landed. Closing bug and clearing flags on attachment 407105. 405227 2020-07-25 05:17:20 -0700 2020-08-24 08:48:58 -0700 Patch bug-214784-20200725051719.patch text/plain 10500 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNDE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGE4NDE0YzQwZTQ5MzZi MDA2ZjFhMjJmMjIyY2FiM2QxODE3YzBkMC4uZDllYmQ0Njk1Y2ZlZWQ1OWU4OTIwMTY0YzcyMzg2 MDQ3YjQ2MWU3YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIwLTA3LTI1ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBSZW5hbWUg TGluZUJveDo6YmFzZWxpbmUgdG8gYWxpZ25tZW50IGJhc2VsaW5lCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQ3ODQKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTZWUgaHR0cHM6Ly93d3cudzMub3JnL1RS L2Nzcy1pbmxpbmUtMy8jYWxpZ25tZW50LWJhc2VsaW5lCisgICAgICAgIFRoaXMgaGVscHMgdG8g dGVsbCB0aGUgZG9taW5hbnQgYW5kIHRoZSBhbGlnbm1lbnQgYmFzZWxpbmVzIGFwYXJ0IGR1cmlu ZyBsaW5lIGJ1aWxkaW5nLiAKKworICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5s aW5lRm9ybWF0dGluZ0NvbnRleHQ6OnNldERpc3BsYXlCb3hlc0ZvckxpbmUpOgorICAgICAgICAq IGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guaDoKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6TGluZUJveDo6TGluZUJveCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6 OkxpbmVCb3g6OnNldEFsaWdubWVudEJhc2VsaW5lSWZHcmVhdGVyKToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6TGluZUJveDo6c2V0QXNjZW50SWZHcmVhdGVyKToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6TGluZUJveDo6YWxpZ25tZW50QmFzZWxpbmUgY29uc3QpOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94OjpyZXNldEFsaWdubWVudEJhc2VsaW5lKToKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveDo6c2V0QmFzZWxpbmVJZkdyZWF0ZXIpOiBEZWxl dGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94OjpiYXNlbGluZSBjb25zdCk6 IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OnJlc2V0QmFzZWxp bmUpOiBEZWxldGVkLgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxp bmVCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OmNs b3NlKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OmFkanVzdEJhc2Vs aW5lQW5kTGluZUhlaWdodCk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lTGluZUJ1aWxkZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6 OmJhc2VsaW5lIGNvbnN0KToKKwogMjAyMC0wNy0yNCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBw bGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gVXNlIHRoZSB0ZXJtICdiYXNlbGluZScgdG8g aW5kaWNhdGUgYWxpZ25tZW50IGJhc2VsaW5lCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4 dC5jcHAKaW5kZXggNzc5ZDM4MjA2NzVkOWFjYjE3NzhhN2MzYjZlOGEzNDNmMDZmNzdmZC4uNTFl ZTYzOTViZDg4ZjUyN2ZmMjBmNDJiNWU0YzFkMzdkMjIxZDI2NyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZv cm1hdHRpbmdDb250ZXh0LmNwcApAQCAtNTY5LDcgKzU2OSw3IEBAIHZvaWQgSW5saW5lRm9ybWF0 dGluZ0NvbnRleHQ6OnNldERpc3BsYXlCb3hlc0ZvckxpbmUoY29uc3QgTGluZUxheW91dENvbnRl eHQ6OkxpCiAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgIH0KICAgICAvLyBGSVhN RTogVGhpcyBpcyB3aGVyZSB0aGUgbG9naWNhbCB0byBwaHlzaWNhbCB0cmFuc2xhdGUgc2hvdWxk IGhhcHBlbi4KLSAgICBpbmxpbmVDb250ZW50LmxpbmVCb3hlcy5hcHBlbmQoeyBsaW5lQm94Lmxv Z2ljYWxSZWN0KCksIGxpbmVCb3guc2Nyb2xsYWJsZU92ZXJmbG93KCksIGxpbmVJbmtPdmVyZmxv dywgbGluZUJveC5iYXNlbGluZSgpIH0pOworICAgIGlubGluZUNvbnRlbnQubGluZUJveGVzLmFw cGVuZCh7IGxpbmVCb3gubG9naWNhbFJlY3QoKSwgbGluZUJveC5zY3JvbGxhYmxlT3ZlcmZsb3co KSwgbGluZUlua092ZXJmbG93LCBsaW5lQm94LmFsaWdubWVudEJhc2VsaW5lKCkgfSk7CiB9CiAK IHZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmludmFsaWRhdGVGb3JtYXR0aW5nU3RhdGUo Y29uc3QgSW52YWxpZGF0aW9uU3RhdGUmKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oCmluZGV4IGQ1ZDc1MzIwMDcyNmFh MWQxMWI2ZDI3OTM3ZWIyM2Q4ZTk4M2VkNmEuLmFkMDgyMDM0MmVjNjhhYzEyMTA3ZDliNzJkNzI2 OGJkODNjMzMwNDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUxpbmVCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmgKQEAgLTUwLDcgKzUwLDcgQEAgcHVibGljOgogICAg ICAgICBBc2NlbnRBbmREZXNjZW50IGFzY2VudEFuZERlc2NlbnQ7CiAgICAgfTsKIAotICAgIExp bmVCb3goY29uc3QgRGlzcGxheTo6SW5saW5lUmVjdCYsIGNvbnN0IEFzY2VudEFuZERlc2NlbnQm LCBJbmxpbmVMYXlvdXRVbml0IGJhc2VsaW5lKTsKKyAgICBMaW5lQm94KGNvbnN0IERpc3BsYXk6 OklubGluZVJlY3QmLCBjb25zdCBBc2NlbnRBbmREZXNjZW50JiwgSW5saW5lTGF5b3V0VW5pdCBh bGlnbm1lbnRCYXNlbGluZSk7CiAgICAgTGluZUJveCgpID0gZGVmYXVsdDsKIAogICAgIGNvbnN0 IERpc3BsYXk6OklubGluZVJlY3QmIGxvZ2ljYWxSZWN0KCkgY29uc3QgeyByZXR1cm4gbV9yZWN0 OyB9CkBAIC02NCwxMiArNjQsMTIgQEAgcHVibGljOgogICAgIElubGluZUxheW91dFVuaXQgbG9n aWNhbFdpZHRoKCkgY29uc3QgeyByZXR1cm4gbV9yZWN0LndpZHRoKCk7IH0KICAgICBJbmxpbmVM YXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQoKSBjb25zdCB7IHJldHVybiBtX3JlY3QuaGVpZ2h0KCk7 IH0KIAotICAgIC8vIEJhc2VsaW5lIG9mZnNldCBmcm9tIGxpbmUgbG9naWNhbCB0b3AuIE5vdGUg dGhhdCBvZmZzZXQgZG9lcyBub3QgbmVjZXNzYXJpbHkgZXF1YWwgdG8gYXNjZW50LgorICAgIC8v IEFsaWdtZW50IGJhc2VsaW5lIGZyb20gbGluZSBsb2dpY2FsIHRvcC4KICAgICAvLwogICAgIC8v IC0tLS0tLS0tLS0tLS0tLS0tLS0gICAgbGluZSBsb2dpY2FsIHRvcCAgICAgLS0tLS0tLS0tLS0t LS0tLS0tLSAodG9wIGFsaWduKQogICAgIC8vICAgICAgICAgICAgIF4gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXgogICAgIC8vICAgICAgICAgICAgIHwgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXiAgICAgICAgICAgfAotICAgIC8vICAgXiAg ICAgICAgIHwgYmFzZWxpbmUgb2Zmc2V0ICAgICAgICAgICAgICAgICAgfCAgICAgICAgICAgfCBi YXNlbGluZSBvZmZzZXQKKyAgICAvLyAgIF4gICAgICAgICB8IGFsaWdubWVudCBiYXNlbGluZSAg ICAgICAgICAgICAgIHwgICAgICAgICAgIHwgYWxpZ25tZW50IGJhc2VsaW5lCiAgICAgLy8gICB8 ICAgICAgICAgfCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgICAgICAgICB8 CiAgICAgLy8gICB8IGFzY2VudCAgfCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8 IGFzY2VudCAgICB8CiAgICAgLy8gICB8ICAgICAgICAgfCAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICB2ICAgICAgICAgICB2CkBAIC03OSwxNCArNzksMTQgQEAgcHVibGljOgogICAg IC8vICAgfCBkZXNjZW50ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdgogICAg IC8vICAgdgogICAgIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0gICAgbGluZSBsb2dpY2FsIGJvdHRv bSAgLS0tLS0tLS0tLS0tLS0tLS0tLQotICAgIElubGluZUxheW91dFVuaXQgYmFzZWxpbmUoKSBj b25zdDsKKyAgICBJbmxpbmVMYXlvdXRVbml0IGFsaWdubWVudEJhc2VsaW5lKCkgY29uc3Q7CiAg ICAgY29uc3QgQXNjZW50QW5kRGVzY2VudCYgYXNjZW50QW5kRGVzY2VudCgpIGNvbnN0IHsgcmV0 dXJuIG1fcm9vdElubGluZUJveC5hc2NlbnRBbmREZXNjZW50OyB9CiAKLSAgICB2b2lkIHNldEJh c2VsaW5lSWZHcmVhdGVyKElubGluZUxheW91dFVuaXQpOworICAgIHZvaWQgc2V0QWxpZ25tZW50 QmFzZWxpbmVJZkdyZWF0ZXIoSW5saW5lTGF5b3V0VW5pdCk7CiAgICAgdm9pZCBzZXRBc2NlbnRJ ZkdyZWF0ZXIoSW5saW5lTGF5b3V0VW5pdCk7CiAgICAgdm9pZCBzZXREZXNjZW50SWZHcmVhdGVy KElubGluZUxheW91dFVuaXQpOwogCi0gICAgdm9pZCByZXNldEJhc2VsaW5lKCk7CisgICAgdm9p ZCByZXNldEFsaWdubWVudEJhc2VsaW5lKCk7CiAKICAgICB2b2lkIHNldExvZ2ljYWxIZWlnaHQo SW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0KSB7IG1fcmVjdC5zZXRIZWlnaHQobG9naWNh bEhlaWdodCk7IH0KIApAQCAtMTE1LDIyICsxMTUsMjIgQEAgcHVibGljOgogCiBwcml2YXRlOgog I2lmIEFTU0VSVF9FTkFCTEVECi0gICAgYm9vbCBtX2hhc1ZhbGlkQmFzZWxpbmUgeyBmYWxzZSB9 OworICAgIGJvb2wgbV9oYXNWYWxpZEFsaWdubWVudEJhc2VsaW5lIHsgZmFsc2UgfTsKICNlbmRp ZgogICAgIERpc3BsYXk6OklubGluZVJlY3QgbV9yZWN0OwogICAgIERpc3BsYXk6OklubGluZVJl Y3QgbV9zY3JvbGxhYmxlT3ZlcmZsb3c7Ci0gICAgSW5saW5lTGF5b3V0VW5pdCBtX2Jhc2VsaW5l IHsgMCB9OworICAgIElubGluZUxheW91dFVuaXQgbV9hbGlnbm1lbnRCYXNlbGluZSB7IDAgfTsK ICAgICBib29sIG1faXNDb25zaWRlcmVkRW1wdHkgeyB0cnVlIH07CiAgICAgSW5saW5lQm94IG1f cm9vdElubGluZUJveDsKIH07CiAKLWlubGluZSBMaW5lQm94OjpMaW5lQm94KGNvbnN0IERpc3Bs YXk6OklubGluZVJlY3QmIHJlY3QsIGNvbnN0IEFzY2VudEFuZERlc2NlbnQmIGFzY2VudEFuZERl c2NlbnQsIElubGluZUxheW91dFVuaXQgYmFzZWxpbmUpCitpbmxpbmUgTGluZUJveDo6TGluZUJv eChjb25zdCBEaXNwbGF5OjpJbmxpbmVSZWN0JiByZWN0LCBjb25zdCBBc2NlbnRBbmREZXNjZW50 JiBhc2NlbnRBbmREZXNjZW50LCBJbmxpbmVMYXlvdXRVbml0IGFsaWdubWVudEJhc2VsaW5lKQog ICAgIDogbV9yZWN0KHJlY3QpCi0gICAgLCBtX2Jhc2VsaW5lKGJhc2VsaW5lKQorICAgICwgbV9h bGlnbm1lbnRCYXNlbGluZShhbGlnbm1lbnRCYXNlbGluZSkKICAgICAsIG1fcm9vdElubGluZUJv eChhc2NlbnRBbmREZXNjZW50KQogewogI2lmIEFTU0VSVF9FTkFCTEVECi0gICAgbV9oYXNWYWxp ZEJhc2VsaW5lID0gdHJ1ZTsKKyAgICBtX2hhc1ZhbGlkQWxpZ25tZW50QmFzZWxpbmUgPSB0cnVl OwogI2VuZGlmCiB9CiAKQEAgLTE0NiwxOSArMTQ2LDE5IEBAIGlubGluZSB2b2lkIExpbmVCb3g6 OnNldExvZ2ljYWxIZWlnaHRJZkdyZWF0ZXIoSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0 KQogICAgIG1fcmVjdC5zZXRIZWlnaHQobG9naWNhbEhlaWdodCk7CiB9CiAKLWlubGluZSB2b2lk IExpbmVCb3g6OnNldEJhc2VsaW5lSWZHcmVhdGVyKElubGluZUxheW91dFVuaXQgYmFzZWxpbmUp CitpbmxpbmUgdm9pZCBMaW5lQm94OjpzZXRBbGlnbm1lbnRCYXNlbGluZUlmR3JlYXRlcihJbmxp bmVMYXlvdXRVbml0IGFsaWdubWVudEJhc2VsaW5lKQogewogI2lmIEFTU0VSVF9FTkFCTEVECi0g ICAgbV9oYXNWYWxpZEJhc2VsaW5lID0gdHJ1ZTsKKyAgICBtX2hhc1ZhbGlkQWxpZ25tZW50QmFz ZWxpbmUgPSB0cnVlOwogI2VuZGlmCi0gICAgbV9iYXNlbGluZSA9IHN0ZDo6bWF4KGJhc2VsaW5l LCBtX2Jhc2VsaW5lKTsKKyAgICBtX2FsaWdubWVudEJhc2VsaW5lID0gc3RkOjptYXgoYWxpZ25t ZW50QmFzZWxpbmUsIG1fYWxpZ25tZW50QmFzZWxpbmUpOwogfQogCiBpbmxpbmUgdm9pZCBMaW5l Qm94OjpzZXRBc2NlbnRJZkdyZWF0ZXIoSW5saW5lTGF5b3V0VW5pdCBhc2NlbnQpCiB7CiAgICAg aWYgKGFzY2VudCA8IG1fcm9vdElubGluZUJveC5hc2NlbnRBbmREZXNjZW50LmFzY2VudCkKICAg ICAgICAgcmV0dXJuOwotICAgIHNldEJhc2VsaW5lSWZHcmVhdGVyKGFzY2VudCk7CisgICAgc2V0 QWxpZ25tZW50QmFzZWxpbmVJZkdyZWF0ZXIoYXNjZW50KTsKICAgICBtX3Jvb3RJbmxpbmVCb3gu YXNjZW50QW5kRGVzY2VudC5hc2NlbnQgPSBhc2NlbnQ7CiB9CiAKQEAgLTE2OSwxOCArMTY5LDE4 IEBAIGlubGluZSB2b2lkIExpbmVCb3g6OnNldERlc2NlbnRJZkdyZWF0ZXIoSW5saW5lTGF5b3V0 VW5pdCBkZXNjZW50KQogICAgIG1fcm9vdElubGluZUJveC5hc2NlbnRBbmREZXNjZW50LmRlc2Nl bnQgPSBkZXNjZW50OwogfQogCi1pbmxpbmUgSW5saW5lTGF5b3V0VW5pdCBMaW5lQm94OjpiYXNl bGluZSgpIGNvbnN0CitpbmxpbmUgSW5saW5lTGF5b3V0VW5pdCBMaW5lQm94OjphbGlnbm1lbnRC YXNlbGluZSgpIGNvbnN0CiB7Ci0gICAgQVNTRVJUKG1faGFzVmFsaWRCYXNlbGluZSk7Ci0gICAg cmV0dXJuIG1fYmFzZWxpbmU7CisgICAgQVNTRVJUKG1faGFzVmFsaWRBbGlnbm1lbnRCYXNlbGlu ZSk7CisgICAgcmV0dXJuIG1fYWxpZ25tZW50QmFzZWxpbmU7CiB9CiAKLWlubGluZSB2b2lkIExp bmVCb3g6OnJlc2V0QmFzZWxpbmUoKQoraW5saW5lIHZvaWQgTGluZUJveDo6cmVzZXRBbGlnbm1l bnRCYXNlbGluZSgpCiB7CiAjaWYgQVNTRVJUX0VOQUJMRUQKLSAgICBtX2hhc1ZhbGlkQmFzZWxp bmUgPSB0cnVlOworICAgIG1faGFzVmFsaWRBbGlnbm1lbnRCYXNlbGluZSA9IHRydWU7CiAjZW5k aWYKLSAgICBtX2Jhc2VsaW5lID0gMF9sdTsKKyAgICBtX2FsaWdubWVudEJhc2VsaW5lID0gMF9s dTsKICAgICBtX3Jvb3RJbmxpbmVCb3guYXNjZW50QW5kRGVzY2VudC5kZXNjZW50ID0geyB9Owog ICAgIG1fcm9vdElubGluZUJveC5hc2NlbnRBbmREZXNjZW50LmFzY2VudCA9IHsgfTsKIH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxp bmVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUxpbmVCdWlsZGVyLmNwcAppbmRleCBjNWVmMzkzODc1NmYzZjkxMjc3ZmI3YWY4YzVmYzQw OTExMzc5YmQxLi4yYWVhNjdlY2M4M2ZiYWU0MzViZTY4ZDcxNTc5YTg1ZDU1MjI5YWQwIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5l QnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv SW5saW5lTGluZUJ1aWxkZXIuY3BwCkBAIC0xMTgsNyArMTE4LDcgQEAgTGluZUJ1aWxkZXI6OlJ1 bkxpc3QgTGluZUJ1aWxkZXI6OmNsb3NlKElzTGFzdExpbmVXaXRoSW5saW5lQ29udGVudCBpc0xh c3RMaW5lV2kKICAgICBhdXRvIGhhbmdpbmdDb250ZW50ID0gY29sbGVjdEhhbmdpbmdDb250ZW50 KGlzTGFzdExpbmVXaXRoSW5saW5lQ29udGVudCk7CiAgICAgYWRqdXN0QmFzZWxpbmVBbmRMaW5l SGVpZ2h0KCk7CiAgICAgaWYgKGlzVmlzdWFsbHlFbXB0eSgpKSB7Ci0gICAgICAgIG1fbGluZUJv eC5yZXNldEJhc2VsaW5lKCk7CisgICAgICAgIG1fbGluZUJveC5yZXNldEFsaWdubWVudEJhc2Vs aW5lKCk7CiAgICAgICAgIG1fbGluZUJveC5zZXRMb2dpY2FsSGVpZ2h0KHsgfSk7CiAgICAgfQog ICAgIGFsaWduQ29udGVudFZlcnRpY2FsbHkoKTsKQEAgLTYxMCw3ICs2MTAsNyBAQCB2b2lkIExp bmVCdWlsZGVyOjphZGp1c3RCYXNlbGluZUFuZExpbmVIZWlnaHQoKQogICAgICAgICAgICAgICAg ICAgICAvLyBUaGVyZSBoYXMgdG8gYmUgYXQgbGVhc3Qgb25lIGxpbmUgLWV2ZW4gaWYgaXQgaXMg ZW1wdHkuCiAgICAgICAgICAgICAgICAgICAgIGF1dG8mIGxhc3RMaW5lQm94ID0gZm9ybWF0dGlu Z1N0YXRlLmRpc3BsYXlJbmxpbmVDb250ZW50KCktPmxpbmVCb3hlcy5sYXN0KCk7CiAgICAgICAg ICAgICAgICAgICAgIGF1dG8gYmVmb3JlSGVpZ2h0ID0gYm94R2VvbWV0cnkubWFyZ2luQmVmb3Jl KCkgKyBib3hHZW9tZXRyeS5ib3JkZXJUb3AoKSArIGJveEdlb21ldHJ5LnBhZGRpbmdUb3AoKS52 YWx1ZU9yKDApOwotICAgICAgICAgICAgICAgICAgICBtX2xpbmVCb3guc2V0QmFzZWxpbmVJZkdy ZWF0ZXIoYmVmb3JlSGVpZ2h0ICsgbGFzdExpbmVCb3guYmFzZWxpbmUoKSk7CisgICAgICAgICAg ICAgICAgICAgIG1fbGluZUJveC5zZXRBbGlnbm1lbnRCYXNlbGluZUlmR3JlYXRlcihiZWZvcmVI ZWlnaHQgKyBsYXN0TGluZUJveC5iYXNlbGluZSgpKTsKICAgICAgICAgICAgICAgICAgICAgbV9s aW5lQm94LnNldExvZ2ljYWxIZWlnaHRJZkdyZWF0ZXIobWFyZ2luQm94SGVpZ2h0KTsKICAgICAg ICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgICAgICAvLyBOb24gaW5saW5lLWJs b2NrIGJveGVzIHNpdCBvbiB0aGUgYmFzZWxpbmUgKGluY2x1ZGluZyB0aGVpciBib3R0b20gbWFy Z2luKS4KQEAgLTYyOSw3ICs2MjksNyBAQCB2b2lkIExpbmVCdWlsZGVyOjphZGp1c3RCYXNlbGlu ZUFuZExpbmVIZWlnaHQoKQogICAgICAgICAgICAgICAgIGF1dG8gbGluZUxvZ2ljYWxIZWlnaHQg PSBtX2xpbmVCb3gubG9naWNhbEhlaWdodCgpOwogICAgICAgICAgICAgICAgIGlmIChtYXJnaW5C b3hIZWlnaHQgPiBsaW5lTG9naWNhbEhlaWdodCkgewogICAgICAgICAgICAgICAgICAgICBtX2xp bmVCb3guc2V0TG9naWNhbEhlaWdodElmR3JlYXRlcihtYXJnaW5Cb3hIZWlnaHQpOwotICAgICAg ICAgICAgICAgICAgICBtX2xpbmVCb3guc2V0QmFzZWxpbmVJZkdyZWF0ZXIobV9saW5lQm94LmJh c2VsaW5lKCkgKyAobWFyZ2luQm94SGVpZ2h0IC0gbGluZUxvZ2ljYWxIZWlnaHQpKTsKKyAgICAg ICAgICAgICAgICAgICAgbV9saW5lQm94LnNldEFsaWdubWVudEJhc2VsaW5lSWZHcmVhdGVyKG1f bGluZUJveC5hbGlnbm1lbnRCYXNlbGluZSgpICsgKG1hcmdpbkJveEhlaWdodCAtIGxpbmVMb2dp Y2FsSGVpZ2h0KSk7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIGJyZWFrOwog ICAgICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZv cm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmgKaW5kZXggMjI1OGRlN2ZkZDdlY2JkODU5 ZjYwODQ2YTc3NmJiNTNjZmVhNjg2Yi4uNTc0ZDE4Njg1MmI4YTBkZmFkODQ5YjI5MTY2MDcyYzhh NDdlMGFjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lTGluZUJ1aWxkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5oCkBAIC0xNjEsNyArMTYxLDcgQEAgcHJpdmF0 ZToKIAogICAgIElubGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxXaWR0aCgpIGNvbnN0IHsg cmV0dXJuIG1fbGluZUJveC5sb2dpY2FsV2lkdGgoKTsgfQogICAgIElubGluZUxheW91dFVuaXQg Y29udGVudExvZ2ljYWxSaWdodCgpIGNvbnN0IHsgcmV0dXJuIG1fbGluZUJveC5sb2dpY2FsUmln aHQoKTsgfQotICAgIElubGluZUxheW91dFVuaXQgYmFzZWxpbmUoKSBjb25zdCB7IHJldHVybiBt X2xpbmVCb3guYmFzZWxpbmUoKTsgfQorICAgIElubGluZUxheW91dFVuaXQgYmFzZWxpbmUoKSBj b25zdCB7IHJldHVybiBtX2xpbmVCb3guYWxpZ25tZW50QmFzZWxpbmUoKTsgfQogCiAgICAgc3Ry dWN0IElubGluZVJ1bkRldGFpbHMgewogICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxX aWR0aCB7IDAgfTsK 407105 2020-08-24 08:48:59 -0700 2020-08-24 09:22:11 -0700 Patch bug-214784-20200824084859.patch text/plain 10646 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2MDU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzM2ODhiZmJlNzM0NzU0 MTI2MTY5ODFkZTgzNGYzM2ZkOTMzNGIxZS4uYTExMGE5NTBlZmRkMGQ4ODcxYzZkMDM1OTg2YzI5 NDllYTE1YjI5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIwLTA4LTI0ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBSZW5hbWUg TGluZUJveDo6YmFzZWxpbmUgdG8gYWxpZ25tZW50IGJhc2VsaW5lCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQ3ODQKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTZWUgaHR0cHM6Ly93d3cudzMub3JnL1RS L2Nzcy1pbmxpbmUtMy8jYWxpZ25tZW50LWJhc2VsaW5lCisgICAgICAgIFVzZSB0aGUgc3BlYyB0 ZXJtLiBUaGlzIGhlbHBzIHRvIHRlbGwgdGhlIGRvbWluYW50IGFuZCB0aGUgYWxpZ25tZW50IGJh c2VsaW5lcyBhcGFydCBkdXJpbmcgbGluZSBidWlsZGluZy4gCisKKyAgICAgICAgKiBsYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0OjpzZXREaXNwbGF5Qm94ZXNG b3JMaW5lKToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94 Lmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OkxpbmVCb3gpOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94OjpzZXRBbGlnbm1lbnRCYXNlbGluZUlmR3JlYXRl cik6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OnNldEFzY2VudElmR3JlYXRl cik6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OmFsaWdubWVudEJhc2VsaW5l IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveDo6cmVzZXRBbGlnbm1l bnRCYXNlbGluZSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OnNldEJhc2Vs aW5lSWZHcmVhdGVyKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJv eDo6YmFzZWxpbmUgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpM aW5lQm94OjpyZXNldEJhc2VsaW5lKTogRGVsZXRlZC4KKyAgICAgICAgKiBsYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OkxpbmVCdWlsZGVyOjpjbG9zZSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVC dWlsZGVyOjphZGp1c3RCYXNlbGluZUFuZExpbmVIZWlnaHQpOgorICAgICAgICAqIGxheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmg6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OkxpbmVCdWlsZGVyOjpiYXNlbGluZSBjb25zdCk6CisKIDIwMjAtMDgtMjQgIFphbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIFVzZSB0aGUg dGVybSAnYmFzZWxpbmUnIHRvIGluZGljYXRlIGFsaWdubWVudCBiYXNlbGluZQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGlu Z0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IGNmMWNlZjRmYjYyMjM2M2QyODQ5MmE1OTA5 NTJmODE5OTE2ZTM1YmIuLmE1ZWJmOTAyNWE1MWU3ZjNlYjA4MjA1ZjNkOTk0MzQwZGIxYzE5YjEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGlu ZUZvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTU2OSw3ICs1NjksNyBA QCB2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpzZXREaXNwbGF5Qm94ZXNGb3JMaW5lKGNv bnN0IExpbmVMYXlvdXRDb250ZXh0OjpMaQogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsK ICAgICB9CiAgICAgLy8gRklYTUU6IFRoaXMgaXMgd2hlcmUgdGhlIGxvZ2ljYWwgdG8gcGh5c2lj YWwgdHJhbnNsYXRlIHNob3VsZCBoYXBwZW4uCi0gICAgaW5saW5lQ29udGVudC5saW5lQm94ZXMu YXBwZW5kKHsgbGluZUJveC5sb2dpY2FsUmVjdCgpLCBsaW5lQm94LnNjcm9sbGFibGVPdmVyZmxv dygpLCBsaW5lSW5rT3ZlcmZsb3csIGxpbmVCb3guYmFzZWxpbmUoKSB9KTsKKyAgICBpbmxpbmVD b250ZW50LmxpbmVCb3hlcy5hcHBlbmQoeyBsaW5lQm94LmxvZ2ljYWxSZWN0KCksIGxpbmVCb3gu c2Nyb2xsYWJsZU92ZXJmbG93KCksIGxpbmVJbmtPdmVyZmxvdywgbGluZUJveC5hbGlnbm1lbnRC YXNlbGluZSgpIH0pOwogfQogCiB2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjppbnZhbGlk YXRlRm9ybWF0dGluZ1N0YXRlKGNvbnN0IEludmFsaWRhdGlvblN0YXRlJikKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guaCBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guaApp bmRleCA3ZmNlZDYyZWUzM2ZhMzI3ZDI1YWE0NjY4MTk4NmI5ZDYwYzE1Mzc5Li42ZGFhODNjNmJj ZjQwZTIxNzc1MzI5MmUyNjJmMjE1MTFlNGM4YWRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmgKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oCkBAIC01MCw3ICs1 MCw3IEBAIHB1YmxpYzoKICAgICAgICAgQXNjZW50QW5kRGVzY2VudCBhc2NlbnRBbmREZXNjZW50 OwogICAgIH07CiAKLSAgICBMaW5lQm94KGNvbnN0IERpc3BsYXk6OklubGluZVJlY3QmLCBjb25z dCBBc2NlbnRBbmREZXNjZW50JiwgSW5saW5lTGF5b3V0VW5pdCBiYXNlbGluZSk7CisgICAgTGlu ZUJveChjb25zdCBEaXNwbGF5OjpJbmxpbmVSZWN0JiwgY29uc3QgQXNjZW50QW5kRGVzY2VudCYs IElubGluZUxheW91dFVuaXQgYWxpZ25tZW50QmFzZWxpbmUpOwogICAgIExpbmVCb3goKSA9IGRl ZmF1bHQ7CiAKICAgICBjb25zdCBEaXNwbGF5OjpJbmxpbmVSZWN0JiBsb2dpY2FsUmVjdCgpIGNv bnN0IHsgcmV0dXJuIG1fcmVjdDsgfQpAQCAtNjQsMTIgKzY0LDEyIEBAIHB1YmxpYzoKICAgICBJ bmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1fcmVjdC53aWR0 aCgpOyB9CiAgICAgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0KCkgY29uc3QgeyByZXR1 cm4gbV9yZWN0LmhlaWdodCgpOyB9CiAKLSAgICAvLyBCYXNlbGluZSBmcm9tIGxpbmUgbG9naWNh bCB0b3AuIE5vdGUgdGhhdCB0aGUgYmFzZWxpbmUgZG9lcyBub3QgbmVjZXNzYXJpbHkgZXF1YWwg dG8gYXNjZW50LgorICAgIC8vIEFsaWdtZW50IGJhc2VsaW5lIGZyb20gbGluZSBsb2dpY2FsIHRv cC4KICAgICAvLwogICAgIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0gICAgbGluZSBsb2dpY2FsIHRv cCAgICAgLS0tLS0tLS0tLS0tLS0tLS0tLSAodG9wIGFsaWduKQogICAgIC8vICAgICAgICAgICAg IF4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXgogICAgIC8v ICAgICAgICAgICAgIHwgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXiAgICAgICAg ICAgfAotICAgIC8vICAgXiAgICAgICAgIHwgYmFzZWxpbmUgICAgICAgICAgICAgICAgICAgICAg ICAgfCAgICAgICAgICAgfCBiYXNlbGluZQorICAgIC8vICAgXiAgICAgICAgIHwgYWxpZ25tZW50 IGJhc2VsaW5lICAgICAgICAgICAgICAgfCAgICAgICAgICAgfCBhbGlnbm1lbnQgYmFzZWxpbmUK ICAgICAvLyAgIHwgICAgICAgICB8ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwg ICAgICAgICAgIHwKICAgICAvLyAgIHwgYXNjZW50ICB8ICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHwgYXNjZW50ICAgIHwKICAgICAvLyAgIHwgICAgICAgICB8ICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHYgICAgICAgICAgIHYKQEAgLTc5LDE0ICs3OSwxNCBAQCBw dWJsaWM6CiAgICAgLy8gICB8IGRlc2NlbnQgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICB2CiAgICAgLy8gICB2CiAgICAgLy8gLS0tLS0tLS0tLS0tLS0tLS0tLSAgICBsaW5lIGxv Z2ljYWwgYm90dG9tICAtLS0tLS0tLS0tLS0tLS0tLS0tCi0gICAgSW5saW5lTGF5b3V0VW5pdCBi YXNlbGluZSgpIGNvbnN0OworICAgIElubGluZUxheW91dFVuaXQgYWxpZ25tZW50QmFzZWxpbmUo KSBjb25zdDsKICAgICBjb25zdCBBc2NlbnRBbmREZXNjZW50JiBhc2NlbnRBbmREZXNjZW50KCkg Y29uc3QgeyByZXR1cm4gbV9yb290SW5saW5lQm94LmFzY2VudEFuZERlc2NlbnQ7IH0KIAotICAg IHZvaWQgc2V0QmFzZWxpbmVJZkdyZWF0ZXIoSW5saW5lTGF5b3V0VW5pdCk7CisgICAgdm9pZCBz ZXRBbGlnbm1lbnRCYXNlbGluZUlmR3JlYXRlcihJbmxpbmVMYXlvdXRVbml0KTsKICAgICB2b2lk IHNldEFzY2VudElmR3JlYXRlcihJbmxpbmVMYXlvdXRVbml0KTsKICAgICB2b2lkIHNldERlc2Nl bnRJZkdyZWF0ZXIoSW5saW5lTGF5b3V0VW5pdCk7CiAKLSAgICB2b2lkIHJlc2V0QmFzZWxpbmUo KTsKKyAgICB2b2lkIHJlc2V0QWxpZ25tZW50QmFzZWxpbmUoKTsKICAgICB2b2lkIHJlc2V0RGVz Y2VudCgpIHsgbV9yb290SW5saW5lQm94LmFzY2VudEFuZERlc2NlbnQuZGVzY2VudCA9IHsgfTsg fQogCiAgICAgdm9pZCBzZXRMb2dpY2FsSGVpZ2h0KElubGluZUxheW91dFVuaXQgbG9naWNhbEhl aWdodCkgeyBtX3JlY3Quc2V0SGVpZ2h0KGxvZ2ljYWxIZWlnaHQpOyB9CkBAIC0xMTYsMjIgKzEx NiwyMiBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAjaWYgQVNTRVJUX0VOQUJMRUQKLSAgICBib29s IG1faGFzVmFsaWRCYXNlbGluZSB7IGZhbHNlIH07CisgICAgYm9vbCBtX2hhc1ZhbGlkQWxpZ25t ZW50QmFzZWxpbmUgeyBmYWxzZSB9OwogI2VuZGlmCiAgICAgRGlzcGxheTo6SW5saW5lUmVjdCBt X3JlY3Q7CiAgICAgRGlzcGxheTo6SW5saW5lUmVjdCBtX3Njcm9sbGFibGVPdmVyZmxvdzsKLSAg ICBJbmxpbmVMYXlvdXRVbml0IG1fYmFzZWxpbmUgeyAwIH07CisgICAgSW5saW5lTGF5b3V0VW5p dCBtX2FsaWdubWVudEJhc2VsaW5lIHsgMCB9OwogICAgIGJvb2wgbV9pc0NvbnNpZGVyZWRFbXB0 eSB7IHRydWUgfTsKICAgICBJbmxpbmVCb3ggbV9yb290SW5saW5lQm94OwogfTsKIAotaW5saW5l IExpbmVCb3g6OkxpbmVCb3goY29uc3QgRGlzcGxheTo6SW5saW5lUmVjdCYgcmVjdCwgY29uc3Qg QXNjZW50QW5kRGVzY2VudCYgYXNjZW50QW5kRGVzY2VudCwgSW5saW5lTGF5b3V0VW5pdCBiYXNl bGluZSkKK2lubGluZSBMaW5lQm94OjpMaW5lQm94KGNvbnN0IERpc3BsYXk6OklubGluZVJlY3Qm IHJlY3QsIGNvbnN0IEFzY2VudEFuZERlc2NlbnQmIGFzY2VudEFuZERlc2NlbnQsIElubGluZUxh eW91dFVuaXQgYWxpZ25tZW50QmFzZWxpbmUpCiAgICAgOiBtX3JlY3QocmVjdCkKLSAgICAsIG1f YmFzZWxpbmUoYmFzZWxpbmUpCisgICAgLCBtX2FsaWdubWVudEJhc2VsaW5lKGFsaWdubWVudEJh c2VsaW5lKQogICAgICwgbV9yb290SW5saW5lQm94KGFzY2VudEFuZERlc2NlbnQpCiB7CiAjaWYg QVNTRVJUX0VOQUJMRUQKLSAgICBtX2hhc1ZhbGlkQmFzZWxpbmUgPSB0cnVlOworICAgIG1faGFz VmFsaWRBbGlnbm1lbnRCYXNlbGluZSA9IHRydWU7CiAjZW5kaWYKIH0KIApAQCAtMTQ3LDE5ICsx NDcsMTkgQEAgaW5saW5lIHZvaWQgTGluZUJveDo6c2V0TG9naWNhbEhlaWdodElmR3JlYXRlcihJ bmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQpCiAgICAgbV9yZWN0LnNldEhlaWdodChsb2dp Y2FsSGVpZ2h0KTsKIH0KIAotaW5saW5lIHZvaWQgTGluZUJveDo6c2V0QmFzZWxpbmVJZkdyZWF0 ZXIoSW5saW5lTGF5b3V0VW5pdCBiYXNlbGluZSkKK2lubGluZSB2b2lkIExpbmVCb3g6OnNldEFs aWdubWVudEJhc2VsaW5lSWZHcmVhdGVyKElubGluZUxheW91dFVuaXQgYWxpZ25tZW50QmFzZWxp bmUpCiB7CiAjaWYgQVNTRVJUX0VOQUJMRUQKLSAgICBtX2hhc1ZhbGlkQmFzZWxpbmUgPSB0cnVl OworICAgIG1faGFzVmFsaWRBbGlnbm1lbnRCYXNlbGluZSA9IHRydWU7CiAjZW5kaWYKLSAgICBt X2Jhc2VsaW5lID0gc3RkOjptYXgoYmFzZWxpbmUsIG1fYmFzZWxpbmUpOworICAgIG1fYWxpZ25t ZW50QmFzZWxpbmUgPSBzdGQ6Om1heChhbGlnbm1lbnRCYXNlbGluZSwgbV9hbGlnbm1lbnRCYXNl bGluZSk7CiB9CiAKIGlubGluZSB2b2lkIExpbmVCb3g6OnNldEFzY2VudElmR3JlYXRlcihJbmxp bmVMYXlvdXRVbml0IGFzY2VudCkKIHsKICAgICBpZiAoYXNjZW50IDwgbV9yb290SW5saW5lQm94 LmFzY2VudEFuZERlc2NlbnQuYXNjZW50KQogICAgICAgICByZXR1cm47Ci0gICAgc2V0QmFzZWxp bmVJZkdyZWF0ZXIoYXNjZW50KTsKKyAgICBzZXRBbGlnbm1lbnRCYXNlbGluZUlmR3JlYXRlcihh c2NlbnQpOwogICAgIG1fcm9vdElubGluZUJveC5hc2NlbnRBbmREZXNjZW50LmFzY2VudCA9IGFz Y2VudDsKIH0KIApAQCAtMTcwLDE4ICsxNzAsMTggQEAgaW5saW5lIHZvaWQgTGluZUJveDo6c2V0 RGVzY2VudElmR3JlYXRlcihJbmxpbmVMYXlvdXRVbml0IGRlc2NlbnQpCiAgICAgbV9yb290SW5s aW5lQm94LmFzY2VudEFuZERlc2NlbnQuZGVzY2VudCA9IGRlc2NlbnQ7CiB9CiAKLWlubGluZSBJ bmxpbmVMYXlvdXRVbml0IExpbmVCb3g6OmJhc2VsaW5lKCkgY29uc3QKK2lubGluZSBJbmxpbmVM YXlvdXRVbml0IExpbmVCb3g6OmFsaWdubWVudEJhc2VsaW5lKCkgY29uc3QKIHsKLSAgICBBU1NF UlQobV9oYXNWYWxpZEJhc2VsaW5lKTsKLSAgICByZXR1cm4gbV9iYXNlbGluZTsKKyAgICBBU1NF UlQobV9oYXNWYWxpZEFsaWdubWVudEJhc2VsaW5lKTsKKyAgICByZXR1cm4gbV9hbGlnbm1lbnRC YXNlbGluZTsKIH0KIAotaW5saW5lIHZvaWQgTGluZUJveDo6cmVzZXRCYXNlbGluZSgpCitpbmxp bmUgdm9pZCBMaW5lQm94OjpyZXNldEFsaWdubWVudEJhc2VsaW5lKCkKIHsKICNpZiBBU1NFUlRf RU5BQkxFRAotICAgIG1faGFzVmFsaWRCYXNlbGluZSA9IHRydWU7CisgICAgbV9oYXNWYWxpZEFs aWdubWVudEJhc2VsaW5lID0gdHJ1ZTsKICNlbmRpZgotICAgIG1fYmFzZWxpbmUgPSAwX2x1Owor ICAgIG1fYWxpZ25tZW50QmFzZWxpbmUgPSAwX2x1OwogICAgIG1fcm9vdElubGluZUJveC5hc2Nl bnRBbmREZXNjZW50LmRlc2NlbnQgPSB7IH07CiAgICAgbV9yb290SW5saW5lQm94LmFzY2VudEFu ZERlc2NlbnQuYXNjZW50ID0geyB9OwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwCmluZGV4IDdk YzhmYzIzNzlkMTY0N2JmNTY1MWZiMmYwODMxMzNlYmJhYjI5NWIuLjVmYWEzYjdjNjg4YzMyNzg0 NmM0NWJlNmMwNTViMzRlNGExY2FiYTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAKQEAgLTEy MCw3ICsxMjAsNyBAQCBMaW5lQnVpbGRlcjo6UnVuTGlzdCBMaW5lQnVpbGRlcjo6Y2xvc2UoSXNM YXN0TGluZVdpdGhJbmxpbmVDb250ZW50IGlzTGFzdExpbmVXaQogICAgIGF1dG8gaGFuZ2luZ0Nv bnRlbnQgPSBjb2xsZWN0SGFuZ2luZ0NvbnRlbnQoaXNMYXN0TGluZVdpdGhJbmxpbmVDb250ZW50 KTsKICAgICBhZGp1c3RCYXNlbGluZUFuZExpbmVIZWlnaHQoKTsKICAgICBpZiAoaXNWaXN1YWxs eUVtcHR5KCkpIHsKLSAgICAgICAgbV9saW5lQm94LnJlc2V0QmFzZWxpbmUoKTsKKyAgICAgICAg bV9saW5lQm94LnJlc2V0QWxpZ25tZW50QmFzZWxpbmUoKTsKICAgICAgICAgbV9saW5lQm94LnNl dExvZ2ljYWxIZWlnaHQoeyB9KTsKICAgICB9CiAgICAgLy8gUmVtb3ZlIGRlc2NlbnQgd2hlbiBh bGwgY29udGVudCBpcyBiYXNlbGluZSBhbGlnbmVkIGJ1dCBub25lIG9mIHRoZW0gaGF2ZSBkZXNj ZW50LgpAQCAtNjIwLDcgKzYyMCw3IEBAIHZvaWQgTGluZUJ1aWxkZXI6OmFkanVzdEJhc2VsaW5l QW5kTGluZUhlaWdodCgpCiAgICAgICAgICAgICAgICAgICAgIC8vIFRoZXJlIGhhcyB0byBiZSBh dCBsZWFzdCBvbmUgbGluZSAtZXZlbiBpZiBpdCBpcyBlbXB0eS4KICAgICAgICAgICAgICAgICAg ICAgYXV0byYgbGFzdExpbmVCb3ggPSBmb3JtYXR0aW5nU3RhdGUuZGlzcGxheUlubGluZUNvbnRl bnQoKS0+bGluZUJveGVzLmxhc3QoKTsKICAgICAgICAgICAgICAgICAgICAgYXV0byBiZWZvcmVI ZWlnaHQgPSBib3hHZW9tZXRyeS5tYXJnaW5CZWZvcmUoKSArIGJveEdlb21ldHJ5LmJvcmRlclRv cCgpICsgYm94R2VvbWV0cnkucGFkZGluZ1RvcCgpLnZhbHVlT3IoMCk7Ci0gICAgICAgICAgICAg ICAgICAgIG1fbGluZUJveC5zZXRCYXNlbGluZUlmR3JlYXRlcihiZWZvcmVIZWlnaHQgKyBsYXN0 TGluZUJveC5iYXNlbGluZSgpKTsKKyAgICAgICAgICAgICAgICAgICAgbV9saW5lQm94LnNldEFs aWdubWVudEJhc2VsaW5lSWZHcmVhdGVyKGJlZm9yZUhlaWdodCArIGxhc3RMaW5lQm94LmJhc2Vs aW5lKCkpOwogICAgICAgICAgICAgICAgICAgICBtX2xpbmVCb3guc2V0TG9naWNhbEhlaWdodElm R3JlYXRlcihtYXJnaW5Cb3hIZWlnaHQpOwogICAgICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAg ICAgICAgICAgICAgICAgIC8vIE5vbiBpbmxpbmUtYmxvY2sgYm94ZXMgc2l0IG9uIHRoZSBiYXNl bGluZSAoaW5jbHVkaW5nIHRoZWlyIGJvdHRvbSBtYXJnaW4pLgpAQCAtNjM5LDcgKzYzOSw3IEBA IHZvaWQgTGluZUJ1aWxkZXI6OmFkanVzdEJhc2VsaW5lQW5kTGluZUhlaWdodCgpCiAgICAgICAg ICAgICAgICAgYXV0byBsaW5lTG9naWNhbEhlaWdodCA9IG1fbGluZUJveC5sb2dpY2FsSGVpZ2h0 KCk7CiAgICAgICAgICAgICAgICAgaWYgKG1hcmdpbkJveEhlaWdodCA+IGxpbmVMb2dpY2FsSGVp Z2h0KSB7CiAgICAgICAgICAgICAgICAgICAgIG1fbGluZUJveC5zZXRMb2dpY2FsSGVpZ2h0SWZH cmVhdGVyKG1hcmdpbkJveEhlaWdodCk7Ci0gICAgICAgICAgICAgICAgICAgIG1fbGluZUJveC5z ZXRCYXNlbGluZUlmR3JlYXRlcihtX2xpbmVCb3guYmFzZWxpbmUoKSArIChtYXJnaW5Cb3hIZWln aHQgLSBsaW5lTG9naWNhbEhlaWdodCkpOworICAgICAgICAgICAgICAgICAgICBtX2xpbmVCb3gu c2V0QWxpZ25tZW50QmFzZWxpbmVJZkdyZWF0ZXIobV9saW5lQm94LmFsaWdubWVudEJhc2VsaW5l KCkgKyAobWFyZ2luQm94SGVpZ2h0IC0gbGluZUxvZ2ljYWxIZWlnaHQpKTsKICAgICAgICAgICAg ICAgICB9CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRl ci5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1 aWxkZXIuaAppbmRleCBhZjg4ZWYzNWU4OWNkZmNlYTQyNDdiM2EwMmRlZGMwMzRhNDdjNjdkLi40 OGQyZDUxZmZhMTA2YzZmZTY0NDJjNjZhYzE1OWFmNGI5MzIxZmMwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWls ZGVyLmgKQEAgLTE2Miw3ICsxNjIsNyBAQCBwcml2YXRlOgogCiAgICAgSW5saW5lTGF5b3V0VW5p dCBjb250ZW50TG9naWNhbFdpZHRoKCkgY29uc3QgeyByZXR1cm4gbV9saW5lQm94LmxvZ2ljYWxX aWR0aCgpOyB9CiAgICAgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbFJpZ2h0KCkgY29u c3QgeyByZXR1cm4gbV9saW5lQm94LmxvZ2ljYWxSaWdodCgpOyB9Ci0gICAgSW5saW5lTGF5b3V0 VW5pdCBiYXNlbGluZSgpIGNvbnN0IHsgcmV0dXJuIG1fbGluZUJveC5iYXNlbGluZSgpOyB9Cisg ICAgSW5saW5lTGF5b3V0VW5pdCBiYXNlbGluZSgpIGNvbnN0IHsgcmV0dXJuIG1fbGluZUJveC5h bGlnbm1lbnRCYXNlbGluZSgpOyB9CiAKICAgICBzdHJ1Y3QgSW5saW5lUnVuRGV0YWlscyB7CiAg ICAgICAgIElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRoIHsgMCB9Owo=