231127 2021-10-02 17:58:48 -0700 [LFC][IFC] Line functions can compute the "extra horizontal space" 2021-10-03 12:34:15 -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 1799787 0 zalan 2021-10-02 17:58:48 -0700 ssia 1799788 1 439980 zalan 2021-10-02 18:00:29 -0700 Created attachment 439980 Patch 1799813 2 439987 zalan 2021-10-02 20:25:07 -0700 Created attachment 439987 Patch 1799886 3 ews-feeder 2021-10-03 12:32:59 -0700 Committed r283477 (242450@main): <https://commits.webkit.org/242450@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 439987. 1799887 4 webkit-bug-importer 2021-10-03 12:34:15 -0700 <rdar://problem/83816546> 439980 2021-10-02 18:00:29 -0700 2021-10-02 20:25:05 -0700 Patch bug-231127-20211002180028.patch text/plain 6761 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzNDQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWQyMjc1ZDA1YWUzNjZi NTNmZDA2ZmE1YTJiNDhiYTBhNTc3YTFlZS4uYjMzN2FjYWMwZDFhNzljNzM0YWYxNjA5ZDk5ZGEz NTA3MGYyOTdkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTEwLTAyICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIExpbmUgZnVu Y3Rpb25zIGNhbiBjb21wdXRlIHRoZSAiZXh0cmEgaG9yaXpvbnRhbCBzcGFjZSIKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMTEyNworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgaW4gcHJlcGFy YXRpb24gZm9yIG1ha2luZyBhcHBseVJ1bkV4cGFuc2lvbiBoYW5naW5nIHdoaXRlc3BhY2UgYXdh cmUuCisKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVM aW5lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6cmVtb3ZlQ29sbGFwc2li bGVDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6YXBwbHlSdW5FeHBh bnNpb24pOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjp2aXN1YWxseUNvbGxhcHNl SGFuZ2luZ092ZXJmbG93KToKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9JbmxpbmVMaW5lLmg6CisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpM aW5lQnVpbGRlcjo6Y2xvc2UpOgorCiAyMDIxLTEwLTAyICBBbGFuIEJ1anRhcyAgPHphbGFuQGFw cGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIE1vdmluZyBoYW5naW5nIHdoaXRlc3BhY2Ug c2VxdWVuY2UgaGFuZGxpbmcgdG8gTGluZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lLmNwcAppbmRl eCBiMzk5MWM0NTU2Nzg0NjNiZGE5MGZjMWI1MzQzYjFjNDgzOTQyMmZhLi44ZjdiNzY1ZmNkOGQz N2Q2ZWM4ODJlZmE0NzU0YmMxZmE0MzQ0OGM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lLmNw cApAQCAtNjAsMTMgKzYwLDEzIEBAIHZvaWQgTGluZTo6aW5pdGlhbGl6ZSgpCiAgICAgbV90cmlt bWFibGVUcmFpbGluZ0NvbnRlbnQucmVzZXQoKTsKIH0KIAotdm9pZCBMaW5lOjpyZW1vdmVDb2xs YXBzaWJsZUNvbnRlbnQoSW5saW5lTGF5b3V0VW5pdCBleHRyYUhvcml6b250YWxTcGFjZSkKK3Zv aWQgTGluZTo6cmVtb3ZlQ29sbGFwc2libGVDb250ZW50KElubGluZUxheW91dFVuaXQgaG9yaXpv bnRhbEF2YWlsYWJsZVNwYWNlKQogewogICAgIHJlbW92ZVRyYWlsaW5nVHJpbW1hYmxlQ29udGVu dCgpOwotICAgIHZpc3VhbGx5Q29sbGFwc2VIYW5naW5nT3ZlcmZsb3coZXh0cmFIb3Jpem9udGFs U3BhY2UpOworICAgIHZpc3VhbGx5Q29sbGFwc2VIYW5naW5nT3ZlcmZsb3coaG9yaXpvbnRhbEF2 YWlsYWJsZVNwYWNlKTsKIH0KIAotdm9pZCBMaW5lOjphcHBseVJ1bkV4cGFuc2lvbihJbmxpbmVM YXlvdXRVbml0IGV4dHJhSG9yaXpvbnRhbFNwYWNlKQordm9pZCBMaW5lOjphcHBseVJ1bkV4cGFu c2lvbihJbmxpbmVMYXlvdXRVbml0IGhvcml6b250YWxBdmFpbGFibGVTcGFjZSkKIHsKICAgICBB U1NFUlQoZm9ybWF0dGluZ0NvbnRleHQoKS5yb290KCkuc3R5bGUoKS50ZXh0QWxpZ24oKSA9PSBU ZXh0QWxpZ25Nb2RlOjpKdXN0aWZ5KTsKICAgICAvLyBUZXh0IGlzIGp1c3RpZmllZCBhY2NvcmRp bmcgdG8gdGhlIG1ldGhvZCBzcGVjaWZpZWQgYnkgdGhlIHRleHQtanVzdGlmeSBwcm9wZXJ0eSwK QEAgLTc1LDcgKzc1LDggQEAgdm9pZCBMaW5lOjphcHBseVJ1bkV4cGFuc2lvbihJbmxpbmVMYXlv dXRVbml0IGV4dHJhSG9yaXpvbnRhbFNwYWNlKQogICAgIGlmIChtX3J1bnMuaXNFbXB0eSgpIHx8 IG1fcnVucy5sYXN0KCkuaXNMaW5lQnJlYWsoKSkKICAgICAgICAgcmV0dXJuOwogICAgIC8vIEFu eXRoaW5nIHRvIGRpc3RyaWJ1dGU/Ci0gICAgaWYgKCFleHRyYUhvcml6b250YWxTcGFjZSkKKyAg ICBhdXRvIHNwYWNlVG9EaXN0cmlidXRlID0gaG9yaXpvbnRhbEF2YWlsYWJsZVNwYWNlIC0gY29u dGVudExvZ2ljYWxXaWR0aCgpOworICAgIGlmIChzcGFjZVRvRGlzdHJpYnV0ZSA8PSAwKQogICAg ICAgICByZXR1cm47CiAKICAgICAvLyBDb2xsZWN0IGFuZCBkaXN0cmlidXRlIHRoZSBleHBhbnNp b24gb3Bwb3J0dW5pdGllcy4KQEAgLTEyNSw3ICsxMjYsNyBAQCB2b2lkIExpbmU6OmFwcGx5UnVu RXhwYW5zaW9uKElubGluZUxheW91dFVuaXQgZXh0cmFIb3Jpem9udGFsU3BhY2UpCiAgICAgaWYg KCFsaW5lRXhwYW5zaW9uT3Bwb3J0dW5pdGllcykKICAgICAgICAgcmV0dXJuOwogICAgIC8vIERp c3RyaWJ1dGUgdGhlIGV4dHJhIHNwYWNlLgotICAgIGF1dG8gZXhwYW5zaW9uVG9EaXN0cmlidXRl ID0gZXh0cmFIb3Jpem9udGFsU3BhY2UgLyBsaW5lRXhwYW5zaW9uT3Bwb3J0dW5pdGllczsKKyAg ICBhdXRvIGV4cGFuc2lvblRvRGlzdHJpYnV0ZSA9IHNwYWNlVG9EaXN0cmlidXRlIC8gbGluZUV4 cGFuc2lvbk9wcG9ydHVuaXRpZXM7CiAgICAgYXV0byBhY2N1bXVsYXRlZEV4cGFuc2lvbiA9IElu bGluZUxheW91dFVuaXQgeyB9OwogICAgIGZvciAoc2l6ZV90IHJ1bkluZGV4ID0gMDsgcnVuSW5k ZXggPCBtX3J1bnMuc2l6ZSgpOyArK3J1bkluZGV4KSB7CiAgICAgICAgIGF1dG8mIHJ1biA9IG1f cnVuc1tydW5JbmRleF07CkBAIC0xNjMsMTMgKzE2NCwxMyBAQCB2b2lkIExpbmU6OnJlbW92ZVRy YWlsaW5nVHJpbW1hYmxlQ29udGVudCgpCiAgICAgbV9jb250ZW50TG9naWNhbFdpZHRoIC09IG1f dHJpbW1hYmxlVHJhaWxpbmdDb250ZW50LnJlbW92ZSgpOwogfQogCi12b2lkIExpbmU6OnZpc3Vh bGx5Q29sbGFwc2VIYW5naW5nT3ZlcmZsb3coSW5saW5lTGF5b3V0VW5pdCBleHRyYUhvcml6b250 YWxTcGFjZSkKK3ZvaWQgTGluZTo6dmlzdWFsbHlDb2xsYXBzZUhhbmdpbmdPdmVyZmxvdyhJbmxp bmVMYXlvdXRVbml0IGhvcml6b250YWxBdmFpbGFibGVTcGFjZSkKIHsKICAgICBBU1NFUlQobV90 cmltbWFibGVUcmFpbGluZ0NvbnRlbnQuaXNFbXB0eSgpKTsKICAgICAvLyBJZiB3aGl0ZS1zcGFj ZSBpcyBzZXQgdG8gcHJlLXdyYXAsIHRoZSBVQSBtdXN0CiAgICAgLy8gLi4uCiAgICAgLy8gSXQg bWF5IGFsc28gdmlzdWFsbHkgY29sbGFwc2UgdGhlIGNoYXJhY3RlciBhZHZhbmNlIHdpZHRocyBv ZiBhbnkgdGhhdCB3b3VsZCBvdGhlcndpc2Ugb3ZlcmZsb3cuCi0gICAgYXV0byBvdmVyZmxvd1dp ZHRoID0gLWV4dHJhSG9yaXpvbnRhbFNwYWNlOworICAgIGF1dG8gb3ZlcmZsb3dXaWR0aCA9IGNv bnRlbnRMb2dpY2FsV2lkdGgoKSAtIGhvcml6b250YWxBdmFpbGFibGVTcGFjZTsKICAgICBpZiAo b3ZlcmZsb3dXaWR0aCA8PSAwKQogICAgICAgICByZXR1cm47CiAgICAgLy8gTGV0J3MganVzdCBm aW5kIHRoZSB0cmFpbGluZyBwcmUtd3JhcCB3aGl0ZXNwYWNlIGNvbnRlbnQgZm9yIG5vdyAoZS5n IGNoZWNrIGlmIHRoZXJlIGFyZSBtdWx0aXBsZSB0cmFpbGluZyBydW5zIHdpdGgKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGlu ZUxpbmUuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0lubGluZUxpbmUuaAppbmRleCBlNTZiMjBiN2ZmYjg0OGY1M2JhMjE3N2MwMDY4Y2Q3ODIxMTdh N2MwLi44YmY5YThjMWYwYmQwODkxNjZlMzgwODA2MDliYzEwYTg4ODk1NjEyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVM aW5lLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvSW5saW5lTGluZS5oCkBAIC01OCw4ICs1OCw4IEBAIHB1YmxpYzoKICAgICBzdGQ6Om9wdGlv bmFsPElubGluZUxheW91dFVuaXQ+IHRyYWlsaW5nU29mdEh5cGhlbldpZHRoKCkgY29uc3QgeyBy ZXR1cm4gbV90cmFpbGluZ1NvZnRIeXBoZW5XaWR0aDsgfQogICAgIHZvaWQgYWRkVHJhaWxpbmdI eXBoZW4oSW5saW5lTGF5b3V0VW5pdCBoeXBoZW5Mb2dpY2FsV2lkdGgpOwogCi0gICAgdm9pZCBy ZW1vdmVDb2xsYXBzaWJsZUNvbnRlbnQoSW5saW5lTGF5b3V0VW5pdCBleHRyYUhvcml6b250YWxT cGFjZSk7Ci0gICAgdm9pZCBhcHBseVJ1bkV4cGFuc2lvbihJbmxpbmVMYXlvdXRVbml0IGV4dHJh SG9yaXpvbnRhbFNwYWNlKTsKKyAgICB2b2lkIHJlbW92ZUNvbGxhcHNpYmxlQ29udGVudChJbmxp bmVMYXlvdXRVbml0IGhvcml6b250YWxBdmFpbGFibGVTcGFjZSk7CisgICAgdm9pZCBhcHBseVJ1 bkV4cGFuc2lvbihJbmxpbmVMYXlvdXRVbml0IGhvcml6b250YWxBdmFpbGFibGVTcGFjZSk7CiAK ICAgICBzdHJ1Y3QgUnVuIHsKICAgICAgICAgYm9vbCBpc1RleHQoKSBjb25zdCB7IHJldHVybiBt X3R5cGUgPT0gSW5saW5lSXRlbTo6VHlwZTo6VGV4dDsgfQpAQCAtMTU0LDcgKzE1NCw3IEBAIHBy aXZhdGU6CiAgICAgdm9pZCBhcHBlbmRXb3JkQnJlYWtPcHBvcnR1bml0eShjb25zdCBJbmxpbmVJ dGVtJik7CiAKICAgICB2b2lkIHJlbW92ZVRyYWlsaW5nVHJpbW1hYmxlQ29udGVudCgpOwotICAg IHZvaWQgdmlzdWFsbHlDb2xsYXBzZUhhbmdpbmdPdmVyZmxvdyhJbmxpbmVMYXlvdXRVbml0IGV4 dHJhSG9yaXpvbnRhbFNwYWNlKTsKKyAgICB2b2lkIHZpc3VhbGx5Q29sbGFwc2VIYW5naW5nT3Zl cmZsb3coSW5saW5lTGF5b3V0VW5pdCBob3Jpem9udGFsQXZhaWxhYmxlU3BhY2UpOwogCiAgICAg Y29uc3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIGZvcm1hdHRpbmdDb250ZXh0KCkgY29uc3Q7 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcAppbmRleCAzMTU5OWUw OWY5MmVmMmU1ZDZlOTRlNzBhNDVhODA2ZTdlN2Y0ODJlLi42NWJhZTRjMGNmNWRkZDFiZTM5ZDgw Mzk1NjE3MzVmNTUzOWE3OGI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxk ZXIuY3BwCkBAIC0zNzIsMTIgKzM3MiwxMiBAQCBMaW5lQnVpbGRlcjo6SW5saW5lSXRlbVJhbmdl IExpbmVCdWlsZGVyOjpjbG9zZShjb25zdCBJbmxpbmVJdGVtUmFuZ2UmIG5lZWRzTGF5bwogICAg ICAgICAvLyBMaW5lIGlzIGVtcHR5LCB3ZSBvbmx5IG1hbmFnZWQgdG8gcGxhY2UgZmxvYXQgYm94 ZXMuCiAgICAgICAgIHJldHVybiBsaW5lUmFuZ2U7CiAgICAgfQotICAgIGF1dG8gYXZhaWxhYmxl V2lkdGggPSBtX2xpbmVMb2dpY2FsUmVjdC53aWR0aCgpIC0gbV9saW5lLmNvbnRlbnRMb2dpY2Fs UmlnaHQoKTsKLSAgICBtX2xpbmUucmVtb3ZlQ29sbGFwc2libGVDb250ZW50KGF2YWlsYWJsZVdp ZHRoKTsKKyAgICBhdXRvIGhvcml6b250YWxBdmFpbGFibGVTcGFjZSA9IG1fbGluZUxvZ2ljYWxS ZWN0LndpZHRoKCk7CisgICAgbV9saW5lLnJlbW92ZUNvbGxhcHNpYmxlQ29udGVudChob3Jpem9u dGFsQXZhaWxhYmxlU3BhY2UpOwogICAgIGF1dG8gaG9yaXpvbnRhbEFsaWdubWVudCA9IHJvb3Qo KS5zdHlsZSgpLnRleHRBbGlnbigpOwogICAgIGF1dG8gcnVuc0V4cGFuZEhvcml6b250YWxseSA9 IGhvcml6b250YWxBbGlnbm1lbnQgPT0gVGV4dEFsaWduTW9kZTo6SnVzdGlmeSAmJiAhaXNMYXN0 TGluZVdpdGhJbmxpbmVDb250ZW50KGxpbmVSYW5nZSwgbmVlZHNMYXlvdXRSYW5nZS5lbmQsIGNv bW1pdHRlZENvbnRlbnQucGFydGlhbFRyYWlsaW5nQ29udGVudExlbmd0aCk7CiAgICAgaWYgKHJ1 bnNFeHBhbmRIb3Jpem9udGFsbHkpCi0gICAgICAgIG1fbGluZS5hcHBseVJ1bkV4cGFuc2lvbiht X2xpbmVMb2dpY2FsUmVjdC53aWR0aCgpIC0gbV9saW5lLmNvbnRlbnRMb2dpY2FsUmlnaHQoKSk7 CisgICAgICAgIG1fbGluZS5hcHBseVJ1bkV4cGFuc2lvbihob3Jpem9udGFsQXZhaWxhYmxlU3Bh Y2UpOwogICAgIGF1dG8gbGluZUVuZHNXaXRoSHlwaGVuID0gZmFsc2U7CiAgICAgaWYgKCFtX2xp bmUucnVucygpLmlzRW1wdHkoKSkgewogICAgICAgICBhdXRvJiBsYXN0VGV4dENvbnRlbnQgPSBt X2xpbmUucnVucygpLmxhc3QoKS50ZXh0Q29udGVudCgpOwo= 439987 2021-10-02 20:25:07 -0700 2021-10-03 12:33:01 -0700 Patch bug-231127-20211002202506.patch text/plain 6761 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzNDQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTlmZjA5YjUxYzA0ZTdm YjFhOTM2MWYzNGMzMTA0MzNhYTBlZDgxZi4uY2E5NTMwMzFhODEyNjUzYTVjMjM3NjJkNzA1NmQ1 MGVmZGIxY2MyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTEwLTAyICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIExpbmUgZnVu Y3Rpb25zIGNhbiBjb21wdXRlIHRoZSAiZXh0cmEgaG9yaXpvbnRhbCBzcGFjZSIKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMTEyNworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgaW4gcHJlcGFy YXRpb24gZm9yIG1ha2luZyBhcHBseVJ1bkV4cGFuc2lvbiBoYW5naW5nIHdoaXRlc3BhY2UgYXdh cmUuCisKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVM aW5lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6cmVtb3ZlQ29sbGFwc2li bGVDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6YXBwbHlSdW5FeHBh bnNpb24pOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjp2aXN1YWxseUNvbGxhcHNl SGFuZ2luZ092ZXJmbG93KToKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9JbmxpbmVMaW5lLmg6CisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpM aW5lQnVpbGRlcjo6Y2xvc2UpOgorCiAyMDIxLTEwLTAyICBBbGFuIEJ1anRhcyAgPHphbGFuQGFw cGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIE1vdmluZyBoYW5naW5nIHdoaXRlc3BhY2Ug c2VxdWVuY2UgaGFuZGxpbmcgdG8gTGluZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lLmNwcAppbmRl eCA0Y2YzODI0MTU5NDQ2ZjgxYTNlMWY2OTVmOTA4NDBiN2Q3OWE5OTFkLi43YzMzYjg3YmVlNjRl MTEyMGNkMzUzOGZlYzk1MDk3NjA1NjcwMTI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lLmNw cApAQCAtNjAsMTMgKzYwLDEzIEBAIHZvaWQgTGluZTo6aW5pdGlhbGl6ZSgpCiAgICAgbV90cmlt bWFibGVUcmFpbGluZ0NvbnRlbnQucmVzZXQoKTsKIH0KIAotdm9pZCBMaW5lOjpyZW1vdmVDb2xs YXBzaWJsZUNvbnRlbnQoSW5saW5lTGF5b3V0VW5pdCBleHRyYUhvcml6b250YWxTcGFjZSkKK3Zv aWQgTGluZTo6cmVtb3ZlQ29sbGFwc2libGVDb250ZW50KElubGluZUxheW91dFVuaXQgaG9yaXpv bnRhbEF2YWlsYWJsZVNwYWNlKQogewogICAgIHJlbW92ZVRyYWlsaW5nVHJpbW1hYmxlQ29udGVu dCgpOwotICAgIHZpc3VhbGx5Q29sbGFwc2VIYW5naW5nT3ZlcmZsb3coZXh0cmFIb3Jpem9udGFs U3BhY2UpOworICAgIHZpc3VhbGx5Q29sbGFwc2VIYW5naW5nT3ZlcmZsb3coaG9yaXpvbnRhbEF2 YWlsYWJsZVNwYWNlKTsKIH0KIAotdm9pZCBMaW5lOjphcHBseVJ1bkV4cGFuc2lvbihJbmxpbmVM YXlvdXRVbml0IGV4dHJhSG9yaXpvbnRhbFNwYWNlKQordm9pZCBMaW5lOjphcHBseVJ1bkV4cGFu c2lvbihJbmxpbmVMYXlvdXRVbml0IGhvcml6b250YWxBdmFpbGFibGVTcGFjZSkKIHsKICAgICBB U1NFUlQoZm9ybWF0dGluZ0NvbnRleHQoKS5yb290KCkuc3R5bGUoKS50ZXh0QWxpZ24oKSA9PSBU ZXh0QWxpZ25Nb2RlOjpKdXN0aWZ5KTsKICAgICAvLyBUZXh0IGlzIGp1c3RpZmllZCBhY2NvcmRp bmcgdG8gdGhlIG1ldGhvZCBzcGVjaWZpZWQgYnkgdGhlIHRleHQtanVzdGlmeSBwcm9wZXJ0eSwK QEAgLTc1LDcgKzc1LDggQEAgdm9pZCBMaW5lOjphcHBseVJ1bkV4cGFuc2lvbihJbmxpbmVMYXlv dXRVbml0IGV4dHJhSG9yaXpvbnRhbFNwYWNlKQogICAgIGlmIChtX3J1bnMuaXNFbXB0eSgpIHx8 IG1fcnVucy5sYXN0KCkuaXNMaW5lQnJlYWsoKSkKICAgICAgICAgcmV0dXJuOwogICAgIC8vIEFu eXRoaW5nIHRvIGRpc3RyaWJ1dGU/Ci0gICAgaWYgKCFleHRyYUhvcml6b250YWxTcGFjZSkKKyAg ICBhdXRvIHNwYWNlVG9EaXN0cmlidXRlID0gaG9yaXpvbnRhbEF2YWlsYWJsZVNwYWNlIC0gY29u dGVudExvZ2ljYWxXaWR0aCgpOworICAgIGlmIChzcGFjZVRvRGlzdHJpYnV0ZSA8PSAwKQogICAg ICAgICByZXR1cm47CiAKICAgICAvLyBDb2xsZWN0IGFuZCBkaXN0cmlidXRlIHRoZSBleHBhbnNp b24gb3Bwb3J0dW5pdGllcy4KQEAgLTEyNSw3ICsxMjYsNyBAQCB2b2lkIExpbmU6OmFwcGx5UnVu RXhwYW5zaW9uKElubGluZUxheW91dFVuaXQgZXh0cmFIb3Jpem9udGFsU3BhY2UpCiAgICAgaWYg KCFsaW5lRXhwYW5zaW9uT3Bwb3J0dW5pdGllcykKICAgICAgICAgcmV0dXJuOwogICAgIC8vIERp c3RyaWJ1dGUgdGhlIGV4dHJhIHNwYWNlLgotICAgIGF1dG8gZXhwYW5zaW9uVG9EaXN0cmlidXRl ID0gZXh0cmFIb3Jpem9udGFsU3BhY2UgLyBsaW5lRXhwYW5zaW9uT3Bwb3J0dW5pdGllczsKKyAg ICBhdXRvIGV4cGFuc2lvblRvRGlzdHJpYnV0ZSA9IHNwYWNlVG9EaXN0cmlidXRlIC8gbGluZUV4 cGFuc2lvbk9wcG9ydHVuaXRpZXM7CiAgICAgYXV0byBhY2N1bXVsYXRlZEV4cGFuc2lvbiA9IElu bGluZUxheW91dFVuaXQgeyB9OwogICAgIGZvciAoc2l6ZV90IHJ1bkluZGV4ID0gMDsgcnVuSW5k ZXggPCBtX3J1bnMuc2l6ZSgpOyArK3J1bkluZGV4KSB7CiAgICAgICAgIGF1dG8mIHJ1biA9IG1f cnVuc1tydW5JbmRleF07CkBAIC0xNjMsMTMgKzE2NCwxMyBAQCB2b2lkIExpbmU6OnJlbW92ZVRy YWlsaW5nVHJpbW1hYmxlQ29udGVudCgpCiAgICAgbV9jb250ZW50TG9naWNhbFdpZHRoIC09IG1f dHJpbW1hYmxlVHJhaWxpbmdDb250ZW50LnJlbW92ZSgpOwogfQogCi12b2lkIExpbmU6OnZpc3Vh bGx5Q29sbGFwc2VIYW5naW5nT3ZlcmZsb3coSW5saW5lTGF5b3V0VW5pdCBleHRyYUhvcml6b250 YWxTcGFjZSkKK3ZvaWQgTGluZTo6dmlzdWFsbHlDb2xsYXBzZUhhbmdpbmdPdmVyZmxvdyhJbmxp bmVMYXlvdXRVbml0IGhvcml6b250YWxBdmFpbGFibGVTcGFjZSkKIHsKICAgICBBU1NFUlQobV90 cmltbWFibGVUcmFpbGluZ0NvbnRlbnQuaXNFbXB0eSgpKTsKICAgICAvLyBJZiB3aGl0ZS1zcGFj ZSBpcyBzZXQgdG8gcHJlLXdyYXAsIHRoZSBVQSBtdXN0CiAgICAgLy8gLi4uCiAgICAgLy8gSXQg bWF5IGFsc28gdmlzdWFsbHkgY29sbGFwc2UgdGhlIGNoYXJhY3RlciBhZHZhbmNlIHdpZHRocyBv ZiBhbnkgdGhhdCB3b3VsZCBvdGhlcndpc2Ugb3ZlcmZsb3cuCi0gICAgYXV0byBvdmVyZmxvd1dp ZHRoID0gLWV4dHJhSG9yaXpvbnRhbFNwYWNlOworICAgIGF1dG8gb3ZlcmZsb3dXaWR0aCA9IGNv bnRlbnRMb2dpY2FsV2lkdGgoKSAtIGhvcml6b250YWxBdmFpbGFibGVTcGFjZTsKICAgICBpZiAo b3ZlcmZsb3dXaWR0aCA8PSAwKQogICAgICAgICByZXR1cm47CiAgICAgLy8gTGV0J3MganVzdCBm aW5kIHRoZSB0cmFpbGluZyBwcmUtd3JhcCB3aGl0ZXNwYWNlIGNvbnRlbnQgZm9yIG5vdyAoZS5n IGNoZWNrIGlmIHRoZXJlIGFyZSBtdWx0aXBsZSB0cmFpbGluZyBydW5zIHdpdGgKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGlu ZUxpbmUuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0lubGluZUxpbmUuaAppbmRleCBlNTZiMjBiN2ZmYjg0OGY1M2JhMjE3N2MwMDY4Y2Q3ODIxMTdh N2MwLi44YmY5YThjMWYwYmQwODkxNjZlMzgwODA2MDliYzEwYTg4ODk1NjEyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVM aW5lLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvSW5saW5lTGluZS5oCkBAIC01OCw4ICs1OCw4IEBAIHB1YmxpYzoKICAgICBzdGQ6Om9wdGlv bmFsPElubGluZUxheW91dFVuaXQ+IHRyYWlsaW5nU29mdEh5cGhlbldpZHRoKCkgY29uc3QgeyBy ZXR1cm4gbV90cmFpbGluZ1NvZnRIeXBoZW5XaWR0aDsgfQogICAgIHZvaWQgYWRkVHJhaWxpbmdI eXBoZW4oSW5saW5lTGF5b3V0VW5pdCBoeXBoZW5Mb2dpY2FsV2lkdGgpOwogCi0gICAgdm9pZCBy ZW1vdmVDb2xsYXBzaWJsZUNvbnRlbnQoSW5saW5lTGF5b3V0VW5pdCBleHRyYUhvcml6b250YWxT cGFjZSk7Ci0gICAgdm9pZCBhcHBseVJ1bkV4cGFuc2lvbihJbmxpbmVMYXlvdXRVbml0IGV4dHJh SG9yaXpvbnRhbFNwYWNlKTsKKyAgICB2b2lkIHJlbW92ZUNvbGxhcHNpYmxlQ29udGVudChJbmxp bmVMYXlvdXRVbml0IGhvcml6b250YWxBdmFpbGFibGVTcGFjZSk7CisgICAgdm9pZCBhcHBseVJ1 bkV4cGFuc2lvbihJbmxpbmVMYXlvdXRVbml0IGhvcml6b250YWxBdmFpbGFibGVTcGFjZSk7CiAK ICAgICBzdHJ1Y3QgUnVuIHsKICAgICAgICAgYm9vbCBpc1RleHQoKSBjb25zdCB7IHJldHVybiBt X3R5cGUgPT0gSW5saW5lSXRlbTo6VHlwZTo6VGV4dDsgfQpAQCAtMTU0LDcgKzE1NCw3IEBAIHBy aXZhdGU6CiAgICAgdm9pZCBhcHBlbmRXb3JkQnJlYWtPcHBvcnR1bml0eShjb25zdCBJbmxpbmVJ dGVtJik7CiAKICAgICB2b2lkIHJlbW92ZVRyYWlsaW5nVHJpbW1hYmxlQ29udGVudCgpOwotICAg IHZvaWQgdmlzdWFsbHlDb2xsYXBzZUhhbmdpbmdPdmVyZmxvdyhJbmxpbmVMYXlvdXRVbml0IGV4 dHJhSG9yaXpvbnRhbFNwYWNlKTsKKyAgICB2b2lkIHZpc3VhbGx5Q29sbGFwc2VIYW5naW5nT3Zl cmZsb3coSW5saW5lTGF5b3V0VW5pdCBob3Jpem9udGFsQXZhaWxhYmxlU3BhY2UpOwogCiAgICAg Y29uc3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIGZvcm1hdHRpbmdDb250ZXh0KCkgY29uc3Q7 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcAppbmRleCAzMTU5OWUw OWY5MmVmMmU1ZDZlOTRlNzBhNDVhODA2ZTdlN2Y0ODJlLi42NWJhZTRjMGNmNWRkZDFiZTM5ZDgw Mzk1NjE3MzVmNTUzOWE3OGI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxk ZXIuY3BwCkBAIC0zNzIsMTIgKzM3MiwxMiBAQCBMaW5lQnVpbGRlcjo6SW5saW5lSXRlbVJhbmdl IExpbmVCdWlsZGVyOjpjbG9zZShjb25zdCBJbmxpbmVJdGVtUmFuZ2UmIG5lZWRzTGF5bwogICAg ICAgICAvLyBMaW5lIGlzIGVtcHR5LCB3ZSBvbmx5IG1hbmFnZWQgdG8gcGxhY2UgZmxvYXQgYm94 ZXMuCiAgICAgICAgIHJldHVybiBsaW5lUmFuZ2U7CiAgICAgfQotICAgIGF1dG8gYXZhaWxhYmxl V2lkdGggPSBtX2xpbmVMb2dpY2FsUmVjdC53aWR0aCgpIC0gbV9saW5lLmNvbnRlbnRMb2dpY2Fs UmlnaHQoKTsKLSAgICBtX2xpbmUucmVtb3ZlQ29sbGFwc2libGVDb250ZW50KGF2YWlsYWJsZVdp ZHRoKTsKKyAgICBhdXRvIGhvcml6b250YWxBdmFpbGFibGVTcGFjZSA9IG1fbGluZUxvZ2ljYWxS ZWN0LndpZHRoKCk7CisgICAgbV9saW5lLnJlbW92ZUNvbGxhcHNpYmxlQ29udGVudChob3Jpem9u dGFsQXZhaWxhYmxlU3BhY2UpOwogICAgIGF1dG8gaG9yaXpvbnRhbEFsaWdubWVudCA9IHJvb3Qo KS5zdHlsZSgpLnRleHRBbGlnbigpOwogICAgIGF1dG8gcnVuc0V4cGFuZEhvcml6b250YWxseSA9 IGhvcml6b250YWxBbGlnbm1lbnQgPT0gVGV4dEFsaWduTW9kZTo6SnVzdGlmeSAmJiAhaXNMYXN0 TGluZVdpdGhJbmxpbmVDb250ZW50KGxpbmVSYW5nZSwgbmVlZHNMYXlvdXRSYW5nZS5lbmQsIGNv bW1pdHRlZENvbnRlbnQucGFydGlhbFRyYWlsaW5nQ29udGVudExlbmd0aCk7CiAgICAgaWYgKHJ1 bnNFeHBhbmRIb3Jpem9udGFsbHkpCi0gICAgICAgIG1fbGluZS5hcHBseVJ1bkV4cGFuc2lvbiht X2xpbmVMb2dpY2FsUmVjdC53aWR0aCgpIC0gbV9saW5lLmNvbnRlbnRMb2dpY2FsUmlnaHQoKSk7 CisgICAgICAgIG1fbGluZS5hcHBseVJ1bkV4cGFuc2lvbihob3Jpem9udGFsQXZhaWxhYmxlU3Bh Y2UpOwogICAgIGF1dG8gbGluZUVuZHNXaXRoSHlwaGVuID0gZmFsc2U7CiAgICAgaWYgKCFtX2xp bmUucnVucygpLmlzRW1wdHkoKSkgewogICAgICAgICBhdXRvJiBsYXN0VGV4dENvbnRlbnQgPSBt X2xpbmUucnVucygpLmxhc3QoKS50ZXh0Q29udGVudCgpOwo=