243564 2022-08-04 15:39:59 -0700 [Painting] visualOverflowForDecorations needs the line box to compute underline offsets 2022-08-14 14:06:25 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 243766 1 zalan zalan bfulgham changseok esprehn+autocc ews-watchlist glenn koivisto kondapallykalyan mmaxfield pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1888987 0 zalan 2022-08-04 15:39:59 -0700 ssia 1888995 1 461409 zalan 2022-08-04 15:58:02 -0700 Created attachment 461409 [fast-cq]Patch 1889107 2 ews-feeder 2022-08-05 06:24:55 -0700 Committed 253145@main (89d57a6f366a): <https://commits.webkit.org/253145@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 461409. 1889108 3 webkit-bug-importer 2022-08-05 06:25:19 -0700 <rdar://problem/98188799> 461409 2022-08-04 15:58:02 -0700 2022-08-05 06:24:56 -0700 [fast-cq]Patch bug-243564-20220804155801.patch text/plain 14001 zalan RnJvbSBmMzc2MWQ2MjI2M2ViZTcyYWY4ODZhZGU2YjBmY2EyYzAzYWQ3NjdmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJ1anRhcyA8emFsYW5AYXBwbGUuY29tPgpEYXRlOiBU aHUsIDQgQXVnIDIwMjIgMTU6NDA6MTEgLTA3MDAKU3ViamVjdDogW1BBVENIXSBbUGFpbnRpbmdd IHZpc3VhbE92ZXJmbG93Rm9yRGVjb3JhdGlvbnMgbmVlZHMgdGhlIGxpbmUgYm94IHRvCiBjb21w dXRlIHVuZGVybGluZSBvZmZzZXRzIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yNDM1NjQKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKVGhlcmUgYXJlIDMgdmFy aWFudHMgb2YgdmlzdWFsT3ZlcmZsb3dGb3JEZWNvcmF0aW9ucyBub3c6CjEuIHdlIGRvbid0IGhh dmUgY29tcHV0ZWQgZ2VvbWV0cnksIG9ubHkgc3R5bGUuCiAgIER1ZSB0byB0aGUgbGFjayBvZiB1 c2VkIGdlb21ldHJ5LCB0aGlzIG1heSBub3QgcHJvZHVjZSBjb3JyZWN0IHJlc3VsdCBmb3IgY29u dGVudCB3aXRoIHVuZGVybGluZSAoUmVuZGVyU3R5bGUgZGlmZiBjYWxscyB0aGlzIGZ1bmN0aW9u KSAtIHZpc3VhbE92ZXJmbG93Rm9yRGVjb3JhdGlvbnMoY29uc3QgUmVuZGVyU3R5bGUmKS4KMi4g d2UgaGF2ZSBhIHRleHQgYm94IG9uIGEgbGluZS4gdmlzdWFsT3ZlcmZsb3dGb3JEZWNvcmF0aW9u cyhjb25zdCBJbmxpbmVJdGVyYXRvcjo6TGluZUJveEl0ZXJhdG9yJiBsaW5lQm94LCBjb25zdCBS ZW5kZXJUZXh0Ji4uLgogICBOb3cgdGhpcyBmdW5jdGlvbiB0cmF2ZXJzZXMgdGhlIGxpbmUgYW5k IGNoZWNrcyBlYWNoIGxlYWYgdGV4dCBib3ggdG8gY29tcHV0ZSB0aGUgY29ycmVjdCAobWF4KSB1 bmRlcmxpbmUgb2Zmc2V0LgogICBUaGlzIGZ1bmN0aW9uIGNhbiBvbmx5IHJldHVybiBjb3JyZWN0 IHJlc3VsdCBpZiBhbGwgbGVhZiBib3hlcyBhcmUgcGxhY2VkIG9uIHRoZSBsaW5lICh3aGljaCBp cyBhbHdheXMgdGhlIGNhc2Ugd2hlbiB3ZSBjYWxsIGl0IGZyb20gcGFpbnRpbmcgKG5vdCBleGFj dGx5IHRoaXMgZnVuY3Rpb24gYnV0IGNvbXB1dGVVbmRlcmxpbmVPZmZzZXQoKSwKICAgYnV0IHRo aXMgYWxzbyBnZXRzIGNhbGxlZCB0byBjb21wdXRlIHRoZSB2aXN1YWwgb3ZlcmZsb3cpLgozLiB3 ZSBoYXZlIHByZWNvbXB1dGVkIGdlb21ldHJ5IC12aXN1YWxPdmVyZmxvd0ZvckRlY29yYXRpb25z KGNvbnN0IFJlbmRlclN0eWxlJiwgVW5kZXJsaW5lT2Zmc2V0QXJndW1lbnRzOjpUZXh0VW5kZXJs aW5lUG9zaXRpb25VbmRlcikKClRoaXMgcGF0Y2ggYWxzbyBtb3ZlcyB0aGUgKzEgKGludGVncmFs IGNlaWxpbmcpIGhhY2sgdG8gYSBjZW50cmFsIHBsYWNlIChpbiBjb21wdXRlZFZpc3VhbE92ZXJm bG93Rm9yRGVjb3JhdGlvbnMpIGFuZCBtYWtlcyBzb21lIGZ1bmN0aW9ucyBzdGF0aWMgdG8gSW5s aW5lVGV4dEJveFN0eWxlLmNwcC4KCiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwOgoo V2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmNvbGxlY3RJbmtP dmVyZmxvd0ZvclRleHREZWNvcmF0aW9ucyk6CiogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0xl Z2FjeUxpbmVMYXlvdXQuY3BwOgooV2ViQ29yZTo6c2V0TG9naWNhbFdpZHRoRm9yVGV4dFJ1bik6 CiogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHREZWNvcmF0aW9uUGFpbnRlci5jcHA6CihX ZWJDb3JlOjpUZXh0RGVjb3JhdGlvblBhaW50ZXI6OnBhaW50QmFja2dyb3VuZERlY29yYXRpb25z KToKKiBTb3VyY2UvV2ViQ29yZS9zdHlsZS9JbmxpbmVUZXh0Qm94U3R5bGUuY3BwOgooV2ViQ29y ZTo6dGV4dFJ1bkxvZ2ljYWxPZmZzZXRGcm9tTGluZUJvdHRvbSk6CihXZWJDb3JlOjpkZWZhdWx0 R2FwKToKKFdlYkNvcmU6OmNvbXB1dGVkVmlzdWFsT3ZlcmZsb3dGb3JEZWNvcmF0aW9ucyk6CihX ZWJDb3JlOjp2aXN1YWxPdmVyZmxvd0ZvckRlY29yYXRpb25zKToKKiBTb3VyY2UvV2ViQ29yZS9z dHlsZS9JbmxpbmVUZXh0Qm94U3R5bGUuaDoKLS0tCiAuLi4vZGlzcGxheS9JbmxpbmVEaXNwbGF5 Q29udGVudEJ1aWxkZXIuY3BwICAgfCAxMSArKy0tCiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv TGVnYWN5TGluZUxheW91dC5jcHAgfCAgNiArLQogLi4uL3JlbmRlcmluZy9UZXh0RGVjb3JhdGlv blBhaW50ZXIuY3BwICAgICAgIHwgIDIgKy0KIFNvdXJjZS9XZWJDb3JlL3N0eWxlL0lubGluZVRl eHRCb3hTdHlsZS5jcHAgICB8IDY2ICsrKysrKysrKystLS0tLS0tLS0KIFNvdXJjZS9XZWJDb3Jl L3N0eWxlL0lubGluZVRleHRCb3hTdHlsZS5oICAgICB8IDExICsrLS0KIDUgZmlsZXMgY2hhbmdl ZCwgNDkgaW5zZXJ0aW9ucygrKSwgNDcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVE aXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3Bw CmluZGV4IDJkNWVkMDg0ODM3Mi4uMDUzZTZiZTNkZDcxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3Bs YXlDb250ZW50QnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3Bw CkBAIC04NzMsMTcgKzg3MywxNiBAQCB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6 Y29sbGVjdElua092ZXJmbG93Rm9yVGV4dERlY29yYXRpb25zKERpc3BsYXlCbwogICAgICAgICBp ZiAoIXRleHREZWNvcmF0aW9ucykKICAgICAgICAgICAgIGNvbnRpbnVlOwogCi0gICAgICAgIGF1 dG8gdW5kZXJsaW5lT2Zmc2V0ID0gWyZdKCkgLT4gc3RkOjpvcHRpb25hbDxmbG9hdD4geworICAg ICAgICBhdXRvIGRlY29yYXRpb25PdmVyZmxvdyA9IFsmXSB7CiAgICAgICAgICAgICBpZiAoIXRl eHREZWNvcmF0aW9ucy5jb250YWlucyhUZXh0RGVjb3JhdGlvbkxpbmU6OlVuZGVybGluZSkpCi0g ICAgICAgICAgICAgICAgcmV0dXJuIHsgfTsKKyAgICAgICAgICAgICAgICByZXR1cm4gdmlzdWFs T3ZlcmZsb3dGb3JEZWNvcmF0aW9ucyhzdHlsZSk7CisKICAgICAgICAgICAgIGlmICghbG9naWNh bEJvdHRvbUZvclRleHREZWNvcmF0aW9uKQogICAgICAgICAgICAgICAgIGxvZ2ljYWxCb3R0b21G b3JUZXh0RGVjb3JhdGlvbiA9IGxvZ2ljYWxCb3R0b21Gb3JUZXh0RGVjb3JhdGlvbkNvbnRlbnQo Ym94ZXMsIGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKTsKICAgICAgICAgICAgIGF1dG8gdGV4dFJ1 bkxvZ2ljYWxPZmZzZXRGcm9tTGluZUJvdHRvbSA9ICpsb2dpY2FsQm90dG9tRm9yVGV4dERlY29y YXRpb24gLSAoaXNIb3Jpem9udGFsV3JpdGluZ01vZGUgPyBkaXNwbGF5Qm94LmJvdHRvbSgpIDog ZGlzcGxheUJveC5yaWdodCgpKTsKLSAgICAgICAgICAgIC8vIENvbXBlbnNhdGUgZm9yIHRoZSBp bnRlZ3JhbCBjZWlsaW5nIGluIEdyYXBoaWNzQ29udGV4dDo6Y29tcHV0ZUxpbmVCb3VuZHNBbmRB bnRpYWxpYXNpbmdNb2RlRm9yVGV4dCgpCi0gICAgICAgICAgICByZXR1cm4gY29tcHV0ZVVuZGVy bGluZU9mZnNldCh7IHN0eWxlLCBkZWZhdWx0R2FwKHN0eWxlKSwgVW5kZXJsaW5lT2Zmc2V0QXJn dW1lbnRzOjpUZXh0VW5kZXJsaW5lUG9zaXRpb25VbmRlciB7IGRpc3BsYXlMaW5lLmJhc2VsaW5l VHlwZSgpLCBkaXNwbGF5Qm94LmhlaWdodCgpLCB0ZXh0UnVuTG9naWNhbE9mZnNldEZyb21MaW5l Qm90dG9tIH0gfSkgKyAxLjBmOwotICAgICAgICB9OworICAgICAgICAgICAgcmV0dXJuIHZpc3Vh bE92ZXJmbG93Rm9yRGVjb3JhdGlvbnMoc3R5bGUsIHsgZGlzcGxheUxpbmUuYmFzZWxpbmVUeXBl KCksIGRpc3BsYXlCb3guaGVpZ2h0KCksIHRleHRSdW5Mb2dpY2FsT2Zmc2V0RnJvbUxpbmVCb3R0 b20gfSk7CisgICAgICAgIH0oKTsKIAotICAgICAgICBhdXRvIGRlY29yYXRpb25PdmVyZmxvdyA9 IHZpc3VhbE92ZXJmbG93Rm9yRGVjb3JhdGlvbnMoc3R5bGUsIHVuZGVybGluZU9mZnNldCgpKTsK ICAgICAgICAgaWYgKCFkZWNvcmF0aW9uT3ZlcmZsb3cuaXNFbXB0eSgpKSB7CiAgICAgICAgICAg ICBtX2NvbnRlbnRIYXNJbmtPdmVyZmxvdyA9IHRydWU7CiAgICAgICAgICAgICBhdXRvIGluZmxh dGVkVmlzdWFsT3ZlcmZsb3dSZWN0ID0gWyZdIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9MZWdhY3lMaW5lTGF5b3V0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9MZWdhY3lMaW5lTGF5b3V0LmNwcAppbmRleCBlMzRjZDVhODZiNTQuLjM1YmMzOGI2MDRiYSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0xlZ2FjeUxpbmVMYXlvdXQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9MZWdhY3lMaW5lTGF5b3V0LmNwcApAQCAt NTM3LDggKzUzNywxMCBAQCBzdGF0aWMgaW5saW5lIHZvaWQgc2V0TG9naWNhbFdpZHRoRm9yVGV4 dFJ1bihMZWdhY3lSb290SW5saW5lQm94KiBsaW5lQm94LCBCaWRpUgogICAgIH0KIAogICAgIC8v IEluY2x1ZGUgdGV4dCBkZWNvcmF0aW9uIHZpc3VhbCBvdmVyZmxvdyBhcyBwYXJ0IG9mIHRoZSBn bHlwaCBvdmVyZmxvdy4KLSAgICBpZiAoIXJlbmRlcmVyLnN0eWxlKCkudGV4dERlY29yYXRpb25z SW5FZmZlY3QoKS5pc0VtcHR5KCkpCi0gICAgICAgIGdseXBoT3ZlcmZsb3cuZXh0ZW5kVG8odmlz dWFsT3ZlcmZsb3dGb3JEZWNvcmF0aW9ucyhydW4tPmJveCgpLT5saW5lU3R5bGUoKSwgSW5saW5l SXRlcmF0b3I6OnRleHRCb3hGb3IoZG93bmNhc3Q8TGVnYWN5SW5saW5lVGV4dEJveD4ocnVuLT5i b3goKSkpKSk7CisgICAgaWYgKCFyZW5kZXJlci5zdHlsZSgpLnRleHREZWNvcmF0aW9uc0luRWZm ZWN0KCkuaXNFbXB0eSgpKSB7CisgICAgICAgIGF1dG8gdGV4dEJveCA9IElubGluZUl0ZXJhdG9y Ojp0ZXh0Qm94Rm9yKGRvd25jYXN0PExlZ2FjeUlubGluZVRleHRCb3g+KHJ1bi0+Ym94KCkpKTsK KyAgICAgICAgZ2x5cGhPdmVyZmxvdy5leHRlbmRUbyh2aXN1YWxPdmVyZmxvd0ZvckRlY29yYXRp b25zKHRleHRCb3gtPmxpbmVCb3goKSwgcmVuZGVyZXIsIHRleHRCb3gtPmxvZ2ljYWxUb3AoKSwg dGV4dEJveC0+bG9naWNhbEJvdHRvbSgpKSk7CisgICAgfQogCiAgICAgaWYgKCFnbHlwaE92ZXJm bG93LmlzRW1wdHkoKSkgewogICAgICAgICBBU1NFUlQocnVuLT5ib3goKS0+YmVoYXZlc0xpa2VU ZXh0KCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHREZWNvcmF0 aW9uUGFpbnRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvVGV4dERlY29yYXRpb25Q YWludGVyLmNwcAppbmRleCBhNWRlZWRiNGFmNzYuLjg2ZDJiYzk4ZTJhNyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHREZWNvcmF0aW9uUGFpbnRlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHREZWNvcmF0aW9uUGFpbnRlci5jcHAKQEAgLTI4 OSw3ICsyODksNyBAQCB2b2lkIFRleHREZWNvcmF0aW9uUGFpbnRlcjo6cGFpbnRCYWNrZ3JvdW5k RGVjb3JhdGlvbnMoY29uc3QgVGV4dFJ1biYgdGV4dFJ1biwgYwogICAgICAgICAgICAgICAgICwg ZGVmYXVsdEdhcAogICAgICAgICAgICAgICAgICwgVW5kZXJsaW5lT2Zmc2V0QXJndW1lbnRzOjpU ZXh0VW5kZXJsaW5lUG9zaXRpb25VbmRlciB7IG1fdGV4dEJveC0+bGluZUJveCgpLT5iYXNlbGlu ZVR5cGUoKSwKICAgICAgICAgICAgICAgICAgICAgbV90ZXh0Qm94LT5sb2dpY2FsQm90dG9tKCkg LSBtX3RleHRCb3gtPmxvZ2ljYWxUb3AoKSwKLSAgICAgICAgICAgICAgICAgICAgdGV4dFJ1bkxv Z2ljYWxPZmZzZXRGcm9tTGluZUJvdHRvbShtX3RleHRCb3gpCisgICAgICAgICAgICAgICAgICAg IHRleHRSdW5Mb2dpY2FsT2Zmc2V0RnJvbUxpbmVCb3R0b20obV90ZXh0Qm94LT5saW5lQm94KCks IG1fdGV4dEJveC0+cmVuZGVyZXIoKSwgbV90ZXh0Qm94LT5sb2dpY2FsVG9wKCksIG1fdGV4dEJv eC0+bG9naWNhbEJvdHRvbSgpKQogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0pOwog ICAgICAgICAgICAgZmxvYXQgd2F2eU9mZnNldCA9IG1fc3R5bGVzLnVuZGVybGluZVN0eWxlID09 IFRleHREZWNvcmF0aW9uU3R5bGU6OldhdnkgPyBtX3dhdnlPZmZzZXQgOiAwOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvSW5saW5lVGV4dEJveFN0eWxlLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3N0eWxlL0lubGluZVRleHRCb3hTdHlsZS5jcHAKaW5kZXggZjQ4NTY5OTMzYjNlLi41 NzRkNDZiYTQxMjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL0lubGluZVRleHRC b3hTdHlsZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvSW5saW5lVGV4dEJveFN0eWxl LmNwcApAQCAtMTA0LDIwICsxMDQsMjYgQEAgc3RhdGljIGNvbnN0IFJlbmRlckVsZW1lbnQqIGVu Y2xvc2luZ1JlbmRlcmVyV2l0aFRleHREZWNvcmF0aW9uKGNvbnN0IFJlbmRlclRleHQKICAgICBy ZXR1cm4gY3VycmVudDsKIH0KIAotZmxvYXQgdGV4dFJ1bkxvZ2ljYWxPZmZzZXRGcm9tTGluZUJv dHRvbShjb25zdCBJbmxpbmVJdGVyYXRvcjo6VGV4dEJveEl0ZXJhdG9yJiB0ZXh0UnVuKQorZmxv YXQgdGV4dFJ1bkxvZ2ljYWxPZmZzZXRGcm9tTGluZUJvdHRvbShjb25zdCBJbmxpbmVJdGVyYXRv cjo6TGluZUJveEl0ZXJhdG9yJiBsaW5lQm94LCBjb25zdCBSZW5kZXJUZXh0JiByZW5kZXJlciwg ZmxvYXQgdGV4dEJveExvZ2ljYWxUb3AsIGZsb2F0IHRleHRCb3hMb2dpY2FsQm90dG9tKQogewog ICAgIGZsb2F0IG9mZnNldCA9IDAuZjsKLSAgICBhdXRvKiBkZWNvcmF0aW9uUmVuZGVyZXIgPSBl bmNsb3NpbmdSZW5kZXJlcldpdGhUZXh0RGVjb3JhdGlvbih0ZXh0UnVuLT5yZW5kZXJlcigpLCB0 ZXh0UnVuLT5saW5lQm94KCktPmlzRmlyc3QoKSk7Ci0gICAgaWYgKHRleHRSdW4tPnJlbmRlcmVy KCkuc3R5bGUoKS5pc0ZsaXBwZWRMaW5lc1dyaXRpbmdNb2RlKCkpIHsKLSAgICAgICAgYXV0byBt aW5Mb2dpY2FsVG9wID0gbWluTG9naWNhbFRvcEZvclRleHREZWNvcmF0aW9uTGluZSh0ZXh0UnVu LT5saW5lQm94KCksIHRleHRSdW4tPmxvZ2ljYWxUb3AoKSwgZGVjb3JhdGlvblJlbmRlcmVyKTsK LSAgICAgICAgb2Zmc2V0ID0gdGV4dFJ1bi0+bG9naWNhbFRvcCgpIC0gbWluTG9naWNhbFRvcDsK KyAgICBhdXRvKiBkZWNvcmF0aW9uUmVuZGVyZXIgPSBlbmNsb3NpbmdSZW5kZXJlcldpdGhUZXh0 RGVjb3JhdGlvbihyZW5kZXJlciwgbGluZUJveC0+aXNGaXJzdCgpKTsKKyAgICBpZiAocmVuZGVy ZXIuc3R5bGUoKS5pc0ZsaXBwZWRMaW5lc1dyaXRpbmdNb2RlKCkpIHsKKyAgICAgICAgYXV0byBt aW5Mb2dpY2FsVG9wID0gbWluTG9naWNhbFRvcEZvclRleHREZWNvcmF0aW9uTGluZShsaW5lQm94 LCB0ZXh0Qm94TG9naWNhbFRvcCwgZGVjb3JhdGlvblJlbmRlcmVyKTsKKyAgICAgICAgb2Zmc2V0 ID0gdGV4dEJveExvZ2ljYWxUb3AgLSBtaW5Mb2dpY2FsVG9wOwogICAgIH0gZWxzZSB7Ci0gICAg ICAgIG9mZnNldCA9IG1heExvZ2ljYWxCb3R0b21Gb3JUZXh0RGVjb3JhdGlvbkxpbmUodGV4dFJ1 bi0+bGluZUJveCgpLCB0ZXh0UnVuLT5sb2dpY2FsQm90dG9tKCksIGRlY29yYXRpb25SZW5kZXJl cik7Ci0gICAgICAgIG9mZnNldCAtPSB0ZXh0UnVuLT5sb2dpY2FsQm90dG9tKCk7CisgICAgICAg IG9mZnNldCA9IG1heExvZ2ljYWxCb3R0b21Gb3JUZXh0RGVjb3JhdGlvbkxpbmUobGluZUJveCwg dGV4dEJveExvZ2ljYWxCb3R0b20sIGRlY29yYXRpb25SZW5kZXJlcik7CisgICAgICAgIG9mZnNl dCAtPSB0ZXh0Qm94TG9naWNhbEJvdHRvbTsKICAgICB9CiAgICAgcmV0dXJuIG9mZnNldDsKIH0K IAorc3RhdGljIGlubGluZSBmbG9hdCBkZWZhdWx0R2FwKGNvbnN0IFJlbmRlclN0eWxlJiBzdHls ZSkKK3sKKyAgICBjb25zdCBmbG9hdCB0ZXh0RGVjb3JhdGlvbkJhc2VGb250U2l6ZSA9IDE2LmY7 CisgICAgcmV0dXJuIHN0eWxlLmNvbXB1dGVkRm9udFNpemUoKSAvIHRleHREZWNvcmF0aW9uQmFz ZUZvbnRTaXplOworfQorCiBmbG9hdCBjb21wdXRlVW5kZXJsaW5lT2Zmc2V0KGNvbnN0IFVuZGVy bGluZU9mZnNldEFyZ3VtZW50cyYgY29udGV4dCkKIHsKICAgICAvLyBUaGlzIHJlcHJlc2VudHMg dGhlIGdhcCBiZXR3ZWVuIHRoZSBiYXNlbGluZSBhbmQgdGhlIGNsb3Nlc3QgZWRnZSBvZiB0aGUg dW5kZXJsaW5lLgpAQCAtMTcyLDggKzE3OCwxMiBAQCBXYXZ5U3Ryb2tlUGFyYW1ldGVycyBnZXRX YXZ5U3Ryb2tlUGFyYW1ldGVycyhmbG9hdCBmb250U2l6ZSkKICAgICByZXR1cm4gcmVzdWx0Owog fQogCi1HbHlwaE92ZXJmbG93IHZpc3VhbE92ZXJmbG93Rm9yRGVjb3JhdGlvbnMoY29uc3QgUmVu ZGVyU3R5bGUmIGxpbmVTdHlsZSwgc3RkOjpvcHRpb25hbDxmbG9hdD4gdW5kZXJsaW5lT2Zmc2V0 KQorc3RhdGljIEdseXBoT3ZlcmZsb3cgY29tcHV0ZWRWaXN1YWxPdmVyZmxvd0ZvckRlY29yYXRp b25zKGNvbnN0IFJlbmRlclN0eWxlJiBsaW5lU3R5bGUsIHN0ZDo6b3B0aW9uYWw8ZmxvYXQ+IHVu ZGVybGluZU9mZnNldCkKIHsKKyAgICAvLyBDb21wZW5zYXRlIGZvciB0aGUgaW50ZWdyYWwgY2Vp bGluZyBpbiBHcmFwaGljc0NvbnRleHQ6OmNvbXB1dGVMaW5lQm91bmRzQW5kQW50aWFsaWFzaW5n TW9kZUZvclRleHQoKQorICAgIGlmICh1bmRlcmxpbmVPZmZzZXQpCisgICAgICAgICp1bmRlcmxp bmVPZmZzZXQgKz0gMTsKKwogICAgIGF1dG8gZGVjb3JhdGlvbiA9IGxpbmVTdHlsZS50ZXh0RGVj b3JhdGlvbnNJbkVmZmVjdCgpOwogICAgIGlmIChkZWNvcmF0aW9uLmlzRW1wdHkoKSkKICAgICAg ICAgcmV0dXJuIEdseXBoT3ZlcmZsb3coKTsKQEAgLTIzNSwzNyArMjQ1LDI5IEBAIEdseXBoT3Zl cmZsb3cgdmlzdWFsT3ZlcmZsb3dGb3JEZWNvcmF0aW9ucyhjb25zdCBSZW5kZXJTdHlsZSYgbGlu ZVN0eWxlLCBzdGQ6Om9wCiAgICAgcmV0dXJuIG92ZXJmbG93UmVzdWx0OwogfQogCi1HbHlwaE92 ZXJmbG93IHZpc3VhbE92ZXJmbG93Rm9yRGVjb3JhdGlvbnMoY29uc3QgUmVuZGVyU3R5bGUmIGxp bmVTdHlsZSwgY29uc3QgSW5saW5lSXRlcmF0b3I6OlRleHRCb3hJdGVyYXRvciYgdGV4dFJ1bikK K0dseXBoT3ZlcmZsb3cgdmlzdWFsT3ZlcmZsb3dGb3JEZWNvcmF0aW9ucyhjb25zdCBJbmxpbmVJ dGVyYXRvcjo6TGluZUJveEl0ZXJhdG9yJiBsaW5lQm94LCBjb25zdCBSZW5kZXJUZXh0JiByZW5k ZXJlciwgZmxvYXQgdGV4dEJveExvZ2ljYWxUb3AsIGZsb2F0IHRleHRCb3hMb2dpY2FsQm90dG9t KQogewotICAgIEFTU0VSVCghdGV4dFJ1biB8fCB0ZXh0UnVuLT5zdHlsZSgpID09IGxpbmVTdHls ZSk7Ci0KLSAgICBpZiAoIWxpbmVTdHlsZS50ZXh0RGVjb3JhdGlvbnNJbkVmZmVjdCgpLmNvbnRh aW5zKFRleHREZWNvcmF0aW9uTGluZTo6VW5kZXJsaW5lKSkKLSAgICAgICAgcmV0dXJuIHZpc3Vh bE92ZXJmbG93Rm9yRGVjb3JhdGlvbnMobGluZVN0eWxlLCBzdGQ6Om9wdGlvbmFsPGZsb2F0PiB7 IH0pOwotCi0gICAgLy8gQ29tcGVuc2F0ZSBmb3IgdGhlIGludGVncmFsIGNlaWxpbmcgaW4gR3Jh cGhpY3NDb250ZXh0Ojpjb21wdXRlTGluZUJvdW5kc0FuZEFudGlhbGlhc2luZ01vZGVGb3JUZXh0 KCkKLSAgICBpbnQgdW5kZXJsaW5lT2Zmc2V0ID0gMTsKLSAgICAvLyBGSVhNRTogUmVuZGVyU3R5 bGUgY2FsbHMgdXMgd2l0aCBlbXB0eSB0ZXh0UnVuIGJ1dCBvbmx5IHdoZW4gVGV4dFVuZGVybGlu ZVBvc2l0aW9uIGlzIG5vdCBVbmRlci4KLSAgICBBU1NFUlQodGV4dFJ1biB8fCBsaW5lU3R5bGUu dGV4dFVuZGVybGluZVBvc2l0aW9uKCkgIT0gVGV4dFVuZGVybGluZVBvc2l0aW9uOjpVbmRlcik7 Ci0gICAgaWYgKCF0ZXh0UnVuKQotICAgICAgICB1bmRlcmxpbmVPZmZzZXQgKz0gY29tcHV0ZVVu ZGVybGluZU9mZnNldCh7IGxpbmVTdHlsZSwgZGVmYXVsdEdhcChsaW5lU3R5bGUpIH0pOwotICAg IGVsc2UgewotICAgICAgICB1bmRlcmxpbmVPZmZzZXQgKz0gY29tcHV0ZVVuZGVybGluZU9mZnNl dCh7IGxpbmVTdHlsZQotICAgICAgICAgICAgLCBkZWZhdWx0R2FwKGxpbmVTdHlsZSkKLSAgICAg ICAgICAgICwgVW5kZXJsaW5lT2Zmc2V0QXJndW1lbnRzOjpUZXh0VW5kZXJsaW5lUG9zaXRpb25V bmRlciB7IHRleHRSdW4tPmxpbmVCb3goKS0+YmFzZWxpbmVUeXBlKCksIHRleHRSdW4tPmxvZ2lj YWxCb3R0b20oKSAtIHRleHRSdW4tPmxvZ2ljYWxUb3AoKSwgdGV4dFJ1bkxvZ2ljYWxPZmZzZXRG cm9tTGluZUJvdHRvbSh0ZXh0UnVuKSB9Ci0gICAgICAgIH0pOwotICAgIH0KLSAgICByZXR1cm4g dmlzdWFsT3ZlcmZsb3dGb3JEZWNvcmF0aW9ucyhsaW5lU3R5bGUsIHVuZGVybGluZU9mZnNldCk7 CisgICAgYXV0byYgc3R5bGUgPSBsaW5lQm94LT5pc0ZpcnN0KCkgPyByZW5kZXJlci5maXJzdExp bmVTdHlsZSgpIDogcmVuZGVyZXIuc3R5bGUoKTsKKyAgICBhdXRvIHVuZGVybGluZU9mZnNldCA9 IHN0eWxlLnRleHREZWNvcmF0aW9uc0luRWZmZWN0KCkuY29udGFpbnMoVGV4dERlY29yYXRpb25M aW5lOjpVbmRlcmxpbmUpCisgICAgICAgID8gc3RkOjptYWtlX29wdGlvbmFsKGNvbXB1dGVVbmRl cmxpbmVPZmZzZXQoeyBzdHlsZSwgZGVmYXVsdEdhcChzdHlsZSksIFVuZGVybGluZU9mZnNldEFy Z3VtZW50czo6VGV4dFVuZGVybGluZVBvc2l0aW9uVW5kZXIgeyBsaW5lQm94LT5iYXNlbGluZVR5 cGUoKSwgdGV4dEJveExvZ2ljYWxCb3R0b20gLSB0ZXh0Qm94TG9naWNhbFRvcCwgdGV4dFJ1bkxv Z2ljYWxPZmZzZXRGcm9tTGluZUJvdHRvbShsaW5lQm94LCByZW5kZXJlciwgdGV4dEJveExvZ2lj YWxUb3AsIHRleHRCb3hMb2dpY2FsQm90dG9tKSB9IH0pKQorICAgICAgICA6IHN0ZDo6bnVsbG9w dDsKKyAgICByZXR1cm4gY29tcHV0ZWRWaXN1YWxPdmVyZmxvd0ZvckRlY29yYXRpb25zKHN0eWxl LCB1bmRlcmxpbmVPZmZzZXQpOwogfQogCi1HbHlwaE92ZXJmbG93IHZpc3VhbE92ZXJmbG93Rm9y RGVjb3JhdGlvbnMoY29uc3QgUmVuZGVyU3R5bGUmIGxpbmVTdHlsZSkKK0dseXBoT3ZlcmZsb3cg dmlzdWFsT3ZlcmZsb3dGb3JEZWNvcmF0aW9ucyhjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUsIFVu ZGVybGluZU9mZnNldEFyZ3VtZW50czo6VGV4dFVuZGVybGluZVBvc2l0aW9uVW5kZXIgdGV4dFVu ZGVybGluZVBvc2l0aW9uVW5kZXIpCiB7Ci0gICAgcmV0dXJuIHZpc3VhbE92ZXJmbG93Rm9yRGVj b3JhdGlvbnMobGluZVN0eWxlLCBJbmxpbmVJdGVyYXRvcjo6VGV4dEJveEl0ZXJhdG9yIHsgfSk7 CisgICAgYXV0byB1bmRlcmxpbmVPZmZzZXQgPSBzdHlsZS50ZXh0RGVjb3JhdGlvbnNJbkVmZmVj dCgpLmNvbnRhaW5zKFRleHREZWNvcmF0aW9uTGluZTo6VW5kZXJsaW5lKQorICAgICAgICA/IHN0 ZDo6bWFrZV9vcHRpb25hbChjb21wdXRlVW5kZXJsaW5lT2Zmc2V0KHsgc3R5bGUsIGRlZmF1bHRH YXAoc3R5bGUpLCB0ZXh0VW5kZXJsaW5lUG9zaXRpb25VbmRlciB9KSkKKyAgICAgICAgOiBzdGQ6 Om51bGxvcHQ7CisgICAgcmV0dXJuIGNvbXB1dGVkVmlzdWFsT3ZlcmZsb3dGb3JEZWNvcmF0aW9u cyhzdHlsZSwgdW5kZXJsaW5lT2Zmc2V0KTsKIH0KIAotZmxvYXQgZGVmYXVsdEdhcChjb25zdCBS ZW5kZXJTdHlsZSYgbGluZVN0eWxlKQorR2x5cGhPdmVyZmxvdyB2aXN1YWxPdmVyZmxvd0ZvckRl Y29yYXRpb25zKGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSkKIHsKLSAgICBjb25zdCBmbG9hdCB0 ZXh0RGVjb3JhdGlvbkJhc2VGb250U2l6ZSA9IDE2LmY7Ci0gICAgcmV0dXJuIGxpbmVTdHlsZS5j b21wdXRlZEZvbnRTaXplKCkgLyB0ZXh0RGVjb3JhdGlvbkJhc2VGb250U2l6ZTsKKyAgICBhdXRv IHVuZGVybGluZU9mZnNldCA9IHN0eWxlLnRleHREZWNvcmF0aW9uc0luRWZmZWN0KCkuY29udGFp bnMoVGV4dERlY29yYXRpb25MaW5lOjpVbmRlcmxpbmUpCisgICAgICAgID8gc3RkOjptYWtlX29w dGlvbmFsKGNvbXB1dGVVbmRlcmxpbmVPZmZzZXQoeyBzdHlsZSwgZGVmYXVsdEdhcChzdHlsZSks IHsgfSB9KSkKKyAgICAgICAgOiBzdGQ6Om51bGxvcHQ7CisgICAgcmV0dXJuIGNvbXB1dGVkVmlz dWFsT3ZlcmZsb3dGb3JEZWNvcmF0aW9ucyhzdHlsZSwgdW5kZXJsaW5lT2Zmc2V0KTsKIH0KIAog fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvSW5saW5lVGV4dEJveFN0eWxlLmgg Yi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9JbmxpbmVUZXh0Qm94U3R5bGUuaAppbmRleCAxOGYxNWY4 OWMxOWMuLmM2MmM5YjdhMDM5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3R5bGUvSW5s aW5lVGV4dEJveFN0eWxlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvSW5saW5lVGV4dEJv eFN0eWxlLmgKQEAgLTU0LDEwICs1NCw2IEBAIHN0cnVjdCBXYXZ5U3Ryb2tlUGFyYW1ldGVycyB7 CiB9OwogV2F2eVN0cm9rZVBhcmFtZXRlcnMgZ2V0V2F2eVN0cm9rZVBhcmFtZXRlcnMoZmxvYXQg Zm9udFNpemUpOwogCi1HbHlwaE92ZXJmbG93IHZpc3VhbE92ZXJmbG93Rm9yRGVjb3JhdGlvbnMo Y29uc3QgUmVuZGVyU3R5bGUmIGxpbmVTdHlsZSk7Ci1HbHlwaE92ZXJmbG93IHZpc3VhbE92ZXJm bG93Rm9yRGVjb3JhdGlvbnMoY29uc3QgUmVuZGVyU3R5bGUmIGxpbmVTdHlsZSwgY29uc3QgSW5s aW5lSXRlcmF0b3I6OlRleHRCb3hJdGVyYXRvciYpOwotR2x5cGhPdmVyZmxvdyB2aXN1YWxPdmVy Zmxvd0ZvckRlY29yYXRpb25zKGNvbnN0IFJlbmRlclN0eWxlJiBsaW5lU3R5bGUsIHN0ZDo6b3B0 aW9uYWw8ZmxvYXQ+IHVuZGVybGluZU9mZnNldCk7Ci0KIHN0cnVjdCBVbmRlcmxpbmVPZmZzZXRB cmd1bWVudHMgewogICAgIGNvbnN0IFJlbmRlclN0eWxlJiBsaW5lU3R5bGU7CiAgICAgZmxvYXQg ZGVmYXVsdEdhcCB7IDAgfTsKQEAgLTY4LDggKzY0LDExIEBAIHN0cnVjdCBVbmRlcmxpbmVPZmZz ZXRBcmd1bWVudHMgewogICAgIH07CiAgICAgc3RkOjpvcHRpb25hbDxUZXh0VW5kZXJsaW5lUG9z aXRpb25VbmRlcj4gdGV4dFVuZGVybGluZVBvc2l0aW9uVW5kZXIgeyB9OwogfTsKK0dseXBoT3Zl cmZsb3cgdmlzdWFsT3ZlcmZsb3dGb3JEZWNvcmF0aW9ucyhjb25zdCBSZW5kZXJTdHlsZSYpOwor R2x5cGhPdmVyZmxvdyB2aXN1YWxPdmVyZmxvd0ZvckRlY29yYXRpb25zKGNvbnN0IFJlbmRlclN0 eWxlJiwgVW5kZXJsaW5lT2Zmc2V0QXJndW1lbnRzOjpUZXh0VW5kZXJsaW5lUG9zaXRpb25VbmRl cik7CitHbHlwaE92ZXJmbG93IHZpc3VhbE92ZXJmbG93Rm9yRGVjb3JhdGlvbnMoY29uc3QgSW5s aW5lSXRlcmF0b3I6OkxpbmVCb3hJdGVyYXRvciYsIGNvbnN0IFJlbmRlclRleHQmLCBmbG9hdCB0 ZXh0Qm94TG9naWNhbFRvcCwgZmxvYXQgdGV4dEJveExvZ2ljYWxCb3R0b20pOworCiBmbG9hdCBj b21wdXRlVW5kZXJsaW5lT2Zmc2V0KGNvbnN0IFVuZGVybGluZU9mZnNldEFyZ3VtZW50cyYpOwot ZmxvYXQgdGV4dFJ1bkxvZ2ljYWxPZmZzZXRGcm9tTGluZUJvdHRvbShjb25zdCBJbmxpbmVJdGVy YXRvcjo6VGV4dEJveEl0ZXJhdG9yJik7Ci1mbG9hdCBkZWZhdWx0R2FwKGNvbnN0IFJlbmRlclN0 eWxlJiBsaW5lU3R5bGUpOworZmxvYXQgdGV4dFJ1bkxvZ2ljYWxPZmZzZXRGcm9tTGluZUJvdHRv bShjb25zdCBJbmxpbmVJdGVyYXRvcjo6TGluZUJveEl0ZXJhdG9yJiwgY29uc3QgUmVuZGVyVGV4 dCYgcmVuZGVyZXIsIGZsb2F0IHRleHRCb3hMb2dpY2FsVG9wLCBmbG9hdCB0ZXh0Qm94TG9naWNh bEJvdHRvbSk7CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK