198932 2019-06-17 13:56:31 -0700 Web Inspector: Debugger: adding a DOM/Event/URL breakpoint should enable breakpoints 2019-06-17 16:45:06 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi commit-queue hi inspector-bugzilla-changes mattbaker webkit-bug-importer oldest_to_newest 1545388 0 hi 2019-06-17 13:56:31 -0700 # STEPS TO REPRODUCE: 1. inspect any page 2. disable breakpoints (navigation sidebar of Debugger/Sources tab) 3. create an Event/URL breakpoint => breakpoint starts out disabled 1545393 1 372272 hi 2019-06-17 14:24:22 -0700 Created attachment 372272 Patch 1545418 2 mattbaker 2019-06-17 15:26:03 -0700 I'm not sure about this. What about the following scenario: 1. I disable breakpoints. Maybe a long running script kept pausing on some existing breakpoints, and interrupting my work. 2. I add a URL or event breakpoint. 3. This causes breakpoints to be enabled => Debugger pauses on one of my other breakpoints, interrupting me If a user disables breakpoints globally, we should respect it until they turn it back on. We already provide a warning to surface this state. 1545425 3 hi 2019-06-17 15:41:50 -0700 (In reply to Matt Baker from comment #2) > I'm not sure about this. What about the following scenario: > > 1. I disable breakpoints. Maybe a long running script kept pausing on some existing breakpoints, and interrupting my work. > 2. I add a URL or event breakpoint. > 3. This causes breakpoints to be enabled > => Debugger pauses on one of my other breakpoints, interrupting me > > If a user disables breakpoints globally, we should respect it until they turn it back on. We already provide a warning to surface this state. This patch matches the behavior of regular breakpoints, which enable breakpoints globally when a new breakpoint is set or an existing breakpoint is enabled. If I'm setting a new breakpoint, it's likely the case that I'm going to soon thereafter trigger that breakpoint, and having to click twice (once to set the new breakpoint and once again to enable breakpoints globally) would be annoying. Another issue is that if I'm setting a DOM breakpoint or specific event listener breakpoint via the Node sidebar, there's no banner in the Elements tab that says "breakpoints disabled". I don't think we should add one anywhere in that tab either, as that's just "out of place" (DOM/elements vs JavaScript/debugging). Currently, setting a DOM breakpoint or a specific event listener breakpoint would basically "silently fail" (which is something that I got quite aggravated about earlier, hence this bug). I agree that the situation you describe isn't ideal, but I think the rest of the situations I've described here would have a much better experience with this change. 1545426 4 372281 hi 2019-06-17 15:44:56 -0700 Created attachment 372281 Patch 1545431 5 mattbaker 2019-06-17 15:56:38 -0700 (In reply to Devin Rousso from comment #3) > (In reply to Matt Baker from comment #2) > > I'm not sure about this. What about the following scenario: > > > > 1. I disable breakpoints. Maybe a long running script kept pausing on some existing breakpoints, and interrupting my work. > > 2. I add a URL or event breakpoint. > > 3. This causes breakpoints to be enabled > > => Debugger pauses on one of my other breakpoints, interrupting me > > > > If a user disables breakpoints globally, we should respect it until they turn it back on. We already provide a warning to surface this state. > This patch matches the behavior of regular breakpoints, which enable > breakpoints globally when a new breakpoint is set or an existing breakpoint > is enabled. I agree we should definitely be consistent across all our breakpoint types. I didn't know this also happened when enabling a breakpoint. > If I'm setting a new breakpoint, it's likely the case that I'm going to soon > thereafter trigger that breakpoint, and having to click twice (once to set > the new breakpoint and once again to enable breakpoints globally) would be > annoying. > > Another issue is that if I'm setting a DOM breakpoint or specific event > listener breakpoint via the Node sidebar, there's no banner in the Elements > tab that says "breakpoints disabled". I don't think we should add one > anywhere in that tab either, as that's just "out of place" (DOM/elements vs > JavaScript/debugging). Currently, setting a DOM breakpoint or a specific > event listener breakpoint would basically "silently fail" (which is > something that I got quite aggravated about earlier, hence this bug). Good point. > I agree that the situation you describe isn't ideal, but I think the rest of > the situations I've described here would have a much better experience with > this change. The situation I described was a hypothetical, and since we have established an existing behavior with script breakpoints let's go ahead! 1545432 6 372281 mattbaker 2019-06-17 15:58:41 -0700 Comment on attachment 372281 Patch r=me. Nice detailed explanation in the change log. 1545463 7 372281 commit-queue 2019-06-17 16:42:47 -0700 Comment on attachment 372281 Patch Clearing flags on attachment: 372281 Committed r246523: <https://trac.webkit.org/changeset/246523> 1545464 8 commit-queue 2019-06-17 16:42:48 -0700 All reviewed patches have been landed. Closing bug. 1545466 9 webkit-bug-importer 2019-06-17 16:45:06 -0700 <rdar://problem/51827160> 372272 2019-06-17 14:24:22 -0700 2019-06-17 15:44:55 -0700 Patch bug-198932-20190617142421.patch text/plain 5211 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDA3OWNmMDFhNzc2NmZlZTM0NWMzNTdiOTQ4OTY0 MmViNWYwMWNjYmEuLjVmZTcyYjVjNTVkMTdlYjg2ZTU0YzUzN2UyNzRhZWNlOTU5YjgyY2EgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE5LTA2LTE3ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBE ZWJ1Z2dlcjogYWRkaW5nIGEgRE9NL0V2ZW50L1VSTCBicmVha3BvaW50IHNob3VsZCBlbmFibGUg YnJlYWtwb2ludHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE5ODkzMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogVXNlckludGVyZmFjZS9Db250cm9sbGVycy9ET01NYW5hZ2VyLmpzOgorICAgICAgICAo V0kuRE9NTWFuYWdlci5wcm90b3R5cGUuX3VwZGF0ZUV2ZW50QnJlYWtwb2ludCk6CisKKyAgICAg ICAgKiBVc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RPTURlYnVnZ2VyTWFuYWdlci5qczoKKyAg ICAgICAgKFdJLkRPTURlYnVnZ2VyTWFuYWdlci5wcm90b3R5cGUuX3VwZGF0ZURPTUJyZWFrcG9p bnQpOgorICAgICAgICAoV0kuRE9NRGVidWdnZXJNYW5hZ2VyLnByb3RvdHlwZS5fdXBkYXRlRXZl bnRCcmVha3BvaW50KToKKyAgICAgICAgKFdJLkRPTURlYnVnZ2VyTWFuYWdlci5wcm90b3R5cGUu X3VwZGF0ZVVSTEJyZWFrcG9pbnQpOgorCiAyMDE5LTA2LTE3ICBEZXZpbiBSb3Vzc28gIDxkcm91 c3NvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBTZXR0aW5nczogc3BsaXQg dGhlIEdlbmVyYWwgcGFuZWwgaW50byBzdWIgcGFuZWxzIHNvIGl0J3MgbGVzcyBjcm93ZGVkCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVy cy9ET01EZWJ1Z2dlck1hbmFnZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9Db250cm9sbGVycy9ET01EZWJ1Z2dlck1hbmFnZXIuanMKaW5kZXggMDlhYjgzYmJmOTIw ZmQ3ODgzN2VlNDMxNTk3MGZkZWIzMTgwOGJlNi4uNjljZTZkMTk5ZTIzYTk1NTQwMTllZGFiNGRi YmVhNmY5NzkyZDMxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvQ29udHJvbGxlcnMvRE9NRGVidWdnZXJNYW5hZ2VyLmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RPTURlYnVnZ2VyTWFuYWdlci5q cwpAQCAtNDkyLDggKzQ5MiwxMiBAQCBXSS5ET01EZWJ1Z2dlck1hbmFnZXIgPSBjbGFzcyBET01E ZWJ1Z2dlck1hbmFnZXIgZXh0ZW5kcyBXSS5PYmplY3QKIAogICAgICAgICBpZiAoYnJlYWtwb2lu dC5kaXNhYmxlZCkKICAgICAgICAgICAgIHRhcmdldC5ET01EZWJ1Z2dlckFnZW50LnJlbW92ZURP TUJyZWFrcG9pbnQoYnJlYWtwb2ludC5kb21Ob2RlSWRlbnRpZmllciwgYnJlYWtwb2ludC50eXBl KTsKLSAgICAgICAgZWxzZQorICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgIGlmICghdGhpcy5f cmVzdG9yaW5nQnJlYWtwb2ludHMgJiYgIVdJLmRlYnVnZ2VyTWFuYWdlci5icmVha3BvaW50c0Rp c2FibGVkVGVtcG9yYXJpbHkpCisgICAgICAgICAgICAgICAgV0kuZGVidWdnZXJNYW5hZ2VyLmJy ZWFrcG9pbnRzRW5hYmxlZCA9IHRydWU7CisKICAgICAgICAgICAgIHRhcmdldC5ET01EZWJ1Z2dl ckFnZW50LnNldERPTUJyZWFrcG9pbnQoYnJlYWtwb2ludC5kb21Ob2RlSWRlbnRpZmllciwgYnJl YWtwb2ludC50eXBlKTsKKyAgICAgICAgfQogICAgIH0KIAogICAgIF91cGRhdGVFdmVudEJyZWFr cG9pbnQoYnJlYWtwb2ludCwgdGFyZ2V0KQpAQCAtNTA1LDE1ICs1MDksMjMgQEAgV0kuRE9NRGVi dWdnZXJNYW5hZ2VyID0gY2xhc3MgRE9NRGVidWdnZXJNYW5hZ2VyIGV4dGVuZHMgV0kuT2JqZWN0 CiAgICAgICAgICAgICBjb25zb2xlLmFzc2VydChicmVha3BvaW50LnR5cGUgPT09IFdJLkV2ZW50 QnJlYWtwb2ludC5UeXBlLkxpc3RlbmVyKTsKICAgICAgICAgICAgIGlmIChicmVha3BvaW50LmRp c2FibGVkKQogICAgICAgICAgICAgICAgIHRhcmdldC5ET01EZWJ1Z2dlckFnZW50LnJlbW92ZUV2 ZW50TGlzdGVuZXJCcmVha3BvaW50KGJyZWFrcG9pbnQuZXZlbnROYW1lKTsKLSAgICAgICAgICAg IGVsc2UKKyAgICAgICAgICAgIGVsc2UgeworICAgICAgICAgICAgICAgIGlmICghdGhpcy5fcmVz dG9yaW5nQnJlYWtwb2ludHMgJiYgIVdJLmRlYnVnZ2VyTWFuYWdlci5icmVha3BvaW50c0Rpc2Fi bGVkVGVtcG9yYXJpbHkpCisgICAgICAgICAgICAgICAgICAgIFdJLmRlYnVnZ2VyTWFuYWdlci5i cmVha3BvaW50c0VuYWJsZWQgPSB0cnVlOworCiAgICAgICAgICAgICAgICAgdGFyZ2V0LkRPTURl YnVnZ2VyQWdlbnQuc2V0RXZlbnRMaXN0ZW5lckJyZWFrcG9pbnQoYnJlYWtwb2ludC5ldmVudE5h bWUpOworICAgICAgICAgICAgfQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKICAg ICAgICAgaWYgKGJyZWFrcG9pbnQuZGlzYWJsZWQpCiAgICAgICAgICAgICB0YXJnZXQuRE9NRGVi dWdnZXJBZ2VudC5yZW1vdmVFdmVudEJyZWFrcG9pbnQoYnJlYWtwb2ludC50eXBlLCBicmVha3Bv aW50LmV2ZW50TmFtZSk7Ci0gICAgICAgIGVsc2UKKyAgICAgICAgZWxzZSB7CisgICAgICAgICAg ICBpZiAoIXRoaXMuX3Jlc3RvcmluZ0JyZWFrcG9pbnRzICYmICFXSS5kZWJ1Z2dlck1hbmFnZXIu YnJlYWtwb2ludHNEaXNhYmxlZFRlbXBvcmFyaWx5KQorICAgICAgICAgICAgICAgIFdJLmRlYnVn Z2VyTWFuYWdlci5icmVha3BvaW50c0VuYWJsZWQgPSB0cnVlOworCiAgICAgICAgICAgICB0YXJn ZXQuRE9NRGVidWdnZXJBZ2VudC5zZXRFdmVudEJyZWFrcG9pbnQoYnJlYWtwb2ludC50eXBlLCBi cmVha3BvaW50LmV2ZW50TmFtZSk7CisgICAgICAgIH0KICAgICB9CiAKICAgICBfdXBkYXRlVVJM QnJlYWtwb2ludChicmVha3BvaW50LCB0YXJnZXQpCkBAIC01MjUsNiArNTM3LDkgQEAgV0kuRE9N RGVidWdnZXJNYW5hZ2VyID0gY2xhc3MgRE9NRGVidWdnZXJNYW5hZ2VyIGV4dGVuZHMgV0kuT2Jq ZWN0CiAgICAgICAgICAgICBpZiAoYnJlYWtwb2ludC5kaXNhYmxlZCkKICAgICAgICAgICAgICAg ICB0YXJnZXQuRE9NRGVidWdnZXJBZ2VudC5yZW1vdmVYSFJCcmVha3BvaW50KGJyZWFrcG9pbnQu dXJsKTsKICAgICAgICAgICAgIGVsc2UgeworICAgICAgICAgICAgICAgIGlmICghdGhpcy5fcmVz dG9yaW5nQnJlYWtwb2ludHMgJiYgIVdJLmRlYnVnZ2VyTWFuYWdlci5icmVha3BvaW50c0Rpc2Fi bGVkVGVtcG9yYXJpbHkpCisgICAgICAgICAgICAgICAgICAgIFdJLmRlYnVnZ2VyTWFuYWdlci5i cmVha3BvaW50c0VuYWJsZWQgPSB0cnVlOworCiAgICAgICAgICAgICAgICAgbGV0IGlzUmVnZXgg PSBicmVha3BvaW50LnR5cGUgPT09IFdJLlVSTEJyZWFrcG9pbnQuVHlwZS5SZWd1bGFyRXhwcmVz c2lvbjsKICAgICAgICAgICAgICAgICB0YXJnZXQuRE9NRGVidWdnZXJBZ2VudC5zZXRYSFJCcmVh a3BvaW50KGJyZWFrcG9pbnQudXJsLCBpc1JlZ2V4KTsKICAgICAgICAgICAgIH0KQEAgLTUzNCw2 ICs1NDksOSBAQCBXSS5ET01EZWJ1Z2dlck1hbmFnZXIgPSBjbGFzcyBET01EZWJ1Z2dlck1hbmFn ZXIgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgaWYgKGJyZWFrcG9pbnQuZGlzYWJsZWQpCiAg ICAgICAgICAgICB0YXJnZXQuRE9NRGVidWdnZXJBZ2VudC5yZW1vdmVVUkxCcmVha3BvaW50KGJy ZWFrcG9pbnQudXJsKTsKICAgICAgICAgZWxzZSB7CisgICAgICAgICAgICBpZiAoIXRoaXMuX3Jl c3RvcmluZ0JyZWFrcG9pbnRzICYmICFXSS5kZWJ1Z2dlck1hbmFnZXIuYnJlYWtwb2ludHNEaXNh YmxlZFRlbXBvcmFyaWx5KQorICAgICAgICAgICAgICAgIFdJLmRlYnVnZ2VyTWFuYWdlci5icmVh a3BvaW50c0VuYWJsZWQgPSB0cnVlOworCiAgICAgICAgICAgICBsZXQgaXNSZWdleCA9IGJyZWFr cG9pbnQudHlwZSA9PT0gV0kuVVJMQnJlYWtwb2ludC5UeXBlLlJlZ3VsYXJFeHByZXNzaW9uOwog ICAgICAgICAgICAgdGFyZ2V0LkRPTURlYnVnZ2VyQWdlbnQuc2V0VVJMQnJlYWtwb2ludChicmVh a3BvaW50LnVybCwgaXNSZWdleCk7CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RPTU1hbmFnZXIuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9ET01NYW5hZ2VyLmpz CmluZGV4IDk2YTZhMjI4ODEzMTYwYThkYjk1NzJmMTAyZDJlYWMxMjAzZWRmZWUuLjI2YTc2MTIw YTgwOGJhNzk4NTg3ZjdhZDYyNDkxNTUyMTk1YTI5N2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RPTU1hbmFnZXIuanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRE9NTWFuYWdl ci5qcwpAQCAtNjc0LDggKzY3NCwxMiBAQCBXSS5ET01NYW5hZ2VyID0gY2xhc3MgRE9NTWFuYWdl ciBleHRlbmRzIFdJLk9iamVjdAogCiAgICAgICAgIGlmIChicmVha3BvaW50LmRpc2FibGVkKQog ICAgICAgICAgICAgdGFyZ2V0LkRPTUFnZW50LnJlbW92ZUJyZWFrcG9pbnRGb3JFdmVudExpc3Rl bmVyKGV2ZW50TGlzdGVuZXIuZXZlbnRMaXN0ZW5lcklkKTsKLSAgICAgICAgZWxzZQorICAgICAg ICBlbHNlIHsKKyAgICAgICAgICAgIGlmICghV0kuZGVidWdnZXJNYW5hZ2VyLmJyZWFrcG9pbnRz RGlzYWJsZWRUZW1wb3JhcmlseSkKKyAgICAgICAgICAgICAgICBXSS5kZWJ1Z2dlck1hbmFnZXIu YnJlYWtwb2ludHNFbmFibGVkID0gdHJ1ZTsKKwogICAgICAgICAgICAgdGFyZ2V0LkRPTUFnZW50 LnNldEJyZWFrcG9pbnRGb3JFdmVudExpc3RlbmVyKGV2ZW50TGlzdGVuZXIuZXZlbnRMaXN0ZW5l cklkKTsKKyAgICAgICAgfQogICAgIH0KIAogICAgIF9oYW5kbGVFdmVudEJyZWFrcG9pbnREaXNh YmxlZFN0YXRlQ2hhbmdlZChldmVudCkK 372281 2019-06-17 15:44:56 -0700 2019-06-17 16:42:47 -0700 Patch bug-198932-20190617154455.patch text/plain 5762 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDA3OWNmMDFhNzc2NmZlZTM0NWMzNTdiOTQ4OTY0 MmViNWYwMWNjYmEuLmVhZDhkM2ZiMmM1ZjU3MjA5MDYwMzAyNThlZmQ3NTdhZTgwZDlkNGMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE5LTA2LTE3ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBE ZWJ1Z2dlcjogYWRkaW5nIGEgRE9NL0V2ZW50L1VSTCBicmVha3BvaW50IHNob3VsZCBlbmFibGUg YnJlYWtwb2ludHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE5ODkzMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIE1hdGNoIHRoZSBiZWhhdmlvciBvZiBKYXZhU2NyaXB0IGJyZWFrcG9pbnRzLCB3aGljaCBl bmFibGUgYnJlYWtwb2ludHMgZ2xvYmFsbHkgd2hlbiBhIG5ldworICAgICAgICBicmVha3BvaW50 IGlzIHNldCBvciBhbiBleGlzdGluZyBicmVha3BvaW50IGlzIGVuYWJsZWQuCisKKyAgICAgICAg VGhpcyBhdm9pZHMgdGhlIHNpdHVhdGlvbiB3aGVyZSBzZXR0aW5nIGEgRE9NIGJyZWFrcG9pbnQg b3IgYSBzcGVjaWZpYyBldmVudCBsaXN0ZW5lcgorICAgICAgICBicmVha3BvaW50IGFwcGVhcnMg dG8gbm90ICJ3b3JrIiBiZWNhdXNlIGJyZWFrcG9pbnRzIGFyZSBnbG9iYWxseSBkaXNhYmxlZC4g VGhlcmUgaXMgbm8KKyAgICAgICAgImJyZWFrcG9pbnRzIGRpc2FibGVkIiBiYW5uZXIgaW4gdGhl IEVsZW1lbnRzIHRhYiwgc28gdGhlIHVzZXIgY291bGQgYmUgY29tcGxldGVseSB1bmF3YXJlCisg ICAgICAgIG9mIHRoaXMsIGFuZCB0aGVyZWZvcmUgYmUgY29uZnVzZWQgYXMgdG8gd2h5IHRoZXNl IGJyZWFrcG9pbnRzIGFyZW4ndCBiZWluZyBoaXQuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L0NvbnRyb2xsZXJzL0RPTU1hbmFnZXIuanM6CisgICAgICAgIChXSS5ET01NYW5hZ2VyLnByb3Rv dHlwZS5fdXBkYXRlRXZlbnRCcmVha3BvaW50KToKKworICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Q29udHJvbGxlcnMvRE9NRGVidWdnZXJNYW5hZ2VyLmpzOgorICAgICAgICAoV0kuRE9NRGVidWdn ZXJNYW5hZ2VyLnByb3RvdHlwZS5fdXBkYXRlRE9NQnJlYWtwb2ludCk6CisgICAgICAgIChXSS5E T01EZWJ1Z2dlck1hbmFnZXIucHJvdG90eXBlLl91cGRhdGVFdmVudEJyZWFrcG9pbnQpOgorICAg ICAgICAoV0kuRE9NRGVidWdnZXJNYW5hZ2VyLnByb3RvdHlwZS5fdXBkYXRlVVJMQnJlYWtwb2lu dCk6CisKIDIwMTktMDYtMTcgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAg ICAgICAgIFdlYiBJbnNwZWN0b3I6IFNldHRpbmdzOiBzcGxpdCB0aGUgR2VuZXJhbCBwYW5lbCBp bnRvIHN1YiBwYW5lbHMgc28gaXQncyBsZXNzIGNyb3dkZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RPTURlYnVnZ2VyTWFuYWdl ci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RP TURlYnVnZ2VyTWFuYWdlci5qcwppbmRleCAwOWFiODNiYmY5MjBmZDc4ODM3ZWU0MzE1OTcwZmRl YjMxODA4YmU2Li42OWNlNmQxOTllMjNhOTU1NDAxOWVkYWI0ZGJiZWE2Zjk3OTJkMzE5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9E T01EZWJ1Z2dlck1hbmFnZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvQ29udHJvbGxlcnMvRE9NRGVidWdnZXJNYW5hZ2VyLmpzCkBAIC00OTIsOCArNDkyLDEy IEBAIFdJLkRPTURlYnVnZ2VyTWFuYWdlciA9IGNsYXNzIERPTURlYnVnZ2VyTWFuYWdlciBleHRl bmRzIFdJLk9iamVjdAogCiAgICAgICAgIGlmIChicmVha3BvaW50LmRpc2FibGVkKQogICAgICAg ICAgICAgdGFyZ2V0LkRPTURlYnVnZ2VyQWdlbnQucmVtb3ZlRE9NQnJlYWtwb2ludChicmVha3Bv aW50LmRvbU5vZGVJZGVudGlmaWVyLCBicmVha3BvaW50LnR5cGUpOwotICAgICAgICBlbHNlCisg ICAgICAgIGVsc2UgeworICAgICAgICAgICAgaWYgKCF0aGlzLl9yZXN0b3JpbmdCcmVha3BvaW50 cyAmJiAhV0kuZGVidWdnZXJNYW5hZ2VyLmJyZWFrcG9pbnRzRGlzYWJsZWRUZW1wb3JhcmlseSkK KyAgICAgICAgICAgICAgICBXSS5kZWJ1Z2dlck1hbmFnZXIuYnJlYWtwb2ludHNFbmFibGVkID0g dHJ1ZTsKKwogICAgICAgICAgICAgdGFyZ2V0LkRPTURlYnVnZ2VyQWdlbnQuc2V0RE9NQnJlYWtw b2ludChicmVha3BvaW50LmRvbU5vZGVJZGVudGlmaWVyLCBicmVha3BvaW50LnR5cGUpOworICAg ICAgICB9CiAgICAgfQogCiAgICAgX3VwZGF0ZUV2ZW50QnJlYWtwb2ludChicmVha3BvaW50LCB0 YXJnZXQpCkBAIC01MDUsMTUgKzUwOSwyMyBAQCBXSS5ET01EZWJ1Z2dlck1hbmFnZXIgPSBjbGFz cyBET01EZWJ1Z2dlck1hbmFnZXIgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgICAgIGNvbnNv bGUuYXNzZXJ0KGJyZWFrcG9pbnQudHlwZSA9PT0gV0kuRXZlbnRCcmVha3BvaW50LlR5cGUuTGlz dGVuZXIpOwogICAgICAgICAgICAgaWYgKGJyZWFrcG9pbnQuZGlzYWJsZWQpCiAgICAgICAgICAg ICAgICAgdGFyZ2V0LkRPTURlYnVnZ2VyQWdlbnQucmVtb3ZlRXZlbnRMaXN0ZW5lckJyZWFrcG9p bnQoYnJlYWtwb2ludC5ldmVudE5hbWUpOwotICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAg ZWxzZSB7CisgICAgICAgICAgICAgICAgaWYgKCF0aGlzLl9yZXN0b3JpbmdCcmVha3BvaW50cyAm JiAhV0kuZGVidWdnZXJNYW5hZ2VyLmJyZWFrcG9pbnRzRGlzYWJsZWRUZW1wb3JhcmlseSkKKyAg ICAgICAgICAgICAgICAgICAgV0kuZGVidWdnZXJNYW5hZ2VyLmJyZWFrcG9pbnRzRW5hYmxlZCA9 IHRydWU7CisKICAgICAgICAgICAgICAgICB0YXJnZXQuRE9NRGVidWdnZXJBZ2VudC5zZXRFdmVu dExpc3RlbmVyQnJlYWtwb2ludChicmVha3BvaW50LmV2ZW50TmFtZSk7CisgICAgICAgICAgICB9 CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIAogICAgICAgICBpZiAoYnJlYWtwb2lu dC5kaXNhYmxlZCkKICAgICAgICAgICAgIHRhcmdldC5ET01EZWJ1Z2dlckFnZW50LnJlbW92ZUV2 ZW50QnJlYWtwb2ludChicmVha3BvaW50LnR5cGUsIGJyZWFrcG9pbnQuZXZlbnROYW1lKTsKLSAg ICAgICAgZWxzZQorICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgIGlmICghdGhpcy5fcmVzdG9y aW5nQnJlYWtwb2ludHMgJiYgIVdJLmRlYnVnZ2VyTWFuYWdlci5icmVha3BvaW50c0Rpc2FibGVk VGVtcG9yYXJpbHkpCisgICAgICAgICAgICAgICAgV0kuZGVidWdnZXJNYW5hZ2VyLmJyZWFrcG9p bnRzRW5hYmxlZCA9IHRydWU7CisKICAgICAgICAgICAgIHRhcmdldC5ET01EZWJ1Z2dlckFnZW50 LnNldEV2ZW50QnJlYWtwb2ludChicmVha3BvaW50LnR5cGUsIGJyZWFrcG9pbnQuZXZlbnROYW1l KTsKKyAgICAgICAgfQogICAgIH0KIAogICAgIF91cGRhdGVVUkxCcmVha3BvaW50KGJyZWFrcG9p bnQsIHRhcmdldCkKQEAgLTUyNSw2ICs1MzcsOSBAQCBXSS5ET01EZWJ1Z2dlck1hbmFnZXIgPSBj bGFzcyBET01EZWJ1Z2dlck1hbmFnZXIgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgICAgIGlm IChicmVha3BvaW50LmRpc2FibGVkKQogICAgICAgICAgICAgICAgIHRhcmdldC5ET01EZWJ1Z2dl ckFnZW50LnJlbW92ZVhIUkJyZWFrcG9pbnQoYnJlYWtwb2ludC51cmwpOwogICAgICAgICAgICAg ZWxzZSB7CisgICAgICAgICAgICAgICAgaWYgKCF0aGlzLl9yZXN0b3JpbmdCcmVha3BvaW50cyAm JiAhV0kuZGVidWdnZXJNYW5hZ2VyLmJyZWFrcG9pbnRzRGlzYWJsZWRUZW1wb3JhcmlseSkKKyAg ICAgICAgICAgICAgICAgICAgV0kuZGVidWdnZXJNYW5hZ2VyLmJyZWFrcG9pbnRzRW5hYmxlZCA9 IHRydWU7CisKICAgICAgICAgICAgICAgICBsZXQgaXNSZWdleCA9IGJyZWFrcG9pbnQudHlwZSA9 PT0gV0kuVVJMQnJlYWtwb2ludC5UeXBlLlJlZ3VsYXJFeHByZXNzaW9uOwogICAgICAgICAgICAg ICAgIHRhcmdldC5ET01EZWJ1Z2dlckFnZW50LnNldFhIUkJyZWFrcG9pbnQoYnJlYWtwb2ludC51 cmwsIGlzUmVnZXgpOwogICAgICAgICAgICAgfQpAQCAtNTM0LDYgKzU0OSw5IEBAIFdJLkRPTURl YnVnZ2VyTWFuYWdlciA9IGNsYXNzIERPTURlYnVnZ2VyTWFuYWdlciBleHRlbmRzIFdJLk9iamVj dAogICAgICAgICBpZiAoYnJlYWtwb2ludC5kaXNhYmxlZCkKICAgICAgICAgICAgIHRhcmdldC5E T01EZWJ1Z2dlckFnZW50LnJlbW92ZVVSTEJyZWFrcG9pbnQoYnJlYWtwb2ludC51cmwpOwogICAg ICAgICBlbHNlIHsKKyAgICAgICAgICAgIGlmICghdGhpcy5fcmVzdG9yaW5nQnJlYWtwb2ludHMg JiYgIVdJLmRlYnVnZ2VyTWFuYWdlci5icmVha3BvaW50c0Rpc2FibGVkVGVtcG9yYXJpbHkpCisg ICAgICAgICAgICAgICAgV0kuZGVidWdnZXJNYW5hZ2VyLmJyZWFrcG9pbnRzRW5hYmxlZCA9IHRy dWU7CisKICAgICAgICAgICAgIGxldCBpc1JlZ2V4ID0gYnJlYWtwb2ludC50eXBlID09PSBXSS5V UkxCcmVha3BvaW50LlR5cGUuUmVndWxhckV4cHJlc3Npb247CiAgICAgICAgICAgICB0YXJnZXQu RE9NRGVidWdnZXJBZ2VudC5zZXRVUkxCcmVha3BvaW50KGJyZWFrcG9pbnQudXJsLCBpc1JlZ2V4 KTsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvQ29udHJvbGxlcnMvRE9NTWFuYWdlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RPTU1hbmFnZXIuanMKaW5kZXggOTZhNmEyMjg4MTMx NjBhOGRiOTU3MmYxMDJkMmVhYzEyMDNlZGZlZS4uMjZhNzYxMjBhODA4YmE3OTg1ODdmN2FkNjI0 OTE1NTIxOTVhMjk3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvQ29udHJvbGxlcnMvRE9NTWFuYWdlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9ET01NYW5hZ2VyLmpzCkBAIC02NzQsOCArNjc0 LDEyIEBAIFdJLkRPTU1hbmFnZXIgPSBjbGFzcyBET01NYW5hZ2VyIGV4dGVuZHMgV0kuT2JqZWN0 CiAKICAgICAgICAgaWYgKGJyZWFrcG9pbnQuZGlzYWJsZWQpCiAgICAgICAgICAgICB0YXJnZXQu RE9NQWdlbnQucmVtb3ZlQnJlYWtwb2ludEZvckV2ZW50TGlzdGVuZXIoZXZlbnRMaXN0ZW5lci5l dmVudExpc3RlbmVySWQpOwotICAgICAgICBlbHNlCisgICAgICAgIGVsc2UgeworICAgICAgICAg ICAgaWYgKCFXSS5kZWJ1Z2dlck1hbmFnZXIuYnJlYWtwb2ludHNEaXNhYmxlZFRlbXBvcmFyaWx5 KQorICAgICAgICAgICAgICAgIFdJLmRlYnVnZ2VyTWFuYWdlci5icmVha3BvaW50c0VuYWJsZWQg PSB0cnVlOworCiAgICAgICAgICAgICB0YXJnZXQuRE9NQWdlbnQuc2V0QnJlYWtwb2ludEZvckV2 ZW50TGlzdGVuZXIoZXZlbnRMaXN0ZW5lci5ldmVudExpc3RlbmVySWQpOworICAgICAgICB9CiAg ICAgfQogCiAgICAgX2hhbmRsZUV2ZW50QnJlYWtwb2ludERpc2FibGVkU3RhdGVDaGFuZ2VkKGV2 ZW50KQo=