205231 2019-12-13 18:48:45 -0800 [LFC][IFC] Add text-indent support 2019-12-14 04:47:59 -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 1598588 0 zalan 2019-12-13 18:48:45 -0800 ssia 1598589 1 webkit-bug-importer 2019-12-13 18:49:29 -0800 <rdar://problem/57932746> 1598629 2 385686 zalan 2019-12-14 04:42:58 -0800 Created attachment 385686 Patch 1598631 3 zalan 2019-12-14 04:47:59 -0800 Committed r253522: <https://trac.webkit.org/changeset/253522> 385686 2019-12-14 04:42:58 -0800 2019-12-14 04:42:58 -0800 Patch bug-205231-20191214044258.patch text/plain 10156 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzNTAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDQ5YjI1OTQ5YjkxNzNh ZjAwODZjNDc1NjFlNjU1NTAyODI5M2FjMy4uYWMwYjg3YTA3ZGM1MGQwOTM0MjJjMWRlYmQ0MjU0 YzQ1NWY5ZmUyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE5LTEyLTEzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBBZGQgdGV4 dC1pbmRlbnQgc3VwcG9ydAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjA1MjMxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81NzkzMjc0Nj4KKworICAg ICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KKworICAgICAgICBUaGlzIHByb3BlcnR5 IHNwZWNpZmllcyB0aGUgaW5kZW50YXRpb24gYXBwbGllZCB0byBsaW5lcyBvZiBpbmxpbmUgY29u dGVudCBpbiBhIGJsb2NrLgorICAgICAgICBUaGUgaW5kZW50IGlzIHRyZWF0ZWQgYXMgYSBtYXJn aW4gYXBwbGllZCB0byB0aGUgc3RhcnQgZWRnZSBvZiB0aGUgbGluZSBib3guCisKKyAgICAgICAg KiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0OjpsaW5lTGF5 b3V0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6 OmNvbnN0cmFpbnRzRm9yTGluZSk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv SW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaDoKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0 dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5Ojpjb21wdXRlZFRl eHRJbmRlbnQgY29uc3QpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGlu ZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OlF1aXJrczo6bGluZUhlaWdodENvbnN0cmFpbnRzIGNv bnN0KToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9MaW5lTGF5b3V0Q29udGV4 dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVMYXlvdXRDb250ZXh0OjpwbGFj ZUlubGluZUl0ZW0pOgorCiAyMDE5LTEyLTEzICBEZWFuIEphY2tzb24gIDxkaW5vQGFwcGxlLmNv bT4KIAogICAgICAgICBNYWNDYXRhbHlzdCBidWlsZCBvZiBsaWJBTkdMRSBpcyBpbnN0YWxsZWQg aW4gdGhlIGluY29ycmVjdCBsb2NhdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQu Y3BwCmluZGV4IDVhYTg4ZDMyNTcwMDgzM2UxZjBmYmM3M2Y4NWRiMmUyZjVkOTZlZjcuLjU1ODE5 MWJkOWQ3MGNhZWEwZjk0NGMwYTU1ZWMyYzAzZWI2MTcwY2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3Jt YXR0aW5nQ29udGV4dC5jcHAKQEAgLTExNCwxOCArMTE0LDE4IEBAIHZvaWQgSW5saW5lRm9ybWF0 dGluZ0NvbnRleHQ6OmxpbmVMYXlvdXQoY29uc3QgVXNlZEhvcml6b250YWxWYWx1ZXMmIHVzZWRI b3Jpem9uCiAgICAgICAgICAgICAgICAgcGFydGlhbExlYWRpbmdDb250ZW50TGVuZ3RoID0gbGlu ZUNvbnRlbnQucGFydGlhbENvbnRlbnQtPm92ZXJmbG93Q29udGVudExlbmd0aDsKICAgICAgICAg ICAgIH0gZWxzZQogICAgICAgICAgICAgICAgIGxlYWRpbmdJbmxpbmVJdGVtSW5kZXggPSAqbGlu ZUNvbnRlbnQudHJhaWxpbmdJbmxpbmVJdGVtSW5kZXggKyAxOwotICAgICAgICB9IGVsc2Ugewot ICAgICAgICAgICAgLy8gRmxvYXRzIHByZXZlbnRlZCB1cyBwbGFjaW5nIGFueSBjb250ZW50IG9u IHRoZSBsaW5lLgotICAgICAgICAgICAgQVNTRVJUKGxpbmVCdWlsZGVyLmhhc0ludHJ1c2l2ZUZs b2F0KCkpOwotICAgICAgICAgICAgLy8gTW92ZSB0aGUgbmV4dCBsaW5lIGJlbG93IHRoZSBpbnRy dXNpdmUgZmxvYXQuCi0gICAgICAgICAgICBhdXRvIGZsb2F0aW5nQ29udGV4dCA9IEZsb2F0aW5n Q29udGV4dCB7IHJvb3QoKSwgKnRoaXMsIGZvcm1hdHRpbmdTdGF0ZSgpLmZsb2F0aW5nU3RhdGUo KSB9OwotICAgICAgICAgICAgYXV0byBmbG9hdENvbnN0cmFpbnRzID0gZmxvYXRpbmdDb250ZXh0 LmNvbnN0cmFpbnRzKHsgbGluZUxvZ2ljYWxUb3AgfSk7Ci0gICAgICAgICAgICBBU1NFUlQoZmxv YXRDb25zdHJhaW50cy5sZWZ0IHx8IGZsb2F0Q29uc3RyYWludHMucmlnaHQpOwotICAgICAgICAg ICAgc3RhdGljIGF1dG8gaW5pZml0ZVBvaW50ID0gUG9pbnRJbkNvbnRleHRSb290OjptYXgoKTsK LSAgICAgICAgICAgIC8vIEluIGNhc2Ugb2YgbGVmdCBhbmQgcmlnaHQgY29uc3RyYWludHMsIHdl IG5lZWQgdG8gcGljayB0aGUgb25lIHRoYXQncyBjbG9zZXIgdG8gdGhlIGN1cnJlbnQgbGluZS4K LSAgICAgICAgICAgIGxpbmVMb2dpY2FsVG9wID0gc3RkOjptaW4oZmxvYXRDb25zdHJhaW50cy5s ZWZ0LnZhbHVlT3IoaW5pZml0ZVBvaW50KS55LCBmbG9hdENvbnN0cmFpbnRzLnJpZ2h0LnZhbHVl T3IoaW5pZml0ZVBvaW50KS55KTsKLSAgICAgICAgICAgIEFTU0VSVChsaW5lTG9naWNhbFRvcCA8 IGluaWZpdGVQb2ludC55KTsKKyAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9CisgICAg ICAgIC8vIEZsb2F0cyBwcmV2ZW50ZWQgdXMgcGxhY2luZyBhbnkgY29udGVudCBvbiB0aGUgbGlu ZS4KKyAgICAgICAgQVNTRVJUKGxpbmVCdWlsZGVyLmhhc0ludHJ1c2l2ZUZsb2F0KCkpOworICAg ICAgICAvLyBNb3ZlIHRoZSBuZXh0IGxpbmUgYmVsb3cgdGhlIGludHJ1c2l2ZSBmbG9hdC4KKyAg ICAgICAgYXV0byBmbG9hdGluZ0NvbnRleHQgPSBGbG9hdGluZ0NvbnRleHQgeyByb290KCksICp0 aGlzLCBmb3JtYXR0aW5nU3RhdGUoKS5mbG9hdGluZ1N0YXRlKCkgfTsKKyAgICAgICAgYXV0byBm bG9hdENvbnN0cmFpbnRzID0gZmxvYXRpbmdDb250ZXh0LmNvbnN0cmFpbnRzKHsgbGluZUxvZ2lj YWxUb3AgfSk7CisgICAgICAgIEFTU0VSVChmbG9hdENvbnN0cmFpbnRzLmxlZnQgfHwgZmxvYXRD b25zdHJhaW50cy5yaWdodCk7CisgICAgICAgIHN0YXRpYyBhdXRvIGluaWZpdGVQb2ludCA9IFBv aW50SW5Db250ZXh0Um9vdDo6bWF4KCk7CisgICAgICAgIC8vIEluIGNhc2Ugb2YgbGVmdCBhbmQg cmlnaHQgY29uc3RyYWludHMsIHdlIG5lZWQgdG8gcGljayB0aGUgb25lIHRoYXQncyBjbG9zZXIg dG8gdGhlIGN1cnJlbnQgbGluZS4KKyAgICAgICAgbGluZUxvZ2ljYWxUb3AgPSBzdGQ6Om1pbihm bG9hdENvbnN0cmFpbnRzLmxlZnQudmFsdWVPcihpbmlmaXRlUG9pbnQpLnksIGZsb2F0Q29uc3Ry YWludHMucmlnaHQudmFsdWVPcihpbmlmaXRlUG9pbnQpLnkpOworICAgICAgICBBU1NFUlQobGlu ZUxvZ2ljYWxUb3AgPCBpbmlmaXRlUG9pbnQueSk7CiAgICAgfQogfQogCkBAIC00MDQsNiArNDA0 LDMyIEBAIExpbmVCdWlsZGVyOjpDb25zdHJhaW50cyBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6 Y29uc3RyYWludHNGb3JMaW5lKGNvbnN0IFVzZWRICiAgICAgICAgICAgICBhdmFpbGFibGVXaWR0 aCA9IGZsb2F0Q29uc3RyYWludHMucmlnaHQtPnggLSBsaW5lTG9naWNhbExlZnQ7CiAgICAgICAg IH0KICAgICB9CisKKyAgICBhdXRvIGNvbXB1dGVkVGV4dEluZGVudCA9IFsmXSB7CisgICAgICAg IC8vIHRleHQtaW5kZW50IHByb3BlcnR5IHNwZWNpZmllcyB0aGUgaW5kZW50YXRpb24gYXBwbGll ZCB0byBsaW5lcyBvZiBpbmxpbmUgY29udGVudCBpbiBhIGJsb2NrLgorICAgICAgICAvLyBUaGUg aW5kZW50IGlzIHRyZWF0ZWQgYXMgYSBtYXJnaW4gYXBwbGllZCB0byB0aGUgc3RhcnQgZWRnZSBv ZiB0aGUgbGluZSBib3guCisgICAgICAgIC8vIFVubGVzcyBvdGhlcndpc2Ugc3BlY2lmaWVkLCBv bmx5IGxpbmVzIHRoYXQgYXJlIHRoZSBmaXJzdCBmb3JtYXR0ZWQgbGluZSBvZiBhbiBlbGVtZW50 IGFyZSBhZmZlY3RlZC4KKyAgICAgICAgLy8gRm9yIGV4YW1wbGUsIHRoZSBmaXJzdCBsaW5lIG9m IGFuIGFub255bW91cyBibG9jayBib3ggaXMgb25seSBhZmZlY3RlZCBpZiBpdCBpcyB0aGUgZmly c3QgY2hpbGQgb2YgaXRzIHBhcmVudCBlbGVtZW50LgorICAgICAgICAvLyBGSVhNRTogQWRkIHN1 cHBvcnQgZm9yIGVhY2gtbGluZS4KKyAgICAgICAgLy8gW0ludGVncmF0aW9uXSByb290KCktPnBh cmVudCgpIHdvdWxkIG5vcm1hbGx5IHByb2R1Y2UgYSB2YWxpZCBsYXlvdXQgYm94LgorICAgICAg ICBhdXRvJiByb290ID0gdGhpcy0+cm9vdCgpOworICAgICAgICBhdXRvIGlzRm9ybWF0dGluZ0Nv bnRleHRSb290Q2FuZGlkYXRlVG9UZXh0SW5kZW50ID0gIXJvb3QuaXNBbm9ueW1vdXMoKSB8fCAh cm9vdC5wYXJlbnQoKSB8fCByb290LnBhcmVudCgpLT5maXJzdEluRmxvd0NoaWxkKCkgPT0gJnJv b3Q7CisgICAgICAgIGlmICghaXNGb3JtYXR0aW5nQ29udGV4dFJvb3RDYW5kaWRhdGVUb1RleHRJ bmRlbnQpCisgICAgICAgICAgICByZXR1cm4gSW5saW5lTGF5b3V0VW5pdCB7IH07CisgICAgICAg IGF1dG8gaW52ZXJ0TGluZVJhbmdlID0gZmFsc2U7CisjaWYgRU5BQkxFKENTUzNfVEVYVCkKKyAg ICAgICAgaW52ZXJ0TGluZVJhbmdlID0gcm9vdC5zdHlsZSgpLnRleHRJbmRlbnRUeXBlKCkgPT0g VGV4dEluZGVudFR5cGU6Okhhbmdpbmc7CisjZW5kaWYKKyAgICAgICAgYXV0byBpc0ZpcnN0TGlu ZSA9IGZvcm1hdHRpbmdTdGF0ZSgpLmVuc3VyZURpc3BsYXlJbmxpbmVDb250ZW50KCkubGluZUJv eGVzLmlzRW1wdHkoKTsKKyAgICAgICAgLy8gdGV4dC1pbmRlbnQ6IGhhbmdpbmcgaW52ZXJ0cyB3 aGljaCBsaW5lcyBhcmUgYWZmZWN0ZWQuCisgICAgICAgIC8vIGludmVydGVkIGxpbmUgcmFuZ2Ug LT4gYWxsIHRoZSBsaW5lcyBleGNlcHQgdGhlIGZpcnN0IG9uZS4KKyAgICAgICAgLy8gIWludmVy dGVkIGxpbmUgcmFuZ2UgLT4gZmlyc3QgbGluZSBnZXRzIHRoZSBpbmRlbnQuCisgICAgICAgIGF1 dG8gc2hvdWxkSW5kZW50ID0gaW52ZXJ0TGluZVJhbmdlICE9IGlzRmlyc3RMaW5lOworICAgICAg ICBpZiAoIXNob3VsZEluZGVudCkKKyAgICAgICAgICAgIHJldHVybiBJbmxpbmVMYXlvdXRVbml0 IHsgfTsKKyAgICAgICAgcmV0dXJuIGdlb21ldHJ5KCkuY29tcHV0ZWRUZXh0SW5kZW50KHJvb3Qs IHVzZWRIb3Jpem9udGFsVmFsdWVzLmNvbnN0cmFpbnRzKS52YWx1ZU9yKElubGluZUxheW91dFVu aXQgeyB9KTsKKyAgICB9OworICAgIGxpbmVMb2dpY2FsTGVmdCArPSBjb21wdXRlZFRleHRJbmRl bnQoKTsKICAgICByZXR1cm4gTGluZUJ1aWxkZXI6OkNvbnN0cmFpbnRzIHsgeyBsaW5lTG9naWNh bExlZnQsIGxpbmVMb2dpY2FsVG9wIH0sIGF2YWlsYWJsZVdpZHRoLCBsaW5lSXNDb25zdHJhaW5l ZEJ5RmxvYXQsIHF1aXJrcygpLmxpbmVIZWlnaHRDb25zdHJhaW50cyhyb290KCkpIH07CiB9CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGlu ZUZvcm1hdHRpbmdDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0 dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oCmluZGV4IGFiODc3MTViZmQ3NWQyYzg1NDMy NWNkYjFjNTRmOWNiMjg2NGIzZWEuLmQ4ZTg5NDRiMWM3Njg0Y2FkNTlhNDdjNWFhZWU5NDYzNGM1 ZGUxOTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaApAQCAtNTEsNyArNTEsNyBA QCBwcml2YXRlOgogICAgIGNsYXNzIFF1aXJrcyA6IHB1YmxpYyBGb3JtYXR0aW5nQ29udGV4dDo6 UXVpcmtzIHsKICAgICBwdWJsaWM6CiAgICAgICAgIGJvb2wgbGluZURlc2NlbnROZWVkc0NvbGxh cHNpbmcoY29uc3QgTGluZUJ1aWxkZXI6OlJ1bkxpc3QmKSBjb25zdDsKLSAgICAgICAgTGluZUJ1 aWxkZXI6OkNvbnN0cmFpbnRzOjpIZWlnaHRBbmRCYXNlbGluZSBsaW5lSGVpZ2h0Q29uc3RyYWlu dHMoY29uc3QgQm94JiBmb3JtYXR0aW5nUm9vdCkgY29uc3Q7CisgICAgICAgIExpbmVCdWlsZGVy OjpDb25zdHJhaW50czo6SGVpZ2h0QW5kQmFzZWxpbmUgbGluZUhlaWdodENvbnN0cmFpbnRzKGNv bnN0IENvbnRhaW5lciYgZm9ybWF0dGluZ1Jvb3QpIGNvbnN0OwogCiAgICAgcHJpdmF0ZToKICAg ICAgICAgZnJpZW5kIGNsYXNzIElubGluZUZvcm1hdHRpbmdDb250ZXh0OwpAQCAtNjYsNiArNjYs NyBAQCBwcml2YXRlOgogICAgIHB1YmxpYzoKICAgICAgICAgQ29udGVudEhlaWdodEFuZE1hcmdp biBpbmxpbmVCbG9ja0hlaWdodEFuZE1hcmdpbihjb25zdCBCb3gmLCBjb25zdCBVc2VkSG9yaXpv bnRhbFZhbHVlcyYsIGNvbnN0IFVzZWRWZXJ0aWNhbFZhbHVlcyYpIGNvbnN0OwogICAgICAgICBD b250ZW50V2lkdGhBbmRNYXJnaW4gaW5saW5lQmxvY2tXaWR0aEFuZE1hcmdpbihjb25zdCBCb3gm LCBjb25zdCBVc2VkSG9yaXpvbnRhbFZhbHVlcyYpOworICAgICAgICBPcHRpb25hbDxJbmxpbmVM YXlvdXRVbml0PiBjb21wdXRlZFRleHRJbmRlbnQoY29uc3QgQ29udGFpbmVyJiBmb3JtYXR0aW5n Q29udGV4dFJvb3QsIGNvbnN0IFVzZWRIb3Jpem9udGFsVmFsdWVzOjpDb25zdHJhaW50cyYpIGNv bnN0OwogCiAgICAgcHJpdmF0ZToKICAgICAgICAgZnJpZW5kIGNsYXNzIElubGluZUZvcm1hdHRp bmdDb250ZXh0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5 LmNwcAppbmRleCBiOWY3NGJhZjRlYTI4MDZmYjUxNTNkZjM1MWI4OTEyOTE4ZGUwODA1Li4yOTdk MDcwNzBmYTkzNzhjNDNlMmEyNThmMDY0NzE4NTZjMzdmNDNiIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdl b21ldHJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcApAQCAtMzEsNiArMzEsNyBAQAogI2lu Y2x1ZGUgIkZvcm1hdHRpbmdDb250ZXh0LmgiCiAjaW5jbHVkZSAiTGF5b3V0Qm94LmgiCiAjaW5j bHVkZSAiTGF5b3V0Q29udGFpbmVyLmgiCisjaW5jbHVkZSAiTGVuZ3RoRnVuY3Rpb25zLmgiCiAK IG5hbWVzcGFjZSBXZWJDb3JlIHsKIG5hbWVzcGFjZSBMYXlvdXQgewpAQCAtNzMsNiArNzQsMTQg QEAgQ29udGVudEhlaWdodEFuZE1hcmdpbiBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0 cnk6OmlubGluZUJsb2NrSGVpZ2h0QW5kTWEKICAgICByZXR1cm4gY29tcGxpY2F0ZWRDYXNlcyhs YXlvdXRCb3gsIHVzZWRIb3Jpem9udGFsVmFsdWVzLCB1c2VkVmVydGljYWxWYWx1ZXMpOwogfQog CitPcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6R2Vv bWV0cnk6OmNvbXB1dGVkVGV4dEluZGVudChjb25zdCBDb250YWluZXImIGZvcm1hdHRpbmdDb250 ZXh0Um9vdCwgY29uc3QgVXNlZEhvcml6b250YWxWYWx1ZXM6OkNvbnN0cmFpbnRzJiBob3Jpem9u dGFsQ29uc3RyYWludHMpIGNvbnN0Cit7CisgICAgYXV0byB0ZXh0SW5kZW50ID0gZm9ybWF0dGlu Z0NvbnRleHRSb290LnN0eWxlKCkudGV4dEluZGVudCgpOworICAgIGlmICh0ZXh0SW5kZW50ID09 IFJlbmRlclN0eWxlOjppbml0aWFsVGV4dEluZGVudCgpKQorICAgICAgICByZXR1cm4geyB9Owor ICAgIHJldHVybiBJbmxpbmVMYXlvdXRVbml0IHsgbWluaW11bVZhbHVlRm9yTGVuZ3RoKHRleHRJ bmRlbnQsIGhvcml6b250YWxDb25zdHJhaW50cy53aWR0aCkgfTsKK30KKwogfQogfQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3Jt YXR0aW5nQ29udGV4dFF1aXJrcy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9y bWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAKaW5kZXggMmVlZDg1OGZh ZmFiNGMyZDZiNjI4YjM5YWYzODljYmRiZThhZmM2Ny4uMDg5Njk3MjU5ODhlODhiOTc0NmQ2OGI2 NmYzZjkwZGRiYTg5ZTQyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRRdWlya3MuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0 UXVpcmtzLmNwcApAQCAtNzQsNyArNzQsNyBAQCBib29sIElubGluZUZvcm1hdHRpbmdDb250ZXh0 OjpRdWlya3M6OmxpbmVEZXNjZW50TmVlZHNDb2xsYXBzaW5nKGNvbnN0IExpbmVCdWlsZAogICAg IHJldHVybiB0cnVlOwogfQogCi1MaW5lQnVpbGRlcjo6Q29uc3RyYWludHM6OkhlaWdodEFuZEJh c2VsaW5lIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpRdWlya3M6OmxpbmVIZWlnaHRDb25zdHJh aW50cyhjb25zdCBCb3gmIGZvcm1hdHRpbmdSb290KSBjb25zdAorTGluZUJ1aWxkZXI6OkNvbnN0 cmFpbnRzOjpIZWlnaHRBbmRCYXNlbGluZSBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6UXVpcmtz OjpsaW5lSGVpZ2h0Q29uc3RyYWludHMoY29uc3QgQ29udGFpbmVyJiBmb3JtYXR0aW5nUm9vdCkg Y29uc3QKIHsKICAgICAvLyBjb21wdXRlZExpbmVIZWlnaHQgdGFrZXMgZm9udC1zaXplIGludG8g YWNjb3VudCB3aGVuIGxpbmUtaGVpZ2h0IGlzIG5vdCBzZXQuCiAgICAgLy8gU3RydXQgaXMgdGhl IGltYWdpbmFyeSBib3ggdGhhdCB3ZSBwdXQgb24gZXZlcnkgbGluZS4gSXQgc2V0cyB0aGUgaW5p dGlhbCB2ZXJ0aWNhbCBjb25zdHJhaW50cyBmb3IgZWFjaCBuZXcgbGluZS4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0xpbmVMYXlvdXRDb250ZXh0 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0xpbmVMYXlvdXRD b250ZXh0LmNwcAppbmRleCA2NWE1ZTZmZGRmOWU2NjYwMDQ4NTM3Y2NjMGY2ZDRjNzIwZTE3NmU2 Li5mYzQ2ZWY2NDY1MjRiMTNhNjFlMDhlMTQ0MzM4ZmMwYjYzOTZjNmZlIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9MaW5lTGF5b3V0Q29udGV4dC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvTGluZUxheW91 dENvbnRleHQuY3BwCkBAIC0xODQsNyArMTg0LDYgQEAgTGluZUxheW91dENvbnRleHQ6OklzRW5k T2ZMaW5lIExpbmVMYXlvdXRDb250ZXh0OjpwbGFjZUlubGluZUl0ZW0oTGluZUJ1aWxkZXImIGwK ICAgICAgICAgfQogICAgICAgICByZXR1cm4gSXNFbmRPZkxpbmU6OlllczsKICAgICB9Ci0gICAg Ly8KICAgICBhdXRvIGlzRW5kT2ZMaW5lID0gSXNFbmRPZkxpbmU6Ok5vOwogICAgIC8vIENhbiB3 ZSBjb21taXQgdGhlIHBlbmRpbmcgY29udGVudCBhbHJlYWR5PwogICAgIGlmIChMaW5lQnJlYWtl cjo6Q29udGVudDo6aXNBdENvbnRlbnRCb3VuZGFyeShpbmxpbmVJdGVtLCBtX3VuY29tbWl0dGVk Q29udGVudCkpCg==