35025 2010-02-17 03:17:38 -0800 Web Inspector: Errors when inspecting styles of non-renderable elements in XHTML 2010-03-16 09:47:29 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 apavlov pfeldman abarth bweinstein joepeck keishi pfeldman pmuellr rik timothy oldest_to_newest 190959 0 48882 apavlov 2010-02-17 03:17:38 -0800 Created attachment 48882 Test Case 1. Bring up the Web Inspector for the attached Test Case (XHTML page). 2. In the Elements panel (note that the top-level node is not expanded), make the <img> or <script> elements visible. 3. Click either of the <img> or <script> elements. In the Console, you will see a red crossed circle followed by "Error dispatching: getStyles" (or "Error dispatching: getInlineStyle"). The Styles sidebar pane is empty, and the Properties pane does not show the full elements hierarchy (HTMLImgElement or HTMLScriptElement are not displayed) 200161 1 50786 pfeldman 2010-03-16 06:35:15 -0700 Created attachment 50786 [PATCH] Proposed fix. 200167 2 pfeldman 2010-03-16 06:58:16 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/inspector/InspectorDOMAgent.cpp M WebCore/inspector/front-end/DOMAgent.js M WebCore/inspector/front-end/MetricsSidebarPane.js M WebCore/inspector/front-end/StylesSidebarPane.js Committed r56059 200231 3 abarth 2010-03-16 09:05:25 -0700 This appears to have broken the tree: $ ./WebKitTools/Scripts/webkit-patch what-broke Leopard Intel Release (Tests) : FAIL (blame-list: [56059]) Leopard Intel Debug (Tests) : FAIL (blame-list: [56059]) SnowLeopard Intel Release (Tests) : FAIL (blame-list: [56059]) 200262 4 pfeldman 2010-03-16 09:47:29 -0700 (In reply to comment #3) > This appears to have broken the tree: > > $ ./WebKitTools/Scripts/webkit-patch what-broke > Leopard Intel Release (Tests) : FAIL (blame-list: [56059]) > Leopard Intel Debug (Tests) : FAIL (blame-list: [56059]) > SnowLeopard Intel Release (Tests) : FAIL (blame-list: [56059]) Should have been fixed by r56067 48882 2010-02-17 03:17:38 -0800 2010-02-17 03:17:38 -0800 Test Case stylesfailure.xhtml application/xhtml+xml 128 apavlov PGh0bWw+DQo8aGVhZD4NCjxzY3JpcHQgc3JjPSJmb28uanMiPjwvc2NyaXB0Pg0KPC9oZWFkPg0K PGJvZHk+DQo8aW1nIHNyYz0iaHR0cDovL3d3dy5leGFtcGxlLmNvbS9sb2dvLmdpZiIgLz4NCjwv Ym9keT4NCjwvaHRtbD4= 50786 2010-03-16 06:35:15 -0700 2010-03-16 06:38:19 -0700 [PATCH] Proposed fix. error_in_styles text/plain 9830 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YTcyZWM3MS4uNGM4YzQzZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyNCBAQAogMjAxMC0wMy0xNiAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KIAorICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBFcnJvcnMgd2hlbiBpbnNwZWN0aW5n IHN0eWxlcyBvZiBub24tcmVuZGVyYWJsZSBlbGVtZW50cyBpbiBYSFRNTC4KKworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzUwMjUKKyAgICAgICAgCisg ICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6Okluc3BlY3RvckRPTUFnZW50OjpnZXRTdHlsZXMpOgorICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvRE9NQWdlbnQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NTm9kZS5wcm90 b3R5cGUuX2FkZEF0dHJpYnV0ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NV2luZG93LnBy b3RvdHlwZS5PYmplY3QpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvTWV0cmljc1Np ZGViYXJQYW5lLmpzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJh clBhbmUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3R5bGVzU2lkZWJhclBhbmUucHJvdG90 eXBlLnVwZGF0ZS5jYWxsYmFjayk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3R5bGVzU2lkZWJh clBhbmUucHJvdG90eXBlLnVwZGF0ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3R5bGVzU2lk ZWJhclBhbmUucHJvdG90eXBlLl91cGRhdGUpOgorCisyMDEwLTAzLTE2ICBQYXZlbCBGZWxkbWFu ICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFJldmlld2VkIGJ5IFRpbW90aHkg SGF0Y2hlci4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBtaWdyYXRlIHRvIG5hdGl2ZSBzdHls ZXMgaW5zcGVjdG9yIGluCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JE T01BZ2VudC5jcHAgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHAKaW5k ZXggZmMxYTA2My4uZjM2NmY2NiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yRE9NQWdlbnQuY3BwCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50 LmNwcApAQCAtNjk2LDcgKzY5Niw4IEBAIHZvaWQgSW5zcGVjdG9yRE9NQWdlbnQ6OmdldFN0eWxl cyhsb25nIGNhbGxJZCwgbG9uZyBub2RlSWQsIGJvb2wgYXV0aG9yT25seSkKICAgICBSZWZQdHI8 Q1NTU3R5bGVEZWNsYXJhdGlvbj4gY29tcHV0ZWRTdHlsZSA9IGRlZmF1bHRWaWV3LT5nZXRDb21w dXRlZFN0eWxlKGVsZW1lbnQsICIiKTsKIAogICAgIFNjcmlwdE9iamVjdCByZXN1bHQgPSBtX2Zy b250ZW5kLT5uZXdTY3JpcHRPYmplY3QoKTsKLSAgICByZXN1bHQuc2V0KCJpbmxpbmVTdHlsZSIs IGJ1aWxkT2JqZWN0Rm9yU3R5bGUoZWxlbWVudC0+c3R5bGUoKSwgdHJ1ZSkpOworICAgIGlmIChl bGVtZW50LT5zdHlsZSgpKQorICAgICAgICByZXN1bHQuc2V0KCJpbmxpbmVTdHlsZSIsIGJ1aWxk T2JqZWN0Rm9yU3R5bGUoZWxlbWVudC0+c3R5bGUoKSwgdHJ1ZSkpOwogICAgIHJlc3VsdC5zZXQo ImNvbXB1dGVkU3R5bGUiLCBidWlsZE9iamVjdEZvclN0eWxlKGNvbXB1dGVkU3R5bGUuZ2V0KCks IGZhbHNlKSk7CiAgICAgcmVzdWx0LnNldCgibWF0Y2hlZENTU1J1bGVzIiwgZ2V0TWF0Y2hlZENT U1J1bGVzKGVsZW1lbnQsIGF1dGhvck9ubHkpKTsKICAgICByZXN1bHQuc2V0KCJzdHlsZUF0dHJp YnV0ZXMiLCBnZXRBdHRyaWJ1dGVTdHlsZXMoZWxlbWVudCkpOwpkaWZmIC0tZ2l0IGEvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50LmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0RPTUFnZW50LmpzCmluZGV4IDYyZmVkNzcuLmM4YmI3MWYgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01BZ2VudC5qcworKysgYi9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvRE9NQWdlbnQuanMKQEAgLTIxMSwzMCArMjExLDYgQEAgV2ViSW5zcGVj dG9yLkRPTU5vZGUucHJvdG90eXBlID0gewogICAgICAgICB9OwogICAgICAgICB0aGlzLl9hdHRy aWJ1dGVzTWFwW25hbWVdID0gYXR0cjsKICAgICAgICAgdGhpcy5hdHRyaWJ1dGVzLnB1c2goYXR0 cik7Ci0gICAgfSwKLQotICAgIF9zZXRTdHlsZXM6IGZ1bmN0aW9uKGNvbXB1dGVkU3R5bGUsIGlu bGluZVN0eWxlLCBzdHlsZUF0dHJpYnV0ZXMsIG1hdGNoZWRDU1NSdWxlcykKLSAgICB7Ci0gICAg ICAgIHRoaXMuX2NvbXB1dGVkU3R5bGUgPSBuZXcgV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFy YXRpb24oY29tcHV0ZWRTdHlsZSk7Ci0gICAgICAgIHRoaXMuc3R5bGUgPSBuZXcgV2ViSW5zcGVj dG9yLkNTU1N0eWxlRGVjbGFyYXRpb24oaW5saW5lU3R5bGUpOwotCi0gICAgICAgIGZvciAodmFy IG5hbWUgaW4gc3R5bGVBdHRyaWJ1dGVzKSB7Ci0gICAgICAgICAgICBpZiAodGhpcy5fYXR0cmli dXRlc01hcFtuYW1lXSkKLSAgICAgICAgICAgICAgICB0aGlzLl9hdHRyaWJ1dGVzTWFwW25hbWVd LnN0eWxlID0gbmV3IFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uKHN0eWxlQXR0cmli dXRlc1tuYW1lXSk7Ci0gICAgICAgIH0KLQotICAgICAgICB0aGlzLl9tYXRjaGVkQ1NTUnVsZXMg PSBbXTsKLSAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBtYXRjaGVkQ1NTUnVsZXMubGVuZ3Ro OyBpKyspCi0gICAgICAgICAgICB0aGlzLl9tYXRjaGVkQ1NTUnVsZXMucHVzaChXZWJJbnNwZWN0 b3IuQ1NTU3R5bGVEZWNsYXJhdGlvbi5wYXJzZVJ1bGUobWF0Y2hlZENTU1J1bGVzW2ldKSk7Ci0g ICAgfSwKLQotICAgIF9jbGVhclN0eWxlczogZnVuY3Rpb24oKQotICAgIHsKLSAgICAgICAgdGhp cy5jb21wdXRlZFN0eWxlID0gbnVsbDsKLSAgICAgICAgdGhpcy5zdHlsZSA9IG51bGw7Ci0gICAg ICAgIGZvciAodmFyIG5hbWUgaW4gdGhpcy5fYXR0cmlidXRlc01hcCkKLSAgICAgICAgICAgIHRo aXMuX2F0dHJpYnV0ZXNNYXBbbmFtZV0uc3R5bGUgPSBudWxsOwotICAgICAgICB0aGlzLl9tYXRj aGVkQ1NTUnVsZXMgPSBudWxsOwogICAgIH0KIH0KIApAQCAtMzA4LDE2ICsyODQsNiBAQCBXZWJJ bnNwZWN0b3IuRE9NV2luZG93LnByb3RvdHlwZSA9IHsKIAogICAgIE9iamVjdDogZnVuY3Rpb24o KQogICAgIHsKLSAgICB9LAotCi0gICAgZ2V0Q29tcHV0ZWRTdHlsZTogZnVuY3Rpb24obm9kZSkK LSAgICB7Ci0gICAgICAgIHJldHVybiBub2RlLl9jb21wdXRlZFN0eWxlOwotICAgIH0sCi0KLSAg ICBnZXRNYXRjaGVkQ1NTUnVsZXM6IGZ1bmN0aW9uKG5vZGUsIHBzZXVkb0VsZW1lbnQsIGF1dGhv ck9ubHkpCi0gICAgewotICAgICAgICByZXR1cm4gbm9kZS5fbWF0Y2hlZENTU1J1bGVzOwogICAg IH0KIH0KIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL01ldHJpY3NT aWRlYmFyUGFuZS5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9NZXRyaWNzU2lkZWJh clBhbmUuanMKaW5kZXggNzM1Y2U5NC4uZWQ1YTdlYyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL01ldHJpY3NTaWRlYmFyUGFuZS5qcworKysgYi9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvTWV0cmljc1NpZGViYXJQYW5lLmpzCkBAIC0xODUsNiArMTg1LDExIEBA IFdlYkluc3BlY3Rvci5NZXRyaWNzU2lkZWJhclBhbmUucHJvdG90eXBlID0gewogCiAgICAgZWRp dGluZ0NvbW1pdHRlZDogZnVuY3Rpb24oZWxlbWVudCwgdXNlcklucHV0LCBwcmV2aW91c0NvbnRl bnQsIGNvbnRleHQpCiAgICAgeworICAgICAgICBpZiAoIXRoaXMuX2lubGluZVN0eWxlSWQpIHsK KyAgICAgICAgICAgIC8vIEVsZW1lbnQgaGFzIG5vIHJlbmRlcmVyLgorICAgICAgICAgICAgcmV0 dXJuIHRoaXMuZWRpdGluZ0NhbmNlbGxlZChlbGVtZW50LCBjb250ZXh0KTsgLy8gbm90aGluZyBj aGFuZ2VkLCBzbyBjYW5jZWwKKyAgICAgICAgfQorCiAgICAgICAgIGlmICh1c2VySW5wdXQgPT09 IHByZXZpb3VzQ29udGVudCkKICAgICAgICAgICAgIHJldHVybiB0aGlzLmVkaXRpbmdDYW5jZWxs ZWQoZWxlbWVudCwgY29udGV4dCk7IC8vIG5vdGhpbmcgY2hhbmdlZCwgc28gY2FuY2VsCiAKZGlm ZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5q cyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qcwppbmRl eCA4OGE0ZGU3Li42ZTg4OWMzIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU3R5bGVzU2lkZWJhclBhbmUuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1N0eWxlc1NpZGViYXJQYW5lLmpzCkBAIC0xMTEsMTcgKzExMSwxOCBAQCBXZWJJbnNwZWN0b3Iu U3R5bGVzU2lkZWJhclBhbmUucHJvdG90eXBlID0gewogICAgICAgICB7CiAgICAgICAgICAgICBp ZiAoIXN0eWxlcykKICAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICBub2RlLl9z ZXRTdHlsZXMoc3R5bGVzLmNvbXB1dGVkU3R5bGUsIHN0eWxlcy5pbmxpbmVTdHlsZSwgc3R5bGVz LnN0eWxlQXR0cmlidXRlcywgc3R5bGVzLm1hdGNoZWRDU1NSdWxlcyk7Ci0gICAgICAgICAgICBz ZWxmLl91cGRhdGUocmVmcmVzaCwgYm9keSwgbm9kZSwgZWRpdGVkU2VjdGlvbiwgZm9yY2VVcGRh dGUpOworICAgICAgICAgICAgc2VsZi5fdXBkYXRlKHJlZnJlc2gsIG5vZGUsIHN0eWxlcywgZWRp dGVkU2VjdGlvbiwgZm9yY2VVcGRhdGUpOwogICAgICAgICB9CiAKICAgICAgICAgSW5zcGVjdG9y QmFja2VuZC5nZXRTdHlsZXMoV2ViSW5zcGVjdG9yLkNhbGxiYWNrLndyYXAoY2FsbGJhY2spLCBu b2RlLmlkLCAhV2ViSW5zcGVjdG9yLnNldHRpbmdzLnNob3dVc2VyQWdlbnRTdHlsZXMpOwogICAg IH0sCiAKLSAgICBfdXBkYXRlOiBmdW5jdGlvbihyZWZyZXNoLCBib2R5LCBub2RlLCBlZGl0ZWRT ZWN0aW9uLCBmb3JjZVVwZGF0ZSkKKyAgICBfdXBkYXRlOiBmdW5jdGlvbihyZWZyZXNoLCBub2Rl LCBzdHlsZXMsIGVkaXRlZFNlY3Rpb24sIGZvcmNlVXBkYXRlKQogICAgIHsKKyAgICAgICAgdmFy IG5vZGVDb21wdXRlZFN0eWxlID0gbmV3IFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9u KHN0eWxlcy5jb21wdXRlZFN0eWxlKTsKKwogICAgICAgICBpZiAoIXJlZnJlc2gpIHsKLSAgICAg ICAgICAgIGJvZHkucmVtb3ZlQ2hpbGRyZW4oKTsKKyAgICAgICAgICAgIHRoaXMuYm9keUVsZW1l bnQucmVtb3ZlQ2hpbGRyZW4oKTsKICAgICAgICAgICAgIHRoaXMuc2VjdGlvbnMgPSBbXTsKICAg ICAgICAgfQogCkBAIC0xMzMsNDIgKzEzNCwzNSBAQCBXZWJJbnNwZWN0b3IuU3R5bGVzU2lkZWJh clBhbmUucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgIGlmIChzZWN0aW9uIGluc3RhbmNl b2YgV2ViSW5zcGVjdG9yLkJsYW5rU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbikKICAgICAgICAgICAg ICAgICAgICAgY29udGludWU7CiAgICAgICAgICAgICAgICAgaWYgKHNlY3Rpb24uY29tcHV0ZWRT dHlsZSkKLSAgICAgICAgICAgICAgICAgICAgc2VjdGlvbi5zdHlsZVJ1bGUuc3R5bGUgPSBub2Rl Lm93bmVyRG9jdW1lbnQuZGVmYXVsdFZpZXcuZ2V0Q29tcHV0ZWRTdHlsZShub2RlKTsKKyAgICAg ICAgICAgICAgICAgICAgc2VjdGlvbi5zdHlsZVJ1bGUuc3R5bGUgPSBub2RlQ29tcHV0ZWRTdHls ZTsKICAgICAgICAgICAgICAgICB2YXIgc3R5bGVSdWxlID0geyBzZWN0aW9uOiBzZWN0aW9uLCBz dHlsZTogc2VjdGlvbi5zdHlsZVJ1bGUuc3R5bGUsIGNvbXB1dGVkU3R5bGU6IHNlY3Rpb24uY29t cHV0ZWRTdHlsZSwgcnVsZTogc2VjdGlvbi5ydWxlIH07CiAgICAgICAgICAgICAgICAgc3R5bGVS dWxlcy5wdXNoKHN0eWxlUnVsZSk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0gZWxzZSB7Ci0g ICAgICAgICAgICB2YXIgY29tcHV0ZWRTdHlsZSA9IG5vZGUub3duZXJEb2N1bWVudC5kZWZhdWx0 Vmlldy5nZXRDb21wdXRlZFN0eWxlKG5vZGUpOwotICAgICAgICAgICAgc3R5bGVSdWxlcy5wdXNo KHsgY29tcHV0ZWRTdHlsZTogdHJ1ZSwgc2VsZWN0b3JUZXh0OiBXZWJJbnNwZWN0b3IuVUlTdHJp bmcoIkNvbXB1dGVkIFN0eWxlIiksIHN0eWxlOiBjb21wdXRlZFN0eWxlLCBlZGl0YWJsZTogZmFs c2UgfSk7Ci0KLSAgICAgICAgICAgIHZhciBub2RlTmFtZSA9IG5vZGUubm9kZU5hbWUudG9Mb3dl ckNhc2UoKTsKLSAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgbm9kZS5hdHRyaWJ1dGVz Lmxlbmd0aDsgKytpKSB7Ci0gICAgICAgICAgICAgICAgdmFyIGF0dHIgPSBub2RlLmF0dHJpYnV0 ZXNbaV07Ci0gICAgICAgICAgICAgICAgaWYgKGF0dHIuc3R5bGUpIHsKLSAgICAgICAgICAgICAg ICAgICAgdmFyIGF0dHJTdHlsZSA9IHsgc3R5bGU6IGF0dHIuc3R5bGUsIGVkaXRhYmxlOiBmYWxz ZSB9OwotICAgICAgICAgICAgICAgICAgICBhdHRyU3R5bGUuc3VidGl0bGUgPSBXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoImVsZW1lbnTigJlzIOKAnCVz4oCdIGF0dHJpYnV0ZSIsIGF0dHIubmFtZSk7 Ci0gICAgICAgICAgICAgICAgICAgIGF0dHJTdHlsZS5zZWxlY3RvclRleHQgPSBub2RlTmFtZSAr ICJbIiArIGF0dHIubmFtZTsKLSAgICAgICAgICAgICAgICAgICAgaWYgKGF0dHIudmFsdWUubGVu Z3RoKQotICAgICAgICAgICAgICAgICAgICAgICAgYXR0clN0eWxlLnNlbGVjdG9yVGV4dCArPSAi PSIgKyBhdHRyLnZhbHVlOwotICAgICAgICAgICAgICAgICAgICBhdHRyU3R5bGUuc2VsZWN0b3JU ZXh0ICs9ICJdIjsKLSAgICAgICAgICAgICAgICAgICAgc3R5bGVSdWxlcy5wdXNoKGF0dHJTdHls ZSk7Ci0gICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgc3R5bGVSdWxlcy5wdXNoKHsgY29t cHV0ZWRTdHlsZTogdHJ1ZSwgc2VsZWN0b3JUZXh0OiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNv bXB1dGVkIFN0eWxlIiksIHN0eWxlOiBub2RlQ29tcHV0ZWRTdHlsZSwgZWRpdGFibGU6IGZhbHNl IH0pOworCisgICAgICAgICAgICB2YXIgc3R5bGVBdHRyaWJ1dGVzID0ge307CisgICAgICAgICAg ICBmb3IgKHZhciBuYW1lIGluIHN0eWxlcy5zdHlsZUF0dHJpYnV0ZXMpIHsKKyAgICAgICAgICAg ICAgICB2YXIgYXR0clN0eWxlID0geyBzdHlsZTogbmV3IFdlYkluc3BlY3Rvci5DU1NTdHlsZURl Y2xhcmF0aW9uKHN0eWxlcy5zdHlsZUF0dHJpYnV0ZXNbbmFtZV0pLCBlZGl0YWJsZTogZmFsc2Ug fTsKKyAgICAgICAgICAgICAgICBhdHRyU3R5bGUuc3VidGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlT dHJpbmcoImVsZW1lbnTigJlzIOKAnCVz4oCdIGF0dHJpYnV0ZSIsIG5hbWUpOworICAgICAgICAg ICAgICAgIGF0dHJTdHlsZS5zZWxlY3RvclRleHQgPSBub2RlTmFtZSArICJbIiArIG5hbWU7Cisg ICAgICAgICAgICAgICAgaWYgKG5vZGUuZ2V0QXR0cmlidXRlKG5hbWUpKQorICAgICAgICAgICAg ICAgICAgICBhdHRyU3R5bGUuc2VsZWN0b3JUZXh0ICs9ICI9IiArIG5vZGUuZ2V0QXR0cmlidXRl KG5hbWUpOworICAgICAgICAgICAgICAgIGF0dHJTdHlsZS5zZWxlY3RvclRleHQgKz0gIl0iOwor ICAgICAgICAgICAgICAgIHN0eWxlUnVsZXMucHVzaChhdHRyU3R5bGUpOwogICAgICAgICAgICAg fQogCiAgICAgICAgICAgICAvLyBBbHdheXMgU2hvdyBlbGVtZW50J3MgU3R5bGUgQXR0cmlidXRl cwotICAgICAgICAgICAgaWYgKG5vZGUubm9kZVR5cGUgPT09IE5vZGUuRUxFTUVOVF9OT0RFKSB7 Ci0gICAgICAgICAgICAgICAgdmFyIGlubGluZVN0eWxlID0geyBzZWxlY3RvclRleHQ6IFdlYklu c3BlY3Rvci5VSVN0cmluZygiU3R5bGUgQXR0cmlidXRlIiksIHN0eWxlOiBub2RlLnN0eWxlLCBp c0F0dHJpYnV0ZTogdHJ1ZSB9OworICAgICAgICAgICAgaWYgKHN0eWxlcy5pbmxpbmVTdHlsZSAm JiBub2RlLm5vZGVUeXBlID09PSBOb2RlLkVMRU1FTlRfTk9ERSkgeworICAgICAgICAgICAgICAg IHZhciBpbmxpbmVTdHlsZSA9IHsgc2VsZWN0b3JUZXh0OiBXZWJJbnNwZWN0b3IuVUlTdHJpbmco IlN0eWxlIEF0dHJpYnV0ZSIpLCBzdHlsZTogbmV3IFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xh cmF0aW9uKHN0eWxlcy5pbmxpbmVTdHlsZSksIGlzQXR0cmlidXRlOiB0cnVlIH07CiAgICAgICAg ICAgICAgICAgaW5saW5lU3R5bGUuc3VidGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoImVs ZW1lbnTigJlzIOKAnCVz4oCdIGF0dHJpYnV0ZSIsICJzdHlsZSIpOwogICAgICAgICAgICAgICAg IHN0eWxlUnVsZXMucHVzaChpbmxpbmVTdHlsZSk7CiAgICAgICAgICAgICB9CiAKLSAgICAgICAg ICAgIHZhciBtYXRjaGVkU3R5bGVSdWxlcyA9IG5vZGUub3duZXJEb2N1bWVudC5kZWZhdWx0Vmll dy5nZXRNYXRjaGVkQ1NTUnVsZXMobm9kZSwgIiIsICFXZWJJbnNwZWN0b3Iuc2V0dGluZ3Muc2hv d1VzZXJBZ2VudFN0eWxlcyk7Ci0gICAgICAgICAgICBpZiAobWF0Y2hlZFN0eWxlUnVsZXMpIHsK LSAgICAgICAgICAgICAgICAvLyBBZGQgcnVsZXMgaW4gcmV2ZXJzZSBvcmRlciB0byBtYXRjaCB0 aGUgY2FzY2FkZSBvcmRlci4KLSAgICAgICAgICAgICAgICBmb3IgKHZhciBpID0gKG1hdGNoZWRT dHlsZVJ1bGVzLmxlbmd0aCAtIDEpOyBpID49IDA7IC0taSkgewotICAgICAgICAgICAgICAgICAg ICB2YXIgcnVsZSA9IG1hdGNoZWRTdHlsZVJ1bGVzW2ldOwotICAgICAgICAgICAgICAgICAgICBz dHlsZVJ1bGVzLnB1c2goeyBzdHlsZTogcnVsZS5zdHlsZSwgc2VsZWN0b3JUZXh0OiBydWxlLnNl bGVjdG9yVGV4dCwgcGFyZW50U3R5bGVTaGVldDogcnVsZS5wYXJlbnRTdHlsZVNoZWV0LCBydWxl OiBydWxlIH0pOwotICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIC8vIEFkZCBydWxlcyBp biByZXZlcnNlIG9yZGVyIHRvIG1hdGNoIHRoZSBjYXNjYWRlIG9yZGVyLgorICAgICAgICAgICAg Zm9yICh2YXIgaSA9IHN0eWxlcy5tYXRjaGVkQ1NTUnVsZXMubGVuZ3RoIC0gMTsgaSA+PSAwOyAt LWkpIHsKKyAgICAgICAgICAgICAgICB2YXIgcnVsZSA9IFdlYkluc3BlY3Rvci5DU1NTdHlsZURl Y2xhcmF0aW9uLnBhcnNlUnVsZShzdHlsZXMubWF0Y2hlZENTU1J1bGVzW2ldKTsKKyAgICAgICAg ICAgICAgICBzdHlsZVJ1bGVzLnB1c2goeyBzdHlsZTogcnVsZS5zdHlsZSwgc2VsZWN0b3JUZXh0 OiBydWxlLnNlbGVjdG9yVGV4dCwgcGFyZW50U3R5bGVTaGVldDogcnVsZS5wYXJlbnRTdHlsZVNo ZWV0LCBydWxlOiBydWxlIH0pOwogICAgICAgICAgICAgfQogICAgICAgICB9CiAKQEAgLTMxMSw3 ICszMDUsNyBAQCBXZWJJbnNwZWN0b3IuU3R5bGVzU2lkZWJhclBhbmUucHJvdG90eXBlID0gewog ICAgICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICAgICAgc2VjdGlvbi5leHBhbmQo dHJ1ZSk7CiAKLSAgICAgICAgICAgICAgICBib2R5LmFwcGVuZENoaWxkKHNlY3Rpb24uZWxlbWVu dCk7CisgICAgICAgICAgICAgICAgdGhpcy5ib2R5RWxlbWVudC5hcHBlbmRDaGlsZChzZWN0aW9u LmVsZW1lbnQpOwogICAgICAgICAgICAgICAgIHRoaXMuc2VjdGlvbnMucHVzaChzZWN0aW9uKTsK ICAgICAgICAgICAgIH0KICAgICAgICAgfQo=