219526 2020-12-03 19:11:00 -0800 [LFC][IFC] Move float constraint logic from initialConstraintsForLine to a dedicated function 2020-12-04 12:07:35 -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 1711931 0 zalan 2020-12-03 19:11:00 -0800 as we are going to call this function whenever the line stretches and not just once and the very beginning. 1711933 1 415378 zalan 2020-12-03 19:20:31 -0800 Created attachment 415378 Patch 1712105 2 ews-feeder 2020-12-04 12:06:24 -0800 Committed r270448: <https://trac.webkit.org/changeset/270448> All reviewed patches have been landed. Closing bug and clearing flags on attachment 415378. 1712107 3 webkit-bug-importer 2020-12-04 12:07:35 -0800 <rdar://problem/71988230> 415378 2020-12-03 19:20:31 -0800 2020-12-04 12:06:25 -0800 Patch bug-219526-20201203192030.patch text/plain 8508 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwMzY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTkyYzkyOWViZDc5OGY1 ODY0YWQzN2JhNzkxOWY2YTljZTFiMmY5NC4uYzJkODlkNDE1MGMyYjJhMDg3NzFmMGQyMTA4ODgw NmI5NzM4ODc4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIwLTEyLTAzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBNb3ZlIGZs b2F0IGNvbnN0cmFpbnQgbG9naWMgZnJvbSBpbml0aWFsQ29uc3RyYWludHNGb3JMaW5lIHRvIGEg ZGVkaWNhdGVkIGZ1bmN0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMTk1MjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBXZSBhcmUgZ29pbmcgdG8gY2FsbCB0aGlzIG5ldyBmdW5jdGlvbiB3aGVuZXZl ciB0aGUgbGluZSBzdHJldGNoZXMgdmVydGljYWxseSBhbmQgbm90IGp1c3Qgb25jZSBhdCB0aGUg dmVyeSBiZWdpbm5pbmcuCisKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVMaW5lQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVy OjpmbG9hdENvbnN0cmFpbnRzIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGlu ZUJ1aWxkZXI6OmluaXRpYWxDb25zdHJhaW50c0ZvckxpbmUgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6aW5pdGlhbENvbnN0cmFpbnRzRm9yTGluZSk6IERl bGV0ZWQuCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxk ZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OmZsb2F0aW5nU3Rh dGUgY29uc3QpOgorCiAyMDIwLTEyLTAzICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+ CiAKICAgICAgICAgW0xGQ11bSUZDXSBPbmx5IHNocmluayB0aGUgbGluZSB3aXRoIHRoZSBmbG9h dCB3aGVuIGl0IGlzIGludHJ1c2l2ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwCmluZGV4IDAzMTU1 NmUxY2VmOTgzMGQzYWE5MTM0N2ExZTZiMDgxYTFlMzEwMTQuLmFhYzQ4ZTcwY2EwYTcwOWY5ZGY5 OWUwNWQyODY4NTk1YjE4ZjlhMDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAKQEAgLTM2MCw0 MCArMzYwLDUxIEBAIExpbmVCdWlsZGVyOjpJbmxpbmVJdGVtUmFuZ2UgTGluZUJ1aWxkZXI6OmNs b3NlKGNvbnN0IElubGluZUl0ZW1SYW5nZSYgbmVlZHNMYXlvCiAgICAgcmV0dXJuIGxpbmVSYW5n ZTsKIH0KIAotTGluZUJ1aWxkZXI6OlVzZWRDb25zdHJhaW50cyBMaW5lQnVpbGRlcjo6aW5pdGlh bENvbnN0cmFpbnRzRm9yTGluZShjb25zdCBJbmxpbmVSZWN0JiBsaW5lTG9naWNhbENvbnN0cmFp bnRzLCBib29sIGlzRmlyc3RMaW5lKQorT3B0aW9uYWw8SG9yaXpvbnRhbENvbnN0cmFpbnRzPiBM aW5lQnVpbGRlcjo6ZmxvYXRDb25zdHJhaW50cyhjb25zdCBJbmxpbmVSZWN0JiBsaW5lTG9naWNh bFJlY3QpIGNvbnN0CiB7Ci0gICAgYXV0byBsaW5lTG9naWNhbExlZnQgPSBsaW5lTG9naWNhbENv bnN0cmFpbnRzLmxlZnQoKTsKLSAgICBhdXRvIGxpbmVMb2dpY2FsVG9wID0gbGluZUxvZ2ljYWxD b25zdHJhaW50cy50b3AoKTsKLSAgICBhdXRvIGxpbmVMb2dpY2FsUmlnaHQgPSBsaW5lTG9naWNh bExlZnQgKyBsaW5lTG9naWNhbENvbnN0cmFpbnRzLndpZHRoKCk7Ci0gICAgYXV0byBsaW5lSXND b25zdHJhaW5lZEJ5RmxvYXQgPSBmYWxzZTsKKyAgICBhdXRvKiBmbG9hdGluZ1N0YXRlID0gdGhp cy0+ZmxvYXRpbmdTdGF0ZSgpOworICAgIGlmICghZmxvYXRpbmdTdGF0ZSB8fCBmbG9hdGluZ1N0 YXRlLT5mbG9hdHMoKS5pc0VtcHR5KCkpCisgICAgICAgIHJldHVybiB7IH07CiAKICAgICAvLyBD aGVjayBmb3IgaW50cnVkaW5nIGZsb2F0cyBhbmQgYWRqdXN0IGxvZ2ljYWwgbGVmdC9hdmFpbGFi bGUgd2lkdGggZm9yIHRoaXMgbGluZSBhY2NvcmRpbmdseS4KLSAgICBpZiAoYXV0byogZmxvYXRp bmdTdGF0ZSA9IHRoaXMtPmZsb2F0aW5nU3RhdGUoKSkgewotICAgICAgICBhdXRvIGZsb2F0aW5n Q29udGV4dCA9IEZsb2F0aW5nQ29udGV4dCB7IGZvcm1hdHRpbmdDb250ZXh0KCksICpmbG9hdGlu Z1N0YXRlIH07Ci0gICAgICAgIGlmICghZmxvYXRpbmdDb250ZXh0LmlzRW1wdHkoKSkgewotICAg ICAgICAgICAgLy8gRklYTUU6IEFkZCBzdXBwb3J0IGZvciB2YXJpYWJsZSBsaW5lIGhlaWdodCwg d2hlcmUgdGhlIGZsb2F0cyBzaG91bGQgYmUgcHJvYmVkIGFzIHRoZSBsaW5lIGhlaWdodCBncm93 cy4KLSAgICAgICAgICAgIGF1dG8gZmxvYXRDb25zdHJhaW50cyA9IGZsb2F0aW5nQ29udGV4dC5j b25zdHJhaW50cyh0b0xheW91dFVuaXQobGluZUxvZ2ljYWxUb3ApLCB0b0xheW91dFVuaXQobGlu ZUxvZ2ljYWxUb3AgKyBsaW5lTG9naWNhbENvbnN0cmFpbnRzLmhlaWdodCgpKSk7Ci0gICAgICAg ICAgICAvLyBDaGVjayBpZiB0aGVzZSB2YWx1ZXMgYWN0dWFsbHkgY29uc3RyYWluIHRoZSBsaW5l LgotICAgICAgICAgICAgaWYgKGZsb2F0Q29uc3RyYWludHMubGVmdCAmJiBmbG9hdENvbnN0cmFp bnRzLmxlZnQtPnggPD0gbGluZUxvZ2ljYWxMZWZ0KQotICAgICAgICAgICAgICAgIGZsb2F0Q29u c3RyYWludHMubGVmdCA9IHsgfTsKLQotICAgICAgICAgICAgaWYgKGZsb2F0Q29uc3RyYWludHMu cmlnaHQgJiYgZmxvYXRDb25zdHJhaW50cy5yaWdodC0+eCA+PSBsaW5lTG9naWNhbFJpZ2h0KQot ICAgICAgICAgICAgICAgIGZsb2F0Q29uc3RyYWludHMucmlnaHQgPSB7IH07Ci0KLSAgICAgICAg ICAgIGxpbmVJc0NvbnN0cmFpbmVkQnlGbG9hdCA9IGZsb2F0Q29uc3RyYWludHMubGVmdCB8fCBm bG9hdENvbnN0cmFpbnRzLnJpZ2h0OwotCi0gICAgICAgICAgICBpZiAoZmxvYXRDb25zdHJhaW50 cy5sZWZ0ICYmIGZsb2F0Q29uc3RyYWludHMucmlnaHQpIHsKLSAgICAgICAgICAgICAgICBBU1NF UlQoZmxvYXRDb25zdHJhaW50cy5sZWZ0LT54IDw9IGZsb2F0Q29uc3RyYWludHMucmlnaHQtPngp OwotICAgICAgICAgICAgICAgIGxpbmVMb2dpY2FsUmlnaHQgPSBmbG9hdENvbnN0cmFpbnRzLnJp Z2h0LT54OwotICAgICAgICAgICAgICAgIGxpbmVMb2dpY2FsTGVmdCA9IGZsb2F0Q29uc3RyYWlu dHMubGVmdC0+eDsKLSAgICAgICAgICAgIH0gZWxzZSBpZiAoZmxvYXRDb25zdHJhaW50cy5sZWZ0 KSB7Ci0gICAgICAgICAgICAgICAgQVNTRVJUKGZsb2F0Q29uc3RyYWludHMubGVmdC0+eCA+PSBs aW5lTG9naWNhbExlZnQpOwotICAgICAgICAgICAgICAgIGxpbmVMb2dpY2FsTGVmdCA9IGZsb2F0 Q29uc3RyYWludHMubGVmdC0+eDsKLSAgICAgICAgICAgIH0gZWxzZSBpZiAoZmxvYXRDb25zdHJh aW50cy5yaWdodCkgewotICAgICAgICAgICAgICAgIC8vIFJpZ2h0IGZsb2F0IGJveGVzIG1heSBv dmVyZmxvdyB0aGUgY29udGFpbmluZyBibG9jayBvbiB0aGUgbGVmdC4KLSAgICAgICAgICAgICAg ICBsaW5lTG9naWNhbFJpZ2h0ID0gc3RkOjptYXg8SW5saW5lTGF5b3V0VW5pdD4obGluZUxvZ2lj YWxMZWZ0LCBmbG9hdENvbnN0cmFpbnRzLnJpZ2h0LT54KTsKLSAgICAgICAgICAgIH0KLSAgICAg ICAgfQorICAgIGF1dG8gZmxvYXRpbmdDb250ZXh0ID0gRmxvYXRpbmdDb250ZXh0IHsgZm9ybWF0 dGluZ0NvbnRleHQoKSwgKmZsb2F0aW5nU3RhdGUgfTsKKyAgICBhdXRvIGNvbnN0cmFpbnRzID0g ZmxvYXRpbmdDb250ZXh0LmNvbnN0cmFpbnRzKHRvTGF5b3V0VW5pdChsaW5lTG9naWNhbFJlY3Qu dG9wKCkpLCB0b0xheW91dFVuaXQobGluZUxvZ2ljYWxSZWN0LmJvdHRvbSgpKSk7CisgICAgLy8g Q2hlY2sgaWYgdGhlc2UgdmFsdWVzIGFjdHVhbGx5IGNvbnN0cmFpbiB0aGUgbGluZS4KKyAgICBp ZiAoY29uc3RyYWludHMubGVmdCAmJiBjb25zdHJhaW50cy5sZWZ0LT54IDw9IGxpbmVMb2dpY2Fs UmVjdC5sZWZ0KCkpCisgICAgICAgIGNvbnN0cmFpbnRzLmxlZnQgPSB7IH07CisKKyAgICBpZiAo Y29uc3RyYWludHMucmlnaHQgJiYgY29uc3RyYWludHMucmlnaHQtPnggPj0gbGluZUxvZ2ljYWxS ZWN0LnJpZ2h0KCkpCisgICAgICAgIGNvbnN0cmFpbnRzLnJpZ2h0ID0geyB9OworCisgICAgaWYg KCFjb25zdHJhaW50cy5sZWZ0ICYmICFjb25zdHJhaW50cy5yaWdodCkKKyAgICAgICAgcmV0dXJu IHsgfTsKKworICAgIGF1dG8gbGluZUxvZ2ljYWxMZWZ0ID0gbGluZUxvZ2ljYWxSZWN0LmxlZnQo KTsKKyAgICBhdXRvIGxpbmVMb2dpY2FsUmlnaHQgPSBsaW5lTG9naWNhbFJlY3QucmlnaHQoKTsK KyAgICBpZiAoY29uc3RyYWludHMubGVmdCAmJiBjb25zdHJhaW50cy5yaWdodCkgeworICAgICAg ICBBU1NFUlQoY29uc3RyYWludHMubGVmdC0+eCA8PSBjb25zdHJhaW50cy5yaWdodC0+eCk7Cisg ICAgICAgIGxpbmVMb2dpY2FsUmlnaHQgPSBjb25zdHJhaW50cy5yaWdodC0+eDsKKyAgICAgICAg bGluZUxvZ2ljYWxMZWZ0ID0gY29uc3RyYWludHMubGVmdC0+eDsKKyAgICB9IGVsc2UgaWYgKGNv bnN0cmFpbnRzLmxlZnQpIHsKKyAgICAgICAgQVNTRVJUKGNvbnN0cmFpbnRzLmxlZnQtPnggPj0g bGluZUxvZ2ljYWxMZWZ0KTsKKyAgICAgICAgbGluZUxvZ2ljYWxMZWZ0ID0gY29uc3RyYWludHMu bGVmdC0+eDsKKyAgICB9IGVsc2UgaWYgKGNvbnN0cmFpbnRzLnJpZ2h0KSB7CisgICAgICAgIC8v IFJpZ2h0IGZsb2F0IGJveGVzIG1heSBvdmVyZmxvdyB0aGUgY29udGFpbmluZyBibG9jayBvbiB0 aGUgbGVmdC4KKyAgICAgICAgbGluZUxvZ2ljYWxSaWdodCA9IHN0ZDo6bWF4PElubGluZUxheW91 dFVuaXQ+KGxpbmVMb2dpY2FsTGVmdCwgY29uc3RyYWludHMucmlnaHQtPngpOworICAgIH0KKyAg ICByZXR1cm4gSG9yaXpvbnRhbENvbnN0cmFpbnRzIHsgdG9MYXlvdXRVbml0KGxpbmVMb2dpY2Fs TGVmdCksIHRvTGF5b3V0VW5pdChsaW5lTG9naWNhbFJpZ2h0IC0gbGluZUxvZ2ljYWxMZWZ0KSB9 OworfQorCitMaW5lQnVpbGRlcjo6VXNlZENvbnN0cmFpbnRzIExpbmVCdWlsZGVyOjppbml0aWFs Q29uc3RyYWludHNGb3JMaW5lKGNvbnN0IElubGluZVJlY3QmIGluaXRpYWxMaW5lTG9naWNhbFJl Y3QsIGJvb2wgaXNGaXJzdExpbmUpIGNvbnN0Cit7CisgICAgYXV0byBsaW5lTG9naWNhbExlZnQg PSBpbml0aWFsTGluZUxvZ2ljYWxSZWN0LmxlZnQoKTsKKyAgICBhdXRvIGxpbmVMb2dpY2FsUmln aHQgPSBpbml0aWFsTGluZUxvZ2ljYWxSZWN0LnJpZ2h0KCk7CisgICAgYXV0byBsaW5lSXNDb25z dHJhaW5lZEJ5RmxvYXQgPSBmYWxzZTsKKworICAgIGlmIChhdXRvIGxpbmVDb25zdHJhaW50cyA9 IGZsb2F0Q29uc3RyYWludHMoaW5pdGlhbExpbmVMb2dpY2FsUmVjdCkpIHsKKyAgICAgICAgbGlu ZUxvZ2ljYWxMZWZ0ID0gbGluZUNvbnN0cmFpbnRzLT5sb2dpY2FsTGVmdDsKKyAgICAgICAgbGlu ZUxvZ2ljYWxSaWdodCA9IGxpbmVDb25zdHJhaW50cy0+bG9naWNhbFJpZ2h0KCk7CisgICAgICAg IGxpbmVJc0NvbnN0cmFpbmVkQnlGbG9hdCA9IHRydWU7CiAgICAgfQogCiAgICAgYXV0byBjb21w dXRlZFRleHRJbmRlbnQgPSBbJl0oKSAtPiBJbmxpbmVMYXlvdXRVbml0IHsKQEAgLTQzMSwxMCAr NDQyLDEwIEBAIExpbmVCdWlsZGVyOjpVc2VkQ29uc3RyYWludHMgTGluZUJ1aWxkZXI6OmluaXRp YWxDb25zdHJhaW50c0ZvckxpbmUoY29uc3QgSW5saW5lCiAgICAgICAgIGF1dG8gdGV4dEluZGVu dCA9IHJvb3Quc3R5bGUoKS50ZXh0SW5kZW50KCk7CiAgICAgICAgIGlmICh0ZXh0SW5kZW50ID09 IFJlbmRlclN0eWxlOjppbml0aWFsVGV4dEluZGVudCgpKQogICAgICAgICAgICAgcmV0dXJuIHsg fTsKLSAgICAgICAgcmV0dXJuIHsgbWluaW11bVZhbHVlRm9yTGVuZ3RoKHRleHRJbmRlbnQsIGxp bmVMb2dpY2FsQ29uc3RyYWludHMud2lkdGgoKSkgfTsKKyAgICAgICAgcmV0dXJuIHsgbWluaW11 bVZhbHVlRm9yTGVuZ3RoKHRleHRJbmRlbnQsIGluaXRpYWxMaW5lTG9naWNhbFJlY3Qud2lkdGgo KSkgfTsKICAgICB9OwogICAgIGxpbmVMb2dpY2FsTGVmdCArPSBjb21wdXRlZFRleHRJbmRlbnQo KTsKLSAgICByZXR1cm4gVXNlZENvbnN0cmFpbnRzIHsgeyBsaW5lTG9naWNhbFRvcCwgbGluZUxv Z2ljYWxMZWZ0LCBsaW5lTG9naWNhbFJpZ2h0IC0gbGluZUxvZ2ljYWxMZWZ0LCBsaW5lTG9naWNh bENvbnN0cmFpbnRzLmhlaWdodCgpIH0sIGxpbmVJc0NvbnN0cmFpbmVkQnlGbG9hdCB9OworICAg IHJldHVybiBVc2VkQ29uc3RyYWludHMgeyB7IGluaXRpYWxMaW5lTG9naWNhbFJlY3QudG9wKCks IGxpbmVMb2dpY2FsTGVmdCwgbGluZUxvZ2ljYWxSaWdodCAtIGxpbmVMb2dpY2FsTGVmdCwgaW5p dGlhbExpbmVMb2dpY2FsUmVjdC5oZWlnaHQoKSB9LCBsaW5lSXNDb25zdHJhaW5lZEJ5RmxvYXQg fTsKIH0KIAogdm9pZCBMaW5lQnVpbGRlcjo6Y2FuZGlkYXRlQ29udGVudEZvckxpbmUoTGluZUNh bmRpZGF0ZSYgbGluZUNhbmRpZGF0ZSwgc2l6ZV90IGN1cnJlbnRJbmxpbmVJdGVtSW5kZXgsIGNv bnN0IElubGluZUl0ZW1SYW5nZSYgbGF5b3V0UmFuZ2UsIHNpemVfdCBwYXJ0aWFsTGVhZGluZ0Nv bnRlbnRMZW5ndGgsIElubGluZUxheW91dFVuaXQgY3VycmVudExvZ2ljYWxSaWdodCkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVC dWlsZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVM aW5lQnVpbGRlci5oCmluZGV4IDdkYTUzZTlkZmY1OGU4NDRmNjExMDkzNDEzZjc4OTY3NTNkYzk4 OWIuLmU2ZjRlN2UxOWUwZTZjYTlhNzczMTljYTY3MGIxNDcyYzUxYjY2M2QgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVy LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGlu ZUJ1aWxkZXIuaApAQCAtODcsNyArODcsOSBAQCBwcml2YXRlOgogICAgICAgICBJbmxpbmVSZWN0 IGxvZ2ljYWxSZWN0OwogICAgICAgICBib29sIGlzQ29uc3RyYWluZWRCeUZsb2F0IHsgZmFsc2Ug fTsKICAgICB9OwotICAgIFVzZWRDb25zdHJhaW50cyBpbml0aWFsQ29uc3RyYWludHNGb3JMaW5l KGNvbnN0IElubGluZVJlY3QmIGluaXRpYWxMaW5lQ29uc3RyYWludHMsIGJvb2wgaXNGaXJzdExp bmUpOworICAgIFVzZWRDb25zdHJhaW50cyBpbml0aWFsQ29uc3RyYWludHNGb3JMaW5lKGNvbnN0 IElubGluZVJlY3QmIGluaXRpYWxMaW5lTG9naWNhbFJlY3QsIGJvb2wgaXNGaXJzdExpbmUpIGNv bnN0OworICAgIE9wdGlvbmFsPEhvcml6b250YWxDb25zdHJhaW50cz4gZmxvYXRDb25zdHJhaW50 cyhjb25zdCBJbmxpbmVSZWN0JiBsaW5lTG9naWNhbFJlY3QpIGNvbnN0OworCiAgICAgdm9pZCBo YW5kbGVGbG9hdENvbnRlbnQoY29uc3QgSW5saW5lSXRlbSYpOwogICAgIFJlc3VsdCBoYW5kbGVJ bmxpbmVDb250ZW50KElubGluZUNvbnRlbnRCcmVha2VyJiwgY29uc3QgSW5saW5lSXRlbVJhbmdl JiBuZWVkc0xheW91dFJhbmdlLCBjb25zdCBMaW5lQ2FuZGlkYXRlJik7CiAgICAgc2l6ZV90IHJl YnVpbGRMaW5lKGNvbnN0IElubGluZUl0ZW1SYW5nZSYgbmVlZHNMYXlvdXRSYW5nZSwgY29uc3Qg SW5saW5lSXRlbSYgbGFzdElubGluZUl0ZW1Ub0FkZCk7CkBAIC0xMDcsNiArMTA5LDcgQEAgcHJp dmF0ZToKICAgICBjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgZm9ybWF0dGluZ0NvbnRl eHQoKSBjb25zdCB7IHJldHVybiBtX2lubGluZUZvcm1hdHRpbmdDb250ZXh0OyB9CiAgICAgSW5s aW5lRm9ybWF0dGluZ1N0YXRlKiBmb3JtYXR0aW5nU3RhdGUoKSB7IHJldHVybiBtX2lubGluZUZv cm1hdHRpbmdTdGF0ZTsgfQogICAgIEZsb2F0aW5nU3RhdGUqIGZsb2F0aW5nU3RhdGUoKSB7IHJl dHVybiBtX2Zsb2F0aW5nU3RhdGU7IH0KKyAgICBjb25zdCBGbG9hdGluZ1N0YXRlKiBmbG9hdGlu Z1N0YXRlKCkgY29uc3QgeyByZXR1cm4gbV9mbG9hdGluZ1N0YXRlOyB9CiAgICAgY29uc3QgQ29u dGFpbmVyQm94JiByb290KCkgY29uc3Q7CiAgICAgY29uc3QgTGF5b3V0U3RhdGUmIGxheW91dFN0 YXRlKCkgY29uc3Q7CiAK