205528 2019-12-20 16:22:42 -0800 LegacyInlineTextBox::selectionState accessor mutates ellipsis selection state 2021-09-13 10:49:24 -0700 1 1 1 Unclassified WebKit CSS Safari Technology Preview Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 205318 1 megan_gardner koivisto changseok esprehn+autocc ews-watchlist glenn koivisto kondapallykalyan mmaxfield pdr webkit-bug-importer zalan oldest_to_newest 1601005 0 megan_gardner 2019-12-20 16:22:42 -0800 The code that deals with ellipsis and selections is in a place that sounds like it should not be mutating state, but it is. This should likely move to SelectionRangeData. Move this code, and also make sure that it also works with the new HighlightAPI. 1601006 1 megan_gardner 2019-12-20 16:23:30 -0800 <rdar://problem/58125978> 1792907 2 438026 koivisto 2021-09-13 03:51:37 -0700 Created attachment 438026 Patch 1793002 3 ews-feeder 2021-09-13 10:48:03 -0700 Committed r282337 (241604@main): <https://commits.webkit.org/241604@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 438026. 1793003 4 webkit-bug-importer 2021-09-13 10:49:24 -0700 <rdar://problem/83062849> 438026 2021-09-13 03:51:37 -0700 2021-09-13 10:48:05 -0700 Patch bug-205528-20210913135135.patch text/plain 10472 koivisto U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyMzE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODQ0YzMwMzBjOWEzNjg5 NDg5M2YzZjY1MWIzNjhhNDkyNTE5NzFjZS4uNzRkNWNkYzM1YWQ3NTExYWYxNDlmNjQ0OTcwOGMw ZTZjNTA4NTZiNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDIxLTA5LTEzICBBbnR0 aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBMZWdhY3lJbmxpbmVUZXh0 Qm94OjpzZWxlY3Rpb25TdGF0ZSBhY2Nlc3NvciBtdXRhdGVzIGVsbGlwc2lzIHNlbGVjdGlvbiBz dGF0ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA1 NTI4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81ODEyNTk3OD4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbiBhY2Nlc3NvciBzaG91bGRuJ3QgbXV0 YXRlIHN0YXRlLgorCisgICAgICAgICogcmVuZGVyaW5nL0xlZ2FjeUVsbGlwc2lzQm94LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkxlZ2FjeUVsbGlwc2lzQm94OjpwYWludFNlbGVjdGlvbik6CisK KyAgICAgICAgQWxzbyBwb3NpdGlvbiBlbGxpcHNpcyBzZWxlY3Rpb24gY29ycmVjdGx5IHdoZW4g cGFpbnRpbmcuCisKKyAgICAgICAgKFdlYkNvcmU6OkxlZ2FjeUVsbGlwc2lzQm94Ojpub2RlQXRQ b2ludCk6CisgICAgICAgIChXZWJDb3JlOjpMZWdhY3lFbGxpcHNpc0JveDo6c2VsZWN0aW9uU3Rh dGUgY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9MZWdhY3lFbGxpcHNpc0JveC5oOgorICAg ICAgICAqIHJlbmRlcmluZy9MZWdhY3lJbmxpbmVUZXh0Qm94LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkxlZ2FjeUlubGluZVRleHRCb3g6OnNlbGVjdGlvblN0YXRlIGNvbnN0KToKKworICAgICAg ICBDb21wdXRlIHRoZSBzZWxlY3Rpb24gc3RhdGUgb2YgdGhlIGVsbGlwc2lzIGJveCBieSBsb29r aW5nIGF0IHRoZSBzZWxlY3Rpb24gc3RhdGUgb2YgdGhlCisgICAgICAgIGxhc3QgdGV4dCBib3gg b24gdGhlIGxpbmUuCisKKyAgICAgICAgKiByZW5kZXJpbmcvTGVnYWN5Um9vdElubGluZUJveC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpMZWdhY3lSb290SW5saW5lQm94OjpsaW5lU2VsZWN0aW9u R2FwKToKKyAgICAgICAgKFdlYkNvcmU6OkxlZ2FjeVJvb3RJbmxpbmVCb3g6OmZpcnN0U2VsZWN0 ZWRCb3ggY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGVnYWN5Um9vdElubGluZUJveDo6bGFz dFNlbGVjdGVkQm94IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxlZ2FjeVJvb3RJbmxpbmVC b3g6OmZpcnN0U2VsZWN0ZWRCb3gpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGVnYWN5 Um9vdElubGluZUJveDo6bGFzdFNlbGVjdGVkQm94KTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5k ZXJpbmcvTGVnYWN5Um9vdElubGluZUJveC5oOgorCiAyMDIxLTA5LTExICBTaW1vbiBGcmFzZXIg IDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIGNzcy9jc3MtdHJhbnNmb3Jtcy90 cmFuc2xhdGUtZ2V0Q29tcHV0ZWRTdHlsZS5odG1sIGZhaWxzCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvTGVnYWN5RWxsaXBzaXNCb3guY3BwIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL0xlZ2FjeUVsbGlwc2lzQm94LmNwcAppbmRleCA3OTIwM2Q1YTE1NGZkNGVkZGQz NGIyYmQyYzhiYTdiNGY5MGZiZTZjLi41MTdlNWMwNDI0MDkyZDc0M2I3ODNjZjVjYzI5YzRlMmVm NGU1ZGE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvTGVnYWN5RWxsaXBz aXNCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9MZWdhY3lFbGxpcHNpc0Jv eC5jcHAKQEAgLTExMiw3ICsxMTIsNyBAQCB2b2lkIExlZ2FjeUVsbGlwc2lzQm94OjpwYWludE1h cmt1cEJveChQYWludEluZm8mIHBhaW50SW5mbywgY29uc3QgTGF5b3V0UG9pbnQmCiAgICAgbWFy a3VwQm94LT5wYWludChwYWludEluZm8sIGFkanVzdGVkUGFpbnRPZmZzZXQsIGxpbmVUb3AsIGxp bmVCb3R0b20pOwogfQogCi1JbnRSZWN0IExlZ2FjeUVsbGlwc2lzQm94OjpzZWxlY3Rpb25SZWN0 KCkKK0ludFJlY3QgTGVnYWN5RWxsaXBzaXNCb3g6OnNlbGVjdGlvblJlY3QoKSBjb25zdAogewog ICAgIGNvbnN0IFJlbmRlclN0eWxlJiBsaW5lU3R5bGUgPSB0aGlzLT5saW5lU3R5bGUoKTsKICAg ICBjb25zdCBGb250Q2FzY2FkZSYgZm9udCA9IGxpbmVTdHlsZS5mb250Q2FzY2FkZSgpOwpAQCAt MTM5LDcgKzEzOSw3IEBAIHZvaWQgTGVnYWN5RWxsaXBzaXNCb3g6OnBhaW50U2VsZWN0aW9uKEdy YXBoaWNzQ29udGV4dCYgY29udGV4dCwgY29uc3QgTGF5b3V0UG9pCiAgICAgY29uc3QgTGVnYWN5 Um9vdElubGluZUJveCYgcm9vdEJveCA9IHJvb3QoKTsKICAgICBHcmFwaGljc0NvbnRleHRTdGF0 ZVNhdmVyIHN0YXRlU2F2ZXIoY29udGV4dCk7CiAgICAgLy8gRklYTUU6IFdoeSBpcyB0aGlzIGFs d2F5cyBMVFI/IEZpeCBieSBwYXNzaW5nIGNvcnJlY3QgdGV4dCBydW4gZmxhZ3MgYmVsb3cuCi0g ICAgTGF5b3V0UmVjdCBzZWxlY3Rpb25SZWN0IHsgTGF5b3V0VW5pdCh4KCkgKyBwYWludE9mZnNl dC54KCkpLCBMYXlvdXRVbml0KHkoKSArIHBhaW50T2Zmc2V0LnkoKSArIHJvb3RCb3guc2VsZWN0 aW9uVG9wKCkpLCAwX2x1LCByb290Qm94LnNlbGVjdGlvbkhlaWdodCgpIH07CisgICAgTGF5b3V0 UmVjdCBzZWxlY3Rpb25SZWN0IHsgTGF5b3V0VW5pdCh4KCkgKyBwYWludE9mZnNldC54KCkpLCBy b290Qm94LnNlbGVjdGlvblRvcCgpICsgcGFpbnRPZmZzZXQueSgpLCAwX2x1LCByb290Qm94LnNl bGVjdGlvbkhlaWdodCgpIH07CiAgICAgVGV4dFJ1biBydW4gPSBSZW5kZXJCbG9jazo6Y29uc3Ry dWN0VGV4dFJ1bihtX3N0ciwgc3R5bGUsIEFsbG93UmlnaHRFeHBhbnNpb24pOwogICAgIGZvbnQu YWRqdXN0U2VsZWN0aW9uUmVjdEZvclRleHQocnVuLCBzZWxlY3Rpb25SZWN0KTsKICAgICBjb250 ZXh0LmZpbGxSZWN0KHNuYXBSZWN0VG9EZXZpY2VQaXhlbHNXaXRoV3JpdGluZ0RpcmVjdGlvbihz ZWxlY3Rpb25SZWN0LCByZW5kZXJlcigpLmRvY3VtZW50KCkuZGV2aWNlU2NhbGVGYWN0b3IoKSwg cnVuLmx0cigpKSwgYyk7CkBAIC0xNzAsNCArMTcwLDE5IEBAIGJvb2wgTGVnYWN5RWxsaXBzaXNC b3g6Om5vZGVBdFBvaW50KGNvbnN0IEhpdFRlc3RSZXF1ZXN0JiByZXF1ZXN0LCBIaXRUZXN0UmVz dWx0CiAgICAgcmV0dXJuIGZhbHNlOwogfQogCitSZW5kZXJPYmplY3Q6OkhpZ2hsaWdodFN0YXRl IExlZ2FjeUVsbGlwc2lzQm94OjpzZWxlY3Rpb25TdGF0ZSgpIGNvbnN0Cit7CisgICAgYXV0byog bGFzdFNlbGVjdGVkQm94ID0gcm9vdCgpLmxhc3RTZWxlY3RlZEJveCgpOworICAgIGlmICghaXM8 TGVnYWN5SW5saW5lVGV4dEJveD4obGFzdFNlbGVjdGVkQm94KSkKKyAgICAgICAgcmV0dXJuIFJl bmRlck9iamVjdDo6SGlnaGxpZ2h0U3RhdGU6Ok5vbmU7CisKKyAgICBhdXRvJiB0ZXh0Qm94ID0g ZG93bmNhc3Q8TGVnYWN5SW5saW5lVGV4dEJveD4oKmxhc3RTZWxlY3RlZEJveCk7CisKKyAgICBh dXRvIFtzZWxlY3Rpb25TdGFydCwgc2VsZWN0aW9uRW5kXSA9IHRleHRCb3guc2VsZWN0aW9uU3Rh cnRFbmQoKTsKKyAgICBpZiAoc2VsZWN0aW9uRW5kID49IHRleHRCb3gudHJ1bmNhdGlvbigpICYm IHNlbGVjdGlvblN0YXJ0IDw9IHRleHRCb3gudHJ1bmNhdGlvbigpKQorICAgICAgICByZXR1cm4g UmVuZGVyT2JqZWN0OjpIaWdobGlnaHRTdGF0ZTo6SW5zaWRlOworCisgICAgcmV0dXJuIFJlbmRl ck9iamVjdDo6SGlnaGxpZ2h0U3RhdGU6Ok5vbmU7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNv cmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9MZWdhY3lFbGxpcHNpc0Jv eC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0xlZ2FjeUVsbGlwc2lzQm94LmgKaW5kZXgg MDk4YjU3ZmVjOWM5ODg3ODgzNGEyNTdhM2EzNDU1M2FmZmYzM2Y0Ny4uZWRjMzhjNzRhYjBiN2I0 ZTdhZDhmYjhjMzQzMGQyZjBlZGY3NDlmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL0xlZ2FjeUVsbGlwc2lzQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L0xlZ2FjeUVsbGlwc2lzQm94LmgKQEAgLTMzLDIwICszMywxOCBAQCBwdWJsaWM6CiAgICAgTGVn YWN5RWxsaXBzaXNCb3goUmVuZGVyQmxvY2tGbG93JiwgY29uc3QgQXRvbVN0cmluZyYgZWxsaXBz aXNTdHIsIExlZ2FjeUlubGluZUZsb3dCb3gqIHBhcmVudCwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0 LCBpbnQgeSwgYm9vbCBmaXJzdExpbmUsIGJvb2wgaXNIb3Jpem9udGFsLCBMZWdhY3lJbmxpbmVC b3gqIG1hcmt1cEJveCk7CiAgICAgdm9pZCBwYWludChQYWludEluZm8mLCBjb25zdCBMYXlvdXRQ b2ludCYsIExheW91dFVuaXQgbGluZVRvcCwgTGF5b3V0VW5pdCBsaW5lQm90dG9tKSBvdmVycmlk ZTsKICAgICBib29sIG5vZGVBdFBvaW50KGNvbnN0IEhpdFRlc3RSZXF1ZXN0JiwgSGl0VGVzdFJl c3VsdCYsIGNvbnN0IEhpdFRlc3RMb2NhdGlvbiYgbG9jYXRpb25JbkNvbnRhaW5lciwgY29uc3Qg TGF5b3V0UG9pbnQmIGFjY3VtdWxhdGVkT2Zmc2V0LCBMYXlvdXRVbml0IGxpbmVUb3AsIExheW91 dFVuaXQgbGluZUJvdHRvbSwgSGl0VGVzdEFjdGlvbikgZmluYWw7Ci0gICAgdm9pZCBzZXRTZWxl Y3Rpb25TdGF0ZShSZW5kZXJPYmplY3Q6OkhpZ2hsaWdodFN0YXRlIHMpIHsgbV9zZWxlY3Rpb25T dGF0ZSA9IHM7IH0KLSAgICBJbnRSZWN0IHNlbGVjdGlvblJlY3QoKTsKKyAgICBJbnRSZWN0IHNl bGVjdGlvblJlY3QoKSBjb25zdDsKIAogICAgIFJlbmRlckJsb2NrRmxvdyYgYmxvY2tGbG93KCkg Y29uc3QgeyByZXR1cm4gZG93bmNhc3Q8UmVuZGVyQmxvY2tGbG93PihMZWdhY3lJbmxpbmVCb3g6 OnJlbmRlcmVyKCkpOyB9CiAKIHByaXZhdGU6CiAgICAgdm9pZCBwYWludE1hcmt1cEJveChQYWlu dEluZm8mLCBjb25zdCBMYXlvdXRQb2ludCYgcGFpbnRPZmZzZXQsIExheW91dFVuaXQgbGluZVRv cCwgTGF5b3V0VW5pdCBsaW5lQm90dG9tLCBjb25zdCBSZW5kZXJTdHlsZSYpOwogICAgIGludCBo ZWlnaHQoKSBjb25zdCB7IHJldHVybiBtX2hlaWdodDsgfQotICAgIFJlbmRlck9iamVjdDo6SGln aGxpZ2h0U3RhdGUgc2VsZWN0aW9uU3RhdGUoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiBtX3Nl bGVjdGlvblN0YXRlOyB9CisgICAgUmVuZGVyT2JqZWN0OjpIaWdobGlnaHRTdGF0ZSBzZWxlY3Rp b25TdGF0ZSgpIGNvbnN0IG92ZXJyaWRlOwogICAgIHZvaWQgcGFpbnRTZWxlY3Rpb24oR3JhcGhp Y3NDb250ZXh0JiwgY29uc3QgTGF5b3V0UG9pbnQmLCBjb25zdCBSZW5kZXJTdHlsZSYsIGNvbnN0 IEZvbnRDYXNjYWRlJik7CiAgICAgTGVnYWN5SW5saW5lQm94KiBtYXJrdXBCb3goKSBjb25zdDsK IAogICAgIGJvb2wgbV9zaG91bGRQYWludE1hcmt1cEJveDsKLSAgICBSZW5kZXJPYmplY3Q6Okhp Z2hsaWdodFN0YXRlIG1fc2VsZWN0aW9uU3RhdGUgeyBSZW5kZXJPYmplY3Q6OkhpZ2hsaWdodFN0 YXRlOjpOb25lIH07CiAgICAgaW50IG1faGVpZ2h0OwogICAgIEF0b21TdHJpbmcgbV9zdHI7CiB9 OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0xlZ2FjeUlubGluZVRleHRC b3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0xlZ2FjeUlubGluZVRleHRCb3guY3Bw CmluZGV4IDg1ZjM3Y2RjZWJmMDgwNzM5MGM1Y2ZlOWM3YWU5M2RiYWZlOGMzYjEuLjNkZjE5OTY2 YTI2MDcxNzFiMzhmODA3MjE5MjczZDE1YzA1MmZhYTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9MZWdhY3lJbmxpbmVUZXh0Qm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvTGVnYWN5SW5saW5lVGV4dEJveC5jcHAKQEAgLTE2MSwyOCArMTYxLDcgQEAg Ym9vbCBMZWdhY3lJbmxpbmVUZXh0Qm94Ojppc1NlbGVjdGFibGUodW5zaWduZWQgc3RhcnRQb3Np dGlvbiwgdW5zaWduZWQgZW5kUG9zaXQKIAogUmVuZGVyT2JqZWN0OjpIaWdobGlnaHRTdGF0ZSBM ZWdhY3lJbmxpbmVUZXh0Qm94OjpzZWxlY3Rpb25TdGF0ZSgpIGNvbnN0CiB7Ci0gICAgYXV0byBz dGF0ZSA9IHJlbmRlcmVyKCkudmlldygpLnNlbGVjdGlvbigpLmhpZ2hsaWdodFN0YXRlRm9yVGV4 dEJveChyZW5kZXJlcigpLCBzZWxlY3RhYmxlUmFuZ2UoKSk7Ci0gICAgCi0gICAgLy8gRklYTUU6 IHRoaXMgY29kZSBtdXRhdGVzIHNlbGVjdGlvbiBzdGF0ZSwgYnV0IGl0J3MgdXNlZCBhdCBhIHNp bXBsZSBnZXR0ZXIgZWxzZXdoZXJlCi0gICAgLy8gaW4gdGhpcyBmaWxlLiBUaGlzIGNvZGUgc2hv dWxkIGxpa2VseSBsaXZlIGluIEhpZ2hsaWdodERhdGEsIG9yIHNvbWV3aGVyZSBlbHNlLgotICAg IC8vIDxyZGFyOi8vcHJvYmxlbS81ODEyNTk3OD4KLSAgICAvLyBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA1NTI4Ci0gICAgLy8gSWYgdGhlcmUgYXJlIGVsbGlwc2lz IGZvbGxvd2luZywgbWFrZSBzdXJlIHRoZWlyIHNlbGVjdGlvbiBpcyB1cGRhdGVkLgotICAgIGlm IChtX3RydW5jYXRpb24gIT0gY05vVHJ1bmNhdGlvbiAmJiByb290KCkuZWxsaXBzaXNCb3goKSkg ewotICAgICAgICBMZWdhY3lFbGxpcHNpc0JveCogZWxsaXBzaXMgPSByb290KCkuZWxsaXBzaXNC b3goKTsKLSAgICAgICAgaWYgKHN0YXRlICE9IFJlbmRlck9iamVjdDo6SGlnaGxpZ2h0U3RhdGU6 Ok5vbmUpIHsKLSAgICAgICAgICAgIGF1dG8gW3NlbGVjdGlvblN0YXJ0LCBzZWxlY3Rpb25FbmRd ID0gc2VsZWN0aW9uU3RhcnRFbmQoKTsKLSAgICAgICAgICAgIC8vIFRoZSBlbGxpcHNpcyBzaG91 bGQgYmUgY29uc2lkZXJlZCB0byBiZSBzZWxlY3RlZCBpZiB0aGUgZW5kIG9mCi0gICAgICAgICAg ICAvLyB0aGUgc2VsZWN0aW9uIGlzIHBhc3QgdGhlIGJlZ2lubmluZyBvZiB0aGUgdHJ1bmNhdGlv biBhbmQgdGhlCi0gICAgICAgICAgICAvLyBiZWdpbm5pbmcgb2YgdGhlIHNlbGVjdGlvbiBpcyBi ZWZvcmUgb3IgYXQgdGhlIGJlZ2lubmluZyBvZiB0aGUKLSAgICAgICAgICAgIC8vIHRydW5jYXRp b24uCi0gICAgICAgICAgICBlbGxpcHNpcy0+c2V0U2VsZWN0aW9uU3RhdGUoc2VsZWN0aW9uRW5k ID49IG1fdHJ1bmNhdGlvbiAmJiBzZWxlY3Rpb25TdGFydCA8PSBtX3RydW5jYXRpb24gPwotICAg ICAgICAgICAgICAgIFJlbmRlck9iamVjdDo6SGlnaGxpZ2h0U3RhdGU6Okluc2lkZSA6IFJlbmRl ck9iamVjdDo6SGlnaGxpZ2h0U3RhdGU6Ok5vbmUpOwotICAgICAgICB9IGVsc2UKLSAgICAgICAg ICAgIGVsbGlwc2lzLT5zZXRTZWxlY3Rpb25TdGF0ZShSZW5kZXJPYmplY3Q6OkhpZ2hsaWdodFN0 YXRlOjpOb25lKTsKLSAgICB9Ci0gICAgCi0gICAgcmV0dXJuIHN0YXRlOworICAgIHJldHVybiBy ZW5kZXJlcigpLnZpZXcoKS5zZWxlY3Rpb24oKS5oaWdobGlnaHRTdGF0ZUZvclRleHRCb3gocmVu ZGVyZXIoKSwgc2VsZWN0YWJsZVJhbmdlKCkpOwogfQogCiBjb25zdCBGb250Q2FzY2FkZSYgTGVn YWN5SW5saW5lVGV4dEJveDo6bGluZUZvbnQoKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL0xlZ2FjeVJvb3RJbmxpbmVCb3guY3BwIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL0xlZ2FjeVJvb3RJbmxpbmVCb3guY3BwCmluZGV4IGQ0MmZiMWFmNzVlMzBiNDdk ODhkZjg5MmZkYWY4ZTMwNTg3YmFjNTMuLjEyZDQ2YjY1YzU2YjM0NDA4NjgxMzg2ZTllYjMwM2Vm MzE1ZjBmNmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9MZWdhY3lSb290 SW5saW5lQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvTGVnYWN5Um9vdElu bGluZUJveC5jcHAKQEAgLTQzOCw4ICs0MzgsOCBAQCBHYXBSZWN0cyBMZWdhY3lSb290SW5saW5l Qm94OjpsaW5lU2VsZWN0aW9uR2FwKFJlbmRlckJsb2NrJiByb290QmxvY2ssIGNvbnN0IExheQog CiAgICAgR2FwUmVjdHMgcmVzdWx0OwogCi0gICAgTGVnYWN5SW5saW5lQm94KiBmaXJzdEJveCA9 IGZpcnN0U2VsZWN0ZWRCb3goKTsKLSAgICBMZWdhY3lJbmxpbmVCb3gqIGxhc3RCb3ggPSBsYXN0 U2VsZWN0ZWRCb3goKTsKKyAgICBhdXRvKiBmaXJzdEJveCA9IGZpcnN0U2VsZWN0ZWRCb3goKTsK KyAgICBhdXRvKiBsYXN0Qm94ID0gbGFzdFNlbGVjdGVkQm94KCk7CiAgICAgaWYgKGxlZnRHYXAp IHsKICAgICAgICAgcmVzdWx0LnVuaXRlTGVmdChibG9ja0Zsb3coKS5sb2dpY2FsTGVmdFNlbGVj dGlvbkdhcChyb290QmxvY2ssIHJvb3RCbG9ja1BoeXNpY2FsUG9zaXRpb24sIG9mZnNldEZyb21S b290QmxvY2ssICZmaXJzdEJveC0+cGFyZW50KCktPnJlbmRlcmVyKCksIExheW91dFVuaXQoZmly c3RCb3gtPmxvZ2ljYWxMZWZ0KCkpLAogICAgICAgICAgICAgc2VsVG9wLCBzZWxIZWlnaHQsIGNh Y2hlLCBwYWludEluZm8pKTsKQEAgLTUwNSw3ICs1MDUsNyBAQCBSZW5kZXJPYmplY3Q6OkhpZ2hs aWdodFN0YXRlIExlZ2FjeVJvb3RJbmxpbmVCb3g6OnNlbGVjdGlvblN0YXRlKCkgY29uc3QKICAg ICByZXR1cm4gc3RhdGU7CiB9CiAKLUxlZ2FjeUlubGluZUJveCogTGVnYWN5Um9vdElubGluZUJv eDo6Zmlyc3RTZWxlY3RlZEJveCgpCitjb25zdCBMZWdhY3lJbmxpbmVCb3gqIExlZ2FjeVJvb3RJ bmxpbmVCb3g6OmZpcnN0U2VsZWN0ZWRCb3goKSBjb25zdAogewogICAgIGZvciAoYXV0byogYm94 ID0gZmlyc3RMZWFmRGVzY2VuZGFudCgpOyBib3g7IGJveCA9IGJveC0+bmV4dExlYWZPbkxpbmUo KSkgewogICAgICAgICBpZiAoYm94LT5zZWxlY3Rpb25TdGF0ZSgpICE9IFJlbmRlck9iamVjdDo6 SGlnaGxpZ2h0U3RhdGU6Ok5vbmUpCkBAIC01MTQsNyArNTE0LDcgQEAgTGVnYWN5SW5saW5lQm94 KiBMZWdhY3lSb290SW5saW5lQm94OjpmaXJzdFNlbGVjdGVkQm94KCkKICAgICByZXR1cm4gbnVs bHB0cjsKIH0KIAotTGVnYWN5SW5saW5lQm94KiBMZWdhY3lSb290SW5saW5lQm94OjpsYXN0U2Vs ZWN0ZWRCb3goKQorY29uc3QgTGVnYWN5SW5saW5lQm94KiBMZWdhY3lSb290SW5saW5lQm94Ojps YXN0U2VsZWN0ZWRCb3goKSBjb25zdAogewogICAgIGZvciAoYXV0byogYm94ID0gbGFzdExlYWZE ZXNjZW5kYW50KCk7IGJveDsgYm94ID0gYm94LT5wcmV2aW91c0xlYWZPbkxpbmUoKSkgewogICAg ICAgICBpZiAoYm94LT5zZWxlY3Rpb25TdGF0ZSgpICE9IFJlbmRlck9iamVjdDo6SGlnaGxpZ2h0 U3RhdGU6Ok5vbmUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvTGVnYWN5 Um9vdElubGluZUJveC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0xlZ2FjeVJvb3RJbmxp bmVCb3guaAppbmRleCBmNjdkNmFmMDcxZjY1NjYxM2NmN2FmYWI0YzUyZWZmNTdhZjY1YWJhLi4x YTVhN2FiYmZhOTJhYTM4NjI5ODg0ZDZiMWY3NTY4Y2M2ZjM0N2RjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvTGVnYWN5Um9vdElubGluZUJveC5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9MZWdhY3lSb290SW5saW5lQm94LmgKQEAgLTEyNyw4ICsxMjcsOCBA QCBwdWJsaWM6CiAgICAgYm9vbCBub2RlQXRQb2ludChjb25zdCBIaXRUZXN0UmVxdWVzdCYsIEhp dFRlc3RSZXN1bHQmLCBjb25zdCBIaXRUZXN0TG9jYXRpb24mIGxvY2F0aW9uSW5Db250YWluZXIs IGNvbnN0IExheW91dFBvaW50JiBhY2N1bXVsYXRlZE9mZnNldCwgTGF5b3V0VW5pdCBsaW5lVG9w LCBMYXlvdXRVbml0IGxpbmVCb3R0b20sIEhpdFRlc3RBY3Rpb24pIG92ZXJyaWRlOwogCiAgICAg UmVuZGVyT2JqZWN0OjpIaWdobGlnaHRTdGF0ZSBzZWxlY3Rpb25TdGF0ZSgpIGNvbnN0IGZpbmFs OwotICAgIExlZ2FjeUlubGluZUJveCogZmlyc3RTZWxlY3RlZEJveCgpOwotICAgIExlZ2FjeUlu bGluZUJveCogbGFzdFNlbGVjdGVkQm94KCk7CisgICAgY29uc3QgTGVnYWN5SW5saW5lQm94KiBm aXJzdFNlbGVjdGVkQm94KCkgY29uc3Q7CisgICAgY29uc3QgTGVnYWN5SW5saW5lQm94KiBsYXN0 U2VsZWN0ZWRCb3goKSBjb25zdDsKIAogICAgIEdhcFJlY3RzIGxpbmVTZWxlY3Rpb25HYXAoUmVu ZGVyQmxvY2smIHJvb3RCbG9jaywgY29uc3QgTGF5b3V0UG9pbnQmIHJvb3RCbG9ja1BoeXNpY2Fs UG9zaXRpb24sIGNvbnN0IExheW91dFNpemUmIG9mZnNldEZyb21Sb290QmxvY2ssCiAgICAgICAg IExheW91dFVuaXQgc2VsVG9wLCBMYXlvdXRVbml0IHNlbEhlaWdodCwgY29uc3QgTG9naWNhbFNl bGVjdGlvbk9mZnNldENhY2hlcyYsIGNvbnN0IFBhaW50SW5mbyopOwo=