65559 2011-08-02 12:16:34 -0700 Web Inspector: Pretty print JSONP in network panel preview tab. 2011-08-04 07:39:36 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 vsevik vsevik apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 445413 0 vsevik 2011-08-02 12:16:34 -0700 Pretty print scripts in network panel preview tab. 445905 1 102789 vsevik 2011-08-03 09:25:33 -0700 Created attachment 102789 Patch 445910 2 102789 pfeldman 2011-08-03 09:40:59 -0700 Comment on attachment 102789 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=102789&action=review Please consider writing a test (both for preview and invalid input data. > Source/WebCore/inspector/front-end/ResourceJSONView.js:52 > + return new WebInspector.ParsedJSON(JSON.parse(text), prefix, ""); Excuse me? > Source/WebCore/inspector/front-end/ResourceJSONView.js:63 > + if (start && end) { start && end for -1 does not work. > Source/WebCore/inspector/front-end/ResourceJSONView.js:66 > + var text = text.substring(start + 1, end); Consider the following text: ")foo("! > Source/WebCore/inspector/front-end/ResourceJSONView.js:109 > + this.postfix = postfix; suffix 446482 3 102911 vsevik 2011-08-04 07:09:25 -0700 Created attachment 102911 Patch 446488 4 vsevik 2011-08-04 07:39:36 -0700 Committed r92372: <http://trac.webkit.org/changeset/92372> 102789 2011-08-03 09:25:33 -0700 2011-08-04 07:09:18 -0700 Patch bug-65559-20110803202531.patch text/plain 4714 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogOTIyNzgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA3MDExNjkwZDgxZDAwM2E1 ZTk5OTIxZDcyNjZlNDQ0MGI1OWFhMmZjLi4yNTViYzQ2YmFhMzZlZWEwODE2ODIwOTM2MGRlNjQ5 ZGM4NDNiM2Q3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTkgQEAKIDIwMTEtMDgtMDMgIFZzZXZv bG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogUHJldHR5IHByaW50IEpTT05QIGluIG5ldHdvcmsgcGFuZWwgcHJldmlldyB0YWIuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NTU1OQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9SZXNvdXJjZUpTT05WaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291 cmNlSlNPTlZpZXcucGFyc2VKU09OLldlYkluc3BlY3Rvci5SZXNvdXJjZUpTT05WaWV3LnBhcnNl SlNPTlApOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlSlNPTlZpZXcucGFyc2VKU09O LldlYkluc3BlY3Rvci5SZXNvdXJjZUpTT05WaWV3LnByb3RvdHlwZS5faW5pdGlhbGl6ZSk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VKU09OVmlldy5wYXJzZUpTT04uV2ViSW5zcGVj dG9yLlBhcnNlZEpTT04pOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VQ cmV2aWV3Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVByZXZpZXdWaWV3 LnByb3RvdHlwZS5fY3JlYXRlUHJldmlld1ZpZXcpOgorCisyMDExLTA4LTAzICBWc2V2b2xvZCBW bGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IENv bnNvbGUgc2Nyb2xsIHBvc2l0aW9uIHNob3VsZCBiZSBzYXZlZCB3aGVuIHN3aXRjaGluZyBwYW5l bHMuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NTYw NwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291 cmNlSlNPTlZpZXcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291 cmNlSlNPTlZpZXcuanMKaW5kZXggMTRkYzFkMmU1NjU0NTUxMGQ3ZDYyY2FjNjdmMGFkYTlmMzY4 ODViYy4uNTkyZjBlNjg5ZjU5ZTdmMjgwYjAzODAyODgzYTU1Y2Q4MTk5Y2U3ZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZUpTT05WaWV3Lmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VKU09OVmll dy5qcwpAQCAtMzcsMTggKzM3LDQzIEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZUpTT05WaWV3ID0g ZnVuY3Rpb24ocmVzb3VyY2UsIHBhcnNlZEpTT04pCiAKIFdlYkluc3BlY3Rvci5SZXNvdXJjZUpT T05WaWV3LnBhcnNlSlNPTiA9IGZ1bmN0aW9uKHRleHQpCiB7CisgICAgdmFyIHByZWZpeCA9ICIi OworCiAgICAgLy8gVHJpbSB3aGlsZSgxKSwgZm9yKDs7KSwgd2VpcmQgbnVtYmVycywgZXRjLiBX ZSBuZWVkIEpTT04gc3RhcnQuCiAgICAgdmFyIHN0YXJ0ID0gL1t7W10vLmV4ZWModGV4dCk7Ci0g ICAgaWYgKHN0YXJ0ICYmIHN0YXJ0LmluZGV4KQorICAgIGlmIChzdGFydCAmJiBzdGFydC5pbmRl eCkgeworICAgICAgICBwcmVmaXggPSB0ZXh0LnN1YnN0cmluZygwLCBzdGFydC5pbmRleCk7CiAg ICAgICAgIHRleHQgPSB0ZXh0LnN1YnN0cmluZyhzdGFydC5pbmRleCk7CisgICAgfQogCiAgICAg dHJ5IHsKLSAgICAgICAgcmV0dXJuIEpTT04ucGFyc2UodGV4dCk7CisgICAgICAgIHZhciBwYXJz ZWRKU09OID0ge307CisgICAgICAgIHZhciBwYXJzZWRPYmplY3QgPSBKU09OLnBhcnNlKHRleHQp OworICAgICAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5QYXJzZWRKU09OKEpTT04ucGFyc2Uo dGV4dCksIHByZWZpeCwgIiIpOwogICAgIH0gY2F0Y2ggKGUpIHsKICAgICAgICAgcmV0dXJuOwog ICAgIH0KIH0KIAorV2ViSW5zcGVjdG9yLlJlc291cmNlSlNPTlZpZXcucGFyc2VKU09OUCA9IGZ1 bmN0aW9uKHRleHQpCit7CisgICAgLy8gVGFraW5nIGV2ZXJ5dGhpbmcgYmV0d2VlbiBmaXJzdCBh bmQgbGFzdCBwYXJlbnRoZXNlcworICAgIHZhciBzdGFydCA9IHRleHQuaW5kZXhPZigiKCIpOwor ICAgIHZhciBlbmQgPSB0ZXh0Lmxhc3RJbmRleE9mKCIpIik7CisgICAgaWYgKHN0YXJ0ICYmIGVu ZCkgeworICAgICAgICB2YXIgcHJlZml4ID0gdGV4dC5zdWJzdHJpbmcoMCwgc3RhcnQgKyAxKTsg CisgICAgICAgIHZhciBwb3N0Zml4ID0gdGV4dC5zdWJzdHJpbmcoZW5kKTsKKyAgICAgICAgdmFy IHRleHQgPSB0ZXh0LnN1YnN0cmluZyhzdGFydCArIDEsIGVuZCk7CisKKyAgICAgICAgdHJ5IHsK KyAgICAgICAgICAgIHJldHVybiBuZXcgV2ViSW5zcGVjdG9yLlBhcnNlZEpTT04oSlNPTi5wYXJz ZSh0ZXh0KSwgcHJlZml4LCBwb3N0Zml4KTsKKyAgICAgICAgfSBjYXRjaCAoZSkgeworICAgICAg ICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgfSBlbHNlCisgICAgICAgIHJldHVybjsKK30K KwogV2ViSW5zcGVjdG9yLlJlc291cmNlSlNPTlZpZXcucHJvdG90eXBlID0gewogICAgIGhhc0Nv bnRlbnQ6IGZ1bmN0aW9uKCkKICAgICB7CkBAIC02Nyw5ICs5MiwxOSBAQCBXZWJJbnNwZWN0b3Iu UmVzb3VyY2VKU09OVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICByZXR1cm47CiAgICAg ICAgIHRoaXMuX2luaXRpYWxpemVkID0gdHJ1ZTsKIAotICAgICAgICB2YXIgb2JqID0gV2ViSW5z cGVjdG9yLlJlbW90ZU9iamVjdC5mcm9tTG9jYWxPYmplY3QodGhpcy5fcGFyc2VkSlNPTik7Ci0g ICAgICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZChuZXcgV2ViSW5zcGVjdG9yLk9iamVjdFBy b3BlcnRpZXNTZWN0aW9uKG9iaiwgb2JqLmRlc2NyaXB0aW9uKS5lbGVtZW50KTsKKyAgICAgICAg dmFyIG9iaiA9IFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3QuZnJvbUxvY2FsT2JqZWN0KHRoaXMu X3BhcnNlZEpTT04uZGF0YSk7CisgICAgICAgIHZhciB0aXRsZSA9IHRoaXMuX3BhcnNlZEpTT04u cHJlZml4ICsgb2JqLmRlc2NyaXB0aW9uICsgdGhpcy5fcGFyc2VkSlNPTi5wb3N0Zml4OworICAg ICAgICB2YXIgc2VjdGlvbiA9IG5ldyBXZWJJbnNwZWN0b3IuT2JqZWN0UHJvcGVydGllc1NlY3Rp b24ob2JqLCB0aXRsZSk7CisgICAgICAgIHNlY3Rpb24uZXhwYW5kKCk7CisgICAgICAgIHRoaXMu ZWxlbWVudC5hcHBlbmRDaGlsZChzZWN0aW9uLmVsZW1lbnQpOwogICAgIH0KIH0KIAogV2ViSW5z cGVjdG9yLlJlc291cmNlSlNPTlZpZXcucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rv ci5SZXNvdXJjZVZpZXcucHJvdG90eXBlOworCitXZWJJbnNwZWN0b3IuUGFyc2VkSlNPTiA9IGZ1 bmN0aW9uKGRhdGEsIHByZWZpeCwgcG9zdGZpeCkKK3sKKyAgICB0aGlzLmRhdGEgPSBkYXRhOwor ICAgIHRoaXMucHJlZml4ID0gcHJlZml4OworICAgIHRoaXMucG9zdGZpeCA9IHBvc3RmaXg7Cit9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNl UHJldmlld1ZpZXcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291 cmNlUHJldmlld1ZpZXcuanMKaW5kZXggMDMwMTE5MzFmMTUzZTc2ZWM0NTFlZmI1MDMxNGFmNjdh ZGIzMGJlNi4uNjM3NWY3ZDZlNGQxYjAzNWYwOWQzYzViMmY3NDI0MGE4N2VhNTJhMyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVByZXZpZXdW aWV3LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VQ cmV2aWV3Vmlldy5qcwpAQCAtNzEsNiArNzEsMTIgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlUHJl dmlld1ZpZXcucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgIHJldHVybiBuZXcgV2ViSW5z cGVjdG9yLlJlc291cmNlSlNPTlZpZXcodGhpcy5yZXNvdXJjZSwgcGFyc2VkSlNPTik7CiAgICAg ICAgIH0KIAorICAgICAgICBpZiAodGhpcy5yZXNvdXJjZS5jb250ZW50ICYmIHRoaXMucmVzb3Vy Y2UuY2F0ZWdvcnkgPT09IFdlYkluc3BlY3Rvci5yZXNvdXJjZUNhdGVnb3JpZXMuc2NyaXB0cyAm JiB0aGlzLnJlc291cmNlLm1pbWVUeXBlID09PSAiYXBwbGljYXRpb24vanNvbiIpIHsKKyAgICAg ICAgICAgIHZhciBwYXJzZWRKU09OUCA9IFdlYkluc3BlY3Rvci5SZXNvdXJjZUpTT05WaWV3LnBh cnNlSlNPTlAodGhpcy5yZXNvdXJjZS5jb250ZW50KTsKKyAgICAgICAgICAgIGlmIChwYXJzZWRK U09OUCkKKyAgICAgICAgICAgICAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5SZXNvdXJjZUpT T05WaWV3KHRoaXMucmVzb3VyY2UsIHBhcnNlZEpTT05QKTsKKyAgICAgICAgfQorCiAgICAgICAg IGlmICh0aGlzLl9yZXNwb25zZVZpZXcuc291cmNlVmlldykKICAgICAgICAgICAgIHJldHVybiB0 aGlzLl9yZXNwb25zZVZpZXcuc291cmNlVmlldzsKICAgICAgICAgCg== 102911 2011-08-04 07:09:25 -0700 2011-08-04 07:31:00 -0700 Patch bug-65559-20110804180923.patch text/plain 8423 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogOTIzNjUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBjMmRiZmU1NWVlMDc4NDA0NzA0Zjdk YjY2MGExMGY4MWYzYWZhNzRlLi45NDA4ZDRmZWJlZjcyMWI3Mzk4YWVjMDJiOWYyM2Q0MTRlN2Ew YmUxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDgtMDQgIFZzZXZvbG9kIFZsYXNvdiAg PHZzZXZpa0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUHJldHR5IHBy aW50IEpTT05QIGluIG5ldHdvcmsgcGFuZWwgcHJldmlldyB0YWIuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NTU1OQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaHR0cC90ZXN0cy9pbnNwZWN0b3IvbmV0 d29yay9uZXR3b3JrLXByZXZpZXctanNvbi1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAq IGh0dHAvdGVzdHMvaW5zcGVjdG9yL25ldHdvcmsvbmV0d29yay1wcmV2aWV3LWpzb24uaHRtbDog QWRkZWQuCisKIDIwMTEtMDgtMDIgIEhhbnMgV2VubmJvcmcgIDxoYW5zQGNocm9taXVtLm9yZz4K IAogICAgICAgICBJbmRleGVkREI6IEZpeCBpbmRleCBkYXRhIGludmFsaWRhdGlvbiBidWdzLgpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvbmV0d29yay9uZXR3 b3JrLXByZXZpZXctanNvbi1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2lu c3BlY3Rvci9uZXR3b3JrL25ldHdvcmstcHJldmlldy1qc29uLWV4cGVjdGVkLnR4dApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi5lZTdjNWJkYjU0ZmQzY2NlMzU0NzQ3NDNhYWZhNmRkOTI4ZGU5NjJkCi0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvbmV0d29yay9uZXR3b3Jr LXByZXZpZXctanNvbi1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwzIEBACitUZXN0cyBSZXNvdXJj ZUpTT05WaWV3IGFiaWxpdHkgdG8gcGFyc2UgSlNPTiBwYXNzZWQgaW4gWEhSLCBKU09OUAorCitC dWcgNjU1NTkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL25l dHdvcmsvbmV0d29yay1wcmV2aWV3LWpzb24uaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMv aW5zcGVjdG9yL25ldHdvcmsvbmV0d29yay1wcmV2aWV3LWpzb24uaHRtbApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi45 MTJkYTBiMTE1MDdlMWQxNGY2NDFkZDU5NmI3ZDhjYzA2NTVhMDM2Ci0tLSAvZGV2L251bGwKKysr IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvbmV0d29yay9uZXR3b3JrLXByZXZp ZXctanNvbi5odG1sCkBAIC0wLDAgKzEsNTQgQEAKKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0IHNy Yz0iLi4vaW5zcGVjdG9yLXRlc3QuanMiPjwvc2NyaXB0PgorPHNjcmlwdD4KKworZnVuY3Rpb24g dGVzdCgpCit7CisgICAgdmFyIHRlc3REYXRhOworCisgICAgdGVzdERhdGEgPSAid2hpbGUoMSk7 IjsKKyAgICBJbnNwZWN0b3JUZXN0LmFzc2VydFRydWUoIVdlYkluc3BlY3Rvci5SZXNvdXJjZUpT T05WaWV3LnBhcnNlSlNPTih0ZXN0RGF0YSksICJTaG91bGQgbm90IGJlIGFibGUgdG8gcGFyc2Ug XCIiICsgdGVzdERhdGEgKyAiXCIuIik7CisKKyAgICB0ZXN0RGF0YSA9ICJ7XCJuYW1lXCI6IFwi dmFsdWVcIiI7CisgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnRUcnVlKCFXZWJJbnNwZWN0b3IuUmVz b3VyY2VKU09OVmlldy5wYXJzZUpTT04odGVzdERhdGEpLCAiU2hvdWxkIG5vdCBiZSBhYmxlIHRv IHBhcnNlIFwiIiArIHRlc3REYXRhICsgIlwiLiIpOworCisgICAgdGVzdERhdGEgPSAie1wibmFt ZVwiOiBcInZhbHVlXCJ9IjsKKyAgICB2YXIgcGFyc2VkSlNPTiA9IFdlYkluc3BlY3Rvci5SZXNv dXJjZUpTT05WaWV3LnBhcnNlSlNPTih0ZXN0RGF0YSk7CisgICAgSW5zcGVjdG9yVGVzdC5hc3Nl cnRFcXVhbHMocGFyc2VkSlNPTi5wcmVmaXgsICIiKTsKKyAgICBJbnNwZWN0b3JUZXN0LmFzc2Vy dEVxdWFscyhwYXJzZWRKU09OLmRhdGEubmFtZSwgInZhbHVlIik7CisgICAgSW5zcGVjdG9yVGVz dC5hc3NlcnRFcXVhbHMocGFyc2VkSlNPTi5zdWZmaXgsICIiKTsKKworICAgIHRlc3REYXRhID0g IndoaWxlKDEpOyB7XCJuYW1lXCI6IFwidmFsdWVcIn0iOworICAgIHBhcnNlZEpTT04gPSBXZWJJ bnNwZWN0b3IuUmVzb3VyY2VKU09OVmlldy5wYXJzZUpTT04odGVzdERhdGEpOworICAgIEluc3Bl Y3RvclRlc3QuYXNzZXJ0RXF1YWxzKHBhcnNlZEpTT04ucHJlZml4LCAid2hpbGUoMSk7ICIpOwor ICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0RXF1YWxzKHBhcnNlZEpTT04uZGF0YS5uYW1lLCAidmFs dWUiKTsKKyAgICBJbnNwZWN0b3JUZXN0LmFzc2VydEVxdWFscyhwYXJzZWRKU09OLnN1ZmZpeCwg IiIpOworCisgICAgdGVzdERhdGEgPSAiZnVuYyh7KSI7CisgICAgSW5zcGVjdG9yVGVzdC5hc3Nl cnRUcnVlKCFXZWJJbnNwZWN0b3IuUmVzb3VyY2VKU09OVmlldy5wYXJzZUpTT05QKHRlc3REYXRh KSwgIlNob3VsZCBub3QgYmUgYWJsZSB0byBwYXJzZSBcIiIgKyB0ZXN0RGF0YSArICJcIi4iKTsK KworICAgIHRlc3REYXRhID0gImZ1bmMpeygiOworICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0VHJ1 ZSghV2ViSW5zcGVjdG9yLlJlc291cmNlSlNPTlZpZXcucGFyc2VKU09OUCh0ZXN0RGF0YSksICJT aG91bGQgbm90IGJlIGFibGUgdG8gcGFyc2UgXCIiICsgdGVzdERhdGEgKyAiXCIuIik7CisKKyAg ICB0ZXN0RGF0YSA9ICJmdW5jKHtcIm5hbWVcIjogXCJ2YWx1ZVwifSI7CisgICAgSW5zcGVjdG9y VGVzdC5hc3NlcnRUcnVlKCFXZWJJbnNwZWN0b3IuUmVzb3VyY2VKU09OVmlldy5wYXJzZUpTT05Q KHRlc3REYXRhKSwgIlNob3VsZCBub3QgYmUgYWJsZSB0byBwYXJzZSBcIiIgKyB0ZXN0RGF0YSAr ICJcIi4iKTsKKworICAgIHRlc3REYXRhID0gImZ1bmN7XCJuYW1lXCI6IFwidmFsdWVcIn0pIjsK KyAgICBJbnNwZWN0b3JUZXN0LmFzc2VydFRydWUoIVdlYkluc3BlY3Rvci5SZXNvdXJjZUpTT05W aWV3LnBhcnNlSlNPTlAodGVzdERhdGEpLCAiU2hvdWxkIG5vdCBiZSBhYmxlIHRvIHBhcnNlIFwi IiArIHRlc3REYXRhICsgIlwiLiIpOworCisgICAgdGVzdERhdGEgPSAiZnVuYyh7XCJuYW1lXCI6 IFwidmFsdWVcIn0pIjsKKyAgICB2YXIgcGFyc2VkSlNPTlAgPSBXZWJJbnNwZWN0b3IuUmVzb3Vy Y2VKU09OVmlldy5wYXJzZUpTT05QKHRlc3REYXRhKTsKKyAgICBJbnNwZWN0b3JUZXN0LmFzc2Vy dEVxdWFscyhwYXJzZWRKU09OUC5wcmVmaXgsICJmdW5jKCIpOworICAgIEluc3BlY3RvclRlc3Qu YXNzZXJ0RXF1YWxzKHBhcnNlZEpTT05QLmRhdGEubmFtZSwgInZhbHVlIik7CisgICAgSW5zcGVj dG9yVGVzdC5hc3NlcnRFcXVhbHMocGFyc2VkSlNPTlAuc3VmZml4LCAiKSIpOworCisgICAgSW5z cGVjdG9yVGVzdC5jb21wbGV0ZVRlc3QoKTsKK30KKzwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHkg b25sb2FkPSJydW5UZXN0KCkiPgorPHA+VGVzdHMgUmVzb3VyY2VKU09OVmlldyBhYmlsaXR5IHRv IHBhcnNlIEpTT04gcGFzc2VkIGluIFhIUiwgSlNPTlA8L3A+Cis8YSBocmVmPSJodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjU1NTkiPkJ1ZyA2NTU1OTwvYT4KKzwvYm9k eT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA5YjhiZmYzOGMyYjQxYWQxYmQ5ZTFiM2Q2ZjE3ZGNk MjM2ZGZhZjAyLi5hNGU5MWMyNDI4NzdjY2YwMDg5NzFmMjJlNjAwNWVmYWNmYzg5M2MwIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDgtMDQgIFZzZXZvbG9kIFZsYXNvdiAgPHZz ZXZpa0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUHJldHR5IHByaW50 IEpTT05QIGluIG5ldHdvcmsgcGFuZWwgcHJldmlldyB0YWIuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NTU1OQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IGh0dHAvdGVzdHMvaW5zcGVjdG9yL25l dHdvcmsvbmV0d29yay1wcmV2aWV3LWpzb24uaHRtbAorCisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9SZXNvdXJjZUpTT05WaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291 cmNlSlNPTlZpZXcucGFyc2VKU09OLldlYkluc3BlY3Rvci5SZXNvdXJjZUpTT05WaWV3LnBhcnNl SlNPTlApOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlSlNPTlZpZXcucGFyc2VKU09O LldlYkluc3BlY3Rvci5SZXNvdXJjZUpTT05WaWV3LnByb3RvdHlwZS5faW5pdGlhbGl6ZSk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VKU09OVmlldy5wYXJzZUpTT04uV2ViSW5zcGVj dG9yLlBhcnNlZEpTT04pOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VQ cmV2aWV3Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVByZXZpZXdWaWV3 LnByb3RvdHlwZS5fY3JlYXRlUHJldmlld1ZpZXcpOgorCiAyMDExLTA4LTA0ICBUb21teSBXaWRl bmZseWNodCAgPHRvbW15d0Bnb29nbGUuY29tPgogCiAgICAgICAgIE1lZGlhU3RyZWFtIEFQSTog UmVuYW1lIFN0cmVhbUV2ZW50IHRvIE1lZGlhU3RyZWFtRXZlbnQKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VKU09OVmlldy5qcyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VKU09OVmlldy5qcwppbmRleCAx NGRjMWQyZTU2NTQ1NTEwZDdkNjJjYWM2N2YwYWRhOWYzNjg4NWJjLi5hMGFkYzc1M2I3ZGY2M2Mw OWNmY2I2N2E0MTE3MGZkZDk3NWRhY2FkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlSlNPTlZpZXcuanMKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZUpTT05WaWV3LmpzCkBAIC0zNywxMyArMzcsMzYg QEAgV2ViSW5zcGVjdG9yLlJlc291cmNlSlNPTlZpZXcgPSBmdW5jdGlvbihyZXNvdXJjZSwgcGFy c2VkSlNPTikKIAogV2ViSW5zcGVjdG9yLlJlc291cmNlSlNPTlZpZXcucGFyc2VKU09OID0gZnVu Y3Rpb24odGV4dCkKIHsKKyAgICB2YXIgcHJlZml4ID0gIiI7CisKICAgICAvLyBUcmltIHdoaWxl KDEpLCBmb3IoOzspLCB3ZWlyZCBudW1iZXJzLCBldGMuIFdlIG5lZWQgSlNPTiBzdGFydC4KICAg ICB2YXIgc3RhcnQgPSAvW3tbXS8uZXhlYyh0ZXh0KTsKLSAgICBpZiAoc3RhcnQgJiYgc3RhcnQu aW5kZXgpCisgICAgaWYgKHN0YXJ0ICYmIHN0YXJ0LmluZGV4KSB7CisgICAgICAgIHByZWZpeCA9 IHRleHQuc3Vic3RyaW5nKDAsIHN0YXJ0LmluZGV4KTsKICAgICAgICAgdGV4dCA9IHRleHQuc3Vi c3RyaW5nKHN0YXJ0LmluZGV4KTsKKyAgICB9CisKKyAgICB0cnkgeworICAgICAgICByZXR1cm4g bmV3IFdlYkluc3BlY3Rvci5QYXJzZWRKU09OKEpTT04ucGFyc2UodGV4dCksIHByZWZpeCwgIiIp OworICAgIH0gY2F0Y2ggKGUpIHsKKyAgICAgICAgcmV0dXJuOworICAgIH0KK30KKworV2ViSW5z cGVjdG9yLlJlc291cmNlSlNPTlZpZXcucGFyc2VKU09OUCA9IGZ1bmN0aW9uKHRleHQpCit7Cisg ICAgLy8gVGFraW5nIGV2ZXJ5dGhpbmcgYmV0d2VlbiBmaXJzdCBhbmQgbGFzdCBwYXJlbnRoZXNl cworICAgIHZhciBzdGFydCA9IHRleHQuaW5kZXhPZigiKCIpOworICAgIHZhciBlbmQgPSB0ZXh0 Lmxhc3RJbmRleE9mKCIpIik7CisgICAgaWYgKHN0YXJ0ID09IC0xIHx8IGVuZCA9PSAtMSB8fCBl bmQgPCBzdGFydCkKKyAgICAgICAgcmV0dXJuOworICAgIAorICAgIHZhciBwcmVmaXggPSB0ZXh0 LnN1YnN0cmluZygwLCBzdGFydCArIDEpOyAKKyAgICB2YXIgc3VmZml4ID0gdGV4dC5zdWJzdHJp bmcoZW5kKTsKKyAgICB2YXIgdGV4dCA9IHRleHQuc3Vic3RyaW5nKHN0YXJ0ICsgMSwgZW5kKTsK IAogICAgIHRyeSB7Ci0gICAgICAgIHJldHVybiBKU09OLnBhcnNlKHRleHQpOworICAgICAgICBy ZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5QYXJzZWRKU09OKEpTT04ucGFyc2UodGV4dCksIHByZWZp eCwgc3VmZml4KTsKICAgICB9IGNhdGNoIChlKSB7CiAgICAgICAgIHJldHVybjsKICAgICB9CkBA IC02Nyw5ICs5MCwyMCBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VKU09OVmlldy5wcm90b3R5cGUg PSB7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIHRoaXMuX2luaXRpYWxpemVkID0gdHJ1 ZTsKIAotICAgICAgICB2YXIgb2JqID0gV2ViSW5zcGVjdG9yLlJlbW90ZU9iamVjdC5mcm9tTG9j YWxPYmplY3QodGhpcy5fcGFyc2VkSlNPTik7Ci0gICAgICAgIHRoaXMuZWxlbWVudC5hcHBlbmRD aGlsZChuZXcgV2ViSW5zcGVjdG9yLk9iamVjdFByb3BlcnRpZXNTZWN0aW9uKG9iaiwgb2JqLmRl c2NyaXB0aW9uKS5lbGVtZW50KTsKKyAgICAgICAgdmFyIG9iaiA9IFdlYkluc3BlY3Rvci5SZW1v dGVPYmplY3QuZnJvbUxvY2FsT2JqZWN0KHRoaXMuX3BhcnNlZEpTT04uZGF0YSk7CisgICAgICAg IHZhciB0aXRsZSA9IHRoaXMuX3BhcnNlZEpTT04ucHJlZml4ICsgb2JqLmRlc2NyaXB0aW9uICsg dGhpcy5fcGFyc2VkSlNPTi5zdWZmaXg7CisgICAgICAgIHZhciBzZWN0aW9uID0gbmV3IFdlYklu c3BlY3Rvci5PYmplY3RQcm9wZXJ0aWVzU2VjdGlvbihvYmosIHRpdGxlKTsKKyAgICAgICAgc2Vj dGlvbi5leHBhbmQoKTsKKyAgICAgICAgc2VjdGlvbi5lZGl0YWJsZSA9IGZhbHNlOworICAgICAg ICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQoc2VjdGlvbi5lbGVtZW50KTsKICAgICB9CiB9CiAK IFdlYkluc3BlY3Rvci5SZXNvdXJjZUpTT05WaWV3LnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJ bnNwZWN0b3IuUmVzb3VyY2VWaWV3LnByb3RvdHlwZTsKKworV2ViSW5zcGVjdG9yLlBhcnNlZEpT T04gPSBmdW5jdGlvbihkYXRhLCBwcmVmaXgsIHN1ZmZpeCkKK3sKKyAgICB0aGlzLmRhdGEgPSBk YXRhOworICAgIHRoaXMucHJlZml4ID0gcHJlZml4OworICAgIHRoaXMuc3VmZml4ID0gc3VmZml4 OworfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNv dXJjZVByZXZpZXdWaWV3LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9S ZXNvdXJjZVByZXZpZXdWaWV3LmpzCmluZGV4IDAzMDExOTMxZjE1M2U3NmVjNDUxZWZiNTAzMTRh ZjY3YWRiMzBiZTYuLjYzNzVmN2Q2ZTRkMWIwMzVmMDlkM2M1YjJmNzQyNDBhODdlYTUyYTMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VQcmV2 aWV3Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291 cmNlUHJldmlld1ZpZXcuanMKQEAgLTcxLDYgKzcxLDEyIEBAIFdlYkluc3BlY3Rvci5SZXNvdXJj ZVByZXZpZXdWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICByZXR1cm4gbmV3IFdl Ykluc3BlY3Rvci5SZXNvdXJjZUpTT05WaWV3KHRoaXMucmVzb3VyY2UsIHBhcnNlZEpTT04pOwog ICAgICAgICB9CiAKKyAgICAgICAgaWYgKHRoaXMucmVzb3VyY2UuY29udGVudCAmJiB0aGlzLnJl c291cmNlLmNhdGVnb3J5ID09PSBXZWJJbnNwZWN0b3IucmVzb3VyY2VDYXRlZ29yaWVzLnNjcmlw dHMgJiYgdGhpcy5yZXNvdXJjZS5taW1lVHlwZSA9PT0gImFwcGxpY2F0aW9uL2pzb24iKSB7Cisg ICAgICAgICAgICB2YXIgcGFyc2VkSlNPTlAgPSBXZWJJbnNwZWN0b3IuUmVzb3VyY2VKU09OVmll dy5wYXJzZUpTT05QKHRoaXMucmVzb3VyY2UuY29udGVudCk7CisgICAgICAgICAgICBpZiAocGFy c2VkSlNPTlApCisgICAgICAgICAgICAgICAgcmV0dXJuIG5ldyBXZWJJbnNwZWN0b3IuUmVzb3Vy Y2VKU09OVmlldyh0aGlzLnJlc291cmNlLCBwYXJzZWRKU09OUCk7CisgICAgICAgIH0KKwogICAg ICAgICBpZiAodGhpcy5fcmVzcG9uc2VWaWV3LnNvdXJjZVZpZXcpCiAgICAgICAgICAgICByZXR1 cm4gdGhpcy5fcmVzcG9uc2VWaWV3LnNvdXJjZVZpZXc7CiAgICAgICAgIAo=