199182 2019-06-24 20:40:01 -0700 Web Inspector: Elements: allow nodes to be copied and pasted 2019-07-02 09:19:18 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 199396 199397 1 hi hi commit-queue hi inspector-bugzilla-changes mattbaker webkit-bug-importer oldest_to_newest 1547623 0 hi 2019-06-24 20:40:01 -0700 I would expect this to copy the HTML markup (copy) and create a new node (paste) right after the selected node with the copied markup. This can be achieved right now by right-clicking on a node, selecting "Copy > HTML", right-clicking on the "destination" node, selecting "Add > Next Sibling", and pasting. 1547632 1 372819 hi 2019-06-24 23:59:04 -0700 Created attachment 372819 Patch 1549455 2 mattbaker 2019-07-01 20:37:12 -0700 (In reply to Devin Rousso from comment #1) > Created attachment 372819 [details] > Patch I never knew I wanted this until testing this patch. Repeatedly hitting paste to keep adding nodes is great. Do we want to select the pasted node automatically? I was a little surprised after hitting paste and not seeing the selection change. 1549456 3 mattbaker 2019-07-01 20:38:21 -0700 (In reply to Matt Baker from comment #2) > (In reply to Devin Rousso from comment #1) > > Created attachment 372819 [details] > > Patch > > I never knew I wanted this until testing this patch. Repeatedly hitting > paste to keep adding nodes is great. > > Do we want to select the pasted node automatically? I was a little surprised > after hitting paste and not seeing the selection change. Just checked, and Finder selects the newly pasted items in this case. 1549457 4 372819 mattbaker 2019-07-01 20:46:42 -0700 Comment on attachment 372819 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=372819&action=review r-, because of the copy-paste error in WI._paste. You can add this in a follow up if you want, but I noticed this doesn't work with comment nodes. > Source/WebInspectorUI/UserInterface/Base/Main.js:2629 > + if (selection.isCollapsed && !WI.isEventTargetAnEditableField(event)) { Decrease indenting with early return: if (!selection.isCollapsed || WI.isTargetAnEditableField(event)) return; > Source/WebInspectorUI/UserInterface/Base/Main.js:2631 > + if (focusedCopyHandler && typeof focusedCopyHandler.handlePasteEvent === "function") { Was this copied from WI._copy? The comment above looks wrong too. > Source/WebInspectorUI/UserInterface/Base/Main.js:2649 > + return; Not needed. 1549475 5 372819 hi 2019-07-01 23:39:46 -0700 Comment on attachment 372819 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=372819&action=review >> Source/WebInspectorUI/UserInterface/Base/Main.js:2629 >> + if (selection.isCollapsed && !WI.isEventTargetAnEditableField(event)) { > > Decrease indenting with early return: > > if (!selection.isCollapsed || WI.isTargetAnEditableField(event)) > return; This was mainly done to have a consistent style with `WI._copy`, but there's no need for it really. I'll change it. >> Source/WebInspectorUI/UserInterface/Base/Main.js:2631 >> + if (focusedCopyHandler && typeof focusedCopyHandler.handlePasteEvent === "function") { > > Was this copied from WI._copy? The comment above looks wrong too. Oops. :| 1549477 6 hi 2019-07-01 23:48:12 -0700 (In reply to Matt Baker from comment #4) > You can add this in a follow up if you want, but I noticed this doesn't work with comment nodes. You mean pasting when a comment node is focused? Interesting 🤔 This is because `insertAdjacentHTML` only exists on Element nodes, which a Comment is not. Perhaps we can be smarter with `insertAdjacentHTML` to adjust the `position` based on the type of node (e.g. use the parent or next sibling if the selected node is a comment). <https://webkit.org/b/199396> 1549483 7 hi 2019-07-02 00:01:54 -0700 (In reply to Matt Baker from comment #2) > Do we want to select the pasted node automatically? I was a little surprised after hitting paste and not seeing the selection change. Yes, we probably should, but there's a lot of work that would need to be done to properly ensure that we select the node. Right now, `insertAdjacentHTML` doesn't send any information back to the frontend about the id (or any other data) of the newly added node(s). As such, we'd basically have to wait for the DOM tree to update, and select the proper node as such. I think this may be safer/simpler to address as a followup. <https://webkit.org/b/199397> 1549485 8 373306 hi 2019-07-02 00:03:57 -0700 Created attachment 373306 Patch 1549576 9 373306 mattbaker 2019-07-02 08:47:02 -0700 Comment on attachment 373306 Patch r=me 1549598 10 373306 commit-queue 2019-07-02 09:18:15 -0700 Comment on attachment 373306 Patch Clearing flags on attachment: 373306 Committed r247054: <https://trac.webkit.org/changeset/247054> 1549599 11 commit-queue 2019-07-02 09:18:16 -0700 All reviewed patches have been landed. Closing bug. 1549601 12 webkit-bug-importer 2019-07-02 09:19:18 -0700 <rdar://problem/52527047> 372819 2019-06-24 23:59:04 -0700 2019-07-02 00:03:56 -0700 Patch bug-199182-20190624235903.patch text/plain 3933 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGRkNGQ0YTljMGQxZjk1YWY1NzIxNTMwMmE1ZWMw NDM5MGM1ZWQ0NjAuLmQ4YzA5MzUyNzczYWZmMzQ1MWQ1NjhmYThjMTk0OTVjMDQ1OTEwZjcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE5LTA2LTI0ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBF bGVtZW50czogYWxsb3cgbm9kZXMgdG8gYmUgY29waWVkIGFuZCBwYXN0ZWQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5OTE4MgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENvcHkgaXMgYWxyZWFkeSBzdXBw b3J0ZWQsIHNvIHRoZXJlJ3Mgbm90aGluZyB0aGF0IG5lZWRzIHRvIGJlIGRvbmUgdGhlcmUuCisK KyAgICAgICAgUGFzdGluZyBpcyBhcyBzaW1wbGUgYXMgY2FsbGluZyBgaW5zZXJ0QWRqYWNlbnRI VE1MKCJhZnRlcmVuZCIsIC4uLilgIG9uIHRoZSBzZWxlY3RlZCBub2RlLgorCisgICAgICAgICog VXNlckludGVyZmFjZS9CYXNlL01haW4uanM6CisgICAgICAgIChXSS5jb250ZW50TG9hZGVkKToK KyAgICAgICAgKFdJLl9wYXN0ZSk6IEFkZGVkLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9W aWV3cy9ET01UcmVlQ29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5ET01UcmVlQ29udGVudFZp ZXcucHJvdG90eXBlLmhhbmRsZVBhc3RlRXZlbnQpOiBBZGRlZC4KKwogMjAxOS0wNi0yMyAgTWF0 dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3Rvcjog UkVHUkVTU0lPTiAocjI0NjY4NCk6IERhcmsgTW9kZTogZGFzaGJvYXJkIGJ1dHRvbnMgc2hvdWxk IGhhdmUgbm8gYmFja2dyb3VuZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvQmFzZS9NYWluLmpzCmluZGV4IDViZmRlNTE1NDhmN2YyNmE3YmFlZDFiOWE0NDdlOGQ1 MmNiNjY1N2MuLmMwOTg1YmYxYzQ2NjllMTBjMGIzYzZkNTlhMDE5OTUyMDJiZTVjNjMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMKQEAg LTI2OSw2ICsyNjksNyBAQCBXSS5jb250ZW50TG9hZGVkID0gZnVuY3Rpb24oKQogICAgIC8vIFJl Z2lzdGVyIGZvciBnbG9iYWwgZXZlbnRzLgogICAgIGRvY3VtZW50LmFkZEV2ZW50TGlzdGVuZXIo ImJlZm9yZWNvcHkiLCBXSS5fYmVmb3JlY29weSk7CiAgICAgZG9jdW1lbnQuYWRkRXZlbnRMaXN0 ZW5lcigiY29weSIsIFdJLl9jb3B5KTsKKyAgICBkb2N1bWVudC5hZGRFdmVudExpc3RlbmVyKCJw YXN0ZSIsIFdJLl9wYXN0ZSk7CiAKICAgICBkb2N1bWVudC5hZGRFdmVudExpc3RlbmVyKCJjbGlj ayIsIFdJLl9tb3VzZVdhc0NsaWNrZWQpOwogICAgIGRvY3VtZW50LmFkZEV2ZW50TGlzdGVuZXIo ImRyYWdvdmVyIiwgV0kuX2hhbmRsZURyYWdPdmVyKTsKQEAgLTI2MjAsNiArMjYyMSwzNSBAQCBX SS5fY29weSA9IGZ1bmN0aW9uKGV2ZW50KQogICAgIGV2ZW50LnByZXZlbnREZWZhdWx0KCk7CiB9 OwogCitXSS5fcGFzdGUgPSBmdW5jdGlvbihldmVudCkKK3sKKyAgICBsZXQgc2VsZWN0aW9uID0g d2luZG93LmdldFNlbGVjdGlvbigpOworCisgICAgLy8gSWYgdGhlcmUgaXMgbm8gc2VsZWN0aW9u LCBwYXNzIHRoZSBjb3B5IGV2ZW50IG9uIHRvIHRoZSBmb2N1c2VkIGVsZW1lbnQgb3IgZm9jdXNl ZCBDb250ZW50Vmlldy4KKyAgICBpZiAoc2VsZWN0aW9uLmlzQ29sbGFwc2VkICYmICFXSS5pc0V2 ZW50VGFyZ2V0QW5FZGl0YWJsZUZpZWxkKGV2ZW50KSkgeworICAgICAgICBsZXQgZm9jdXNlZENv cHlIYW5kbGVyID0gV0kuY3VycmVudEZvY3VzRWxlbWVudCAmJiBXSS5jdXJyZW50Rm9jdXNFbGVt ZW50LmNvcHlIYW5kbGVyOworICAgICAgICBpZiAoZm9jdXNlZENvcHlIYW5kbGVyICYmIHR5cGVv ZiBmb2N1c2VkQ29weUhhbmRsZXIuaGFuZGxlUGFzdGVFdmVudCA9PT0gImZ1bmN0aW9uIikgewor ICAgICAgICAgICAgZm9jdXNlZENvcHlIYW5kbGVyLmhhbmRsZVBhc3RlRXZlbnQoZXZlbnQpOwor ICAgICAgICAgICAgaWYgKGV2ZW50LmRlZmF1bHRQcmV2ZW50ZWQpCisgICAgICAgICAgICAgICAg cmV0dXJuOworICAgICAgICB9CisKKyAgICAgICAgbGV0IGZvY3VzZWRDb250ZW50VmlldyA9IFdJ Ll9mb2N1c2VkQ29udGVudFZpZXcoKTsKKyAgICAgICAgaWYgKGZvY3VzZWRDb250ZW50VmlldyAm JiB0eXBlb2YgZm9jdXNlZENvbnRlbnRWaWV3LmhhbmRsZVBhc3RlRXZlbnQgPT09ICJmdW5jdGlv biIpIHsKKyAgICAgICAgICAgIGZvY3VzZWRDb250ZW50Vmlldy5oYW5kbGVQYXN0ZUV2ZW50KGV2 ZW50KTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCisgICAgICAgIGxldCB0YWJD b250ZW50VmlldyA9IFdJLnRhYkJyb3dzZXIuc2VsZWN0ZWRUYWJDb250ZW50VmlldzsKKyAgICAg ICAgaWYgKHRhYkNvbnRlbnRWaWV3ICYmIHR5cGVvZiB0YWJDb250ZW50Vmlldy5oYW5kbGVQYXN0 ZUV2ZW50ID09PSAiZnVuY3Rpb24iKSB7CisgICAgICAgICAgICB0YWJDb250ZW50Vmlldy5oYW5k bGVQYXN0ZUV2ZW50KGV2ZW50KTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCisg ICAgICAgIHJldHVybjsKKyAgICB9Cit9OworCiBXSS5faW5jcmVhc2Vab29tID0gZnVuY3Rpb24o ZXZlbnQpCiB7CiAgICAgY29uc3QgZXBzaWxvbiA9IDAuMDAwMTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVDb250ZW50Vmlldy5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVDb250 ZW50Vmlldy5qcwppbmRleCBiMDE4ODk3ZDg3ZGQwZDM2NWY4MzJjNWI3OWFlZmUwMTc1NTY1MmEw Li41ZGIxOWI4MWZjYWI3MDEzN2I0ZmE2NTU5ZGFkZGIwMDI2OTVmNThjIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlQ29udGVudFZp ZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9N VHJlZUNvbnRlbnRWaWV3LmpzCkBAIC0yNTEsNiArMjUxLDE5IEBAIFdJLkRPTVRyZWVDb250ZW50 VmlldyA9IGNsYXNzIERPTVRyZWVDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWV3CiAg ICAgICAgIHNlbGVjdGVkRE9NTm9kZS5jb3B5Tm9kZSgpOwogICAgIH0KIAorICAgIGhhbmRsZVBh c3RlRXZlbnQoZXZlbnQpCisgICAgeworICAgICAgICBsZXQgc2VsZWN0ZWRET01Ob2RlID0gdGhp cy5fZG9tVHJlZU91dGxpbmUuc2VsZWN0ZWRET01Ob2RlKCk7CisgICAgICAgIGlmICghc2VsZWN0 ZWRET01Ob2RlKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIGxldCB0ZXh0ID0gZXZl bnQuY2xpcGJvYXJkRGF0YS5nZXREYXRhKCJ0ZXh0L3BsYWluIik7CisgICAgICAgIGlmICghdGV4 dCkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBzZWxlY3RlZERPTU5vZGUuaW5zZXJ0 QWRqYWNlbnRIVE1MKCJhZnRlcmVuZCIsIHRleHQpOworICAgIH0KKwogICAgIGdldCBzdXBwb3J0 c1NhdmUoKQogICAgIHsKICAgICAgICAgcmV0dXJuIFdJLmNhbkFyY2hpdmVNYWluRnJhbWUoKTsK 373306 2019-07-02 00:03:57 -0700 2019-07-02 09:18:15 -0700 Patch bug-199182-20190702000356.patch text/plain 3733 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDkxNWNjMmU3MzYxOTk3YmVhZGQ0ZDU5ZDBjOGVi MWRmNGFjZmNlODEuLjQ1NzAwYzIzZTAwMDNjYTM3MzQ0YjZkN2YwNDg4OTgzMTQ4OWUzY2YgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE5LTA3LTAyICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBF bGVtZW50czogYWxsb3cgbm9kZXMgdG8gYmUgY29waWVkIGFuZCBwYXN0ZWQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5OTE4MgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENvcHkgaXMgYWxyZWFkeSBzdXBw b3J0ZWQsIHNvIHRoZXJlJ3Mgbm90aGluZyB0aGF0IG5lZWRzIHRvIGJlIGRvbmUgdGhlcmUuCisK KyAgICAgICAgUGFzdGluZyBpcyBhcyBzaW1wbGUgYXMgY2FsbGluZyBgaW5zZXJ0QWRqYWNlbnRI VE1MKCJhZnRlcmVuZCIsIC4uLilgIG9uIHRoZSBzZWxlY3RlZCBub2RlLgorCisgICAgICAgICog VXNlckludGVyZmFjZS9CYXNlL01haW4uanM6CisgICAgICAgIChXSS5jb250ZW50TG9hZGVkKToK KyAgICAgICAgKFdJLl9wYXN0ZSk6IEFkZGVkLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9W aWV3cy9ET01UcmVlQ29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5ET01UcmVlQ29udGVudFZp ZXcucHJvdG90eXBlLmhhbmRsZVBhc3RlRXZlbnQpOiBBZGRlZC4KKwogMjAxOS0wNi0yNyAgQmV0 aCBEYWtpbiAgPGJkYWtpbkBhcHBsZS5jb20+CiAKICAgICAgICAgVXBzdHJlYW0gdXNlIG9mIE1B Q0NBVEFMWVNUCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9CYXNlL01haW4uanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNl L01haW4uanMKaW5kZXggNWJmZGU1MTU0OGY3ZjI2YTdiYWVkMWI5YTQ0N2U4ZDUyY2I2NjU3Yy4u ZmI5YzJlZTBmM2I2MzA4YmZkNzI0MDBiYTYyZjEwNDdjODNlYjlkOCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcwpAQCAtMjY5LDYgKzI2 OSw3IEBAIFdJLmNvbnRlbnRMb2FkZWQgPSBmdW5jdGlvbigpCiAgICAgLy8gUmVnaXN0ZXIgZm9y IGdsb2JhbCBldmVudHMuCiAgICAgZG9jdW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiYmVmb3JlY29w eSIsIFdJLl9iZWZvcmVjb3B5KTsKICAgICBkb2N1bWVudC5hZGRFdmVudExpc3RlbmVyKCJjb3B5 IiwgV0kuX2NvcHkpOworICAgIGRvY3VtZW50LmFkZEV2ZW50TGlzdGVuZXIoInBhc3RlIiwgV0ku X3Bhc3RlKTsKIAogICAgIGRvY3VtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgV0kuX21v dXNlV2FzQ2xpY2tlZCk7CiAgICAgZG9jdW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiZHJhZ292ZXIi LCBXSS5faGFuZGxlRHJhZ092ZXIpOwpAQCAtMjYyMCw2ICsyNjIxLDM0IEBAIFdJLl9jb3B5ID0g ZnVuY3Rpb24oZXZlbnQpCiAgICAgZXZlbnQucHJldmVudERlZmF1bHQoKTsKIH07CiAKK1dJLl9w YXN0ZSA9IGZ1bmN0aW9uKGV2ZW50KQoreworICAgIGxldCBzZWxlY3Rpb24gPSB3aW5kb3cuZ2V0 U2VsZWN0aW9uKCk7CisKKyAgICAvLyBJZiB0aGVyZSBpcyBubyBzZWxlY3Rpb24sIHBhc3MgdGhl IHBhc3RlIGV2ZW50IG9uIHRvIHRoZSBmb2N1c2VkIGVsZW1lbnQgb3IgZm9jdXNlZCBDb250ZW50 Vmlldy4KKyAgICBpZiAoIXNlbGVjdGlvbi5pc0NvbGxhcHNlZCB8fCBXSS5pc0V2ZW50VGFyZ2V0 QW5FZGl0YWJsZUZpZWxkKGV2ZW50KSkKKyAgICAgICAgcmV0dXJuOworCisgICAgbGV0IGZvY3Vz ZWRQYXN0ZUhhbmRsZXIgPSBXSS5jdXJyZW50Rm9jdXNFbGVtZW50ICYmIFdJLmN1cnJlbnRGb2N1 c0VsZW1lbnQucGFzdGVIYW5kbGVyOworICAgIGlmIChmb2N1c2VkUGFzdGVIYW5kbGVyICYmIGZv Y3VzZWRQYXN0ZUhhbmRsZXIuaGFuZGxlUGFzdGVFdmVudCkgeworICAgICAgICBmb2N1c2VkUGFz dGVIYW5kbGVyLmhhbmRsZVBhc3RlRXZlbnQoZXZlbnQpOworICAgICAgICBpZiAoZXZlbnQuZGVm YXVsdFByZXZlbnRlZCkKKyAgICAgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBsZXQgZm9j dXNlZENvbnRlbnRWaWV3ID0gV0kuX2ZvY3VzZWRDb250ZW50VmlldygpOworICAgIGlmIChmb2N1 c2VkQ29udGVudFZpZXcgJiYgZm9jdXNlZENvbnRlbnRWaWV3LmhhbmRsZVBhc3RlRXZlbnQpIHsK KyAgICAgICAgZm9jdXNlZENvbnRlbnRWaWV3LmhhbmRsZVBhc3RlRXZlbnQoZXZlbnQpOworICAg ICAgICByZXR1cm47CisgICAgfQorCisgICAgbGV0IHRhYkNvbnRlbnRWaWV3ID0gV0kudGFiQnJv d3Nlci5zZWxlY3RlZFRhYkNvbnRlbnRWaWV3OworICAgIGlmICh0YWJDb250ZW50VmlldyAmJiB0 YWJDb250ZW50Vmlldy5oYW5kbGVQYXN0ZUV2ZW50KSB7CisgICAgICAgIHRhYkNvbnRlbnRWaWV3 LmhhbmRsZVBhc3RlRXZlbnQoZXZlbnQpOworICAgICAgICByZXR1cm47CisgICAgfQorfTsKKwog V0kuX2luY3JlYXNlWm9vbSA9IGZ1bmN0aW9uKGV2ZW50KQogewogICAgIGNvbnN0IGVwc2lsb24g PSAwLjAwMDE7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9ET01UcmVlQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9ET01UcmVlQ29udGVudFZpZXcuanMKaW5kZXggYjAxODg5N2Q4N2Rk MGQzNjVmODMyYzViNzlhZWZlMDE3NTU2NTJhMC4uNWRiMTliODFmY2FiNzAxMzdiNGZhNjU1OWRh ZGRiMDAyNjk1ZjU4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvRE9NVHJlZUNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVDb250ZW50Vmlldy5qcwpAQCAtMjUxLDYg KzI1MSwxOSBAQCBXSS5ET01UcmVlQ29udGVudFZpZXcgPSBjbGFzcyBET01UcmVlQ29udGVudFZp ZXcgZXh0ZW5kcyBXSS5Db250ZW50VmlldwogICAgICAgICBzZWxlY3RlZERPTU5vZGUuY29weU5v ZGUoKTsKICAgICB9CiAKKyAgICBoYW5kbGVQYXN0ZUV2ZW50KGV2ZW50KQorICAgIHsKKyAgICAg ICAgbGV0IHNlbGVjdGVkRE9NTm9kZSA9IHRoaXMuX2RvbVRyZWVPdXRsaW5lLnNlbGVjdGVkRE9N Tm9kZSgpOworICAgICAgICBpZiAoIXNlbGVjdGVkRE9NTm9kZSkKKyAgICAgICAgICAgIHJldHVy bjsKKworICAgICAgICBsZXQgdGV4dCA9IGV2ZW50LmNsaXBib2FyZERhdGEuZ2V0RGF0YSgidGV4 dC9wbGFpbiIpOworICAgICAgICBpZiAoIXRleHQpCisgICAgICAgICAgICByZXR1cm47CisKKyAg ICAgICAgc2VsZWN0ZWRET01Ob2RlLmluc2VydEFkamFjZW50SFRNTCgiYWZ0ZXJlbmQiLCB0ZXh0 KTsKKyAgICB9CisKICAgICBnZXQgc3VwcG9ydHNTYXZlKCkKICAgICB7CiAgICAgICAgIHJldHVy biBXSS5jYW5BcmNoaXZlTWFpbkZyYW1lKCk7Cg==