205745 2020-01-03 12:55:41 -0800 Align Range.intersectsNode() with the DOM specification 2020-01-03 15:25:55 -0800 1 1 1 Unclassified WebKit DOM WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://dom.spec.whatwg.org/#dom-range-intersectsnode InRadar P2 Normal --- 1 cdumez cdumez achristensen beidson commit-queue darin dbates esprehn+autocc ews-watchlist ggaren kangil.han rniwa webkit-bug-importer youennf oldest_to_newest 1602560 0 cdumez 2020-01-03 12:55:41 -0800 Align Range.intersectsNode() with the DOM specification: - https://dom.spec.whatwg.org/#dom-range-intersectsnode This also aligns our behavior with Chrome and Firefox. 1602561 1 386709 cdumez 2020-01-03 12:58:32 -0800 Created attachment 386709 Patch 1602588 2 386716 cdumez 2020-01-03 14:32:09 -0800 Created attachment 386716 Patch 1602614 3 386716 cdumez 2020-01-03 15:22:42 -0800 Comment on attachment 386716 Patch Clearing flags on attachment: 386716 Committed r254018: <https://trac.webkit.org/changeset/254018> 1602615 4 cdumez 2020-01-03 15:22:44 -0800 All reviewed patches have been landed. Closing bug. 1602616 5 webkit-bug-importer 2020-01-03 15:23:23 -0800 <rdar://problem/58308716> 386709 2020-01-03 12:58:32 -0800 2020-01-03 14:32:08 -0800 Patch bug-205745-20200103125828.patch text/plain 5484 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0MDAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjdiNjVlNTkyMWY2MDAx MjAwYTQ5OWVmMjE1MTgxY2UzZWMwOTVlOS4uZDA0YzVhNjVkZDBmYjJiZjRjOTkxYTFhMzQ2NTBh YTcyYTNhNTk5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIwLTAxLTAzICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgQWxpZ24gUmFuZ2UuaW50ZXJz ZWN0c05vZGUoKSB3aXRoIHRoZSBET00gc3BlY2lmaWNhdGlvbgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA1NzQ1CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWxpZ24gUmFuZ2UuaW50ZXJzZWN0c05vZGUo KSB3aXRoIHRoZSBET00gc3BlY2lmaWNhdGlvbjoKKyAgICAgICAgLSBodHRwczovL2RvbS5zcGVj LndoYXR3Zy5vcmcvI2RvbS1yYW5nZS1pbnRlcnNlY3Rzbm9kZQorCisgICAgICAgIFRoaXMgYWxz byBhbGlnbnMgb3VyIGJlaGF2aW9yIHdpdGggQ2hyb21lIDc5IGFuZCBGaXJlZm94IDcxLgorCisg ICAgICAgIE5vIG5ldyB0ZXN0cywgcmViYXNlbGluZWQgZXhpc3RpbmcgdGVzdC4KKworICAgICAg ICAqIGRvbS9SYW5nZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSYW5nZTo6Y29tcGFyZUJvdW5k YXJ5UG9pbnRzIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJhbmdlOjppbnRlcnNlY3RzTm9k ZSBjb25zdCk6CisKIDIwMjAtMDEtMDMgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4K IAogICAgICAgICBBbGlnbiBYUGF0aEV2YWx1YXRvci5jcmVhdGVOU1Jlc29sdmVyKCkgLyBYUGF0 aFJlc3VsdC5zbmFwc2hvdEl0ZW0oKSB3aXRoIHRoZSBzcGVjaWZpY2F0aW9uCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9kb20vUmFuZ2UuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL1Jhbmdl LmNwcAppbmRleCA2OTY0M2ExYmEzMjNlMTI3YmRlYzA3NTMwMTk3NjBlOTIwZTA4NGE3Li5kNjkx MTRiYmIyNDIyMDNmM2Y1OTM3Zjk0YTFkNzA5YzdiY2FlMjRhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9kb20vUmFuZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9SYW5nZS5jcHAK QEAgLTMyNSwxOSArMzI1LDkgQEAgRXhjZXB0aW9uT3I8UmFuZ2U6OkNvbXBhcmVSZXN1bHRzPiBS YW5nZTo6Y29tcGFyZU5vZGUoTm9kZSYgcmVmTm9kZSkgY29uc3QKICAgICAgICAgOiAobm9kZUVu ZHNBZnRlclJhbmdlID8gTk9ERV9BRlRFUiA6IE5PREVfSU5TSURFKTsKIH0KIAotc3RhdGljIGlu bGluZSBOb2RlKiB0b3AoTm9kZSYgbm9kZSkKLXsKLSAgICBhdXRvKiB0b3AgPSAmbm9kZTsKLSAg ICB3aGlsZSAoYXV0byogcGFyZW50ID0gdG9wLT5wYXJlbnROb2RlKCkpCi0gICAgICAgIHRvcCA9 IHBhcmVudDsKLSAgICByZXR1cm4gdG9wOwotfQotCiBFeGNlcHRpb25PcjxzaG9ydD4gUmFuZ2U6 OmNvbXBhcmVCb3VuZGFyeVBvaW50cyhDb21wYXJlSG93IGhvdywgY29uc3QgUmFuZ2UmIHNvdXJj ZVJhbmdlKSBjb25zdAogewotICAgIGF1dG8qIHRoaXNDb250YWluZXIgPSBjb21tb25BbmNlc3Rv ckNvbnRhaW5lcigpOwotICAgIGF1dG8qIHNvdXJjZUNvbnRhaW5lciA9IHNvdXJjZVJhbmdlLmNv bW1vbkFuY2VzdG9yQ29udGFpbmVyKCk7Ci0gICAgaWYgKCF0aGlzQ29udGFpbmVyIHx8ICFzb3Vy Y2VDb250YWluZXIgfHwgJnRoaXNDb250YWluZXItPmRvY3VtZW50KCkgIT0gJnNvdXJjZUNvbnRh aW5lci0+ZG9jdW1lbnQoKSB8fCB0b3AoKnRoaXNDb250YWluZXIpICE9IHRvcCgqc291cmNlQ29u dGFpbmVyKSkKKyAgICBpZiAoJnN0YXJ0Q29udGFpbmVyKCkucm9vdE5vZGUoKSAhPSAmc291cmNl UmFuZ2Uuc3RhcnRDb250YWluZXIoKS5yb290Tm9kZSgpKQogICAgICAgICByZXR1cm4gRXhjZXB0 aW9uIHsgV3JvbmdEb2N1bWVudEVycm9yIH07CiAKICAgICBzd2l0Y2ggKGhvdykgewpAQCAtNDcz LDMwICs0NjMsMjQgQEAgRXhjZXB0aW9uT3I8dm9pZD4gUmFuZ2U6OmRlbGV0ZUNvbnRlbnRzKCkK IAogRXhjZXB0aW9uT3I8Ym9vbD4gUmFuZ2U6OmludGVyc2VjdHNOb2RlKE5vZGUmIHJlZk5vZGUp IGNvbnN0CiB7Ci0gICAgaWYgKCFyZWZOb2RlLmlzQ29ubmVjdGVkKCkgfHwgJnJlZk5vZGUuZG9j dW1lbnQoKSAhPSAmb3duZXJEb2N1bWVudCgpKQorICAgIGlmICgmc3RhcnRDb250YWluZXIoKS5y b290Tm9kZSgpICE9ICZyZWZOb2RlLnJvb3ROb2RlKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsK IAotICAgIENvbnRhaW5lck5vZGUqIHBhcmVudE5vZGUgPSByZWZOb2RlLnBhcmVudE5vZGUoKTsK KyAgICBhdXRvKiBwYXJlbnROb2RlID0gcmVmTm9kZS5wYXJlbnROb2RlKCk7CiAgICAgaWYgKCFw YXJlbnROb2RlKQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAogICAgIHVuc2lnbmVkIG5vZGVJbmRl eCA9IHJlZk5vZGUuY29tcHV0ZU5vZGVJbmRleCgpOwogCi0gICAgLy8gSWYgKHBhcmVudCwgb2Zm c2V0KSBpcyBiZWZvcmUgZW5kIGFuZCAocGFyZW50LCBvZmZzZXQgKyAxKSBpcyBhZnRlciBzdGFy dCwgcmV0dXJuIHRydWUuCisgICAgLy8gSWYgKHBhcmVudE5vZGUsIG5vZGVJbmRleCkgaXMgYmVm b3JlIGVuZCBhbmQgKHBhcmVudE5vZGUsIG5vZGVJbmRleCArIDEpIGlzIGFmdGVyIHN0YXJ0LCBy ZXR1cm4gdHJ1ZS4KICAgICAvLyBPdGhlcndpc2UsIHJldHVybiBmYWxzZS4KLSAgICBhdXRvIHJl c3VsdCA9IGNvbXBhcmVQb2ludCgqcGFyZW50Tm9kZSwgbm9kZUluZGV4KTsKLSAgICBpZiAocmVz dWx0Lmhhc0V4Y2VwdGlvbigpKQotICAgICAgICByZXR1cm4gcmVzdWx0LnJlbGVhc2VFeGNlcHRp b24oKTsKLSAgICBhdXRvIGNvbXBhcmVGaXJzdCA9IHJlc3VsdC5yZWxlYXNlUmV0dXJuVmFsdWUo KTsKLSAgICByZXN1bHQgPSBjb21wYXJlUG9pbnQoKnBhcmVudE5vZGUsIG5vZGVJbmRleCArIDEp OwotICAgIGlmIChyZXN1bHQuaGFzRXhjZXB0aW9uKCkpCi0gICAgICAgIHJldHVybiByZXN1bHQu cmVsZWFzZUV4Y2VwdGlvbigpOwotICAgIGF1dG8gY29tcGFyZVNlY29uZCA9IHJlc3VsdC5yZWxl YXNlUmV0dXJuVmFsdWUoKTsKLQotICAgIGJvb2wgaXNGaXJzdEJlZm9yZUVuZCA9IG1fc3RhcnQg PT0gbV9lbmQgPyBjb21wYXJlRmlyc3QgPCAwIDogY29tcGFyZUZpcnN0IDw9IDA7Ci0gICAgYm9v bCBpc1NlY29uZEFmdGVyU3RhcnQgPSBtX3N0YXJ0ID09IG1fZW5kID8gY29tcGFyZVNlY29uZCA+ IDAgOiBjb21wYXJlU2Vjb25kID49IDA7Ci0KLSAgICByZXR1cm4gaXNGaXJzdEJlZm9yZUVuZCAm JiBpc1NlY29uZEFmdGVyU3RhcnQ7CisgICAgYXV0byBjb21wYXJlRW5kUmVzdWx0ID0gY29tcGFy ZUJvdW5kYXJ5UG9pbnRzKHBhcmVudE5vZGUsIG5vZGVJbmRleCwgbV9lbmQuY29udGFpbmVyKCks IG1fZW5kLm9mZnNldCgpKTsKKyAgICBpZiAoY29tcGFyZUVuZFJlc3VsdC5oYXNFeGNlcHRpb24o KSkKKyAgICAgICAgcmV0dXJuIGNvbXBhcmVFbmRSZXN1bHQucmVsZWFzZUV4Y2VwdGlvbigpOwor ICAgIGF1dG8gY29tcGFyZVN0YXJ0UmVzdWx0ID0gY29tcGFyZUJvdW5kYXJ5UG9pbnRzKHBhcmVu dE5vZGUsIG5vZGVJbmRleCArIDEsIG1fc3RhcnQuY29udGFpbmVyKCksIG1fc3RhcnQub2Zmc2V0 KCkpOworICAgIGlmIChjb21wYXJlU3RhcnRSZXN1bHQuaGFzRXhjZXB0aW9uKCkpCisgICAgICAg IHJldHVybiBjb21wYXJlU3RhcnRSZXN1bHQucmVsZWFzZUV4Y2VwdGlvbigpOworICAgIHJldHVy biBjb21wYXJlRW5kUmVzdWx0LnJldHVyblZhbHVlKCkgPT0gLTEgJiYgY29tcGFyZVN0YXJ0UmVz dWx0LnJldHVyblZhbHVlKCkgPT0gMTsKIH0KIAogc3RhdGljIGlubGluZSBOb2RlKiBoaWdoZXN0 QW5jZXN0b3JVbmRlckNvbW1vblJvb3QoTm9kZSogbm9kZSwgTm9kZSogY29tbW9uUm9vdCkKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0 cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCmluZGV4IGJmNzM0YjBkNDg4YTk2Yzg4N2VlNjcyZWZj ODkxM2RhMGU2ZTU1M2IuLmM5ZjIwODM2ZTFjZTllMzNlMzI4NzNjOGY4NmYxMmRkZjMxZTQ3NzMg MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKKysrIGIvTGF5 b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIwLTAx LTAzICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgQWxpZ24gUmFu Z2UuaW50ZXJzZWN0c05vZGUoKSB3aXRoIHRoZSBET00gc3BlY2lmaWNhdGlvbgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA1NzQ1CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmViYXNlbGluZSBXUFQgdGVz dCBub3cgdGhhdCBpdCBpcyBwYXNzaW5nLgorCisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3Rz L2RvbS9yYW5nZXMvUmFuZ2UtaW50ZXJzZWN0c05vZGUtMi1leHBlY3RlZC50eHQ6CisKIDIwMjAt MDEtMDMgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBBbGlnbiBY UGF0aEV2YWx1YXRvci5jcmVhdGVOU1Jlc29sdmVyKCkgLyBYUGF0aFJlc3VsdC5zbmFwc2hvdEl0 ZW0oKSB3aXRoIHRoZSBzcGVjaWZpY2F0aW9uCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBv cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2RvbS9yYW5nZXMvUmFuZ2UtaW50ZXJzZWN0c05v ZGUtMi1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL2RvbS9yYW5nZXMvUmFuZ2UtaW50ZXJzZWN0c05vZGUtMi1leHBlY3RlZC50eHQKaW5k ZXggNzczMjM5ZGU0NmE3NzExMDU2YzE1NjQ5MjA3YTQyOTcyYTI3Y2M0Mi4uNTkwYzc4MGU5ZTgy NGFmMGMzYmU3YzY0MTc0NDUyMmEyNTA0MTY3OSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1w b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9kb20vcmFuZ2VzL1JhbmdlLWludGVyc2VjdHNO b2RlLTItZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvZG9tL3Jhbmdlcy9SYW5nZS1pbnRlcnNlY3RzTm9kZS0yLWV4cGVjdGVkLnR4 dApAQCAtMSw0ICsxLDQgQEAKIHMwczFzMgogCi1GQUlMIFJhbmdlLmludGVyc2VjdHNOb2RlKCkg c2ltcGxlIGNhc2VzIGFzc2VydF9mYWxzZTogW3MwXSByYW5nZS5pbnRlcnNlY3RzTm9kZShzMSkg ZXhwZWN0ZWQgZmFsc2UgZ290IHRydWUKK1BBU1MgUmFuZ2UuaW50ZXJzZWN0c05vZGUoKSBzaW1w bGUgY2FzZXMgCiAK 386716 2020-01-03 14:32:09 -0800 2020-01-03 15:22:42 -0800 Patch bug-205745-20200103143204.patch text/plain 4464 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0MDAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjdiNjVlNTkyMWY2MDAx MjAwYTQ5OWVmMjE1MTgxY2UzZWMwOTVlOS4uNDY2ZDJjYWQ5M2NkZDE0ZDAzYmJlZGIwODExMTNi ZGExYmFhMDU5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTAxLTAzICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgQWxpZ24gUmFuZ2UuaW50ZXJz ZWN0c05vZGUoKSB3aXRoIHRoZSBET00gc3BlY2lmaWNhdGlvbgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA1NzQ1CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgQWxpZ24gUmFuZ2UuaW50ZXJzZWN0c05vZGUoKSB3 aXRoIHRoZSBET00gc3BlY2lmaWNhdGlvbjoKKyAgICAgICAgLSBodHRwczovL2RvbS5zcGVjLndo YXR3Zy5vcmcvI2RvbS1yYW5nZS1pbnRlcnNlY3Rzbm9kZQorCisgICAgICAgIFRoaXMgYWxzbyBh bGlnbnMgb3VyIGJlaGF2aW9yIHdpdGggQ2hyb21lIDc5IGFuZCBGaXJlZm94IDcxLgorCisgICAg ICAgIE5vIG5ldyB0ZXN0cywgcmViYXNlbGluZWQgZXhpc3RpbmcgdGVzdC4KKworICAgICAgICAq IGRvbS9SYW5nZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSYW5nZTo6aW50ZXJzZWN0c05vZGUg Y29uc3QpOgorCiAyMDIwLTAxLTAzICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAK ICAgICAgICAgQWxpZ24gWFBhdGhFdmFsdWF0b3IuY3JlYXRlTlNSZXNvbHZlcigpIC8gWFBhdGhS ZXN1bHQuc25hcHNob3RJdGVtKCkgd2l0aCB0aGUgc3BlY2lmaWNhdGlvbgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvZG9tL1JhbmdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9SYW5nZS5j cHAKaW5kZXggNjk2NDNhMWJhMzIzZTEyN2JkZWMwNzUzMDE5NzYwZTkyMGUwODRhNy4uMzVkZjEy OWQ2MjBlN2E2NmVhYTRjZmZlZGQ1Njk5NTQzZjRkNWI5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvZG9tL1JhbmdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vUmFuZ2UuY3BwCkBA IC00NzYsMjcgKzQ3NiwyMSBAQCBFeGNlcHRpb25Pcjxib29sPiBSYW5nZTo6aW50ZXJzZWN0c05v ZGUoTm9kZSYgcmVmTm9kZSkgY29uc3QKICAgICBpZiAoIXJlZk5vZGUuaXNDb25uZWN0ZWQoKSB8 fCAmcmVmTm9kZS5kb2N1bWVudCgpICE9ICZvd25lckRvY3VtZW50KCkpCiAgICAgICAgIHJldHVy biBmYWxzZTsKIAotICAgIENvbnRhaW5lck5vZGUqIHBhcmVudE5vZGUgPSByZWZOb2RlLnBhcmVu dE5vZGUoKTsKKyAgICBhdXRvKiBwYXJlbnROb2RlID0gcmVmTm9kZS5wYXJlbnROb2RlKCk7CiAg ICAgaWYgKCFwYXJlbnROb2RlKQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAogICAgIHVuc2lnbmVk IG5vZGVJbmRleCA9IHJlZk5vZGUuY29tcHV0ZU5vZGVJbmRleCgpOwogCi0gICAgLy8gSWYgKHBh cmVudCwgb2Zmc2V0KSBpcyBiZWZvcmUgZW5kIGFuZCAocGFyZW50LCBvZmZzZXQgKyAxKSBpcyBh ZnRlciBzdGFydCwgcmV0dXJuIHRydWUuCisgICAgLy8gSWYgKHBhcmVudE5vZGUsIG5vZGVJbmRl eCkgaXMgYmVmb3JlIGVuZCBhbmQgKHBhcmVudE5vZGUsIG5vZGVJbmRleCArIDEpIGlzIGFmdGVy IHN0YXJ0LCByZXR1cm4gdHJ1ZS4KICAgICAvLyBPdGhlcndpc2UsIHJldHVybiBmYWxzZS4KLSAg ICBhdXRvIHJlc3VsdCA9IGNvbXBhcmVQb2ludCgqcGFyZW50Tm9kZSwgbm9kZUluZGV4KTsKLSAg ICBpZiAocmVzdWx0Lmhhc0V4Y2VwdGlvbigpKQotICAgICAgICByZXR1cm4gcmVzdWx0LnJlbGVh c2VFeGNlcHRpb24oKTsKLSAgICBhdXRvIGNvbXBhcmVGaXJzdCA9IHJlc3VsdC5yZWxlYXNlUmV0 dXJuVmFsdWUoKTsKLSAgICByZXN1bHQgPSBjb21wYXJlUG9pbnQoKnBhcmVudE5vZGUsIG5vZGVJ bmRleCArIDEpOwotICAgIGlmIChyZXN1bHQuaGFzRXhjZXB0aW9uKCkpCi0gICAgICAgIHJldHVy biByZXN1bHQucmVsZWFzZUV4Y2VwdGlvbigpOwotICAgIGF1dG8gY29tcGFyZVNlY29uZCA9IHJl c3VsdC5yZWxlYXNlUmV0dXJuVmFsdWUoKTsKLQotICAgIGJvb2wgaXNGaXJzdEJlZm9yZUVuZCA9 IG1fc3RhcnQgPT0gbV9lbmQgPyBjb21wYXJlRmlyc3QgPCAwIDogY29tcGFyZUZpcnN0IDw9IDA7 Ci0gICAgYm9vbCBpc1NlY29uZEFmdGVyU3RhcnQgPSBtX3N0YXJ0ID09IG1fZW5kID8gY29tcGFy ZVNlY29uZCA+IDAgOiBjb21wYXJlU2Vjb25kID49IDA7Ci0KLSAgICByZXR1cm4gaXNGaXJzdEJl Zm9yZUVuZCAmJiBpc1NlY29uZEFmdGVyU3RhcnQ7CisgICAgYXV0byBjb21wYXJlRW5kUmVzdWx0 ID0gY29tcGFyZUJvdW5kYXJ5UG9pbnRzKHBhcmVudE5vZGUsIG5vZGVJbmRleCwgbV9lbmQuY29u dGFpbmVyKCksIG1fZW5kLm9mZnNldCgpKTsKKyAgICBpZiAoY29tcGFyZUVuZFJlc3VsdC5oYXNF eGNlcHRpb24oKSkKKyAgICAgICAgcmV0dXJuIGNvbXBhcmVFbmRSZXN1bHQucmVsZWFzZUV4Y2Vw dGlvbigpOworICAgIGF1dG8gY29tcGFyZVN0YXJ0UmVzdWx0ID0gY29tcGFyZUJvdW5kYXJ5UG9p bnRzKHBhcmVudE5vZGUsIG5vZGVJbmRleCArIDEsIG1fc3RhcnQuY29udGFpbmVyKCksIG1fc3Rh cnQub2Zmc2V0KCkpOworICAgIGlmIChjb21wYXJlU3RhcnRSZXN1bHQuaGFzRXhjZXB0aW9uKCkp CisgICAgICAgIHJldHVybiBjb21wYXJlU3RhcnRSZXN1bHQucmVsZWFzZUV4Y2VwdGlvbigpOwor ICAgIHJldHVybiBjb21wYXJlRW5kUmVzdWx0LnJldHVyblZhbHVlKCkgPT0gLTEgJiYgY29tcGFy ZVN0YXJ0UmVzdWx0LnJldHVyblZhbHVlKCkgPT0gMTsKIH0KIAogc3RhdGljIGlubGluZSBOb2Rl KiBoaWdoZXN0QW5jZXN0b3JVbmRlckNvbW1vblJvb3QoTm9kZSogbm9kZSwgTm9kZSogY29tbW9u Um9vdCkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cgYi9M YXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCmluZGV4IGJmNzM0YjBkNDg4YTk2Yzg4 N2VlNjcyZWZjODkxM2RhMGU2ZTU1M2IuLjRjYjU1NWRjZjk4N2U4MzdiM2VlZDIwZTNmNjY4MDkx Y2U5Nzk0OTkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cK KysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBA CisyMDIwLTAxLTAzICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAg QWxpZ24gUmFuZ2UuaW50ZXJzZWN0c05vZGUoKSB3aXRoIHRoZSBET00gc3BlY2lmaWNhdGlvbgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA1NzQ1CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgUmViYXNlbGluZSBX UFQgdGVzdCBub3cgdGhhdCBpdCBpcyBwYXNzaW5nLgorCisgICAgICAgICogd2ViLXBsYXRmb3Jt LXRlc3RzL2RvbS9yYW5nZXMvUmFuZ2UtaW50ZXJzZWN0c05vZGUtMi1leHBlY3RlZC50eHQ6CisK IDIwMjAtMDEtMDMgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBB bGlnbiBYUGF0aEV2YWx1YXRvci5jcmVhdGVOU1Jlc29sdmVyKCkgLyBYUGF0aFJlc3VsdC5zbmFw c2hvdEl0ZW0oKSB3aXRoIHRoZSBzcGVjaWZpY2F0aW9uCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2RvbS9yYW5nZXMvUmFuZ2UtaW50ZXJz ZWN0c05vZGUtMi1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL2RvbS9yYW5nZXMvUmFuZ2UtaW50ZXJzZWN0c05vZGUtMi1leHBlY3RlZC50 eHQKaW5kZXggNzczMjM5ZGU0NmE3NzExMDU2YzE1NjQ5MjA3YTQyOTcyYTI3Y2M0Mi4uNTkwYzc4 MGU5ZTgyNGFmMGMzYmU3YzY0MTc0NDUyMmEyNTA0MTY3OSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9kb20vcmFuZ2VzL1JhbmdlLWludGVy c2VjdHNOb2RlLTItZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93 ZWItcGxhdGZvcm0tdGVzdHMvZG9tL3Jhbmdlcy9SYW5nZS1pbnRlcnNlY3RzTm9kZS0yLWV4cGVj dGVkLnR4dApAQCAtMSw0ICsxLDQgQEAKIHMwczFzMgogCi1GQUlMIFJhbmdlLmludGVyc2VjdHNO b2RlKCkgc2ltcGxlIGNhc2VzIGFzc2VydF9mYWxzZTogW3MwXSByYW5nZS5pbnRlcnNlY3RzTm9k ZShzMSkgZXhwZWN0ZWQgZmFsc2UgZ290IHRydWUKK1BBU1MgUmFuZ2UuaW50ZXJzZWN0c05vZGUo KSBzaW1wbGUgY2FzZXMgCiAK