181314 2018-01-04 18:56:24 -0800 REGRESSION (r225709): Web Inspector: CSS Source maps not loading 2018-01-04 20:34:13 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck bburg commit-queue inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1386017 0 joepeck 2018-01-04 18:56:24 -0800 REGRESSION (r225709): Web Inspector: CSS Source maps not loading Steps to Reproduce: 1. Load any page with CSS source maps => CSS source map not loaded Notes: • An over-eager else when we added handling of no-main-frame cases (service worker inspector). • See: SourceMapManager _loadAndParseSourceMap 1386018 1 joepeck 2018-01-04 18:56:31 -0800 <rdar://problem/36177620> 1386021 2 330511 joepeck 2018-01-04 19:28:15 -0800 Created attachment 330511 [PATCH] Proposed Fix 1386030 3 330511 bburg 2018-01-04 20:13:31 -0800 Comment on attachment 330511 [PATCH] Proposed Fix r=me, nice test! 1386034 4 330511 commit-queue 2018-01-04 20:34:12 -0800 Comment on attachment 330511 [PATCH] Proposed Fix Clearing flags on attachment: 330511 Committed r226435: <https://trac.webkit.org/changeset/226435> 1386035 5 commit-queue 2018-01-04 20:34:13 -0800 All reviewed patches have been landed. Closing bug. 330511 2018-01-04 19:28:15 -0800 2018-01-04 20:34:12 -0800 [PATCH] Proposed Fix source-map-issue-1.patch text/plain 13790 joepeck ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBmZGJjY2NiOWY2Mi4uODQ0ZWY4NzE3MDUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyNSBAQAog MjAxOC0wMS0wNCAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgogCisgICAg ICAgIFJFR1JFU1NJT04gKHIyMjU3MDkpOiBXZWIgSW5zcGVjdG9yOiBDU1MgU291cmNlIG1hcHMg bm90IGxvYWRpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE4MTMxNAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzYxNzc2MjA+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBodHRwL3Rlc3RzL2luc3Bl Y3Rvci9uZXR3b3JrL3Jlc291cmNlcy9zY3JpcHQtd2l0aC1zb3VyY2VtYXAuanM6IEFkZGVkLgor ICAgICAgICAqIGh0dHAvdGVzdHMvaW5zcGVjdG9yL25ldHdvcmsvcmVzb3VyY2VzL3NjcmlwdC13 aXRoLXNvdXJjZW1hcC5qcy5tYXA6IEFkZGVkLgorICAgICAgICAqIGh0dHAvdGVzdHMvaW5zcGVj dG9yL25ldHdvcmsvcmVzb3VyY2VzL3N0eWxlc2hlZXQtd2l0aC1zb3VyY2VtYXAuY3NzOiBBZGRl ZC4KKyAgICAgICAgKiBodHRwL3Rlc3RzL2luc3BlY3Rvci9uZXR3b3JrL3Jlc291cmNlcy9zdHls ZXNoZWV0LXdpdGgtc291cmNlbWFwLmNzcy5tYXA6IEFkZGVkLgorICAgICAgICAqIGh0dHAvdGVz dHMvaW5zcGVjdG9yL25ldHdvcmsvcmVzb3VyY2VzL3N0eWxlc2hlZXQtd2l0aC1zb3VyY2VtYXAu c2NzczogQWRkZWQuCisgICAgICAgIEFkZCBhIHJlYWwgc2NyaXB0IG1pbmlmaWVkIHdpdGggYSBz b3VyY2UgbWFwLgorICAgICAgICBBZGQgYSByZWFsIHNjc3Mgc3R5bGVzaGVldCBjb21waWxlZCB0 byBjc3Mgd2l0aCBhIHNvdXJjZSBtYXAuCisKKyAgICAgICAgKiBodHRwL3Rlc3RzL2luc3BlY3Rv ci9uZXR3b3JrL3NvdXJjZS1tYXAtbG9hZHMtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAg KiBodHRwL3Rlc3RzL2luc3BlY3Rvci9uZXR3b3JrL3NvdXJjZS1tYXAtbG9hZHMuaHRtbDogQWRk ZWQuCisgICAgICAgIFRlc3QgdGhhdCB3ZSBsb2FkIHNvdXJjZSBtYXBzIGZvciByZXNvdXJjZXMg d2l0aCBzb3VyY2VNYXBwaW5nVVJMIGRpcmVjdGl2ZXMuCisKKzIwMTgtMDEtMDQgIEpvc2VwaCBQ ZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwogICAgICAgICBTZXJ2aWNlV29ya2Vyczog RW5hYmxlIFVzZXJUaW1pbmcgLyBSZXNvdXJjZVRpbWluZwogICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgxMjk3CiAgICAgICAgIDxyZGFyOi8vcHJvYmxl bS8zNjMwNzMwNj4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9y L25ldHdvcmsvcmVzb3VyY2VzL3NjcmlwdC13aXRoLXNvdXJjZW1hcC5qcyBiL0xheW91dFRlc3Rz L2h0dHAvdGVzdHMvaW5zcGVjdG9yL25ldHdvcmsvcmVzb3VyY2VzL3NjcmlwdC13aXRoLXNvdXJj ZW1hcC5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMC4uMzI5NmE5ZWUz OGIKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9u ZXR3b3JrL3Jlc291cmNlcy9zY3JpcHQtd2l0aC1zb3VyY2VtYXAuanMKQEAgLTAsMCArMSwyIEBA CitmdW5jdGlvbiBub3RoaW5nU3BlY2lhbFRvU2VlSGVyZTEoKXtjb25zb2xlLmxvZygibm90aGlu Z1NwZWNpYWxUb1NlZUhlcmUxIil9CisvLyMgc291cmNlTWFwcGluZ1VSTD1zY3JpcHQtd2l0aC1z b3VyY2VtYXAuanMubWFwCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3Bl Y3Rvci9uZXR3b3JrL3Jlc291cmNlcy9zY3JpcHQtd2l0aC1zb3VyY2VtYXAuanMubWFwIGIvTGF5 b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvbmV0d29yay9yZXNvdXJjZXMvc2NyaXB0LXdp dGgtc291cmNlbWFwLmpzLm1hcApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAw MC4uNDg0M2Y5YjY3YzYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3Rz L2luc3BlY3Rvci9uZXR3b3JrL3Jlc291cmNlcy9zY3JpcHQtd2l0aC1zb3VyY2VtYXAuanMubWFw CkBAIC0wLDAgKzEsNyBAQAoreworInZlcnNpb24iOiAzLAorImZpbGUiOiAic2NyaXB0LXdpdGgt c291cmNlbWFwLmpzIiwKKyJzb3VyY2VzIjogWyJzY3JpcHQtd2l0aC1zb3VyY2VtYXAuanMiXSwK KyJuYW1lcyI6IFsibm90aGluZ1NwZWNpYWxUb1NlZUhlcmUxIiwiY29uc29sZSIsImxvZyJdLAor Im1hcHBpbmdzIjogIkFBQ0EsUUFBU0EsNEJBQ0xDLFFBQVFDLElBQUkiCit9CmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9uZXR3b3JrL3Jlc291cmNlcy9zdHls ZXNoZWV0LXdpdGgtc291cmNlbWFwLmNzcyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVj dG9yL25ldHdvcmsvcmVzb3VyY2VzL3N0eWxlc2hlZXQtd2l0aC1zb3VyY2VtYXAuY3NzCm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwLi5lZWRhYWJjNWE0ZQotLS0gL2Rldi9u dWxsCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL25ldHdvcmsvcmVzb3Vy Y2VzL3N0eWxlc2hlZXQtd2l0aC1zb3VyY2VtYXAuY3NzCkBAIC0wLDAgKzEsMjIgQEAKK2RpdiB7 CisgIGJhY2tncm91bmQtY29sb3I6ICNBQkM7CisgIHdpZHRoOiAyMDBweDsKKyAgaGVpZ2h0OiAx MDBweDsKKyAgbWFyZ2luOiAyMHB4OyB9CisKKy5kaXYxIHsKKyAgYm9yZGVyLXRvcC1sZWZ0LXJh ZGl1czogMTBweDsKKyAgLW1vei1ib3JkZXItcmFkaXVzLXRvcGxlZnQ6IDEwcHg7CisgIC13ZWJr aXQtYm9yZGVyLXRvcC1sZWZ0LXJhZGl1czogMTBweDsgfQorCisuZGl2MiB7CisgIGJvcmRlci10 b3AtbGVmdC1yYWRpdXM6IDIwcHg7CisgIC1tb3otYm9yZGVyLXJhZGl1cy10b3BsZWZ0OiAyMHB4 OworICAtd2Via2l0LWJvcmRlci10b3AtbGVmdC1yYWRpdXM6IDIwcHg7IH0KKworLmRpdjMgewor ICBib3JkZXItdG9wLWxlZnQtcmFkaXVzOiAzMHB4OworICAtbW96LWJvcmRlci1yYWRpdXMtdG9w bGVmdDogMzBweDsKKyAgLXdlYmtpdC1ib3JkZXItdG9wLWxlZnQtcmFkaXVzOiAzMHB4OyB9CisK Ky8qIyBzb3VyY2VNYXBwaW5nVVJMPXN0eWxlc2hlZXQtd2l0aC1zb3VyY2VtYXAuY3NzLm1hcCAq LwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvbmV0d29yay9y ZXNvdXJjZXMvc3R5bGVzaGVldC13aXRoLXNvdXJjZW1hcC5jc3MubWFwIGIvTGF5b3V0VGVzdHMv aHR0cC90ZXN0cy9pbnNwZWN0b3IvbmV0d29yay9yZXNvdXJjZXMvc3R5bGVzaGVldC13aXRoLXNv dXJjZW1hcC5jc3MubWFwCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwLi4z YmU4MzFkNjc2MwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5z cGVjdG9yL25ldHdvcmsvcmVzb3VyY2VzL3N0eWxlc2hlZXQtd2l0aC1zb3VyY2VtYXAuY3NzLm1h cApAQCAtMCwwICsxLDcgQEAKK3sKKyJ2ZXJzaW9uIjogMywKKyJtYXBwaW5ncyI6ICJBQU1BLEdB QUk7RUFBRSxnQkFBZ0IsRUFBRSxJQUFJO0VBQUUsS0FBSyxFQUFFLEtBQUs7RUFBRSxNQUFNLEVB QUUsS0FBSztFQUFFLE1BQU0sRUFBRSxJQUFJOztBQUN2RSxLQUFNO0VBTkosc0JBQStCLEVBREss SUFBSTtFQUV4QywwQkFBbUMsRUFGQyxJQUFJO0VBR3hDLDhCQUF1QyxFQUhILElBQUk7O0FBUTFD LEtBQU07RUFQSixzQkFBK0IsRUFPRyxJQUFJO0VBTnRDLDBCQUFtQyxFQU1ELElBQUk7RUFMdEMs OEJBQXVDLEVBS0wsSUFBSTs7QUFDeEMsS0FBTTtFQVJKLHNCQUErQixFQVFHLElBQUk7RUFQdEMs MEJBQW1DLEVBT0QsSUFBSTtFQU50Qyw4QkFBdUMsRUFNTCxJQUFJIiwKKyJzb3VyY2VzIjogWyJz dHlsZXMuc2NzcyJdLAorIm5hbWVzIjogW10sCisiZmlsZSI6ICJzdHlsZXNoZWV0LXdpdGgtc291 cmNlbWFwLmNzcyIKK30KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVj dG9yL25ldHdvcmsvcmVzb3VyY2VzL3N0eWxlc2hlZXQtd2l0aC1zb3VyY2VtYXAuc2NzcyBiL0xh eW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL25ldHdvcmsvcmVzb3VyY2VzL3N0eWxlc2hl ZXQtd2l0aC1zb3VyY2VtYXAuc2NzcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMC4uNDkzZGM0NDFiMTAKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rl c3RzL2luc3BlY3Rvci9uZXR3b3JrL3Jlc291cmNlcy9zdHlsZXNoZWV0LXdpdGgtc291cmNlbWFw LnNjc3MKQEAgLTAsMCArMSwxMCBAQAorQG1peGluIHJvdW5kZWQoJHZlcnQsICRob3J6LCAkcmFk aXVzOiAxMHB4KSB7CisgIGJvcmRlci0jeyR2ZXJ0fS0jeyRob3J6fS1yYWRpdXM6ICRyYWRpdXM7 CisgIC1tb3otYm9yZGVyLXJhZGl1cy0jeyR2ZXJ0fSN7JGhvcnp9OiAkcmFkaXVzOworICAtd2Vi a2l0LWJvcmRlci0jeyR2ZXJ0fS0jeyRob3J6fS1yYWRpdXM6ICRyYWRpdXM7Cit9CisKK2RpdiB7 IGJhY2tncm91bmQtY29sb3I6ICNBQkM7IHdpZHRoOiAyMDBweDsgaGVpZ2h0OiAxMDBweDsgbWFy Z2luOiAyMHB4OyB9CisuZGl2MSB7IEBpbmNsdWRlIHJvdW5kZWQodG9wLCBsZWZ0KTsgfQorLmRp djIgeyBAaW5jbHVkZSByb3VuZGVkKHRvcCwgbGVmdCwgMjBweCk7IH0KKy5kaXYzIHsgQGluY2x1 ZGUgcm91bmRlZCh0b3AsIGxlZnQsIDMwcHgpOyB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9o dHRwL3Rlc3RzL2luc3BlY3Rvci9uZXR3b3JrL3NvdXJjZS1tYXAtbG9hZHMtZXhwZWN0ZWQudHh0 IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvbmV0d29yay9zb3VyY2UtbWFwLWxv YWRzLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMC4u MDAwYzM3MWFiYWUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2lu c3BlY3Rvci9uZXR3b3JrL3NvdXJjZS1tYXAtbG9hZHMtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEs MTQgQEAKK0Vuc3VyZSBhIHNvdXJjZSBtYXAgbG9hZHMgZm9yIHJlc291cmNlcyB3aXRoIHNvdXJj ZU1hcHBpbmdVUkxzLgorCisKKz09IFJ1bm5pbmcgdGVzdCBzdWl0ZTogTmV0d29yay5Tb3VyY2VN YXAKKy0tIFJ1bm5pbmcgdGVzdCBjYXNlOiBOZXR3b3JrLlNvdXJjZU1hcC5TdHlsZXNoZWV0CitQ QVNTOiBTdHlsZXNoZWV0IFJlc291cmNlIHNob3VsZCBiZSBjcmVhdGVkLgorUEFTUzogUmVzb3Vy Y2Ugc2hvdWxkIGhhdmUgbG9hZGVkIDEgU291cmNlTWFwLgorUEFTUzogU291cmNlTWFwIHNob3Vs ZCBiZSBhIFdJLlNvdXJjZU1hcCBpbnN0YW5jZS4KKworLS0gUnVubmluZyB0ZXN0IGNhc2U6IE5l dHdvcmsuU291cmNlTWFwLlNjcmlwdAorUEFTUzogU2NyaXB0IFJlc291cmNlIHNob3VsZCBiZSBj cmVhdGVkLgorUEFTUzogUmVzb3VyY2Ugc2hvdWxkIGhhdmUgbG9hZGVkIDEgU291cmNlTWFwLgor UEFTUzogU291cmNlTWFwIHNob3VsZCBiZSBhIFdJLlNvdXJjZU1hcCBpbnN0YW5jZS4KKwpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvbmV0d29yay9zb3VyY2Ut bWFwLWxvYWRzLmh0bWwgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9uZXR3b3Jr L3NvdXJjZS1tYXAtbG9hZHMuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMC4uZmQxYTBmZWY5ZGUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rl c3RzL2luc3BlY3Rvci9uZXR3b3JrL3NvdXJjZS1tYXAtbG9hZHMuaHRtbApAQCAtMCwwICsxLDU4 IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0IHNyYz0iLi4vcmVz b3VyY2VzL2luc3BlY3Rvci10ZXN0LmpzIj48L3NjcmlwdD4KKzxzY3JpcHQ+CitmdW5jdGlvbiB0 cmlnZ2VyU3R5bGVzaGVldFJlc291cmNlKCkgeworICAgIGxldCBsaW5rID0gZG9jdW1lbnQuY3Jl YXRlRWxlbWVudCgibGluayIpOworICAgIGxpbmsucmVsID0gInN0eWxlc2hlZXQiOworICAgIGxp bmsuaHJlZiA9ICJyZXNvdXJjZXMvc3R5bGVzaGVldC13aXRoLXNvdXJjZW1hcC5jc3MiOworICAg IGRvY3VtZW50LmhlYWQuYXBwZW5kQ2hpbGQobGluayk7Cit9CisKK2Z1bmN0aW9uIHRyaWdnZXJT Y3JpcHRSZXNvdXJjZSgpIHsKKyAgICBsZXQgc2NyaXB0ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVu dCgic2NyaXB0Iik7CisgICAgc2NyaXB0LnNyYyA9ICJyZXNvdXJjZXMvc2NyaXB0LXdpdGgtc291 cmNlbWFwLmpzIjsKKyAgICBkb2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKHNjcmlwdCk7Cit9CisK K2Z1bmN0aW9uIHRlc3QoKQoreworICAgIGxldCBzdWl0ZSA9IEluc3BlY3RvclRlc3QuY3JlYXRl QXN5bmNTdWl0ZSgiTmV0d29yay5Tb3VyY2VNYXAiKTsKKworICAgIHN1aXRlLmFkZFRlc3RDYXNl KHsKKyAgICAgICAgbmFtZTogIk5ldHdvcmsuU291cmNlTWFwLlN0eWxlc2hlZXQiLAorICAgICAg ICBkZXNjcmlwdGlvbjogIkVuc3VyZSBhIHNvdXJjZSBtYXAgbG9hZHMgZm9yIGEgc3R5bGVzaGVl dCByZXNvdXJjZS4iLAorICAgICAgICBhc3luYyB0ZXN0KHJlc29sdmUsIHJlamVjdCkgeworICAg ICAgICAgICAgSW5zcGVjdG9yVGVzdC5ldmFsdWF0ZUluUGFnZShgdHJpZ2dlclN0eWxlc2hlZXRS ZXNvdXJjZSgpYCk7CisgICAgICAgICAgICBsZXQgcmVzb3VyY2VFdmVudCA9IGF3YWl0IFdJLkZy YW1lLmF3YWl0RXZlbnQoV0kuRnJhbWUuRXZlbnQuUmVzb3VyY2VXYXNBZGRlZCk7CisgICAgICAg ICAgICBsZXQgcmVzb3VyY2UgPSByZXNvdXJjZUV2ZW50LmRhdGEucmVzb3VyY2U7CisgICAgICAg ICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdFRoYXQocmVzb3VyY2UudXJsLmVuZHNXaXRoKCJzdHls ZXNoZWV0LXdpdGgtc291cmNlbWFwLmNzcyIpLCAiU3R5bGVzaGVldCBSZXNvdXJjZSBzaG91bGQg YmUgY3JlYXRlZC4iKTsKKyAgICAgICAgICAgIGxldCBzb3VyY2VNYXBFdmVudCA9IGF3YWl0IHJl c291cmNlLmF3YWl0RXZlbnQoV0kuU291cmNlQ29kZS5FdmVudC5Tb3VyY2VNYXBBZGRlZCk7Cisg ICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEVxdWFsKHJlc291cmNlLnNvdXJjZU1hcHMu bGVuZ3RoLCAxLCAiUmVzb3VyY2Ugc2hvdWxkIGhhdmUgbG9hZGVkIDEgU291cmNlTWFwLiIpOwor ICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0KHJlc291cmNlLnNvdXJjZU1hcHNb MF0gaW5zdGFuY2VvZiBXSS5Tb3VyY2VNYXAsICJTb3VyY2VNYXAgc2hvdWxkIGJlIGEgV0kuU291 cmNlTWFwIGluc3RhbmNlLiIpOworICAgICAgICB9CisgICAgfSk7CisKKyAgICBzdWl0ZS5hZGRU ZXN0Q2FzZSh7CisgICAgICAgIG5hbWU6ICJOZXR3b3JrLlNvdXJjZU1hcC5TY3JpcHQiLAorICAg ICAgICBkZXNjcmlwdGlvbjogIkVuc3VyZSBhIHNvdXJjZSBtYXAgbG9hZHMgZm9yIGEgc2NyaXB0 IHJlc291cmNlLiIsCisgICAgICAgIGFzeW5jIHRlc3QocmVzb2x2ZSwgcmVqZWN0KSB7CisgICAg ICAgICAgICBJbnNwZWN0b3JUZXN0LmV2YWx1YXRlSW5QYWdlKGB0cmlnZ2VyU2NyaXB0UmVzb3Vy Y2UoKWApOworICAgICAgICAgICAgbGV0IHJlc291cmNlRXZlbnQgPSBhd2FpdCBXSS5GcmFtZS5h d2FpdEV2ZW50KFdJLkZyYW1lLkV2ZW50LlJlc291cmNlV2FzQWRkZWQpOworICAgICAgICAgICAg bGV0IHJlc291cmNlID0gcmVzb3VyY2VFdmVudC5kYXRhLnJlc291cmNlOworICAgICAgICAgICAg SW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0KHJlc291cmNlLnVybC5lbmRzV2l0aCgic2NyaXB0LXdp dGgtc291cmNlbWFwLmpzIiksICJTY3JpcHQgUmVzb3VyY2Ugc2hvdWxkIGJlIGNyZWF0ZWQuIik7 CisgICAgICAgICAgICBsZXQgc291cmNlTWFwRXZlbnQgPSBhd2FpdCByZXNvdXJjZS5hd2FpdEV2 ZW50KFdJLlNvdXJjZUNvZGUuRXZlbnQuU291cmNlTWFwQWRkZWQpOworICAgICAgICAgICAgSW5z cGVjdG9yVGVzdC5leHBlY3RFcXVhbChyZXNvdXJjZS5zb3VyY2VNYXBzLmxlbmd0aCwgMSwgIlJl c291cmNlIHNob3VsZCBoYXZlIGxvYWRlZCAxIFNvdXJjZU1hcC4iKTsKKyAgICAgICAgICAgIElu c3BlY3RvclRlc3QuZXhwZWN0VGhhdChyZXNvdXJjZS5zb3VyY2VNYXBzWzBdIGluc3RhbmNlb2Yg V0kuU291cmNlTWFwLCAiU291cmNlTWFwIHNob3VsZCBiZSBhIFdJLlNvdXJjZU1hcCBpbnN0YW5j ZS4iKTsKKyAgICAgICAgfQorICAgIH0pOworCisgICAgc3VpdGUucnVuVGVzdENhc2VzQW5kRmlu aXNoKCk7Cit9Cis8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5IG9ubG9hZD0icnVuVGVzdCgpIj4K KzxwPkVuc3VyZSBhIHNvdXJjZSBtYXAgbG9hZHMgZm9yIHJlc291cmNlcyB3aXRoIHNvdXJjZU1h cHBpbmdVUkxzLjwvcD4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmlu ZGV4IGE5OWIzYTc4OTc4Li4xYzVkMTAxN2IyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBA IC0xLDUgKzEsMjYgQEAKIDIwMTgtMDEtMDQgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFw cGxlLmNvbT4KIAorICAgICAgICBSRUdSRVNTSU9OIChyMjI1NzA5KTogV2ViIEluc3BlY3Rvcjog Q1NTIFNvdXJjZSBtYXBzIG5vdCBsb2FkaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xODEzMTQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM2MTc3 NjIwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog VXNlckludGVyZmFjZS9Db250cm9sbGVycy9Tb3VyY2VNYXBNYW5hZ2VyLmpzOgorICAgICAgICAo V0kuU291cmNlTWFwTWFuYWdlci5wcm90b3R5cGUuX2xvYWRBbmRQYXJzZVNvdXJjZU1hcCk6Cisg ICAgICAgICogVXNlckludGVyZmFjZS9Nb2RlbHMvU291cmNlTWFwUmVzb3VyY2UuanM6CisgICAg ICAgIChXSS5Tb3VyY2VNYXBSZXNvdXJjZS5wcm90b3R5cGUucmVxdWVzdENvbnRlbnRGcm9tQmFj a2VuZCk6CisgICAgICAgIENvcnJlY3QgdGhpcyBzbyB0aGF0IHdlIG9ubHkgZmFsbCBiYWNrIHRv IGEgcmVhc29uYWJsZSBmcmFtZSBpZAorICAgICAgICBpZiB3ZSBjb3VsZG4ndCBkZXRlcm1pbmUg YSBmcmFtZSBpZCBmcm9tIGVhcmxpZXIuIFByZXZpb3VzbHkgdGhpcworICAgICAgICB3YXMgaW5j b3JyZWN0bHkgY2xlYXJpbmcgdGhlIGZyYW1lIGlkIGlmIHdlIGhhZCBnb3R0ZW4gaXQgZWFybGll ci4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVGVzdC5odG1sOgorICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVGVzdC9UZXN0LmpzOgorICAgICAgICAoV0kubG9hZGVkKToKKyAgICAgICAgQWRk IFNvdXJjZU1hcCByZWxhdGVkIGZpbGVzIGZvciB0ZXN0cy4KKworMjAxOC0wMS0wNCAgSm9zZXBo IFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6 IEZpbmQgbmV4dCAvIHByZXZpb3VzIHdpdGhpbiBhIHJlc291cmNlIGNvbnRlbnQgdmlldyBkb2Vz IG5vdCBoYXZlIGJvdW5jeSBoaWdobGlnaHQgd2hlbiBlZGl0b3Igc2Nyb2xscwogICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgxMjc5CiAgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS8zNjI5MTA5Nz4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1NvdXJjZU1hcE1hbmFnZXIuanMgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9Tb3VyY2VNYXBNYW5hZ2Vy LmpzCmluZGV4IGE1MTI0YmVjYWQ2Li43YTliZTE1ZDI3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvU291cmNlTWFwTWFuYWdlci5q cworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9T b3VyY2VNYXBNYW5hZ2VyLmpzCkBAIC0xMzYsMTAgKzEzNiw4IEBAIFdJLlNvdXJjZU1hcE1hbmFn ZXIgPSBjbGFzcyBTb3VyY2VNYXBNYW5hZ2VyIGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgIGlm IChvcmlnaW5hbFNvdXJjZUNvZGUgaW5zdGFuY2VvZiBXSS5SZXNvdXJjZSAmJiBvcmlnaW5hbFNv dXJjZUNvZGUucGFyZW50RnJhbWUpCiAgICAgICAgICAgICBmcmFtZUlkZW50aWZpZXIgPSBvcmln aW5hbFNvdXJjZUNvZGUucGFyZW50RnJhbWUuaWQ7CiAKLSAgICAgICAgaWYgKCFmcmFtZUlkZW50 aWZpZXIgJiYgV0kuZnJhbWVSZXNvdXJjZU1hbmFnZXIubWFpbkZyYW1lKQotICAgICAgICAgICAg ZnJhbWVJZGVudGlmaWVyID0gV0kuZnJhbWVSZXNvdXJjZU1hbmFnZXIubWFpbkZyYW1lLmlkOwot ICAgICAgICBlbHNlCi0gICAgICAgICAgICBmcmFtZUlkZW50aWZpZXIgPSAiIjsKKyAgICAgICAg aWYgKCFmcmFtZUlkZW50aWZpZXIpCisgICAgICAgICAgICBmcmFtZUlkZW50aWZpZXIgPSBXSS5m cmFtZVJlc291cmNlTWFuYWdlci5tYWluRnJhbWUgPyBXSS5mcmFtZVJlc291cmNlTWFuYWdlci5t YWluRnJhbWUuaWQgOiAiIjsKIAogICAgICAgICBOZXR3b3JrQWdlbnQubG9hZFJlc291cmNlKGZy YW1lSWRlbnRpZmllciwgc291cmNlTWFwVVJMLCBzb3VyY2VNYXBMb2FkZWQuYmluZCh0aGlzKSk7 CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv TW9kZWxzL1NvdXJjZU1hcFJlc291cmNlLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvTW9kZWxzL1NvdXJjZU1hcFJlc291cmNlLmpzCmluZGV4IDMwZDAwMzI5Y2MyLi5m Zjg3N2NmNzE1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvTW9kZWxzL1NvdXJjZU1hcFJlc291cmNlLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL01vZGVscy9Tb3VyY2VNYXBSZXNvdXJjZS5qcwpAQCAtMTQwLDEwICsx NDAsOCBAQCBXSS5Tb3VyY2VNYXBSZXNvdXJjZSA9IGNsYXNzIFNvdXJjZU1hcFJlc291cmNlIGV4 dGVuZHMgV0kuUmVzb3VyY2UKICAgICAgICAgaWYgKHRoaXMuX3NvdXJjZU1hcC5vcmlnaW5hbFNv dXJjZUNvZGUgaW5zdGFuY2VvZiBXSS5SZXNvdXJjZSAmJiB0aGlzLl9zb3VyY2VNYXAub3JpZ2lu YWxTb3VyY2VDb2RlLnBhcmVudEZyYW1lKQogICAgICAgICAgICAgZnJhbWVJZGVudGlmaWVyID0g dGhpcy5fc291cmNlTWFwLm9yaWdpbmFsU291cmNlQ29kZS5wYXJlbnRGcmFtZS5pZDsKIAotICAg ICAgICBpZiAoIWZyYW1lSWRlbnRpZmllciAmJiBXSS5mcmFtZVJlc291cmNlTWFuYWdlci5tYWlu RnJhbWUpCi0gICAgICAgICAgICBmcmFtZUlkZW50aWZpZXIgPSBXSS5mcmFtZVJlc291cmNlTWFu YWdlci5tYWluRnJhbWUuaWQ7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIGZyYW1lSWRlbnRp ZmllciA9ICIiOworICAgICAgICBpZiAoIWZyYW1lSWRlbnRpZmllcikKKyAgICAgICAgICAgIGZy YW1lSWRlbnRpZmllciA9IFdJLmZyYW1lUmVzb3VyY2VNYW5hZ2VyLm1haW5GcmFtZSA/IFdJLmZy YW1lUmVzb3VyY2VNYW5hZ2VyLm1haW5GcmFtZS5pZCA6ICIiOwogCiAgICAgICAgIHJldHVybiBO ZXR3b3JrQWdlbnQubG9hZFJlc291cmNlKGZyYW1lSWRlbnRpZmllciwgdGhpcy51cmwpLnRoZW4o c291cmNlTWFwUmVzb3VyY2VMb2FkZWQuYmluZCh0aGlzKSkuY2F0Y2goc291cmNlTWFwUmVzb3Vy Y2VMb2FkRXJyb3IuYmluZCh0aGlzKSk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGVzdC5odG1sIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVGVzdC5odG1sCmluZGV4IDZkYmFhODU4N2E5Li42MGZiODEyN2U0OSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGVzdC5odG1s CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Rlc3QuaHRtbApAQCAt MTg1LDYgKzE4NSw3IEBACiAgICAgPHNjcmlwdCBzcmM9Ik1vZGVscy9TaGFkZXJQcm9ncmFtLmpz Ij48L3NjcmlwdD4KICAgICA8c2NyaXB0IHNyYz0iTW9kZWxzL1NvdXJjZUNvZGVSZXZpc2lvbi5q cyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9Ik1vZGVscy9Tb3VyY2VDb2RlVGltZWxpbmUu anMiPjwvc2NyaXB0PgorICAgIDxzY3JpcHQgc3JjPSJNb2RlbHMvU291cmNlTWFwLmpzIj48L3Nj cmlwdD4KICAgICA8c2NyaXB0IHNyYz0iTW9kZWxzL1NvdXJjZU1hcFJlc291cmNlLmpzIj48L3Nj cmlwdD4KICAgICA8c2NyaXB0IHNyYz0iTW9kZWxzL1N0YWNrVHJhY2UuanMiPjwvc2NyaXB0Pgog ICAgIDxzY3JpcHQgc3JjPSJNb2RlbHMvVGV4dFJhbmdlLmpzIj48L3NjcmlwdD4KQEAgLTIxNiw2 ICsyMTcsNyBAQAogICAgIDxzY3JpcHQgc3JjPSJDb250cm9sbGVycy9NZW1vcnlNYW5hZ2VyLmpz Ij48L3NjcmlwdD4KICAgICA8c2NyaXB0IHNyYz0iQ29udHJvbGxlcnMvUHJvYmVNYW5hZ2VyLmpz Ij48L3NjcmlwdD4KICAgICA8c2NyaXB0IHNyYz0iQ29udHJvbGxlcnMvUnVudGltZU1hbmFnZXIu anMiPjwvc2NyaXB0PgorICAgIDxzY3JpcHQgc3JjPSJDb250cm9sbGVycy9Tb3VyY2VNYXBNYW5h Z2VyLmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHNyYz0iQ29udHJvbGxlcnMvU3RvcmFnZU1h bmFnZXIuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJDb250cm9sbGVycy9UYXJnZXRN YW5hZ2VyLmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHNyYz0iQ29udHJvbGxlcnMvVGltZWxp bmVNYW5hZ2VyLmpzIj48L3NjcmlwdD4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1Rlc3QvVGVzdC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1Rlc3QvVGVzdC5qcwppbmRleCBkMDFjNTgyNzUwMi4uNmVmMWUwMjAwMDYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Rlc3QvVGVzdC5q cworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UZXN0L1Rlc3QuanMK QEAgLTYwLDYgKzYwLDcgQEAgV0kubG9hZGVkID0gZnVuY3Rpb24oKQogICAgIHRoaXMubWVtb3J5 TWFuYWdlciA9IG5ldyBXSS5NZW1vcnlNYW5hZ2VyOwogICAgIHRoaXMudGltZWxpbmVNYW5hZ2Vy ID0gbmV3IFdJLlRpbWVsaW5lTWFuYWdlcjsKICAgICB0aGlzLmRlYnVnZ2VyTWFuYWdlciA9IG5l dyBXSS5EZWJ1Z2dlck1hbmFnZXI7CisgICAgdGhpcy5zb3VyY2VNYXBNYW5hZ2VyID0gbmV3IFdJ LlNvdXJjZU1hcE1hbmFnZXI7CiAgICAgdGhpcy5sYXllclRyZWVNYW5hZ2VyID0gbmV3IFdJLkxh eWVyVHJlZU1hbmFnZXI7CiAgICAgdGhpcy5wcm9iZU1hbmFnZXIgPSBuZXcgV0kuUHJvYmVNYW5h Z2VyOwogICAgIHRoaXMud29ya2VyTWFuYWdlciA9IG5ldyBXSS5Xb3JrZXJNYW5hZ2VyOwo=