225926 2021-05-18 11:00:50 -0700 Layer names should not contain object addresses in release builds 2021-05-18 16:56:25 -0700 1 1 1 Unclassified WebKit Compositing Safari Technology Preview Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=225838 InRadar P2 Normal --- 1 simon.fraser simon.fraser cdumez changseok cmarcelo esprehn+autocc ews-watchlist fred.wang ggaren glenn kangil.han kondapallykalyan pdr simon.fraser webkit-bug-importer oldest_to_newest 1761213 0 simon.fraser 2021-05-18 11:00:50 -0700 Object addresses should not show in layer names in release, to reduce string churn, and to avoid giving away memory address locations. 1761303 1 428978 simon.fraser 2021-05-18 14:09:34 -0700 Created attachment 428978 Patch 1761308 2 428978 ggaren 2021-05-18 14:15:48 -0700 Comment on attachment 428978 Patch r=me 1761377 3 ews-feeder 2021-05-18 16:55:16 -0700 Committed r277692 (237886@main): <https://commits.webkit.org/237886@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 428978. 1761382 4 webkit-bug-importer 2021-05-18 16:56:25 -0700 <rdar://problem/78180136> 428978 2021-05-18 14:09:34 -0700 2021-05-18 16:55:17 -0700 Patch bug-225926-20210518140933.patch text/plain 9073 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3NTg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTAwZDY4Y2QzNjRkMWY3 NTNjMzY2MDM2NzBjZjJlNjJjYjVmY2I5Ny4uNWNjODAwNjRmOWZmNDNiNjBjYmRlNTYxZTVjODg4 ZmNhMzk3YTY2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ0IEBACisyMDIxLTA1LTE4ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIExheWVyIG5hbWVz IHNob3VsZCBub3QgY29udGFpbiBvYmplY3QgYWRkcmVzc2VzIGluIHJlbGVhc2UgYnVpbGRzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjU5MjYKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBdm9pZCBwdXR0 aW5nIG9iamVjdCBhZGRyZXNzZXMgaW4gbGF5ZXIgbmFtZSBzdHJpbmdzICh3aGljaCBlbmQgdXAg b24gQ0FMYXllcnMpCisgICAgICAgIHRvIHJlZHVjZSBzdHJpbmcgYmxvYXQuCisKKyAgICAgICAg UmVuZGVyTGF5ZXI6Om5hbWUoKSBub3cgY2FsbHMgYSBkZXNjcmlwdGlvbigpIGZ1bmN0aW9uIG9u IFJlbmRlck9iamVjdCwgd2hpY2gKKyAgICAgICAgaW4gdHVybiBjYWxscyB0aGUgc2FtZSBvbiBp dHMgTm9kZS4gVGhlc2UgZGVzY3JpcHRpb24oKSBmdW5jdGlvbnMgZG9uJ3QgcHV0CisgICAgICAg IG9iamVjdCBhZGRyZXNzZXMgaW4gdGhlIHN0cmluZy4KKworICAgICAgICBBbHRlcm5hdGl2ZXMg Y29uc2lkZXJlZDogI2lmZGVmZmluZyBpbiB0aGUgZGVidWdEZXNjcmlwdGlvbigpIGltcGxlbWVu dGF0aW9uczoKKyAgICAgICAgSSBkZWNpZGVkIG5vdCB0byBiZWNhdXNlIGNhbGxpbmcgYSBmdW5j dGlvbiBjYWxsZWQgZGVidWdGb28gaW4gcmVsZWFzZSBzZWVtcworICAgICAgICB3cm9uZy4gSXQg bWlnaHQgYWxzbyBiZSB1c2VmdWwgdG8gZHVtcCB0aGUgc3RyaW5nIHdpdGggYWRkcmVzc2VzIHdo ZW4gZGVidWdnaW5nCisgICAgICAgIGluIGEgcmVsZWFzZSBidWlsZC4KKworICAgICAgICBSZW5h bWluZyBkZWJ1Z0Rlc2NyaXB0aW9uKCkgdG8gZGVzY3JpcHRpb24oKSBhbmQgcGFzc2luZyBhIGJl aGF2aW9yIGVudW06CisgICAgICAgIFNlZW1zIGFib3V0IGFzIGNvbXBsaWNhdGVkIGFzIHRoaXMg Y2hhbmdlLgorCisgICAgICAgICogZG9tL0VsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 YXBwZW5kQXR0cmlidXRlcyk6CisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50OjpkZXNjcmlwdGlv biBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50OjpkZWJ1Z0Rlc2NyaXB0aW9uIGNv bnN0KToKKyAgICAgICAgKiBkb20vRWxlbWVudC5oOgorICAgICAgICAqIGRvbS9Ob2RlLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6Ok5vZGU6OmRlc2NyaXB0aW9uIGNvbnN0KToKKyAgICAgICAgKiBk b20vTm9kZS5oOgorICAgICAgICAqIGRvbS9UZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmFw cGVuZFRleHRSZXByZXNlbnRhdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpUZXh0OjpkZXNjcmlw dGlvbiBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0OjpkZWJ1Z0Rlc2NyaXB0aW9uIGNv bnN0KToKKyAgICAgICAgKiBkb20vVGV4dC5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJM YXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6bmFtZSBjb25zdCk6Cisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJPYmplY3Q6OmRlc2NyaXB0aW9uIGNvbnN0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyT2JqZWN0Lmg6CisKIDIwMjEtMDUtMTcgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNv bT4KIAogICAgICAgICBNb3ZlIG1vcmUgbG9naWMgZnJvbSBBdWRpb0Rlc3RpbmF0aW9uTm9kZSB0 byBpdHMgc3ViY2xhc3NlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQu Y3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCmluZGV4IDZmZjUwOWMzMTRiZmM0 NmY5NGNkOWY5MjZlNmVmNjAyZDdhZjAyNjguLjUwNGZmNTRlNmY4YTZhYTVkM2QwM2VlODAyYTdm YjA2ZWZmMGZmZGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAKQEAgLTI3MjMsMTggKzI3MjMsMTQg QEAgdm9pZCBFbGVtZW50OjpmaW5pc2hQYXJzaW5nQ2hpbGRyZW4oKQogICAgIGNoZWNrRm9yU2li bGluZ1N0eWxlQ2hhbmdlcygqdGhpcywgRmluaXNoZWRQYXJzaW5nQ2hpbGRyZW4sIEVsZW1lbnRU cmF2ZXJzYWw6Omxhc3RDaGlsZCgqdGhpcyksIG51bGxwdHIpOwogfQogCi1TdHJpbmcgRWxlbWVu dDo6ZGVidWdEZXNjcmlwdGlvbigpIGNvbnN0CitzdGF0aWMgdm9pZCBhcHBlbmRBdHRyaWJ1dGVz KFN0cmluZ0J1aWxkZXImIGJ1aWxkZXIsIGNvbnN0IEVsZW1lbnQmIGVsZW1lbnQpCiB7Ci0gICAg U3RyaW5nQnVpbGRlciBidWlsZGVyOwotCi0gICAgYnVpbGRlci5hcHBlbmQoQ29udGFpbmVyTm9k ZTo6ZGVidWdEZXNjcmlwdGlvbigpKTsKLQotICAgIGlmIChoYXNJRCgpKQotICAgICAgICBidWls ZGVyLmFwcGVuZCgiIGlkPVwnIiwgZ2V0SWRBdHRyaWJ1dGUoKSwgJ1wnJyk7CisgICAgaWYgKGVs ZW1lbnQuaGFzSUQoKSkKKyAgICAgICAgYnVpbGRlci5hcHBlbmQoIiBpZD1cJyIsIGVsZW1lbnQu Z2V0SWRBdHRyaWJ1dGUoKSwgJ1wnJyk7CiAKLSAgICBpZiAoaGFzQ2xhc3MoKSkgeworICAgIGlm IChlbGVtZW50Lmhhc0NsYXNzKCkpIHsKICAgICAgICAgYnVpbGRlci5hcHBlbmRMaXRlcmFsKCIg Y2xhc3M9XCciKTsKLSAgICAgICAgc2l6ZV90IGNsYXNzTmFtZXNUb0R1bXAgPSBjbGFzc05hbWVz KCkuc2l6ZSgpOworICAgICAgICBzaXplX3QgY2xhc3NOYW1lc1RvRHVtcCA9IGVsZW1lbnQuY2xh c3NOYW1lcygpLnNpemUoKTsKICAgICAgICAgY29uc3RleHByIHNpemVfdCBtYXhOdW1DbGFzc05h bWVzID0gNzsKICAgICAgICAgYm9vbCBhZGRFbGxpcHNpcyA9IGZhbHNlOwogICAgICAgICBpZiAo Y2xhc3NOYW1lc1RvRHVtcCA+IG1heE51bUNsYXNzTmFtZXMpIHsKQEAgLTI3NDUsMTIgKzI3NDEs MzAgQEAgU3RyaW5nIEVsZW1lbnQ6OmRlYnVnRGVzY3JpcHRpb24oKSBjb25zdAogICAgICAgICBm b3IgKHNpemVfdCBpID0gMDsgaSA8IGNsYXNzTmFtZXNUb0R1bXA7ICsraSkgewogICAgICAgICAg ICAgaWYgKGkgPiAwKQogICAgICAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kKCcgJyk7Ci0gICAg ICAgICAgICBidWlsZGVyLmFwcGVuZChjbGFzc05hbWVzKClbaV0pOworICAgICAgICAgICAgYnVp bGRlci5hcHBlbmQoZWxlbWVudC5jbGFzc05hbWVzKClbaV0pOwogICAgICAgICB9CiAgICAgICAg IGlmIChhZGRFbGxpcHNpcykKICAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kKCIgLi4uIik7CiAg ICAgICAgIGJ1aWxkZXIuYXBwZW5kKCdcJycpOwogICAgIH0KK30KKworU3RyaW5nIEVsZW1lbnQ6 OmRlc2NyaXB0aW9uKCkgY29uc3QKK3sKKyAgICBTdHJpbmdCdWlsZGVyIGJ1aWxkZXI7CisKKyAg ICBidWlsZGVyLmFwcGVuZChDb250YWluZXJOb2RlOjpkZXNjcmlwdGlvbigpKTsKKyAgICBhcHBl bmRBdHRyaWJ1dGVzKGJ1aWxkZXIsICp0aGlzKTsKKworICAgIHJldHVybiBidWlsZGVyLnRvU3Ry aW5nKCk7Cit9CisKK1N0cmluZyBFbGVtZW50OjpkZWJ1Z0Rlc2NyaXB0aW9uKCkgY29uc3QKK3sK KyAgICBTdHJpbmdCdWlsZGVyIGJ1aWxkZXI7CisKKyAgICBidWlsZGVyLmFwcGVuZChDb250YWlu ZXJOb2RlOjpkZWJ1Z0Rlc2NyaXB0aW9uKCkpOworICAgIGFwcGVuZEF0dHJpYnV0ZXMoYnVpbGRl ciwgKnRoaXMpOwogCiAgICAgcmV0dXJuIGJ1aWxkZXIudG9TdHJpbmcoKTsKIH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vRWxl bWVudC5oCmluZGV4IGM0YWE2NjgzY2JmYTNhZDc1NThlNTUwOGQ4YmI0ZDgyZmViNmQ0NzMuLmJl ODViYjQ3OTgyMGM5MGM3ZTMxODc4YWNkODVhNWQ5OWEwMzc1NzggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2RvbS9FbGVtZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQu aApAQCAtNjI0LDYgKzYyNCw3IEBAIHB1YmxpYzoKIAogICAgIEVsZW1lbnRJZGVudGlmaWVyIGNy ZWF0ZUVsZW1lbnRJZGVudGlmaWVyKCk7CiAKKyAgICBTdHJpbmcgZGVzY3JpcHRpb24oKSBjb25z dCBvdmVycmlkZTsKICAgICBTdHJpbmcgZGVidWdEZXNjcmlwdGlvbigpIGNvbnN0IG92ZXJyaWRl OwogCiBwcm90ZWN0ZWQ6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5jcHAKaW5kZXggMDUyMmRlMGJhYTc4MmQ3ZTlmYjQ5 MzM5MDk0MjU2NmViYzc1ZGM1Yi4uYjJmYTNhMjI1ZTQ1YmI5ODdjOTQ3ZmY2YjQxZTNhNGQwYmJh Y2M1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL05vZGUuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcApAQCAtMTc1NCw2ICsxNzU0LDEyIEBAIEZsb2F0UG9pbnQg Tm9kZTo6Y29udmVydEZyb21QYWdlKGNvbnN0IEZsb2F0UG9pbnQmIHApIGNvbnN0CiAgICAgcmV0 dXJuIHA7CiB9CiAKK1N0cmluZyBOb2RlOjpkZXNjcmlwdGlvbigpIGNvbnN0Cit7CisgICAgYXV0 byBuYW1lID0gbm9kZU5hbWUoKTsKKyAgICByZXR1cm4gbWFrZVN0cmluZyhuYW1lLmlzRW1wdHko KSA/ICI8bm9uZT4iIDogIiIsIG5hbWUpOworfQorCiBTdHJpbmcgTm9kZTo6ZGVidWdEZXNjcmlw dGlvbigpIGNvbnN0CiB7CiAgICAgYXV0byBuYW1lID0gbm9kZU5hbWUoKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5oCmlu ZGV4IGRkYTZmOGFjMmFjYWU5Nzc3YWFlOTQ4N2U3NmM3YmI5OGY5NWYxNmMuLmI5NjU2OTE4NjJk NWQwMjY2YTRkMmFjMDJjN2RmZGMwMzdkNmYxMjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2RvbS9Ob2RlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL05vZGUuaApAQCAtNDI5LDYgKzQy OSw3IEBAIHB1YmxpYzoKICAgICB9OwogICAgIHZpcnR1YWwgdm9pZCByZW1vdmVkRnJvbUFuY2Vz dG9yKFJlbW92YWxUeXBlLCBDb250YWluZXJOb2RlJiBvbGRQYXJlbnRPZlJlbW92ZWRUcmVlKTsK IAorICAgIHZpcnR1YWwgU3RyaW5nIGRlc2NyaXB0aW9uKCkgY29uc3Q7CiAgICAgdmlydHVhbCBT dHJpbmcgZGVidWdEZXNjcmlwdGlvbigpIGNvbnN0OwogCiAjaWYgRU5BQkxFKFRSRUVfREVCVUdH SU5HKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL1RleHQuY3BwIGIvU291cmNlL1dl YkNvcmUvZG9tL1RleHQuY3BwCmluZGV4IDEyZDkxNzExZGQ3NDQyMDc2ZjA4ZjU3MmExNjAwMGUy OWY0NjI4MTMuLjNmMTg1NjJkYTlkNmUxOTVhNGNhNGVlODA5NjZkOTkxYzQ2YmY3NzYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9UZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9k b20vVGV4dC5jcHAKQEAgLTIyMywxMyArMjIzLDkgQEAgdm9pZCBUZXh0Ojp1cGRhdGVSZW5kZXJl ckFmdGVyQ29udGVudENoYW5nZSh1bnNpZ25lZCBvZmZzZXRPZlJlcGxhY2VkRGF0YSwgdW5zaWcK ICAgICBkb2N1bWVudCgpLnVwZGF0ZVRleHRSZW5kZXJlcigqdGhpcywgb2Zmc2V0T2ZSZXBsYWNl ZERhdGEsIGxlbmd0aE9mUmVwbGFjZWREYXRhKTsKIH0KIAotU3RyaW5nIFRleHQ6OmRlYnVnRGVz Y3JpcHRpb24oKSBjb25zdAorc3RhdGljIHZvaWQgYXBwZW5kVGV4dFJlcHJlc2VudGF0aW9uKFN0 cmluZ0J1aWxkZXImIGJ1aWxkZXIsIGNvbnN0IFRleHQmIHRleHQpCiB7Ci0gICAgU3RyaW5nQnVp bGRlciBidWlsZGVyOwotCi0gICAgYnVpbGRlci5hcHBlbmQoQ2hhcmFjdGVyRGF0YTo6ZGVidWdE ZXNjcmlwdGlvbigpKTsKLQotICAgIFN0cmluZyB2YWx1ZSA9IGRhdGEoKTsKKyAgICBTdHJpbmcg dmFsdWUgPSB0ZXh0LmRhdGEoKTsKICAgICBidWlsZGVyLmFwcGVuZCgiIGxlbmd0aD0iX3MsIHZh bHVlLmxlbmd0aCgpKTsKIAogICAgIHZhbHVlLnJlcGxhY2VXaXRoTGl0ZXJhbCgnXFwnLCAiXFxc XCIpOwpAQCAtMjQyLDYgKzIzOCwyNCBAQCBTdHJpbmcgVGV4dDo6ZGVidWdEZXNjcmlwdGlvbigp IGNvbnN0CiAgICAgfQogCiAgICAgYnVpbGRlci5hcHBlbmQoIiBcIiIsIHZhbHVlLCAnXCInKTsK K30KKworU3RyaW5nIFRleHQ6OmRlc2NyaXB0aW9uKCkgY29uc3QKK3sKKyAgICBTdHJpbmdCdWls ZGVyIGJ1aWxkZXI7CisKKyAgICBidWlsZGVyLmFwcGVuZChDaGFyYWN0ZXJEYXRhOjpkZXNjcmlw dGlvbigpKTsKKyAgICBhcHBlbmRUZXh0UmVwcmVzZW50YXRpb24oYnVpbGRlciwgKnRoaXMpOwor CisgICAgcmV0dXJuIGJ1aWxkZXIudG9TdHJpbmcoKTsKK30KKworU3RyaW5nIFRleHQ6OmRlYnVn RGVzY3JpcHRpb24oKSBjb25zdAoreworICAgIFN0cmluZ0J1aWxkZXIgYnVpbGRlcjsKKworICAg IGJ1aWxkZXIuYXBwZW5kKENoYXJhY3RlckRhdGE6OmRlYnVnRGVzY3JpcHRpb24oKSk7CisgICAg YXBwZW5kVGV4dFJlcHJlc2VudGF0aW9uKGJ1aWxkZXIsICp0aGlzKTsKIAogICAgIHJldHVybiBi dWlsZGVyLnRvU3RyaW5nKCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vVGV4 dC5oIGIvU291cmNlL1dlYkNvcmUvZG9tL1RleHQuaAppbmRleCA5MzUzOGU4OWIyZDU1ZmFiNmZk NjQ2MjM0MDYzZDMyOTU0N2M3Mjc0Li5lYmM5ZDEwY2M0OGUxMGE3NzZlZjExMmMxMzZhNWM2YjQ3 MTcxYmIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vVGV4dC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2RvbS9UZXh0LmgKQEAgLTU1LDYgKzU1LDcgQEAgcHVibGljOgogCiAgICAgdm9p ZCB1cGRhdGVSZW5kZXJlckFmdGVyQ29udGVudENoYW5nZSh1bnNpZ25lZCBvZmZzZXRPZlJlcGxh Y2VkRGF0YSwgdW5zaWduZWQgbGVuZ3RoT2ZSZXBsYWNlZERhdGEpOwogCisgICAgU3RyaW5nIGRl c2NyaXB0aW9uKCkgY29uc3QgZmluYWw7CiAgICAgU3RyaW5nIGRlYnVnRGVzY3JpcHRpb24oKSBj b25zdCBmaW5hbDsKIAogcHJvdGVjdGVkOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckxheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM YXllci5jcHAKaW5kZXggZTZhOTVhZmU0OGFlZjAyNmEyYWUxZTBjZjEyYThhNDIxZjFiNjEzOS4u MTdiMmM4MzRkMGVjZWEyZGMyMjI1MjAwOTgwY2EwNGI3OWEwOGFmMCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCkBAIC04MTQsNyArODE0LDcgQEAgdm9pZCBSZW5k ZXJMYXllcjo6dXBkYXRlTGF5ZXJMaXN0c0lmTmVlZGVkKCkKIFN0cmluZyBSZW5kZXJMYXllcjo6 bmFtZSgpIGNvbnN0CiB7CiAgICAgU3RyaW5nQnVpbGRlciBuYW1lOwotICAgIG5hbWUuYXBwZW5k KHJlbmRlcmVyKCkuZGVidWdEZXNjcmlwdGlvbigpKTsKKyAgICBuYW1lLmFwcGVuZChyZW5kZXJl cigpLmRlc2NyaXB0aW9uKCkpOwogCiAgICAgaWYgKGlzUmVmbGVjdGlvbigpKQogICAgICAgICBu YW1lLmFwcGVuZExpdGVyYWwoIiAocmVmbGVjdGlvbikiKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlck9iamVjdC5jcHAKaW5kZXggMWQyOWQ5NWYwMmU5ZDllZTQyOGVjN2M3ZmYxZmE3 OTU5MTk2MTk2NS4uZDg1MGQ4ZThkMzBmMDgzNDM1NTJkYjhiOWI2MWQ3MzNjNjZiYzYxNSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKQEAgLTI0MTAsNiArMjQx MCwxNyBAQCBWZWN0b3I8U2VsZWN0aW9uR2VvbWV0cnk+IFJlbmRlck9iamVjdDo6Y29sbGVjdFNl bGVjdGlvbkdlb21ldHJpZXMoY29uc3QgU2ltcGxlUgogCiAjZW5kaWYKIAorU3RyaW5nIFJlbmRl ck9iamVjdDo6ZGVzY3JpcHRpb24oKSBjb25zdAoreworICAgIFN0cmluZ0J1aWxkZXIgYnVpbGRl cjsKKworICAgIGJ1aWxkZXIuYXBwZW5kKHJlbmRlck5hbWUoKSwgJyAnKTsKKyAgICBpZiAobm9k ZSgpKQorICAgICAgICBidWlsZGVyLmFwcGVuZCgnICcsIG5vZGUoKS0+ZGVzY3JpcHRpb24oKSk7 CisgICAgCisgICAgcmV0dXJuIGJ1aWxkZXIudG9TdHJpbmcoKTsKK30KKwogU3RyaW5nIFJlbmRl ck9iamVjdDo6ZGVidWdEZXNjcmlwdGlvbigpIGNvbnN0CiB7CiAgICAgU3RyaW5nQnVpbGRlciBi dWlsZGVyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVj dC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCmluZGV4IDg2ZmI1 M2M5ZWU0MWVmNmFlNWZlYzExZGQ1YmUwNTM0ZDYzZDRjYzQuLjRlZGI2NzIzMDlmNjAxMjVhYjZl ZmU4NjZlMzE0NjQxMWY4MWFjYjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJPYmplY3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2Jq ZWN0LmgKQEAgLTcyNiw2ICs3MjYsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCByZXNldEZyYWdtZW50 ZWRGbG93U3RhdGVPblJlbW92YWwoKTsKICAgICB2b2lkIGluaXRpYWxpemVGcmFnbWVudGVkRmxv d1N0YXRlT25JbnNlcnRpb24oKTsKIAorICAgIHZpcnR1YWwgU3RyaW5nIGRlc2NyaXB0aW9uKCkg Y29uc3Q7CiAgICAgdmlydHVhbCBTdHJpbmcgZGVidWdEZXNjcmlwdGlvbigpIGNvbnN0OwogCiBw cm90ZWN0ZWQ6Cg==