170029 2017-03-23 15:43:10 -0700 Web Inspector: DetailsSection should hide header "options" when collapsed 2017-04-03 15:07:51 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED P2 Normal --- 1 mattbaker mattbaker commit-queue inspector-bugzilla-changes timothy oldest_to_newest 1290623 0 mattbaker 2017-03-23 15:43:10 -0700 Summary: DetailsSection should hide header "options" when collapsed. The current behavior is mixed, and not controlled by DetailsSection. In some cases options are hidden: - Computed Styles panel: "Show All" checkbox - Visual Styles panel: "Add Style Rule" button - Node panel: Event Listeners "Grouping Method" button and in other, they are always shown: - Debugger sidebar: Pause Reason go-to arrow* - Debugger sidebar: "Add XHR Breakpoint" button - Probes - Watch Expressions *This is the only case where an exception makes sense to me, since the command doesn't modify the contents of the DetailsSection. 1290628 1 305234 mattbaker 2017-03-23 15:53:34 -0700 Created attachment 305234 Patch 1290631 2 mattbaker 2017-03-23 15:55:15 -0700 This change came about after noticing that adding an XHR Breakpoint while the section is collapsed is confusing. Initially I considered expanding the section if a breakpoint is added by the user clicking the "+" button, but decided against it. 1293843 3 305234 commit-queue 2017-04-03 15:07:50 -0700 Comment on attachment 305234 Patch Clearing flags on attachment: 305234 Committed r214843: <http://trac.webkit.org/changeset/214843> 1293844 4 commit-queue 2017-04-03 15:07:51 -0700 All reviewed patches have been landed. Closing bug. 305234 2017-03-23 15:53:34 -0700 2017-04-03 15:07:50 -0700 Patch bug-170029-20170323155333.patch text/plain 11423 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMjE0MjQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA1 N2NmY2E3Mjg0OGY0NjJmMDQyNDkzNzZhNjVlYmY1ZjcxMjI3OTE2Li40Yzc2MWYwMjFmN2Q1N2Ex YjA3MzBmOGYxZmMyZjk2N2M0ZDc1MmZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw0NyBAQAorMjAxNy0wMy0yMyAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRGV0YWlsc1NlY3Rpb24gc2hvdWxkIGhpZGUgaGVh ZGVyICJvcHRpb25zIiB3aGVuIGNvbGxhcHNlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcwMDI5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RPTU5vZGVEZXRhaWxz U2lkZWJhclBhbmVsLmNzczoKKyAgICAgICAgKC5zaWRlYmFyID4gLnBhbmVsLmRvbS1ub2RlLWRl dGFpbHMgLmRldGFpbHMtc2VjdGlvbi5kb20tbm9kZS1ldmVudC1saXN0ZW5lcnMgPiAuaGVhZGVy ID4gLmZpbHRlcik6CisgICAgICAgICguc2lkZWJhciA+IC5wYW5lbC5kb20tbm9kZS1kZXRhaWxz IC5kZXRhaWxzLXNlY3Rpb24uZG9tLW5vZGUtZXZlbnQtbGlzdGVuZXJzLmNvbGxhcHNlZCA+IC5o ZWFkZXIgPiAuZmlsdGVyKTogRGVsZXRlZC4KKyAgICAgICAgRGV0YWlsc1NlY3Rpb24gaXMgcmVz cG9uc2libGUgZm9yIGhpZGluZyBvcHRpb25zIHdoZW4gY29sbGFwc2VkLgorCisgICAgICAgICog VXNlckludGVyZmFjZS9WaWV3cy9EZWJ1Z2dlclNpZGViYXJQYW5lbC5jc3M6CisgICAgICAgICgu c2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLmRlYnVnZ2VyIC5kZXRhaWxzLXNlY3Rpb24ucGF1 c2VkLXJlYXNvbi5jb2xsYXBzZWQgPiAuaGVhZGVyID4gLm9wdGlvbnMpOgorCisgICAgICAgICog VXNlckludGVyZmFjZS9WaWV3cy9EZXRhaWxzU2VjdGlvbi5jc3M6CisgICAgICAgIChib2R5W2Rp cj1sdHJdIC5kZXRhaWxzLXNlY3Rpb24gPiAuaGVhZGVyID4gLm9wdGlvbnMsKToKKyAgICAgICAg KGJvZHlbZGlyPWx0cl0gLmRldGFpbHMtc2VjdGlvbiA+IC5oZWFkZXI6OmJlZm9yZSwpOgorICAg ICAgICAoLmRldGFpbHMtc2VjdGlvbi5jb2xsYXBzZWQgID4gLmhlYWRlciA+IC5vcHRpb25zKToK KyAgICAgICAgKGJvZHlbZGlyPWx0cl0gLmRldGFpbHMtc2VjdGlvbiA+IC5oZWFkZXIgPiA6bWF0 Y2hlcyhsYWJlbCwgLm5vZGUtbGluaywgLmdvLXRvLWFycm93KSwpOiBEZWxldGVkLgorICAgICAg ICAoLmRldGFpbHMtc2VjdGlvbi5jb2xsYXBzZWQgID4gLmhlYWRlciA+IGxhYmVsKTogRGVsZXRl ZC4KKyAgICAgICAgUmVtb3ZlZCB1bm5lY2Vzc2FyeSBydWxlcy4gVGhlICJvcHRpb25zIiBjbGFz cyBjb3ZlcnMgdGhlc2UgY2FzZXMuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0Rl dGFpbHNTZWN0aW9uLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRldGFpbHNTZWN0aW9uLnBy b3RvdHlwZS5nZXQgdGl0bGVFbGVtZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZXRhaWxz U2VjdGlvbi5wcm90b3R5cGUuc2V0IHRpdGxlRWxlbWVudCk6CisgICAgICAgIEFkZGVkIHRpdGxl IGVsZW1lbnQgY3VzdG9taXphdGlvbiBzbyB0aGF0IHRoZSBoYWNrIHVzZWQgYnkgUHJvYmVTZXRE ZXRhaWxzU2VjdGlvbgorICAgICAgICB0byBnZXQgYSBsaW5rIGludG8gdGhlIHRpdGxlIGNhbiBi ZSByZW1vdmVkLiBZdWNrIQorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Qcm9iZVNl dERldGFpbHNTZWN0aW9uLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2JlU2V0RGV0YWls c1NlY3Rpb24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2JlU2V0RGV0YWlsc1NlY3Rpb24u cHJvdG90eXBlLl91cGRhdGVMaW5rRWxlbWVudCk6CisgICAgICAgIFVzZSB0aGUgbmV3IERldGFp bHNTZWN0aW9uIHRpdGxlIGVsZW1lbnQgc2V0dGVyLgorCisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9WaXN1YWxTdHlsZURldGFpbHNQYW5lbC5jc3M6CisgICAgICAgICguc2lkZWJhciA+ IC5wYW5lbC5kZXRhaWxzLmNzcy1zdHlsZSAudmlzdWFsID4gLmRldGFpbHMtc2VjdGlvbiAuZGV0 YWlscy1zZWN0aW9uID4gLmhlYWRlciA+IC5vcHRpb25zKToKKyAgICAgICAgKC5zaWRlYmFyID4g LnBhbmVsLmRldGFpbHMuY3NzLXN0eWxlIC52aXN1YWwgPiAuZGV0YWlscy1zZWN0aW9uIC5kZXRh aWxzLXNlY3Rpb24gPiAuaGVhZGVyID4gLnZpc3VhbC1zdHlsZS1zZWN0aW9uLWNsZWFyKTogRGVs ZXRlZC4KKyAgICAgICAgKC5zaWRlYmFyID4gLnBhbmVsLmRldGFpbHMuY3NzLXN0eWxlIC52aXN1 YWwgPiAuZGV0YWlscy1zZWN0aW9uIC5kZXRhaWxzLXNlY3Rpb24uY29sbGFwc2VkID4gLmhlYWRl ciA+IC52aXN1YWwtc3R5bGUtc2VjdGlvbi1jbGVhciwpOiBEZWxldGVkLgorICAgICAgICBSZW1v dmUgdGhlICJ2aXN1YWwtc3R5bGUtc2VjdGlvbi1jbGVhciIgY2xhc3MsIGFzIGl0J3Mgbm8gbG9u Z2VyIG5lZWRlZC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVE ZXRhaWxzUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVEZXRhaWxz UGFuZWwucHJvdG90eXBlLl9nZW5lcmF0ZVNlY3Rpb24uY3JlYXRlT3B0aW9uc0VsZW1lbnQpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlRGV0YWlsc1BhbmVsLnByb3RvdHlwZS5f Z2VuZXJhdGVTZWN0aW9uKToKKwogMjAxNy0wMy0yMCAgRGV2aW4gUm91c3NvICA8d2Via2l0QGRl dmlucm91c3NvLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBSVEw6IG1pbm9yIGxheW91 dCBpc3N1ZXMgaW4gQnJlYWtwb2ludCBFZGl0b3IgcG9wb3ZlcgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NTm9kZURldGFpbHNTaWRlYmFy UGFuZWwuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9N Tm9kZURldGFpbHNTaWRlYmFyUGFuZWwuY3NzCmluZGV4IDY3NTllYzMyNjE4MGVkNjIxNzYxMjc2 ZDdkZjM5NTZiNWUxMmU4NWYuLjY0Nzg4YjIxZWIwN2ZhYjBjMDc1NDIwOGM3NzBiNmU0ZDAwNGEz ZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0RPTU5vZGVEZXRhaWxzU2lkZWJhclBhbmVsLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01Ob2RlRGV0YWlsc1NpZGViYXJQYW5lbC5jc3MKQEAg LTI0LDcgKzI0LDYgQEAKICAqLwogCiAuc2lkZWJhciA+IC5wYW5lbC5kb20tbm9kZS1kZXRhaWxz IC5kZXRhaWxzLXNlY3Rpb24uZG9tLW5vZGUtZXZlbnQtbGlzdGVuZXJzID4gLmhlYWRlciA+IC5m aWx0ZXIgewotICAgIGRpc3BsYXk6IGlubGluZS1ibG9jazsKICAgICBwb3NpdGlvbjogcmVsYXRp dmU7CiAgICAgd2lkdGg6IDE0cHg7CiAgICAgaGVpZ2h0OiAxNHB4OwpAQCAtNDYsMTAgKzQ1LDYg QEAgYm9keVtkaXI9cnRsXSAuc2lkZWJhciA+IC5wYW5lbC5kb20tbm9kZS1kZXRhaWxzIC5kZXRh aWxzLXNlY3Rpb24uZG9tLW5vZGUtZXZlbnQKICAgICBmaWx0ZXI6IGJyaWdodG5lc3MoMC41KTsK IH0KIAotLnNpZGViYXIgPiAucGFuZWwuZG9tLW5vZGUtZGV0YWlscyAuZGV0YWlscy1zZWN0aW9u LmRvbS1ub2RlLWV2ZW50LWxpc3RlbmVycy5jb2xsYXBzZWQgPiAuaGVhZGVyID4gLmZpbHRlciB7 Ci0gICAgZGlzcGxheTogbm9uZTsKLX0KLQogLnNpZGViYXIgPiAucGFuZWwuZG9tLW5vZGUtZGV0 YWlscyAuZGV0YWlscy1zZWN0aW9uLmRvbS1ub2RlLWV2ZW50LWxpc3RlbmVycyA+IC5oZWFkZXIg PiAuZmlsdGVyID4gc2VsZWN0IHsKICAgICBwb3NpdGlvbjogYWJzb2x1dGU7CiAgICAgdG9wOiAw OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv RGVidWdnZXJTaWRlYmFyUGFuZWwuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvRGVidWdnZXJTaWRlYmFyUGFuZWwuY3NzCmluZGV4IDM1NjNjZDA3MDhhYmZh ZmJiZTc2ZmE3YzZlYjc0MGJhYThiY2JmZmEuLjhiOWRiMjkzNzJlNTI0NGMzZTIxYmZkZjJjMTAw MjNmZGQ1MzYzZDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0RlYnVnZ2VyU2lkZWJhclBhbmVsLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EZWJ1Z2dlclNpZGViYXJQYW5lbC5jc3MKQEAgLTc5 LDYgKzc5LDEwIEBACiAgICAgZm9udC1zaXplOiAxMXB4OwogfQogCisuc2lkZWJhciA+IC5wYW5l bC5uYXZpZ2F0aW9uLmRlYnVnZ2VyIC5kZXRhaWxzLXNlY3Rpb24ucGF1c2VkLXJlYXNvbi5jb2xs YXBzZWQgPiAuaGVhZGVyID4gLm9wdGlvbnMgeworICAgIGRpc3BsYXk6IGJsb2NrOworfQorCiAu c2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLmRlYnVnZ2VyIC5kZXRhaWxzLXNlY3Rpb24gPiAu Y29udGVudCB7CiAgICAgZGlzcGxheTogYmxvY2s7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EZXRhaWxzU2VjdGlvbi5jc3MgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EZXRhaWxzU2VjdGlvbi5jc3MK aW5kZXggNjZmOWQ3ZWY4YzBkNWJkOWQ1MmIzZWE3YzQ3MjIyYzhmNGQ1OThjMy4uNjBkMGQyZDJi NDk4Mjg1YjY1ZjkyOTUyOTA2MjQ0YzA2MDA1ZTEzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGV0YWlsc1NlY3Rpb24uY3NzCisrKyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RldGFpbHNTZWN0aW9uLmNz cwpAQCAtNzksMTUgKzc5LDEzIEBAIGJvZHlbZGlyPXJ0bF0gLmRldGFpbHMtc2VjdGlvbiA+IC5o ZWFkZXIgewogICAgIGJvcmRlcjogbm9uZTsKIH0KIAotYm9keVtkaXI9bHRyXSAuZGV0YWlscy1z ZWN0aW9uID4gLmhlYWRlciA+IDptYXRjaGVzKGxhYmVsLCAubm9kZS1saW5rLCAuZ28tdG8tYXJy b3cpLAotYm9keVtkaXI9bHRyXSAuZGV0YWlscy1zZWN0aW9uID4gLmhlYWRlciA+IC5vcHRpb25z ID4gLm5hdmlnYXRpb24tYmFyLAorYm9keVtkaXI9bHRyXSAuZGV0YWlscy1zZWN0aW9uID4gLmhl YWRlciA+IC5vcHRpb25zLAogYm9keVtkaXI9cnRsXSAuZGV0YWlscy1zZWN0aW9uID4gLmhlYWRl cjo6YmVmb3JlIHsKICAgICBmbG9hdDogcmlnaHQ7CiB9CiAKIGJvZHlbZGlyPWx0cl0gLmRldGFp bHMtc2VjdGlvbiA+IC5oZWFkZXI6OmJlZm9yZSwKLWJvZHlbZGlyPXJ0bF0gLmRldGFpbHMtc2Vj dGlvbiA+IC5oZWFkZXIgPiAub3B0aW9ucyA+IC5uYXZpZ2F0aW9uLWJhciwKLWJvZHlbZGlyPXJ0 bF0gLmRldGFpbHMtc2VjdGlvbiA+IC5oZWFkZXIgPiA6bWF0Y2hlcyhsYWJlbCwgLm5vZGUtbGlu aywgLmdvLXRvLWFycm93KSB7Citib2R5W2Rpcj1ydGxdIC5kZXRhaWxzLXNlY3Rpb24gPiAuaGVh ZGVyID4gLm9wdGlvbnMgewogICAgIGZsb2F0OiBsZWZ0OwogfQogCkBAIC0xNDYsNyArMTQ0LDcg QEAgYm9keVtkaXI9cnRsXSAuZGV0YWlscy1zZWN0aW9uID4gLmhlYWRlcjo6YmVmb3JlIHsKICAg ICB0ZXh0LWFsaWduOiBlbmQ7CiB9CiAKLS5kZXRhaWxzLXNlY3Rpb24uY29sbGFwc2VkICA+IC5o ZWFkZXIgPiBsYWJlbCB7CisuZGV0YWlscy1zZWN0aW9uLmNvbGxhcHNlZCAgPiAuaGVhZGVyID4g Lm9wdGlvbnMgewogICAgIGRpc3BsYXk6IG5vbmU7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RldGFpbHNTZWN0aW9uLmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGV0YWlsc1NlY3Rpb24uanMK aW5kZXggM2E0YmJmN2JmMmY0MmVjZDE1M2Y2NTZhYjE1ZjEwMGM2YzFiNDhhYy4uYjEwNTA2ZjE3 OTM0NGY1OWE2MGNhOGJkZWE1MTI2MGUwZTkwOWYwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGV0YWlsc1NlY3Rpb24uanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGV0YWlsc1NlY3Rpb24uanMK QEAgLTg1LDYgKzg1LDE5IEBAIFdlYkluc3BlY3Rvci5EZXRhaWxzU2VjdGlvbiA9IGNsYXNzIERl dGFpbHNTZWN0aW9uIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogICAgICAgICB0aGlzLl90 aXRsZUVsZW1lbnQudGV4dENvbnRlbnQgPSB0aXRsZTsKICAgICB9CiAKKyAgICBnZXQgdGl0bGVF bGVtZW50KCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl90aXRsZUVsZW1lbnQ7CisgICAg fQorCisgICAgc2V0IHRpdGxlRWxlbWVudChlbGVtZW50KQorICAgIHsKKyAgICAgICAgY29uc29s ZS5hc3NlcnQoZWxlbWVudCBpbnN0YW5jZW9mIEhUTUxFbGVtZW50LCAiRXhwZWN0ZWQgdGl0bGVF bGVtZW50IHRvIGJlIGFuIEhUTUxFbGVtZW50LiIsIGVsZW1lbnQpOworCisgICAgICAgIHRoaXMu X2hlYWRlckVsZW1lbnQucmVwbGFjZUNoaWxkKGVsZW1lbnQsIHRoaXMuX3RpdGxlRWxlbWVudCk7 CisgICAgICAgIHRoaXMuX3RpdGxlRWxlbWVudCA9IGVsZW1lbnQ7CisgICAgfQorCiAgICAgZ2V0 IGNvbGxhcHNlZCgpCiAgICAgewogICAgICAgICByZXR1cm4gdGhpcy5fZWxlbWVudC5jbGFzc0xp c3QuY29udGFpbnMoV2ViSW5zcGVjdG9yLkRldGFpbHNTZWN0aW9uLkNvbGxhcHNlZFN0eWxlQ2xh c3NOYW1lKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1Byb2JlU2V0RGV0YWlsc1NlY3Rpb24uanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9Qcm9iZVNldERldGFpbHNTZWN0aW9uLmpzCmluZGV4IDUyNmMx OWU3Mzg3MzM1MjY1MmIyZTFkZWRjNWQ5NzM0NTkwZTE5ZWMuLmVkNjhkMGZhYjlkNmI1NTRlY2Nh NTVmNTY1NmUwNTM1MjlkMGU5MDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1Byb2JlU2V0RGV0YWlsc1NlY3Rpb24uanMKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUHJvYmVTZXREZXRhaWxzU2VjdGlv bi5qcwpAQCAtNDIsOCArNDIsNiBAQCBXZWJJbnNwZWN0b3IuUHJvYmVTZXREZXRhaWxzU2VjdGlv biA9IGNsYXNzIFByb2JlU2V0RGV0YWlsc1NlY3Rpb24gZXh0ZW5kcyBXZWJJbgogCiAgICAgICAg IHRoaXMuZWxlbWVudC5jbGFzc0xpc3QuYWRkKCJwcm9iZS1zZXQiKTsKIAotICAgICAgICB0aGlz Ll9vcHRpb25zRWxlbWVudCA9IG9wdGlvbnNFbGVtZW50OwotCiAgICAgICAgIHRoaXMuX2xpc3Rl bmVyU2V0ID0gbmV3IFdlYkluc3BlY3Rvci5FdmVudExpc3RlbmVyU2V0KHRoaXMsICJQcm9iZVNl dERldGFpbHNTZWN0aW9uIFVJIGxpc3RlbmVycyIpOwogICAgICAgICB0aGlzLl9wcm9iZVNldCA9 IHByb2JlU2V0OwogICAgICAgICB0aGlzLl9kYXRhR3JpZCA9IGRhdGFHcmlkOwpAQCAtODgsMjQg Kzg2LDE3IEBAIFdlYkluc3BlY3Rvci5Qcm9iZVNldERldGFpbHNTZWN0aW9uID0gY2xhc3MgUHJv YmVTZXREZXRhaWxzU2VjdGlvbiBleHRlbmRzIFdlYkluCiAgICAgX3VwZGF0ZUxpbmtFbGVtZW50 KCkKICAgICB7CiAgICAgICAgIHZhciBicmVha3BvaW50ID0gdGhpcy5fcHJvYmVTZXQuYnJlYWtw b2ludDsKLSAgICAgICAgdmFyIHRpdGxlRWxlbWVudCA9IG51bGw7CiAgICAgICAgIGlmIChicmVh a3BvaW50LnNvdXJjZUNvZGVMb2NhdGlvbi5zb3VyY2VDb2RlKQotICAgICAgICAgICAgdGl0bGVF bGVtZW50ID0gV2ViSW5zcGVjdG9yLmNyZWF0ZVNvdXJjZUNvZGVMb2NhdGlvbkxpbmsoYnJlYWtw b2ludC5zb3VyY2VDb2RlTG9jYXRpb24pOworICAgICAgICAgICAgdGhpcy50aXRsZUVsZW1lbnQg PSBXZWJJbnNwZWN0b3IuY3JlYXRlU291cmNlQ29kZUxvY2F0aW9uTGluayhicmVha3BvaW50LnNv dXJjZUNvZGVMb2NhdGlvbik7CiAgICAgICAgIGVsc2UgewogICAgICAgICAgICAgLy8gRmFsbGJh Y2sgZm9yIHdoZW4gd2UgY2FuJ3QgY3JlYXRlIGEgbGl2ZSBzb3VyY2UgbGluay4KICAgICAgICAg ICAgIGNvbnNvbGUuYXNzZXJ0KCFicmVha3BvaW50LnJlc29sdmVkKTsKIAogICAgICAgICAgICAg dmFyIGxvY2F0aW9uID0gYnJlYWtwb2ludC5zb3VyY2VDb2RlTG9jYXRpb247Ci0gICAgICAgICAg ICB0aXRsZUVsZW1lbnQgPSBXZWJJbnNwZWN0b3IubGlua2lmeUxvY2F0aW9uKGJyZWFrcG9pbnQu Y29udGVudElkZW50aWZpZXIsIGxvY2F0aW9uLmRpc3BsYXlMaW5lTnVtYmVyLCBsb2NhdGlvbi5k aXNwbGF5Q29sdW1uTnVtYmVyKTsKKyAgICAgICAgICAgIHRoaXMudGl0bGVFbGVtZW50ID0gV2Vi SW5zcGVjdG9yLmxpbmtpZnlMb2NhdGlvbihicmVha3BvaW50LmNvbnRlbnRJZGVudGlmaWVyLCBs b2NhdGlvbi5kaXNwbGF5TGluZU51bWJlciwgbG9jYXRpb24uZGlzcGxheUNvbHVtbk51bWJlcik7 CiAgICAgICAgIH0KIAotICAgICAgICB0aXRsZUVsZW1lbnQuY2xhc3NMaXN0LmFkZChXZWJJbnNw ZWN0b3IuUHJvYmVTZXREZXRhaWxzU2VjdGlvbi5Eb250RmxvYXRMaW5rU3R5bGVDbGFzc05hbWUp OwotCi0gICAgICAgIGlmICh0aGlzLl9saW5rRWxlbWVudCkKLSAgICAgICAgICAgIHRoaXMuX29w dGlvbnNFbGVtZW50LnJlbW92ZUNoaWxkKHRoaXMuX2xpbmtFbGVtZW50KTsKLQotICAgICAgICB0 aGlzLl9saW5rRWxlbWVudCA9IHRpdGxlRWxlbWVudDsKLSAgICAgICAgdGhpcy5fb3B0aW9uc0Vs ZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fbGlua0VsZW1lbnQpOworICAgICAgICB0aGlzLnRpdGxl RWxlbWVudC5jbGFzc0xpc3QuYWRkKFdlYkluc3BlY3Rvci5Qcm9iZVNldERldGFpbHNTZWN0aW9u LkRvbnRGbG9hdExpbmtTdHlsZUNsYXNzTmFtZSk7CiAgICAgfQogCiAgICAgX2FkZFByb2JlQnV0 dG9uQ2xpY2tlZChldmVudCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlRGV0YWlsc1BhbmVsLmNzcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlRGV0YWlsc1BhbmVsLmNz cwppbmRleCA0MDY1MjI1Yzc1MjA4MjYwZWJmMWVhOGVjZGYwNzE4YTk5NDE0ODU1Li5kOTcwZDEw MjIyYmNmM2JiNTFiOWFjNWVjMDY4YjE5NjJiY2UyMzZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZURldGFpbHNQYW5lbC5j c3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFs U3R5bGVEZXRhaWxzUGFuZWwuY3NzCkBAIC0zNSw5ICszNSw3IEBACiAgICAgZm9udC13ZWlnaHQ6 IG5vcm1hbDsKIH0KIAotLnNpZGViYXIgPiAucGFuZWwuZGV0YWlscy5jc3Mtc3R5bGUgLnZpc3Vh bCA+IC5kZXRhaWxzLXNlY3Rpb24gLmRldGFpbHMtc2VjdGlvbiA+IC5oZWFkZXIgPiAudmlzdWFs LXN0eWxlLXNlY3Rpb24tY2xlYXIgewotICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKLSAgICByaWdo dDogNXB4OworLnNpZGViYXIgPiAucGFuZWwuZGV0YWlscy5jc3Mtc3R5bGUgLnZpc3VhbCA+IC5k ZXRhaWxzLXNlY3Rpb24gLmRldGFpbHMtc2VjdGlvbiA+IC5oZWFkZXIgPiAub3B0aW9ucyB7CiAg ICAgd2lkdGg6IDE1cHg7CiAgICAgaGVpZ2h0OiAxNXB4OwogICAgIGJhY2tncm91bmQtaW1hZ2U6 IHVybCguLi9JbWFnZXMvTmF2aWdhdGlvbkl0ZW1UcmFzaC5zdmcpOwpAQCAtNDUsMTEgKzQzLDYg QEAKICAgICBvcGFjaXR5OiAwLjc7CiB9CiAKLS5zaWRlYmFyID4gLnBhbmVsLmRldGFpbHMuY3Nz LXN0eWxlIC52aXN1YWwgPiAuZGV0YWlscy1zZWN0aW9uIC5kZXRhaWxzLXNlY3Rpb24uY29sbGFw c2VkID4gLmhlYWRlciA+IC52aXN1YWwtc3R5bGUtc2VjdGlvbi1jbGVhciwKLS5zaWRlYmFyID4g LnBhbmVsLmRldGFpbHMuY3NzLXN0eWxlIC52aXN1YWwgPiAuZGV0YWlscy1zZWN0aW9uIC5kZXRh aWxzLXNlY3Rpb246bm90KC5tb2RpZmllZCkgPiAuaGVhZGVyID4gLnZpc3VhbC1zdHlsZS1zZWN0 aW9uLWNsZWFyIHsKLSAgICBkaXNwbGF5OiBub25lOwotfQotCiAuc2lkZWJhciA+IC5wYW5lbC5k ZXRhaWxzLmNzcy1zdHlsZSAudmlzdWFsID4gLmRldGFpbHMtc2VjdGlvbiAuZGV0YWlscy1zZWN0 aW9uID4gLmhlYWRlciA+IHNwYW4gewogICAgIGRpc3BsYXk6IGZsZXg7CiB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZURl dGFpbHNQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1Zpc3VhbFN0eWxlRGV0YWlsc1BhbmVsLmpzCmluZGV4IGEwYWU1NjU2NWQ4MzZhOThlYTM1NjRj MTJkNzE1YjY0ZDYwODFkOWUuLjA5MjA5YmFiYTdhZTBmNGIzZDgwZWQ4NzI3NWMxNDJmZjRiMTNj OWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1Zpc3VhbFN0eWxlRGV0YWlsc1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlRGV0YWlsc1BhbmVsLmpzCkBAIC0xNDcsNyAr MTQ3LDYgQEAgV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlRGV0YWlsc1BhbmVsID0gY2xhc3MgVmlz dWFsU3R5bGVEZXRhaWxzUGFuZWwgZXh0ZW5kcyBXZWIKIAogICAgICAgICBmdW5jdGlvbiBjcmVh dGVPcHRpb25zRWxlbWVudCgpIHsKICAgICAgICAgICAgIGxldCBjb250YWluZXIgPSBkb2N1bWVu dC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICAgICAgICAgIGNvbnRhaW5lci5jbGFzc0xpc3Qu YWRkKCJ2aXN1YWwtc3R5bGUtc2VjdGlvbi1jbGVhciIpOwogICAgICAgICAgICAgY29udGFpbmVy LnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDbGVhciBtb2RpZmllZCBwcm9wZXJ0aWVz Iik7CiAgICAgICAgICAgICBjb250YWluZXIuYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlz Ll9jbGVhck1vZGlmaWVkU2VjdGlvbi5iaW5kKHRoaXMsIGNhbWVsQ2FzZUlkKSk7CiAgICAgICAg ICAgICByZXR1cm4gY29udGFpbmVyOwo=