151836 2015-12-03 16:41:25 -0800 Web Inspector: add "Copy Selected" context menu item to Console 2016-08-16 10:07:34 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 bburg hi bburg commit-queue graouts hi joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1146128 0 bburg 2015-12-03 16:41:25 -0800 Copying item(s) from console is not discoverable enough. 1146129 1 webkit-bug-importer 2015-12-03 16:41:36 -0800 <rdar://problem/23752839> 1219924 2 286021 hi 2016-08-13 23:42:58 -0700 Created attachment 286021 Patch 1219934 3 286021 nvasilyev 2016-08-14 12:00:31 -0700 Comment on attachment 286021 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=286021&action=review This patch allows to copy one console message. That's a good start. Ideally, I'd expect the context menu to do the same as Command-C — copy all selected messages. > Source/WebInspectorUI/UserInterface/Views/LogContentView.js:344 > + Why is this needed? > Source/WebInspectorUI/UserInterface/Views/LogContentView.js:358 > + contextMenu.appendItem(WebInspector.UIString("Copy Selected"), () => { You should add "Copy Selected" to localizedStrings.js. > Source/WebInspectorUI/UserInterface/Views/LogContentView.js:-365 > - Why is this needed? 1219937 4 286021 hi 2016-08-14 13:07:18 -0700 Comment on attachment 286021 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=286021&action=review >> Source/WebInspectorUI/UserInterface/Views/LogContentView.js:344 >> + > > Why is this needed? Since a context menu is considered a "mousedown" but not a "mouseup" we need to force this event >> Source/WebInspectorUI/UserInterface/Views/LogContentView.js:-365 >> - > > Why is this needed? This prevented the right click from even working on console entries 1219938 5 286026 hi 2016-08-14 13:08:00 -0700 Created attachment 286026 Patch 1220254 6 286026 joepeck 2016-08-15 17:15:15 -0700 Comment on attachment 286026 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=286026&action=review r=me, but this should add some comments to the tricky bit. > Source/WebInspectorUI/UserInterface/Views/LogContentView.js:344 > + if (!this._selectedMessages.length) > + this._mouseup(event); This really needs a comment. It is not obvious why this needs to be here and it is not explained anywhere. What are the consequences of not doing this? Selection handling is not reset so just moving the mouse would select rows? 1220352 7 286150 hi 2016-08-15 22:02:41 -0700 Created attachment 286150 Patch 1220472 8 286150 commit-queue 2016-08-16 10:07:30 -0700 Comment on attachment 286150 Patch Clearing flags on attachment: 286150 Committed r204511: <http://trac.webkit.org/changeset/204511> 1220473 9 commit-queue 2016-08-16 10:07:34 -0700 All reviewed patches have been landed. Closing bug. 286021 2016-08-13 23:42:58 -0700 2016-08-14 13:07:56 -0700 Patch bug-151836-20160813234116.patch text/plain 3008 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDc3YjliMjNiYjA0ZWZiMGVjNTMzZWI4MDU2NGEy NDdkNzFmZjJiZWMuLmM0N2M5NzVhNGQwNDQ1NTY0OGJlZTQzYTYyN2UwMWRlODQ2MzM1ZjQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE2LTA4LTEzICBEZXZp biBSb3Vzc28gIDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IGFkZCAiQ29weSBTZWxlY3RlZCIgY29udGV4dCBtZW51IGl0ZW0gdG8gQ29uc29sZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUxODM2CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkxv Z0NvbnRlbnRWaWV3LnByb3RvdHlwZS5fcHJldmlvdXNNZXNzYWdlUmVwZWF0Q291bnRVcGRhdGVk KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Mb2dDb250ZW50Vmlldy5wcm90b3R5cGUuX2hhbmRs ZUNvbnRleHRNZW51RXZlbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkxvZ0NvbnRlbnRWaWV3 LnByb3RvdHlwZS5fbW91c2Vkb3duKToKKwogMjAxNi0wOC0xMiAgVGltb3RoeSBIYXRjaGVyICA8 dGltb3RoeUBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogQWRkIGFwcGxpY2F0 aW9uL3ZuZC5hcGkranNvbiBhcyBhIHZhbGlkIEpTT04gTUlNRS10eXBlCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRW aWV3LmpzCmluZGV4IDJlYzQ2ZWIxZDE3MjJkYTAwY2QxZWM1ZTVjYTRmNGZmZjcxNjhkMTguLmQz NjczMDI0NzJiZmUxZTE0NmIyMTdkM2JjMWI2MWY4NGU0ZTEwYTQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmpzCisr KyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRW aWV3LmpzCkBAIC0zMzMsMTMgKzMzMywxNSBAQCBXZWJJbnNwZWN0b3IuTG9nQ29udGVudFZpZXcg PSBjbGFzcyBMb2dDb250ZW50VmlldyBleHRlbmRzIFdlYkluc3BlY3Rvci5Db250ZW50VgogICAg IH0KIAogICAgIF9wcmV2aW91c01lc3NhZ2VSZXBlYXRDb3VudFVwZGF0ZWQoZXZlbnQpCi0gICAg eyAgICAgICAgCisgICAgewogICAgICAgICBpZiAodGhpcy5fbG9nVmlld0NvbnRyb2xsZXIudXBk YXRlUHJldmlvdXNNZXNzYWdlUmVwZWF0Q291bnQoZXZlbnQuZGF0YS5jb3VudCkgJiYgdGhpcy5f bGFzdE1lc3NhZ2VWaWV3KQogICAgICAgICAgICAgdGhpcy5fbWFya1Njb3BlQmFySXRlbVVucmVh ZCh0aGlzLl9sYXN0TWVzc2FnZVZpZXcubWVzc2FnZS5sZXZlbCk7CiAgICAgfQogCiAgICAgX2hh bmRsZUNvbnRleHRNZW51RXZlbnQoZXZlbnQpCiAgICAgeworICAgICAgICB0aGlzLl9tb3VzZXVw KGV2ZW50KTsKKwogICAgICAgICBpZiAoIXdpbmRvdy5nZXRTZWxlY3Rpb24oKS5pc0NvbGxhcHNl ZCkgewogICAgICAgICAgICAgLy8gSWYgdGhlcmUgaXMgYSBzZWxlY3Rpb24sIHdlIHdhbnQgdG8g c2hvdyBvdXIgbm9ybWFsIGNvbnRleHQgbWVudQogICAgICAgICAgICAgLy8gKHdpdGggQ29weSwg ZXRjLiksIGFuZCBub3QgQ2xlYXIgTG9nLgpAQCAtMzUxLDYgKzM1MywxNCBAQCBXZWJJbnNwZWN0 b3IuTG9nQ29udGVudFZpZXcgPSBjbGFzcyBMb2dDb250ZW50VmlldyBleHRlbmRzIFdlYkluc3Bl Y3Rvci5Db250ZW50VgogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIGxldCBjb250ZXh0 TWVudSA9IFdlYkluc3BlY3Rvci5Db250ZXh0TWVudS5jcmVhdGVGcm9tRXZlbnQoZXZlbnQpOwor CisgICAgICAgIGlmICh0aGlzLl9zZWxlY3RlZE1lc3NhZ2VzLmxlbmd0aCkgeworICAgICAgICAg ICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNvcHkgU2Vs ZWN0ZWQiKSwgKCkgPT4geworICAgICAgICAgICAgICAgIEluc3BlY3RvckZyb250ZW5kSG9zdC5j b3B5VGV4dCh0aGlzLl9mb3JtYXRNZXNzYWdlc0FzRGF0YSh0cnVlKSk7CisgICAgICAgICAgICB9 KTsKKyAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZFNlcGFyYXRvcigpOworICAgICAgICB9 CisKICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmco IkNsZWFyIExvZyIpLCB0aGlzLl9jbGVhckxvZy5iaW5kKHRoaXMpKTsKICAgICAgICAgY29udGV4 dE1lbnUuYXBwZW5kU2VwYXJhdG9yKCk7CiAKQEAgLTM2MCw5ICszNzAsNiBAQCBXZWJJbnNwZWN0 b3IuTG9nQ29udGVudFZpZXcgPSBjbGFzcyBMb2dDb250ZW50VmlldyBleHRlbmRzIFdlYkluc3Bl Y3Rvci5Db250ZW50VgogCiAgICAgX21vdXNlZG93bihldmVudCkKICAgICB7Ci0gICAgICAgIGlm IChldmVudC5idXR0b24gIT09IDAgfHwgZXZlbnQuY3RybEtleSkKLSAgICAgICAgICAgIHJldHVy bjsKLQogICAgICAgICBpZiAoZXZlbnQuZGVmYXVsdFByZXZlbnRlZCkgewogICAgICAgICAgICAg Ly8gRGVmYXVsdCB3YXMgcHJldmVudGVkIG9uIHRoZSBldmVudCwgc28gdGhpcyBtZWFucyBzb21l dGhpbmcgZGVlcGVyIChsaWtlIGEgZGlzY2xvc3VyZSB0cmlhbmdsZSkKICAgICAgICAgICAgIC8v IGhhbmRsZWQgdGhlIG1vdXNlIGRvd24uIEluIHRoaXMgY2FzZSB3ZSB3YW50IHRvIGNsZWFyIHRo ZSBzZWxlY3Rpb24gYW5kIGRvbid0IG1ha2UgYSBuZXcgc2VsZWN0aW9uLgo= 286026 2016-08-14 13:08:00 -0700 2016-08-15 22:02:35 -0700 Patch bug-151836-20160814130616.patch text/plain 3358 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDc3YjliMjNiYjA0ZWZiMGVjNTMzZWI4MDU2NGEy NDdkNzFmZjJiZWMuLjljMjZkYmRjZjU5MjE3OTRjYWJjMGQ2YzE1YTg2YTA4NmI4ZTM0NTggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE2LTA4LTE0ICBEZXZp biBSb3Vzc28gIDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IGFkZCAiQ29weSBTZWxlY3RlZCIgY29udGV4dCBtZW51IGl0ZW0gdG8gQ29uc29sZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUxODM2CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBMb2NhbGl6 YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanM6CisgICAgICAgICogVXNlckludGVy ZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Mb2dD b250ZW50Vmlldy5wcm90b3R5cGUuX3ByZXZpb3VzTWVzc2FnZVJlcGVhdENvdW50VXBkYXRlZCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuTG9nQ29udGVudFZpZXcucHJvdG90eXBlLl9oYW5kbGVD b250ZXh0TWVudUV2ZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Mb2dDb250ZW50Vmlldy5w cm90b3R5cGUuX21vdXNlZG93bik6CisKIDIwMTYtMDgtMTIgIFRpbW90aHkgSGF0Y2hlciAgPHRp bW90aHlAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEFkZCBhcHBsaWNhdGlv bi92bmQuYXBpK2pzb24gYXMgYSB2YWxpZCBKU09OIE1JTUUtdHlwZQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5n cy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2Fs aXplZFN0cmluZ3MuanMKaW5kZXggOTk5OTYyMzYwNmQzYmY4ZTc0MmZkMzBmYmJhOTc0N2UyOGI2 ZjU4ZS4uNmZmM2M4NDgwYTRmZDM1MzNmY2RmNmQ1YmE4ZGE2ZjY3YjhjNGQxMCAxMDA2NDQKR0lU IGJpbmFyeSBwYXRjaApkZWx0YSA0Nwp6Y21lQT0lbGhSaz54UlhWe0p7KlYzXl9vWSV1b1UoUXpp I1FpY2p3c1czLXdhQUhtaFVJQ0FecU5YRitwMEVASGAKQU84QGA+CgpkZWx0YSAxOAphY21leHpt YkwzRj54UlhWJkFkX0RkN35KZ144ZiU7eENoR3MKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmpzCmluZGV4 IDJlYzQ2ZWIxZDE3MjJkYTAwY2QxZWM1ZTVjYTRmNGZmZjcxNjhkMTguLmM0NzIwMWViYjM2OTEx ZGY1NmRhZTUxYzE3ZWEyYmI1YjJlMzJkODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmpzCkBAIC0z MzMsMTMgKzMzMywxNiBAQCBXZWJJbnNwZWN0b3IuTG9nQ29udGVudFZpZXcgPSBjbGFzcyBMb2dD b250ZW50VmlldyBleHRlbmRzIFdlYkluc3BlY3Rvci5Db250ZW50VgogICAgIH0KIAogICAgIF9w cmV2aW91c01lc3NhZ2VSZXBlYXRDb3VudFVwZGF0ZWQoZXZlbnQpCi0gICAgeyAgICAgICAgCisg ICAgewogICAgICAgICBpZiAodGhpcy5fbG9nVmlld0NvbnRyb2xsZXIudXBkYXRlUHJldmlvdXNN ZXNzYWdlUmVwZWF0Q291bnQoZXZlbnQuZGF0YS5jb3VudCkgJiYgdGhpcy5fbGFzdE1lc3NhZ2VW aWV3KQogICAgICAgICAgICAgdGhpcy5fbWFya1Njb3BlQmFySXRlbVVucmVhZCh0aGlzLl9sYXN0 TWVzc2FnZVZpZXcubWVzc2FnZS5sZXZlbCk7CiAgICAgfQogCiAgICAgX2hhbmRsZUNvbnRleHRN ZW51RXZlbnQoZXZlbnQpCiAgICAgeworICAgICAgICBpZiAoIXRoaXMuX3NlbGVjdGVkTWVzc2Fn ZXMubGVuZ3RoKQorICAgICAgICAgICAgdGhpcy5fbW91c2V1cChldmVudCk7CisKICAgICAgICAg aWYgKCF3aW5kb3cuZ2V0U2VsZWN0aW9uKCkuaXNDb2xsYXBzZWQpIHsKICAgICAgICAgICAgIC8v IElmIHRoZXJlIGlzIGEgc2VsZWN0aW9uLCB3ZSB3YW50IHRvIHNob3cgb3VyIG5vcm1hbCBjb250 ZXh0IG1lbnUKICAgICAgICAgICAgIC8vICh3aXRoIENvcHksIGV0Yy4pLCBhbmQgbm90IENsZWFy IExvZy4KQEAgLTM1MSw2ICszNTQsMTQgQEAgV2ViSW5zcGVjdG9yLkxvZ0NvbnRlbnRWaWV3ID0g Y2xhc3MgTG9nQ29udGVudFZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuQ29udGVudFYKICAgICAg ICAgICAgIHJldHVybjsKIAogICAgICAgICBsZXQgY29udGV4dE1lbnUgPSBXZWJJbnNwZWN0b3Iu Q29udGV4dE1lbnUuY3JlYXRlRnJvbUV2ZW50KGV2ZW50KTsKKworICAgICAgICBpZiAodGhpcy5f c2VsZWN0ZWRNZXNzYWdlcy5sZW5ndGgpIHsKKyAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVu ZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDb3B5IFNlbGVjdGVkIiksICgpID0+IHsKKyAg ICAgICAgICAgICAgICBJbnNwZWN0b3JGcm9udGVuZEhvc3QuY29weVRleHQodGhpcy5fZm9ybWF0 TWVzc2FnZXNBc0RhdGEodHJ1ZSkpOworICAgICAgICAgICAgfSk7CisgICAgICAgICAgICBjb250 ZXh0TWVudS5hcHBlbmRTZXBhcmF0b3IoKTsKKyAgICAgICAgfQorCiAgICAgICAgIGNvbnRleHRN ZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDbGVhciBMb2ciKSwgdGhpcy5f Y2xlYXJMb2cuYmluZCh0aGlzKSk7CiAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZFNlcGFyYXRv cigpOwogCkBAIC0zNjAsNyArMzcxLDcgQEAgV2ViSW5zcGVjdG9yLkxvZ0NvbnRlbnRWaWV3ID0g Y2xhc3MgTG9nQ29udGVudFZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuQ29udGVudFYKIAogICAg IF9tb3VzZWRvd24oZXZlbnQpCiAgICAgewotICAgICAgICBpZiAoZXZlbnQuYnV0dG9uICE9PSAw IHx8IGV2ZW50LmN0cmxLZXkpCisgICAgICAgIGlmICh0aGlzLl9zZWxlY3RlZE1lc3NhZ2VzLmxl bmd0aCAmJiAoZXZlbnQuYnV0dG9uICE9PSAwIHx8IGV2ZW50LmN0cmxLZXkpKQogICAgICAgICAg ICAgcmV0dXJuOwogCiAgICAgICAgIGlmIChldmVudC5kZWZhdWx0UHJldmVudGVkKSB7Cg== 286150 2016-08-15 22:02:41 -0700 2016-08-16 10:07:30 -0700 Patch bug-151836-20160815220054.patch text/plain 3978 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDc3YjliMjNiYjA0ZWZiMGVjNTMzZWI4MDU2NGEy NDdkNzFmZjJiZWMuLjljMjZkYmRjZjU5MjE3OTRjYWJjMGQ2YzE1YTg2YTA4NmI4ZTM0NTggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE2LTA4LTE0ICBEZXZp biBSb3Vzc28gIDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IGFkZCAiQ29weSBTZWxlY3RlZCIgY29udGV4dCBtZW51IGl0ZW0gdG8gQ29uc29sZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUxODM2CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBMb2NhbGl6 YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanM6CisgICAgICAgICogVXNlckludGVy ZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Mb2dD b250ZW50Vmlldy5wcm90b3R5cGUuX3ByZXZpb3VzTWVzc2FnZVJlcGVhdENvdW50VXBkYXRlZCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuTG9nQ29udGVudFZpZXcucHJvdG90eXBlLl9oYW5kbGVD b250ZXh0TWVudUV2ZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Mb2dDb250ZW50Vmlldy5w cm90b3R5cGUuX21vdXNlZG93bik6CisKIDIwMTYtMDgtMTIgIFRpbW90aHkgSGF0Y2hlciAgPHRp bW90aHlAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEFkZCBhcHBsaWNhdGlv bi92bmQuYXBpK2pzb24gYXMgYSB2YWxpZCBKU09OIE1JTUUtdHlwZQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5n cy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2Fs aXplZFN0cmluZ3MuanMKaW5kZXggOTk5OTYyMzYwNmQzYmY4ZTc0MmZkMzBmYmJhOTc0N2UyOGI2 ZjU4ZS4uNmZmM2M4NDgwYTRmZDM1MzNmY2RmNmQ1YmE4ZGE2ZjY3YjhjNGQxMCAxMDA2NDQKR0lU IGJpbmFyeSBwYXRjaApkZWx0YSA0Nwp6Y21lQT0lbGhSaz54UlhWe0p7KlYzXl9vWSV1b1UoUXpp I1FpY2p3c1czLXdhQUhtaFVJQ0FecU5YRitwMEVASGAKQU84QGA+CgpkZWx0YSAxOAphY21leHpt YkwzRj54UlhWJkFkX0RkN35KZ144ZiU7eENoR3MKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmpzCmluZGV4 IDJlYzQ2ZWIxZDE3MjJkYTAwY2QxZWM1ZTVjYTRmNGZmZjcxNjhkMTguLjM5MTg2ZTJhMWYxZWQ5 YmEzNWEzOTQ4ZjE4YWQyZDM5NmZiNDdmYWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmpzCkBAIC0z MzMsNyArMzMzLDcgQEAgV2ViSW5zcGVjdG9yLkxvZ0NvbnRlbnRWaWV3ID0gY2xhc3MgTG9nQ29u dGVudFZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuQ29udGVudFYKICAgICB9CiAKICAgICBfcHJl dmlvdXNNZXNzYWdlUmVwZWF0Q291bnRVcGRhdGVkKGV2ZW50KQotICAgIHsgICAgICAgIAorICAg IHsKICAgICAgICAgaWYgKHRoaXMuX2xvZ1ZpZXdDb250cm9sbGVyLnVwZGF0ZVByZXZpb3VzTWVz c2FnZVJlcGVhdENvdW50KGV2ZW50LmRhdGEuY291bnQpICYmIHRoaXMuX2xhc3RNZXNzYWdlVmll dykKICAgICAgICAgICAgIHRoaXMuX21hcmtTY29wZUJhckl0ZW1VbnJlYWQodGhpcy5fbGFzdE1l c3NhZ2VWaWV3Lm1lc3NhZ2UubGV2ZWwpOwogICAgIH0KQEAgLTM0NiwxMSArMzQ2LDMyIEBAIFdl Ykluc3BlY3Rvci5Mb2dDb250ZW50VmlldyA9IGNsYXNzIExvZ0NvbnRlbnRWaWV3IGV4dGVuZHMg V2ViSW5zcGVjdG9yLkNvbnRlbnRWCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIAor ICAgICAgICAvLyBJbiB0aGUgY2FzZSB0aGF0IHRoZXJlIGFyZSBzZWxlY3RlZCBtZXNzYWdlcywg b25seSBjbGVhciB0aGF0IHNlbGVjdGlvbiBpZiB0aGUgcmlnaHQtY2xpY2sKKyAgICAgICAgLy8g aXMgbm90IG9uIHRoZSBlbGVtZW50IG9yIGRlc2NlbmRhbnRzIG9mIHRoZSBzZWxlY3RlZCBtZXNz YWdlcy4KKyAgICAgICAgaWYgKHRoaXMuX3NlbGVjdGVkTWVzc2FnZXMubGVuZ3RoICYmICF0aGlz Ll9zZWxlY3RlZE1lc3NhZ2VzLnNvbWUoZWxlbWVudCA9PiBldmVudC50YXJnZXQuaXNTZWxmT3JE ZXNjZW5kYW50KGVsZW1lbnQpKSkgeworICAgICAgICAgICAgdGhpcy5fY2xlYXJNZXNzYWdlc1Nl bGVjdGlvbigpOworICAgICAgICAgICAgdGhpcy5fbW91c2Vkb3duKGV2ZW50KTsKKyAgICAgICAg fQorCisgICAgICAgIC8vIElmIHRoZXJlIGFyZSBubyBzZWxlY3RlZCBtZXNzYWdlcywgcmlnaHQt Y2xpY2tpbmcgd2lsbCBub3QgcmVzZXQgdGhlIGN1cnJlbnQgbW91c2Ugc3RhdGUKKyAgICAgICAg Ly8gbWVhbmluZyB0aGF0IHdoZW4gdGhlIGNvbnRleHQgbWVudSBpcyBkaXNtaXNzZWQsIGNvbnNv bGUgbWVzc2FnZXMgd2lsbCBiZSBzZWxlY3RlZCB3aGVuCisgICAgICAgIC8vIHRoZSB1c2VyIG1v dmVzIHRoZSBtb3VzZSBldmVuIHRob3VnaCBubyBidXR0b25zIGFyZSBwcmVzc2VkLgorICAgICAg ICBpZiAoIXRoaXMuX3NlbGVjdGVkTWVzc2FnZXMubGVuZ3RoKQorICAgICAgICAgICAgdGhpcy5f bW91c2V1cChldmVudCk7CisKICAgICAgICAgLy8gV2UgZG9uJ3Qgd2FudCB0byBzaG93IHRoZSBj dXN0b20gbWVudSBmb3IgbGlua3MgaW4gdGhlIGNvbnNvbGUuCiAgICAgICAgIGlmIChldmVudC50 YXJnZXQuZW5jbG9zaW5nTm9kZU9yU2VsZldpdGhOb2RlTmFtZSgiYSIpKQogICAgICAgICAgICAg cmV0dXJuOwogCiAgICAgICAgIGxldCBjb250ZXh0TWVudSA9IFdlYkluc3BlY3Rvci5Db250ZXh0 TWVudS5jcmVhdGVGcm9tRXZlbnQoZXZlbnQpOworCisgICAgICAgIGlmICh0aGlzLl9zZWxlY3Rl ZE1lc3NhZ2VzLmxlbmd0aCkgeworICAgICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShX ZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNvcHkgU2VsZWN0ZWQiKSwgKCkgPT4geworICAgICAgICAg ICAgICAgIEluc3BlY3RvckZyb250ZW5kSG9zdC5jb3B5VGV4dCh0aGlzLl9mb3JtYXRNZXNzYWdl c0FzRGF0YSh0cnVlKSk7CisgICAgICAgICAgICB9KTsKKyAgICAgICAgICAgIGNvbnRleHRNZW51 LmFwcGVuZFNlcGFyYXRvcigpOworICAgICAgICB9CisKICAgICAgICAgY29udGV4dE1lbnUuYXBw ZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNsZWFyIExvZyIpLCB0aGlzLl9jbGVhckxv Zy5iaW5kKHRoaXMpKTsKICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kU2VwYXJhdG9yKCk7CiAK QEAgLTM2MCw3ICszODEsNyBAQCBXZWJJbnNwZWN0b3IuTG9nQ29udGVudFZpZXcgPSBjbGFzcyBM b2dDb250ZW50VmlldyBleHRlbmRzIFdlYkluc3BlY3Rvci5Db250ZW50VgogCiAgICAgX21vdXNl ZG93bihldmVudCkKICAgICB7Ci0gICAgICAgIGlmIChldmVudC5idXR0b24gIT09IDAgfHwgZXZl bnQuY3RybEtleSkKKyAgICAgICAgaWYgKHRoaXMuX3NlbGVjdGVkTWVzc2FnZXMubGVuZ3RoICYm IChldmVudC5idXR0b24gIT09IDAgfHwgZXZlbnQuY3RybEtleSkpCiAgICAgICAgICAgICByZXR1 cm47CiAKICAgICAgICAgaWYgKGV2ZW50LmRlZmF1bHRQcmV2ZW50ZWQpIHsK