145399 2015-05-26 18:31:58 -0700 Web Inspector: Highlighting a CSS section does not deselect previously highlighted CSS sections 2015-06-05 18:16:55 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Minor --- 1 hi webkit-unassigned commit-queue graouts hi joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1097566 0 hi 2015-05-26 18:31:58 -0700 In Elements > Styles > Rules, it is possible to highlight one section (such as the CSS applied to the "body") and then highlight another section (such as a specific div element) without de-highlighting the first section. In a section with highlighted content, the only way to de-highlight that content is to click again within that section. Clicking outside that section will not effect the highlighted content in any way. It should instead be that clicking outside of one section will de-highlight all content in any other content so that only one piece of content is highlighted/selected at any given time. 1097567 1 webkit-bug-importer 2015-05-26 18:32:38 -0700 <rdar://problem/21116228> 1098893 2 254102 hi 2015-06-02 14:14:30 -0700 Created attachment 254102 Patch 1099871 3 254102 timothy 2015-06-05 11:16:59 -0700 Comment on attachment 254102 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=254102&action=review > Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js:287 > + this._delegate.editorFocused(this); This should check for existence of the auction before calling it. This would also be "cssStyleDeclarationSectionEditorFocused". > Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js:73 > + if (typeof this._delegate.editorFocused === "function") Delegate methods should be prefixed with the class name, so they can't conflict with others or built-in methods. So this should be "cssStyleDeclarationTextEditorFocused" to match the other delegate methods on this class. > Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js:330 > + if (typeof this._delegate.editorFocused === "function") > + this._delegate.editorFocused(); Ditto. > Source/WebInspectorUI/UserInterface/Views/RulesStyleDetailsPanel.js:260 > + editorFocused(ignoredSection) This would be cssStyleDeclarationSectionEditorFocused. 1099984 4 254391 hi 2015-06-05 15:16:35 -0700 Created attachment 254391 Patch 1100037 5 254391 commit-queue 2015-06-05 18:16:51 -0700 Comment on attachment 254391 Patch Clearing flags on attachment: 254391 Committed r185279: <http://trac.webkit.org/changeset/185279> 1100038 6 commit-queue 2015-06-05 18:16:55 -0700 All reviewed patches have been landed. Closing bug. 254102 2015-06-02 14:14:30 -0700 2015-06-05 15:16:31 -0700 Patch bug-145399-20150602141411.patch text/plain 5779 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDQ4MWEzOGE4OTBhOGI4YmU3YzA0NjY5ZGM0MGUy MzFkZGYxYmFkZTkuLmQ0ZjMzZDc0ZDFhNDA0MDhhOGMyNTM5Mjk3YjU1MGZhMmRlNDM0YWYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE1LTA2LTAyICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBI aWdobGlnaHRpbmcgYSBDU1Mgc2VjdGlvbiBkb2VzIG5vdCBkZXNlbGVjdCBwcmV2aW91c2x5IGhp Z2hsaWdodGVkIENTUyBzZWN0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTQ1Mzk5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVjbGFyYXRpb25T ZWN0aW9uLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb25TZWN0 aW9uKTogQWRkZWQgZGVsZWdhdGUgdmFyaWFibGUgdG8gY29uc3RydWN0b3IuCisgICAgICAgIChX ZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24ucHJvdG90eXBlLmNsZWFyU2Vs ZWN0aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uU2VjdGlv bi5wcm90b3R5cGUuZWRpdG9yRm9jdXNlZCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3 cy9DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvcik6IEFkZGVkIGV2ZW50IGxpc3RlbmVyIHRv IGNvZGVNaXJyb3Igb24gImZvY3VzIi4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NTdHlsZURl Y2xhcmF0aW9uVGV4dEVkaXRvci5wcm90b3R5cGUuY2xlYXJTZWxlY3Rpb24pOiBTZXRzIHRoZSBj dXJzb3Igb2YgdGhlIGNvZGVNaXJyb3IgdG8gY2hhcmFjdGVyIDAgb24gbGluZSAwLgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLnByb3RvdHlwZS5f ZWRpdG9yRm9jdXNlZCk6IEZ1bmN0aW9uIHRoYXQgY2FsbHMgdGhlIGRlbGVnYXRlIGZ1bmN0aW9u ICJlZGl0b3JGb2N1c2VkIiB3aGVuIHRoZSBjb2RlTWlycm9yIGlzIGZvY3VzZWQKKyAgICAgICAg KiBVc2VySW50ZXJmYWNlL1ZpZXdzL1J1bGVzU3R5bGVEZXRhaWxzUGFuZWwuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuUnVsZXNTdHlsZURldGFpbHNQYW5lbC5wcm90b3R5cGUucmVmcmVzaC5h cHBlbmRTdHlsZVNlY3Rpb24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJ1bGVzU3R5bGVEZXRh aWxzUGFuZWwucHJvdG90eXBlLmVkaXRvckZvY3VzZWQpOiBMb29wcyB0aHJvdWdoIGFsbCBzZWN0 aW9ucyBleGNlcHQgZm9yIHRoZSBpZ25vcmVkU2VjdGlvbiAocGFyYW1ldGVyKSBhbmQgY2xlYXJz IHRoZSBzZWxlY3RlZCB0ZXh0IGluIGVhY2ggb2YgdGhlbS4KKwogMjAxNS0wNi0wMSAgSm9ubyBX ZWxscyAgPGpvbm93ZWxsc0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogVHlw ZSB0b2tlbiB0ZXh0IGRlc2NlbmRlcnMgdG91Y2ggYm90dG9tIG9mIGNvbnRhaW5lcgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ1NTU3R5bGVE ZWNsYXJhdGlvblNlY3Rpb24uanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9DU1NTdHlsZURlY2xhcmF0aW9uU2VjdGlvbi5qcwppbmRleCAyMzhlMjU2ODdlZmRl OGM3MzljY2E1NDk2OWI0NjczZDdhYjkyZWVhLi44NWExYmUxMWVkZDdhMDU2MDFhY2RhYjJiNWJk ZmQwN2I1MmU2ZmZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9DU1NTdHlsZURlY2xhcmF0aW9uU2VjdGlvbi5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DU1NTdHlsZURlY2xhcmF0aW9uU2VjdGlv bi5qcwpAQCAtMjMsMTEgKzIzLDEzIEBACiAgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1B R0UuCiAgKi8KIAotV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uID0gZnVu Y3Rpb24oc3R5bGUpCitXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24gPSBm dW5jdGlvbihkZWxlZ2F0ZSwgc3R5bGUpCiB7CiAgICAgLy8gRklYTUU6IENvbnZlcnQgdGhpcyB0 byBhIFdlYkluc3BlY3Rvci5PYmplY3Qgc3ViY2xhc3MsIGFuZCBjYWxsIHN1cGVyKCkuCiAgICAg Ly8gV2ViSW5zcGVjdG9yLk9iamVjdC5jYWxsKHRoaXMpOwogCisgICAgdGhpcy5fZGVsZWdhdGUg PSBkZWxlZ2F0ZSB8fCBudWxsOworCiAgICAgY29uc29sZS5hc3NlcnQoc3R5bGUpOwogICAgIHRo aXMuX3N0eWxlID0gc3R5bGUgfHwgbnVsbDsKIApAQCAtMjc1LDYgKzI3NywxNiBAQCBXZWJJbnNw ZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24ucHJvdG90eXBlID0gewogICAgICAgICB0 aGlzLl9wcm9wZXJ0aWVzVGV4dEVkaXRvci51cGRhdGVMYXlvdXQoKTsKICAgICB9LAogCisgICAg Y2xlYXJTZWxlY3Rpb246IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHRoaXMuX3Byb3BlcnRp ZXNUZXh0RWRpdG9yLmNsZWFyU2VsZWN0aW9uKCk7CisgICAgfSwKKworICAgIGVkaXRvckZvY3Vz ZWQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHRoaXMuX2RlbGVnYXRlLmVkaXRvckZvY3Vz ZWQodGhpcyk7CisgICAgfSwKKwogICAgIC8vIFByaXZhdGUKIAogICAgIF9jb21taXRTZWxlY3Rv cjogZnVuY3Rpb24obXV0YXRpb25zKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IuanMgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DU1NTdHlsZURlY2xhcmF0 aW9uVGV4dEVkaXRvci5qcwppbmRleCAzZjk3NmM3MDFjNzhjYWJjMjI5NTdlODZmOWQ1YjRkNTBj ZDYyOTc4Li4xNGI5MDU4MDljMzJkZmQyZjYzNWYzMWRmZDBhMmZmNzA5ZjM3YTAwIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DU1NTdHlsZURl Y2xhcmF0aW9uVGV4dEVkaXRvci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvci5qcwpAQCAtNzAsNiAr NzAsOSBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IgPSBjbGFz cyBDU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvcgogICAgICAgICB0aGlzLl9jb2RlTWlycm9y Lm9uKCJjaGFuZ2UiLCB0aGlzLl9jb250ZW50Q2hhbmdlZC5iaW5kKHRoaXMpKTsKICAgICAgICAg dGhpcy5fY29kZU1pcnJvci5vbigiYmx1ciIsIHRoaXMuX2VkaXRvckJsdXJlZC5iaW5kKHRoaXMp KTsKIAorICAgICAgICBpZiAodHlwZW9mIHRoaXMuX2RlbGVnYXRlLmVkaXRvckZvY3VzZWQgPT09 ICJmdW5jdGlvbiIpCisgICAgICAgICAgICB0aGlzLl9jb2RlTWlycm9yLm9uKCJmb2N1cyIsIHRo aXMuX2VkaXRvckZvY3VzZWQuYmluZCh0aGlzKSk7CisKICAgICAgICAgdGhpcy5zdHlsZSA9IHN0 eWxlOwogICAgIH0KIApAQCAtMjIxLDYgKzIyNCwxMSBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVE ZWNsYXJhdGlvblRleHRFZGl0b3IgPSBjbGFzcyBDU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRv cgogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCisgICAgY2xlYXJTZWxlY3Rpb24oKQor ICAgIHsKKyAgICAgICAgdGhpcy5fY29kZU1pcnJvci5zZXRDdXJzb3Ioe2xpbmU6IDAsIGNoOiAw fSk7CisgICAgfQorCiAgICAgLy8gUHJvdGVjdGVkCiAKICAgICBkaWREaXNtaXNzUG9wb3Zlcihw b3BvdmVyKQpAQCAtMzE2LDYgKzMyNCwxMiBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJh dGlvblRleHRFZGl0b3IgPSBjbGFzcyBDU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvcgogICAg ICAgICB0aGlzLl9yZXNldENvbnRlbnQoKTsKICAgICB9CiAKKyAgICBfZWRpdG9yRm9jdXNlZChj b2RlTWlycm9yKQorICAgIHsKKyAgICAgICAgaWYgKHR5cGVvZiB0aGlzLl9kZWxlZ2F0ZS5lZGl0 b3JGb2N1c2VkID09PSAiZnVuY3Rpb24iKQorICAgICAgICAgICAgdGhpcy5fZGVsZWdhdGUuZWRp dG9yRm9jdXNlZCgpOworICAgIH0KKwogICAgIF9jb250ZW50Q2hhbmdlZChjb2RlTWlycm9yLCBj aGFuZ2UpCiAgICAgewogICAgICAgICAvLyBSZXR1cm4gZWFybHkgaWYgdGhlIHN0eWxlIGlzbid0 IGVkaXRhYmxlLiBUaGlzIHN0aWxsIGNhbiBiZSBjYWxsZWQgd2hlbiByZWFkT25seSBpcyBzZXQg YmVjYXVzZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvUnVsZXNTdHlsZURldGFpbHNQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1J1bGVzU3R5bGVEZXRhaWxzUGFuZWwuanMKaW5kZXggNTk1ZmU0 MjIxN2Q5MjgwMTQ1NzNlOWJhZDUyNDY4OTNlZjBlZTU5MC4uYTc4NjkxNTNkYjdiM2RkZjQzNWZm ZDdhMTdmZTdlZjYzNGVkNTkzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvUnVsZXNTdHlsZURldGFpbHNQYW5lbC5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SdWxlc1N0eWxlRGV0YWlsc1BhbmVs LmpzCkBAIC0xMjAsNyArMTIwLDcgQEAgV2ViSW5zcGVjdG9yLlJ1bGVzU3R5bGVEZXRhaWxzUGFu ZWwgPSBjbGFzcyBSdWxlc1N0eWxlRGV0YWlsc1BhbmVsIGV4dGVuZHMgV2ViSW4KICAgICAgICAg ICAgICAgICBwcmV2aW91c0ZvY3VzZWRTZWN0aW9uID0gc2VjdGlvbjsKIAogICAgICAgICAgICAg aWYgKCFzZWN0aW9uKSB7Ci0gICAgICAgICAgICAgICAgc2VjdGlvbiA9IG5ldyBXZWJJbnNwZWN0 b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24oc3R5bGUpOworICAgICAgICAgICAgICAgIHNl Y3Rpb24gPSBuZXcgV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uKHRoaXMs IHN0eWxlKTsKICAgICAgICAgICAgICAgICBzdHlsZS5fX3J1bGVzU2VjdGlvbiA9IHNlY3Rpb247 CiAgICAgICAgICAgICB9IGVsc2UKICAgICAgICAgICAgICAgICBzZWN0aW9uLnJlZnJlc2goKTsK QEAgLTI1Nyw2ICsyNTcsMTQgQEAgV2ViSW5zcGVjdG9yLlJ1bGVzU3R5bGVEZXRhaWxzUGFuZWwg PSBjbGFzcyBSdWxlc1N0eWxlRGV0YWlsc1BhbmVsIGV4dGVuZHMgV2ViSW4KICAgICAgICAgcmV0 dXJuIGZhbHNlOwogICAgIH0KIAorICAgIGVkaXRvckZvY3VzZWQoaWdub3JlZFNlY3Rpb24pCisg ICAgeworICAgICAgICBmb3IgKHZhciBzZWN0aW9uIG9mIHRoaXMuX3NlY3Rpb25zKSB7CisgICAg ICAgICAgICBpZiAoc2VjdGlvbiAhPT0gaWdub3JlZFNlY3Rpb24pCisgICAgICAgICAgICAgICAg c2VjdGlvbi5jbGVhclNlbGVjdGlvbigpOworICAgICAgICB9CisgICAgfQorCiAgICAgLy8gUHJv dGVjdGVkCiAKICAgICBzaG93bigpCg== 254391 2015-06-05 15:16:35 -0700 2015-06-05 18:16:51 -0700 Patch bug-145399-20150605151612.patch text/plain 6103 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDE5NjlkOWQ0ZjkzZjAxYjg3YjJlM2FkY2UyYWM2 ZmY4ZGE5MTk1NDcuLjhiNjZkZWVhNmRhNDFlODY2MmVlOTY3Y2UxOWIxYmM1MmQzMDI1MmYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE1LTA2LTAyICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBI aWdobGlnaHRpbmcgYSBDU1Mgc2VjdGlvbiBkb2VzIG5vdCBkZXNlbGVjdCBwcmV2aW91c2x5IGhp Z2hsaWdodGVkIENTUyBzZWN0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTQ1Mzk5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVjbGFyYXRpb25T ZWN0aW9uLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb25TZWN0 aW9uKTogQWRkZWQgZGVsZWdhdGUgdmFyaWFibGUgdG8gY29uc3RydWN0b3IuCisgICAgICAgIChX ZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24ucHJvdG90eXBlLmNsZWFyU2Vs ZWN0aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uU2VjdGlv bi5wcm90b3R5cGUuY3NzU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3JGb2N1c2VkKToKKyAgICAg ICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yKTog QWRkZWQgZXZlbnQgbGlzdGVuZXIgdG8gY29kZU1pcnJvciBvbiAiZm9jdXMiLgorICAgICAgICAo V2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLnByb3RvdHlwZS5jbGVh clNlbGVjdGlvbik6IFNldHMgdGhlIGN1cnNvciBvZiB0aGUgY29kZU1pcnJvciB0byBjaGFyYWN0 ZXIgMCBvbiBsaW5lIDAuCisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlv blRleHRFZGl0b3IucHJvdG90eXBlLl9lZGl0b3JGb2N1c2VkKTogRnVuY3Rpb24gdGhhdCBjYWxs cyB0aGUgZGVsZWdhdGUgZnVuY3Rpb24gImVkaXRvckZvY3VzZWQiIHdoZW4gdGhlIGNvZGVNaXJy b3IgaXMgZm9jdXNlZAorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvUnVsZXNTdHlsZURl dGFpbHNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SdWxlc1N0eWxlRGV0YWlsc1Bh bmVsLnByb3RvdHlwZS5yZWZyZXNoLmFwcGVuZFN0eWxlU2VjdGlvbik6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuUnVsZXNTdHlsZURldGFpbHNQYW5lbC5wcm90b3R5cGUuY3NzU3R5bGVEZWNsYXJh dGlvblNlY3Rpb25FZGl0b3JGb2N1c2VkKTogTG9vcHMgdGhyb3VnaCBhbGwgc2VjdGlvbnMgZXhj ZXB0IGZvciB0aGUgaWdub3JlZFNlY3Rpb24gKHBhcmFtZXRlcikgYW5kIGNsZWFycyB0aGUgc2Vs ZWN0ZWQgdGV4dCBpbiBlYWNoIG9mIHRoZW0uCisKIDIwMTUtMDYtMDUgIE5pa2l0YSBWYXNpbHll diAgPG52YXNpbHlldkBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogW1JFR1JF U1NJT05dIERhc2hib2FyZCdzIHJlc291cmNlIGNvdW50IGRvZXMgbm90IHJlc2V0IHdoZW4gbWFp biByZXNvdXJjZSBuYXZpZ2F0ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uLmpzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ1NTU3R5bGVEZWNsYXJhdGlvblNl Y3Rpb24uanMKaW5kZXggMjM4ZTI1Njg3ZWZkZThjNzM5Y2NhNTQ5NjliNDY3M2Q3YWI5MmVlYS4u MTE3NGU1YTA0Njc5N2I1ZmZhYzYzYThmNjQ4OTMwODZhYzRhMDA4NyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ1NTU3R5bGVEZWNsYXJhdGlv blNlY3Rpb24uanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvQ1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24uanMKQEAgLTIzLDExICsyMywxMyBAQAogICog VEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICovCiAKLVdlYkluc3BlY3Rvci5DU1NT dHlsZURlY2xhcmF0aW9uU2VjdGlvbiA9IGZ1bmN0aW9uKHN0eWxlKQorV2ViSW5zcGVjdG9yLkNT U1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uID0gZnVuY3Rpb24oZGVsZWdhdGUsIHN0eWxlKQogewog ICAgIC8vIEZJWE1FOiBDb252ZXJ0IHRoaXMgdG8gYSBXZWJJbnNwZWN0b3IuT2JqZWN0IHN1YmNs YXNzLCBhbmQgY2FsbCBzdXBlcigpLgogICAgIC8vIFdlYkluc3BlY3Rvci5PYmplY3QuY2FsbCh0 aGlzKTsKIAorICAgIHRoaXMuX2RlbGVnYXRlID0gZGVsZWdhdGUgfHwgbnVsbDsKKwogICAgIGNv bnNvbGUuYXNzZXJ0KHN0eWxlKTsKICAgICB0aGlzLl9zdHlsZSA9IHN0eWxlIHx8IG51bGw7CiAK QEAgLTI3NSw2ICsyNzcsMTcgQEAgV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb25TZWN0 aW9uLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fcHJvcGVydGllc1RleHRFZGl0b3IudXBk YXRlTGF5b3V0KCk7CiAgICAgfSwKIAorICAgIGNsZWFyU2VsZWN0aW9uOiBmdW5jdGlvbigpCisg ICAgeworICAgICAgICB0aGlzLl9wcm9wZXJ0aWVzVGV4dEVkaXRvci5jbGVhclNlbGVjdGlvbigp OworICAgIH0sCisKKyAgICBjc3NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvckZvY3VzZWQ6IGZ1 bmN0aW9uKCkKKyAgICB7CisgICAgICAgIGlmICh0eXBlb2YgdGhpcy5fZGVsZWdhdGUuY3NzU3R5 bGVEZWNsYXJhdGlvblNlY3Rpb25FZGl0b3JGb2N1c2VkID09PSAiZnVuY3Rpb24iKQorICAgICAg ICAgICAgdGhpcy5fZGVsZWdhdGUuY3NzU3R5bGVEZWNsYXJhdGlvblNlY3Rpb25FZGl0b3JGb2N1 c2VkKHRoaXMpOworICAgIH0sCisKICAgICAvLyBQcml2YXRlCiAKICAgICBfY29tbWl0U2VsZWN0 b3I6IGZ1bmN0aW9uKG11dGF0aW9ucykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ1NTU3R5bGVEZWNsYXJh dGlvblRleHRFZGl0b3IuanMKaW5kZXggODU2NDYyOThjYmU4MTY0ZDMwMWUyNjM3NWMxNTI2MzZk M2ViOWVlNC4uMWYzZTBjOGJlOTJmN2FhNGE4ZjY5YWY5YmE4MjVkZjgxZTE3ZmQ4OCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ1NTU3R5bGVE ZWNsYXJhdGlvblRleHRFZGl0b3IuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IuanMKQEAgLTcwLDYg KzcwLDkgQEAgV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yID0gY2xh c3MgQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IKICAgICAgICAgdGhpcy5fY29kZU1pcnJv ci5vbigiY2hhbmdlIiwgdGhpcy5fY29udGVudENoYW5nZWQuYmluZCh0aGlzKSk7CiAgICAgICAg IHRoaXMuX2NvZGVNaXJyb3Iub24oImJsdXIiLCB0aGlzLl9lZGl0b3JCbHVyZWQuYmluZCh0aGlz KSk7CiAKKyAgICAgICAgaWYgKHR5cGVvZiB0aGlzLl9kZWxlZ2F0ZS5jc3NTdHlsZURlY2xhcmF0 aW9uVGV4dEVkaXRvckZvY3VzZWQgPT09ICJmdW5jdGlvbiIpCisgICAgICAgICAgICB0aGlzLl9j b2RlTWlycm9yLm9uKCJmb2N1cyIsIHRoaXMuX2VkaXRvckZvY3VzZWQuYmluZCh0aGlzKSk7CisK ICAgICAgICAgdGhpcy5zdHlsZSA9IHN0eWxlOwogICAgIH0KIApAQCAtMjIxLDYgKzIyNCwxMSBA QCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IgPSBjbGFzcyBDU1NT dHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvcgogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQog CisgICAgY2xlYXJTZWxlY3Rpb24oKQorICAgIHsKKyAgICAgICAgdGhpcy5fY29kZU1pcnJvci5z ZXRDdXJzb3Ioe2xpbmU6IDAsIGNoOiAwfSk7CisgICAgfQorCiAgICAgLy8gUHJvdGVjdGVkCiAK ICAgICBkaWREaXNtaXNzUG9wb3Zlcihwb3BvdmVyKQpAQCAtMzE2LDYgKzMyNCwxMiBAQCBXZWJJ bnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IgPSBjbGFzcyBDU1NTdHlsZURl Y2xhcmF0aW9uVGV4dEVkaXRvcgogICAgICAgICB0aGlzLl9yZXNldENvbnRlbnQoKTsKICAgICB9 CiAKKyAgICBfZWRpdG9yRm9jdXNlZChjb2RlTWlycm9yKQorICAgIHsKKyAgICAgICAgaWYgKHR5 cGVvZiB0aGlzLl9kZWxlZ2F0ZS5jc3NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvckZvY3VzZWQg PT09ICJmdW5jdGlvbiIpCisgICAgICAgICAgICB0aGlzLl9kZWxlZ2F0ZS5jc3NTdHlsZURlY2xh cmF0aW9uVGV4dEVkaXRvckZvY3VzZWQoKTsKKyAgICB9CisKICAgICBfY29udGVudENoYW5nZWQo Y29kZU1pcnJvciwgY2hhbmdlKQogICAgIHsKICAgICAgICAgLy8gUmV0dXJuIGVhcmx5IGlmIHRo ZSBzdHlsZSBpc24ndCBlZGl0YWJsZS4gVGhpcyBzdGlsbCBjYW4gYmUgY2FsbGVkIHdoZW4gcmVh ZE9ubHkgaXMgc2V0IGJlY2F1c2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1J1bGVzU3R5bGVEZXRhaWxzUGFuZWwuanMgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SdWxlc1N0eWxlRGV0YWlsc1BhbmVsLmpz CmluZGV4IDU5NWZlNDIyMTdkOTI4MDE0NTczZTliYWQ1MjQ2ODkzZWYwZWU1OTAuLjdkMWJjN2Mx YWRlNmQ1MjJhMDg2MGZjOTIwOWMxOWY3YzUzMTY0MTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1J1bGVzU3R5bGVEZXRhaWxzUGFuZWwuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUnVsZXNTdHls ZURldGFpbHNQYW5lbC5qcwpAQCAtMTIwLDcgKzEyMCw3IEBAIFdlYkluc3BlY3Rvci5SdWxlc1N0 eWxlRGV0YWlsc1BhbmVsID0gY2xhc3MgUnVsZXNTdHlsZURldGFpbHNQYW5lbCBleHRlbmRzIFdl YkluCiAgICAgICAgICAgICAgICAgcHJldmlvdXNGb2N1c2VkU2VjdGlvbiA9IHNlY3Rpb247CiAK ICAgICAgICAgICAgIGlmICghc2VjdGlvbikgewotICAgICAgICAgICAgICAgIHNlY3Rpb24gPSBu ZXcgV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uKHN0eWxlKTsKKyAgICAg ICAgICAgICAgICBzZWN0aW9uID0gbmV3IFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9u U2VjdGlvbih0aGlzLCBzdHlsZSk7CiAgICAgICAgICAgICAgICAgc3R5bGUuX19ydWxlc1NlY3Rp b24gPSBzZWN0aW9uOwogICAgICAgICAgICAgfSBlbHNlCiAgICAgICAgICAgICAgICAgc2VjdGlv bi5yZWZyZXNoKCk7CkBAIC0yNTcsNiArMjU3LDE0IEBAIFdlYkluc3BlY3Rvci5SdWxlc1N0eWxl RGV0YWlsc1BhbmVsID0gY2xhc3MgUnVsZXNTdHlsZURldGFpbHNQYW5lbCBleHRlbmRzIFdlYklu CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAKKyAgICBjc3NTdHlsZURlY2xhcmF0aW9u U2VjdGlvbkVkaXRvckZvY3VzZWQoaWdub3JlZFNlY3Rpb24pCisgICAgeworICAgICAgICBmb3Ig KHZhciBzZWN0aW9uIG9mIHRoaXMuX3NlY3Rpb25zKSB7CisgICAgICAgICAgICBpZiAoc2VjdGlv biAhPT0gaWdub3JlZFNlY3Rpb24pCisgICAgICAgICAgICAgICAgc2VjdGlvbi5jbGVhclNlbGVj dGlvbigpOworICAgICAgICB9CisgICAgfQorCiAgICAgLy8gUHJvdGVjdGVkCiAKICAgICBzaG93 bigpCg==