239548 2022-04-20 10:30:07 -0700 Avoid repeated calls to eventNames() in a few more places 2022-04-20 12:40:15 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez changseok esprehn+autocc ews-watchlist gyuyoung.kim kangil.han webkit-bug-importer ysuzuki oldest_to_newest 1862971 0 cdumez 2022-04-20 10:30:07 -0700 Avoid repeated calls to eventNames() in a few more places given that it accesses threadGlobalData(). 1862972 1 457994 cdumez 2022-04-20 10:31:18 -0700 Created attachment 457994 Patch 1862986 2 457994 ysuzuki 2022-04-20 10:58:26 -0700 Comment on attachment 457994 Patch r=me 1863022 3 ews-feeder 2022-04-20 12:39:10 -0700 Committed r293110 (249816@main): <https://commits.webkit.org/249816@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 457994. 1863023 4 webkit-bug-importer 2022-04-20 12:40:15 -0700 <rdar://problem/92045170> 457994 2022-04-20 10:31:18 -0700 2022-04-20 12:39:12 -0700 Patch bug-239548-20220420103117.patch text/plain 9402 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjkzMDk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWI2Njc3YTAzNDA3NGNh YzM0MDIxNDZmNzczODMwMTY4Y2RhODNmYS4uMjcyYTE3YzQ5OWM4YjVkOTdiZTM1MTM1ZWM1MmUz NzZkMWRhZTVkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIyLTA0LTIwICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgQXZvaWQgcmVwZWF0ZWQgY2Fs bHMgdG8gZXZlbnROYW1lcygpIGluIGEgZmV3IG1vcmUgcGxhY2VzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzk1NDgKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBdm9pZCByZXBlYXRlZCBjYWxscyB0byBl dmVudE5hbWVzKCkgaW4gYSBmZXcgbW9yZSBwbGFjZXMgZ2l2ZW4gdGhhdCBpdCBhY2Nlc3NlcyB0 aHJlYWRHbG9iYWxEYXRhKCkuCisKKyAgICAgICAgKiBkb20vTW91c2VFdmVudC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpNb3VzZUV2ZW50OjpjcmVhdGUpOgorICAgICAgICAqIGRvbS9TaW11bGF0 ZWRDbGljay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpzaW11bGF0ZUNsaWNrKToKKyAgICAgICAg KiBkb20vaW9zL1BvaW50ZXJFdmVudElPUy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpidXR0b25z Rm9yVHlwZSk6CisgICAgICAgICogaHRtbC9IVE1MQ2FudmFzRWxlbWVudC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpIVE1MQ2FudmFzRWxlbWVudDo6ZXZlbnRMaXN0ZW5lcnNEaWRDaGFuZ2UpOgor ICAgICAgICAqIHBhZ2UvRXZlbnRIYW5kbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50 SGFuZGxlcjo6ZGlzcGF0Y2hEcmFnRXZlbnQpOgorICAgICAgICAqIHBhZ2UvUG9pbnRlckNhcHR1 cmVDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBvaW50ZXJDYXB0dXJlQ29udHJv bGxlcjo6Y2FuY2VsUG9pbnRlcik6CisKIDIwMjItMDQtMjAgIFNpbW9uIEZyYXNlciAgPHNpbW9u LmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgU29tZSBBdXRvc2Nyb2xsQ29udHJvbGxlciBj bGVhbnVwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vTW91c2VFdmVudC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9kb20vTW91c2VFdmVudC5jcHAKaW5kZXggOTJiY2EyZTBiNzRjZDg4YmIw MWQ0YzA3OGViYTc0MzhhMDc4ODQ0Ni4uYTdjYTg0ZDFiMzQ4ODM0NjFhZTYyY2U2YTNjOGE2ZTgx ZTE5ZDU3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL01vdXNlRXZlbnQuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Nb3VzZUV2ZW50LmNwcApAQCAtNTAsNyArNTAsOCBAQCBS ZWY8TW91c2VFdmVudD4gTW91c2VFdmVudDo6Y3JlYXRlKGNvbnN0IEF0b21TdHJpbmcmIHR5cGUs IGNvbnN0IE1vdXNlRXZlbnRJbml0JgogCiBSZWY8TW91c2VFdmVudD4gTW91c2VFdmVudDo6Y3Jl YXRlKGNvbnN0IEF0b21TdHJpbmcmIGV2ZW50VHlwZSwgUmVmUHRyPFdpbmRvd1Byb3h5PiYmIHZp ZXcsIGNvbnN0IFBsYXRmb3JtTW91c2VFdmVudCYgZXZlbnQsIGludCBkZXRhaWwsIE5vZGUqIHJl bGF0ZWRUYXJnZXQpCiB7Ci0gICAgYm9vbCBpc01vdXNlRW50ZXJPckxlYXZlID0gZXZlbnRUeXBl ID09IGV2ZW50TmFtZXMoKS5tb3VzZWVudGVyRXZlbnQgfHwgZXZlbnRUeXBlID09IGV2ZW50TmFt ZXMoKS5tb3VzZWxlYXZlRXZlbnQ7CisgICAgYXV0byYgZXZlbnROYW1lcyA9IFdlYkNvcmU6OmV2 ZW50TmFtZXMoKTsKKyAgICBib29sIGlzTW91c2VFbnRlck9yTGVhdmUgPSBldmVudFR5cGUgPT0g ZXZlbnROYW1lcy5tb3VzZWVudGVyRXZlbnQgfHwgZXZlbnRUeXBlID09IGV2ZW50TmFtZXMubW91 c2VsZWF2ZUV2ZW50OwogICAgIGF1dG8gaXNDYW5jZWxhYmxlID0gIWlzTW91c2VFbnRlck9yTGVh dmUgPyBJc0NhbmNlbGFibGU6OlllcyA6IElzQ2FuY2VsYWJsZTo6Tm87CiAgICAgYXV0byBjYW5C dWJibGUgPSAhaXNNb3VzZUVudGVyT3JMZWF2ZSA/IENhbkJ1YmJsZTo6WWVzIDogQ2FuQnViYmxl OjpObzsKICAgICBhdXRvIGlzQ29tcG9zZWQgPSAhaXNNb3VzZUVudGVyT3JMZWF2ZSA/IElzQ29t cG9zZWQ6OlllcyA6IElzQ29tcG9zZWQ6Ok5vOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv ZG9tL1NpbXVsYXRlZENsaWNrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9TaW11bGF0ZWRDbGlj ay5jcHAKaW5kZXggNTJlNjFhMDJiNjU5MTI3NzE3ZTY0ODkxNzgxODY0MDFmMWNmYmQyZS4uMWU2 NjUxNmY2NWI3YzM1YTVhMWQ4M2Y1MWE3YWJkNzUyNjg5NjM2OCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvZG9tL1NpbXVsYXRlZENsaWNrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20v U2ltdWxhdGVkQ2xpY2suY3BwCkBAIC04NiwyMiArODYsMjMgQEAgYm9vbCBzaW11bGF0ZUNsaWNr KEVsZW1lbnQmIGVsZW1lbnQsIEV2ZW50KiB1bmRlcmx5aW5nRXZlbnQsIFNpbXVsYXRlZENsaWNr TW91c2UKICAgICBpZiAoZWxlbWVudC5pc0Rpc2FibGVkRm9ybUNvbnRyb2woKSkKICAgICAgICAg cmV0dXJuIGZhbHNlOwogCi0gICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPEhhc2hTZXQ8RWxlbWVu dCo+PiBlbGVtZW50c0Rpc3BhdGNoaW5nU2ltdWxhdGVkQ2xpY2tzOworICAgIHN0YXRpYyBNYWlu VGhyZWFkTmV2ZXJEZXN0cm95ZWQ8SGFzaFNldDxFbGVtZW50Kj4+IGVsZW1lbnRzRGlzcGF0Y2hp bmdTaW11bGF0ZWRDbGlja3M7CiAgICAgaWYgKCFlbGVtZW50c0Rpc3BhdGNoaW5nU2ltdWxhdGVk Q2xpY2tzLmdldCgpLmFkZCgmZWxlbWVudCkuaXNOZXdFbnRyeSkKICAgICAgICAgcmV0dXJuIGZh bHNlOwogCisgICAgYXV0byYgZXZlbnROYW1lcyA9IFdlYkNvcmU6OmV2ZW50TmFtZXMoKTsKICAg ICBpZiAobW91c2VFdmVudE9wdGlvbnMgPT0gU2VuZE1vdXNlT3ZlclVwRG93bkV2ZW50cykKLSAg ICAgICAgc2ltdWxhdGVNb3VzZUV2ZW50KGV2ZW50TmFtZXMoKS5tb3VzZW92ZXJFdmVudCwgZWxl bWVudCwgdW5kZXJseWluZ0V2ZW50LCBjcmVhdGlvbk9wdGlvbnMpOworICAgICAgICBzaW11bGF0 ZU1vdXNlRXZlbnQoZXZlbnROYW1lcy5tb3VzZW92ZXJFdmVudCwgZWxlbWVudCwgdW5kZXJseWlu Z0V2ZW50LCBjcmVhdGlvbk9wdGlvbnMpOwogCiAgICAgaWYgKG1vdXNlRXZlbnRPcHRpb25zICE9 IFNlbmROb0V2ZW50cykKLSAgICAgICAgc2ltdWxhdGVNb3VzZUV2ZW50KGV2ZW50TmFtZXMoKS5t b3VzZWRvd25FdmVudCwgZWxlbWVudCwgdW5kZXJseWluZ0V2ZW50LCBjcmVhdGlvbk9wdGlvbnMp OworICAgICAgICBzaW11bGF0ZU1vdXNlRXZlbnQoZXZlbnROYW1lcy5tb3VzZWRvd25FdmVudCwg ZWxlbWVudCwgdW5kZXJseWluZ0V2ZW50LCBjcmVhdGlvbk9wdGlvbnMpOwogICAgIGlmIChtb3Vz ZUV2ZW50T3B0aW9ucyAhPSBTZW5kTm9FdmVudHMgfHwgdmlzdWFsT3B0aW9ucyA9PSBTaG93UHJl c3NlZExvb2spCiAgICAgICAgIGVsZW1lbnQuc2V0QWN0aXZlKHRydWUsIHRydWUpOwogICAgIGlm IChtb3VzZUV2ZW50T3B0aW9ucyAhPSBTZW5kTm9FdmVudHMpCi0gICAgICAgIHNpbXVsYXRlTW91 c2VFdmVudChldmVudE5hbWVzKCkubW91c2V1cEV2ZW50LCBlbGVtZW50LCB1bmRlcmx5aW5nRXZl bnQsIGNyZWF0aW9uT3B0aW9ucyk7CisgICAgICAgIHNpbXVsYXRlTW91c2VFdmVudChldmVudE5h bWVzLm1vdXNldXBFdmVudCwgZWxlbWVudCwgdW5kZXJseWluZ0V2ZW50LCBjcmVhdGlvbk9wdGlv bnMpOwogICAgIGVsZW1lbnQuc2V0QWN0aXZlKGZhbHNlKTsKIAotICAgIHNpbXVsYXRlTW91c2VF dmVudChldmVudE5hbWVzKCkuY2xpY2tFdmVudCwgZWxlbWVudCwgdW5kZXJseWluZ0V2ZW50LCBj cmVhdGlvbk9wdGlvbnMpOworICAgIHNpbXVsYXRlTW91c2VFdmVudChldmVudE5hbWVzLmNsaWNr RXZlbnQsIGVsZW1lbnQsIHVuZGVybHlpbmdFdmVudCwgY3JlYXRpb25PcHRpb25zKTsKIAogICAg IGVsZW1lbnRzRGlzcGF0Y2hpbmdTaW11bGF0ZWRDbGlja3MuZ2V0KCkucmVtb3ZlKCZlbGVtZW50 KTsKICAgICByZXR1cm4gdHJ1ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9pb3Mv UG9pbnRlckV2ZW50SU9TLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9pb3MvUG9pbnRlckV2ZW50 SU9TLmNwcAppbmRleCBiYzFiOWNlNjZmOGVjNTQ2OTYyNDNmYTkwYzUyZGU3OWYxYWU0NDczLi5j OWZjNDQ4MWYxM2Y0YzIzODhjZjM5NDhjOTdmM2E3YzA2NzE4NmRkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9kb20vaW9zL1BvaW50ZXJFdmVudElPUy5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvZG9tL2lvcy9Qb2ludGVyRXZlbnRJT1MuY3BwCkBAIC01OCw3ICs1OCw4IEBAIHN0YXRpYyBz aG9ydCBidXR0b25Gb3JUeXBlKGNvbnN0IEF0b21TdHJpbmcmIHR5cGUpCiBzdGF0aWMgdW5zaWdu ZWQgc2hvcnQgYnV0dG9uc0ZvclR5cGUoY29uc3QgQXRvbVN0cmluZyYgdHlwZSkKIHsKICAgICAv LyBXZSBoYXZlIGNvbnRhY3Qgd2l0aCB0aGUgdG91Y2ggc3VyZmFjZSBmb3IgbW9zdCBldmVudHMg ZXhjZXB0IHdoZW4gd2UndmUgcmVsZWFzZWQgdGhlIHRvdWNoIG9yIGNhbmNlbGVkIGl0LgotICAg IHJldHVybiAodHlwZSA9PSBldmVudE5hbWVzKCkucG9pbnRlcnVwRXZlbnQgfHwgdHlwZSA9PSBl dmVudE5hbWVzKCkucG9pbnRlcm91dEV2ZW50IHx8IHR5cGUgPT0gZXZlbnROYW1lcygpLnBvaW50 ZXJsZWF2ZUV2ZW50IHx8IHR5cGUgPT0gZXZlbnROYW1lcygpLnBvaW50ZXJjYW5jZWxFdmVudCkg PyAwIDogMTsKKyAgICBhdXRvJiBldmVudE5hbWVzID0gV2ViQ29yZTo6ZXZlbnROYW1lcygpOwor ICAgIHJldHVybiAodHlwZSA9PSBldmVudE5hbWVzLnBvaW50ZXJ1cEV2ZW50IHx8IHR5cGUgPT0g ZXZlbnROYW1lcy5wb2ludGVyb3V0RXZlbnQgfHwgdHlwZSA9PSBldmVudE5hbWVzLnBvaW50ZXJs ZWF2ZUV2ZW50IHx8IHR5cGUgPT0gZXZlbnROYW1lcy5wb2ludGVyY2FuY2VsRXZlbnQpID8gMCA6 IDE7CiB9CiAKIFJlZjxQb2ludGVyRXZlbnQ+IFBvaW50ZXJFdmVudDo6Y3JlYXRlKGNvbnN0IFBs YXRmb3JtVG91Y2hFdmVudCYgZXZlbnQsIHVuc2lnbmVkIGluZGV4LCBib29sIGlzUHJpbWFyeSwg UmVmPFdpbmRvd1Byb3h5PiYmIHZpZXcpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxDYW52YXNFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTENhbnZhc0Vs ZW1lbnQuY3BwCmluZGV4IDNmNDU4NmZiYzYwYmM4OTc4ZGQzMjg0MDZiNDZhMGYwOWMxYmM5Yzku LjMyMjcyZTAzODVkMDBmZWQ5MGFlNzg0ZWQzZDZlOWY4M2YyYjgyN2EgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2h0bWwvSFRNTENhbnZhc0VsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvSFRNTENhbnZhc0VsZW1lbnQuY3BwCkBAIC05ODUsOSArOTg1LDEwIEBAIGJvb2wg SFRNTENhbnZhc0VsZW1lbnQ6OnZpcnR1YWxIYXNQZW5kaW5nQWN0aXZpdHkoKSBjb25zdAogdm9p ZCBIVE1MQ2FudmFzRWxlbWVudDo6ZXZlbnRMaXN0ZW5lcnNEaWRDaGFuZ2UoKQogewogI2lmIEVO QUJMRShXRUJHTCkKLSAgICBtX2hhc1JlbGV2YW50V2ViR0xFdmVudExpc3RlbmVyID0gaGFzRXZl bnRMaXN0ZW5lcnMoZXZlbnROYW1lcygpLndlYmdsY29udGV4dGNoYW5nZWRFdmVudCkKLSAgICAg ICAgfHwgaGFzRXZlbnRMaXN0ZW5lcnMoZXZlbnROYW1lcygpLndlYmdsY29udGV4dGxvc3RFdmVu dCkKLSAgICAgICAgfHwgaGFzRXZlbnRMaXN0ZW5lcnMoZXZlbnROYW1lcygpLndlYmdsY29udGV4 dHJlc3RvcmVkRXZlbnQpOworICAgIGF1dG8mIGV2ZW50TmFtZXMgPSBXZWJDb3JlOjpldmVudE5h bWVzKCk7CisgICAgbV9oYXNSZWxldmFudFdlYkdMRXZlbnRMaXN0ZW5lciA9IGhhc0V2ZW50TGlz dGVuZXJzKGV2ZW50TmFtZXMud2ViZ2xjb250ZXh0Y2hhbmdlZEV2ZW50KQorICAgICAgICB8fCBo YXNFdmVudExpc3RlbmVycyhldmVudE5hbWVzLndlYmdsY29udGV4dGxvc3RFdmVudCkKKyAgICAg ICAgfHwgaGFzRXZlbnRMaXN0ZW5lcnMoZXZlbnROYW1lcy53ZWJnbGNvbnRleHRyZXN0b3JlZEV2 ZW50KTsKICNlbmRpZgogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50 SGFuZGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAKaW5kZXgg ODZlMGYwMDhkODQ2YmQ2NGViNjc3OTU2M2FkZjI5ZDljNzU3OWFlNS4uYzAwNjk5M2UyMzI4ZjI4 M2QwODVhOGYyNzUwZWViNmY2YTU4NjQ1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFn ZS9FdmVudEhhbmRsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVy LmNwcApAQCAtMjI3NCwxNSArMjI3NCwxNiBAQCBib29sIEV2ZW50SGFuZGxlcjo6ZGlzcGF0Y2hE cmFnRXZlbnQoY29uc3QgQXRvbVN0cmluZyYgZXZlbnRUeXBlLCBFbGVtZW50JiBkcmFnVAogICAg IGRyYWdUYXJnZXQuZGlzcGF0Y2hFdmVudChkcmFnRXZlbnQpOwogCiAgICAgaWYgKGF1dG8qIGNh Y2hlID0gbV9mcmFtZS5kb2N1bWVudCgpLT5leGlzdGluZ0FYT2JqZWN0Q2FjaGUoKSkgewotICAg ICAgICBpZiAoZXZlbnRUeXBlID09IGV2ZW50TmFtZXMoKS5kcmFnc3RhcnRFdmVudCkKKyAgICAg ICAgYXV0byYgZXZlbnROYW1lcyA9IFdlYkNvcmU6OmV2ZW50TmFtZXMoKTsKKyAgICAgICAgaWYg KGV2ZW50VHlwZSA9PSBldmVudE5hbWVzLmRyYWdzdGFydEV2ZW50KQogICAgICAgICAgICAgY2Fj aGUtPnBvc3ROb3RpZmljYXRpb24oJmRyYWdUYXJnZXQsIEFYT2JqZWN0Q2FjaGU6OkFYRHJhZ2dp bmdTdGFydGVkKTsKLSAgICAgICAgZWxzZSBpZiAoZXZlbnRUeXBlID09IGV2ZW50TmFtZXMoKS5k cmFnZW5kRXZlbnQpCisgICAgICAgIGVsc2UgaWYgKGV2ZW50VHlwZSA9PSBldmVudE5hbWVzLmRy YWdlbmRFdmVudCkKICAgICAgICAgICAgIGNhY2hlLT5wb3N0Tm90aWZpY2F0aW9uKCZkcmFnVGFy Z2V0LCBBWE9iamVjdENhY2hlOjpBWERyYWdnaW5nRW5kZWQpOwotICAgICAgICBlbHNlIGlmIChl dmVudFR5cGUgPT0gZXZlbnROYW1lcygpLmRyYWdlbnRlckV2ZW50KQorICAgICAgICBlbHNlIGlm IChldmVudFR5cGUgPT0gZXZlbnROYW1lcy5kcmFnZW50ZXJFdmVudCkKICAgICAgICAgICAgIGNh Y2hlLT5wb3N0Tm90aWZpY2F0aW9uKCZkcmFnVGFyZ2V0LCBBWE9iamVjdENhY2hlOjpBWERyYWdn aW5nRW50ZXJlZERyb3Bab25lKTsKLSAgICAgICAgZWxzZSBpZiAoZXZlbnRUeXBlID09IGV2ZW50 TmFtZXMoKS5kcmFnbGVhdmVFdmVudCkKKyAgICAgICAgZWxzZSBpZiAoZXZlbnRUeXBlID09IGV2 ZW50TmFtZXMuZHJhZ2xlYXZlRXZlbnQpCiAgICAgICAgICAgICBjYWNoZS0+cG9zdE5vdGlmaWNh dGlvbigmZHJhZ1RhcmdldCwgQVhPYmplY3RDYWNoZTo6QVhEcmFnZ2luZ0V4aXRlZERyb3Bab25l KTsKLSAgICAgICAgZWxzZSBpZiAoZXZlbnRUeXBlID09IGV2ZW50TmFtZXMoKS5kcm9wRXZlbnQp CisgICAgICAgIGVsc2UgaWYgKGV2ZW50VHlwZSA9PSBldmVudE5hbWVzLmRyb3BFdmVudCkKICAg ICAgICAgICAgIGNhY2hlLT5wb3N0Tm90aWZpY2F0aW9uKCZkcmFnVGFyZ2V0LCBBWE9iamVjdENh Y2hlOjpBWERyYWdnaW5nRHJvcHBlZCk7CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL1BvaW50ZXJDYXB0dXJlQ29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL1BvaW50ZXJDYXB0dXJlQ29udHJvbGxlci5jcHAKaW5kZXggYjExZjE2OTFjYjRjYzJiYmRk OThiMWM2OGNkMTRiZDZiMDk4NmQ5YS4uNThiNjEzMWI3OWRlZTdhM2VhOTE4ZWFjYmZkN2E5YjMx YzM5YWMwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9Qb2ludGVyQ2FwdHVyZUNv bnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUG9pbnRlckNhcHR1cmVDb250 cm9sbGVyLmNwcApAQCAtNDkzLDEwICs0OTMsMTEgQEAgdm9pZCBQb2ludGVyQ2FwdHVyZUNvbnRy b2xsZXI6OmNhbmNlbFBvaW50ZXIoUG9pbnRlcklEIHBvaW50ZXJJZCwgY29uc3QgSW50UG9pbnQK ICAgICAvLyBBZnRlciBmaXJpbmcgdGhlIHBvaW50ZXJjYW5jZWwgZXZlbnQsIGEgdXNlciBhZ2Vu dCBNVVNUIGFsc28gZmlyZSBhIHBvaW50ZXIgZXZlbnQgbmFtZWQgcG9pbnRlcm91dAogICAgIC8v IGZvbGxvd2VkIGJ5IGZpcmluZyBhIHBvaW50ZXIgZXZlbnQgbmFtZWQgcG9pbnRlcmxlYXZlLgog ICAgIGF1dG8gaXNQcmltYXJ5ID0gY2FwdHVyaW5nRGF0YS0+aXNQcmltYXJ5ID8gUG9pbnRlckV2 ZW50OjpJc1ByaW1hcnk6OlllcyA6IFBvaW50ZXJFdmVudDo6SXNQcmltYXJ5OjpObzsKLSAgICBh dXRvIGNhbmNlbEV2ZW50ID0gUG9pbnRlckV2ZW50OjpjcmVhdGUoZXZlbnROYW1lcygpLnBvaW50 ZXJjYW5jZWxFdmVudCwgcG9pbnRlcklkLCBjYXB0dXJpbmdEYXRhLT5wb2ludGVyVHlwZSwgaXNQ cmltYXJ5KTsKKyAgICBhdXRvJiBldmVudE5hbWVzID0gV2ViQ29yZTo6ZXZlbnROYW1lcygpOwor ICAgIGF1dG8gY2FuY2VsRXZlbnQgPSBQb2ludGVyRXZlbnQ6OmNyZWF0ZShldmVudE5hbWVzLnBv aW50ZXJjYW5jZWxFdmVudCwgcG9pbnRlcklkLCBjYXB0dXJpbmdEYXRhLT5wb2ludGVyVHlwZSwg aXNQcmltYXJ5KTsKICAgICB0YXJnZXQtPmRpc3BhdGNoRXZlbnQoY2FuY2VsRXZlbnQpOwotICAg IHRhcmdldC0+ZGlzcGF0Y2hFdmVudChQb2ludGVyRXZlbnQ6OmNyZWF0ZShldmVudE5hbWVzKCku cG9pbnRlcm91dEV2ZW50LCBwb2ludGVySWQsIGNhcHR1cmluZ0RhdGEtPnBvaW50ZXJUeXBlLCBp c1ByaW1hcnkpKTsKLSAgICB0YXJnZXQtPmRpc3BhdGNoRXZlbnQoUG9pbnRlckV2ZW50OjpjcmVh dGUoZXZlbnROYW1lcygpLnBvaW50ZXJsZWF2ZUV2ZW50LCBwb2ludGVySWQsIGNhcHR1cmluZ0Rh dGEtPnBvaW50ZXJUeXBlLCBpc1ByaW1hcnkpKTsKKyAgICB0YXJnZXQtPmRpc3BhdGNoRXZlbnQo UG9pbnRlckV2ZW50OjpjcmVhdGUoZXZlbnROYW1lcy5wb2ludGVyb3V0RXZlbnQsIHBvaW50ZXJJ ZCwgY2FwdHVyaW5nRGF0YS0+cG9pbnRlclR5cGUsIGlzUHJpbWFyeSkpOworICAgIHRhcmdldC0+ ZGlzcGF0Y2hFdmVudChQb2ludGVyRXZlbnQ6OmNyZWF0ZShldmVudE5hbWVzLnBvaW50ZXJsZWF2 ZUV2ZW50LCBwb2ludGVySWQsIGNhcHR1cmluZ0RhdGEtPnBvaW50ZXJUeXBlLCBpc1ByaW1hcnkp KTsKICAgICBwcm9jZXNzUGVuZGluZ1BvaW50ZXJDYXB0dXJlKHBvaW50ZXJJZCk7CiB9CiAK