200364 2019-08-01 15:14:50 -0700 Web Inspector: "Inspector.initialized" happens before breakpoints are set 2019-08-02 13:26:13 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck hi commit-queue hi inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1557771 0 joepeck 2019-08-01 15:14:50 -0700 "Inspector.initialized" happens before breakpoints are set This probably means `auto-attach` will not have breakpoints set up appropriately and would miss breakpoints. Notes: • Inspector page loading protocol log: ... [Log] Trace: request (page-338) – {id: 62, method: "Inspector.initialized"} ... [Log] Trace: request (page-338) – {id: 72, method: "Debugger.setBreakpointByUrl", params: Object} [Log] Trace: request (page-338) – {id: 74, method: "Debugger.setBreakpointByUrl", params: Object} ... 1557813 1 375370 hi 2019-08-01 17:32:42 -0700 Created attachment 375370 Patch 1558051 2 375370 joepeck 2019-08-02 12:36:19 -0700 Comment on attachment 375370 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=375370&action=review > Source/WebInspectorUI/UserInterface/Protocol/Target.js:89 > + Promise.all(Target._initializationPromises).then(() => { Would we want to assert here that `Target._initializationPromises` is not empty? We always expect at least one (Breakpoints) This assert would let us know if we change something and went too early. > Source/WebInspectorUI/UserInterface/Protocol/Target.js:145 > + promise.then(() => { > + Target._initializationPromises.remove(promise); > + }); Oh, you're removing promises from the list... probably to reduce memory. Maybe we should leave them for the assert, which seems pretty valuable. Or have an assertion: console.assert((Target._initializationPromises.length > 0) || (Target._completedInitializationPromises > 0)); And have this increment `Target._completedInitializationPromises` as well as remove the promise. That keeps removing the promises at the cost of a counter for a useful assertion. 1558064 3 375443 hi 2019-08-02 13:01:53 -0700 Created attachment 375443 Patch 1558080 4 375443 commit-queue 2019-08-02 13:25:07 -0700 Comment on attachment 375443 Patch Clearing flags on attachment: 375443 Committed r248176: <https://trac.webkit.org/changeset/248176> 1558081 5 commit-queue 2019-08-02 13:25:09 -0700 All reviewed patches have been landed. Closing bug. 1558083 6 webkit-bug-importer 2019-08-02 13:26:13 -0700 <rdar://problem/53876805> 375370 2019-08-01 17:32:42 -0700 2019-08-02 13:01:51 -0700 Patch bug-200364-20190801173241.patch text/plain 6986 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDJiOGVmZDNjM2Q0ZWFlMzU0YjI2YjMxY2FkMzJi ZDE0YWZkNTNlNGEuLjVhNTlhY2I3OTRlMmFiYzA0MTY0ZmM1NGFlYTIxMDdkZmUwNjE3NmUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE5LTA4LTAxICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiAi SW5zcGVjdG9yLmluaXRpYWxpemVkIiBoYXBwZW5zIGJlZm9yZSBicmVha3BvaW50cyBhcmUgc2V0 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDAzNjQK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbGxvdyBt YW5hZ2VycyB0byByZWdpc3RlciBhIHByb21pc2UgdGhhdCB3aWxsIGRlbGF5IGBJbnNwZWN0b3Iu aW5pdGlhbGl6ZWRgLiBUaGlzIGlzIG5lZWRlZAorICAgICAgICB3aGVuIHJlc3RvcmluZyBicmVh a3BvaW50cyBzbyB0aGF0ICJBdXRvbWF0aWNhbGx5IFNob3cgV2ViIEluc3BlY3RvciBmb3IgSlND b250ZXh0cyIgY2FuIHNldAorICAgICAgICB0aGVtIGJlZm9yZSBhbnkgc2NyaXB0cyBoYXZlIGV2 YWx1YXRlZCwgZW5zdXJpbmcgdGhhdCBubyBicmVha3BvaW50cyBhcmUgInNraXBwZWQiLgorCisg ICAgICAgICogVXNlckludGVyZmFjZS9Qcm90b2NvbC9UYXJnZXQuanM6CisgICAgICAgIChXSS5U YXJnZXQucHJvdG90eXBlLmluaXRpYWxpemUpOgorICAgICAgICAoV0kuVGFyZ2V0LnJlZ2lzdGVy SW5pdGlhbGl6YXRpb25Qcm9taXNlKTogQWRkZWQuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L0NvbnRyb2xsZXJzL0RPTURlYnVnZ2VyTWFuYWdlci5qczoKKyAgICAgICAgKFdJLkRPTURlYnVn Z2VyTWFuYWdlcik6CisgICAgICAgICogVXNlckludGVyZmFjZS9Db250cm9sbGVycy9EZWJ1Z2dl ck1hbmFnZXIuanM6CisgICAgICAgIChXSS5EZWJ1Z2dlck1hbmFnZXIpOgorCiAyMDE5LTA4LTAx ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2Vk LCByZW1vdmUgYGVtdWxhdGVVc2VyR2VzdHVyZWAgcGFyYW1ldGVyIGZyb20gYERlYnVnZ2VyLmV2 YWx1YXRlT25DYWxsRnJhbWVgIGZvciBpT1MgMTMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RPTURlYnVnZ2VyTWFuYWdlci5qcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RPTURlYnVn Z2VyTWFuYWdlci5qcwppbmRleCBkZDg4YTYzNTk0M2Q5YjQ3ZTkzODYzODM5Mjc4ODI0NDE4MGQw NzhhLi5jYmU4OGFmNjg1ZmFjODBhM2IzZDYzNWQ3MWM1YThjYTEzZjcxYjA0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9ET01EZWJ1 Z2dlck1hbmFnZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Q29udHJvbGxlcnMvRE9NRGVidWdnZXJNYW5hZ2VyLmpzCkBAIC01MywyNyArNTMsMjkgQEAgV0ku RE9NRGVidWdnZXJNYW5hZ2VyID0gY2xhc3MgRE9NRGVidWdnZXJNYW5hZ2VyIGV4dGVuZHMgV0ku T2JqZWN0CiAgICAgICAgIFdJLkZyYW1lLmFkZEV2ZW50TGlzdGVuZXIoV0kuRnJhbWUuRXZlbnQu Q2hpbGRGcmFtZVdhc1JlbW92ZWQsIHRoaXMuX2NoaWxkRnJhbWVXYXNSZW1vdmVkLCB0aGlzKTsK ICAgICAgICAgV0kuRnJhbWUuYWRkRXZlbnRMaXN0ZW5lcihXSS5GcmFtZS5FdmVudC5NYWluUmVz b3VyY2VEaWRDaGFuZ2UsIHRoaXMuX21haW5SZXNvdXJjZURpZENoYW5nZSwgdGhpcyk7CiAKLSAg ICAgICAgbGV0IGxvYWRCcmVha3BvaW50cyA9IGFzeW5jIChjb25zdHJ1Y3Rvciwgb2JqZWN0U3Rv cmUsIG9sZFNldHRpbmdzLCBjYWxsYmFjaykgPT4gewotICAgICAgICAgICAgZm9yIChsZXQga2V5 IG9mIG9sZFNldHRpbmdzKSB7Ci0gICAgICAgICAgICAgICAgbGV0IGV4aXN0aW5nU2VyaWFsaXpl ZEJyZWFrcG9pbnRzID0gV0kuU2V0dGluZy5taWdyYXRlVmFsdWUoa2V5KTsKLSAgICAgICAgICAg ICAgICBpZiAoZXhpc3RpbmdTZXJpYWxpemVkQnJlYWtwb2ludHMpIHsKLSAgICAgICAgICAgICAg ICAgICAgZm9yIChsZXQgZXhpc3RpbmdTZXJpYWxpemVkQnJlYWtwb2ludCBvZiBleGlzdGluZ1Nl cmlhbGl6ZWRCcmVha3BvaW50cykKLSAgICAgICAgICAgICAgICAgICAgICAgIGF3YWl0IG9iamVj dFN0b3JlLnB1dE9iamVjdChjb25zdHJ1Y3Rvci5kZXNlcmlhbGl6ZShleGlzdGluZ1NlcmlhbGl6 ZWRCcmVha3BvaW50KSk7CisgICAgICAgIGxldCBsb2FkQnJlYWtwb2ludHMgPSAoY29uc3RydWN0 b3IsIG9iamVjdFN0b3JlLCBvbGRTZXR0aW5ncywgY2FsbGJhY2spID0+IHsKKyAgICAgICAgICAg IFdJLlRhcmdldC5yZWdpc3RlckluaXRpYWxpemF0aW9uUHJvbWlzZSgoYXN5bmMgKCkgPT4gewor ICAgICAgICAgICAgICAgIGZvciAobGV0IGtleSBvZiBvbGRTZXR0aW5ncykgeworICAgICAgICAg ICAgICAgICAgICBsZXQgZXhpc3RpbmdTZXJpYWxpemVkQnJlYWtwb2ludHMgPSBXSS5TZXR0aW5n Lm1pZ3JhdGVWYWx1ZShrZXkpOworICAgICAgICAgICAgICAgICAgICBpZiAoZXhpc3RpbmdTZXJp YWxpemVkQnJlYWtwb2ludHMpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIGZvciAobGV0IGV4 aXN0aW5nU2VyaWFsaXplZEJyZWFrcG9pbnQgb2YgZXhpc3RpbmdTZXJpYWxpemVkQnJlYWtwb2lu dHMpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgYXdhaXQgb2JqZWN0U3RvcmUucHV0T2Jq ZWN0KGNvbnN0cnVjdG9yLmRlc2VyaWFsaXplKGV4aXN0aW5nU2VyaWFsaXplZEJyZWFrcG9pbnQp KTsKKyAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAg IH0KIAotICAgICAgICAgICAgbGV0IHNlcmlhbGl6ZWRCcmVha3BvaW50cyA9IGF3YWl0IG9iamVj dFN0b3JlLmdldEFsbCgpOworICAgICAgICAgICAgICAgIGxldCBzZXJpYWxpemVkQnJlYWtwb2lu dHMgPSBhd2FpdCBvYmplY3RTdG9yZS5nZXRBbGwoKTsKIAotICAgICAgICAgICAgdGhpcy5fcmVz dG9yaW5nQnJlYWtwb2ludHMgPSB0cnVlOwotICAgICAgICAgICAgZm9yIChsZXQgc2VyaWFsaXpl ZEJyZWFrcG9pbnQgb2Ygc2VyaWFsaXplZEJyZWFrcG9pbnRzKSB7Ci0gICAgICAgICAgICAgICAg bGV0IGJyZWFrcG9pbnQgPSBjb25zdHJ1Y3Rvci5kZXNlcmlhbGl6ZShzZXJpYWxpemVkQnJlYWtw b2ludCk7CisgICAgICAgICAgICAgICAgdGhpcy5fcmVzdG9yaW5nQnJlYWtwb2ludHMgPSB0cnVl OworICAgICAgICAgICAgICAgIGZvciAobGV0IHNlcmlhbGl6ZWRCcmVha3BvaW50IG9mIHNlcmlh bGl6ZWRCcmVha3BvaW50cykgeworICAgICAgICAgICAgICAgICAgICBsZXQgYnJlYWtwb2ludCA9 IGNvbnN0cnVjdG9yLmRlc2VyaWFsaXplKHNlcmlhbGl6ZWRCcmVha3BvaW50KTsKIAotICAgICAg ICAgICAgICAgIGNvbnN0IGtleSA9IG51bGw7Ci0gICAgICAgICAgICAgICAgb2JqZWN0U3RvcmUu YXNzb2NpYXRlT2JqZWN0KGJyZWFrcG9pbnQsIGtleSwgc2VyaWFsaXplZEJyZWFrcG9pbnQpOwor ICAgICAgICAgICAgICAgICAgICBjb25zdCBrZXkgPSBudWxsOworICAgICAgICAgICAgICAgICAg ICBvYmplY3RTdG9yZS5hc3NvY2lhdGVPYmplY3QoYnJlYWtwb2ludCwga2V5LCBzZXJpYWxpemVk QnJlYWtwb2ludCk7CiAKLSAgICAgICAgICAgICAgICBjYWxsYmFjayhicmVha3BvaW50KTsKLSAg ICAgICAgICAgIH0KLSAgICAgICAgICAgIHRoaXMuX3Jlc3RvcmluZ0JyZWFrcG9pbnRzID0gZmFs c2U7CisgICAgICAgICAgICAgICAgICAgIGNhbGxiYWNrKGJyZWFrcG9pbnQpOworICAgICAgICAg ICAgICAgIH0KKyAgICAgICAgICAgICAgICB0aGlzLl9yZXN0b3JpbmdCcmVha3BvaW50cyA9IGZh bHNlOworICAgICAgICAgICAgfSkoKSk7CiAgICAgICAgIH07CiAKICAgICAgICAgaWYgKHRoaXMu c3VwcG9ydGVkKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9Db250cm9sbGVycy9EZWJ1Z2dlck1hbmFnZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9EZWJ1Z2dlck1hbmFnZXIuanMKaW5kZXggMGVj ZDYwMWJkOTY4ZDE5NTM3OWU5YTU1OTBjMzc1MGIyYzA2YTQ4NC4uYTk4NDZlNWI0NTYwZWU3NGY1 MjY2OWQxZDA2ZWY3OTY4NGQ1NDg5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRGVidWdnZXJNYW5hZ2VyLmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RlYnVnZ2VyTWFuYWdl ci5qcwpAQCAtMTA1LDcgKzEwNSw3IEBAIFdJLkRlYnVnZ2VyTWFuYWdlciA9IGNsYXNzIERlYnVn Z2VyTWFuYWdlciBleHRlbmRzIFdJLk9iamVjdAogCiAgICAgICAgIHRoaXMuX2lnbm9yZUJyZWFr cG9pbnREaXNwbGF5TG9jYXRpb25EaWRDaGFuZ2VFdmVudCA9IGZhbHNlOwogCi0gICAgICAgIChh c3luYyAoKSA9PiB7CisgICAgICAgIFdJLlRhcmdldC5yZWdpc3RlckluaXRpYWxpemF0aW9uUHJv bWlzZSgoYXN5bmMgKCkgPT4gewogICAgICAgICAgICAgbGV0IGV4aXN0aW5nU2VyaWFsaXplZEJy ZWFrcG9pbnRzID0gV0kuU2V0dGluZy5taWdyYXRlVmFsdWUoImJyZWFrcG9pbnRzIik7CiAgICAg ICAgICAgICBpZiAoZXhpc3RpbmdTZXJpYWxpemVkQnJlYWtwb2ludHMpIHsKICAgICAgICAgICAg ICAgICBmb3IgKGxldCBleGlzdGluZ1NlcmlhbGl6ZWRCcmVha3BvaW50IG9mIGV4aXN0aW5nU2Vy aWFsaXplZEJyZWFrcG9pbnRzKQpAQCAtMTI0LDcgKzEyNCw3IEBAIFdJLkRlYnVnZ2VyTWFuYWdl ciA9IGNsYXNzIERlYnVnZ2VyTWFuYWdlciBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICAgICAg ICAgIHRoaXMuYWRkQnJlYWtwb2ludChicmVha3BvaW50KTsKICAgICAgICAgICAgIH0KICAgICAg ICAgICAgIHRoaXMuX3Jlc3RvcmluZ0JyZWFrcG9pbnRzID0gZmFsc2U7Ci0gICAgICAgIH0pKCk7 CisgICAgICAgIH0pKCkpOwogICAgIH0KIAogICAgIC8vIFRhcmdldApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvVGFyZ2V0LmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvVGFyZ2V0LmpzCmluZGV4 IDg1YWIwNThmYjQ0MTQ1OTFlYTc0Y2E5MDIzNTA1YzczZTMzNjQwYWYuLjUwMmUyMjQzMDA5OGMz NjhjMzMzMDU5ODA0NDU5ZWJjNmI1NWQ2YWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL1RhcmdldC5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9UYXJnZXQuanMKQEAgLTg2LDcgKzg2LDcg QEAgV0kuVGFyZ2V0ID0gY2xhc3MgVGFyZ2V0IGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgICAg ICBXSS5wZXJmb3JtT25lVGltZUZyb250ZW5kSW5pdGlhbGl6YXRpb25zVXNpbmdUYXJnZXQodGhp cyk7CiAgICAgICAgIH0pOwogCi0gICAgICAgIHNldFRpbWVvdXQoKCkgPT4geworICAgICAgICBQ cm9taXNlLmFsbChUYXJnZXQuX2luaXRpYWxpemF0aW9uUHJvbWlzZXMpLnRoZW4oKCkgPT4gewog ICAgICAgICAgICAgLy8gVGVsbCB0aGUgYmFja2VuZCB3ZSBhcmUgaW5pdGlhbGl6ZWQgYWZ0ZXIg YWxsIG91ciBpbml0aWFsaXphdGlvbiBtZXNzYWdlcyBoYXZlIGJlZW4gc2VudC4KICAgICAgICAg ICAgIC8vIFRoaXMgYWxsb3dzIGFuIGF1dG9tYXRpY2FsbHkgcGF1c2VkIGJhY2tlbmQgdG8gcmVz dW1lIGV4ZWN1dGlvbiwgYnV0IHdlIHdhbnQgdG8gZW5zdXJlCiAgICAgICAgICAgICAvLyBvdXIg YnJlYWtwb2ludHMgd2VyZSBhbHJlYWR5IHNlbnQgdG8gdGhhdCBiYWNrZW5kLgpAQCAtMTMxLDYg KzEzMSwyMCBAQCBXSS5UYXJnZXQgPSBjbGFzcyBUYXJnZXQgZXh0ZW5kcyBXSS5PYmplY3QKICAg ICBnZXQgVGltZWxpbmVBZ2VudCgpIHsgcmV0dXJuIHRoaXMuX2FnZW50cy5UaW1lbGluZTsgfQog ICAgIGdldCBXb3JrZXJBZ2VudCgpIHsgcmV0dXJuIHRoaXMuX2FnZW50cy5Xb3JrZXI7IH0KIAor ICAgIC8vIFN0YXRpYworCisgICAgc3RhdGljIHJlZ2lzdGVySW5pdGlhbGl6YXRpb25Qcm9taXNl KHByb21pc2UpCisgICAgeworICAgICAgICAvLyBUaGlzIGNhbiBiZSBjYWxsZWQgZm9yIHdvcmsg dGhhdCBoYXMgdG8gYmUgZG9uZSBiZWZvcmUgYEluc3BlY3Rvci5pbml0aWFsaXplZGAgaXMgY2Fs bGVkLgorICAgICAgICAvLyBTaG91bGQgb25seSBiZSBjYWxsZWQgYmVmb3JlIHRoZSBmaXJzdCB0 YXJnZXQgaXMgY3JlYXRlZC4KKworICAgICAgICBUYXJnZXQuX2luaXRpYWxpemF0aW9uUHJvbWlz ZXMucHVzaChwcm9taXNlKTsKKworICAgICAgICBwcm9taXNlLnRoZW4oKCkgPT4geworICAgICAg ICAgICAgVGFyZ2V0Ll9pbml0aWFsaXphdGlvblByb21pc2VzLnJlbW92ZShwcm9taXNlKTsKKyAg ICAgICAgfSk7CisgICAgfQorCiAgICAgLy8gUHVibGljCiAKICAgICBnZXQgaWRlbnRpZmllcigp IHsgcmV0dXJuIHRoaXMuX2lkZW50aWZpZXI7IH0KQEAgLTIxNSwzICsyMjksNSBAQCBXSS5UYXJn ZXQuRXZlbnQgPSB7CiAgICAgUmVzb3VyY2VBZGRlZDogInRhcmdldC1yZXNvdXJjZS1hZGRlZCIs CiAgICAgU2NyaXB0QWRkZWQ6ICJ0YXJnZXQtc2NyaXB0LWFkZGVkIiwKIH07CisKK1dJLlRhcmdl dC5faW5pdGlhbGl6YXRpb25Qcm9taXNlcyA9IFtdOwo= 375443 2019-08-02 13:01:53 -0700 2019-08-02 13:25:07 -0700 Patch bug-200364-20190802130152.patch text/plain 7282 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDJiOGVmZDNjM2Q0ZWFlMzU0YjI2YjMxY2FkMzJi ZDE0YWZkNTNlNGEuLjE2ZDQ3YmQ1OGMxMWI4NDgzOWI4MzRiNTJmYjQ1ZDU3NWI2ZWEzYWYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE5LTA4LTAyICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiAi SW5zcGVjdG9yLmluaXRpYWxpemVkIiBoYXBwZW5zIGJlZm9yZSBicmVha3BvaW50cyBhcmUgc2V0 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDAzNjQK KworICAgICAgICBSZXZpZXdlZCBieSBKb3NlcGggUGVjb3Jhcm8uCisKKyAgICAgICAgQWxsb3cg bWFuYWdlcnMgdG8gcmVnaXN0ZXIgYSBwcm9taXNlIHRoYXQgd2lsbCBkZWxheSBgSW5zcGVjdG9y LmluaXRpYWxpemVkYC4gVGhpcyBpcyBuZWVkZWQKKyAgICAgICAgd2hlbiByZXN0b3JpbmcgYnJl YWtwb2ludHMgc28gdGhhdCAiQXV0b21hdGljYWxseSBTaG93IFdlYiBJbnNwZWN0b3IgZm9yIEpT Q29udGV4dHMiIGNhbiBzZXQKKyAgICAgICAgdGhlbSBiZWZvcmUgYW55IHNjcmlwdHMgaGF2ZSBl dmFsdWF0ZWQsIGVuc3VyaW5nIHRoYXQgbm8gYnJlYWtwb2ludHMgYXJlICJza2lwcGVkIi4KKwor ICAgICAgICAqIFVzZXJJbnRlcmZhY2UvUHJvdG9jb2wvVGFyZ2V0LmpzOgorICAgICAgICAoV0ku VGFyZ2V0LnByb3RvdHlwZS5pbml0aWFsaXplKToKKyAgICAgICAgKFdJLlRhcmdldC5yZWdpc3Rl ckluaXRpYWxpemF0aW9uUHJvbWlzZSk6IEFkZGVkLgorCisgICAgICAgICogVXNlckludGVyZmFj ZS9Db250cm9sbGVycy9ET01EZWJ1Z2dlck1hbmFnZXIuanM6CisgICAgICAgIChXSS5ET01EZWJ1 Z2dlck1hbmFnZXIpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRGVidWdn ZXJNYW5hZ2VyLmpzOgorICAgICAgICAoV0kuRGVidWdnZXJNYW5hZ2VyKToKKwogMjAxOS0wOC0w MSAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdl ZCwgcmVtb3ZlIGBlbXVsYXRlVXNlckdlc3R1cmVgIHBhcmFtZXRlciBmcm9tIGBEZWJ1Z2dlci5l dmFsdWF0ZU9uQ2FsbEZyYW1lYCBmb3IgaU9TIDEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9ET01EZWJ1Z2dlck1hbmFnZXIuanMg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9ET01EZWJ1 Z2dlck1hbmFnZXIuanMKaW5kZXggZGQ4OGE2MzU5NDNkOWI0N2U5Mzg2MzgzOTI3ODgyNDQxODBk MDc4YS4uY2JlODhhZjY4NWZhYzgwYTNiM2Q2MzVkNzFjNWE4Y2ExM2Y3MWIwNCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRE9NRGVi dWdnZXJNYW5hZ2VyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L0NvbnRyb2xsZXJzL0RPTURlYnVnZ2VyTWFuYWdlci5qcwpAQCAtNTMsMjcgKzUzLDI5IEBAIFdJ LkRPTURlYnVnZ2VyTWFuYWdlciA9IGNsYXNzIERPTURlYnVnZ2VyTWFuYWdlciBleHRlbmRzIFdJ Lk9iamVjdAogICAgICAgICBXSS5GcmFtZS5hZGRFdmVudExpc3RlbmVyKFdJLkZyYW1lLkV2ZW50 LkNoaWxkRnJhbWVXYXNSZW1vdmVkLCB0aGlzLl9jaGlsZEZyYW1lV2FzUmVtb3ZlZCwgdGhpcyk7 CiAgICAgICAgIFdJLkZyYW1lLmFkZEV2ZW50TGlzdGVuZXIoV0kuRnJhbWUuRXZlbnQuTWFpblJl c291cmNlRGlkQ2hhbmdlLCB0aGlzLl9tYWluUmVzb3VyY2VEaWRDaGFuZ2UsIHRoaXMpOwogCi0g ICAgICAgIGxldCBsb2FkQnJlYWtwb2ludHMgPSBhc3luYyAoY29uc3RydWN0b3IsIG9iamVjdFN0 b3JlLCBvbGRTZXR0aW5ncywgY2FsbGJhY2spID0+IHsKLSAgICAgICAgICAgIGZvciAobGV0IGtl eSBvZiBvbGRTZXR0aW5ncykgewotICAgICAgICAgICAgICAgIGxldCBleGlzdGluZ1NlcmlhbGl6 ZWRCcmVha3BvaW50cyA9IFdJLlNldHRpbmcubWlncmF0ZVZhbHVlKGtleSk7Ci0gICAgICAgICAg ICAgICAgaWYgKGV4aXN0aW5nU2VyaWFsaXplZEJyZWFrcG9pbnRzKSB7Ci0gICAgICAgICAgICAg ICAgICAgIGZvciAobGV0IGV4aXN0aW5nU2VyaWFsaXplZEJyZWFrcG9pbnQgb2YgZXhpc3RpbmdT ZXJpYWxpemVkQnJlYWtwb2ludHMpCi0gICAgICAgICAgICAgICAgICAgICAgICBhd2FpdCBvYmpl Y3RTdG9yZS5wdXRPYmplY3QoY29uc3RydWN0b3IuZGVzZXJpYWxpemUoZXhpc3RpbmdTZXJpYWxp emVkQnJlYWtwb2ludCkpOworICAgICAgICBsZXQgbG9hZEJyZWFrcG9pbnRzID0gKGNvbnN0cnVj dG9yLCBvYmplY3RTdG9yZSwgb2xkU2V0dGluZ3MsIGNhbGxiYWNrKSA9PiB7CisgICAgICAgICAg ICBXSS5UYXJnZXQucmVnaXN0ZXJJbml0aWFsaXphdGlvblByb21pc2UoKGFzeW5jICgpID0+IHsK KyAgICAgICAgICAgICAgICBmb3IgKGxldCBrZXkgb2Ygb2xkU2V0dGluZ3MpIHsKKyAgICAgICAg ICAgICAgICAgICAgbGV0IGV4aXN0aW5nU2VyaWFsaXplZEJyZWFrcG9pbnRzID0gV0kuU2V0dGlu Zy5taWdyYXRlVmFsdWUoa2V5KTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKGV4aXN0aW5nU2Vy aWFsaXplZEJyZWFrcG9pbnRzKSB7CisgICAgICAgICAgICAgICAgICAgICAgICBmb3IgKGxldCBl eGlzdGluZ1NlcmlhbGl6ZWRCcmVha3BvaW50IG9mIGV4aXN0aW5nU2VyaWFsaXplZEJyZWFrcG9p bnRzKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgIGF3YWl0IG9iamVjdFN0b3JlLnB1dE9i amVjdChjb25zdHJ1Y3Rvci5kZXNlcmlhbGl6ZShleGlzdGluZ1NlcmlhbGl6ZWRCcmVha3BvaW50 KSk7CisgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAg ICB9CiAKLSAgICAgICAgICAgIGxldCBzZXJpYWxpemVkQnJlYWtwb2ludHMgPSBhd2FpdCBvYmpl Y3RTdG9yZS5nZXRBbGwoKTsKKyAgICAgICAgICAgICAgICBsZXQgc2VyaWFsaXplZEJyZWFrcG9p bnRzID0gYXdhaXQgb2JqZWN0U3RvcmUuZ2V0QWxsKCk7CiAKLSAgICAgICAgICAgIHRoaXMuX3Jl c3RvcmluZ0JyZWFrcG9pbnRzID0gdHJ1ZTsKLSAgICAgICAgICAgIGZvciAobGV0IHNlcmlhbGl6 ZWRCcmVha3BvaW50IG9mIHNlcmlhbGl6ZWRCcmVha3BvaW50cykgewotICAgICAgICAgICAgICAg IGxldCBicmVha3BvaW50ID0gY29uc3RydWN0b3IuZGVzZXJpYWxpemUoc2VyaWFsaXplZEJyZWFr cG9pbnQpOworICAgICAgICAgICAgICAgIHRoaXMuX3Jlc3RvcmluZ0JyZWFrcG9pbnRzID0gdHJ1 ZTsKKyAgICAgICAgICAgICAgICBmb3IgKGxldCBzZXJpYWxpemVkQnJlYWtwb2ludCBvZiBzZXJp YWxpemVkQnJlYWtwb2ludHMpIHsKKyAgICAgICAgICAgICAgICAgICAgbGV0IGJyZWFrcG9pbnQg PSBjb25zdHJ1Y3Rvci5kZXNlcmlhbGl6ZShzZXJpYWxpemVkQnJlYWtwb2ludCk7CiAKLSAgICAg ICAgICAgICAgICBjb25zdCBrZXkgPSBudWxsOwotICAgICAgICAgICAgICAgIG9iamVjdFN0b3Jl LmFzc29jaWF0ZU9iamVjdChicmVha3BvaW50LCBrZXksIHNlcmlhbGl6ZWRCcmVha3BvaW50KTsK KyAgICAgICAgICAgICAgICAgICAgY29uc3Qga2V5ID0gbnVsbDsKKyAgICAgICAgICAgICAgICAg ICAgb2JqZWN0U3RvcmUuYXNzb2NpYXRlT2JqZWN0KGJyZWFrcG9pbnQsIGtleSwgc2VyaWFsaXpl ZEJyZWFrcG9pbnQpOwogCi0gICAgICAgICAgICAgICAgY2FsbGJhY2soYnJlYWtwb2ludCk7Ci0g ICAgICAgICAgICB9Ci0gICAgICAgICAgICB0aGlzLl9yZXN0b3JpbmdCcmVha3BvaW50cyA9IGZh bHNlOworICAgICAgICAgICAgICAgICAgICBjYWxsYmFjayhicmVha3BvaW50KTsKKyAgICAgICAg ICAgICAgICB9CisgICAgICAgICAgICAgICAgdGhpcy5fcmVzdG9yaW5nQnJlYWtwb2ludHMgPSBm YWxzZTsKKyAgICAgICAgICAgIH0pKCkpOwogICAgICAgICB9OwogCiAgICAgICAgIGlmICh0aGlz LnN1cHBvcnRlZCkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvQ29udHJvbGxlcnMvRGVidWdnZXJNYW5hZ2VyLmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRGVidWdnZXJNYW5hZ2VyLmpzCmluZGV4IDBl Y2Q2MDFiZDk2OGQxOTUzNzllOWE1NTkwYzM3NTBiMmMwNmE0ODQuLmE5ODQ2ZTViNDU2MGVlNzRm NTI2NjlkMWQwNmVmNzk2ODRkNTQ4OTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RlYnVnZ2VyTWFuYWdlci5qcworKysgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9EZWJ1Z2dlck1hbmFn ZXIuanMKQEAgLTEwNSw3ICsxMDUsNyBAQCBXSS5EZWJ1Z2dlck1hbmFnZXIgPSBjbGFzcyBEZWJ1 Z2dlck1hbmFnZXIgZXh0ZW5kcyBXSS5PYmplY3QKIAogICAgICAgICB0aGlzLl9pZ25vcmVCcmVh a3BvaW50RGlzcGxheUxvY2F0aW9uRGlkQ2hhbmdlRXZlbnQgPSBmYWxzZTsKIAotICAgICAgICAo YXN5bmMgKCkgPT4geworICAgICAgICBXSS5UYXJnZXQucmVnaXN0ZXJJbml0aWFsaXphdGlvblBy b21pc2UoKGFzeW5jICgpID0+IHsKICAgICAgICAgICAgIGxldCBleGlzdGluZ1NlcmlhbGl6ZWRC cmVha3BvaW50cyA9IFdJLlNldHRpbmcubWlncmF0ZVZhbHVlKCJicmVha3BvaW50cyIpOwogICAg ICAgICAgICAgaWYgKGV4aXN0aW5nU2VyaWFsaXplZEJyZWFrcG9pbnRzKSB7CiAgICAgICAgICAg ICAgICAgZm9yIChsZXQgZXhpc3RpbmdTZXJpYWxpemVkQnJlYWtwb2ludCBvZiBleGlzdGluZ1Nl cmlhbGl6ZWRCcmVha3BvaW50cykKQEAgLTEyNCw3ICsxMjQsNyBAQCBXSS5EZWJ1Z2dlck1hbmFn ZXIgPSBjbGFzcyBEZWJ1Z2dlck1hbmFnZXIgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgICAg ICAgICB0aGlzLmFkZEJyZWFrcG9pbnQoYnJlYWtwb2ludCk7CiAgICAgICAgICAgICB9CiAgICAg ICAgICAgICB0aGlzLl9yZXN0b3JpbmdCcmVha3BvaW50cyA9IGZhbHNlOwotICAgICAgICB9KSgp OworICAgICAgICB9KSgpKTsKICAgICB9CiAKICAgICAvLyBUYXJnZXQKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL1RhcmdldC5qcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL1RhcmdldC5qcwppbmRl eCA4NWFiMDU4ZmI0NDE0NTkxZWE3NGNhOTAyMzUwNWM3M2UzMzY0MGFmLi4yMDMzNDEwYTZiNTMz NThlYjdjYTkyNTEzMTc1ZDMxMmFhZDFhNDQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9UYXJnZXQuanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvVGFyZ2V0LmpzCkBAIC04Niw3ICs4Niw4 IEBAIFdJLlRhcmdldCA9IGNsYXNzIFRhcmdldCBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICAg ICAgV0kucGVyZm9ybU9uZVRpbWVGcm9udGVuZEluaXRpYWxpemF0aW9uc1VzaW5nVGFyZ2V0KHRo aXMpOwogICAgICAgICB9KTsKIAotICAgICAgICBzZXRUaW1lb3V0KCgpID0+IHsKKyAgICAgICAg Y29uc29sZS5hc3NlcnQoVGFyZ2V0Ll9pbml0aWFsaXphdGlvblByb21pc2VzLmxlbmd0aCB8fCBU YXJnZXQuX2NvbXBsZXRlZEluaXRpYWxpemF0aW9uUHJvbWlzZUNvdW50KTsKKyAgICAgICAgUHJv bWlzZS5hbGwoVGFyZ2V0Ll9pbml0aWFsaXphdGlvblByb21pc2VzKS50aGVuKCgpID0+IHsKICAg ICAgICAgICAgIC8vIFRlbGwgdGhlIGJhY2tlbmQgd2UgYXJlIGluaXRpYWxpemVkIGFmdGVyIGFs bCBvdXIgaW5pdGlhbGl6YXRpb24gbWVzc2FnZXMgaGF2ZSBiZWVuIHNlbnQuCiAgICAgICAgICAg ICAvLyBUaGlzIGFsbG93cyBhbiBhdXRvbWF0aWNhbGx5IHBhdXNlZCBiYWNrZW5kIHRvIHJlc3Vt ZSBleGVjdXRpb24sIGJ1dCB3ZSB3YW50IHRvIGVuc3VyZQogICAgICAgICAgICAgLy8gb3VyIGJy ZWFrcG9pbnRzIHdlcmUgYWxyZWFkeSBzZW50IHRvIHRoYXQgYmFja2VuZC4KQEAgLTEzMSw2ICsx MzIsMjIgQEAgV0kuVGFyZ2V0ID0gY2xhc3MgVGFyZ2V0IGV4dGVuZHMgV0kuT2JqZWN0CiAgICAg Z2V0IFRpbWVsaW5lQWdlbnQoKSB7IHJldHVybiB0aGlzLl9hZ2VudHMuVGltZWxpbmU7IH0KICAg ICBnZXQgV29ya2VyQWdlbnQoKSB7IHJldHVybiB0aGlzLl9hZ2VudHMuV29ya2VyOyB9CiAKKyAg ICAvLyBTdGF0aWMKKworICAgIHN0YXRpYyByZWdpc3RlckluaXRpYWxpemF0aW9uUHJvbWlzZShw cm9taXNlKQorICAgIHsKKyAgICAgICAgLy8gVGhpcyBjYW4gYmUgY2FsbGVkIGZvciB3b3JrIHRo YXQgaGFzIHRvIGJlIGRvbmUgYmVmb3JlIGBJbnNwZWN0b3IuaW5pdGlhbGl6ZWRgIGlzIGNhbGxl ZC4KKyAgICAgICAgLy8gU2hvdWxkIG9ubHkgYmUgY2FsbGVkIGJlZm9yZSB0aGUgZmlyc3QgdGFy Z2V0IGlzIGNyZWF0ZWQuCisgICAgICAgIGNvbnNvbGUuYXNzZXJ0KCFUYXJnZXQuX2NvbXBsZXRl ZEluaXRpYWxpemF0aW9uUHJvbWlzZUNvdW50KTsKKworICAgICAgICBUYXJnZXQuX2luaXRpYWxp emF0aW9uUHJvbWlzZXMucHVzaChwcm9taXNlKTsKKworICAgICAgICBwcm9taXNlLnRoZW4oKCkg PT4geworICAgICAgICAgICAgKytUYXJnZXQuX2NvbXBsZXRlZEluaXRpYWxpemF0aW9uUHJvbWlz ZUNvdW50OworICAgICAgICAgICAgVGFyZ2V0Ll9pbml0aWFsaXphdGlvblByb21pc2VzLnJlbW92 ZShwcm9taXNlKTsKKyAgICAgICAgfSk7CisgICAgfQorCiAgICAgLy8gUHVibGljCiAKICAgICBn ZXQgaWRlbnRpZmllcigpIHsgcmV0dXJuIHRoaXMuX2lkZW50aWZpZXI7IH0KQEAgLTIxNSwzICsy MzIsNiBAQCBXSS5UYXJnZXQuRXZlbnQgPSB7CiAgICAgUmVzb3VyY2VBZGRlZDogInRhcmdldC1y ZXNvdXJjZS1hZGRlZCIsCiAgICAgU2NyaXB0QWRkZWQ6ICJ0YXJnZXQtc2NyaXB0LWFkZGVkIiwK IH07CisKK1dJLlRhcmdldC5faW5pdGlhbGl6YXRpb25Qcm9taXNlcyA9IFtdOworV0kuVGFyZ2V0 Ll9jb21wbGV0ZWRJbml0aWFsaXphdGlvblByb21pc2VDb3VudCA9IDA7Cg==