148153 2015-08-18 16:53:44 -0700 Web Inspector: Visual editor links should unlink when switching styles 2015-08-18 18:42:10 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 147563 1 hi hi agomez bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1118704 0 hi 2015-08-18 16:53:44 -0700 Currently, the editor links stay active until the user disables them, even when switching rules/nodes. This should be changed such that the link deactivates whenever the rule/node changes to prevent unwanted syncing between editors. 1118707 1 webkit-bug-importer 2015-08-18 16:54:29 -0700 <rdar://problem/22335395> 1118708 2 259322 hi 2015-08-18 16:56:40 -0700 Created attachment 259322 Patch 1118714 3 259322 timothy 2015-08-18 17:04:21 -0700 Comment on attachment 259322 Patch Maybe it should auto link if the values match? 1118716 4 hi 2015-08-18 17:10:58 -0700 (In reply to comment #3) > Maybe it should auto link if the values match? I was tempted to add this, but I feel that that may be assuming too much about what the user intends to do. If they really want to link the editors, they click the link to make that happen. 1118719 5 timothy 2015-08-18 17:12:36 -0700 Alright. Sounds good. 1118770 6 259322 commit-queue 2015-08-18 18:42:06 -0700 Comment on attachment 259322 Patch Clearing flags on attachment: 259322 Committed r188621: <http://trac.webkit.org/changeset/188621> 1118771 7 commit-queue 2015-08-18 18:42:10 -0700 All reviewed patches have been landed. Closing bug. 259322 2015-08-18 16:56:40 -0700 2015-08-18 18:42:06 -0700 Patch bug-148153-20150818165637.patch text/plain 8731 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDdiNTYwNjhkZTIwNWRmMzkzNDlkOGY0ZWQxMGNk NjE3ZmE1M2QzY2UuLmNiMDkxYWQ4MDE2NThkNTI3ZDU3YjA0MjYxM2Q1YjFhM2UzZTFmZjYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE1LTA4LTE4ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBW aXN1YWwgZWRpdG9yIGxpbmtzIHNob3VsZCB1bmxpbmsgd2hlbiBzd2l0Y2hpbmcgc3R5bGVzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDgxNTMKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBWaXN1YWwgZWRp dG9yIGxpbmtzIGFyZSBub3cgZGVhY3RpdmF0ZWQgd2hlbiBzd2l0Y2hpbmcgcnVsZXMvbm9kZXMu CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0ltYWdlcy9WaXN1YWxTdHlsZVByb3BlcnR5VW5s aW5rZWQuc3ZnOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVEZXRh aWxzUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVEZXRhaWxzUGFu ZWwucHJvdG90eXBlLl91cGRhdGVQcm9wZXJ0aWVzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5W aXN1YWxTdHlsZURldGFpbHNQYW5lbC5wcm90b3R5cGUuX2dlbmVyYXRlTWV0cmljU2VjdGlvblJv d3MpOgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZVByb3BlcnR5 RWRpdG9yTGluay5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZVByb3BlcnR5 RWRpdG9yTGluay5wcm90b3R5cGUuc2V0IGxpbmtlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu VmlzdWFsU3R5bGVQcm9wZXJ0eUVkaXRvckxpbmsucHJvdG90eXBlLl9pY29uQ2xpY2tlZCk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVQcm9wZXJ0eUVkaXRvckxpbmspOgorCiAy MDE1LTA4LTE4ICBOaWtpdGEgVmFzaWx5ZXYgIDxudmFzaWx5ZXZAYXBwbGUuY29tPgogCiAgICAg ICAgIFdlYiBJbnNwZWN0b3I6IE9wdGlvbi1FbnRlciBzaG91bGQgY29tbWl0IGNvbnNvbGUgY29t bWFuZCB3aXRob3V0IGVyYXNpbmcgdGhlIHByb21wdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL1Zpc3VhbFN0eWxlUHJvcGVydHlVbmxpbmtl ZC5zdmcgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9JbWFnZXMvVmlzdWFs U3R5bGVQcm9wZXJ0eVVubGlua2VkLnN2ZwppbmRleCAwZjRkMTJkOTE5N2NiNzVmNzA4ZWQ4MGI1 Yjk3ZTAzYzllNzQ5Y2RlLi40YjBlMTA4N2RkYTVhMDNhNmQ4OTMzZGIwMWRhOWZkMDQ2ZmRiMTNi IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9JbWFnZXMv VmlzdWFsU3R5bGVQcm9wZXJ0eVVubGlua2VkLnN2ZworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9JbWFnZXMvVmlzdWFsU3R5bGVQcm9wZXJ0eVVubGlua2VkLnN2ZwpA QCAtMSw2ICsxLDYgQEAKIDw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9InV0Zi04Ij8+CiA8 IS0tIENvcHlyaWdodCDCqSAyMDE1IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4gLS0+ CiA8c3ZnIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2 aWV3Qm94PSIwIDAgMTYgMTYiPgotICAgIDxwYXRoIGNsYXNzPSJmaWxsZWQiIGQ9Ik0gMTAgNCBD IDE2IDQgMTYgMTIgMTAgMTIiIHN0cm9rZT0ibm9uZSIgLz4KLSAgICA8cGF0aCBjbGFzcz0iZmls bGVkIiBkPSJNIDYgNCBDIDAgNCAwIDEyIDYgMTIiIHN0cm9rZT0ibm9uZSIgLz4KKyAgICA8cGF0 aCBjbGFzcz0iZmlsbGVkIiBkPSJNIDYuNSA0IEMgMCA0IDAgMTIgNi41IDEyIiBzdHJva2U9Im5v bmUiIC8+CisgICAgPHBhdGggY2xhc3M9ImZpbGxlZCIgZD0iTSA5LjUgNCBDIDE2IDQgMTYgMTIg OS41IDEyIiBzdHJva2U9Im5vbmUiIC8+CiA8L3N2Zz4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlRGV0YWlsc1BhbmVsLmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVE ZXRhaWxzUGFuZWwuanMKaW5kZXggOTkyYTFjMzljZDRmMzliZjQxYzdmYTUwNDIxNjk4NjM3ZDI3 NDQyNy4uNzhlZTNmODA4YTA3NjYwZjA0MDYzNGIwYzIwYTFiOGIzMDAzMTQ4MCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVE ZXRhaWxzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwuanMKQEAgLTE4MSw2ICsxODEsMTEgQEAgV2Vi SW5zcGVjdG9yLlZpc3VhbFN0eWxlRGV0YWlsc1BhbmVsID0gY2xhc3MgVmlzdWFsU3R5bGVEZXRh aWxzUGFuZWwgZXh0ZW5kcyBXZWIKICAgICAgICAgaWYgKCFncm91cC5zZWN0aW9uKQogICAgICAg ICAgICAgcmV0dXJuOwogCisgICAgICAgIGlmIChncm91cC5saW5rcykgeworICAgICAgICAgICAg Zm9yIChsZXQga2V5IGluIGdyb3VwLmxpbmtzKQorICAgICAgICAgICAgICAgIGdyb3VwLmxpbmtz W2tleV0ubGlua2VkID0gZmFsc2U7CisgICAgICAgIH0KKwogICAgICAgICBsZXQgaW5pdGlhbFRl eHRMaXN0ID0gdGhpcy5faW5pdGlhbFRleHRMaXN0OwogICAgICAgICBpZiAoIWluaXRpYWxUZXh0 TGlzdCkKICAgICAgICAgICAgIHRoaXMuX2N1cnJlbnRTdHlsZVtXZWJJbnNwZWN0b3IuVmlzdWFs U3R5bGVEZXRhaWxzUGFuZWwuSW5pdGlhbFByb3BlcnR5U2VjdGlvblRleHRMaXN0U3ltYm9sXSA9 IGluaXRpYWxUZXh0TGlzdCA9IG5ldyBXZWFrTWFwOwpAQCAtMzUzLDYgKzM1OCw3IEBAIFdlYklu c3BlY3Rvci5WaXN1YWxTdHlsZURldGFpbHNQYW5lbCA9IGNsYXNzIFZpc3VhbFN0eWxlRGV0YWls c1BhbmVsIGV4dGVuZHMgV2ViCiAgICAgX2dlbmVyYXRlTWV0cmljU2VjdGlvblJvd3MoZ3JvdXAs IHByZWZpeCwgYWxsb3dOZWdhdGl2ZXMsIGhpZ2hsaWdodE9uSG92ZXIpCiAgICAgewogICAgICAg ICBsZXQgcHJvcGVydGllcyA9IGdyb3VwLnByb3BlcnRpZXM7CisgICAgICAgIGxldCBsaW5rcyA9 IGdyb3VwLmxpbmtzID0ge307CiAKICAgICAgICAgbGV0IGhhc1ByZWZpeCA9IHByZWZpeCAmJiBw cmVmaXgubGVuZ3RoOwogICAgICAgICBsZXQgcHJvcGVydHlOYW1lUHJlZml4ID0gaGFzUHJlZml4 ID8gcHJlZml4ICsgIi0iIDogIiI7CkBAIC0zNjYsMzMgKzM3MiwzMyBAQCBXZWJJbnNwZWN0b3Iu VmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwgPSBjbGFzcyBWaXN1YWxTdHlsZURldGFpbHNQYW5lbCBl eHRlbmRzIFdlYgogCiAgICAgICAgIHByb3BlcnRpZXNbdG9wXSA9IG5ldyBXZWJJbnNwZWN0b3Iu VmlzdWFsU3R5bGVOdW1iZXJJbnB1dEJveChwcm9wZXJ0eU5hbWVQcmVmaXggKyAidG9wIiwgV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJUb3AiKSwgdGhpcy5fa2V5d29yZHMuYm94TW9kZWwsIHRoaXMu X3VuaXRzLmRlZmF1bHRzLCBhbGxvd05lZ2F0aXZlcyk7CiAgICAgICAgIHByb3BlcnRpZXNbYm90 dG9tXSA9IG5ldyBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVOdW1iZXJJbnB1dEJveChwcm9wZXJ0 eU5hbWVQcmVmaXggKyAiYm90dG9tIiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJCb3R0b20iKSwg dGhpcy5fa2V5d29yZHMuYm94TW9kZWwsIHRoaXMuX3VuaXRzLmRlZmF1bHRzLCBhbGxvd05lZ2F0 aXZlcywgdHJ1ZSk7Ci0gICAgICAgIGxldCB2ZXJ0aWNhbExpbmsgPSBuZXcgV2ViSW5zcGVjdG9y LlZpc3VhbFN0eWxlUHJvcGVydHlFZGl0b3JMaW5rKFtwcm9wZXJ0aWVzW3RvcF0sIHByb3BlcnRp ZXNbYm90dG9tXV0sICJsaW5rLXZlcnRpY2FsIik7CisgICAgICAgIGxpbmtzWyJ2ZXJ0aWNhbCJd ID0gbmV3IFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZVByb3BlcnR5RWRpdG9yTGluayhbcHJvcGVy dGllc1t0b3BdLCBwcm9wZXJ0aWVzW2JvdHRvbV1dLCAibGluay12ZXJ0aWNhbCIpOwogCiAgICAg ICAgIHZlcnRpY2FsLmVsZW1lbnQuYXBwZW5kQ2hpbGQocHJvcGVydGllc1t0b3BdLmVsZW1lbnQp OwotICAgICAgICB2ZXJ0aWNhbC5lbGVtZW50LmFwcGVuZENoaWxkKHZlcnRpY2FsTGluay5lbGVt ZW50KTsKKyAgICAgICAgdmVydGljYWwuZWxlbWVudC5hcHBlbmRDaGlsZChsaW5rc1sidmVydGlj YWwiXS5lbGVtZW50KTsKICAgICAgICAgdmVydGljYWwuZWxlbWVudC5hcHBlbmRDaGlsZChwcm9w ZXJ0aWVzW2JvdHRvbV0uZWxlbWVudCk7CiAKICAgICAgICAgbGV0IGhvcml6b250YWwgPSBuZXcg V2ViSW5zcGVjdG9yLkRldGFpbHNTZWN0aW9uUm93OwogCiAgICAgICAgIHByb3BlcnRpZXNbbGVm dF0gPSBuZXcgV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlTnVtYmVySW5wdXRCb3gocHJvcGVydHlO YW1lUHJlZml4ICsgImxlZnQiLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkxlZnQiKSwgdGhpcy5f a2V5d29yZHMuYm94TW9kZWwsIHRoaXMuX3VuaXRzLmRlZmF1bHRzLCBhbGxvd05lZ2F0aXZlcyk7 CiAgICAgICAgIHByb3BlcnRpZXNbcmlnaHRdID0gbmV3IFdlYkluc3BlY3Rvci5WaXN1YWxTdHls ZU51bWJlcklucHV0Qm94KHByb3BlcnR5TmFtZVByZWZpeCArICJyaWdodCIsIFdlYkluc3BlY3Rv ci5VSVN0cmluZygiUmlnaHQiKSwgdGhpcy5fa2V5d29yZHMuYm94TW9kZWwsIHRoaXMuX3VuaXRz LmRlZmF1bHRzLCBhbGxvd05lZ2F0aXZlcywgdHJ1ZSk7Ci0gICAgICAgIGxldCBob3Jpem9udGFs TGluayA9IG5ldyBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVQcm9wZXJ0eUVkaXRvckxpbmsoW3By b3BlcnRpZXNbbGVmdF0sIHByb3BlcnRpZXNbcmlnaHRdXSwgImxpbmstaG9yaXpvbnRhbCIpOwor ICAgICAgICBsaW5rc1siaG9yaXpvbnRhbCJdID0gbmV3IFdlYkluc3BlY3Rvci5WaXN1YWxTdHls ZVByb3BlcnR5RWRpdG9yTGluayhbcHJvcGVydGllc1tsZWZ0XSwgcHJvcGVydGllc1tyaWdodF1d LCAibGluay1ob3Jpem9udGFsIik7CiAKICAgICAgICAgaG9yaXpvbnRhbC5lbGVtZW50LmFwcGVu ZENoaWxkKHByb3BlcnRpZXNbbGVmdF0uZWxlbWVudCk7Ci0gICAgICAgIGhvcml6b250YWwuZWxl bWVudC5hcHBlbmRDaGlsZChob3Jpem9udGFsTGluay5lbGVtZW50KTsKKyAgICAgICAgaG9yaXpv bnRhbC5lbGVtZW50LmFwcGVuZENoaWxkKGxpbmtzWyJob3Jpem9udGFsIl0uZWxlbWVudCk7CiAg ICAgICAgIGhvcml6b250YWwuZWxlbWVudC5hcHBlbmRDaGlsZChwcm9wZXJ0aWVzW3JpZ2h0XS5l bGVtZW50KTsKIAogICAgICAgICBsZXQgYWxsTGlua1JvdyA9IG5ldyBXZWJJbnNwZWN0b3IuRGV0 YWlsc1NlY3Rpb25Sb3c7Ci0gICAgICAgIGxldCBhbGxMaW5rID0gbmV3IFdlYkluc3BlY3Rvci5W aXN1YWxTdHlsZVByb3BlcnR5RWRpdG9yTGluayhbcHJvcGVydGllc1t0b3BdLCBwcm9wZXJ0aWVz W2JvdHRvbV0sIHByb3BlcnRpZXNbbGVmdF0sIHByb3BlcnRpZXNbcmlnaHRdXSwgImxpbmstYWxs IiwgW3ZlcnRpY2FsTGluaywgaG9yaXpvbnRhbExpbmtdKTsKLSAgICAgICAgYWxsTGlua1Jvdy5l bGVtZW50LmFwcGVuZENoaWxkKGFsbExpbmsuZWxlbWVudCk7CisgICAgICAgIGxpbmtzWyJhbGwi XSA9IG5ldyBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVQcm9wZXJ0eUVkaXRvckxpbmsoW3Byb3Bl cnRpZXNbdG9wXSwgcHJvcGVydGllc1tib3R0b21dLCBwcm9wZXJ0aWVzW2xlZnRdLCBwcm9wZXJ0 aWVzW3JpZ2h0XV0sICJsaW5rLWFsbCIsIFtsaW5rc1sidmVydGljYWwiXSwgbGlua3NbImhvcml6 b250YWwiXV0pOworICAgICAgICBhbGxMaW5rUm93LmVsZW1lbnQuYXBwZW5kQ2hpbGQobGlua3Nb ImFsbCJdLmVsZW1lbnQpOwogCiAgICAgICAgIGlmIChoaWdobGlnaHRPbkhvdmVyKSB7CiAgICAg ICAgICAgICB0aGlzLl9hZGRNZXRyaWNzTW91c2VMaXN0ZW5lcnMocHJvcGVydGllc1t0b3BdLCBw cmVmaXgpOwotICAgICAgICAgICAgdGhpcy5fYWRkTWV0cmljc01vdXNlTGlzdGVuZXJzKHZlcnRp Y2FsTGluaywgcHJlZml4KTsKKyAgICAgICAgICAgIHRoaXMuX2FkZE1ldHJpY3NNb3VzZUxpc3Rl bmVycyhsaW5rc1sidmVydGljYWwiXSwgcHJlZml4KTsKICAgICAgICAgICAgIHRoaXMuX2FkZE1l dHJpY3NNb3VzZUxpc3RlbmVycyhwcm9wZXJ0aWVzW2JvdHRvbV0sIHByZWZpeCk7Ci0gICAgICAg ICAgICB0aGlzLl9hZGRNZXRyaWNzTW91c2VMaXN0ZW5lcnMoYWxsTGluaywgcHJlZml4KTsKKyAg ICAgICAgICAgIHRoaXMuX2FkZE1ldHJpY3NNb3VzZUxpc3RlbmVycyhsaW5rc1siYWxsIl0sIHBy ZWZpeCk7CiAgICAgICAgICAgICB0aGlzLl9hZGRNZXRyaWNzTW91c2VMaXN0ZW5lcnMocHJvcGVy dGllc1tsZWZ0XSwgcHJlZml4KTsKLSAgICAgICAgICAgIHRoaXMuX2FkZE1ldHJpY3NNb3VzZUxp c3RlbmVycyhob3Jpem9udGFsTGluaywgcHJlZml4KTsKKyAgICAgICAgICAgIHRoaXMuX2FkZE1l dHJpY3NNb3VzZUxpc3RlbmVycyhsaW5rc1siaG9yaXpvbnRhbCJdLCBwcmVmaXgpOwogICAgICAg ICAgICAgdGhpcy5fYWRkTWV0cmljc01vdXNlTGlzdGVuZXJzKHByb3BlcnRpZXNbcmlnaHRdLCBw cmVmaXgpOwogICAgICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlUHJvcGVydHlFZGl0b3JMaW5rLmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVQcm9wZXJ0 eUVkaXRvckxpbmsuanMKaW5kZXggYTI4ZmJhMDVjYmYyZmI0NDJiNDMwNzdlODgzOTBiODQ2MWRh ZThlOC4uZWE0OWFlMTdiOTUyOTY1MjE0NDM2MDU4YWY0MmQwMzE1ZTVjOTU5MCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVQ cm9wZXJ0eUVkaXRvckxpbmsuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvVmlzdWFsU3R5bGVQcm9wZXJ0eUVkaXRvckxpbmsuanMKQEAgLTc4LDYgKzc4 LDE4IEBAIFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZVByb3BlcnR5RWRpdG9yTGluayA9IGNsYXNz IFZpc3VhbFN0eWxlUHJvcGVydHlFZGl0b3JMaW5rCiAgICAgICAgIHJldHVybiB0aGlzLl9lbGVt ZW50OwogICAgIH0KIAorICAgIHNldCBsaW5rZWQoZmxhZykKKyAgICB7CisgICAgICAgIHRoaXMu X2xpbmtlZCA9IGZsYWc7CisgICAgICAgIHRoaXMuX2VsZW1lbnQuY2xhc3NMaXN0LnRvZ2dsZSgi bGlua2VkIiwgdGhpcy5fbGlua2VkKTsKKyAgICAgICAgdGhpcy5fbGlua2VkSWNvbi5oaWRkZW4g PSAhdGhpcy5fbGlua2VkOworICAgICAgICB0aGlzLl91bmxpbmtlZEljb24uaGlkZGVuID0gdGhp cy5fbGlua2VkOworICAgICAgICB0aGlzLl9pY29uRWxlbWVudC50aXRsZSA9IHRoaXMuX2xpbmtl ZCA/IFdlYkluc3BlY3Rvci5VSVN0cmluZygiQ2xpY2sgdG8gcmVtb3ZlIGxpbmsiKSA6IFdlYklu c3BlY3Rvci5VSVN0cmluZygiQ2xpY2sgdG8gbGluayBwcm9wZXJ0eSB2YWx1ZXMiKTsKKworICAg ICAgICBmb3IgKGxldCBsaW5rVG9IaWRlIG9mIHRoaXMuX2xpbmtzVG9IaWRlV2hlbkxpbmtlZCkK KyAgICAgICAgICAgIGxpbmtUb0hpZGUuZGlzYWJsZWQgPSB0aGlzLl9saW5rZWQ7CisgICAgfQor CiAgICAgc2V0IGRpc2FibGVkKGZsYWcpCiAgICAgewogICAgICAgICB0aGlzLl9kaXNhYmxlZCA9 IGZsYWc7CkBAIC0xMjgsMTUgKzE0MCw3IEBAIFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZVByb3Bl cnR5RWRpdG9yTGluayA9IGNsYXNzIFZpc3VhbFN0eWxlUHJvcGVydHlFZGl0b3JMaW5rCiAKICAg ICBfaWNvbkNsaWNrZWQoKQogICAgIHsKLSAgICAgICAgdGhpcy5fbGlua2VkID0gIXRoaXMuX2xp bmtlZDsKLSAgICAgICAgdGhpcy5fZWxlbWVudC5jbGFzc0xpc3QudG9nZ2xlKCJsaW5rZWQiLCB0 aGlzLl9saW5rZWQpOwotICAgICAgICB0aGlzLl9saW5rZWRJY29uLmhpZGRlbiA9ICF0aGlzLl9s aW5rZWQ7Ci0gICAgICAgIHRoaXMuX3VubGlua2VkSWNvbi5oaWRkZW4gPSB0aGlzLl9saW5rZWQ7 Ci0KLSAgICAgICAgdGhpcy5faWNvbkVsZW1lbnQudGl0bGUgPSB0aGlzLl9saW5rZWQgPyBXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIkNsaWNrIHRvIHJlbW92ZSBsaW5rIikgOiBXZWJJbnNwZWN0b3Iu VUlTdHJpbmcoIkNsaWNrIHRvIGxpbmsgcHJvcGVydHkgdmFsdWVzIik7Ci0KKyAgICAgICAgdGhp cy5saW5rZWQgPSAhdGhpcy5fbGlua2VkOwogICAgICAgICB0aGlzLl91cGRhdGVMaW5rZWRFZGl0 b3JzKHRoaXMuX2xhc3RQcm9wZXJ0eUVkaXRlZCB8fCB0aGlzLl9saW5rZWRQcm9wZXJ0aWVzWzBd KTsKLSAgICAgICAgZm9yIChsZXQgbGlua1RvSGlkZSBvZiB0aGlzLl9saW5rc1RvSGlkZVdoZW5M aW5rZWQpCi0gICAgICAgICAgICBsaW5rVG9IaWRlLmRpc2FibGVkID0gdGhpcy5fbGlua2VkOwog ICAgIH0KIH07Cg==