215364 2020-08-11 02:54:09 -0700 Web Inspector: breakpoint condition should be evaluated before the ignore count 2020-08-25 11:50:02 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 215362 1 hi hi ews-watchlist hi inspector-bugzilla-changes joepeck keith_miller mark.lam msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1679347 0 hi 2020-08-11 02:54:09 -0700 It seems very odd to me that the hit count is incremented without checking whether or not the condition matches. As an example, <https://webkit.org/b/215362> adds the ability for event breakpoints to be configured, meaning that the All Events breakpoint could be configured with a `window.event.type.includes("key")` condition and an ignore count of 2. There are two ways this can be interpreted a) ignore the first two events (whatever they may be) and then break on every event that includes "key" b) pause on all but the first two "key" events I think that (b) is much preferred and more intuitive/useful. additionally, in the frontend UI, the condition input is above the ignore count input 1681039 1 webkit-bug-importer 2020-08-18 02:55:15 -0700 <rdar://problem/67310703> 1682096 2 407039 hi 2020-08-21 18:53:16 -0700 Created attachment 407039 Patch 1682697 3 407039 joepeck 2020-08-25 10:35:24 -0700 Comment on attachment 407039 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=407039&action=review r=me > Source/JavaScriptCore/debugger/Breakpoint.cpp:78 > + return debugger.evaluateBreakpointCondition(*this, globalObject) && ++m_hitCount > m_ignoreCount; I find this one line unnecessarily complicated when all combined on one line. I'd break it up kinda like it was before 1682708 4 407209 hi 2020-08-25 10:52:46 -0700 Created attachment 407209 Patch 1682728 5 ews-feeder 2020-08-25 11:50:01 -0700 Committed r266138: <https://trac.webkit.org/changeset/266138> All reviewed patches have been landed. Closing bug and clearing flags on attachment 407209. 407039 2020-08-21 18:53:16 -0700 2020-08-25 10:52:45 -0700 Patch 215364.diff text/plain 7330 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IGUwZTY5ODQ3MWY0MS4uOTBhODFjYjIyOWM2IDEw MDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAyMC0wOC0yMiAgRGV2 aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rvcjog YnJlYWtwb2ludCBjb25kaXRpb24gc2hvdWxkIGJlIGV2YWx1YXRlZCBiZWZvcmUgdGhlIGlnbm9y ZSBjb3VudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjE1MzY0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82NzMxMDcwMz4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQcmV2aW91c2x5LCB3aGVuIHBhdXNp bmcsIGBKU0M6OkJyZWFrcG9pbnRgIHdvdWxkIGNoZWNrIHRoYXQgaXQncyBgaWdub3JlQ291bnRg IGJlZm9yZSBpdAorICAgICAgICB3b3VsZCBldmVuIGF0dGVtcHQgdG8gZXZhbHVhdGUgaXQncyBg Y29uZGl0aW9uYC4gVGhpcyBtZWFudCB0aGF0IGEgYEpTQzo6QnJlYWtwb2ludGAgd2l0aAorICAg ICAgICBhIGBjb25kaXRpb25gIG9mIGBmb28gPT09IDQyYCBhbmQgYW4gYGlnbm9yZUNvdW50YCBv ZiBgM2Agd291bGQgaWdub3JlIHRoZSBmaXJzdCB0aHJlZQorICAgICAgICBwYXVzZXMgYW5kIHRo ZW4gb25seSBwYXVzZSBpZiBgZm9vID09PSA0MmAuIFRoaXMgaXMgbGlrZWx5IGNvbnRyYXJ5IHRv IHRoZSBleHBlY3RhdGlvbiBvZgorICAgICAgICBtb3N0IHVzZXJzIChlc3BlY2lhbGx5IHNpbmNl IHRoZSBgY29uZGl0aW9uYCBpbnB1dCBpcyBiZWZvcmUgdGhlIGBpZ25vcmVDb3VudGAgaW5wdXQg aW4KKyAgICAgICAgdGhlIFdlYiBJbnNwZWN0b3IgZnJvbnRlbmQgVUkpIGluIHRoYXQgdGhleSB3 b3VsZCBwcm9iYWJseSBleHBlY3QgdG8gaWdub3JlIHRoZSBmaXJzdAorICAgICAgICB0aHJlZSBw YXVzZXMgaWYgYGZvbyA9PT0gNDJgLgorCisgICAgICAgICogZGVidWdnZXIvQnJlYWtwb2ludC5j cHA6CisgICAgICAgIChKU0M6OkJyZWFrcG9pbnQ6OnNob3VsZFBhdXNlKToKKwogMjAyMC0wOC0x OCAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3Bl Y3RvcjogYWxsb3cgZXZlbnQgYnJlYWtwb2ludHMgdG8gYmUgY29uZmlndXJlZApkaWZmIC0tZ2l0 IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RlYnVnZ2VyL0JyZWFrcG9pbnQuY3BwIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL2RlYnVnZ2VyL0JyZWFrcG9pbnQuY3BwCmluZGV4IDU5NjdiZjFkZDEx MS4uMDRmNTAxNTUxMmQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGVidWdn ZXIvQnJlYWtwb2ludC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RlYnVnZ2VyL0Jy ZWFrcG9pbnQuY3BwCkBAIC03NSwxMCArNzUsNyBAQCBib29sIEJyZWFrcG9pbnQ6OnJlc29sdmUo dW5zaWduZWQgbGluZU51bWJlciwgdW5zaWduZWQgY29sdW1uTnVtYmVyKQogCiBib29sIEJyZWFr cG9pbnQ6OnNob3VsZFBhdXNlKERlYnVnZ2VyJiBkZWJ1Z2dlciwgSlNHbG9iYWxPYmplY3QqIGds b2JhbE9iamVjdCkKIHsKLSAgICBpZiAoKyttX2hpdENvdW50IDw9IG1faWdub3JlQ291bnQpCi0g ICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIHJldHVybiBkZWJ1Z2dlci5ldmFsdWF0ZUJyZWFr cG9pbnRDb25kaXRpb24oKnRoaXMsIGdsb2JhbE9iamVjdCk7CisgICAgcmV0dXJuIGRlYnVnZ2Vy LmV2YWx1YXRlQnJlYWtwb2ludENvbmRpdGlvbigqdGhpcywgZ2xvYmFsT2JqZWN0KSAmJiArK21f aGl0Q291bnQgPiBtX2lnbm9yZUNvdW50OwogfQogCiB9IC8vIG5hbWVzcGFjZSBKU0MKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRl eCA0MWI2ZmY4NmQwMzIuLjQ3Y2YzNWQ5YmQ4MiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIw LTA4LTIyICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIg SW5zcGVjdG9yOiBicmVha3BvaW50IGNvbmRpdGlvbiBzaG91bGQgYmUgZXZhbHVhdGVkIGJlZm9y ZSB0aGUgaWdub3JlIGNvdW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMTUzNjQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY3MzEwNzAzPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9y L2RlYnVnZ2VyL3Jlc291cmNlcy9jb25kaXRpb24taWdub3JlQ291bnQuanM6IEFkZGVkLgorICAg ICAgICAodHJpZ2dlcik6IEFkZGVkLgorICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dlci9zZXRC cmVha3BvaW50LWNvbmRpdGlvbi1pZ25vcmVDb3VudC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBp bnNwZWN0b3IvZGVidWdnZXIvc2V0QnJlYWtwb2ludC1jb25kaXRpb24taWdub3JlQ291bnQtZXhw ZWN0ZWQudHh0OiBBZGRlZC4KKwogMjAyMC0wOC0xOCAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0Bh cHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogYWxsb3cgZXZlbnQgYnJlYWtwb2lu dHMgdG8gYmUgY29uZmlndXJlZApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Rl YnVnZ2VyL3Jlc291cmNlcy9jb25kaXRpb24taWdub3JlQ291bnQuanMgYi9MYXlvdXRUZXN0cy9p bnNwZWN0b3IvZGVidWdnZXIvcmVzb3VyY2VzL2NvbmRpdGlvbi1pZ25vcmVDb3VudC5qcwpuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAuLmMwMmU5ZGI3M2JlMAotLS0gL2Rl di9udWxsCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9yZXNvdXJjZXMvY29u ZGl0aW9uLWlnbm9yZUNvdW50LmpzCkBAIC0wLDAgKzEsNyBAQAord2luZG93LkNPTkRJVElPTl9U RVNUID0gMDsKKworZnVuY3Rpb24gdHJpZ2dlcigpIHsKKyAgICArK3dpbmRvdy5DT05ESVRJT05f VEVTVDsKKworICAgIFRlc3RQYWdlLmRpc3BhdGNoRXZlbnRUb0Zyb250ZW5kKCJUZXN0UGFnZV90 cmlnZ2VyIik7Cit9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIv c2V0QnJlYWtwb2ludC1jb25kaXRpb24taWdub3JlQ291bnQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NldEJyZWFrcG9pbnQtY29uZGl0aW9uLWlnbm9yZUNv dW50LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAu LjQ1ODc1Mzc0NGIxYwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9k ZWJ1Z2dlci9zZXRCcmVha3BvaW50LWNvbmRpdGlvbi1pZ25vcmVDb3VudC1leHBlY3RlZC50eHQK QEAgLTAsMCArMSwyNSBAQAorVGVzdHMgZm9yIERlYnVnZ2VyLnNldEJyZWFrcG9pbnQuCisKKwor PT0gUnVubmluZyB0ZXN0IHN1aXRlOiBEZWJ1Z2dlci5zZXRCcmVha3BvaW50CistLSBSdW5uaW5n IHRlc3QgY2FzZTogRGVidWdnZXIuc2V0QnJlYWtwb2ludC5Db25kaXRpb25JZ25vcmVDb3VudAor QWRkaW5nIGJyZWFrcG9pbnQuLi4KKworVHJpZ2dlcmluZyBicmVha3BvaW50Li4uCitQQVNTOiBT aG91bGQgbm90IHBhdXNlLgorCitUcmlnZ2VyaW5nIGJyZWFrcG9pbnQuLi4KK1BBU1M6IFNob3Vs ZCBub3QgcGF1c2UuCisKK1RyaWdnZXJpbmcgYnJlYWtwb2ludC4uLgorUEFTUzogU2hvdWxkIG5v dCBwYXVzZS4KKworVHJpZ2dlcmluZyBicmVha3BvaW50Li4uCitQQVNTOiBTaG91bGQgbm90IHBh dXNlLgorCitUcmlnZ2VyaW5nIGJyZWFrcG9pbnQuLi4KK1BBU1M6IFNob3VsZCBwYXVzZS4KKwor VHJpZ2dlcmluZyBicmVha3BvaW50Li4uCitQQVNTOiBTaG91bGQgcGF1c2UuCisKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zZXRCcmVha3BvaW50LWNvbmRpdGlv bi1pZ25vcmVDb3VudC5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NldEJy ZWFrcG9pbnQtY29uZGl0aW9uLWlnbm9yZUNvdW50Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMDAwMDAwLi5lOTAxZTE2OGJlMDAKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2V0QnJlYWtwb2ludC1jb25kaXRpb24taWdub3Jl Q291bnQuaHRtbApAQCAtMCwwICsxLDc4IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhl YWQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vaHR0cC90ZXN0cy9pbnNwZWN0b3IvcmVzb3VyY2VzL2lu c3BlY3Rvci10ZXN0LmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSJyZXNvdXJjZXMvY29uZGl0 aW9uLWlnbm9yZUNvdW50LmpzIj48L3NjcmlwdD4KKzxzY3JpcHQ+CitmdW5jdGlvbiB0ZXN0KCkg eworICAgIGZ1bmN0aW9uIGlzSGVscGVyU2NyaXB0KHNjcmlwdCkgeworICAgICAgICByZXR1cm4g L3Jlc291cmNlc1wvY29uZGl0aW9uLWlnbm9yZUNvdW50XC5qcy8udGVzdChzY3JpcHQudXJsKTsK KyAgICB9CisKKyAgICBsZXQgc3VpdGUgPSBJbnNwZWN0b3JUZXN0LmNyZWF0ZUFzeW5jU3VpdGUo IkRlYnVnZ2VyLnNldEJyZWFrcG9pbnQiKTsKKworICAgIHN1aXRlLmFkZFRlc3RDYXNlKHsKKyAg ICAgICAgbmFtZTogIkRlYnVnZ2VyLnNldEJyZWFrcG9pbnQuQ29uZGl0aW9uSWdub3JlQ291bnQi LAorICAgICAgICBkZXNjcmlwdGlvbjogIkNoZWNrIHRoYXQgYGNvbmRpdGlvbmAgaXMgZXZhbHVh dGVkIGJlZm9yZSBgaWdub3JlQ291bnRgLiIsCisgICAgICAgIGFzeW5jIHRlc3QoKSB7CisgICAg ICAgICAgICBsZXQgcGF1c2VDb3VudCA9IDA7CisKKyAgICAgICAgICAgIGxldCBsaXN0ZW5lciA9 IFdJLmRlYnVnZ2VyTWFuYWdlci5hZGRFdmVudExpc3RlbmVyKFdJLkRlYnVnZ2VyTWFuYWdlci5F dmVudC5QYXVzZWQsIChldmVudCkgPT4geworICAgICAgICAgICAgICAgICsrcGF1c2VDb3VudDsK KyAgICAgICAgICAgICAgICBXSS5kZWJ1Z2dlck1hbmFnZXIucmVzdW1lKCk7CisgICAgICAgICAg ICB9KTsKKworICAgICAgICAgICAgbGV0IGRlYnVnZ2VyRGF0YSA9IFdJLmRlYnVnZ2VyTWFuYWdl ci5kYXRhRm9yVGFyZ2V0KFdJLm1haW5UYXJnZXQpOworCisgICAgICAgICAgICBsZXQgc2NyaXB0 ID0gZGVidWdnZXJEYXRhLnNjcmlwdHMuZmlsdGVyKGlzSGVscGVyU2NyaXB0KVswXTsKKyAgICAg ICAgICAgIGlmICghc2NyaXB0KSB7CisgICAgICAgICAgICAgICAgYXdhaXQgbmV3IFByb21pc2Uo KHJlc29sdmUsIHJlamVjdCkgPT4geworICAgICAgICAgICAgICAgICAgICBsZXQgbGlzdGVuZXIg PSBXSS5kZWJ1Z2dlck1hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihXSS5EZWJ1Z2dlck1hbmFnZXIu RXZlbnQuU2NyaXB0QWRkZWQsIChldmVudCkgPT4geworICAgICAgICAgICAgICAgICAgICAgICAg c2NyaXB0ID0gZXZlbnQuZGF0YS5zY3JpcHQ7CisgICAgICAgICAgICAgICAgICAgICAgICBpZiAo aXNIZWxwZXJTY3JpcHQoc2NyaXB0KSkgeworICAgICAgICAgICAgICAgICAgICAgICAgICAgIFdJ LmRlYnVnZ2VyTWFuYWdlci5yZW1vdmVFdmVudExpc3RlbmVyKFdJLkRlYnVnZ2VyTWFuYWdlci5F dmVudC5TY3JpcHRBZGRlZCwgbGlzdGVuZXIpOworICAgICAgICAgICAgICAgICAgICAgICAgICAg IHJlc29sdmUoKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAg ICAgfSk7CisgICAgICAgICAgICAgICAgfSk7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAg IGxldCBicmVha3BvaW50ID0gbmV3IFdJLkphdmFTY3JpcHRCcmVha3BvaW50KG5ldyBXSS5Tb3Vy Y2VDb2RlTG9jYXRpb24oc2NyaXB0LCA0LCAwKSwgeworICAgICAgICAgICAgICAgIGNvbmRpdGlv bjogYHdpbmRvdy5DT05ESVRJT05fVEVTVCA+IDJgLAorICAgICAgICAgICAgICAgIGlnbm9yZUNv dW50OiAyLAorICAgICAgICAgICAgfSk7CisKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QubG9n KCJBZGRpbmcgYnJlYWtwb2ludC4uLiIpOworICAgICAgICAgICAgYXdhaXQgUHJvbWlzZS5hbGwo WworICAgICAgICAgICAgICAgIGJyZWFrcG9pbnQuYXdhaXRFdmVudChXSS5KYXZhU2NyaXB0QnJl YWtwb2ludC5FdmVudC5SZXNvbHZlZFN0YXRlRGlkQ2hhbmdlKSwKKyAgICAgICAgICAgICAgICBX SS5kZWJ1Z2dlck1hbmFnZXIuYWRkQnJlYWtwb2ludChicmVha3BvaW50KSwKKyAgICAgICAgICAg IF0pOworCisgICAgICAgICAgICBmb3IgKGxldCBpID0gMTsgaSA8PSA2OyArK2kpIHsKKyAgICAg ICAgICAgICAgICBJbnNwZWN0b3JUZXN0Lm5ld2xpbmUoKTsKKworICAgICAgICAgICAgICAgIElu c3BlY3RvclRlc3QubG9nKCJUcmlnZ2VyaW5nIGJyZWFrcG9pbnQuLi4iKTsKKyAgICAgICAgICAg ICAgICBhd2FpdCBQcm9taXNlLmFsbChbCisgICAgICAgICAgICAgICAgICAgIEluc3BlY3RvclRl c3QuYXdhaXRFdmVudCgiVGVzdFBhZ2VfdHJpZ2dlciIpLAorICAgICAgICAgICAgICAgICAgICBJ bnNwZWN0b3JUZXN0LmV2YWx1YXRlSW5QYWdlKGB0cmlnZ2VyKClgKSwKKyAgICAgICAgICAgICAg ICBdKTsKKworICAgICAgICAgICAgICAgIGlmIChpIDw9IDQpCisgICAgICAgICAgICAgICAgICAg IEluc3BlY3RvclRlc3QuZXhwZWN0RXF1YWwocGF1c2VDb3VudCwgMCwgIlNob3VsZCBub3QgcGF1 c2UuIik7CisgICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICBJbnNwZWN0 b3JUZXN0LmV4cGVjdEVxdWFsKHBhdXNlQ291bnQsIGkgLSA0LCAiU2hvdWxkIHBhdXNlLiIpOwor ICAgICAgICAgICAgfQorCisgICAgICAgICAgICBicmVha3BvaW50LnJlbW92ZSgpOworICAgICAg ICAgICAgV0kuZGVidWdnZXJNYW5hZ2VyLnJlbW92ZUV2ZW50TGlzdGVuZXIoV0kuRGVidWdnZXJN YW5hZ2VyLkV2ZW50LlBhdXNlZCwgbGlzdGVuZXIpOworICAgICAgICB9LAorICAgIH0pOworCisg ICAgc3VpdGUucnVuVGVzdENhc2VzQW5kRmluaXNoKCk7Cit9Cis8L3NjcmlwdD4KKzwvaGVhZD4K Kzxib2R5IG9ubG9hZD0icnVuVGVzdCgpIj4KKyAgICA8cD5UZXN0cyBmb3IgRGVidWdnZXIuc2V0 QnJlYWtwb2ludC48L3A+Cis8L2JvZHk+Cis8L2h0bWw+Cg== 407209 2020-08-25 10:52:46 -0700 2020-08-25 11:50:02 -0700 Patch bug-215364-20200825105245.patch text/plain 7706 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDk4Njk5YTI2MWQ0MTBkZjE2YTdjOGQ4YTljZmNi YWI3ZDA3NGE2MTUuLjQ1NGQwNmNhODA1OTUyZmNjMDIwZTgyNGI0YTFjMmRjNTVmZmJlMWYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTA4LTI1ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBi cmVha3BvaW50IGNvbmRpdGlvbiBzaG91bGQgYmUgZXZhbHVhdGVkIGJlZm9yZSB0aGUgaWdub3Jl IGNvdW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MTUzNjQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY3MzEwNzAzPgorCisgICAgICAgIFJldmll d2VkIGJ5IEpvc2VwaCBQZWNvcmFyby4KKworICAgICAgICBQcmV2aW91c2x5LCB3aGVuIHBhdXNp bmcsIGBKU0M6OkJyZWFrcG9pbnRgIHdvdWxkIGNoZWNrIHRoYXQgaXQncyBgaWdub3JlQ291bnRg IGJlZm9yZSBpdAorICAgICAgICB3b3VsZCBldmVuIGF0dGVtcHQgdG8gZXZhbHVhdGUgaXQncyBg Y29uZGl0aW9uYC4gVGhpcyBtZWFudCB0aGF0IGEgYEpTQzo6QnJlYWtwb2ludGAgd2l0aAorICAg ICAgICBhIGBjb25kaXRpb25gIG9mIGBmb28gPT09IDQyYCBhbmQgYW4gYGlnbm9yZUNvdW50YCBv ZiBgM2Agd291bGQgaWdub3JlIHRoZSBmaXJzdCB0aHJlZQorICAgICAgICBwYXVzZXMgYW5kIHRo ZW4gb25seSBwYXVzZSBpZiBgZm9vID09PSA0MmAuIFRoaXMgaXMgbGlrZWx5IGNvbnRyYXJ5IHRv IHRoZSBleHBlY3RhdGlvbiBvZgorICAgICAgICBtb3N0IHVzZXJzIChlc3BlY2lhbGx5IHNpbmNl IHRoZSBgY29uZGl0aW9uYCBpbnB1dCBpcyBiZWZvcmUgdGhlIGBpZ25vcmVDb3VudGAgaW5wdXQg aW4KKyAgICAgICAgdGhlIFdlYiBJbnNwZWN0b3IgZnJvbnRlbmQgVUkpIGluIHRoYXQgdGhleSB3 b3VsZCBwcm9iYWJseSBleHBlY3QgdG8gaWdub3JlIHRoZSBmaXJzdAorICAgICAgICB0aHJlZSBw YXVzZXMgaWYgYGZvbyA9PT0gNDJgLgorCisgICAgICAgICogZGVidWdnZXIvQnJlYWtwb2ludC5j cHA6CisgICAgICAgIChKU0M6OkJyZWFrcG9pbnQ6OnNob3VsZFBhdXNlKToKKwogMjAyMC0wOC0y NCAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxlLmNvbT4KIAogICAgICAgICBERkcg c2hvdWxkIGFsd2F5cyBydW4gQ0ZHIFNpbXBsaWZpY2F0aW9uIGFmdGVyIENvbnN0YW50IEZvbGRp bmcuCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGVidWdnZXIvQnJlYWtwb2lu dC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGVidWdnZXIvQnJlYWtwb2ludC5jcHAKaW5k ZXggNTk2N2JmMWRkMTExNDMyYmM1MTYwNGNhNWE2NzY1OGM0ZjRjYjY1ZC4uNmFiMmNjNmJjNWEw NmJlYTMwNzdhZDAzYWE0ZDAxYThkM2UxMTZhYyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL2RlYnVnZ2VyL0JyZWFrcG9pbnQuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9kZWJ1Z2dlci9CcmVha3BvaW50LmNwcApAQCAtNzUsMTAgKzc1LDEwIEBAIGJvb2wgQnJlYWtw b2ludDo6cmVzb2x2ZSh1bnNpZ25lZCBsaW5lTnVtYmVyLCB1bnNpZ25lZCBjb2x1bW5OdW1iZXIp CiAKIGJvb2wgQnJlYWtwb2ludDo6c2hvdWxkUGF1c2UoRGVidWdnZXImIGRlYnVnZ2VyLCBKU0ds b2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0KQogewotICAgIGlmICgrK21faGl0Q291bnQgPD0gbV9p Z25vcmVDb3VudCkKKyAgICBpZiAoIWRlYnVnZ2VyLmV2YWx1YXRlQnJlYWtwb2ludENvbmRpdGlv bigqdGhpcywgZ2xvYmFsT2JqZWN0KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgcmV0 dXJuIGRlYnVnZ2VyLmV2YWx1YXRlQnJlYWtwb2ludENvbmRpdGlvbigqdGhpcywgZ2xvYmFsT2Jq ZWN0KTsKKyAgICByZXR1cm4gKyttX2hpdENvdW50ID4gbV9pZ25vcmVDb3VudDsKIH0KIAogfSAv LyBuYW1lc3BhY2UgSlNDCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZDA4OTU0MmI4Y2EyODFjYTQxOGZmMzYzOWJiOTI2NWU3 Nzg4ZTkzNy4uZmEzYWZiZDVmNjk3ODkxMGU2MjdkZDZiNGRkZTI0ZTgwMGI5Njk5ZCAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE2IEBACisyMDIwLTA4LTI1ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxl LmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBicmVha3BvaW50IGNvbmRpdGlvbiBzaG91 bGQgYmUgZXZhbHVhdGVkIGJlZm9yZSB0aGUgaWdub3JlIGNvdW50CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTUzNjQKKyAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzY3MzEwNzAzPgorCisgICAgICAgIFJldmlld2VkIGJ5IEpvc2VwaCBQZWNvcmFyby4K KworICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dlci9yZXNvdXJjZXMvY29uZGl0aW9uLWlnbm9y ZUNvdW50LmpzOiBBZGRlZC4KKyAgICAgICAgKHRyaWdnZXIpOiBBZGRlZC4KKyAgICAgICAgKiBp bnNwZWN0b3IvZGVidWdnZXIvc2V0QnJlYWtwb2ludC1jb25kaXRpb24taWdub3JlQ291bnQuaHRt bDogQWRkZWQuCisgICAgICAgICogaW5zcGVjdG9yL2RlYnVnZ2VyL3NldEJyZWFrcG9pbnQtY29u ZGl0aW9uLWlnbm9yZUNvdW50LWV4cGVjdGVkLnR4dDogQWRkZWQuCisKIDIwMjAtMDgtMjQgIE15 bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KIAogICAgICAgICBbbWFjT1Mg QmlnIFN1cl0gc3ZnL1czQy1JMThOL3RzcGFuLWRpcmVjdGlvbi1ydGwuc3ZnIGlzIGZhaWxpbmcK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9yZXNvdXJjZXMvY29u ZGl0aW9uLWlnbm9yZUNvdW50LmpzIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3Jl c291cmNlcy9jb25kaXRpb24taWdub3JlQ291bnQuanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYzAyZTlkYjczYmUw Zjc3MTcyNTE0MTg0NTkyMDU1M2JkZGM3MTZkZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRl c3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9yZXNvdXJjZXMvY29uZGl0aW9uLWlnbm9yZUNvdW50Lmpz CkBAIC0wLDAgKzEsNyBAQAord2luZG93LkNPTkRJVElPTl9URVNUID0gMDsKKworZnVuY3Rpb24g dHJpZ2dlcigpIHsKKyAgICArK3dpbmRvdy5DT05ESVRJT05fVEVTVDsKKworICAgIFRlc3RQYWdl LmRpc3BhdGNoRXZlbnRUb0Zyb250ZW5kKCJUZXN0UGFnZV90cmlnZ2VyIik7Cit9CmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2V0QnJlYWtwb2ludC1jb25kaXRp b24taWdub3JlQ291bnQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVn Z2VyL3NldEJyZWFrcG9pbnQtY29uZGl0aW9uLWlnbm9yZUNvdW50LWV4cGVjdGVkLnR4dApuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwLi40NTg3NTM3NDRiMWM2Mjk2NDc0YTAyY2E4ZmIxYzA3MmNmZTMyYTE4Ci0tLSAvZGV2 L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NldEJyZWFrcG9pbnQt Y29uZGl0aW9uLWlnbm9yZUNvdW50LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDI1IEBACitUZXN0 cyBmb3IgRGVidWdnZXIuc2V0QnJlYWtwb2ludC4KKworCis9PSBSdW5uaW5nIHRlc3Qgc3VpdGU6 IERlYnVnZ2VyLnNldEJyZWFrcG9pbnQKKy0tIFJ1bm5pbmcgdGVzdCBjYXNlOiBEZWJ1Z2dlci5z ZXRCcmVha3BvaW50LkNvbmRpdGlvbklnbm9yZUNvdW50CitBZGRpbmcgYnJlYWtwb2ludC4uLgor CitUcmlnZ2VyaW5nIGJyZWFrcG9pbnQuLi4KK1BBU1M6IFNob3VsZCBub3QgcGF1c2UuCisKK1Ry aWdnZXJpbmcgYnJlYWtwb2ludC4uLgorUEFTUzogU2hvdWxkIG5vdCBwYXVzZS4KKworVHJpZ2dl cmluZyBicmVha3BvaW50Li4uCitQQVNTOiBTaG91bGQgbm90IHBhdXNlLgorCitUcmlnZ2VyaW5n IGJyZWFrcG9pbnQuLi4KK1BBU1M6IFNob3VsZCBub3QgcGF1c2UuCisKK1RyaWdnZXJpbmcgYnJl YWtwb2ludC4uLgorUEFTUzogU2hvdWxkIHBhdXNlLgorCitUcmlnZ2VyaW5nIGJyZWFrcG9pbnQu Li4KK1BBU1M6IFNob3VsZCBwYXVzZS4KKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL2RlYnVnZ2VyL3NldEJyZWFrcG9pbnQtY29uZGl0aW9uLWlnbm9yZUNvdW50Lmh0bWwgYi9M YXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2V0QnJlYWtwb2ludC1jb25kaXRpb24taWdu b3JlQ291bnQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5lOTAxZTE2OGJlMDBkMTc0NTY0ZmRmM2ZhNGI4OWE1 OTljZDk5NTNlCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVn Z2VyL3NldEJyZWFrcG9pbnQtY29uZGl0aW9uLWlnbm9yZUNvdW50Lmh0bWwKQEAgLTAsMCArMSw3 OCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdCBzcmM9Ii4uLy4u L2h0dHAvdGVzdHMvaW5zcGVjdG9yL3Jlc291cmNlcy9pbnNwZWN0b3ItdGVzdC5qcyI+PC9zY3Jp cHQ+Cis8c2NyaXB0IHNyYz0icmVzb3VyY2VzL2NvbmRpdGlvbi1pZ25vcmVDb3VudC5qcyI+PC9z Y3JpcHQ+Cis8c2NyaXB0PgorZnVuY3Rpb24gdGVzdCgpIHsKKyAgICBmdW5jdGlvbiBpc0hlbHBl clNjcmlwdChzY3JpcHQpIHsKKyAgICAgICAgcmV0dXJuIC9yZXNvdXJjZXNcL2NvbmRpdGlvbi1p Z25vcmVDb3VudFwuanMvLnRlc3Qoc2NyaXB0LnVybCk7CisgICAgfQorCisgICAgbGV0IHN1aXRl ID0gSW5zcGVjdG9yVGVzdC5jcmVhdGVBc3luY1N1aXRlKCJEZWJ1Z2dlci5zZXRCcmVha3BvaW50 Iik7CisKKyAgICBzdWl0ZS5hZGRUZXN0Q2FzZSh7CisgICAgICAgIG5hbWU6ICJEZWJ1Z2dlci5z ZXRCcmVha3BvaW50LkNvbmRpdGlvbklnbm9yZUNvdW50IiwKKyAgICAgICAgZGVzY3JpcHRpb246 ICJDaGVjayB0aGF0IGBjb25kaXRpb25gIGlzIGV2YWx1YXRlZCBiZWZvcmUgYGlnbm9yZUNvdW50 YC4iLAorICAgICAgICBhc3luYyB0ZXN0KCkgeworICAgICAgICAgICAgbGV0IHBhdXNlQ291bnQg PSAwOworCisgICAgICAgICAgICBsZXQgbGlzdGVuZXIgPSBXSS5kZWJ1Z2dlck1hbmFnZXIuYWRk RXZlbnRMaXN0ZW5lcihXSS5EZWJ1Z2dlck1hbmFnZXIuRXZlbnQuUGF1c2VkLCAoZXZlbnQpID0+ IHsKKyAgICAgICAgICAgICAgICArK3BhdXNlQ291bnQ7CisgICAgICAgICAgICAgICAgV0kuZGVi dWdnZXJNYW5hZ2VyLnJlc3VtZSgpOworICAgICAgICAgICAgfSk7CisKKyAgICAgICAgICAgIGxl dCBkZWJ1Z2dlckRhdGEgPSBXSS5kZWJ1Z2dlck1hbmFnZXIuZGF0YUZvclRhcmdldChXSS5tYWlu VGFyZ2V0KTsKKworICAgICAgICAgICAgbGV0IHNjcmlwdCA9IGRlYnVnZ2VyRGF0YS5zY3JpcHRz LmZpbHRlcihpc0hlbHBlclNjcmlwdClbMF07CisgICAgICAgICAgICBpZiAoIXNjcmlwdCkgewor ICAgICAgICAgICAgICAgIGF3YWl0IG5ldyBQcm9taXNlKChyZXNvbHZlLCByZWplY3QpID0+IHsK KyAgICAgICAgICAgICAgICAgICAgbGV0IGxpc3RlbmVyID0gV0kuZGVidWdnZXJNYW5hZ2VyLmFk ZEV2ZW50TGlzdGVuZXIoV0kuRGVidWdnZXJNYW5hZ2VyLkV2ZW50LlNjcmlwdEFkZGVkLCAoZXZl bnQpID0+IHsKKyAgICAgICAgICAgICAgICAgICAgICAgIHNjcmlwdCA9IGV2ZW50LmRhdGEuc2Ny aXB0OworICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGlzSGVscGVyU2NyaXB0KHNjcmlwdCkp IHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBXSS5kZWJ1Z2dlck1hbmFnZXIucmVtb3Zl RXZlbnRMaXN0ZW5lcihXSS5EZWJ1Z2dlck1hbmFnZXIuRXZlbnQuU2NyaXB0QWRkZWQsIGxpc3Rl bmVyKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXNvbHZlKCk7CisgICAgICAgICAg ICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgICAgIH0pOworICAgICAgICAgICAgICAg IH0pOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICBsZXQgYnJlYWtwb2ludCA9IG5ldyBX SS5KYXZhU2NyaXB0QnJlYWtwb2ludChuZXcgV0kuU291cmNlQ29kZUxvY2F0aW9uKHNjcmlwdCwg NCwgMCksIHsKKyAgICAgICAgICAgICAgICBjb25kaXRpb246IGB3aW5kb3cuQ09ORElUSU9OX1RF U1QgPiAyYCwKKyAgICAgICAgICAgICAgICBpZ25vcmVDb3VudDogMiwKKyAgICAgICAgICAgIH0p OworCisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmxvZygiQWRkaW5nIGJyZWFrcG9pbnQuLi4i KTsKKyAgICAgICAgICAgIGF3YWl0IFByb21pc2UuYWxsKFsKKyAgICAgICAgICAgICAgICBicmVh a3BvaW50LmF3YWl0RXZlbnQoV0kuSmF2YVNjcmlwdEJyZWFrcG9pbnQuRXZlbnQuUmVzb2x2ZWRT dGF0ZURpZENoYW5nZSksCisgICAgICAgICAgICAgICAgV0kuZGVidWdnZXJNYW5hZ2VyLmFkZEJy ZWFrcG9pbnQoYnJlYWtwb2ludCksCisgICAgICAgICAgICBdKTsKKworICAgICAgICAgICAgZm9y IChsZXQgaSA9IDE7IGkgPD0gNjsgKytpKSB7CisgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVz dC5uZXdsaW5lKCk7CisKKyAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmxvZygiVHJpZ2dl cmluZyBicmVha3BvaW50Li4uIik7CisgICAgICAgICAgICAgICAgYXdhaXQgUHJvbWlzZS5hbGwo WworICAgICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmF3YWl0RXZlbnQoIlRlc3RQYWdl X3RyaWdnZXIiKSwKKyAgICAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5ldmFsdWF0ZUlu UGFnZShgdHJpZ2dlcigpYCksCisgICAgICAgICAgICAgICAgXSk7CisKKyAgICAgICAgICAgICAg ICBpZiAoaSA8PSA0KQorICAgICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEVx dWFsKHBhdXNlQ291bnQsIDAsICJTaG91bGQgbm90IHBhdXNlLiIpOworICAgICAgICAgICAgICAg IGVsc2UKKyAgICAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RFcXVhbChwYXVz ZUNvdW50LCBpIC0gNCwgIlNob3VsZCBwYXVzZS4iKTsKKyAgICAgICAgICAgIH0KKworICAgICAg ICAgICAgYnJlYWtwb2ludC5yZW1vdmUoKTsKKyAgICAgICAgICAgIFdJLmRlYnVnZ2VyTWFuYWdl ci5yZW1vdmVFdmVudExpc3RlbmVyKFdJLkRlYnVnZ2VyTWFuYWdlci5FdmVudC5QYXVzZWQsIGxp c3RlbmVyKTsKKyAgICAgICAgfSwKKyAgICB9KTsKKworICAgIHN1aXRlLnJ1blRlc3RDYXNlc0Fu ZEZpbmlzaCgpOworfQorPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBvbmxvYWQ9InJ1blRlc3Qo KSI+CisgICAgPHA+VGVzdHMgZm9yIERlYnVnZ2VyLnNldEJyZWFrcG9pbnQuPC9wPgorPC9ib2R5 PgorPC9odG1sPgo=