138185 2014-10-29 14:23:52 -0700 Web Inspector: I do not expect to see the same rule multiple times in styles sidebar 2015-01-13 13:44:24 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck webkit-unassigned commit-queue graouts joepeck timothy webkit-bug-importer oldest_to_newest 1044832 0 joepeck 2014-10-29 14:23:52 -0700 * SUMMARY When a rule with multiple selectors matching the current selected element, the rule shows up multiple times in the sidebar. * TEST <style>*, h1, .a, h1.a, body > #foo.a.b { color: green; }</style> <h1 id="foo" class="a b c">Hello World</h1> * STEPS TO REPRODUCE 1. Inspect h1#foo on test page 2. Show styles sidebar => See the one rule 5 times * NOTES It is not too unreasonable to show this rule multiple times. For instance in this test: <style> h1, h1.a { color: blue } .a { color: red; } </style> <h1 class="a">Test</h1> Which will show the fallback list as: Rule 1 (h1.a) -> Rule 2 (.a) -> Rule 1 (a) However, in the case where the same rule matches multiple times, it seems the case of higher specificity should show, and the others do not need to. * OTHER BROWSERS - Chrome matches Safari now and shows the rule multiple times - Firefox only shows the rule once Thoughts? 1044833 1 webkit-bug-importer 2014-10-29 14:24:24 -0700 <rdar://problem/18816349> 1044834 2 joepeck 2014-10-29 14:24:46 -0700 Probably a dup of: https://bugs.webkit.org/show_bug.cgi?id=113476 I rather like the idea of reducing clutter. 1044838 3 timothy 2014-10-29 14:27:03 -0700 I debated this when I redid the sidebar. It can be important when each selector has different specificity and other rules interleave with it. Different CSS properties could/will be overridden in each instance of the rule with multiple selectors. 1044839 4 timothy 2014-10-29 14:27:39 -0700 Maybe we can show them but in some new collapsed state? 1044842 5 timothy 2014-10-29 14:29:14 -0700 Or only show them if interleaving happens. Otherwise it collapses into one instance. 1051678 6 joepeck 2014-12-01 17:09:39 -0800 I think the deduplication really helps simplify the sidebar. One case I hadn't thought of that this helps is inherited styles. Take this test: <html> <head> <style> /* simplified reset.css */ html, body, div, p { margin:0; padding:0; border:0; font-style: inherit; } body { line-height:1.5; } /* page styles */ p { margin: 0 0 1.5em; } </style> </head> <body><div><p>Test</p></div></body> </html> Inspecting the <p> you will see the first reset rule 4 times total because of the "font-style: inherit" for the p, div, body, html. With de-duplication you only see it once, up above with high specificity and never in the inherited section. If there was in fact a font style it inherits, that would be listed in the inherited section, seriously reducing clutter. 1051680 7 242365 joepeck 2014-12-01 17:12:36 -0800 Created attachment 242365 [PATCH] Proposed Fix We should probably also include the complete fallback list in the Computed Rules section with the complete cascade per-property like Firefox/Chrome if there is ever a case where interleaving matters. 1051682 8 242365 joepeck 2014-12-01 17:13:51 -0800 Comment on attachment 242365 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=242365&action=review > Source/WebInspectorUI/ChangeLog:18 > + Remove duplicates from the ordered list of selectors. s/selectors/CSSStyleDeclarations/ 1051684 9 242367 joepeck 2014-12-01 17:14:26 -0800 Created attachment 242367 [PATCH] Proposed Fix 1060910 10 242367 commit-queue 2015-01-13 13:44:20 -0800 Comment on attachment 242367 [PATCH] Proposed Fix Clearing flags on attachment: 242367 Committed r178373: <http://trac.webkit.org/changeset/178373> 1060911 11 commit-queue 2015-01-13 13:44:24 -0800 All reviewed patches have been landed. Closing bug. 242365 2014-12-01 17:12:36 -0800 2014-12-01 17:14:26 -0800 [PATCH] Proposed Fix deduplication.patch text/plain 4067 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGNhZDM3ZmYuLjE5ODRkNzAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0IEBACiAyMDE0LTEyLTAxICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogSSBkbyBu b3QgZXhwZWN0IHRvIHNlZSB0aGUgc2FtZSBydWxlIG11bHRpcGxlIHRpbWVzIGluIHN0eWxlcyBz aWRlYmFyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MzgxODUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJ biB0aGUgc3R5bGVzIHNpZGViYXIsIGRvbid0IHNob3cgYSBkdXBsaWNhdGUsIGxlc3Nlci1zcGVj aWZpY2l0eSBydWxlIGV2ZW4KKyAgICAgICAgaWYgaXQgbWF0Y2hlcyB0aGUgc2VsZWN0ZWQgZWxl bWVudCBtdWx0aXBsZSB0aW1lcyB3aXRoIGRpZmZlcmVudCBzZWxlY3RvcnMKKyAgICAgICAgaW4g dGhlIGxpc3QuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVscy9DU1NSdWxlLmpzOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkNTU1J1bGUucHJvdG90eXBlLmlzRXF1YWxUbyk6CisgICAg ICAgIENTU1J1bGUgaWRlbnRpZmllcnMgYXJlIG9iamVjdHMuCisKKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL1ZpZXdzL1J1bGVzU3R5bGVEZXRhaWxzUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuUnVsZXNTdHlsZURldGFpbHNQYW5lbC5wcm90b3R5cGUucmVmcmVzaCk6CisgICAgICAg IFJlbW92ZSBkdXBsaWNhdGVzIGZyb20gdGhlIG9yZGVyZWQgbGlzdCBvZiBzZWxlY3RvcnMuCisK KzIwMTQtMTItMDEgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwogICAg ICAgICBXZWIgSW5zcGVjdG9yOiBMYXlvdXRUZXN0cy9pbnNwZWN0b3IgdGVzdHMgZmFpbCBpbiBQ cm9kdWN0aW9uIGJ1aWxkcyBkdWUgdG8gbWlzc2luZyB0ZXN0IHJlc291cmNlcwogICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM4ODk4CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9DU1NSdWxlLmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0NTU1J1bGUuanMK aW5kZXggMDdkMDcxMC4uMGQ4NzQxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvTW9kZWxzL0NTU1J1bGUuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0NTU1J1bGUuanMKQEAgLTE4OCw2ICsxODgsMTQgQEAg V2ViSW5zcGVjdG9yLkNTU1J1bGUucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gdGhpcy5f bWVkaWFMaXN0OwogICAgIH0sCiAKKyAgICBpc0VxdWFsVG86IGZ1bmN0aW9uKHJ1bGUpCisgICAg eworICAgICAgICBpZiAoIXJ1bGUpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICAg ICAgcmV0dXJuIE9iamVjdC5zaGFsbG93RXF1YWwodGhpcy5faWQsIHJ1bGUuaWQpOworICAgIH0s CisKICAgICAvLyBQcm90ZWN0ZWQKIAogICAgIGdldCBub2RlU3R5bGVzKCkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1J1bGVzU3R5bGVEZXRh aWxzUGFuZWwuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9S dWxlc1N0eWxlRGV0YWlsc1BhbmVsLmpzCmluZGV4IGE1MDJkZTUuLjgwYzA4OGEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1J1bGVzU3R5bGVE ZXRhaWxzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvUnVsZXNTdHlsZURldGFpbHNQYW5lbC5qcwpAQCAtOTIsNiArOTIsMzEgQEAgV2ViSW5z cGVjdG9yLlJ1bGVzU3R5bGVEZXRhaWxzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICAgICAg fSk7CiAgICAgICAgIH0KIAorICAgICAgICBmdW5jdGlvbiB1bmlxdWVPcmRlcmVkU3R5bGVzKG9y ZGVyZWRTdHlsZXMpCisgICAgICAgIHsKKyAgICAgICAgICAgIHZhciB1bmlxdWVTdHlsZXMgPSBb XTsKKworICAgICAgICAgICAgZm9yICh2YXIgc3R5bGUgb2Ygb3JkZXJlZFN0eWxlcykgeworICAg ICAgICAgICAgICAgIHZhciBydWxlID0gc3R5bGUub3duZXJSdWxlOworICAgICAgICAgICAgICAg IGlmICghcnVsZSkgeworICAgICAgICAgICAgICAgICAgICB1bmlxdWVTdHlsZXMucHVzaChzdHls ZSk7CisgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgICAgIH0KKwor ICAgICAgICAgICAgICAgIHZhciBmb3VuZCA9IGZhbHNlOworICAgICAgICAgICAgICAgIGZvciAo dmFyIGV4aXN0aW5nU3R5bGUgb2YgdW5pcXVlU3R5bGVzKSB7CisgICAgICAgICAgICAgICAgICAg IGlmIChydWxlLmlzRXF1YWxUbyhleGlzdGluZ1N0eWxlLm93bmVyUnVsZSkpIHsKKyAgICAgICAg ICAgICAgICAgICAgICAgIGZvdW5kID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGJy ZWFrOworICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgfQorICAgICAgICAg ICAgICAgIGlmICghZm91bmQpCisgICAgICAgICAgICAgICAgICAgIHVuaXF1ZVN0eWxlcy5wdXNo KHN0eWxlKTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgcmV0dXJuIHVuaXF1ZVN0eWxl czsKKyAgICAgICAgfQorCiAgICAgICAgIGZ1bmN0aW9uIGFwcGVuZFN0eWxlU2VjdGlvbihzdHls ZSkKICAgICAgICAgewogICAgICAgICAgICAgdmFyIHNlY3Rpb24gPSBzdHlsZS5fX3J1bGVzU2Vj dGlvbjsKQEAgLTEzOCwxMCArMTYzLDkgQEAgV2ViSW5zcGVjdG9yLlJ1bGVzU3R5bGVEZXRhaWxz UGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB2YXIgcHNldWRvRWxlbWVudHMgPSB0aGlzLm5v ZGVTdHlsZXMucHNldWRvRWxlbWVudHM7CiAgICAgICAgIGZvciAodmFyIHBzZXVkb0lkZW50aWZp ZXIgaW4gcHNldWRvRWxlbWVudHMpIHsKICAgICAgICAgICAgIHZhciBwc2V1ZG9FbGVtZW50ID0g cHNldWRvRWxlbWVudHNbcHNldWRvSWRlbnRpZmllcl07Ci0gICAgICAgICAgICBmb3IgKHZhciBp ID0gMDsgaSA8IHBzZXVkb0VsZW1lbnQub3JkZXJlZFN0eWxlcy5sZW5ndGg7ICsraSkgewotICAg ICAgICAgICAgICAgIHZhciBzdHlsZSA9IHBzZXVkb0VsZW1lbnQub3JkZXJlZFN0eWxlc1tpXTsK KyAgICAgICAgICAgIHZhciBvcmRlcmVkU3R5bGVzID0gdW5pcXVlT3JkZXJlZFN0eWxlcyhwc2V1 ZG9FbGVtZW50Lm9yZGVyZWRTdHlsZXMpOworICAgICAgICAgICAgZm9yICh2YXIgc3R5bGUgb2Yg b3JkZXJlZFN0eWxlcykKICAgICAgICAgICAgICAgICBhcHBlbmRTdHlsZVNlY3Rpb24uY2FsbCh0 aGlzLCBzdHlsZSk7Ci0gICAgICAgICAgICB9CiAKICAgICAgICAgICAgIGlmIChwcmV2aW91c1Nl Y3Rpb24pCiAgICAgICAgICAgICAgICAgcHJldmlvdXNTZWN0aW9uLmxhc3RJbkdyb3VwID0gdHJ1 ZTsKQEAgLTE0OSw3ICsxNzMsNyBAQCBXZWJJbnNwZWN0b3IuUnVsZXNTdHlsZURldGFpbHNQYW5l bC5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgdmFyIGFkZGVkTmV3UnVsZUJ1dHRvbiA9IGZhbHNl OwogCi0gICAgICAgIHZhciBvcmRlcmVkU3R5bGVzID0gdGhpcy5ub2RlU3R5bGVzLm9yZGVyZWRT dHlsZXM7CisgICAgICAgIHZhciBvcmRlcmVkU3R5bGVzID0gdW5pcXVlT3JkZXJlZFN0eWxlcyh0 aGlzLm5vZGVTdHlsZXMub3JkZXJlZFN0eWxlcyk7CiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBp IDwgb3JkZXJlZFN0eWxlcy5sZW5ndGg7ICsraSkgewogICAgICAgICAgICAgdmFyIHN0eWxlID0g b3JkZXJlZFN0eWxlc1tpXTsKIAo= 242367 2014-12-01 17:14:26 -0800 2015-01-13 13:44:20 -0800 [PATCH] Proposed Fix betters.patch text/plain 4076 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGNhZDM3ZmYuLmVlNzZhODkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0IEBACiAyMDE0LTEyLTAxICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogSSBkbyBu b3QgZXhwZWN0IHRvIHNlZSB0aGUgc2FtZSBydWxlIG11bHRpcGxlIHRpbWVzIGluIHN0eWxlcyBz aWRlYmFyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MzgxODUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJ biB0aGUgc3R5bGVzIHNpZGViYXIsIGRvbid0IHNob3cgYSBkdXBsaWNhdGUsIGxlc3Nlci1zcGVj aWZpY2l0eSBydWxlIGV2ZW4KKyAgICAgICAgaWYgaXQgbWF0Y2hlcyB0aGUgc2VsZWN0ZWQgZWxl bWVudCBtdWx0aXBsZSB0aW1lcyB3aXRoIGRpZmZlcmVudCBzZWxlY3RvcnMKKyAgICAgICAgaW4g dGhlIGxpc3QuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVscy9DU1NSdWxlLmpzOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkNTU1J1bGUucHJvdG90eXBlLmlzRXF1YWxUbyk6CisgICAg ICAgIENTU1J1bGUgaWRlbnRpZmllcnMgYXJlIG9iamVjdHMuCisKKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL1ZpZXdzL1J1bGVzU3R5bGVEZXRhaWxzUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuUnVsZXNTdHlsZURldGFpbHNQYW5lbC5wcm90b3R5cGUucmVmcmVzaCk6CisgICAgICAg IFJlbW92ZSBkdXBsaWNhdGVzIGZyb20gdGhlIG9yZGVyZWQgbGlzdCBvZiBzdHlsZSBkZWNsYXJh dGlvbnMuCisKKzIwMTQtMTItMDEgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNv bT4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBMYXlvdXRUZXN0cy9pbnNwZWN0b3IgdGVzdHMg ZmFpbCBpbiBQcm9kdWN0aW9uIGJ1aWxkcyBkdWUgdG8gbWlzc2luZyB0ZXN0IHJlc291cmNlcwog ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM4ODk4CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9D U1NSdWxlLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0NT U1J1bGUuanMKaW5kZXggMDdkMDcxMC4uMGQ4NzQxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0NTU1J1bGUuanMKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0NTU1J1bGUuanMKQEAgLTE4OCw2ICsx ODgsMTQgQEAgV2ViSW5zcGVjdG9yLkNTU1J1bGUucHJvdG90eXBlID0gewogICAgICAgICByZXR1 cm4gdGhpcy5fbWVkaWFMaXN0OwogICAgIH0sCiAKKyAgICBpc0VxdWFsVG86IGZ1bmN0aW9uKHJ1 bGUpCisgICAgeworICAgICAgICBpZiAoIXJ1bGUpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7 CisKKyAgICAgICAgcmV0dXJuIE9iamVjdC5zaGFsbG93RXF1YWwodGhpcy5faWQsIHJ1bGUuaWQp OworICAgIH0sCisKICAgICAvLyBQcm90ZWN0ZWQKIAogICAgIGdldCBub2RlU3R5bGVzKCkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1J1bGVz U3R5bGVEZXRhaWxzUGFuZWwuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9SdWxlc1N0eWxlRGV0YWlsc1BhbmVsLmpzCmluZGV4IGE1MDJkZTUuLjgwYzA4OGEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1J1 bGVzU3R5bGVEZXRhaWxzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvUnVsZXNTdHlsZURldGFpbHNQYW5lbC5qcwpAQCAtOTIsNiArOTIsMzEg QEAgV2ViSW5zcGVjdG9yLlJ1bGVzU3R5bGVEZXRhaWxzUGFuZWwucHJvdG90eXBlID0gewogICAg ICAgICAgICAgfSk7CiAgICAgICAgIH0KIAorICAgICAgICBmdW5jdGlvbiB1bmlxdWVPcmRlcmVk U3R5bGVzKG9yZGVyZWRTdHlsZXMpCisgICAgICAgIHsKKyAgICAgICAgICAgIHZhciB1bmlxdWVT dHlsZXMgPSBbXTsKKworICAgICAgICAgICAgZm9yICh2YXIgc3R5bGUgb2Ygb3JkZXJlZFN0eWxl cykgeworICAgICAgICAgICAgICAgIHZhciBydWxlID0gc3R5bGUub3duZXJSdWxlOworICAgICAg ICAgICAgICAgIGlmICghcnVsZSkgeworICAgICAgICAgICAgICAgICAgICB1bmlxdWVTdHlsZXMu cHVzaChzdHlsZSk7CisgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAg ICAgIH0KKworICAgICAgICAgICAgICAgIHZhciBmb3VuZCA9IGZhbHNlOworICAgICAgICAgICAg ICAgIGZvciAodmFyIGV4aXN0aW5nU3R5bGUgb2YgdW5pcXVlU3R5bGVzKSB7CisgICAgICAgICAg ICAgICAgICAgIGlmIChydWxlLmlzRXF1YWxUbyhleGlzdGluZ1N0eWxlLm93bmVyUnVsZSkpIHsK KyAgICAgICAgICAgICAgICAgICAgICAgIGZvdW5kID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICAg ICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgfQor ICAgICAgICAgICAgICAgIGlmICghZm91bmQpCisgICAgICAgICAgICAgICAgICAgIHVuaXF1ZVN0 eWxlcy5wdXNoKHN0eWxlKTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgcmV0dXJuIHVu aXF1ZVN0eWxlczsKKyAgICAgICAgfQorCiAgICAgICAgIGZ1bmN0aW9uIGFwcGVuZFN0eWxlU2Vj dGlvbihzdHlsZSkKICAgICAgICAgewogICAgICAgICAgICAgdmFyIHNlY3Rpb24gPSBzdHlsZS5f X3J1bGVzU2VjdGlvbjsKQEAgLTEzOCwxMCArMTYzLDkgQEAgV2ViSW5zcGVjdG9yLlJ1bGVzU3R5 bGVEZXRhaWxzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB2YXIgcHNldWRvRWxlbWVudHMg PSB0aGlzLm5vZGVTdHlsZXMucHNldWRvRWxlbWVudHM7CiAgICAgICAgIGZvciAodmFyIHBzZXVk b0lkZW50aWZpZXIgaW4gcHNldWRvRWxlbWVudHMpIHsKICAgICAgICAgICAgIHZhciBwc2V1ZG9F bGVtZW50ID0gcHNldWRvRWxlbWVudHNbcHNldWRvSWRlbnRpZmllcl07Ci0gICAgICAgICAgICBm b3IgKHZhciBpID0gMDsgaSA8IHBzZXVkb0VsZW1lbnQub3JkZXJlZFN0eWxlcy5sZW5ndGg7ICsr aSkgewotICAgICAgICAgICAgICAgIHZhciBzdHlsZSA9IHBzZXVkb0VsZW1lbnQub3JkZXJlZFN0 eWxlc1tpXTsKKyAgICAgICAgICAgIHZhciBvcmRlcmVkU3R5bGVzID0gdW5pcXVlT3JkZXJlZFN0 eWxlcyhwc2V1ZG9FbGVtZW50Lm9yZGVyZWRTdHlsZXMpOworICAgICAgICAgICAgZm9yICh2YXIg c3R5bGUgb2Ygb3JkZXJlZFN0eWxlcykKICAgICAgICAgICAgICAgICBhcHBlbmRTdHlsZVNlY3Rp b24uY2FsbCh0aGlzLCBzdHlsZSk7Ci0gICAgICAgICAgICB9CiAKICAgICAgICAgICAgIGlmIChw cmV2aW91c1NlY3Rpb24pCiAgICAgICAgICAgICAgICAgcHJldmlvdXNTZWN0aW9uLmxhc3RJbkdy b3VwID0gdHJ1ZTsKQEAgLTE0OSw3ICsxNzMsNyBAQCBXZWJJbnNwZWN0b3IuUnVsZXNTdHlsZURl dGFpbHNQYW5lbC5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgdmFyIGFkZGVkTmV3UnVsZUJ1dHRv biA9IGZhbHNlOwogCi0gICAgICAgIHZhciBvcmRlcmVkU3R5bGVzID0gdGhpcy5ub2RlU3R5bGVz Lm9yZGVyZWRTdHlsZXM7CisgICAgICAgIHZhciBvcmRlcmVkU3R5bGVzID0gdW5pcXVlT3JkZXJl ZFN0eWxlcyh0aGlzLm5vZGVTdHlsZXMub3JkZXJlZFN0eWxlcyk7CiAgICAgICAgIGZvciAodmFy IGkgPSAwOyBpIDwgb3JkZXJlZFN0eWxlcy5sZW5ndGg7ICsraSkgewogICAgICAgICAgICAgdmFy IHN0eWxlID0gb3JkZXJlZFN0eWxlc1tpXTsKIAo=