69244 2011-10-03 02:27:43 -0700 Web Inspector: move console message formatting from ConsoleView.js into ConsoleMessage.js 2011-10-03 23:45:05 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik rniwa timothy yurys oldest_to_newest 476855 0 pfeldman 2011-10-03 02:27:43 -0700 Patch to follow. 476856 1 109455 pfeldman 2011-10-03 02:34:21 -0700 Created attachment 109455 Patch 476860 2 pfeldman 2011-10-03 02:53:36 -0700 Committed r96487: <http://trac.webkit.org/changeset/96487> 477458 3 rniwa 2011-10-03 23:45:05 -0700 This may have broken script-formatter.html on Snow Leopard: http://build.webkit.org/results/SnowLeopard%20Intel%20Release%20(Tests)/r96571%20(33608)/inspector/debugger/script-formatter-pretty-diff.html 109455 2011-10-03 02:34:21 -0700 2011-10-03 02:49:27 -0700 Patch bug-69244-20111003133419.patch text/plain 14486 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogOTY0ODUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxMDRmZWU3ZjU1MThkYTQ0 ZmEyYjRmMWY0NzQyYjA2MzdmZDIzNDZjLi5mNWI0ZmVkNmRiYWFhMjQ2ZjY5MjVlZTNjNTNmNWRi NWZlZGI2ZWUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTEtMTAtMDMgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6 IG1vdmUgY29uc29sZSBtZXNzYWdlIGZvcm1hdHRpbmcgZnJvbSBDb25zb2xlVmlldy5qcyBpbnRv IENvbnNvbGVNZXNzYWdlLmpzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD02OTI0NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlTWVzc2FnZS5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu Q29uc29sZU1lc3NhZ2UucHJvdG90eXBlLl9mb3JtYXRNZXNzYWdlLmVsc2UuZWxzZS5saW5raWZp ZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLnByb3RvdHlwZS5fZm9y bWF0TWVzc2FnZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UucHJvdG90 eXBlLl9mb3JtYXQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLnByb3Rv dHlwZS5fZm9ybWF0UGFyYW1ldGVyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlTWVz c2FnZS5wcm90b3R5cGUuX2Zvcm1hdFBhcmFtZXRlckFzVmFsdWUpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkNvbnNvbGVNZXNzYWdlLnByb3RvdHlwZS5fZm9ybWF0UGFyYW1ldGVyQXNPYmplY3Qp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLnByb3RvdHlwZS5fZm9ybWF0 UGFyYW1ldGVyQXNOb2RlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5w cm90b3R5cGUuX2Zvcm1hdFBhcmFtZXRlckFzQXJyYXkpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkNvbnNvbGVNZXNzYWdlLnByb3RvdHlwZS5fZm9ybWF0UGFyYW1ldGVyQXNTdHJpbmcpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLnByb3RvdHlwZS5fcHJpbnRBcnJheSk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UucHJvdG90eXBlLl9mb3JtYXRB c0FycmF5RW50cnkpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLnByb3Rv dHlwZS5fZm9ybWF0V2l0aFN1YnN0aXR1dGlvblN0cmluZyk6CisgICAgICAgICogaW5zcGVjdG9y L2Zyb250LWVuZC9Db25zb2xlVmlldy5qczoKKwogMjAxMS0xMC0wMyAgUGF2ZWwgRmVsZG1hbiAg PHBmZWxkbWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiByZXN0b3Jl IHBhcnRpYWwgZnJvbnQtZW5kIGNvbXBpbGFiaWxpdHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZU1lc3NhZ2UuanMgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVNZXNzYWdlLmpzCmluZGV4IDA1NjU4M2UxN2Y1 YzQ1NmYwYmMwMzM2Nzc5MGM2ZjFiMjg0NjNkYzQuLjhiNWJkYzE3OTIzN2M3NzRmMTJkYzlmZTk4 Y2MyMDI5NjlmYjdiZDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvQ29uc29sZU1lc3NhZ2UuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9Db25zb2xlTWVzc2FnZS5qcwpAQCAtNDEsOCArNDEsOSBAQCBXZWJJbnNwZWN0b3Iu Q29uc29sZVN0YWNrRnJhbWUgPSBmdW5jdGlvbigpCiAKIC8qKgogICogQGNvbnN0cnVjdG9yCi0g KiBAcGFyYW0ge0FycmF5LjxXZWJJbnNwZWN0b3IuQ29uc29sZVN0YWNrRnJhbWU+PX0gc3RhY2tU cmFjZQotICogQHBhcmFtIHtudW1iZXI9fSByZXF1ZXN0CisgKiBAcGFyYW0ge0FycmF5LjxSdW50 aW1lQWdlbnQuUmVtb3RlT2JqZWN0Pj19IHBhcmFtZXRlcnMKKyAqIEBwYXJhbSB7Q29uc29sZUFn ZW50LlN0YWNrVHJhY2U9fSBzdGFja1RyYWNlCisgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5SZXNv dXJjZT19IHJlcXVlc3QKICAqLwogV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlID0gZnVuY3Rp b24oc291cmNlLCB0eXBlLCBsZXZlbCwgbGluZSwgdXJsLCByZXBlYXRDb3VudCwgbWVzc2FnZSwg cGFyYW1ldGVycywgc3RhY2tUcmFjZSwgcmVxdWVzdCkKIHsKQEAgLTY3LDYgKzY4LDEzIEBAIFdl Ykluc3BlY3Rvci5Db25zb2xlTWVzc2FnZSA9IGZ1bmN0aW9uKHNvdXJjZSwgdHlwZSwgbGV2ZWws IGxpbmUsIHVybCwgcmVwZWF0Q291CiAgICAgICAgICAgICB0aGlzLmxpbmUgPSB0b3BDYWxsRnJh bWUubGluZU51bWJlcjsKICAgICB9CiAKKyAgICB0aGlzLl9jdXN0b21Gb3JtYXR0ZXJzID0gewor ICAgICAgICAib2JqZWN0IjogdGhpcy5fZm9ybWF0UGFyYW1ldGVyQXNPYmplY3QsCisgICAgICAg ICJhcnJheSI6ICB0aGlzLl9mb3JtYXRQYXJhbWV0ZXJBc0FycmF5LAorICAgICAgICAibm9kZSI6 ICAgdGhpcy5fZm9ybWF0UGFyYW1ldGVyQXNOb2RlLAorICAgICAgICAic3RyaW5nIjogdGhpcy5f Zm9ybWF0UGFyYW1ldGVyQXNTdHJpbmcKKyAgICB9OworCiAgICAgdGhpcy5fZm9ybWF0TWVzc2Fn ZSgpOwogfQogCkBAIC0xMjMsMTQgKzEzMSwxNCBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3Nh Z2UucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgICAgICBmdW5jdGlvbiBsaW5raWZpZXIo dGl0bGUsIHVybCwgbGluZU51bWJlcikKICAgICAgICAgICAgICAgICAgICAgewogICAgICAgICAg ICAgICAgICAgICAgICAgdmFyIGlzRXh0ZXJuYWwgPSAhdGhpcy5fcmVxdWVzdDsKLSAgICAgICAg ICAgICAgICAgICAgICAgIHZhciBhbmNob3IgPSBXZWJJbnNwZWN0b3IubGlua2lmeVVSTEFzTm9k ZSh1cmwsIHRpdGxlLCBudWxsLCBpc0V4dGVybmFsKTsKKyAgICAgICAgICAgICAgICAgICAgICAg IHZhciBhbmNob3IgPSBXZWJJbnNwZWN0b3IubGlua2lmeVVSTEFzTm9kZSh1cmwsIHRpdGxlLCB1 bmRlZmluZWQsIGlzRXh0ZXJuYWwpOwogICAgICAgICAgICAgICAgICAgICAgICAgaWYgKHRoaXMu X3JlcXVlc3QpIHsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhbmNob3Iuc2V0QXR0cmli dXRlKCJyZXF1ZXN0X2lkIiwgdGhpcy5fcmVxdWVzdC5yZXF1ZXN0SWQpOwogICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGFuY2hvci5zZXRBdHRyaWJ1dGUoInByZWZlcnJlZF9wYW5lbCIsICJu ZXR3b3JrIik7CiAgICAgICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgICAg ICAgICByZXR1cm4gYW5jaG9yOwogICAgICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAg ICAgICAgIAorCiAgICAgICAgICAgICAgICAgICAgIHZhciBmcmFnbWVudCA9IFdlYkluc3BlY3Rv ci5saW5raWZ5U3RyaW5nQXNGcmFnbWVudFdpdGhDdXN0b21MaW5raWZpZXIodGhpcy5fbWVzc2Fn ZVRleHQsIGxpbmtpZmllci5iaW5kKHRoaXMpKTsKICAgICAgICAgICAgICAgICAgICAgbWVzc2Fn ZVRleHQuYXBwZW5kQ2hpbGQoZnJhZ21lbnQpOwogICAgICAgICAgICAgICAgIH0KQEAgLTIzNSwy MiArMjQzLDEyNSBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UucHJvdG90eXBlID0gewog ICAgICAgICAgICAgaWYgKHNob3VsZEZvcm1hdE1lc3NhZ2UgJiYgcGFyYW1ldGVyc1tpXS50eXBl ID09PSAic3RyaW5nIikKICAgICAgICAgICAgICAgICBmb3JtYXR0ZWRSZXN1bHQuYXBwZW5kQ2hp bGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUocGFyYW1ldGVyc1tpXS5kZXNjcmlwdGlvbikpOwog ICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgIGZvcm1hdHRlZFJlc3VsdC5hcHBlbmRD aGlsZChXZWJJbnNwZWN0b3IuY29uc29sZVZpZXcuX2Zvcm1hdChwYXJhbWV0ZXJzW2ldKSk7Cisg ICAgICAgICAgICAgICAgZm9ybWF0dGVkUmVzdWx0LmFwcGVuZENoaWxkKHRoaXMuX2Zvcm1hdFBh cmFtZXRlcihwYXJhbWV0ZXJzW2ldKSk7CiAgICAgICAgICAgICBpZiAoaSA8IHBhcmFtZXRlcnMu bGVuZ3RoIC0gMSkKICAgICAgICAgICAgICAgICBmb3JtYXR0ZWRSZXN1bHQuYXBwZW5kQ2hpbGQo ZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUoIiAiKSk7CiAgICAgICAgIH0KICAgICAgICAgcmV0dXJu IGZvcm1hdHRlZFJlc3VsdDsKICAgICB9LAogCisgICAgLyoqCisgICAgICogQHBhcmFtIHtib29s ZWFuPX0gZm9yY2VPYmplY3RGb3JtYXQKKyAgICAgKi8KKyAgICBfZm9ybWF0UGFyYW1ldGVyOiBm dW5jdGlvbihvdXRwdXQsIGZvcmNlT2JqZWN0Rm9ybWF0KQorICAgIHsKKyAgICAgICAgdmFyIHR5 cGU7CisgICAgICAgIGlmIChmb3JjZU9iamVjdEZvcm1hdCkKKyAgICAgICAgICAgIHR5cGUgPSAi b2JqZWN0IjsKKyAgICAgICAgZWxzZSBpZiAob3V0cHV0IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9y LlJlbW90ZU9iamVjdCkKKyAgICAgICAgICAgIHR5cGUgPSBvdXRwdXQuc3VidHlwZSB8fCBvdXRw dXQudHlwZTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgdHlwZSA9IHR5cGVvZiBvdXRwdXQ7 CisKKyAgICAgICAgdmFyIGZvcm1hdHRlciA9IHRoaXMuX2N1c3RvbUZvcm1hdHRlcnNbdHlwZV07 CisgICAgICAgIGlmICghZm9ybWF0dGVyKSB7CisgICAgICAgICAgICBmb3JtYXR0ZXIgPSB0aGlz Ll9mb3JtYXRQYXJhbWV0ZXJBc1ZhbHVlOworICAgICAgICAgICAgb3V0cHV0ID0gb3V0cHV0LmRl c2NyaXB0aW9uOworICAgICAgICB9CisKKyAgICAgICAgdmFyIHNwYW4gPSBkb2N1bWVudC5jcmVh dGVFbGVtZW50KCJzcGFuIik7CisgICAgICAgIHNwYW4uY2xhc3NOYW1lID0gImNvbnNvbGUtZm9y bWF0dGVkLSIgKyB0eXBlICsgIiBzb3VyY2UtY29kZSI7CisgICAgICAgIGZvcm1hdHRlci5jYWxs KHRoaXMsIG91dHB1dCwgc3Bhbik7CisgICAgICAgIHJldHVybiBzcGFuOworICAgIH0sCisKKyAg ICBfZm9ybWF0UGFyYW1ldGVyQXNWYWx1ZTogZnVuY3Rpb24odmFsLCBlbGVtKQorICAgIHsKKyAg ICAgICAgZWxlbS5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZSh2YWwpKTsKKyAg ICB9LAorCisgICAgX2Zvcm1hdFBhcmFtZXRlckFzT2JqZWN0OiBmdW5jdGlvbihvYmosIGVsZW0p CisgICAgeworICAgICAgICBlbGVtLmFwcGVuZENoaWxkKG5ldyBXZWJJbnNwZWN0b3IuT2JqZWN0 UHJvcGVydGllc1NlY3Rpb24ob2JqLCBvYmouZGVzY3JpcHRpb24pLmVsZW1lbnQpOworICAgIH0s CisKKyAgICBfZm9ybWF0UGFyYW1ldGVyQXNOb2RlOiBmdW5jdGlvbihvYmplY3QsIGVsZW0pCisg ICAgeworICAgICAgICBmdW5jdGlvbiBwcmludE5vZGUobm9kZUlkKQorICAgICAgICB7CisgICAg ICAgICAgICBpZiAoIW5vZGVJZCkgeworICAgICAgICAgICAgICAgIC8vIFNvbWV0aW1lcyBET00g aXMgbG9hZGVkIGFmdGVyIHRoZSBzeW5jIG1lc3NhZ2UgaXMgYmVpbmcgZm9ybWF0dGVkLCBzbyB3 ZSBnZXQgbm8KKyAgICAgICAgICAgICAgICAvLyBub2RlSWQgaGVyZS4gU28gd2UgZmFsbCBiYWNr IHRvIG9iamVjdCBmb3JtYXR0aW5nIGhlcmUuCisgICAgICAgICAgICAgICAgdGhpcy5fZm9ybWF0 UGFyYW1ldGVyQXNPYmplY3Qob2JqZWN0LCBlbGVtKTsKKyAgICAgICAgICAgICAgICByZXR1cm47 CisgICAgICAgICAgICB9CisgICAgICAgICAgICB2YXIgdHJlZU91dGxpbmUgPSBuZXcgV2ViSW5z cGVjdG9yLkVsZW1lbnRzVHJlZU91dGxpbmUoKTsKKyAgICAgICAgICAgIHRyZWVPdXRsaW5lLnNo b3dJbkVsZW1lbnRzUGFuZWxFbmFibGVkID0gdHJ1ZTsKKyAgICAgICAgICAgIHRyZWVPdXRsaW5l LnJvb3RET01Ob2RlID0gV2ViSW5zcGVjdG9yLmRvbUFnZW50Lm5vZGVGb3JJZChub2RlSWQpOwor ICAgICAgICAgICAgdHJlZU91dGxpbmUuZWxlbWVudC5hZGRTdHlsZUNsYXNzKCJvdXRsaW5lLWRp c2Nsb3N1cmUiKTsKKyAgICAgICAgICAgIGlmICghdHJlZU91dGxpbmUuY2hpbGRyZW5bMF0uaGFz Q2hpbGRyZW4pCisgICAgICAgICAgICAgICAgdHJlZU91dGxpbmUuZWxlbWVudC5hZGRTdHlsZUNs YXNzKCJzaW5nbGUtbm9kZSIpOworICAgICAgICAgICAgZWxlbS5hcHBlbmRDaGlsZCh0cmVlT3V0 bGluZS5lbGVtZW50KTsKKyAgICAgICAgfQorICAgICAgICBvYmplY3QucHVzaE5vZGVUb0Zyb250 ZW5kKHByaW50Tm9kZS5iaW5kKHRoaXMpKTsKKyAgICB9LAorCisgICAgX2Zvcm1hdFBhcmFtZXRl ckFzQXJyYXk6IGZ1bmN0aW9uKGFyciwgZWxlbSkKKyAgICB7CisgICAgICAgIGFyci5nZXRPd25Q cm9wZXJ0aWVzKHRoaXMuX3ByaW50QXJyYXkuYmluZCh0aGlzLCBlbGVtKSk7CisgICAgfSwKKwor ICAgIF9mb3JtYXRQYXJhbWV0ZXJBc1N0cmluZzogZnVuY3Rpb24ob3V0cHV0LCBlbGVtKQorICAg IHsKKyAgICAgICAgdmFyIHNwYW4gPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7Cisg ICAgICAgIHNwYW4uY2xhc3NOYW1lID0gImNvbnNvbGUtZm9ybWF0dGVkLXN0cmluZyBzb3VyY2Ut Y29kZSI7CisgICAgICAgIHNwYW4uYXBwZW5kQ2hpbGQoV2ViSW5zcGVjdG9yLmxpbmtpZnlTdHJp bmdBc0ZyYWdtZW50KG91dHB1dC5kZXNjcmlwdGlvbikpOworCisgICAgICAgIC8vIE1ha2UgYmxh Y2sgcXVvdGVzLgorICAgICAgICBlbGVtLnJlbW92ZVN0eWxlQ2xhc3MoImNvbnNvbGUtZm9ybWF0 dGVkLXN0cmluZyIpOworICAgICAgICBlbGVtLmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRl eHROb2RlKCJcIiIpKTsKKyAgICAgICAgZWxlbS5hcHBlbmRDaGlsZChzcGFuKTsKKyAgICAgICAg ZWxlbS5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZSgiXCIiKSk7CisgICAgfSwK KworICAgIF9wcmludEFycmF5OiBmdW5jdGlvbihlbGVtLCBwcm9wZXJ0aWVzKQorICAgIHsKKyAg ICAgICAgaWYgKCFwcm9wZXJ0aWVzKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIHZh ciBlbGVtZW50cyA9IFtdOworICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHByb3BlcnRpZXMu bGVuZ3RoOyArK2kpIHsKKyAgICAgICAgICAgIHZhciBuYW1lID0gcHJvcGVydGllc1tpXS5uYW1l OworICAgICAgICAgICAgaWYgKG5hbWUgPT0gcGFyc2VJbnQobmFtZSwgMTApKQorICAgICAgICAg ICAgICAgIGVsZW1lbnRzW25hbWVdID0gdGhpcy5fZm9ybWF0QXNBcnJheUVudHJ5KHByb3BlcnRp ZXNbaV0udmFsdWUpOworICAgICAgICB9CisKKyAgICAgICAgZWxlbS5hcHBlbmRDaGlsZChkb2N1 bWVudC5jcmVhdGVUZXh0Tm9kZSgiWyIpKTsKKyAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBl bGVtZW50cy5sZW5ndGg7ICsraSkgeworICAgICAgICAgICAgdmFyIGVsZW1lbnQgPSBlbGVtZW50 c1tpXTsKKyAgICAgICAgICAgIGlmIChlbGVtZW50KQorICAgICAgICAgICAgICAgIGVsZW0uYXBw ZW5kQ2hpbGQoZWxlbWVudCk7CisgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgZWxl bS5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZSgidW5kZWZpbmVkIikpCisgICAg ICAgICAgICBpZiAoaSA8IGVsZW1lbnRzLmxlbmd0aCAtIDEpCisgICAgICAgICAgICAgICAgZWxl bS5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZSgiLCAiKSk7CisgICAgICAgIH0K KyAgICAgICAgZWxlbS5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZSgiXSIpKTsK KyAgICB9LAorCisgICAgX2Zvcm1hdEFzQXJyYXlFbnRyeTogZnVuY3Rpb24ob3V0cHV0KQorICAg IHsKKyAgICAgICAgLy8gUHJldmVudCBpbmZpbml0ZSBleHBhbnNpb24gb2YgY3Jvc3MtcmVmZXJl bmNpbmcgYXJyYXlzLgorICAgICAgICByZXR1cm4gdGhpcy5fZm9ybWF0UGFyYW1ldGVyKG91dHB1 dCwgb3V0cHV0LnN1YnR5cGUgJiYgb3V0cHV0LnN1YnR5cGUgPT09ICJhcnJheSIpOworICAgIH0s CisKICAgICBfZm9ybWF0V2l0aFN1YnN0aXR1dGlvblN0cmluZzogZnVuY3Rpb24ocGFyYW1ldGVy cywgZm9ybWF0dGVkUmVzdWx0KQogICAgIHsKICAgICAgICAgdmFyIGZvcm1hdHRlcnMgPSB7fQog Ci0gICAgICAgIGZ1bmN0aW9uIGNvbnNvbGVGb3JtYXRXcmFwcGVyKGZvcmNlKQorICAgICAgICBm dW5jdGlvbiBwYXJhbWV0ZXJGb3JtYXR0ZXIoZm9yY2UsIG9iaikKICAgICAgICAgewotICAgICAg ICAgICAgcmV0dXJuIGZ1bmN0aW9uKG9iaikgewotICAgICAgICAgICAgICAgIHJldHVybiBXZWJJ bnNwZWN0b3IuY29uc29sZVZpZXcuX2Zvcm1hdChvYmosIGZvcmNlKTsKLSAgICAgICAgICAgIH07 CisgICAgICAgICAgICByZXR1cm4gdGhpcy5fZm9ybWF0UGFyYW1ldGVyKG9iaiwgZm9yY2UpOwog ICAgICAgICB9CiAKICAgICAgICAgZnVuY3Rpb24gdmFsdWVGb3JtYXR0ZXIob2JqKQpAQCAtMjU5 LDcgKzM3MCw3IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5wcm90b3R5cGUgPSB7CiAg ICAgICAgIH0KIAogICAgICAgICAvLyBGaXJlYnVnIHVzZXMgJW8gZm9yIGZvcm1hdHRpbmcgb2Jq ZWN0cy4KLSAgICAgICAgZm9ybWF0dGVycy5vID0gY29uc29sZUZvcm1hdFdyYXBwZXIoZmFsc2Up OworICAgICAgICBmb3JtYXR0ZXJzLm8gPSBwYXJhbWV0ZXJGb3JtYXR0ZXIuYmluZCh0aGlzLCBm YWxzZSk7CiAgICAgICAgIGZvcm1hdHRlcnMucyA9IHZhbHVlRm9ybWF0dGVyOwogICAgICAgICBm b3JtYXR0ZXJzLmYgPSB2YWx1ZUZvcm1hdHRlcjsKICAgICAgICAgLy8gRmlyZWJ1ZyBhbGxvd3Mg Ym90aCAlaSBhbmQgJWQgZm9yIGZvcm1hdHRpbmcgaW50ZWdlcnMuCkBAIC0yNjcsNyArMzc4LDcg QEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLnByb3RvdHlwZSA9IHsKICAgICAgICAgZm9y bWF0dGVycy5kID0gdmFsdWVGb3JtYXR0ZXI7CiAKICAgICAgICAgLy8gU3VwcG9ydCAlTyB0byBm b3JjZSBvYmplY3QgZm9ybWF0dGluZywgaW5zdGVhZCBvZiB0aGUgdHlwZS1iYXNlZCAlbyBmb3Jt YXR0aW5nLgotICAgICAgICBmb3JtYXR0ZXJzLk8gPSBjb25zb2xlRm9ybWF0V3JhcHBlcih0cnVl KTsKKyAgICAgICAgZm9ybWF0dGVycy5PID0gcGFyYW1ldGVyRm9ybWF0dGVyLmJpbmQodGhpcywg dHJ1ZSk7CiAKICAgICAgICAgZnVuY3Rpb24gYXBwZW5kKGEsIGIpCiAgICAgICAgIHsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzCmluZGV4 IGM1MTY4MmUwYjBhNzJmZGU3MTk3ODkzN2E3YTc0Mjg3NjQ1MjJmMmYuLjljY2NlMTZlYTdmOTU2 Mzk2MjJhYjIyN2Y3YjljNGJhZDM5YTc3MjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5qcwpAQCAtMjksNiArMjksMTAgQEAKIAogY29u c3QgRXhwcmVzc2lvblN0b3BDaGFyYWN0ZXJzID0gIiA9OlsoezssISstKi8mfF48PiI7CiAKKy8q KgorICogQGV4dGVuZHMge1dlYkluc3BlY3Rvci5WaWV3fQorICogQGNvbnN0cnVjdG9yCisgKi8K IFdlYkluc3BlY3Rvci5Db25zb2xlVmlldyA9IGZ1bmN0aW9uKCkKIHsKICAgICBXZWJJbnNwZWN0 b3IuVmlldy5jYWxsKHRoaXMpOwpAQCAtMTAxLDEzICsxMDUsNiBAQCBXZWJJbnNwZWN0b3IuQ29u c29sZVZpZXcgPSBmdW5jdGlvbigpCiAKICAgICB0aGlzLm1lc3NhZ2VzRWxlbWVudC5hZGRFdmVu dExpc3RlbmVyKCJjb250ZXh0bWVudSIsIHRoaXMuX2hhbmRsZUNvbnRleHRNZW51RXZlbnQuYmlu ZCh0aGlzKSwgZmFsc2UpOwogCi0gICAgdGhpcy5fY3VzdG9tRm9ybWF0dGVycyA9IHsKLSAgICAg ICAgIm9iamVjdCI6IHRoaXMuX2Zvcm1hdG9iamVjdCwKLSAgICAgICAgImFycmF5IjogIHRoaXMu X2Zvcm1hdGFycmF5LAotICAgICAgICAibm9kZSI6ICAgdGhpcy5fZm9ybWF0bm9kZSwKLSAgICAg ICAgInN0cmluZyI6IHRoaXMuX2Zvcm1hdHN0cmluZwotICAgIH07Ci0KICAgICBXZWJJbnNwZWN0 b3Iuc2V0dGluZ3MubW9uaXRvcmluZ1hIUkVuYWJsZWQuYWRkQ2hhbmdlTGlzdGVuZXIodGhpcy5f bW9uaXRvcmluZ1hIUkVuYWJsZWRTZXR0aW5nQ2hhbmdlZC5iaW5kKHRoaXMpKTsKIAogICAgIFdl Ykluc3BlY3Rvci5jb25zb2xlLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkNvbnNvbGVN b2RlbC5FdmVudHMuTWVzc2FnZUFkZGVkLCB0aGlzLl9jb25zb2xlTWVzc2FnZUFkZGVkLCB0aGlz KTsKQEAgLTYzNywxMDggKzYzNCw2IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5 cGUgPSB7CiAgICAgICAgIFdlYkluc3BlY3Rvci51c2VyTWV0cmljcy5Db25zb2xlRXZhbHVhdGVk LnJlY29yZCgpOwogICAgIH0sCiAKLSAgICBfZm9ybWF0OiBmdW5jdGlvbihvdXRwdXQsIGZvcmNl T2JqZWN0Rm9ybWF0KQotICAgIHsKLSAgICAgICAgdmFyIHR5cGU7Ci0gICAgICAgIGlmIChmb3Jj ZU9iamVjdEZvcm1hdCkKLSAgICAgICAgICAgIHR5cGUgPSAib2JqZWN0IjsKLSAgICAgICAgZWxz ZSBpZiAob3V0cHV0IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlJlbW90ZU9iamVjdCkKLSAgICAg ICAgICAgIHR5cGUgPSBvdXRwdXQuc3VidHlwZSB8fCBvdXRwdXQudHlwZTsKLSAgICAgICAgZWxz ZQotICAgICAgICAgICAgdHlwZSA9IHR5cGVvZiBvdXRwdXQ7Ci0KLSAgICAgICAgdmFyIGZvcm1h dHRlciA9IHRoaXMuX2N1c3RvbUZvcm1hdHRlcnNbdHlwZV07Ci0gICAgICAgIGlmICghZm9ybWF0 dGVyKSB7Ci0gICAgICAgICAgICBmb3JtYXR0ZXIgPSB0aGlzLl9mb3JtYXR2YWx1ZTsKLSAgICAg ICAgICAgIG91dHB1dCA9IG91dHB1dC5kZXNjcmlwdGlvbjsKLSAgICAgICAgfQotCi0gICAgICAg IHZhciBzcGFuID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic3BhbiIpOwotICAgICAgICBzcGFu LmNsYXNzTmFtZSA9ICJjb25zb2xlLWZvcm1hdHRlZC0iICsgdHlwZSArICIgc291cmNlLWNvZGUi OwotICAgICAgICBmb3JtYXR0ZXIuY2FsbCh0aGlzLCBvdXRwdXQsIHNwYW4pOwotICAgICAgICBy ZXR1cm4gc3BhbjsKLSAgICB9LAotCi0gICAgX2Zvcm1hdHZhbHVlOiBmdW5jdGlvbih2YWwsIGVs ZW0pCi0gICAgewotICAgICAgICBlbGVtLmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHRO b2RlKHZhbCkpOwotICAgIH0sCi0KLSAgICBfZm9ybWF0b2JqZWN0OiBmdW5jdGlvbihvYmosIGVs ZW0pCi0gICAgewotICAgICAgICBlbGVtLmFwcGVuZENoaWxkKG5ldyBXZWJJbnNwZWN0b3IuT2Jq ZWN0UHJvcGVydGllc1NlY3Rpb24ob2JqLCBvYmouZGVzY3JpcHRpb24pLmVsZW1lbnQpOwotICAg IH0sCi0KLSAgICBfZm9ybWF0bm9kZTogZnVuY3Rpb24ob2JqZWN0LCBlbGVtKQotICAgIHsKLSAg ICAgICAgZnVuY3Rpb24gcHJpbnROb2RlKG5vZGVJZCkKLSAgICAgICAgewotICAgICAgICAgICAg aWYgKCFub2RlSWQpIHsKLSAgICAgICAgICAgICAgICAvLyBTb21ldGltZXMgRE9NIGlzIGxvYWRl ZCBhZnRlciB0aGUgc3luYyBtZXNzYWdlIGlzIGJlaW5nIGZvcm1hdHRlZCwgc28gd2UgZ2V0IG5v Ci0gICAgICAgICAgICAgICAgLy8gbm9kZUlkIGhlcmUuIFNvIHdlIGZhbGwgYmFjayB0byBvYmpl Y3QgZm9ybWF0dGluZyBoZXJlLgotICAgICAgICAgICAgICAgIHRoaXMuX2Zvcm1hdG9iamVjdChv YmplY3QsIGVsZW0pOwotICAgICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAgIH0KLSAg ICAgICAgICAgIHZhciB0cmVlT3V0bGluZSA9IG5ldyBXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVl T3V0bGluZSgpOwotICAgICAgICAgICAgdHJlZU91dGxpbmUuc2hvd0luRWxlbWVudHNQYW5lbEVu YWJsZWQgPSB0cnVlOwotICAgICAgICAgICAgdHJlZU91dGxpbmUucm9vdERPTU5vZGUgPSBXZWJJ bnNwZWN0b3IuZG9tQWdlbnQubm9kZUZvcklkKG5vZGVJZCk7Ci0gICAgICAgICAgICB0cmVlT3V0 bGluZS5lbGVtZW50LmFkZFN0eWxlQ2xhc3MoIm91dGxpbmUtZGlzY2xvc3VyZSIpOwotICAgICAg ICAgICAgaWYgKCF0cmVlT3V0bGluZS5jaGlsZHJlblswXS5oYXNDaGlsZHJlbikKLSAgICAgICAg ICAgICAgICB0cmVlT3V0bGluZS5lbGVtZW50LmFkZFN0eWxlQ2xhc3MoInNpbmdsZS1ub2RlIik7 Ci0gICAgICAgICAgICBlbGVtLmFwcGVuZENoaWxkKHRyZWVPdXRsaW5lLmVsZW1lbnQpOwotICAg ICAgICB9Ci0gICAgICAgIG9iamVjdC5wdXNoTm9kZVRvRnJvbnRlbmQocHJpbnROb2RlLmJpbmQo dGhpcykpOwotICAgIH0sCi0KLSAgICBfZm9ybWF0YXJyYXk6IGZ1bmN0aW9uKGFyciwgZWxlbSkK LSAgICB7Ci0gICAgICAgIGFyci5nZXRPd25Qcm9wZXJ0aWVzKHRoaXMuX3ByaW50QXJyYXkuYmlu ZCh0aGlzLCBlbGVtKSk7Ci0gICAgfSwKLQotICAgIF9mb3JtYXRzdHJpbmc6IGZ1bmN0aW9uKG91 dHB1dCwgZWxlbSkKLSAgICB7Ci0gICAgICAgIHZhciBzcGFuID0gZG9jdW1lbnQuY3JlYXRlRWxl bWVudCgic3BhbiIpOwotICAgICAgICBzcGFuLmNsYXNzTmFtZSA9ICJjb25zb2xlLWZvcm1hdHRl ZC1zdHJpbmcgc291cmNlLWNvZGUiOwotICAgICAgICBzcGFuLmFwcGVuZENoaWxkKFdlYkluc3Bl Y3Rvci5saW5raWZ5U3RyaW5nQXNGcmFnbWVudChvdXRwdXQuZGVzY3JpcHRpb24pKTsKLQotICAg ICAgICAvLyBNYWtlIGJsYWNrIHF1b3Rlcy4KLSAgICAgICAgZWxlbS5yZW1vdmVTdHlsZUNsYXNz KCJjb25zb2xlLWZvcm1hdHRlZC1zdHJpbmciKTsKLSAgICAgICAgZWxlbS5hcHBlbmRDaGlsZChk b2N1bWVudC5jcmVhdGVUZXh0Tm9kZSgiXCIiKSk7Ci0gICAgICAgIGVsZW0uYXBwZW5kQ2hpbGQo c3Bhbik7Ci0gICAgICAgIGVsZW0uYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUo IlwiIikpOwotICAgIH0sCi0KLSAgICBfcHJpbnRBcnJheTogZnVuY3Rpb24oZWxlbSwgcHJvcGVy dGllcykKLSAgICB7Ci0gICAgICAgIGlmICghcHJvcGVydGllcykKLSAgICAgICAgICAgIHJldHVy bjsKLQotICAgICAgICB2YXIgZWxlbWVudHMgPSBbXTsKLSAgICAgICAgZm9yICh2YXIgaSA9IDA7 IGkgPCBwcm9wZXJ0aWVzLmxlbmd0aDsgKytpKSB7Ci0gICAgICAgICAgICB2YXIgbmFtZSA9IHBy b3BlcnRpZXNbaV0ubmFtZTsKLSAgICAgICAgICAgIGlmIChuYW1lID09IHBhcnNlSW50KG5hbWUp KQotICAgICAgICAgICAgICAgIGVsZW1lbnRzW25hbWVdID0gdGhpcy5fZm9ybWF0QXNBcnJheUVu dHJ5KHByb3BlcnRpZXNbaV0udmFsdWUpOwotICAgICAgICB9Ci0KLSAgICAgICAgZWxlbS5hcHBl bmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZSgiWyIpKTsKLSAgICAgICAgZm9yICh2YXIg aSA9IDA7IGkgPCBlbGVtZW50cy5sZW5ndGg7ICsraSkgewotICAgICAgICAgICAgdmFyIGVsZW1l bnQgPSBlbGVtZW50c1tpXTsKLSAgICAgICAgICAgIGlmIChlbGVtZW50KQotICAgICAgICAgICAg ICAgIGVsZW0uYXBwZW5kQ2hpbGQoZWxlbWVudCk7Ci0gICAgICAgICAgICBlbHNlCi0gICAgICAg ICAgICAgICAgZWxlbS5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZSgidW5kZWZp bmVkIikpCi0gICAgICAgICAgICBpZiAoaSA8IGVsZW1lbnRzLmxlbmd0aCAtIDEpCi0gICAgICAg ICAgICAgICAgZWxlbS5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZSgiLCAiKSk7 Ci0gICAgICAgIH0KLSAgICAgICAgZWxlbS5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0 Tm9kZSgiXSIpKTsKLSAgICB9LAotCi0gICAgX2Zvcm1hdEFzQXJyYXlFbnRyeTogZnVuY3Rpb24o b3V0cHV0KQotICAgIHsKLSAgICAgICAgLy8gUHJldmVudCBpbmZpbml0ZSBleHBhbnNpb24gb2Yg Y3Jvc3MtcmVmZXJlbmNpbmcgYXJyYXlzLgotICAgICAgICByZXR1cm4gdGhpcy5fZm9ybWF0KG91 dHB1dCwgb3V0cHV0LnN1YnR5cGUgJiYgb3V0cHV0LnN1YnR5cGUgPT09ICJhcnJheSIpOwotICAg IH0sCi0KICAgICBlbGVtZW50c1RvUmVzdG9yZVNjcm9sbFBvc2l0aW9uc0ZvcjogZnVuY3Rpb24o KQogICAgIHsKICAgICAgICAgcmV0dXJuIFt0aGlzLm1lc3NhZ2VzRWxlbWVudF07CkBAIC04NzYs MyArNzcxLDggQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVHcm91cC5wcm90b3R5cGUgPSB7CiAgICAg ICAgIGV2ZW50LnByZXZlbnREZWZhdWx0KCk7CiAgICAgfQogfQorCisvKioKKyAqIEB0eXBlIHs/ V2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3fQorICovCitXZWJJbnNwZWN0b3IuY29uc29sZVZpZXcg PSBudWxsOwo=