199396 2019-07-01 23:47:49 -0700 Web Inspector: Elements: pasting doesn't work when a comment node is selected 2019-08-02 20:40:12 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All NEW P2 Normal --- 199182 1 hi hi hi inspector-bugzilla-changes joepeck oldest_to_newest 1549476 0 hi 2019-07-01 23:47:49 -0700 # STEPS TO REPRODUCE: 1. inspect any page 2. go to the Elements tab 3. select any node (preferably one that doesn't have any children) 4. copy that node (⌘C) 5. select a non-Element node (e.g. comment or text) 6. paste (⌘V) => nothing happens (the outer HTML copied from steps 3 and 4 should be added as a next sibling) This is because `insertAdjacentHTML` only exists on Element nodes, which comments/text are not. 1550668 1 373581 hi 2019-07-06 14:07:01 -0700 Created attachment 373581 Patch 1555263 2 374747 hi 2019-07-23 18:06:32 -0700 Created attachment 374747 Patch 1558253 3 374747 joepeck 2019-08-02 20:39:48 -0700 Comment on attachment 374747 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=374747&action=review Seems good but I didn't understand the `+ 2` which probably means it deserves a comment. > Source/WebInspectorUI/ChangeLog:14 > + the functionality of `insertAdjacentHTML` by creating a detached DOM node in the page and > + moving each child (`insertBefore`) created from the given HTML to be a child of the parent > + of the target DOM node at the right index. This never defines "target DOM node" and ends up being confusing. May be better with more specifics: ... mimic the functionality of `insertAdjacentHTML` by creating a detached DOM node in the page, inserting html into that detached node, and transferring the resulting children into the tree at the appropriate location. > Source/WebInspectorUI/UserInterface/Models/DOMNode.js:558 > + let object = await WI.RemoteObject.resolveNode(this.parentNode); > + > + function inspectedPage_parent_mimic_insertAdjacentHTML(index, html) { Style: I'd swap the order of these and then you'd see the 3 lines using `object` right next to each other and it would be easy to understand what is happening. > Source/WebInspectorUI/UserInterface/Models/DOMNode.js:562 > + this.insertBefore(child, this.childNodes[index + 2]); Why index + 2? It seems like in the: • "beforebegin" mimic I'd expect insertBefore `children[index]` • "afterend" mimic I'd expect insertAfter `children[index]` (or before index+1). I didn't follow how this became +2. > Source/WebInspectorUI/UserInterface/Models/DOMNode.js:576 > + } else if (allowed(this.parentNode)) { For all of these `allowed(this.parentNode)` is it ever possible for a parent to not be an ELEMENT_NODE? I'd expect these to all be just `this.parentNode` checks. 1558254 4 374747 joepeck 2019-08-02 20:40:12 -0700 Comment on attachment 374747 Patch In the meantime, to drop it from the queue I'm going to r-. 373581 2019-07-06 14:07:01 -0700 2019-07-23 18:06:08 -0700 Patch bug-199396-20190706140700.patch text/plain 4271 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDgxYjViZTNlNjg5ZTY4ZDhkZDZlMmZkOTZhNmJk ZWNjMDY0NjBkMTIuLjU3MzE4YzUzZmMwNjg5YzZmN2ZhZjI3MjhkZjAxNTU5ZjUwMDJmYzAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE5LTA3LTA2ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBF bGVtZW50czogcGFzdGluZyBkb2Vzbid0IHdvcmsgd2hlbiBhIGNvbW1lbnQgbm9kZSBpcyBzZWxl Y3RlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5 Mzk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2hl Y2sgaWYgdGhlIG5leHQvcHJldmlvdXMvcGFyZW50IERPTSBub2RlIGV4aXN0cyBhbmQgY2FuIGNh bGwgYGluc2VydEFkamFjZW50SFRNTGAgaWYgdGhlCisgICAgICAgIHRhcmdldCBET00gbm9kZSBp c24ndCBhYmxlIHRvLgorCisgICAgICAgIElmIHRoZSBuZXh0L3ByZXZpb3VzIERPTSBub2RlcyBl eGlzdCwgYnV0IGFyZW4ndCBhYmxlIHRvIGNhbGwgYGluc2VydEFkamFjZW50SFRNTGAsIG1pbWlj CisgICAgICAgIHRoZSBmdW5jdGlvbmFsaXR5IG9mIGBpbnNlcnRBZGphY2VudEhUTUxgIGJ5IGNy ZWF0aW5nIGEgZGV0YWNoZWQgRE9NIG5vZGUgaW4gdGhlIHBhZ2UgYW5kCisgICAgICAgIG1vdmlu ZyBlYWNoIGNoaWxkIChgaW5zZXJ0QmVmb3JlYCkgY3JlYXRlZCBmcm9tIHRoZSBnaXZlbiBIVE1M IHRvIGJlIGEgY2hpbGQgb2YgdGhlIHBhcmVudAorICAgICAgICBvZiB0aGUgdGFyZ2V0IERPTSBu b2RlIGF0IHRoZSByaWdodCBpbmRleC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvTW9kZWxz L0RPTU5vZGUuanM6CisgICAgICAgIChXSS5ET01Ob2RlLnByb3RvdHlwZS5pbnNlcnRBZGphY2Vu dEhUTUwpOgorICAgICAgICAoV0kuRE9NTm9kZS5wcm90b3R5cGUuaW5zZXJ0QWRqYWNlbnRIVE1M LmFsbG93ZWQpOiBBZGRlZC4KKwogMjAxOS0wNy0wNSAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0Bh cHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogY3VycmVudCBjYWxsIGZyYW1lIGlu ZGljYXRvciBub3QgdmlzaWJsZSBpbiBkYXJrIG1vZGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9ET01Ob2RlLmpzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0RPTU5vZGUuanMKaW5kZXggY2FhN2U5YTA3 ODE5MGRjYTY2OGU5ZjQ0MTI0NDc3Yzk4M2YwMjhmMi4uNDlmOThiYzU4MWQ4ZWI5NzM0OWVhYWJm NTZiZGNkY2JmOGNlYTM2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvTW9kZWxzL0RPTU5vZGUuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvTW9kZWxzL0RPTU5vZGUuanMKQEAgLTU0OCw4ICs1NDgsNjIgQEAgV0kuRE9N Tm9kZSA9IGNsYXNzIERPTU5vZGUgZXh0ZW5kcyBXSS5PYmplY3QKIAogICAgIGluc2VydEFkamFj ZW50SFRNTChwb3NpdGlvbiwgaHRtbCkKICAgICB7Ci0gICAgICAgIGlmICh0aGlzLm5vZGVUeXBl KCkgIT09IE5vZGUuRUxFTUVOVF9OT0RFKQorICAgICAgICBmdW5jdGlvbiBhbGxvd2VkKG5vZGUp IHsKKyAgICAgICAgICAgIHJldHVybiBub2RlICYmIG5vZGUubm9kZVR5cGUoKSA9PT0gTm9kZS5F TEVNRU5UX05PREU7CisgICAgICAgIH0KKworICAgICAgICBsZXQgbWltaWNJbnNlcnRBZGphY2Vu dEhUTUwgPSBhc3luYyAoKSA9PiB7CisgICAgICAgICAgICBsZXQgb2JqZWN0ID0gYXdhaXQgV0ku UmVtb3RlT2JqZWN0LnJlc29sdmVOb2RlKHRoaXMucGFyZW50Tm9kZSk7CisKKyAgICAgICAgICAg IGZ1bmN0aW9uIGluc3BlY3RlZFBhZ2VfcGFyZW50X21pbWljX2luc2VydEFkamFjZW50SFRNTChp bmRleCwgaHRtbCkgeworICAgICAgICAgICAgICAgIHZhciB3cmFwcGVyID0gZG9jdW1lbnQuY3Jl YXRlRWxlbWVudCgiZGl2Iik7CisgICAgICAgICAgICAgICAgd3JhcHBlci5pbm5lckhUTUwgPSBo dG1sOworICAgICAgICAgICAgICAgIGZvciAodmFyIGNoaWxkID0gd3JhcHBlci5sYXN0Q2hpbGQ7 IGNoaWxkOyBjaGlsZCA9IHdyYXBwZXIubGFzdENoaWxkKQorICAgICAgICAgICAgICAgICAgICB0 aGlzLmluc2VydEJlZm9yZShjaGlsZCwgdGhpcy5jaGlsZE5vZGVzW2luZGV4ICsgMl0pOworICAg ICAgICAgICAgfQorICAgICAgICAgICAgb2JqZWN0LmNhbGxGdW5jdGlvbihpbnNwZWN0ZWRQYWdl X3BhcmVudF9taW1pY19pbnNlcnRBZGphY2VudEhUTUwsIFt0aGlzLnBhcmVudE5vZGUuY2hpbGRy ZW4uaW5kZXhPZih0aGlzKSwgaHRtbF0pOworICAgICAgICAgICAgb2JqZWN0LnJlbGVhc2UoKTsK KyAgICAgICAgfTsKKworICAgICAgICBpZiAoIWFsbG93ZWQodGhpcykpIHsKKyAgICAgICAgICAg IHN3aXRjaCAocG9zaXRpb24pIHsKKyAgICAgICAgICAgIGNhc2UgImJlZm9yZWJlZ2luIjogewor ICAgICAgICAgICAgICAgIGxldCBwcmV2aW91c1NpYmxpbmcgPSB0aGlzLnByZXZpb3VzU2libGlu ZzsKKyAgICAgICAgICAgICAgICBpZiAocHJldmlvdXNTaWJsaW5nKSB7CisgICAgICAgICAgICAg ICAgICAgIGlmIChhbGxvd2VkKHByZXZpb3VzU2libGluZykpIHsKKyAgICAgICAgICAgICAgICAg ICAgICAgIHByZXZpb3VzU2libGluZy5pbnNlcnRBZGphY2VudEhUTUwoImFmdGVyZW5kIiwgaHRt bCk7CisgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICAgICAgICAg IH0gZWxzZSBpZiAoYWxsb3dlZCh0aGlzLnBhcmVudE5vZGUpKSB7CisgICAgICAgICAgICAgICAg ICAgICAgICBtaW1pY0luc2VydEFkamFjZW50SFRNTCgpOworICAgICAgICAgICAgICAgICAgICAg ICAgcmV0dXJuOworICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgfSBlbHNl IGlmIChhbGxvd2VkKHRoaXMucGFyZW50Tm9kZSkpIHsKKyAgICAgICAgICAgICAgICAgICAgdGhp cy5wYXJlbnROb2RlLmluc2VydEFkamFjZW50SFRNTCgiYWZ0ZXJiZWdpbiIsIGh0bWwpOworICAg ICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAg ICAgIGJyZWFrOworICAgICAgICAgICAgfQorICAgICAgICAgICAgY2FzZSAiYWZ0ZXJlbmQiOiB7 CisgICAgICAgICAgICAgICAgbGV0IG5leHRTaWJsaW5nID0gdGhpcy5uZXh0U2libGluZzsKKyAg ICAgICAgICAgICAgICBpZiAobmV4dFNpYmxpbmcpIHsKKyAgICAgICAgICAgICAgICAgICAgaWYg KGFsbG93ZWQobmV4dFNpYmxpbmcpKSB7CisgICAgICAgICAgICAgICAgICAgICAgICBuZXh0U2li bGluZy5pbnNlcnRBZGphY2VudEhUTUwoImJlZm9yZWJlZ2luIiwgaHRtbCk7CisgICAgICAgICAg ICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICAgICAgICAgIH0gZWxzZSBpZiAoYWxs b3dlZCh0aGlzLnBhcmVudE5vZGUpKSB7CisgICAgICAgICAgICAgICAgICAgICAgICBtaW1pY0lu c2VydEFkamFjZW50SFRNTCgpOworICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuOworICAg ICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgfSBlbHNlIGlmIChhbGxvd2VkKHRo aXMucGFyZW50Tm9kZSkpIHsKKyAgICAgICAgICAgICAgICAgICAgdGhpcy5wYXJlbnROb2RlLmlu c2VydEFkamFjZW50SFRNTCgiYmVmb3JlZW5kIiwgaHRtbCk7CisgICAgICAgICAgICAgICAgICAg IHJldHVybjsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAg ICAgICAgICB9CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KGZh bHNlLCAiQ2Fubm90IGluc2VydEFkamFjZW50SFRNTCBhdCBwb3NpdGlvbiIsIHBvc2l0aW9uLCBo dG1sLCB0aGlzKTsKICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQogCiAgICAgICAgIC8v IENPTVBBVElCSUxJVFkgKGlPUyAxMS4wKTogRE9NLmluc2VydEFkamFjZW50SFRNTCBkaWQgbm90 IGV4aXN0LgogICAgICAgICBpZiAoIURPTUFnZW50Lmluc2VydEFkamFjZW50SFRNTCkgewo= 374747 2019-07-23 18:06:32 -0700 2019-08-02 20:40:12 -0700 Patch bug-199396-20190723180632.patch text/plain 6553 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDM1NDlkMTdmMmQ2NmUxZjNjZDRkZDhjNDZlMGQ4 ZmQ5Zjg4NDIzMzguLmQyMTY2NjI2NjA4ZDVlNzAxZjJiZWU4MGJlMjZmZTMwODllY2Q3OTggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE5LTA3LTIzICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBF bGVtZW50czogcGFzdGluZyBkb2Vzbid0IHdvcmsgd2hlbiBhIGNvbW1lbnQgbm9kZSBpcyBzZWxl Y3RlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5 Mzk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2hl Y2sgaWYgdGhlIG5leHQvcHJldmlvdXMvcGFyZW50IERPTSBub2RlIGV4aXN0cyBhbmQgY2FuIGNh bGwgYGluc2VydEFkamFjZW50SFRNTGAgaWYgdGhlCisgICAgICAgIHRhcmdldCBET00gbm9kZSBp c24ndCBhYmxlIHRvLgorCisgICAgICAgIElmIHRoZSBuZXh0L3ByZXZpb3VzIERPTSBub2RlcyBl eGlzdCwgYnV0IGFyZW4ndCBhYmxlIHRvIGNhbGwgYGluc2VydEFkamFjZW50SFRNTGAsIG1pbWlj CisgICAgICAgIHRoZSBmdW5jdGlvbmFsaXR5IG9mIGBpbnNlcnRBZGphY2VudEhUTUxgIGJ5IGNy ZWF0aW5nIGEgZGV0YWNoZWQgRE9NIG5vZGUgaW4gdGhlIHBhZ2UgYW5kCisgICAgICAgIG1vdmlu ZyBlYWNoIGNoaWxkIChgaW5zZXJ0QmVmb3JlYCkgY3JlYXRlZCBmcm9tIHRoZSBnaXZlbiBIVE1M IHRvIGJlIGEgY2hpbGQgb2YgdGhlIHBhcmVudAorICAgICAgICBvZiB0aGUgdGFyZ2V0IERPTSBu b2RlIGF0IHRoZSByaWdodCBpbmRleC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvTW9kZWxz L0RPTU5vZGUuanM6CisgICAgICAgIChXSS5ET01Ob2RlLnByb3RvdHlwZS5pbnNlcnRBZGphY2Vu dEhUTUwpOgorICAgICAgICAoV0kuRE9NTm9kZS5wcm90b3R5cGUuaW5zZXJ0QWRqYWNlbnRIVE1M LmFsbG93ZWQpOiBBZGRlZC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJl ZUNvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV0kuRE9NVHJlZUNvbnRlbnRWaWV3LnByb3RvdHlw ZS5oYW5kbGVQYXN0ZUV2ZW50KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRy ZWVFbGVtZW50LmpzOgorICAgICAgICAoV0kuRE9NVHJlZUVsZW1lbnQucHJvdG90eXBlLl9pbnNl cnRBZGphY2VudEhUTUwpOgorICAgICAgICBCZWVwIGlmIHdlJ3JlIHVuYWJsZSB0byBldmVuIGNh bGwgYGluc2VydEFkamFjZW50SFRNTGAuCisKIDIwMTktMDctMjIgIERldmluIFJvdXNzbyAgPGRy b3Vzc29AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFVuY2F1Z2h0IEV4Y2Vw dGlvbjogQnJlYWtwb2ludCBhdCBzcGVjaWZpZWQgbG9jYXRpb24gYWxyZWFkeSBleGlzdHMuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvRE9N Tm9kZS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9ET01O b2RlLmpzCmluZGV4IGNhYTdlOWEwNzgxOTBkY2E2NjhlOWY0NDEyNDQ3N2M5ODNmMDI4ZjIuLjM1 NzkyNmE4N2JhZmYwMzFhMjI0NTQ5ODI1OTcyYTkxNmQwYTg2NWIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9ET01Ob2RlLmpzCisrKyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9ET01Ob2RlLmpzCkBAIC01 NDgsOCArNTQ4LDYyIEBAIFdJLkRPTU5vZGUgPSBjbGFzcyBET01Ob2RlIGV4dGVuZHMgV0kuT2Jq ZWN0CiAKICAgICBpbnNlcnRBZGphY2VudEhUTUwocG9zaXRpb24sIGh0bWwpCiAgICAgewotICAg ICAgICBpZiAodGhpcy5ub2RlVHlwZSgpICE9PSBOb2RlLkVMRU1FTlRfTk9ERSkKLSAgICAgICAg ICAgIHJldHVybjsKKyAgICAgICAgZnVuY3Rpb24gYWxsb3dlZChub2RlKSB7CisgICAgICAgICAg ICByZXR1cm4gbm9kZSAmJiBub2RlLm5vZGVUeXBlKCkgPT09IE5vZGUuRUxFTUVOVF9OT0RFOwor ICAgICAgICB9CisKKyAgICAgICAgbGV0IG1pbWljSW5zZXJ0QWRqYWNlbnRIVE1MID0gYXN5bmMg KCkgPT4geworICAgICAgICAgICAgbGV0IG9iamVjdCA9IGF3YWl0IFdJLlJlbW90ZU9iamVjdC5y ZXNvbHZlTm9kZSh0aGlzLnBhcmVudE5vZGUpOworCisgICAgICAgICAgICBmdW5jdGlvbiBpbnNw ZWN0ZWRQYWdlX3BhcmVudF9taW1pY19pbnNlcnRBZGphY2VudEhUTUwoaW5kZXgsIGh0bWwpIHsK KyAgICAgICAgICAgICAgICB2YXIgd3JhcHBlciA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRp diIpOworICAgICAgICAgICAgICAgIHdyYXBwZXIuaW5uZXJIVE1MID0gaHRtbDsKKyAgICAgICAg ICAgICAgICBmb3IgKHZhciBjaGlsZCA9IHdyYXBwZXIubGFzdENoaWxkOyBjaGlsZDsgY2hpbGQg PSB3cmFwcGVyLmxhc3RDaGlsZCkKKyAgICAgICAgICAgICAgICAgICAgdGhpcy5pbnNlcnRCZWZv cmUoY2hpbGQsIHRoaXMuY2hpbGROb2Rlc1tpbmRleCArIDJdKTsKKyAgICAgICAgICAgIH0KKyAg ICAgICAgICAgIG9iamVjdC5jYWxsRnVuY3Rpb24oaW5zcGVjdGVkUGFnZV9wYXJlbnRfbWltaWNf aW5zZXJ0QWRqYWNlbnRIVE1MLCBbdGhpcy5wYXJlbnROb2RlLmNoaWxkcmVuLmluZGV4T2YodGhp cyksIGh0bWxdKTsKKyAgICAgICAgICAgIG9iamVjdC5yZWxlYXNlKCk7CisgICAgICAgIH07CisK KyAgICAgICAgaWYgKCFhbGxvd2VkKHRoaXMpKSB7CisgICAgICAgICAgICBzd2l0Y2ggKHBvc2l0 aW9uKSB7CisgICAgICAgICAgICBjYXNlICJiZWZvcmViZWdpbiI6IHsKKyAgICAgICAgICAgICAg ICBsZXQgcHJldmlvdXNTaWJsaW5nID0gdGhpcy5wcmV2aW91c1NpYmxpbmc7CisgICAgICAgICAg ICAgICAgaWYgKHByZXZpb3VzU2libGluZykgeworICAgICAgICAgICAgICAgICAgICBpZiAoYWxs b3dlZChwcmV2aW91c1NpYmxpbmcpKSB7CisgICAgICAgICAgICAgICAgICAgICAgICBwcmV2aW91 c1NpYmxpbmcuaW5zZXJ0QWRqYWNlbnRIVE1MKCJhZnRlcmVuZCIsIGh0bWwpOworICAgICAgICAg ICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgICAgICAgICAgICAgIH0gZWxzZSBp ZiAoYWxsb3dlZCh0aGlzLnBhcmVudE5vZGUpKSB7CisgICAgICAgICAgICAgICAgICAgICAgICBt aW1pY0luc2VydEFkamFjZW50SFRNTCgpOworICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJu IHRydWU7CisgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICB9IGVsc2UgaWYg KGFsbG93ZWQodGhpcy5wYXJlbnROb2RlKSkgeworICAgICAgICAgICAgICAgICAgICB0aGlzLnBh cmVudE5vZGUuaW5zZXJ0QWRqYWNlbnRIVE1MKCJhZnRlcmJlZ2luIiwgaHRtbCk7CisgICAgICAg ICAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAg ICAgICBicmVhazsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGNhc2UgImFmdGVyZW5kIjog eworICAgICAgICAgICAgICAgIGxldCBuZXh0U2libGluZyA9IHRoaXMubmV4dFNpYmxpbmc7Cisg ICAgICAgICAgICAgICAgaWYgKG5leHRTaWJsaW5nKSB7CisgICAgICAgICAgICAgICAgICAgIGlm IChhbGxvd2VkKG5leHRTaWJsaW5nKSkgeworICAgICAgICAgICAgICAgICAgICAgICAgbmV4dFNp YmxpbmcuaW5zZXJ0QWRqYWNlbnRIVE1MKCJiZWZvcmViZWdpbiIsIGh0bWwpOworICAgICAgICAg ICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgICAgICAgICAgICAgIH0gZWxzZSBp ZiAoYWxsb3dlZCh0aGlzLnBhcmVudE5vZGUpKSB7CisgICAgICAgICAgICAgICAgICAgICAgICBt aW1pY0luc2VydEFkamFjZW50SFRNTCgpOworICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJu IHRydWU7CisgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICB9IGVsc2UgaWYg KGFsbG93ZWQodGhpcy5wYXJlbnROb2RlKSkgeworICAgICAgICAgICAgICAgICAgICB0aGlzLnBh cmVudE5vZGUuaW5zZXJ0QWRqYWNlbnRIVE1MKCJiZWZvcmVlbmQiLCBodG1sKTsKKyAgICAgICAg ICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAg ICAgIGJyZWFrOworICAgICAgICAgICAgfQorICAgICAgICAgICAgfQorCisgICAgICAgICAgICBj b25zb2xlLmFzc2VydChmYWxzZSwgIkNhbm5vdCBpbnNlcnRBZGphY2VudEhUTUwgYXQgcG9zaXRp b24iLCBwb3NpdGlvbiwgaHRtbCwgdGhpcyk7CisgICAgICAgICAgICByZXR1cm4gZmFsc2U7Cisg ICAgICAgIH0KIAogICAgICAgICAvLyBDT01QQVRJQklMSVRZIChpT1MgMTEuMCk6IERPTS5pbnNl cnRBZGphY2VudEhUTUwgZGlkIG5vdCBleGlzdC4KICAgICAgICAgaWYgKCFET01BZ2VudC5pbnNl cnRBZGphY2VudEhUTUwpIHsKQEAgLTU2MSwxMCArNjE1LDExIEBAIFdJLkRPTU5vZGUgPSBjbGFz cyBET01Ob2RlIGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgICAgICAgICAgb2JqZWN0LmNhbGxG dW5jdGlvbihpbnNwZWN0ZWRQYWdlX25vZGVfaW5zZXJ0QWRqYWNlbnRIVE1MLCBbcG9zaXRpb24s IGh0bWxdKTsKICAgICAgICAgICAgICAgICBvYmplY3QucmVsZWFzZSgpOwogICAgICAgICAgICAg fSk7Ci0gICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAg ICAgfQogCiAgICAgICAgIERPTUFnZW50Lmluc2VydEFkamFjZW50SFRNTCh0aGlzLmlkLCBwb3Np dGlvbiwgaHRtbCwgdGhpcy5fbWFrZVVuZG9hYmxlQ2FsbGJhY2soKSk7CisgICAgICAgIHJldHVy biB0cnVlOwogICAgIH0KIAogICAgIHJlbW92ZU5vZGUoY2FsbGJhY2spCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlQ29udGVudFZp ZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVl Q29udGVudFZpZXcuanMKaW5kZXggYzVmZjAzNzU3Mjg1ZjBiZjk5MDQyM2NlNWMyYzhmNjNmZjk0 NDE0MC4uYmJmZjI0NjJmZTJmZWNhNmNlMDQ5Mzc3ZTk2ZWU5YTc0ZTVhMTMxYSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZUNvbnRl bnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0RPTVRyZWVDb250ZW50Vmlldy5qcwpAQCAtMjQxLDcgKzI0MSw4IEBAIFdJLkRPTVRyZWVDb250 ZW50VmlldyA9IGNsYXNzIERPTVRyZWVDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWV3 CiAgICAgICAgIGlmICghdGV4dCkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBzZWxl Y3RlZERPTU5vZGUuaW5zZXJ0QWRqYWNlbnRIVE1MKCJhZnRlcmVuZCIsIHRleHQpOworICAgICAg ICBpZiAoIXNlbGVjdGVkRE9NTm9kZS5pbnNlcnRBZGphY2VudEhUTUwoImFmdGVyZW5kIiwgdGV4 dCkpCisgICAgICAgICAgICBJbnNwZWN0b3JGcm9udGVuZEhvc3QuYmVlcCgpOwogICAgIH0KIAog ICAgIGdldCBzdXBwb3J0c1NhdmUoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZUVsZW1lbnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlRWxlbWVudC5qcwppbmRleCA1ZjIwYTY4 ZjMwZWMyMzkzY2RhYzk4ZjQ5OWU0ZmU0ZTY3ZjBjZjY3Li4yOGVkODcxMmI0YTk1ZDkwOWFkMjE2 MTJhYzA5ZGUxNGM2YmQwODRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9ET01UcmVlRWxlbWVudC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlRWxlbWVudC5qcwpAQCAtMTY3NSw3ICsx Njc1LDggQEAgV0kuRE9NVHJlZUVsZW1lbnQgPSBjbGFzcyBET01UcmVlRWxlbWVudCBleHRlbmRz IFdJLlRyZWVFbGVtZW50CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgfQog Ci0gICAgICAgICAgICB0aGlzLnJlcHJlc2VudGVkT2JqZWN0Lmluc2VydEFkamFjZW50SFRNTChw b3NpdGlvbiwgdmFsdWUpOworICAgICAgICAgICAgaWYgKCF0aGlzLnJlcHJlc2VudGVkT2JqZWN0 Lmluc2VydEFkamFjZW50SFRNTChwb3NpdGlvbiwgdmFsdWUpKQorICAgICAgICAgICAgICAgIElu c3BlY3RvckZyb250ZW5kSG9zdC5iZWVwKCk7CiAgICAgICAgIH07CiAKICAgICAgICAgaWYgKHBv c2l0aW9uID09PSAiYWZ0ZXJiZWdpbiIgfHwgcG9zaXRpb24gPT09ICJiZWZvcmVlbmQiKSB7Cg==