199033 2019-06-19 14:15:07 -0700 Web Inspector: Debugger: setting a breakpoint on a non-JavaScript line should immediately show as unresolved 2019-06-20 15:52:11 -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 1546239 0 hi 2019-06-19 14:15:07 -0700 # STEPS TO REPRODUCE: 1. inspect any page 2. set a breakpoint on a non-<script> line of any HTML file => breakpoint icon shows blue 3. move (drag) the breakpoint to a different non-script line in the same file => breakpoint icon changes to dark grey 1546260 1 372497 hi 2019-06-19 15:53:34 -0700 Created attachment 372497 Patch 1546579 2 372497 mattbaker 2019-06-20 11:04:14 -0700 Comment on attachment 372497 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=372497&action=review r=me, nice change. > Source/WebInspectorUI/ChangeLog:12 > + by the time that `shouldSpeculativelyResolve` would've taken effect, so it's unnecessary. Any idea why it existed in the first place? > Source/WebInspectorUI/ChangeLog:14 > + This only affects resolving breakpoints set via the gutter of a `SourceCodeTextEditor`. Maybe "This parameter was only used when setting a breakpoint via...". I had to check the code to clarify. > Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js:933 > + _setBreakpoint(breakpoint, specificTarget) Interesting. It looks like a breakpoint only begins its life in the resolved state when restoring breakpoints in DebuggerManager.prototype.initializeTarget (specificTarget will be non-null). 1546633 3 webkit-bug-importer 2019-06-20 13:23:19 -0700 <rdar://problem/51957111> 1546683 4 372497 hi 2019-06-20 15:20:33 -0700 Comment on attachment 372497 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=372497&action=review >> Source/WebInspectorUI/ChangeLog:12 >> + by the time that `shouldSpeculativelyResolve` would've taken effect, so it's unnecessary. > > Any idea why it existed in the first place? It was added in r171784. My guess is that at the time, `breakpoint.resolved` was used as a "gate" for invoking certain backend commands, so automatically marking it as resolved would help avoid those. Nowadays, it's not used for basically anything other than UI. 1546685 5 372592 hi 2019-06-20 15:20:59 -0700 Created attachment 372592 Patch 1546709 6 372592 commit-queue 2019-06-20 15:52:09 -0700 Comment on attachment 372592 Patch Clearing flags on attachment: 372592 Committed r246659: <https://trac.webkit.org/changeset/246659> 1546710 7 commit-queue 2019-06-20 15:52:11 -0700 All reviewed patches have been landed. Closing bug. 372497 2019-06-19 15:53:34 -0700 2019-06-20 15:20:58 -0700 Patch bug-199033-20190619155334.patch text/plain 4405 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGFiY2YwNGI4ZWJlMjEyNWQzN2YyYWNlZDI5NDZi MWY2MTMzNjM4NGIuLjk0YmI2ZTMzMmZiZTRkNmU1MDg3ODk0ODZmYjIzODYwMGFiY2IzZTEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE5LTA2LTE5ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBE ZWJ1Z2dlcjogc2V0dGluZyBhIGJyZWFrcG9pbnQgb24gYSBub24tSmF2YVNjcmlwdCBsaW5lIHNo b3VsZCBpbW1lZGlhdGVseSBzaG93IGFzIHVucmVzb2x2ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5OTAzMworCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSB0aGUgYHNob3VsZFNwZWN1bGF0aXZl bHlSZXNvbHZlYCBwYXJhbWV0ZXIsIGFzIGl0IHdhcyByZXNvbHZpbmcgYnJlYWtwb2ludHMgZXZl biBpbgorICAgICAgICB0aGUgY2FzZSB0aGF0IHRoZXJlIHdlcmUgbm8gcmVzb2x2ZWQgbG9jYXRp b25zIGZvciB0aGUgZ2l2ZW4gYnJlYWtwb2ludC4KKworICAgICAgICBJbiB0aGUgY2FzZSB0aGF0 IHRoZXJlIGFyZSByZXNvbHZlZCBsb2NhdGlvbnMsIHRoZSBicmVha3BvaW50IHdvdWxkJ3ZlIGFs cmVhZHkgYmVlbiByZXNvbHZlZAorICAgICAgICBieSB0aGUgdGltZSB0aGF0IGBzaG91bGRTcGVj dWxhdGl2ZWx5UmVzb2x2ZWAgd291bGQndmUgdGFrZW4gZWZmZWN0LCBzbyBpdCdzIHVubmVjZXNz YXJ5LgorCisgICAgICAgIFRoaXMgb25seSBhZmZlY3RzIHJlc29sdmluZyBicmVha3BvaW50cyBz ZXQgdmlhIHRoZSBndXR0ZXIgb2YgYSBgU291cmNlQ29kZVRleHRFZGl0b3JgLgorCisgICAgICAg ICogVXNlckludGVyZmFjZS9Db250cm9sbGVycy9EZWJ1Z2dlck1hbmFnZXIuanM6CisgICAgICAg IChXSS5EZWJ1Z2dlck1hbmFnZXIucHJvdG90eXBlLmFkZEJyZWFrcG9pbnQpOgorICAgICAgICAo V0kuRGVidWdnZXJNYW5hZ2VyLnByb3RvdHlwZS5fc2V0QnJlYWtwb2ludCk6CisgICAgICAgIChX SS5EZWJ1Z2dlck1hbmFnZXIucHJvdG90eXBlLl9zZXRCcmVha3BvaW50LmRpZFNldEJyZWFrcG9p bnQpOgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Tb3VyY2VDb2RlVGV4dEVkaXRv ci5qczoKKyAgICAgICAgKFdJLlNvdXJjZUNvZGVUZXh0RWRpdG9yLnByb3RvdHlwZS50ZXh0RWRp dG9yQnJlYWtwb2ludEFkZGVkKToKKwogMjAxOS0wNi0xOCAgRGV2aW4gUm91c3NvICA8ZHJvdXNz b0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogTmV0d29yazogZGV0YWlsIHZp ZXcgc2hvdWxkbid0IHN0YXkgb3BlbiB3aGVuIHRoZSByZWxhdGVkIGVudHJ5IGlzIHJlbW92ZWQK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xs ZXJzL0RlYnVnZ2VyTWFuYWdlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL0NvbnRyb2xsZXJzL0RlYnVnZ2VyTWFuYWdlci5qcwppbmRleCA3YWFlZWI4Njg0OWM5YTM2 NDIzNjNkOWIyMDhkYjk0MTRiNjE4NTY3Li40Mjc2Nzk5YWMwODU3NTE5YWNlYzYwYjc3ODg5ZDVk ZjYwMTFmNzNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9Db250cm9sbGVycy9EZWJ1Z2dlck1hbmFnZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRGVidWdnZXJNYW5hZ2VyLmpzCkBAIC00NzEs NyArNDcxLDcgQEAgV0kuRGVidWdnZXJNYW5hZ2VyID0gY2xhc3MgRGVidWdnZXJNYW5hZ2VyIGV4 dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgIHJldHVybiBzY3JpcHQudGFyZ2V0LkRlYnVnZ2VyQWdl bnQuY29udGludWVUb0xvY2F0aW9uKHtzY3JpcHRJZDogc2NyaXB0LmlkLCBsaW5lTnVtYmVyLCBj b2x1bW5OdW1iZXJ9KTsKICAgICB9CiAKLSAgICBhZGRCcmVha3BvaW50KGJyZWFrcG9pbnQsIHNo b3VsZFNwZWN1bGF0aXZlbHlSZXNvbHZlKQorICAgIGFkZEJyZWFrcG9pbnQoYnJlYWtwb2ludCkK ICAgICB7CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KGJyZWFrcG9pbnQgaW5zdGFuY2VvZiBXSS5C cmVha3BvaW50KTsKICAgICAgICAgaWYgKCFicmVha3BvaW50KQpAQCAtNDkyLDEwICs0OTIsNyBA QCBXSS5EZWJ1Z2dlck1hbmFnZXIgPSBjbGFzcyBEZWJ1Z2dlck1hbmFnZXIgZXh0ZW5kcyBXSS5P YmplY3QKIAogICAgICAgICBpZiAoIWJyZWFrcG9pbnQuZGlzYWJsZWQpIHsKICAgICAgICAgICAg IGNvbnN0IHNwZWNpZmljVGFyZ2V0ID0gdW5kZWZpbmVkOwotICAgICAgICAgICAgdGhpcy5fc2V0 QnJlYWtwb2ludChicmVha3BvaW50LCBzcGVjaWZpY1RhcmdldCwgKCkgPT4gewotICAgICAgICAg ICAgICAgIGlmIChzaG91bGRTcGVjdWxhdGl2ZWx5UmVzb2x2ZSkKLSAgICAgICAgICAgICAgICAg ICAgYnJlYWtwb2ludC5yZXNvbHZlZCA9IHRydWU7Ci0gICAgICAgICAgICB9KTsKKyAgICAgICAg ICAgIHRoaXMuX3NldEJyZWFrcG9pbnQoYnJlYWtwb2ludCwgc3BlY2lmaWNUYXJnZXQpOwogICAg ICAgICB9CiAKICAgICAgICAgaWYgKCF0aGlzLl9yZXN0b3JpbmdCcmVha3BvaW50cykKQEAgLTkz Myw3ICs5MzAsNyBAQCBXSS5EZWJ1Z2dlck1hbmFnZXIgPSBjbGFzcyBEZWJ1Z2dlck1hbmFnZXIg ZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgfTsKICAgICB9CiAKLSAgICBfc2V0QnJlYWtwb2lu dChicmVha3BvaW50LCBzcGVjaWZpY1RhcmdldCwgY2FsbGJhY2spCisgICAgX3NldEJyZWFrcG9p bnQoYnJlYWtwb2ludCwgc3BlY2lmaWNUYXJnZXQpCiAgICAgewogICAgICAgICBjb25zb2xlLmFz c2VydCghYnJlYWtwb2ludC5kaXNhYmxlZCk7CiAKQEAgLTk2Miw5ICs5NTksNiBAQCBXSS5EZWJ1 Z2dlck1hbmFnZXIgPSBjbGFzcyBEZWJ1Z2dlck1hbmFnZXIgZXh0ZW5kcyBXSS5PYmplY3QKIAog ICAgICAgICAgICAgZm9yIChsZXQgbG9jYXRpb24gb2YgbG9jYXRpb25zKQogICAgICAgICAgICAg ICAgIHRoaXMuYnJlYWtwb2ludFJlc29sdmVkKHRhcmdldCwgYnJlYWtwb2ludElkZW50aWZpZXIs IGxvY2F0aW9uKTsKLQotICAgICAgICAgICAgaWYgKHR5cGVvZiBjYWxsYmFjayA9PT0gImZ1bmN0 aW9uIikKLSAgICAgICAgICAgICAgICBjYWxsYmFjaygpOwogICAgICAgICB9CiAKICAgICAgICAg Ly8gVGhlIGJyZWFrcG9pbnQgd2lsbCBiZSByZXNvbHZlZCBhZ2FpbiBieSBjYWxsaW5nIERlYnVn Z2VyQWdlbnQsIHNvIG1hcmsgaXQgYXMgdW5yZXNvbHZlZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NvdXJjZUNvZGVUZXh0RWRpdG9yLmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU291cmNlQ29kZVRl eHRFZGl0b3IuanMKaW5kZXggODE3MGI1MGE2ZTM1MDlhNmZmZDc2ZTkyNGQ5MWNmZDkyZDY1NzE2 Mi4uM2RmMzNiNTY0NDkzZTBhYTMyM2Q5M2Q3OTUxYTIwZWM5YWIxZDVmZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU291cmNlQ29kZVRleHRF ZGl0b3IuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv U291cmNlQ29kZVRleHRFZGl0b3IuanMKQEAgLTEyOTcsOCArMTI5Nyw3IEBAIFdJLlNvdXJjZUNv ZGVUZXh0RWRpdG9yID0gY2xhc3MgU291cmNlQ29kZVRleHRFZGl0b3IgZXh0ZW5kcyBXSS5UZXh0 RWRpdG9yCiAgICAgICAgIHRoaXMuX2FkZEJyZWFrcG9pbnRXaXRoRWRpdG9yTGluZUluZm8oYnJl YWtwb2ludCwgbGluZUluZm8pOwogCiAgICAgICAgIHRoaXMuX2lnbm9yZUJyZWFrcG9pbnRBZGRl ZEJyZWFrcG9pbnQgPSBicmVha3BvaW50OwotICAgICAgICBjb25zdCBzaG91bGRTcGVjdWxhdGl2 ZWx5UmVzb2x2ZUJyZWFrcG9pbnQgPSB0cnVlOwotICAgICAgICBXSS5kZWJ1Z2dlck1hbmFnZXIu YWRkQnJlYWtwb2ludChicmVha3BvaW50LCBzaG91bGRTcGVjdWxhdGl2ZWx5UmVzb2x2ZUJyZWFr cG9pbnQpOworICAgICAgICBXSS5kZWJ1Z2dlck1hbmFnZXIuYWRkQnJlYWtwb2ludChicmVha3Bv aW50KTsKICAgICAgICAgdGhpcy5faWdub3JlQnJlYWtwb2ludEFkZGVkQnJlYWtwb2ludCA9IG51 bGw7CiAKICAgICAgICAgLy8gUmV0dXJuIHRoZSBtb3JlIGFjY3VyYXRlIGxvY2F0aW9uIGFuZCBi cmVha3BvaW50IGluZm8uCg== 372592 2019-06-20 15:20:59 -0700 2019-06-20 15:52:09 -0700 Patch bug-199033-20190620152058.patch text/plain 4408 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDhmNWM3Mzk4OTFkODFhMTQ1OWM4MGYzMzVkZGRh OWU0MjIxODQwYzAuLmNlOTIyYzIzODFmNTMxZDFmMmI2ZjNiMDAzNDc1NDRiYzI5MGNhYTUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE5LTA2LTE5ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBE ZWJ1Z2dlcjogc2V0dGluZyBhIGJyZWFrcG9pbnQgb24gYSBub24tSmF2YVNjcmlwdCBsaW5lIHNo b3VsZCBpbW1lZGlhdGVseSBzaG93IGFzIHVucmVzb2x2ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5OTAzMworCisgICAgICAgIFJldmlld2VkIGJ5 IE1hdHQgQmFrZXIuCisKKyAgICAgICAgUmVtb3ZlIHRoZSBgc2hvdWxkU3BlY3VsYXRpdmVseVJl c29sdmVgIHBhcmFtZXRlciwgYXMgaXQgd2FzIHJlc29sdmluZyBicmVha3BvaW50cyBldmVuIGlu CisgICAgICAgIHRoZSBjYXNlIHRoYXQgdGhlcmUgd2VyZSBubyByZXNvbHZlZCBsb2NhdGlvbnMg Zm9yIHRoZSBnaXZlbiBicmVha3BvaW50LgorCisgICAgICAgIEluIHRoZSBjYXNlIHRoYXQgdGhl cmUgYXJlIHJlc29sdmVkIGxvY2F0aW9ucywgdGhlIGJyZWFrcG9pbnQgd291bGQndmUgYWxyZWFk eSBiZWVuIHJlc29sdmVkCisgICAgICAgIGJ5IHRoZSB0aW1lIHRoYXQgYHNob3VsZFNwZWN1bGF0 aXZlbHlSZXNvbHZlYCB3b3VsZCd2ZSB0YWtlbiBlZmZlY3QsIHNvIGl0J3MgdW5uZWNlc3Nhcnku CisKKyAgICAgICAgVGhpcyBwYXJhbWV0ZXIgd2FzIG9ubHkgdXNlZCB3aGVuIHNldHRpbmcgYSBi cmVha3BvaW50IGZyb20gYSBgU291cmNlQ29kZVRleHRFZGl0b3JgIGd1dHRlci4KKworICAgICAg ICAqIFVzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRGVidWdnZXJNYW5hZ2VyLmpzOgorICAgICAg ICAoV0kuRGVidWdnZXJNYW5hZ2VyLnByb3RvdHlwZS5hZGRCcmVha3BvaW50KToKKyAgICAgICAg KFdJLkRlYnVnZ2VyTWFuYWdlci5wcm90b3R5cGUuX3NldEJyZWFrcG9pbnQpOgorICAgICAgICAo V0kuRGVidWdnZXJNYW5hZ2VyLnByb3RvdHlwZS5fc2V0QnJlYWtwb2ludC5kaWRTZXRCcmVha3Bv aW50KToKKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU291cmNlQ29kZVRleHRFZGl0 b3IuanM6CisgICAgICAgIChXSS5Tb3VyY2VDb2RlVGV4dEVkaXRvci5wcm90b3R5cGUudGV4dEVk aXRvckJyZWFrcG9pbnRBZGRlZCk6CisKIDIwMTktMDYtMTkgIERldmluIFJvdXNzbyAgPGRyb3Vz c29AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJFR1JFU1NJT046IERlYnVn Z2VyOiBjdXJyZW50IGNhbGwgZnJhbWUgaW5kaWNhdG9yIGlzbid0IHZlcnRpY2FsbHkgY2VudGVy ZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRy b2xsZXJzL0RlYnVnZ2VyTWFuYWdlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL0NvbnRyb2xsZXJzL0RlYnVnZ2VyTWFuYWdlci5qcwppbmRleCA3YWFlZWI4Njg0OWM5 YTM2NDIzNjNkOWIyMDhkYjk0MTRiNjE4NTY3Li40Mjc2Nzk5YWMwODU3NTE5YWNlYzYwYjc3ODg5 ZDVkZjYwMTFmNzNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9Db250cm9sbGVycy9EZWJ1Z2dlck1hbmFnZXIuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRGVidWdnZXJNYW5hZ2VyLmpzCkBAIC00 NzEsNyArNDcxLDcgQEAgV0kuRGVidWdnZXJNYW5hZ2VyID0gY2xhc3MgRGVidWdnZXJNYW5hZ2Vy IGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgIHJldHVybiBzY3JpcHQudGFyZ2V0LkRlYnVnZ2Vy QWdlbnQuY29udGludWVUb0xvY2F0aW9uKHtzY3JpcHRJZDogc2NyaXB0LmlkLCBsaW5lTnVtYmVy LCBjb2x1bW5OdW1iZXJ9KTsKICAgICB9CiAKLSAgICBhZGRCcmVha3BvaW50KGJyZWFrcG9pbnQs IHNob3VsZFNwZWN1bGF0aXZlbHlSZXNvbHZlKQorICAgIGFkZEJyZWFrcG9pbnQoYnJlYWtwb2lu dCkKICAgICB7CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KGJyZWFrcG9pbnQgaW5zdGFuY2VvZiBX SS5CcmVha3BvaW50KTsKICAgICAgICAgaWYgKCFicmVha3BvaW50KQpAQCAtNDkyLDEwICs0OTIs NyBAQCBXSS5EZWJ1Z2dlck1hbmFnZXIgPSBjbGFzcyBEZWJ1Z2dlck1hbmFnZXIgZXh0ZW5kcyBX SS5PYmplY3QKIAogICAgICAgICBpZiAoIWJyZWFrcG9pbnQuZGlzYWJsZWQpIHsKICAgICAgICAg ICAgIGNvbnN0IHNwZWNpZmljVGFyZ2V0ID0gdW5kZWZpbmVkOwotICAgICAgICAgICAgdGhpcy5f c2V0QnJlYWtwb2ludChicmVha3BvaW50LCBzcGVjaWZpY1RhcmdldCwgKCkgPT4gewotICAgICAg ICAgICAgICAgIGlmIChzaG91bGRTcGVjdWxhdGl2ZWx5UmVzb2x2ZSkKLSAgICAgICAgICAgICAg ICAgICAgYnJlYWtwb2ludC5yZXNvbHZlZCA9IHRydWU7Ci0gICAgICAgICAgICB9KTsKKyAgICAg ICAgICAgIHRoaXMuX3NldEJyZWFrcG9pbnQoYnJlYWtwb2ludCwgc3BlY2lmaWNUYXJnZXQpOwog ICAgICAgICB9CiAKICAgICAgICAgaWYgKCF0aGlzLl9yZXN0b3JpbmdCcmVha3BvaW50cykKQEAg LTkzMyw3ICs5MzAsNyBAQCBXSS5EZWJ1Z2dlck1hbmFnZXIgPSBjbGFzcyBEZWJ1Z2dlck1hbmFn ZXIgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgfTsKICAgICB9CiAKLSAgICBfc2V0QnJlYWtw b2ludChicmVha3BvaW50LCBzcGVjaWZpY1RhcmdldCwgY2FsbGJhY2spCisgICAgX3NldEJyZWFr cG9pbnQoYnJlYWtwb2ludCwgc3BlY2lmaWNUYXJnZXQpCiAgICAgewogICAgICAgICBjb25zb2xl LmFzc2VydCghYnJlYWtwb2ludC5kaXNhYmxlZCk7CiAKQEAgLTk2Miw5ICs5NTksNiBAQCBXSS5E ZWJ1Z2dlck1hbmFnZXIgPSBjbGFzcyBEZWJ1Z2dlck1hbmFnZXIgZXh0ZW5kcyBXSS5PYmplY3QK IAogICAgICAgICAgICAgZm9yIChsZXQgbG9jYXRpb24gb2YgbG9jYXRpb25zKQogICAgICAgICAg ICAgICAgIHRoaXMuYnJlYWtwb2ludFJlc29sdmVkKHRhcmdldCwgYnJlYWtwb2ludElkZW50aWZp ZXIsIGxvY2F0aW9uKTsKLQotICAgICAgICAgICAgaWYgKHR5cGVvZiBjYWxsYmFjayA9PT0gImZ1 bmN0aW9uIikKLSAgICAgICAgICAgICAgICBjYWxsYmFjaygpOwogICAgICAgICB9CiAKICAgICAg ICAgLy8gVGhlIGJyZWFrcG9pbnQgd2lsbCBiZSByZXNvbHZlZCBhZ2FpbiBieSBjYWxsaW5nIERl YnVnZ2VyQWdlbnQsIHNvIG1hcmsgaXQgYXMgdW5yZXNvbHZlZC4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NvdXJjZUNvZGVUZXh0RWRpdG9y LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU291cmNlQ29k ZVRleHRFZGl0b3IuanMKaW5kZXggODE3MGI1MGE2ZTM1MDlhNmZmZDc2ZTkyNGQ5MWNmZDkyZDY1 NzE2Mi4uM2RmMzNiNTY0NDkzZTBhYTMyM2Q5M2Q3OTUxYTIwZWM5YWIxZDVmZSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU291cmNlQ29kZVRl eHRFZGl0b3IuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvU291cmNlQ29kZVRleHRFZGl0b3IuanMKQEAgLTEyOTcsOCArMTI5Nyw3IEBAIFdJLlNvdXJj ZUNvZGVUZXh0RWRpdG9yID0gY2xhc3MgU291cmNlQ29kZVRleHRFZGl0b3IgZXh0ZW5kcyBXSS5U ZXh0RWRpdG9yCiAgICAgICAgIHRoaXMuX2FkZEJyZWFrcG9pbnRXaXRoRWRpdG9yTGluZUluZm8o YnJlYWtwb2ludCwgbGluZUluZm8pOwogCiAgICAgICAgIHRoaXMuX2lnbm9yZUJyZWFrcG9pbnRB ZGRlZEJyZWFrcG9pbnQgPSBicmVha3BvaW50OwotICAgICAgICBjb25zdCBzaG91bGRTcGVjdWxh dGl2ZWx5UmVzb2x2ZUJyZWFrcG9pbnQgPSB0cnVlOwotICAgICAgICBXSS5kZWJ1Z2dlck1hbmFn ZXIuYWRkQnJlYWtwb2ludChicmVha3BvaW50LCBzaG91bGRTcGVjdWxhdGl2ZWx5UmVzb2x2ZUJy ZWFrcG9pbnQpOworICAgICAgICBXSS5kZWJ1Z2dlck1hbmFnZXIuYWRkQnJlYWtwb2ludChicmVh a3BvaW50KTsKICAgICAgICAgdGhpcy5faWdub3JlQnJlYWtwb2ludEFkZGVkQnJlYWtwb2ludCA9 IG51bGw7CiAKICAgICAgICAgLy8gUmV0dXJuIHRoZSBtb3JlIGFjY3VyYXRlIGxvY2F0aW9uIGFu ZCBicmVha3BvaW50IGluZm8uCg==