57452 2011-03-30 07:19:15 -0700 Web Inspector: Make the CSStyle "shorthandValues" name-value map an array 2011-03-31 03:29:45 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 57435 1 apavlov apavlov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 376291 0 apavlov 2011-03-30 07:19:15 -0700 Patch to follow. 376358 1 87543 apavlov 2011-03-30 08:45:59 -0700 Created attachment 87543 [PATCH] Suggested solution 376364 2 87544 apavlov 2011-03-30 08:56:19 -0700 Created attachment 87544 [PATCH] Fixed field name in JS object and doc comment in InspectorCSSAgent.cpp to follow the change 377032 3 apavlov 2011-03-31 03:29:45 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M Source/WebCore/ChangeLog M Source/WebCore/inspector/InspectorCSSAgent.cpp M Source/WebCore/inspector/InspectorStyleSheet.cpp M Source/WebCore/inspector/front-end/CSSStyleModel.js Committed r82555 87543 2011-03-30 08:45:59 -0700 2011-03-30 08:56:19 -0700 [PATCH] Suggested solution shorthands.patch text/plain 3245 apavlov Y29tbWl0IDhlY2MxNjIwOWRmZGU5MGZhMGVkZDUxYzUwMDE2MjM4NDkxMTVjOTEKQXV0aG9yOiBB bGV4YW5kZXIgUGF2bG92IDxhcGF2bG92QGNocm9taXVtLm9yZz4KRGF0ZTogICBXZWQgTWFyIDMw IDE5OjM3OjQzIDIwMTEgKzA0MDAKCiAgICBmaXgKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yU3R5bGVTaGVldC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yU3R5bGVTaGVldC5jcHAKaW5kZXggMzQyY2Y1NC4uYmIwZTE5NiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclN0eWxlU2hlZXQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JTdHlsZVNoZWV0LmNwcApA QCAtNDQwLDcgKzQ0MCw3IEBAIHZvaWQgSW5zcGVjdG9yU3R5bGU6OnBvcHVsYXRlT2JqZWN0V2l0 aFN0eWxlUHJvcGVydGllcyhJbnNwZWN0b3JPYmplY3QqIHJlc3VsdCkKICAgICBwb3B1bGF0ZUFs bFByb3BlcnRpZXMoJnByb3BlcnRpZXMpOwogCiAgICAgUmVmUHRyPEluc3BlY3RvckFycmF5PiBw cm9wZXJ0aWVzT2JqZWN0ID0gSW5zcGVjdG9yQXJyYXk6OmNyZWF0ZSgpOwotICAgIFJlZlB0cjxJ bnNwZWN0b3JPYmplY3Q+IHNob3J0aGFuZFZhbHVlcyA9IEluc3BlY3Rvck9iamVjdDo6Y3JlYXRl KCk7CisgICAgUmVmUHRyPEluc3BlY3RvckFycmF5PiBzaG9ydGhhbmRWYWx1ZXMgPSBJbnNwZWN0 b3JBcnJheTo6Y3JlYXRlKCk7CiAgICAgSGFzaE1hcDxTdHJpbmcsIFJlZlB0cjxJbnNwZWN0b3JP YmplY3Q+ID4gcHJvcGVydHlOYW1lVG9QcmV2aW91c0FjdGl2ZVByb3BlcnR5OwogICAgIEhhc2hT ZXQ8U3RyaW5nPiBmb3VuZFNob3J0aGFuZHM7CiAKQEAgLTUxMSw3ICs1MTEsMTAgQEAgdm9pZCBJ bnNwZWN0b3JTdHlsZTo6cG9wdWxhdGVPYmplY3RXaXRoU3R5bGVQcm9wZXJ0aWVzKEluc3BlY3Rv ck9iamVjdCogcmVzdWx0KQogICAgICAgICAgICAgICAgIHByb3BlcnR5LT5zZXRTdHJpbmcoInNo b3J0aGFuZE5hbWUiLCBzaG9ydGhhbmQpOwogICAgICAgICAgICAgICAgIGlmICghZm91bmRTaG9y dGhhbmRzLmNvbnRhaW5zKHNob3J0aGFuZCkpIHsKICAgICAgICAgICAgICAgICAgICAgZm91bmRT aG9ydGhhbmRzLmFkZChzaG9ydGhhbmQpOwotICAgICAgICAgICAgICAgICAgICBzaG9ydGhhbmRW YWx1ZXMtPnNldFN0cmluZyhzaG9ydGhhbmQsIHNob3J0aGFuZFZhbHVlKHNob3J0aGFuZCkpOwor ICAgICAgICAgICAgICAgICAgICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBzaG9ydGhhbmRFbnRy eSA9IEluc3BlY3Rvck9iamVjdDo6Y3JlYXRlKCk7CisgICAgICAgICAgICAgICAgICAgIHNob3J0 aGFuZEVudHJ5LT5zZXRTdHJpbmcoIm5hbWUiLCBzaG9ydGhhbmQpOworICAgICAgICAgICAgICAg ICAgICBzaG9ydGhhbmRFbnRyeS0+c2V0U3RyaW5nKCJ2YWx1ZSIsIHNob3J0aGFuZFZhbHVlKHNo b3J0aGFuZCkpOworICAgICAgICAgICAgICAgICAgICBzaG9ydGhhbmRWYWx1ZXMtPnB1c2hPYmpl Y3Qoc2hvcnRoYW5kRW50cnkucmVsZWFzZSgpKTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAg ICAgICB9CiAgICAgICAgIH0KQEAgLTUxOSw3ICs1MjIsNyBAQCB2b2lkIEluc3BlY3RvclN0eWxl Ojpwb3B1bGF0ZU9iamVjdFdpdGhTdHlsZVByb3BlcnRpZXMoSW5zcGVjdG9yT2JqZWN0KiByZXN1 bHQpCiAgICAgfQogCiAgICAgcmVzdWx0LT5zZXRBcnJheSgiY3NzUHJvcGVydGllcyIsIHByb3Bl cnRpZXNPYmplY3QpOwotICAgIHJlc3VsdC0+c2V0T2JqZWN0KCJzaG9ydGhhbmRWYWx1ZXMiLCBz aG9ydGhhbmRWYWx1ZXMpOworICAgIHJlc3VsdC0+c2V0QXJyYXkoInNob3J0aGFuZFZhbHVlcyIs IHNob3J0aGFuZFZhbHVlcyk7CiB9CiAKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzCmluZGV4IDE0OGJmZDguLjNkYWU2MWIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ1NTU3R5bGVNb2Rl bC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NTU1N0eWxlTW9k ZWwuanMKQEAgLTE5Nyw3ICsxOTcsNyBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlv biA9IGZ1bmN0aW9uKHBheWxvYWQpCiB7CiAgICAgdGhpcy5pZCA9IHBheWxvYWQuc3R5bGVJZDsK ICAgICB0aGlzLnByb3BlcnRpZXMgPSBwYXlsb2FkLnByb3BlcnRpZXM7Ci0gICAgdGhpcy5fc2hv cnRoYW5kVmFsdWVzID0gcGF5bG9hZC5zaG9ydGhhbmRWYWx1ZXM7CisgICAgdGhpcy5fc2hvcnRo YW5kVmFsdWVzID0gV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb24uYnVpbGRTaG9ydGhh bmRWYWx1ZU1hcChwYXlsb2FkLnNob3J0aGFuZFZhbHVlcyk7CiAgICAgdGhpcy5fbGl2ZVByb3Bl cnR5TWFwID0ge307IC8vIExJVkUgcHJvcGVydGllcyAoc291cmNlLWJhc2VkIG9yIHN0eWxlLWJh c2VkKSA6IHsgbmFtZSAtPiBDU1NQcm9wZXJ0eSB9CiAgICAgdGhpcy5fYWxsUHJvcGVydGllcyA9 IFtdOyAvLyBBTEwgcHJvcGVydGllczogWyBDU1NQcm9wZXJ0eSBdCiAgICAgdGhpcy5fbG9uZ2hh bmRQcm9wZXJ0aWVzID0ge307IC8vIHNob3J0aGFuZE5hbWUgLT4gWyBDU1NQcm9wZXJ0eSBdCkBA IC0yMzIsNiArMjMyLDE0IEBAIFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uID0gZnVu Y3Rpb24ocGF5bG9hZCkKICAgICAgICAgdGhpcy5jc3NUZXh0ID0gcGF5bG9hZC5jc3NUZXh0Owog fQogCitXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvbi5idWlsZFNob3J0aGFuZFZhbHVl TWFwID0gZnVuY3Rpb24oc2hvcnRoYW5kRW50cmllcykKK3sKKyAgICB2YXIgcmVzdWx0ID0ge307 CisgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBzaG9ydGhhbmRFbnRyaWVzLmxlbmd0aDsgKytpKQor ICAgICAgICByZXN1bHRbc2hvcnRoYW5kRW50cmllc1tpXS5uYW1lXSA9IHNob3J0aGFuZEVudHJp ZXNbaV0udmFsdWU7CisgICAgcmV0dXJuIHJlc3VsdDsKK30KKwogV2ViSW5zcGVjdG9yLkNTU1N0 eWxlRGVjbGFyYXRpb24ucGFyc2VQYXlsb2FkID0gZnVuY3Rpb24ocGF5bG9hZCkKIHsKICAgICBy ZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uKHBheWxvYWQpOwo= 87544 2011-03-30 08:56:19 -0700 2011-03-30 11:27:50 -0700 [PATCH] Fixed field name in JS object and doc comment in InspectorCSSAgent.cpp to follow the change shorthands.patch text/plain 5253 apavlov Y29tbWl0IGRhZjZkZGY3NTk3ZGQ3NmFjMDdlOTNjOTUwNTlmYzc5MWM5ZmZmYTgKQXV0aG9yOiBB bGV4YW5kZXIgUGF2bG92IDxhcGF2bG92QGNocm9taXVtLm9yZz4KRGF0ZTogICBXZWQgTWFyIDMw IDE5OjM3OjQzIDIwMTEgKzA0MDAKCiAgICBmaXgKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2Q4NzZhNi4uMmU4 MzQ5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDExLTAzLTMwICBBbGV4YW5kZXIg UGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogTWFrZSB0aGUgQ1NTdHlsZSAi c2hvcnRoYW5kVmFsdWVzIiBuYW1lLXZhbHVlIG1hcCBhbiBhcnJheQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTc0NTIKKworICAgICAgICBObyBuZXcg dGVzdHMsIGFzIHRoaXMgaXMgYSByZWZhY3RvcmluZy4KKworICAgICAgICAqIGluc3BlY3Rvci9J bnNwZWN0b3JDU1NBZ2VudC5jcHA6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvclN0eWxl U2hlZXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yU3R5bGU6OnBvcHVsYXRlT2Jq ZWN0V2l0aFN0eWxlUHJvcGVydGllcyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9D U1NTdHlsZU1vZGVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRp b24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb24uYnVpbGRTaG9y dGhhbmRWYWx1ZU1hcCk6CisKIDIwMTEtMDMtMzAgIFl1cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0Bj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gRml4IGNvbXBpbGF0aW9uIG9uIFdp bmRvd3MgYW5kIEVGTC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JDU1NBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ1NT QWdlbnQuY3BwCmluZGV4IDk4MGZjZjIuLjkzNjc4NjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDU1NBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvckNTU0FnZW50LmNwcApAQCAtODEsMTAgKzgxLDExIEBACiAvLyAg ICAgICAgICAgICAgICAgICAgICAgICAgLi4uCiAvLyAgICAgICAgICAgICAgICAgICAgICAgICAg I2Nzc1Byb3BlcnR5CiAvLyAgICAgICAgICAgICAgICAgICAgICAgICBdLAotLy8gICAgc2hvcnRo YW5kVmFsdWVzICAgIDogewotLy8gICAgICAgICAgICAgICAgICAgICAgICAgIHNob3J0aGFuZE5h bWUxIDogc2hvcnRoYW5kVmFsdWUxLAotLy8gICAgICAgICAgICAgICAgICAgICAgICAgIHNob3J0 aGFuZE5hbWUyIDogc2hvcnRoYW5kVmFsdWUyCi0vLyAgICAgICAgICAgICAgICAgICAgICAgICB9 LAorLy8gICAgc2hvcnRoYW5kRW50cmllcyAgIDogWworLy8gICAgICAgICAgICAgICAgICAgICAg ICAgICNzaG9ydGhhbmRFbnRyeSwKKy8vICAgICAgICAgICAgICAgICAgICAgICAgICAuLi4KKy8v ICAgICAgICAgICAgICAgICAgICAgICAgICAjc2hvcnRoYW5kRW50cnkKKy8vICAgICAgICAgICAg ICAgICAgICAgICAgIF0sCiAvLyAgICBjc3NUZXh0ICAgICAgICAgICAgOiA8c3RyaW5nPiwgLy8g T3B0aW9uYWwgLSBkZWNsYXJhdGlvbiB0ZXh0CiAvLyAgICBwcm9wZXJ0aWVzICAgICAgICAgOiB7 CiAvLyAgICAgICAgICAgICAgICAgICAgICAgICAgd2lkdGgsCkBAIC05NCw2ICs5NSwxMSBAQAog Ly8gICAgICAgICAgICAgICAgICAgICAgICAgfQogLy8gfQogLy8KKy8vIHNob3J0aGFuZEVudHJ5 ID0geworLy8gICAgbmFtZTogPHN0cmluZz4sCisvLyAgICB2YWx1ZTogPHN0cmluZz4KKy8vIH0K Ky8vCiAvLyBjc3NSdWxlID0gewogLy8gICAgcnVsZUlkICAgICAgIDogPHN0cmluZz4sIC8vIE9w dGlvbmFsCiAvLyAgICBzZWxlY3RvclRleHQgOiA8c3RyaW5nPiwKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JTdHlsZVNoZWV0LmNwcCBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JTdHlsZVNoZWV0LmNwcAppbmRleCAzNDJjZjU0Li41ZTY3 M2E4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yU3R5bGVT aGVldC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclN0eWxlU2hl ZXQuY3BwCkBAIC00NDAsNyArNDQwLDcgQEAgdm9pZCBJbnNwZWN0b3JTdHlsZTo6cG9wdWxhdGVP YmplY3RXaXRoU3R5bGVQcm9wZXJ0aWVzKEluc3BlY3Rvck9iamVjdCogcmVzdWx0KQogICAgIHBv cHVsYXRlQWxsUHJvcGVydGllcygmcHJvcGVydGllcyk7CiAKICAgICBSZWZQdHI8SW5zcGVjdG9y QXJyYXk+IHByb3BlcnRpZXNPYmplY3QgPSBJbnNwZWN0b3JBcnJheTo6Y3JlYXRlKCk7Ci0gICAg UmVmUHRyPEluc3BlY3Rvck9iamVjdD4gc2hvcnRoYW5kVmFsdWVzID0gSW5zcGVjdG9yT2JqZWN0 OjpjcmVhdGUoKTsKKyAgICBSZWZQdHI8SW5zcGVjdG9yQXJyYXk+IHNob3J0aGFuZEVudHJpZXMg PSBJbnNwZWN0b3JBcnJheTo6Y3JlYXRlKCk7CiAgICAgSGFzaE1hcDxTdHJpbmcsIFJlZlB0cjxJ bnNwZWN0b3JPYmplY3Q+ID4gcHJvcGVydHlOYW1lVG9QcmV2aW91c0FjdGl2ZVByb3BlcnR5Owog ICAgIEhhc2hTZXQ8U3RyaW5nPiBmb3VuZFNob3J0aGFuZHM7CiAKQEAgLTUxMSw3ICs1MTEsMTAg QEAgdm9pZCBJbnNwZWN0b3JTdHlsZTo6cG9wdWxhdGVPYmplY3RXaXRoU3R5bGVQcm9wZXJ0aWVz KEluc3BlY3Rvck9iamVjdCogcmVzdWx0KQogICAgICAgICAgICAgICAgIHByb3BlcnR5LT5zZXRT dHJpbmcoInNob3J0aGFuZE5hbWUiLCBzaG9ydGhhbmQpOwogICAgICAgICAgICAgICAgIGlmICgh Zm91bmRTaG9ydGhhbmRzLmNvbnRhaW5zKHNob3J0aGFuZCkpIHsKICAgICAgICAgICAgICAgICAg ICAgZm91bmRTaG9ydGhhbmRzLmFkZChzaG9ydGhhbmQpOwotICAgICAgICAgICAgICAgICAgICBz aG9ydGhhbmRWYWx1ZXMtPnNldFN0cmluZyhzaG9ydGhhbmQsIHNob3J0aGFuZFZhbHVlKHNob3J0 aGFuZCkpOworICAgICAgICAgICAgICAgICAgICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBzaG9y dGhhbmRFbnRyeSA9IEluc3BlY3Rvck9iamVjdDo6Y3JlYXRlKCk7CisgICAgICAgICAgICAgICAg ICAgIHNob3J0aGFuZEVudHJ5LT5zZXRTdHJpbmcoIm5hbWUiLCBzaG9ydGhhbmQpOworICAgICAg ICAgICAgICAgICAgICBzaG9ydGhhbmRFbnRyeS0+c2V0U3RyaW5nKCJ2YWx1ZSIsIHNob3J0aGFu ZFZhbHVlKHNob3J0aGFuZCkpOworICAgICAgICAgICAgICAgICAgICBzaG9ydGhhbmRFbnRyaWVz LT5wdXNoT2JqZWN0KHNob3J0aGFuZEVudHJ5LnJlbGVhc2UoKSk7CiAgICAgICAgICAgICAgICAg fQogICAgICAgICAgICAgfQogICAgICAgICB9CkBAIC01MTksNyArNTIyLDcgQEAgdm9pZCBJbnNw ZWN0b3JTdHlsZTo6cG9wdWxhdGVPYmplY3RXaXRoU3R5bGVQcm9wZXJ0aWVzKEluc3BlY3Rvck9i amVjdCogcmVzdWx0KQogICAgIH0KIAogICAgIHJlc3VsdC0+c2V0QXJyYXkoImNzc1Byb3BlcnRp ZXMiLCBwcm9wZXJ0aWVzT2JqZWN0KTsKLSAgICByZXN1bHQtPnNldE9iamVjdCgic2hvcnRoYW5k VmFsdWVzIiwgc2hvcnRoYW5kVmFsdWVzKTsKKyAgICByZXN1bHQtPnNldEFycmF5KCJzaG9ydGhh bmRFbnRyaWVzIiwgc2hvcnRoYW5kRW50cmllcyk7CiB9CiAKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzCmluZGV4IDE0OGJmZDgu LmQ4NWEyMWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv Q1NTU3R5bGVNb2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0NTU1N0eWxlTW9kZWwuanMKQEAgLTE5Nyw3ICsxOTcsNyBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5 bGVEZWNsYXJhdGlvbiA9IGZ1bmN0aW9uKHBheWxvYWQpCiB7CiAgICAgdGhpcy5pZCA9IHBheWxv YWQuc3R5bGVJZDsKICAgICB0aGlzLnByb3BlcnRpZXMgPSBwYXlsb2FkLnByb3BlcnRpZXM7Ci0g ICAgdGhpcy5fc2hvcnRoYW5kVmFsdWVzID0gcGF5bG9hZC5zaG9ydGhhbmRWYWx1ZXM7CisgICAg dGhpcy5fc2hvcnRoYW5kVmFsdWVzID0gV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb24u YnVpbGRTaG9ydGhhbmRWYWx1ZU1hcChwYXlsb2FkLnNob3J0aGFuZEVudHJpZXMpOwogICAgIHRo aXMuX2xpdmVQcm9wZXJ0eU1hcCA9IHt9OyAvLyBMSVZFIHByb3BlcnRpZXMgKHNvdXJjZS1iYXNl ZCBvciBzdHlsZS1iYXNlZCkgOiB7IG5hbWUgLT4gQ1NTUHJvcGVydHkgfQogICAgIHRoaXMuX2Fs bFByb3BlcnRpZXMgPSBbXTsgLy8gQUxMIHByb3BlcnRpZXM6IFsgQ1NTUHJvcGVydHkgXQogICAg IHRoaXMuX2xvbmdoYW5kUHJvcGVydGllcyA9IHt9OyAvLyBzaG9ydGhhbmROYW1lIC0+IFsgQ1NT UHJvcGVydHkgXQpAQCAtMjMyLDYgKzIzMiwxNCBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNs YXJhdGlvbiA9IGZ1bmN0aW9uKHBheWxvYWQpCiAgICAgICAgIHRoaXMuY3NzVGV4dCA9IHBheWxv YWQuY3NzVGV4dDsKIH0KIAorV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb24uYnVpbGRT aG9ydGhhbmRWYWx1ZU1hcCA9IGZ1bmN0aW9uKHNob3J0aGFuZEVudHJpZXMpCit7CisgICAgdmFy IHJlc3VsdCA9IHt9OworICAgIGZvciAodmFyIGkgPSAwOyBpIDwgc2hvcnRoYW5kRW50cmllcy5s ZW5ndGg7ICsraSkKKyAgICAgICAgcmVzdWx0W3Nob3J0aGFuZEVudHJpZXNbaV0ubmFtZV0gPSBz aG9ydGhhbmRFbnRyaWVzW2ldLnZhbHVlOworICAgIHJldHVybiByZXN1bHQ7Cit9CisKIFdlYklu c3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uLnBhcnNlUGF5bG9hZCA9IGZ1bmN0aW9uKHBheWxv YWQpCiB7CiAgICAgcmV0dXJuIG5ldyBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvbihw YXlsb2FkKTsK