47890 2010-10-19 01:46:11 -0700 Web Inspector: migrate from legacy Object.properties to Object.keys, remove dead code. 2010-10-19 03:38:53 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman apavlov bweinstein commit-queue dbates joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 296056 0 pfeldman 2010-10-19 01:46:11 -0700 Drive-by kill dead code. 296059 1 pfeldman 2010-10-19 01:52:23 -0700 I am removing dead stylesheet changes calculation since Alexander is landing the new thing that is a superset of the old functionality. 296064 2 71143 pfeldman 2010-10-19 02:06:47 -0700 Created attachment 71143 [PATCH] Proposed change. 296094 3 commit-queue 2010-10-19 03:36:45 -0700 The commit-queue encountered the following flaky tests while processing attachment 71143: http/tests/security/xssAuditor/script-tag-with-source-entities.html Please file bugs against the tests. The author(s) of the test(s) have been CCed on this bug. The commit-queue is continuing to process your patch. 296096 4 71143 commit-queue 2010-10-19 03:38:47 -0700 Comment on attachment 71143 [PATCH] Proposed change. Clearing flags on attachment: 71143 Committed r70046: <http://trac.webkit.org/changeset/70046> 296097 5 commit-queue 2010-10-19 03:38:53 -0700 All reviewed patches have been landed. Closing bug. 71143 2010-10-19 02:06:47 -0700 2010-10-19 03:38:47 -0700 [PATCH] Proposed change. remove_code text/plain 15220 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NTk1M2U5Mi4uMjcyOGJjOSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxMC0xMC0xOSAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBtaWdyYXRlIGZyb20gbGVnYWN5IE9i amVjdC5wcm9wZXJ0aWVzIHRvIE9iamVjdC5rZXlzLCByZW1vdmUgZGVhZCBjb2RlLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDc4OTAKKworICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBlLl9yZXBvcnRDb21wbGV0aW9ucyk6CisgICAgICAg ICogaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkVsZW1lbnRzUGFuZWwpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRXh0 ZW5zaW9uU2VydmVyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkV4dGVuc2lvblNlcnZlci5w cm90b3R5cGUuX29uR2V0UmVzb3VyY2VzKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L0hBUkVudHJ5LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhBUkxvZy5wcm90b3R5cGUuYnVp bGQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0eVRyZWVFbGVtZW50LnByb3RvdHlw ZS4pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydHlUcmVlRWxlbWVudC5wcm90 b3R5cGUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvdXRpbGl0aWVzLmpzOgorCiAy MDEwLTEwLTE5ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAog ICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByNzAwMzQuCmRpZmYgLS1naXQgYS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuaWRsIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y LmlkbAppbmRleCBiN2Y0YTBkLi44NWMzMGE4IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3IuaWRsCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5pZGwKQEAg LTIwNyw3ICsyMDcsNyBAQCBtb2R1bGUgY29yZSB7CiAgICAgICAgIFtoYW5kbGVyPURPTV0gdm9p ZCBnZXRDb21wdXRlZFN0eWxlKGluIGxvbmcgbm9kZUlkLCBvdXQgVmFsdWUgc3R5bGUpOwogICAg ICAgICBbaGFuZGxlcj1ET01dIHZvaWQgZ2V0U3R5bGVTaGVldChpbiBsb25nIHN0eWxlU2hlZXRJ ZCwgb3V0IE9iamVjdCBzdHlsZVNoZWV0KTsKICAgICAgICAgW2hhbmRsZXI9RE9NXSB2b2lkIGdl dFN0eWxlU291cmNlRGF0YShpbiBsb25nIHN0eWxlU2hlZXRJZCwgb3V0IE9iamVjdCBzdHlsZVNv dXJjZURhdGEpOwotICAgICAgICBbaGFuZGxlcj1ET01dIHZvaWQgYXBwbHlTdHlsZVRleHQoaW4g bG9uZyBzdHlsZUlkLCBpbiBTdHJpbmcgc3R5bGVUZXh0LCBpbiBTdHJpbmcgcHJvcGVydHlOYW1l LCBvdXQgYm9vbGVhbiBzdWNjZXNzLCBvdXQgVmFsdWUgc3R5bGUsIG91dCBBcnJheSBjaGFuZ2Vk UHJvcGVydGllcyk7CisgICAgICAgIFtoYW5kbGVyPURPTV0gdm9pZCBhcHBseVN0eWxlVGV4dChp biBsb25nIHN0eWxlSWQsIGluIFN0cmluZyBzdHlsZVRleHQsIGluIFN0cmluZyBwcm9wZXJ0eU5h bWUsIG91dCBib29sZWFuIHN1Y2Nlc3MsIG91dCBWYWx1ZSBzdHlsZSk7CiAgICAgICAgIFtoYW5k bGVyPURPTV0gdm9pZCBzZXRTdHlsZVRleHQoaW4gbG9uZyBzdHlsZUlkLCBpbiBTdHJpbmcgc3R5 bGVUZXh0LCBvdXQgYm9vbGVhbiBzdWNjZXNzKTsKICAgICAgICAgW2hhbmRsZXI9RE9NXSB2b2lk IHNldFN0eWxlUHJvcGVydHkoaW4gbG9uZyBzdHlsZUlkLCBpbiBTdHJpbmcgbmFtZSwgaW4gU3Ry aW5nIHZhbHVlLCBvdXQgYm9vbGVhbiBzdWNjZXNzKTsKICAgICAgICAgW2hhbmRsZXI9RE9NXSB2 b2lkIHRvZ2dsZVN0eWxlRW5hYmxlZChpbiBsb25nIHN0eWxlSWQsIGluIFN0cmluZyBwcm9wZXJ0 eU5hbWUsIGluIGJvb2xlYW4gZGlzYWJsZWQsIG91dCBWYWx1ZSBzdHlsZSk7CmRpZmYgLS1naXQg YS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHAgYi9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHAKaW5kZXggMzBiYzNkYy4uZjVjNWY4YiAxMDA2NDQK LS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwCisrKyBiL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcApAQCAtMTM1OCw3ICsxMzU4LDcgQEAg UGFzc1JlZlB0cjxJbnNwZWN0b3JBcnJheT4gSW5zcGVjdG9yRE9NQWdlbnQ6OmJ1aWxkQXJyYXlG b3JQc2V1ZG9FbGVtZW50cyhFbGVtZW4KICAgICByZXR1cm4gcmVzdWx0LnJlbGVhc2UoKTsKIH0K IAotdm9pZCBJbnNwZWN0b3JET01BZ2VudDo6YXBwbHlTdHlsZVRleHQobG9uZyBzdHlsZUlkLCBj b25zdCBTdHJpbmcmIHN0eWxlVGV4dCwgY29uc3QgU3RyaW5nJiBwcm9wZXJ0eU5hbWUsIGJvb2wq IHN1Y2Nlc3MsIFJlZlB0cjxJbnNwZWN0b3JWYWx1ZT4qIHN0eWxlT2JqZWN0LCBSZWZQdHI8SW5z cGVjdG9yQXJyYXk+KiBjaGFuZ2VkUHJvcGVydGllc0FycmF5KQordm9pZCBJbnNwZWN0b3JET01B Z2VudDo6YXBwbHlTdHlsZVRleHQobG9uZyBzdHlsZUlkLCBjb25zdCBTdHJpbmcmIHN0eWxlVGV4 dCwgY29uc3QgU3RyaW5nJiBwcm9wZXJ0eU5hbWUsIGJvb2wqIHN1Y2Nlc3MsIFJlZlB0cjxJbnNw ZWN0b3JWYWx1ZT4qIHN0eWxlT2JqZWN0KQogewogICAgIENTU1N0eWxlRGVjbGFyYXRpb24qIHN0 eWxlID0gY3NzU3RvcmUoKS0+c3R5bGVGb3JJZChzdHlsZUlkKTsKICAgICBpZiAoIXN0eWxlKQpA QCAtMTM5NSw3ICsxMzk1LDYgQEAgdm9pZCBJbnNwZWN0b3JET01BZ2VudDo6YXBwbHlTdHlsZVRl eHQobG9uZyBzdHlsZUlkLCBjb25zdCBTdHJpbmcmIHN0eWxlVGV4dCwgY28KIAogICAgIC8vIE5v dGlmeSBjYWxsZXIgdGhhdCB0aGUgcHJvcGVydHkgd2FzIHN1Y2Nlc3NmdWxseSBkZWxldGVkLgog ICAgIGlmICghc3R5bGVUZXh0TGVuZ3RoKSB7Ci0gICAgICAgICgqY2hhbmdlZFByb3BlcnRpZXNB cnJheSktPnB1c2hTdHJpbmcocHJvcGVydHlOYW1lKTsKICAgICAgICAgKnN1Y2Nlc3MgPSB0cnVl OwogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtMTQwNiw3ICsxNDA1LDYgQEAgdm9pZCBJbnNw ZWN0b3JET01BZ2VudDo6YXBwbHlTdHlsZVRleHQobG9uZyBzdHlsZUlkLCBjb25zdCBTdHJpbmcm IHN0eWxlVGV4dCwgY28KICAgICAvLyBJdGVyYXRlIG9mIHRoZSBwcm9wZXJ0aWVzIG9uIHRoZSB0 ZXN0IGVsZW1lbnQncyBzdHlsZSBkZWNsYXJhdGlvbiBhbmQKICAgICAvLyBhZGQgdGhlbSB0byB0 aGUgcmVhbCBzdHlsZSBkZWNsYXJhdGlvbi4gV2UgdGFrZSBjYXJlIHRvIG1vdmUgc2hvcnRoYW5k cy4KICAgICBIYXNoU2V0PFN0cmluZz4gZm91bmRTaG9ydGhhbmRzOwotICAgIFZlY3RvcjxTdHJp bmc+IGNoYW5nZWRQcm9wZXJ0aWVzOwogCiAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IHRl bXBTdHlsZS0+bGVuZ3RoKCk7ICsraSkgewogICAgICAgICBTdHJpbmcgbmFtZSA9IHRlbXBTdHls ZS0+aXRlbShpKTsKQEAgLTE0MzMsMTEgKzE0MzEsOSBAQCB2b2lkIEluc3BlY3RvckRPTUFnZW50 OjphcHBseVN0eWxlVGV4dChsb25nIHN0eWxlSWQsIGNvbnN0IFN0cmluZyYgc3R5bGVUZXh0LCBj bwogICAgICAgICAvLyBSZW1vdmUgZGlzYWJsZWQgcHJvcGVydHkgZW50cnkgZm9yIHByb3BlcnR5 IHdpdGggdGhpcyBuYW1lLgogICAgICAgICBpZiAoZGlzYWJsZWRTdHlsZSkKICAgICAgICAgICAg IGRpc2FibGVkU3R5bGUtPnJlbW92ZShuYW1lKTsKLSAgICAgICAgY2hhbmdlZFByb3BlcnRpZXMu YXBwZW5kKG5hbWUpOwogICAgIH0KICAgICAqc3VjY2VzcyA9IHRydWU7CiAgICAgKnN0eWxlT2Jq ZWN0ID0gYnVpbGRPYmplY3RGb3JTdHlsZShzdHlsZSwgdHJ1ZSk7Ci0gICAgKmNoYW5nZWRQcm9w ZXJ0aWVzQXJyYXkgPSB0b0FycmF5KGNoYW5nZWRQcm9wZXJ0aWVzKTsKIH0KIAogdm9pZCBJbnNw ZWN0b3JET01BZ2VudDo6c2V0U3R5bGVUZXh0KGxvbmcgc3R5bGVJZCwgY29uc3QgU3RyaW5nJiBj c3NUZXh0LCBib29sKiBzdWNjZXNzKQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yRE9NQWdlbnQuaCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmgK aW5kZXggZWViMjFhNi4uMDNlNGQ4ZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yRE9NQWdlbnQuaAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2Vu dC5oCkBAIC0xMzEsNyArMTMxLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB2b2lk IGdldENvbXB1dGVkU3R5bGUobG9uZyBub2RlSWQsIFJlZlB0cjxJbnNwZWN0b3JWYWx1ZT4qIHN0 eWxlcyk7CiAgICAgICAgIHZvaWQgZ2V0U3R5bGVTaGVldChsb25nIHN0eWxlU2hlZXRJZCwgUmVm UHRyPEluc3BlY3Rvck9iamVjdD4qIHN0eWxlU2hlZXRPYmplY3QpOwogICAgICAgICB2b2lkIGdl dFN0eWxlU291cmNlRGF0YShsb25nIHN0eWxlSWQsIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+KiBk YXRhT2JqZWN0KTsKLSAgICAgICAgdm9pZCBhcHBseVN0eWxlVGV4dChsb25nIHN0eWxlSWQsIGNv bnN0IFN0cmluZyYgc3R5bGVUZXh0LCBjb25zdCBTdHJpbmcmIHByb3BlcnR5TmFtZSwgYm9vbCog c3VjY2VzcywgUmVmUHRyPEluc3BlY3RvclZhbHVlPiogc3R5bGVPYmplY3QsIFJlZlB0cjxJbnNw ZWN0b3JBcnJheT4qIGNoYW5nZWRQcm9wZXJ0aWVzKTsKKyAgICAgICAgdm9pZCBhcHBseVN0eWxl VGV4dChsb25nIHN0eWxlSWQsIGNvbnN0IFN0cmluZyYgc3R5bGVUZXh0LCBjb25zdCBTdHJpbmcm IHByb3BlcnR5TmFtZSwgYm9vbCogc3VjY2VzcywgUmVmUHRyPEluc3BlY3RvclZhbHVlPiogc3R5 bGVPYmplY3QpOwogICAgICAgICB2b2lkIHNldFN0eWxlVGV4dChsb25nIHN0eWxlSWQsIGNvbnN0 IFN0cmluZyYgY3NzVGV4dCwgYm9vbCogc3VjY2Vzcyk7CiAgICAgICAgIHZvaWQgc2V0U3R5bGVQ cm9wZXJ0eShsb25nIHN0eWxlSWQsIGNvbnN0IFN0cmluZyYgbmFtZSwgY29uc3QgU3RyaW5nJiB2 YWx1ZSwgYm9vbCogc3VjY2Vzcyk7CiAgICAgICAgIHZvaWQgdG9nZ2xlU3R5bGVFbmFibGVkKGxv bmcgc3R5bGVJZCwgY29uc3QgU3RyaW5nJiBwcm9wZXJ0eU5hbWUsIGJvb2wgZGlzYWJsZWQsIFJl ZlB0cjxJbnNwZWN0b3JWYWx1ZT4qIHN0eWxlT2JqZWN0KTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0NTU1N0eWxlTW9kZWwuanMKaW5kZXggYmRhNDA2NC4uZTNlOWI0ZiAxMDA2NDQK LS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NTU1N0eWxlTW9kZWwuanMKKysrIGIv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NTU1N0eWxlTW9kZWwuanMKQEAgLTk2LDEzICs5 NiwxMyBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVNb2RlbC5wcm90b3R5cGUgPSB7CiAKICAgICBh cHBseVN0eWxlVGV4dDogZnVuY3Rpb24oc3R5bGVJZCwgc3R5bGVUZXh0LCBwcm9wZXJ0eU5hbWUs IHN1Y2Nlc3NDYWxsYmFjaywgZmFpbHVyZUNhbGxiYWNrKQogICAgIHsKLSAgICAgICAgZnVuY3Rp b24gY2FsbGJhY2soc3VjY2VzcywgbmV3UGF5bG9hZCwgY2hhbmdlZFByb3BlcnRpZXMpCisgICAg ICAgIGZ1bmN0aW9uIGNhbGxiYWNrKHN1Y2Nlc3MsIG5ld1BheWxvYWQpCiAgICAgICAgIHsKICAg ICAgICAgICAgIGlmICghc3VjY2VzcykKICAgICAgICAgICAgICAgICBmYWlsdXJlQ2FsbGJhY2so KTsKICAgICAgICAgICAgIGVsc2UgewogICAgICAgICAgICAgICAgIHZhciBuZXdTdHlsZSA9IG5l d1BheWxvYWQgPyBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvbi5wYXJzZVN0eWxlKG5l d1BheWxvYWQpIDogbnVsbDsKLSAgICAgICAgICAgICAgICBzdWNjZXNzQ2FsbGJhY2sobmV3U3R5 bGUsIGNoYW5nZWRQcm9wZXJ0aWVzKTsKKyAgICAgICAgICAgICAgICBzdWNjZXNzQ2FsbGJhY2so bmV3U3R5bGUpOwogICAgICAgICAgICAgfQogICAgICAgICB9CiAKZGlmZiAtLWdpdCBhL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5qcyBiL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Db25zb2xlVmlldy5qcwppbmRleCAyNWQ4MWFjLi44Y2Q1ZDUyIDEwMDY0NAot LS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMKKysrIGIvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzCkBAIC0zNjAsNyArMzYwLDcg QEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgfQogCiAg ICAgICAgIHZhciByZXN1bHRzID0gW107Ci0gICAgICAgIHZhciBwcm9wZXJ0aWVzID0gT2JqZWN0 LnNvcnRlZFByb3BlcnRpZXMocmVzdWx0KTsKKyAgICAgICAgdmFyIHByb3BlcnRpZXMgPSBPYmpl Y3Qua2V5cyhyZXN1bHQpLnNvcnQoKTsKIAogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHBy b3BlcnRpZXMubGVuZ3RoOyArK2kpIHsKICAgICAgICAgICAgIHZhciBwcm9wZXJ0eSA9IHByb3Bl cnRpZXNbaV07CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVu dHNQYW5lbC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsLmpz CmluZGV4IGQ2NDM3ZmMuLjc2YzIyYzUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9FbGVtZW50c1BhbmVsLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9FbGVtZW50c1BhbmVsLmpzCkBAIC0xMDcsNyArMTA3LDYgQEAgV2ViSW5zcGVjdG9yLkVsZW1l bnRzUGFuZWwgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMu c2lkZWJhclJlc2l6ZUVsZW1lbnQpOwogCiAgICAgdGhpcy5fcmVnaXN0ZXJTaG9ydGN1dHMoKTsK LSAgICB0aGlzLl9jaGFuZ2VkU3R5bGVzID0ge307CiAKICAgICB0aGlzLnJlc2V0KCk7CiB9CkBA IC0zNDYsMTE1ICszNDUsNiBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5lbC5wcm90b3R5cGUg PSB7CiAgICAgICAgIC8vIFRPRE86IEltcGxlbWVudCBTaGlmdGluZyB0aGUgb2xkU2VsZWN0b3Is IGFuZCBpdHMgY29udGVudHMgdG8gYSBuZXdTZWxlY3RvcgogICAgIH0sCiAKLSAgICBhZGRTdHls ZUNoYW5nZTogZnVuY3Rpb24oaWRlbnRpZmllciwgc3R5bGUsIHByb3BlcnR5KQotICAgIHsKLSAg ICAgICAgaWYgKCFzdHlsZS5wYXJlbnRSdWxlKQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAg ICAgIHZhciBzZWxlY3RvciA9IHN0eWxlLnBhcmVudFJ1bGUuc2VsZWN0b3JUZXh0OwotICAgICAg ICBpZiAoIXRoaXMuX2NoYW5nZWRTdHlsZXNbaWRlbnRpZmllcl0pCi0gICAgICAgICAgICB0aGlz Ll9jaGFuZ2VkU3R5bGVzW2lkZW50aWZpZXJdID0ge307Ci0KLSAgICAgICAgaWYgKCF0aGlzLl9j aGFuZ2VkU3R5bGVzW2lkZW50aWZpZXJdW3NlbGVjdG9yXSkKLSAgICAgICAgICAgIHRoaXMuX2No YW5nZWRTdHlsZXNbaWRlbnRpZmllcl1bc2VsZWN0b3JdID0ge307Ci0KLSAgICAgICAgaWYgKCF0 aGlzLl9jaGFuZ2VkU3R5bGVzW2lkZW50aWZpZXJdW3NlbGVjdG9yXVtwcm9wZXJ0eV0pCi0gICAg ICAgICAgICBXZWJJbnNwZWN0b3Iuc3R5bGVDaGFuZ2VzICs9IDE7Ci0KLSAgICAgICAgdGhpcy5f Y2hhbmdlZFN0eWxlc1tpZGVudGlmaWVyXVtzZWxlY3Rvcl1bcHJvcGVydHldID0gc3R5bGUuZ2V0 UHJvcGVydHlWYWx1ZShwcm9wZXJ0eSk7Ci0gICAgfSwKLQotICAgIHJlbW92ZVN0eWxlQ2hhbmdl OiBmdW5jdGlvbihpZGVudGlmaWVyLCBzdHlsZSwgcHJvcGVydHkpCi0gICAgewotICAgICAgICBp ZiAoIXN0eWxlLnBhcmVudFJ1bGUpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgdmFy IHNlbGVjdG9yID0gc3R5bGUucGFyZW50UnVsZS5zZWxlY3RvclRleHQ7Ci0gICAgICAgIGlmICgh dGhpcy5fY2hhbmdlZFN0eWxlc1tpZGVudGlmaWVyXSB8fCAhdGhpcy5fY2hhbmdlZFN0eWxlc1tp ZGVudGlmaWVyXVtzZWxlY3Rvcl0pCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgaWYg KHRoaXMuX2NoYW5nZWRTdHlsZXNbaWRlbnRpZmllcl1bc2VsZWN0b3JdW3Byb3BlcnR5XSkgewot ICAgICAgICAgICAgZGVsZXRlIHRoaXMuX2NoYW5nZWRTdHlsZXNbaWRlbnRpZmllcl1bc2VsZWN0 b3JdW3Byb3BlcnR5XTsKLSAgICAgICAgICAgIFdlYkluc3BlY3Rvci5zdHlsZUNoYW5nZXMgLT0g MTsKLSAgICAgICAgfQotICAgIH0sCi0KLSAgICBnZW5lcmF0ZVN0eWxlc2hlZXQ6IGZ1bmN0aW9u KCkKLSAgICB7Ci0gICAgICAgIGlmICghV2ViSW5zcGVjdG9yLnN0eWxlQ2hhbmdlcykKLSAgICAg ICAgICAgIHJldHVybjsKLQotICAgICAgICAvLyBNZXJnZSBEb3duIHRvIEp1c3QgU2VsZWN0b3Jz Ci0gICAgICAgIHZhciBtZXJnZWRTZWxlY3RvcnMgPSB7fTsKLSAgICAgICAgZm9yICh2YXIgaWRl bnRpZmllciBpbiB0aGlzLl9jaGFuZ2VkU3R5bGVzKSB7Ci0gICAgICAgICAgICBmb3IgKHZhciBz ZWxlY3RvciBpbiB0aGlzLl9jaGFuZ2VkU3R5bGVzW2lkZW50aWZpZXJdKSB7Ci0gICAgICAgICAg ICAgICAgaWYgKCFtZXJnZWRTZWxlY3RvcnNbc2VsZWN0b3JdKQotICAgICAgICAgICAgICAgICAg ICBtZXJnZWRTZWxlY3RvcnNbc2VsZWN0b3JdID0gdGhpcy5fY2hhbmdlZFN0eWxlc1tpZGVudGlm aWVyXVtzZWxlY3Rvcl07Ci0gICAgICAgICAgICAgICAgZWxzZSB7IC8vIG1lcmdlIG9uIHNlbGVj dG9yCi0gICAgICAgICAgICAgICAgICAgIHZhciBtZXJnZSA9IHt9OwotICAgICAgICAgICAgICAg ICAgICBmb3IgKHZhciBwcm9wZXJ0eSBpbiBtZXJnZWRTZWxlY3RvcnNbc2VsZWN0b3JdKQotICAg ICAgICAgICAgICAgICAgICAgICAgbWVyZ2VbcHJvcGVydHldID0gbWVyZ2VkU2VsZWN0b3JzW3Nl bGVjdG9yXVtwcm9wZXJ0eV07Ci0gICAgICAgICAgICAgICAgICAgIGZvciAodmFyIHByb3BlcnR5 IGluIHRoaXMuX2NoYW5nZWRTdHlsZXNbaWRlbnRpZmllcl1bc2VsZWN0b3JdKSB7Ci0gICAgICAg ICAgICAgICAgICAgICAgICBpZiAoIW1lcmdlW3Byb3BlcnR5XSkKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICBtZXJnZVtwcm9wZXJ0eV0gPSB0aGlzLl9jaGFuZ2VkU3R5bGVzW2lkZW50aWZp ZXJdW3NlbGVjdG9yXVtwcm9wZXJ0eV07Ci0gICAgICAgICAgICAgICAgICAgICAgICBlbHNlIHsg Ly8gbWVyZ2Ugb24gcHJvcGVydHkgd2l0aGluIGEgc2VsZWN0b3IsIGluY2x1ZGUgY29tbWVudCB0 byBub3RpZnkgdXNlcgotICAgICAgICAgICAgICAgICAgICAgICAgICAgIHZhciB2YWx1ZTEgPSBt ZXJnZVtwcm9wZXJ0eV07Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgdmFyIHZhbHVlMiA9 IHRoaXMuX2NoYW5nZWRTdHlsZXNbaWRlbnRpZmllcl1bc2VsZWN0b3JdW3Byb3BlcnR5XTsKLQot ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmICh2YWx1ZTEgPT09IHZhbHVlMikKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgbWVyZ2VbcHJvcGVydHldID0gW3ZhbHVlMV07Ci0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgZWxzZSBpZiAodmFsdWUxIGluc3RhbmNlb2YgQXJy YXkpCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1lcmdlW3Byb3BlcnR5XS5wdXNo KHZhbHVlMik7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBtZXJnZVtwcm9wZXJ0eV0gPSBbdmFsdWUxLCB2YWx1ZTJdOwot ICAgICAgICAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgICAgICB9Ci0gICAgICAg ICAgICAgICAgICAgIG1lcmdlZFNlbGVjdG9yc1tzZWxlY3Rvcl0gPSBtZXJnZTsKLSAgICAgICAg ICAgICAgICB9Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0KLQotICAgICAgICB2YXIgYnVpbGRl ciA9IFtdOwotICAgICAgICBidWlsZGVyLnB1c2goIi8qKiIpOwotICAgICAgICBidWlsZGVyLnB1 c2goIiAqIEluc3BlY3RvciBHZW5lcmF0ZWQgU3R5bGVzaGVldCIpOyAvLyBVSVN0cmluZz8KLSAg ICAgICAgYnVpbGRlci5wdXNoKCIgKi9cbiIpOwotCi0gICAgICAgIHZhciBpbmRlbnQgPSAiICAi OwotICAgICAgICBmdW5jdGlvbiBkaXNwbGF5UHJvcGVydHkocHJvcGVydHksIHZhbHVlLCBjb21t ZW50KSB7Ci0gICAgICAgICAgICBpZiAoY29tbWVudCkKLSAgICAgICAgICAgICAgICByZXR1cm4g aW5kZW50ICsgIi8qICIgKyBwcm9wZXJ0eSArICI6ICIgKyB2YWx1ZSArICI7ICovIjsKLSAgICAg ICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICByZXR1cm4gaW5kZW50ICsgcHJvcGVydHkgKyAi OiAiICsgdmFsdWUgKyAiOyI7Ci0gICAgICAgIH0KLQotICAgICAgICBmb3IgKHZhciBzZWxlY3Rv ciBpbiBtZXJnZWRTZWxlY3RvcnMpIHsKLSAgICAgICAgICAgIHZhciBwc3VlZG9TdHlsZSA9IG1l cmdlZFNlbGVjdG9yc1tzZWxlY3Rvcl07Ci0gICAgICAgICAgICB2YXIgcHJvcGVydGllcyA9IE9i amVjdC5wcm9wZXJ0aWVzKHBzdWVkb1N0eWxlKTsKLSAgICAgICAgICAgIGlmIChwcm9wZXJ0aWVz Lmxlbmd0aCkgewotICAgICAgICAgICAgICAgIGJ1aWxkZXIucHVzaChzZWxlY3RvciArICIgeyIp OwotICAgICAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgcHJvcGVydGllcy5sZW5ndGg7 ICsraSkgewotICAgICAgICAgICAgICAgICAgICB2YXIgcHJvcGVydHkgPSBwcm9wZXJ0aWVzW2ld OwotICAgICAgICAgICAgICAgICAgICB2YXIgdmFsdWUgPSBwc3VlZG9TdHlsZVtwcm9wZXJ0eV07 Ci0gICAgICAgICAgICAgICAgICAgIGlmICghKHZhbHVlIGluc3RhbmNlb2YgQXJyYXkpKQotICAg ICAgICAgICAgICAgICAgICAgICAgYnVpbGRlci5wdXNoKGRpc3BsYXlQcm9wZXJ0eShwcm9wZXJ0 eSwgdmFsdWUpKTsKLSAgICAgICAgICAgICAgICAgICAgZWxzZSB7Ci0gICAgICAgICAgICAgICAg ICAgICAgICBpZiAodmFsdWUubGVuZ3RoID09PSAxKQotICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGJ1aWxkZXIucHVzaChkaXNwbGF5UHJvcGVydHkocHJvcGVydHksIHZhbHVlKSArICIgLyog bWVyZ2VkIGZyb20gZXF1aXZhbGVudCBlZGl0cyAqLyIpOyAvLyBVSVN0cmluZz8KLSAgICAgICAg ICAgICAgICAgICAgICAgIGVsc2UgeyAgICAgICAgICAgICAgICAgICAgICAgIAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGJ1aWxkZXIucHVzaChpbmRlbnQgKyAiLyogVGhlcmUgd2FzIGEg Q29uZmxpY3QuLi4gVGhlcmUgd2VyZSBNdWx0aXBsZSBFZGl0cyBmb3IgJyIgKyBwcm9wZXJ0eSAr ICInICovIik7IC8vIFVJU3RyaW5nPwotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZvciAo dmFyIGogPSAwOyBqIDwgdmFsdWUubGVuZ3RoOyArK2opCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGJ1aWxkZXIucHVzaChkaXNwbGF5UHJvcGVydHkocHJvcGVydHksIHZhbHVlLCB0 cnVlKSk7Ci0gICAgICAgICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgICAgIH0K LSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgYnVpbGRlci5wdXNoKCJ9XG4iKTsK LSAgICAgICAgICAgIH0KLSAgICAgICAgfQotCi0gICAgICAgIFdlYkluc3BlY3Rvci5zaG93Q29u c29sZSgpOwotICAgICAgICBXZWJJbnNwZWN0b3IuY29uc29sZS5hZGRNZXNzYWdlKFdlYkluc3Bl Y3Rvci5Db25zb2xlTWVzc2FnZS5jcmVhdGVUZXh0TWVzc2FnZShidWlsZGVyLmpvaW4oIlxuIikp KTsKLSAgICB9LAotCiAgICAgZ2V0IHJvb3RET01Ob2RlKCkKICAgICB7CiAgICAgICAgIHJldHVy biB0aGlzLnRyZWVPdXRsaW5lLnJvb3RET01Ob2RlOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvblNlcnZlci5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9FeHRlbnNpb25TZXJ2ZXIuanMKaW5kZXggYmM2MzNjYS4uOWFiNGMwYyAxMDA2NDQK LS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvblNlcnZlci5qcworKysg Yi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRXh0ZW5zaW9uU2VydmVyLmpzCkBAIC0yNjMs NyArMjYzLDcgQEAgV2ViSW5zcGVjdG9yLkV4dGVuc2lvblNlcnZlci5wcm90b3R5cGUgPSB7CiAg ICAgICAgIGlmIChyZXF1ZXN0LmlkKQogICAgICAgICAgICAgcmVzcG9uc2UgPSBXZWJJbnNwZWN0 b3IucmVzb3VyY2VzW3JlcXVlc3QuaWRdID8gcmVzb3VyY2VXcmFwcGVyKHJlcXVlc3QuaWQpIDog dGhpcy5fc3RhdHVzLkVfTk9URk9VTkQocmVxdWVzdC5pZCk7CiAgICAgICAgIGVsc2UKLSAgICAg ICAgICAgIHJlc3BvbnNlID0gT2JqZWN0LnByb3BlcnRpZXMoV2ViSW5zcGVjdG9yLnJlc291cmNl cykubWFwKHJlc291cmNlV3JhcHBlcik7CisgICAgICAgICAgICByZXNwb25zZSA9IE9iamVjdC5r ZXlzKFdlYkluc3BlY3Rvci5yZXNvdXJjZXMpLm1hcChyZXNvdXJjZVdyYXBwZXIpOwogICAgICAg ICByZXR1cm4gcmVzcG9uc2U7CiAgICAgfSwKIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0hBUkVudHJ5LmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0hB UkVudHJ5LmpzCmluZGV4IDJjZjA3NDAuLmI5Zjc1YTIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9IQVJFbnRyeS5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvSEFSRW50cnkuanMKQEAgLTE4MSw3ICsxODEsNyBAQCBXZWJJbnNwZWN0b3IuSEFSTG9n LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICB2ZXJzaW9uOiB3ZWJLaXRWZXJzaW9uID8g d2ViS2l0VmVyc2lvblsxXSA6ICJuL2EiCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgcGFn ZXM6IHRoaXMuX2J1aWxkUGFnZXMoKSwKLSAgICAgICAgICAgIGVudHJpZXM6IE9iamVjdC5wcm9w ZXJ0aWVzKFdlYkluc3BlY3Rvci5yZXNvdXJjZXMpLm1hcCh0aGlzLl9jb252ZXJ0UmVzb3VyY2Up CisgICAgICAgICAgICBlbnRyaWVzOiBPYmplY3Qua2V5cyhXZWJJbnNwZWN0b3IucmVzb3VyY2Vz KS5tYXAodGhpcy5fY29udmVydFJlc291cmNlKQogICAgICAgICB9CiAgICAgfSwKIApkaWZmIC0t Z2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzIGIv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzCmluZGV4IDZh ZmYzN2QuLjM2ZDg1NGMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9T dHlsZXNTaWRlYmFyUGFuZS5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5 bGVzU2lkZWJhclBhbmUuanMKQEAgLTE2OTUsMTcgKzE2OTUsMTMgQEAgV2ViSW5zcGVjdG9yLlN0 eWxlUHJvcGVydHlUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgc2Vs Zi51cGRhdGVUaXRsZSgpOwogICAgICAgICB9CiAKLSAgICAgICAgZnVuY3Rpb24gc3VjY2Vzc0Nh bGxiYWNrKG5ld1N0eWxlLCBjaGFuZ2VkUHJvcGVydGllcykKKyAgICAgICAgZnVuY3Rpb24gc3Vj Y2Vzc0NhbGxiYWNrKG5ld1N0eWxlKQogICAgICAgICB7Ci0gICAgICAgICAgICBlbGVtZW50c1Bh bmVsLnJlbW92ZVN0eWxlQ2hhbmdlKHNlY3Rpb24uaWRlbnRpZmllciwgc2VsZi5zdHlsZSwgc2Vs Zi5uYW1lKTsKLQogICAgICAgICAgICAgaWYgKCFzdHlsZVRleHRMZW5ndGgpIHsKICAgICAgICAg ICAgICAgICAvLyBEbyByZW1vdmUgb3Vyc2VsdmVzIGZyb20gVUkgd2hlbiB0aGUgcHJvcGVydHkg cmVtb3ZhbCBpcyBjb25maXJtZWQuCiAgICAgICAgICAgICAgICAgc2VsZi5wYXJlbnQucmVtb3Zl Q2hpbGQoc2VsZik7CiAgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgIHNlbGYu c3R5bGUgPSBuZXdTdHlsZTsKLSAgICAgICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGNo YW5nZWRQcm9wZXJ0aWVzLmxlbmd0aDsgKytpKQotICAgICAgICAgICAgICAgICAgICBlbGVtZW50 c1BhbmVsLmFkZFN0eWxlQ2hhbmdlKHNlY3Rpb24uaWRlbnRpZmllciwgc2VsZi5zdHlsZSwgY2hh bmdlZFByb3BlcnRpZXNbaV0pOwogICAgICAgICAgICAgICAgIHNlbGYuX3N0eWxlUnVsZS5zdHls ZSA9IHNlbGYuc3R5bGU7CiAgICAgICAgICAgICB9CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC91dGlsaXRpZXMuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvdXRpbGl0aWVzLmpzCmluZGV4IDAzNmRjMTcuLjdmMGVlNWUgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC91dGlsaXRpZXMuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL3V0aWxpdGllcy5qcwpAQCAtMjYsMTkgKzI2LDYgQEAKICAqIFRISVMgU09G VFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0Uu CiAgKi8KIAotT2JqZWN0LnByb3BlcnRpZXMgPSBmdW5jdGlvbihvYmopCi17Ci0gICAgdmFyIHBy b3BlcnRpZXMgPSBbXTsKLSAgICBmb3IgKHZhciBwcm9wIGluIG9iaikKLSAgICAgICAgcHJvcGVy dGllcy5wdXNoKHByb3ApOwotICAgIHJldHVybiBwcm9wZXJ0aWVzOwotfQotCi1PYmplY3Quc29y dGVkUHJvcGVydGllcyA9IGZ1bmN0aW9uKG9iaiwgc29ydEZ1bmMpCi17Ci0gICAgcmV0dXJuIE9i amVjdC5wcm9wZXJ0aWVzKG9iaikuc29ydChzb3J0RnVuYyk7Ci19Ci0KIEZ1bmN0aW9uLnByb3Rv dHlwZS5iaW5kID0gZnVuY3Rpb24odGhpc09iamVjdCkKIHsKICAgICB2YXIgZnVuYyA9IHRoaXM7 Cg==