238116 2022-03-19 13:29:53 -0700 Optimize EventTarget::visitJSEventListeners() 2022-03-19 20:31:18 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez darin esprehn+autocc ews-watchlist ggaren gsnedders kangil.han webkit-bug-importer oldest_to_newest 1852988 0 cdumez 2022-03-19 13:29:53 -0700 Optimize EventTarget::visitJSEventListeners(). 1852990 1 455171 cdumez 2022-03-19 13:31:34 -0700 Created attachment 455171 Patch 1853032 2 ews-feeder 2022-03-19 20:30:28 -0700 Committed r291538 (248644@main): <https://commits.webkit.org/248644@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 455171. 1853033 3 webkit-bug-importer 2022-03-19 20:31:18 -0700 <rdar://problem/90531876> 455171 2022-03-19 13:31:34 -0700 2022-03-19 20:30:29 -0700 Patch bug-238116-20220319133133.patch text/plain 9127 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxNTMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWIwNzVmY2QzOTlhNzZh YzY1ZmY3Y2YyN2NkMGM1MmYxY2NkMDk4Yy4uNGE0ZDg3NzE5OWQ3OTZlZDlhZTY0ZmYyMzM0OWY4 NjViYzkyOWI3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDIyLTAzLTE5ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgT3B0aW1pemUgRXZlbnRUYXJn ZXQ6OnZpc2l0SlNFdmVudExpc3RlbmVycygpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMzgxMTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUaGlzIHdhcyBjb25maXJtZWQgYnkgQS9CIGJvdHMgdG8gYmUg YSAxLTEuNSUgcHJvZ3Jlc3Npb24gb24gU3BlZWRvbWV0ZXIgb24KKyAgICAgICAgaU1hYyAyMCwx IChJbnRlbCkuCisKKyAgICAgICAgKiBkb20vRXZlbnRMaXN0ZW5lck1hcC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpFdmVudExpc3RlbmVyTWFwOjpjbGVhcik6CisgICAgICAgIChXZWJDb3JlOjpF dmVudExpc3RlbmVyTWFwOjpyZXBsYWNlKToKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50TGlzdGVu ZXJNYXA6OmFkZCk6CisgICAgICAgIChXZWJDb3JlOjpFdmVudExpc3RlbmVyTWFwOjpyZW1vdmUp OgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRMaXN0ZW5lck1hcDo6cmVtb3ZlRmlyc3RFdmVudExp c3RlbmVyQ3JlYXRlZEZyb21NYXJrdXApOgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRMaXN0ZW5l ck1hcDo6YXNzZXJ0Tm9BY3RpdmVJdGVyYXRvcnMgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAo V2ViQ29yZTo6RXZlbnRMaXN0ZW5lck1hcDo6RXZlbnRMaXN0ZW5lck1hcCk6IERlbGV0ZWQuCisg ICAgICAgIChXZWJDb3JlOjpFdmVudExpc3RlbmVySXRlcmF0b3I6OkV2ZW50TGlzdGVuZXJJdGVy YXRvcik6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpFdmVudExpc3RlbmVySXRlcmF0b3I6 On5FdmVudExpc3RlbmVySXRlcmF0b3IpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6RXZl bnRMaXN0ZW5lckl0ZXJhdG9yOjpuZXh0TGlzdGVuZXIpOiBEZWxldGVkLgorICAgICAgICAqIGRv bS9FdmVudExpc3RlbmVyTWFwLmg6CisgICAgICAgIChXZWJDb3JlOjpFdmVudExpc3RlbmVyTWFw Ojp2aXNpdEpTRXZlbnRMaXN0ZW5lcnMpOgorICAgICAgICAoKTogRGVsZXRlZC4KKyAgICAgICAg KFdlYkNvcmU6OkV2ZW50TGlzdGVuZXJNYXA6OmFzc2VydE5vQWN0aXZlSXRlcmF0b3JzIGNvbnN0 KTogRGVsZXRlZC4KKyAgICAgICAgKiBkb20vRXZlbnRUYXJnZXQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6RXZlbnRUYXJnZXQ6OnZpc2l0SlNFdmVudExpc3RlbmVycyk6IERlbGV0ZWQuCisgICAg ICAgICogZG9tL0V2ZW50VGFyZ2V0Lmg6CisgICAgICAgIChXZWJDb3JlOjpFdmVudFRhcmdldDo6 dmlzaXRKU0V2ZW50TGlzdGVuZXJzKToKKwogMjAyMi0wMy0xOSAgQWxhbiBCdWp0YXMgIDx6YWxh bkBhcHBsZS5jb20+CiAKICAgICAgICAgW0lGQ11bSW50ZWdyYXRpb25dIFJlbmFtZSBJbmxpbmVJ dGVyYXRvcjo6TGluZTo6YmxvY2tEaXJlY3Rpb25Qb2ludEluTGluZSB0byBjb250ZW50U3RhcnRJ bkJsb2NrRGlyZWN0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRXZlbnRMaXN0 ZW5lck1hcC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRXZlbnRMaXN0ZW5lck1hcC5jcHAKaW5k ZXggM2Y3YTA0YzBjNWFlMmY4ZDQ5N2I1YTAwYjg1MjQzZDY4NjcyMjg0Zi4uNTAxNGNmYTAwZGRl NmY1NzdlY2I5YmQ4ZGJmNTY0ZjI5ZWQ5MDU0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv ZG9tL0V2ZW50TGlzdGVuZXJNYXAuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FdmVudExp c3RlbmVyTWFwLmNwcApAQCAtNDQsMTYgKzQ0LDcgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewog Ci0jaWZuZGVmIE5ERUJVRwotdm9pZCBFdmVudExpc3RlbmVyTWFwOjphc3NlcnROb0FjdGl2ZUl0 ZXJhdG9ycygpIGNvbnN0Ci17Ci0gICAgQVNTRVJUKCFtX2FjdGl2ZUl0ZXJhdG9yQ291bnQpOwot fQotI2VuZGlmCi0KLUV2ZW50TGlzdGVuZXJNYXA6OkV2ZW50TGlzdGVuZXJNYXAoKQotewotfQor RXZlbnRMaXN0ZW5lck1hcDo6RXZlbnRMaXN0ZW5lck1hcCgpID0gZGVmYXVsdDsKIAogYm9vbCBF dmVudExpc3RlbmVyTWFwOjpjb250YWluc0NhcHR1cmluZyhjb25zdCBBdG9tU3RyaW5nJiBldmVu dFR5cGUpIGNvbnN0CiB7CkBAIC04NCw4ICs3NSw2IEBAIGJvb2wgRXZlbnRMaXN0ZW5lck1hcDo6 Y29udGFpbnNBY3RpdmUoY29uc3QgQXRvbVN0cmluZyYgZXZlbnRUeXBlKSBjb25zdAogdm9pZCBF dmVudExpc3RlbmVyTWFwOjpjbGVhcigpCiB7CiAgICAgTG9ja2VyIGxvY2tlciB7IG1fbG9jayB9 OwotICAgIAotICAgIGFzc2VydE5vQWN0aXZlSXRlcmF0b3JzKCk7CiAKICAgICBmb3IgKGF1dG8m IGVudHJ5IDogbV9lbnRyaWVzKSB7CiAgICAgICAgIGZvciAoYXV0byYgbGlzdGVuZXIgOiBlbnRy eS5zZWNvbmQpCkBAIC0xMTUsOCArMTA0LDYgQEAgc3RhdGljIGlubGluZSBzaXplX3QgZmluZExp c3RlbmVyKGNvbnN0IEV2ZW50TGlzdGVuZXJWZWN0b3ImIGxpc3RlbmVycywgRXZlbnRMaXMKIHZv aWQgRXZlbnRMaXN0ZW5lck1hcDo6cmVwbGFjZShjb25zdCBBdG9tU3RyaW5nJiBldmVudFR5cGUs IEV2ZW50TGlzdGVuZXImIG9sZExpc3RlbmVyLCBSZWY8RXZlbnRMaXN0ZW5lcj4mJiBuZXdMaXN0 ZW5lciwgY29uc3QgUmVnaXN0ZXJlZEV2ZW50TGlzdGVuZXI6Ok9wdGlvbnMmIG9wdGlvbnMpCiB7 CiAgICAgTG9ja2VyIGxvY2tlciB7IG1fbG9jayB9OwotICAgIAotICAgIGFzc2VydE5vQWN0aXZl SXRlcmF0b3JzKCk7CiAKICAgICBhdXRvKiBsaXN0ZW5lcnMgPSBmaW5kKGV2ZW50VHlwZSk7CiAg ICAgQVNTRVJUKGxpc3RlbmVycyk7CkBAIC0xMzAsOCArMTE3LDYgQEAgdm9pZCBFdmVudExpc3Rl bmVyTWFwOjpyZXBsYWNlKGNvbnN0IEF0b21TdHJpbmcmIGV2ZW50VHlwZSwgRXZlbnRMaXN0ZW5l ciYgb2xkTGkKIGJvb2wgRXZlbnRMaXN0ZW5lck1hcDo6YWRkKGNvbnN0IEF0b21TdHJpbmcmIGV2 ZW50VHlwZSwgUmVmPEV2ZW50TGlzdGVuZXI+JiYgbGlzdGVuZXIsIGNvbnN0IFJlZ2lzdGVyZWRF dmVudExpc3RlbmVyOjpPcHRpb25zJiBvcHRpb25zKQogewogICAgIExvY2tlciBsb2NrZXIgeyBt X2xvY2sgfTsKLSAgICAKLSAgICBhc3NlcnROb0FjdGl2ZUl0ZXJhdG9ycygpOwogCiAgICAgaWYg KGF1dG8qIGxpc3RlbmVycyA9IGZpbmQoZXZlbnRUeXBlKSkgewogICAgICAgICBpZiAoZmluZExp c3RlbmVyKCpsaXN0ZW5lcnMsIGxpc3RlbmVyLCBvcHRpb25zLmNhcHR1cmUpICE9IG5vdEZvdW5k KQpAQCAtMTU4LDggKzE0Myw2IEBAIHN0YXRpYyBib29sIHJlbW92ZUxpc3RlbmVyRnJvbVZlY3Rv cihFdmVudExpc3RlbmVyVmVjdG9yJiBsaXN0ZW5lcnMsIEV2ZW50TGlzdGVuCiBib29sIEV2ZW50 TGlzdGVuZXJNYXA6OnJlbW92ZShjb25zdCBBdG9tU3RyaW5nJiBldmVudFR5cGUsIEV2ZW50TGlz dGVuZXImIGxpc3RlbmVyLCBib29sIHVzZUNhcHR1cmUpCiB7CiAgICAgTG9ja2VyIGxvY2tlciB7 IG1fbG9jayB9OwotICAgIAotICAgIGFzc2VydE5vQWN0aXZlSXRlcmF0b3JzKCk7CiAKICAgICBm b3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbV9lbnRyaWVzLnNpemUoKTsgKytpKSB7CiAgICAgICAg IGlmIChtX2VudHJpZXNbaV0uZmlyc3QgPT0gZXZlbnRUeXBlKSB7CkBAIC0xOTgsOCArMTgxLDYg QEAgc3RhdGljIHZvaWQgcmVtb3ZlRmlyc3RMaXN0ZW5lckNyZWF0ZWRGcm9tTWFya3VwKEV2ZW50 TGlzdGVuZXJWZWN0b3ImIGxpc3RlbmVyVmUKIHZvaWQgRXZlbnRMaXN0ZW5lck1hcDo6cmVtb3Zl Rmlyc3RFdmVudExpc3RlbmVyQ3JlYXRlZEZyb21NYXJrdXAoY29uc3QgQXRvbVN0cmluZyYgZXZl bnRUeXBlKQogewogICAgIExvY2tlciBsb2NrZXIgeyBtX2xvY2sgfTsKLSAgICAKLSAgICBhc3Nl cnROb0FjdGl2ZUl0ZXJhdG9ycygpOwogCiAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG1f ZW50cmllcy5zaXplKCk7ICsraSkgewogICAgICAgICBpZiAobV9lbnRyaWVzW2ldLmZpcnN0ID09 IGV2ZW50VHlwZSkgewpAQCAtMjI3LDUxICsyMDgsNCBAQCB2b2lkIEV2ZW50TGlzdGVuZXJNYXA6 OmNvcHlFdmVudExpc3RlbmVyc05vdENyZWF0ZWRGcm9tTWFya3VwVG9UYXJnZXQoRXZlbnRUYXJn ZQogICAgICAgICBjb3B5TGlzdGVuZXJzTm90Q3JlYXRlZEZyb21NYXJrdXBUb1RhcmdldChlbnRy eS5maXJzdCwgZW50cnkuc2Vjb25kLCB0YXJnZXQpOwogfQogCi1FdmVudExpc3RlbmVySXRlcmF0 b3I6OkV2ZW50TGlzdGVuZXJJdGVyYXRvcihFdmVudFRhcmdldCogdGFyZ2V0KQotewotICAgIEFT U0VSVCh0YXJnZXQpOwotICAgIEV2ZW50VGFyZ2V0RGF0YSogZGF0YSA9IHRhcmdldC0+ZXZlbnRU YXJnZXREYXRhKCk7Ci0KLSAgICBpZiAoIWRhdGEpCi0gICAgICAgIHJldHVybjsKLQotICAgIG1f bWFwID0gJmRhdGEtPmV2ZW50TGlzdGVuZXJNYXA7Ci0KLSNpZm5kZWYgTkRFQlVHCi0gICAgbV9t YXAtPm1fYWN0aXZlSXRlcmF0b3JDb3VudCsrOwotI2VuZGlmCi19Ci0KLUV2ZW50TGlzdGVuZXJJ dGVyYXRvcjo6RXZlbnRMaXN0ZW5lckl0ZXJhdG9yKEV2ZW50TGlzdGVuZXJNYXAqIG1hcCkKLXsK LSAgICBtX21hcCA9IG1hcDsKLQotI2lmbmRlZiBOREVCVUcKLSAgICBtX21hcC0+bV9hY3RpdmVJ dGVyYXRvckNvdW50Kys7Ci0jZW5kaWYKLX0KLQotI2lmbmRlZiBOREVCVUcKLUV2ZW50TGlzdGVu ZXJJdGVyYXRvcjo6fkV2ZW50TGlzdGVuZXJJdGVyYXRvcigpCi17Ci0gICAgaWYgKG1fbWFwKQot ICAgICAgICBtX21hcC0+bV9hY3RpdmVJdGVyYXRvckNvdW50LS07Ci19Ci0jZW5kaWYKLQotRXZl bnRMaXN0ZW5lciogRXZlbnRMaXN0ZW5lckl0ZXJhdG9yOjpuZXh0TGlzdGVuZXIoKQotewotICAg IGlmICghbV9tYXApCi0gICAgICAgIHJldHVybiBudWxscHRyOwotCi0gICAgZm9yICg7IG1fZW50 cnlJbmRleCA8IG1fbWFwLT5tX2VudHJpZXMuc2l6ZSgpOyArK21fZW50cnlJbmRleCkgewotICAg ICAgICBFdmVudExpc3RlbmVyVmVjdG9yJiBsaXN0ZW5lcnMgPSBtX21hcC0+bV9lbnRyaWVzW21f ZW50cnlJbmRleF0uc2Vjb25kOwotICAgICAgICBpZiAobV9pbmRleCA8IGxpc3RlbmVycy5zaXpl KCkpCi0gICAgICAgICAgICByZXR1cm4gJmxpc3RlbmVyc1ttX2luZGV4KytdLT5jYWxsYmFjaygp OwotICAgICAgICBtX2luZGV4ID0gMDsKLSAgICB9Ci0KLSAgICByZXR1cm4gbnVsbHB0cjsKLX0K LQogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9t L0V2ZW50TGlzdGVuZXJNYXAuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FdmVudExpc3RlbmVyTWFw LmgKaW5kZXggNDhhMThjNzA2NTRlYWMzMmZkOWQ3ODQ1YzJmZmEyYWEyNmQyMmY3Zi4uMzAzYmI5 Y2JhODQyOTcyMDMxMzM1YmM3N2Y0NTBiZjY3ZDhkOTYyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvZG9tL0V2ZW50TGlzdGVuZXJNYXAuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRXZl bnRMaXN0ZW5lck1hcC5oCkBAIC02Niw0MSArNjYsMjIgQEAgcHVibGljOgogICAgIHZvaWQgcmVt b3ZlRmlyc3RFdmVudExpc3RlbmVyQ3JlYXRlZEZyb21NYXJrdXAoY29uc3QgQXRvbVN0cmluZyYg ZXZlbnRUeXBlKTsKICAgICB2b2lkIGNvcHlFdmVudExpc3RlbmVyc05vdENyZWF0ZWRGcm9tTWFy a3VwVG9UYXJnZXQoRXZlbnRUYXJnZXQqKTsKICAgICAKKyAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBW aXNpdG9yPiB2b2lkIHZpc2l0SlNFdmVudExpc3RlbmVycyhWaXNpdG9yJik7CiAgICAgTG9jayYg bG9jaygpIHsgcmV0dXJuIG1fbG9jazsgfQogCiBwcml2YXRlOgotICAgIGZyaWVuZCBjbGFzcyBF dmVudExpc3RlbmVySXRlcmF0b3I7Ci0KLSAgICB2b2lkIGFzc2VydE5vQWN0aXZlSXRlcmF0b3Jz KCkgY29uc3Q7Ci0KICAgICBWZWN0b3I8c3RkOjpwYWlyPEF0b21TdHJpbmcsIEV2ZW50TGlzdGVu ZXJWZWN0b3I+PiBtX2VudHJpZXM7Ci0KLSNpZm5kZWYgTkRFQlVHCi0gICAgc3RkOjphdG9taWM8 aW50PiBtX2FjdGl2ZUl0ZXJhdG9yQ291bnQgeyAwIH07Ci0jZW5kaWYKLQogICAgIExvY2sgbV9s b2NrOwogfTsKIAotY2xhc3MgRXZlbnRMaXN0ZW5lckl0ZXJhdG9yIHsKLSAgICBXVEZfTUFLRV9O T05DT1BZQUJMRShFdmVudExpc3RlbmVySXRlcmF0b3IpOwotcHVibGljOgotICAgIGV4cGxpY2l0 IEV2ZW50TGlzdGVuZXJJdGVyYXRvcihFdmVudFRhcmdldCopOwotICAgIGV4cGxpY2l0IEV2ZW50 TGlzdGVuZXJJdGVyYXRvcihFdmVudExpc3RlbmVyTWFwKik7Ci0jaWZuZGVmIE5ERUJVRwotICAg IH5FdmVudExpc3RlbmVySXRlcmF0b3IoKTsKLSNlbmRpZgotCi0gICAgRXZlbnRMaXN0ZW5lciog bmV4dExpc3RlbmVyKCk7Ci0KLXByaXZhdGU6Ci0gICAgRXZlbnRMaXN0ZW5lck1hcCogbV9tYXAg eyBudWxscHRyIH07Ci0gICAgdW5zaWduZWQgbV9lbnRyeUluZGV4IHsgMCB9OwotICAgIHVuc2ln bmVkIG1faW5kZXggeyAwIH07Ci19OwotCi0jaWZkZWYgTkRFQlVHCi1pbmxpbmUgdm9pZCBFdmVu dExpc3RlbmVyTWFwOjphc3NlcnROb0FjdGl2ZUl0ZXJhdG9ycygpIGNvbnN0IHsgfQotI2VuZGlm Cit0ZW1wbGF0ZTx0eXBlbmFtZSBWaXNpdG9yPgordm9pZCBFdmVudExpc3RlbmVyTWFwOjp2aXNp dEpTRXZlbnRMaXN0ZW5lcnMoVmlzaXRvciYgdmlzaXRvcikKK3sKKyAgICBMb2NrZXIgbG9ja2Vy IHsgbV9sb2NrIH07CisgICAgZm9yIChhdXRvJiBlbnRyeSA6IG1fZW50cmllcykgeworICAgICAg ICBmb3IgKGF1dG8mIGV2ZW50TGlzdGVuZXIgOiBlbnRyeS5zZWNvbmQpCisgICAgICAgICAgICBl dmVudExpc3RlbmVyLT5jYWxsYmFjaygpLnZpc2l0SlNGdW5jdGlvbih2aXNpdG9yKTsKKyAgICB9 Cit9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2RvbS9FdmVudFRhcmdldC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRXZlbnRUYXJnZXQuY3Bw CmluZGV4IGNmNDQ5YzAyZDYxNGY3YjA3NGNmOTc0ZWY4YWIxOTJhMTViYzg4ZWIuLjQyOWI5OTk0 ZGNlNmNmMTc5MDY5OGI5ZjBlODUzZWZiNmNiZGUwYjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2RvbS9FdmVudFRhcmdldC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0V2ZW50VGFy Z2V0LmNwcApAQCAtNDA1LDIyICs0MDUsNiBAQCB2b2lkIEV2ZW50VGFyZ2V0OjpyZW1vdmVBbGxF dmVudExpc3RlbmVycygpCiAgICAgdGhyZWFkRGF0YS5zZXRJc0luUmVtb3ZlQWxsRXZlbnRMaXN0 ZW5lcnMoZmFsc2UpOwogfQogCi10ZW1wbGF0ZTx0eXBlbmFtZSBWaXNpdG9yPgotdm9pZCBFdmVu dFRhcmdldDo6dmlzaXRKU0V2ZW50TGlzdGVuZXJzKFZpc2l0b3ImIHZpc2l0b3IpCi17Ci0gICAg RXZlbnRUYXJnZXREYXRhKiBkYXRhID0gZXZlbnRUYXJnZXREYXRhQ29uY3VycmVudGx5KCk7Ci0g ICAgaWYgKCFkYXRhKQotICAgICAgICByZXR1cm47Ci0gICAgCi0gICAgTG9ja2VyIGxvY2tlciB7 IGRhdGEtPmV2ZW50TGlzdGVuZXJNYXAubG9jaygpIH07Ci0gICAgRXZlbnRMaXN0ZW5lckl0ZXJh dG9yIGl0ZXJhdG9yKCZkYXRhLT5ldmVudExpc3RlbmVyTWFwKTsKLSAgICB3aGlsZSAoYXV0byog bGlzdGVuZXIgPSBpdGVyYXRvci5uZXh0TGlzdGVuZXIoKSkKLSAgICAgICAgbGlzdGVuZXItPnZp c2l0SlNGdW5jdGlvbih2aXNpdG9yKTsKLX0KLQotdGVtcGxhdGUgdm9pZCBFdmVudFRhcmdldDo6 dmlzaXRKU0V2ZW50TGlzdGVuZXJzKEpTQzo6QWJzdHJhY3RTbG90VmlzaXRvciYpOwotdGVtcGxh dGUgdm9pZCBFdmVudFRhcmdldDo6dmlzaXRKU0V2ZW50TGlzdGVuZXJzKEpTQzo6U2xvdFZpc2l0 b3ImKTsKLQogdm9pZCBFdmVudFRhcmdldDo6aW52YWxpZGF0ZUV2ZW50TGlzdGVuZXJSZWdpb25z KCkKIHsKICAgICBpZiAoaXM8RWxlbWVudD4oKnRoaXMpKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9kb20vRXZlbnRUYXJnZXQuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FdmVudFRhcmdl dC5oCmluZGV4IDRlNjdiYmEyYzdiMzdmMThlOTg2ZWY5MGMxZTgwZDk2ZWU2NDY0YWMuLmUxMzJj ODAxN2E4OTc2N2NlNTQxNGFjY2JhN2QwOTMyMWFkNjUzNTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2RvbS9FdmVudFRhcmdldC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FdmVudFRh cmdldC5oCkBAIC0xMjUsOCArMTI1LDYgQEAgcHJpdmF0ZToKICAgICAKICAgICB2b2lkIGlubmVy SW52b2tlRXZlbnRMaXN0ZW5lcnMoRXZlbnQmLCBFdmVudExpc3RlbmVyVmVjdG9yLCBFdmVudElu dm9rZVBoYXNlKTsKICAgICB2b2lkIGludmFsaWRhdGVFdmVudExpc3RlbmVyUmVnaW9ucygpOwot Ci0gICAgZnJpZW5kIGNsYXNzIEV2ZW50TGlzdGVuZXJJdGVyYXRvcjsKIH07CiAKIGNsYXNzIEV2 ZW50VGFyZ2V0V2l0aElubGluZURhdGEgOiBwdWJsaWMgRXZlbnRUYXJnZXQgewpAQCAtMTY4LDQg KzE2NiwxMSBAQCBpbmxpbmUgYm9vbCBFdmVudFRhcmdldDo6aGFzQ2FwdHVyaW5nRXZlbnRMaXN0 ZW5lcnMoY29uc3QgQXRvbVN0cmluZyYgZXZlbnRUeXBlKQogICAgIHJldHVybiBkYXRhICYmIGRh dGEtPmV2ZW50TGlzdGVuZXJNYXAuY29udGFpbnNDYXB0dXJpbmcoZXZlbnRUeXBlKTsKIH0KIAor dGVtcGxhdGU8dHlwZW5hbWUgVmlzaXRvcj4KK3ZvaWQgRXZlbnRUYXJnZXQ6OnZpc2l0SlNFdmVu dExpc3RlbmVycyhWaXNpdG9yJiB2aXNpdG9yKQoreworICAgIGlmIChhdXRvKiBkYXRhID0gZXZl bnRUYXJnZXREYXRhQ29uY3VycmVudGx5KCkpCisgICAgICAgIGRhdGEtPmV2ZW50TGlzdGVuZXJN YXAudmlzaXRKU0V2ZW50TGlzdGVuZXJzKHZpc2l0b3IpOworfQorCiB9IC8vIG5hbWVzcGFjZSBX ZWJDb3JlCg==