81897 2012-03-22 05:34:09 -0700 Web Inspector: move resource loading logic from SourceMapParser to CompilerScriptMapping. 2012-03-26 02:58:35 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 podivilov podivilov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 585156 0 podivilov 2012-03-22 05:34:09 -0700 Web Inspector: move resource loading logic from SourceMapParser to CompilerScriptMapping. SourceMapParser should only deal with payload parsing. 585159 1 133233 podivilov 2012-03-22 05:35:29 -0700 Created attachment 133233 Patch 585449 2 133233 vsevik 2012-03-22 10:31:03 -0700 Comment on attachment 133233 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=133233&action=review > Source/WebCore/ChangeLog:8 > + SourceMapParser should only deal with payload parsing. ...because parser should not deal with loading. 587563 3 podivilov 2012-03-26 02:58:35 -0700 Committed r112070: <http://trac.webkit.org/changeset/112070> 133233 2012-03-22 05:35:29 -0700 2012-03-22 10:31:02 -0700 Patch bug-81897-20120322163527.patch text/plain 15573 podivilov U3VidmVyc2lvbiBSZXZpc2lvbjogMTExNjY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTIwYzk5ZDU1MDMzM2Vk MjE2N2ExNjE3NWJjYTYyNGQxNTM5YjRmOS4uMmZlN2Y0ZjdlY2NlZDMwM2U4NGE1MmQ3NTEwZWEx OGM3YzM3MmE2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTAzLTIyICBQYXZl bCBQb2Rpdmlsb3YgIDxwb2Rpdmlsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IG1vdmUgcmVzb3VyY2UgbG9hZGluZyBsb2dpYyBmcm9tIFNvdXJjZU1hcFBhcnNlciB0 byBDb21waWxlclNjcmlwdE1hcHBpbmcuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD04MTg5NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFNvdXJjZU1hcFBhcnNlciBzaG91bGQgb25seSBkZWFsIHdpdGggcGF5 bG9hZCBwYXJzaW5nLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Db21waWxlclNj cmlwdE1hcHBpbmcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29tcGlsZXJTY3JpcHRNYXBw aW5nLnByb3RvdHlwZS5yYXdMb2NhdGlvblRvVUlMb2NhdGlvbik6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuQ29tcGlsZXJTY3JpcHRNYXBwaW5nLnByb3RvdHlwZS5hZGRTY3JpcHQpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkNvbXBpbGVyU2NyaXB0TWFwcGluZy5wcm90b3R5cGUubG9hZFNvdXJj ZU1hcEZvclNjcmlwdCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlTWFwUGF5bG9hZCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlTWFwUGFyc2VyKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5Tb3VyY2VNYXBQYXJzZXIucHJvdG90eXBlLnNvdXJjZUNvbnRlbnQpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlNvdXJjZU1hcFBhcnNlci5wcm90b3R5cGUuZmluZEVudHJ5KToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VNYXBQYXJzZXIucHJvdG90eXBlLmZpbmRFbnRyeVJl dmVyc2VkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnRlbnRQcm92aWRlcnMu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29tcGlsZXJTb3VyY2VNYXBwaW5nQ29udGVudFBy b3ZpZGVyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db21waWxlclNvdXJjZU1hcHBpbmdDb250 ZW50UHJvdmlkZXIucHJvdG90eXBlLnJlcXVlc3RDb250ZW50KToKKwogMjAxMi0wMy0yMiAgS2Vu dCBUYW11cmEgIDx0a2VudEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgRXhwYW5kIFJlbmRlclRl eHRDb250cm9sU2luZ2xlTGluZTo6Y29udHJvbENsaXBSZWN0KCkgdG8gY29udGFpbiBjb250ZW50 UmVjdCgpLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9D b21waWxlclNjcmlwdE1hcHBpbmcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0NvbXBpbGVyU2NyaXB0TWFwcGluZy5qcwppbmRleCA2YzZlNmIyNjVhMDdkODM2ZGNhNjRk MGE0Zjc4NDkwZDlhMDFjYjI5Li41Mzk4NDc5ZmQ2MDE0NDVkNmYwNDA1YzM1NzZkMmExOGM1ZDRi YzAxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbXBp bGVyU2NyaXB0TWFwcGluZy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0NvbXBpbGVyU2NyaXB0TWFwcGluZy5qcwpAQCAtNDksOSArNDksOCBAQCBXZWJJbnNwZWN0 b3IuQ29tcGlsZXJTY3JpcHRNYXBwaW5nLnByb3RvdHlwZSA9IHsKICAgICByYXdMb2NhdGlvblRv VUlMb2NhdGlvbjogZnVuY3Rpb24ocmF3TG9jYXRpb24pCiAgICAgewogICAgICAgICB2YXIgc291 cmNlTWFwID0gdGhpcy5fc291cmNlTWFwRm9yU2NyaXB0SWRbcmF3TG9jYXRpb24uc2NyaXB0SWRd OwotICAgICAgICB2YXIgbG9jYXRpb24gPSBzb3VyY2VNYXAuY29tcGlsZWRMb2NhdGlvblRvU291 cmNlTG9jYXRpb24ocmF3TG9jYXRpb24ubGluZU51bWJlciwgcmF3TG9jYXRpb24uY29sdW1uTnVt YmVyIHx8IDApOwotICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gdGhpcy5fdWlTb3VyY2VDb2Rl QnlVUkxbbG9jYXRpb24uc291cmNlVVJMXTsKLSAgICAgICAgcmV0dXJuIG5ldyBXZWJJbnNwZWN0 b3IuVUlMb2NhdGlvbih1aVNvdXJjZUNvZGUsIGxvY2F0aW9uLmxpbmVOdW1iZXIsIGxvY2F0aW9u LmNvbHVtbk51bWJlcik7CisgICAgICAgIHZhciBlbnRyeSA9IHNvdXJjZU1hcC5maW5kRW50cnko cmF3TG9jYXRpb24ubGluZU51bWJlciwgcmF3TG9jYXRpb24uY29sdW1uTnVtYmVyIHx8IDApOwor ICAgICAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5VSUxvY2F0aW9uKHRoaXMuX3VpU291cmNl Q29kZUJ5VVJMW2VudHJ5WzJdXSwgZW50cnlbM10sIGVudHJ5WzRdKTsKICAgICB9LAogCiAgICAg LyoqCkBAIC02Myw4ICs2Miw4IEBAIFdlYkluc3BlY3Rvci5Db21waWxlclNjcmlwdE1hcHBpbmcu cHJvdG90eXBlID0gewogICAgIHVpTG9jYXRpb25Ub1Jhd0xvY2F0aW9uOiBmdW5jdGlvbih1aVNv dXJjZUNvZGUsIGxpbmVOdW1iZXIsIGNvbHVtbk51bWJlcikKICAgICB7CiAgICAgICAgIHZhciBz b3VyY2VNYXAgPSB0aGlzLl9zb3VyY2VNYXBGb3JVSVNvdXJjZUNvZGUuZ2V0KHVpU291cmNlQ29k ZSk7Ci0gICAgICAgIHZhciBsb2NhdGlvbiA9IHNvdXJjZU1hcC5zb3VyY2VMb2NhdGlvblRvQ29t cGlsZWRMb2NhdGlvbih1aVNvdXJjZUNvZGUudXJsLCBsaW5lTnVtYmVyKTsKLSAgICAgICAgcmV0 dXJuIFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLmNyZWF0ZVJhd0xvY2F0aW9uKHRoaXMuX3Nj cmlwdEZvclNvdXJjZU1hcC5nZXQoc291cmNlTWFwKSwgbG9jYXRpb25bMF0sIGxvY2F0aW9uWzFd KTsKKyAgICAgICAgdmFyIGVudHJ5ID0gc291cmNlTWFwLmZpbmRFbnRyeVJldmVyc2VkKHVpU291 cmNlQ29kZS51cmwsIGxpbmVOdW1iZXIpOworICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLmRl YnVnZ2VyTW9kZWwuY3JlYXRlUmF3TG9jYXRpb24odGhpcy5fc2NyaXB0Rm9yU291cmNlTWFwLmdl dChzb3VyY2VNYXApLCBlbnRyeVswXSwgZW50cnlbMV0pOwogICAgIH0sCiAKICAgICAvKioKQEAg LTk4LDcgKzk3LDEyIEBAIFdlYkluc3BlY3Rvci5Db21waWxlclNjcmlwdE1hcHBpbmcucHJvdG90 eXBlID0gewogICAgICAgICAgICAgdmFyIHNvdXJjZVVSTCA9IHNvdXJjZVVSTHNbaV07CiAgICAg ICAgICAgICBpZiAodGhpcy5fdWlTb3VyY2VDb2RlQnlVUkxbc291cmNlVVJMXSkKICAgICAgICAg ICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgIHZhciBjb250ZW50UHJvdmlkZXIgPSBuZXcg V2ViSW5zcGVjdG9yLkNvbXBpbGVyU291cmNlTWFwcGluZ0NvbnRlbnRQcm92aWRlcihzb3VyY2VV UkwsIHNvdXJjZU1hcCk7CisgICAgICAgICAgICB2YXIgc291cmNlQ29udGVudCA9IHNvdXJjZU1h cC5zb3VyY2VDb250ZW50KHNvdXJjZVVSTCk7CisgICAgICAgICAgICB2YXIgY29udGVudFByb3Zp ZGVyOworICAgICAgICAgICAgaWYgKHNvdXJjZUNvbnRlbnQpCisgICAgICAgICAgICAgICAgY29u dGVudFByb3ZpZGVyID0gbmV3IFdlYkluc3BlY3Rvci5TdGF0aWNDb250ZW50UHJvdmlkZXIoInRl eHQvamF2YXNjcmlwdCIsIHNvdXJjZUNvbnRlbnQpOworICAgICAgICAgICAgZWxzZQorICAgICAg ICAgICAgICAgIGNvbnRlbnRQcm92aWRlciA9IG5ldyBXZWJJbnNwZWN0b3IuQ29tcGlsZXJTb3Vy Y2VNYXBwaW5nQ29udGVudFByb3ZpZGVyKHNvdXJjZVVSTCk7CiAgICAgICAgICAgICB2YXIgdWlT b3VyY2VDb2RlID0gbmV3IFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUoc291cmNlVVJMLCBzb3Vy Y2VVUkwsIGNvbnRlbnRQcm92aWRlcik7CiAgICAgICAgICAgICB1aVNvdXJjZUNvZGUuaXNDb250 ZW50U2NyaXB0ID0gc2NyaXB0LmlzQ29udGVudFNjcmlwdDsKICAgICAgICAgICAgIHVpU291cmNl Q29kZS5pc0VkaXRhYmxlID0gZmFsc2U7CkBAIC0xMjQsMTAgKzEyOCwxNyBAQCBXZWJJbnNwZWN0 b3IuQ29tcGlsZXJTY3JpcHRNYXBwaW5nLnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKHNvdXJj ZU1hcCkKICAgICAgICAgICAgIHJldHVybiBzb3VyY2VNYXA7CiAKLSAgICAgICAgc291cmNlTWFw ID0gbmV3IFdlYkluc3BlY3Rvci5Tb3VyY2VNYXBQYXJzZXIoc2NyaXB0LnNvdXJjZU1hcFVSTCwg c2NyaXB0LnNvdXJjZVVSTCk7Ci0gICAgICAgIGlmICghc291cmNlTWFwLmxvYWQoKSkKKyAgICAg ICAgdHJ5IHsKKyAgICAgICAgICAgIC8vIEZJWE1FOiBtYWtlIHNlbmRSZXF1ZXN0IGFzeW5jLgor ICAgICAgICAgICAgdmFyIHJlc3BvbnNlID0gSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmxvYWRSZXNv dXJjZVN5bmNocm9ub3VzbHkoc291cmNlTWFwVVJMKTsKKyAgICAgICAgICAgIGlmIChyZXNwb25z ZS5zbGljZSgwLCAzKSA9PT0gIildfSIpCisgICAgICAgICAgICAgICAgcmVzcG9uc2UgPSByZXNw b25zZS5zdWJzdHJpbmcocmVzcG9uc2UuaW5kZXhPZignXG4nKSk7CisgICAgICAgICAgICB2YXIg cGF5bG9hZCA9IC8qKiBAdHlwZSB7V2ViSW5zcGVjdG9yLlNvdXJjZU1hcFBheWxvYWR9ICovIEpT T04ucGFyc2UocmVzcG9uc2UpOworICAgICAgICAgICAgc291cmNlTWFwID0gbmV3IFdlYkluc3Bl Y3Rvci5Tb3VyY2VNYXBQYXJzZXIoc291cmNlTWFwVVJMLCBwYXlsb2FkKTsKKyAgICAgICAgfSBj YXRjaChlKSB7CisgICAgICAgICAgICBjb25zb2xlLmVycm9yKGUubWVzc2FnZSk7CiAgICAgICAg ICAgICByZXR1cm4gbnVsbDsKLQorICAgICAgICB9CiAgICAgICAgIHRoaXMuX3NvdXJjZU1hcEJ5 VVJMW3NvdXJjZU1hcFVSTF0gPSBzb3VyY2VNYXA7CiAgICAgICAgIHJldHVybiBzb3VyY2VNYXA7 CiAgICAgfSwKQEAgLTE1MCw4ICsxNjEsOSBAQCBXZWJJbnNwZWN0b3IuQ29tcGlsZXJTY3JpcHRN YXBwaW5nLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuU2NyaXB0TWFwcAogLyoq CiAgKiBAY29uc3RydWN0b3IKICAqLwotV2ViSW5zcGVjdG9yLlNvdXJjZU1hcFBhcnNlclBheWxv YWQgPSBmdW5jdGlvbigpCitXZWJJbnNwZWN0b3IuU291cmNlTWFwUGF5bG9hZCA9IGZ1bmN0aW9u KCkKIHsKKyAgICB0aGlzLnNlY3Rpb25zID0gW107CiAgICAgdGhpcy5tYXBwaW5ncyA9ICIiOwog ICAgIHRoaXMuc291cmNlUm9vdCA9ICIiOwogICAgIHRoaXMuc291cmNlcyA9IFtdOwpAQCAtMTYy LDkgKzE3NCw5IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VNYXBQYXJzZXJQYXlsb2FkID0gZnVuY3Rp b24oKQogICogZm9yIGZvcm1hdCBkZXNjcmlwdGlvbi4KICAqIEBjb25zdHJ1Y3RvcgogICogQHBh cmFtIHtzdHJpbmd9IHNvdXJjZU1hcHBpbmdVUkwKLSAqIEBwYXJhbSB7c3RyaW5nfSBzY3JpcHRT b3VyY2VPcmlnaW4KKyAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLkNsb3N1cmVDb21waWxlclNvdXJj ZU1hcHBpbmdQYXlsb2FkfSBwYXlsb2FkCiAgKi8KLVdlYkluc3BlY3Rvci5Tb3VyY2VNYXBQYXJz ZXIgPSBmdW5jdGlvbihzb3VyY2VNYXBwaW5nVVJMLCBzY3JpcHRTb3VyY2VPcmlnaW4pCitXZWJJ bnNwZWN0b3IuU291cmNlTWFwUGFyc2VyID0gZnVuY3Rpb24oc291cmNlTWFwcGluZ1VSTCwgcGF5 bG9hZCkKIHsKICAgICBpZiAoIVdlYkluc3BlY3Rvci5Tb3VyY2VNYXBQYXJzZXIucHJvdG90eXBl Ll9iYXNlNjRNYXApIHsKICAgICAgICAgY29uc3QgYmFzZTY0RGlnaXRzID0gIkFCQ0RFRkdISUpL TE1OT1BRUlNUVVZXWFlaYWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXowMTIzNDU2Nzg5Ky8iOwpA QCAtMTczLDUzICsxODUsMTUgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZU1hcFBhcnNlciA9IGZ1bmN0 aW9uKHNvdXJjZU1hcHBpbmdVUkwsIHNjcmlwdFNvdXJjZU9yaWdpbikKICAgICAgICAgICAgIFdl Ykluc3BlY3Rvci5Tb3VyY2VNYXBQYXJzZXIucHJvdG90eXBlLl9iYXNlNjRNYXBbYmFzZTY0RGln aXRzLmNoYXJBdChpKV0gPSBpOwogICAgIH0KIAotICAgIHRoaXMuX3NvdXJjZU1hcHBpbmdVUkwg PSB0aGlzLl9jYW5vbmljYWxpemVVUkwoc291cmNlTWFwcGluZ1VSTCwgc2NyaXB0U291cmNlT3Jp Z2luKTsKKyAgICB0aGlzLl9zb3VyY2VNYXBwaW5nVVJMID0gc291cmNlTWFwcGluZ1VSTDsKICAg ICB0aGlzLl9tYXBwaW5ncyA9IFtdOwogICAgIHRoaXMuX3JldmVyc2VNYXBwaW5nc0J5U291cmNl VVJMID0ge307CiAgICAgdGhpcy5fc291cmNlQ29udGVudEJ5VVJMID0ge307CisgICAgdGhpcy5f cGFyc2VNYXBwaW5nUGF5bG9hZChwYXlsb2FkKTsKIH0KIAogV2ViSW5zcGVjdG9yLlNvdXJjZU1h cFBhcnNlci5wcm90b3R5cGUgPSB7CiAgICAgLyoqCi0gICAgICogQHJldHVybiB7Ym9vbGVhbn0K LSAgICAgKi8KLSAgICBsb2FkOiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICB0cnkgewotICAg ICAgICAgICAgLy8gRklYTUU6IG1ha2Ugc2VuZFJlcXVlc3QgYXN5bmMuCi0gICAgICAgICAgICB2 YXIgcmVzcG9uc2UgPSBJbnNwZWN0b3JGcm9udGVuZEhvc3QubG9hZFJlc291cmNlU3luY2hyb25v dXNseSh0aGlzLl9zb3VyY2VNYXBwaW5nVVJMKTsKLSAgICAgICAgICAgIGlmIChyZXNwb25zZS5z bGljZSgwLCAzKSA9PT0gIildfSIpCi0gICAgICAgICAgICAgICAgcmVzcG9uc2UgPSByZXNwb25z ZS5zdWJzdHJpbmcocmVzcG9uc2UuaW5kZXhPZignXG4nKSk7Ci0gICAgICAgICAgICB0aGlzLl9w YXJzZU1hcHBpbmdQYXlsb2FkKEpTT04ucGFyc2UocmVzcG9uc2UpKTsKLSAgICAgICAgICAgIHJl dHVybiB0cnVlCi0gICAgICAgIH0gY2F0Y2goZSkgewotICAgICAgICAgICAgY29uc29sZS5lcnJv cihlLm1lc3NhZ2UpOwotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICB9Ci0gICAg fSwKLQotICAgIC8qKgotICAgICAqIEBwYXJhbSB7bnVtYmVyfSBsaW5lTnVtYmVyCi0gICAgICog QHBhcmFtIHtudW1iZXJ9IGNvbHVtbk51bWJlcgotICAgICAqIEByZXR1cm4ge09iamVjdH0KLSAg ICAgKi8KLSAgICBjb21waWxlZExvY2F0aW9uVG9Tb3VyY2VMb2NhdGlvbjogZnVuY3Rpb24obGlu ZU51bWJlciwgY29sdW1uTnVtYmVyKQotICAgIHsKLSAgICAgICAgdmFyIG1hcHBpbmcgPSB0aGlz Ll9maW5kTWFwcGluZyhsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXIpOwotICAgICAgICByZXR1cm4g eyBzb3VyY2VVUkw6IG1hcHBpbmdbMl0sIGxpbmVOdW1iZXI6IG1hcHBpbmdbM10sIGNvbHVtbk51 bWJlcjogbWFwcGluZ1s0XSB9OwotICAgIH0sCi0KLSAgICBzb3VyY2VMb2NhdGlvblRvQ29tcGls ZWRMb2NhdGlvbjogZnVuY3Rpb24oc291cmNlVVJMLCBsaW5lTnVtYmVyKQotICAgIHsKLSAgICAg ICAgdmFyIG1hcHBpbmdzID0gdGhpcy5fcmV2ZXJzZU1hcHBpbmdzQnlTb3VyY2VVUkxbc291cmNl VVJMXTsKLSAgICAgICAgZm9yICggOyBsaW5lTnVtYmVyIDwgbWFwcGluZ3MubGVuZ3RoOyArK2xp bmVOdW1iZXIpIHsKLSAgICAgICAgICAgIHZhciBtYXBwaW5nID0gbWFwcGluZ3NbbGluZU51bWJl cl07Ci0gICAgICAgICAgICBpZiAobWFwcGluZykKLSAgICAgICAgICAgICAgICByZXR1cm4gW21h cHBpbmdbMF0sIG1hcHBpbmdbMV1dOwotICAgICAgICB9Ci0gICAgfSwKLQotICAgIC8qKgogICAg ICAqIEByZXR1cm4ge0FycmF5LjxzdHJpbmc+fQogICAgICAqLwogICAgIHNvdXJjZXM6IGZ1bmN0 aW9uKCkKQEAgLTIzMCwyNSArMjA0LDEyIEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VNYXBQYXJzZXIu cHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gc291cmNlczsKICAgICB9LAogCi0gICAgLyoq Ci0gICAgICogQHBhcmFtIHtzdHJpbmd9IHNvdXJjZVVSTAotICAgICAqIEByZXR1cm4ge3N0cmlu Z30KLSAgICAgKi8KLSAgICBsb2FkU291cmNlQ29kZTogZnVuY3Rpb24oc291cmNlVVJMKQorICAg IHNvdXJjZUNvbnRlbnQ6IGZ1bmN0aW9uKHNvdXJjZVVSTCkKICAgICB7Ci0gICAgICAgIGlmICh0 aGlzLl9zb3VyY2VDb250ZW50QnlVUkxbc291cmNlVVJMXSkKLSAgICAgICAgICAgIHJldHVybiB0 aGlzLl9zb3VyY2VDb250ZW50QnlVUkxbc291cmNlVVJMXTsKLQotICAgICAgICB0cnkgewotICAg ICAgICAgICAgLy8gRklYTUU6IG1ha2Ugc2VuZFJlcXVlc3QgYXN5bmMuCi0gICAgICAgICAgICBy ZXR1cm4gSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmxvYWRSZXNvdXJjZVN5bmNocm9ub3VzbHkoc291 cmNlVVJMKTsKLSAgICAgICAgfSBjYXRjaChlKSB7Ci0gICAgICAgICAgICBjb25zb2xlLmVycm9y KGUubWVzc2FnZSk7Ci0gICAgICAgICAgICByZXR1cm4gIiI7Ci0gICAgICAgIH0KKyAgICAgICAg cmV0dXJuIHRoaXMuX3NvdXJjZUNvbnRlbnRCeVVSTFtzb3VyY2VVUkxdOwogICAgIH0sCiAKLSAg ICBfZmluZE1hcHBpbmc6IGZ1bmN0aW9uKGxpbmVOdW1iZXIsIGNvbHVtbk51bWJlcikKKyAgICBm aW5kRW50cnk6IGZ1bmN0aW9uKGxpbmVOdW1iZXIsIGNvbHVtbk51bWJlcikKICAgICB7CiAgICAg ICAgIHZhciBmaXJzdCA9IDA7CiAgICAgICAgIHZhciBjb3VudCA9IHRoaXMuX21hcHBpbmdzLmxl bmd0aDsKQEAgLTI2Niw2ICsyMjcsMTcgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZU1hcFBhcnNlci5w cm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiB0aGlzLl9tYXBwaW5nc1tmaXJzdF07CiAgICAg fSwKIAorICAgIGZpbmRFbnRyeVJldmVyc2VkOiBmdW5jdGlvbihzb3VyY2VVUkwsIGxpbmVOdW1i ZXIpCisgICAgeworICAgICAgICB2YXIgbWFwcGluZ3MgPSB0aGlzLl9yZXZlcnNlTWFwcGluZ3NC eVNvdXJjZVVSTFtzb3VyY2VVUkxdOworICAgICAgICBmb3IgKCA7IGxpbmVOdW1iZXIgPCBtYXBw aW5ncy5sZW5ndGg7ICsrbGluZU51bWJlcikgeworICAgICAgICAgICAgdmFyIG1hcHBpbmcgPSBt YXBwaW5nc1tsaW5lTnVtYmVyXTsKKyAgICAgICAgICAgIGlmIChtYXBwaW5nKQorICAgICAgICAg ICAgICAgIHJldHVybiBtYXBwaW5nOworICAgICAgICB9CisgICAgICAgIHJldHVybiB0aGlzLl9t YXBwaW5nc1swXTsKKyAgICB9LAorCiAgICAgX3BhcnNlTWFwcGluZ1BheWxvYWQ6IGZ1bmN0aW9u KG1hcHBpbmdQYXlsb2FkKQogICAgIHsKICAgICAgICAgaWYgKG1hcHBpbmdQYXlsb2FkLnNlY3Rp b25zKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db250 ZW50UHJvdmlkZXJzLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db250 ZW50UHJvdmlkZXJzLmpzCmluZGV4IDlmMzczNmEzY2ZjNTkyM2M5N2QwMzU2M2M2ZDRhMGU5NGE0 NDdmY2YuLmI4Njk3MTY2ZDA4OWI3MjU1MzkxZGJhZjQ5OWE0MjUzYjExZWRiNjYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29udGVudFByb3ZpZGVycy5q cworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnRlbnRQcm92aWRl cnMuanMKQEAgLTI0MywxMSArMjQzLDEwIEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZUNvbnRlbnRQ cm92aWRlci5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLkNvbnRlbnRQCiAgKiBA Y29uc3RydWN0b3IKICAqIEBpbXBsZW1lbnRzIHtXZWJJbnNwZWN0b3IuQ29udGVudFByb3ZpZGVy fQogICovCi1XZWJJbnNwZWN0b3IuQ29tcGlsZXJTb3VyY2VNYXBwaW5nQ29udGVudFByb3ZpZGVy ID0gZnVuY3Rpb24oc291cmNlVVJMLCBjb21waWxlclNvdXJjZU1hcHBpbmcpCitXZWJJbnNwZWN0 b3IuQ29tcGlsZXJTb3VyY2VNYXBwaW5nQ29udGVudFByb3ZpZGVyID0gZnVuY3Rpb24oc291cmNl VVJMKQogewogICAgIHRoaXMuX21pbWVUeXBlID0gInRleHQvamF2YXNjcmlwdCI7CiAgICAgdGhp cy5fc291cmNlVVJMID0gc291cmNlVVJMOwotICAgIHRoaXMuX2NvbXBpbGVyU291cmNlTWFwcGlu ZyA9IGNvbXBpbGVyU291cmNlTWFwcGluZzsKIH0KIAogV2ViSW5zcGVjdG9yLkNvbXBpbGVyU291 cmNlTWFwcGluZ0NvbnRlbnRQcm92aWRlci5wcm90b3R5cGUgPSB7CkBAIC0yNTYsNyArMjU1LDEz IEBAIFdlYkluc3BlY3Rvci5Db21waWxlclNvdXJjZU1hcHBpbmdDb250ZW50UHJvdmlkZXIucHJv dG90eXBlID0gewogICAgICAqLwogICAgIHJlcXVlc3RDb250ZW50OiBmdW5jdGlvbihjYWxsYmFj aykKICAgICB7Ci0gICAgICAgIHZhciBzb3VyY2VDb2RlID0gdGhpcy5fY29tcGlsZXJTb3VyY2VN YXBwaW5nLmxvYWRTb3VyY2VDb2RlKHRoaXMuX3NvdXJjZVVSTCk7CisgICAgICAgIHZhciBzb3Vy Y2VDb2RlID0gIiI7CisgICAgICAgIHRyeSB7CisgICAgICAgICAgICAvLyBGSVhNRTogbWFrZSBz ZW5kUmVxdWVzdCBhc3luYy4KKyAgICAgICAgICAgIHNvdXJjZUNvZGUgPSBJbnNwZWN0b3JGcm9u dGVuZEhvc3QubG9hZFJlc291cmNlU3luY2hyb25vdXNseSh0aGlzLl9zb3VyY2VVUkwpOworICAg ICAgICB9IGNhdGNoKGUpIHsKKyAgICAgICAgICAgIGNvbnNvbGUuZXJyb3IoZS5tZXNzYWdlKTsK KyAgICAgICAgfQogICAgICAgICBjYWxsYmFjayh0aGlzLl9taW1lVHlwZSwgc291cmNlQ29kZSk7 CiAgICAgfSwKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCmluZGV4IGFlMDY5NmMyZWQwODhmZWU2NDRjYmU4MDViY2RhN2QwN2NjNTM2 NDYuLjlkY2M0MmZjYTFhZWEwNjA3YWY0NjJmM2QxNGY1NjE0YzI2ZjFmZDIgMTAwNjQ0Ci0tLSBh L0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMiBAQAorMjAxMi0wMy0yMiAgUGF2ZWwgUG9kaXZpbG92ICA8cG9kaXZpbG92QGNocm9t aXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBtb3ZlIHJlc291cmNlIGxvYWRpbmcg bG9naWMgZnJvbSBTb3VyY2VNYXBQYXJzZXIgdG8gQ29tcGlsZXJTY3JpcHRNYXBwaW5nLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODE4OTcKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGh0dHAvdGVzdHMv aW5zcGVjdG9yL2NvbXBpbGVyLXNjcmlwdC1tYXBwaW5nLmh0bWw6CisKIDIwMTItMDMtMjIgIEty aXN0w7NmIEtvc3p0ecOzICA8a2tyaXN0b2ZAaW5mLnUtc3plZ2VkLmh1PgogCiAgICAgICAgIFVu cmV2aWV3ZWQgZ2FyZGVuaW5nIGFmdGVyIHIxMTE1OTUuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9jb21waWxlci1zY3JpcHQtbWFwcGluZy5odG1sIGIvTGF5 b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvY29tcGlsZXItc2NyaXB0LW1hcHBpbmcuaHRt bAppbmRleCBiYjdjOTNkNTc0NjRiZTQ5M2EzN2E0MzBhZDQ4ZDIwMGUwMDlmNmVjLi5mYjU1NzQ4 ODUzMzk1N2ViOGM1YzVkMDYxYWFmYjdkYjU0OWMwZmQyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9jb21waWxlci1zY3JpcHQtbWFwcGluZy5odG1sCisrKyBi L0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2NvbXBpbGVyLXNjcmlwdC1tYXBwaW5n Lmh0bWwKQEAgLTksMTcgKzksMTcgQEAgZnVuY3Rpb24gdGVzdCgpCiB7CiAgICAgZnVuY3Rpb24g Y2hlY2tNYXBwaW5nKGNvbXBpbGVkTGluZU51bWJlciwgY29tcGlsZWRDb2x1bW5OdW1iZXIsIHNv dXJjZVVSTCwgc291cmNlTGluZU51bWJlciwgc291cmNlQ29sdW1uTnVtYmVyLCBtYXBwaW5nKQog ICAgIHsKLSAgICAgICAgdmFyIHNvdXJjZUxvY2F0aW9uID0gbWFwcGluZy5jb21waWxlZExvY2F0 aW9uVG9Tb3VyY2VMb2NhdGlvbihjb21waWxlZExpbmVOdW1iZXIsIGNvbXBpbGVkQ29sdW1uTnVt YmVyKTsKLSAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnRFcXVhbHMoc291cmNlVVJMLCBzb3Vy Y2VMb2NhdGlvbi5zb3VyY2VVUkwpOwotICAgICAgICBJbnNwZWN0b3JUZXN0LmFzc2VydEVxdWFs cyhzb3VyY2VMaW5lTnVtYmVyLCBzb3VyY2VMb2NhdGlvbi5saW5lTnVtYmVyKTsKLSAgICAgICAg SW5zcGVjdG9yVGVzdC5hc3NlcnRFcXVhbHMoc291cmNlQ29sdW1uTnVtYmVyLCBzb3VyY2VMb2Nh dGlvbi5jb2x1bW5OdW1iZXIpOworICAgICAgICB2YXIgZW50cnkgPSBtYXBwaW5nLmZpbmRFbnRy eShjb21waWxlZExpbmVOdW1iZXIsIGNvbXBpbGVkQ29sdW1uTnVtYmVyKTsKKyAgICAgICAgSW5z cGVjdG9yVGVzdC5hc3NlcnRFcXVhbHMoc291cmNlVVJMLCBlbnRyeVsyXSk7CisgICAgICAgIElu c3BlY3RvclRlc3QuYXNzZXJ0RXF1YWxzKHNvdXJjZUxpbmVOdW1iZXIsIGVudHJ5WzNdKTsKKyAg ICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnRFcXVhbHMoc291cmNlQ29sdW1uTnVtYmVyLCBlbnRy eVs0XSk7CiAgICAgfQogCiAgICAgZnVuY3Rpb24gY2hlY2tSZXZlcnNlTWFwcGluZyhjb21waWxl ZExpbmVOdW1iZXIsIGNvbXBpbGVkQ29sdW1uTnVtYmVyLCBzb3VyY2VVUkwsIHNvdXJjZUxpbmVO dW1iZXIsIG1hcHBpbmcpCiAgICAgewotICAgICAgICB2YXIgY29tcGlsZWRMb2NhdGlvbiA9IG1h cHBpbmcuc291cmNlTG9jYXRpb25Ub0NvbXBpbGVkTG9jYXRpb24oc291cmNlVVJMLCBzb3VyY2VM aW5lTnVtYmVyKTsKLSAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnRFcXVhbHMoY29tcGlsZWRM aW5lTnVtYmVyLCBjb21waWxlZExvY2F0aW9uWzBdKTsKLSAgICAgICAgSW5zcGVjdG9yVGVzdC5h c3NlcnRFcXVhbHMoY29tcGlsZWRDb2x1bW5OdW1iZXIsIGNvbXBpbGVkTG9jYXRpb25bMV0pOwor ICAgICAgICB2YXIgZW50cnkgPSBtYXBwaW5nLmZpbmRFbnRyeVJldmVyc2VkKHNvdXJjZVVSTCwg c291cmNlTGluZU51bWJlcik7CisgICAgICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0RXF1YWxzKGNv bXBpbGVkTGluZU51bWJlciwgZW50cnlbMF0pOworICAgICAgICBJbnNwZWN0b3JUZXN0LmFzc2Vy dEVxdWFscyhjb21waWxlZENvbHVtbk51bWJlciwgZW50cnlbMV0pOwogICAgIH0KIAogICAgIElu c3BlY3RvclRlc3QucnVuVGVzdFN1aXRlKFsKQEAgLTQ1LDggKzQ1LDcgQEAgZnVuY3Rpb24gdGVz dCgpCiAgICAgICAgICAgICAgICAgIm1hcHBpbmdzIjoiQUFBU0EsUUFBQUEsSUFBRyxDQUFDQyxD QUFELENBQWFDLENBQWIsQ0FDWixDQUNJLE1BQU9ELEVBQVAsQ0FBb0JDLENBRHhCLENBSUEsSUFB SUMsT0FBUzsiLAogICAgICAgICAgICAgICAgICJzb3VyY2VzIjpbImV4YW1wbGUuanMiXQogICAg ICAgICAgICAgfTsKLSAgICAgICAgICAgIHZhciBtYXBwaW5nID0gbmV3IFdlYkluc3BlY3Rvci5T b3VyY2VNYXBQYXJzZXIoKTsKLSAgICAgICAgICAgIG1hcHBpbmcuX3BhcnNlTWFwcGluZ1BheWxv YWQobWFwcGluZ1BheWxvYWQpOworICAgICAgICAgICAgdmFyIG1hcHBpbmcgPSBuZXcgV2ViSW5z cGVjdG9yLlNvdXJjZU1hcFBhcnNlcigic291cmNlLW1hcC5qc29uIiwgbWFwcGluZ1BheWxvYWQp OwogCiAgICAgICAgICAgICBjaGVja01hcHBpbmcoMCwgOSwgImV4YW1wbGUuanMiLCAwLCA5LCBt YXBwaW5nKTsKICAgICAgICAgICAgIGNoZWNrTWFwcGluZygwLCAxMywgImV4YW1wbGUuanMiLCAw LCAxMywgbWFwcGluZyk7CkBAIC02MCw3ICs1OSw2IEBAIGZ1bmN0aW9uIHRlc3QoKQogICAgICAg ICAgICAgY2hlY2tSZXZlcnNlTWFwcGluZygwLCAxOCwgImV4YW1wbGUuanMiLCAyLCBtYXBwaW5n KTsKICAgICAgICAgICAgIGNoZWNrUmV2ZXJzZU1hcHBpbmcoMCwgMjksICJleGFtcGxlLmpzIiwg NCwgbWFwcGluZyk7CiAgICAgICAgICAgICBjaGVja1JldmVyc2VNYXBwaW5nKDAsIDI5LCAiZXhh bXBsZS5qcyIsIDUsIG1hcHBpbmcpOwotICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnRU cnVlKCFtYXBwaW5nLnNvdXJjZUxvY2F0aW9uVG9Db21waWxlZExvY2F0aW9uKCJleGFtcGxlLmpz IiwgNikpOwogCiAgICAgICAgICAgICBuZXh0KCk7CiAgICAgICAgIH0sCkBAIC03MSw4ICs2OSw3 IEBAIGZ1bmN0aW9uIHRlc3QoKQogICAgICAgICAgICAgICAgICJtYXBwaW5ncyI6IkFBQUEsQyxD QUFFOyIsCiAgICAgICAgICAgICAgICAgInNvdXJjZXMiOlsiZXhhbXBsZS5qcyJdCiAgICAgICAg ICAgICB9OwotICAgICAgICAgICAgdmFyIG1hcHBpbmcgPSBuZXcgV2ViSW5zcGVjdG9yLlNvdXJj ZU1hcFBhcnNlcigpOwotICAgICAgICAgICAgbWFwcGluZy5fcGFyc2VNYXBwaW5nUGF5bG9hZCht YXBwaW5nUGF5bG9hZCk7CisgICAgICAgICAgICB2YXIgbWFwcGluZyA9IG5ldyBXZWJJbnNwZWN0 b3IuU291cmNlTWFwUGFyc2VyKCJzb3VyY2UtbWFwLmpzb24iLCBtYXBwaW5nUGF5bG9hZCk7CiAg ICAgICAgICAgICBjaGVja01hcHBpbmcoMCwgMCwgImV4YW1wbGUuanMiLCAwLCAwLCBtYXBwaW5n KTsKICAgICAgICAgICAgIGNoZWNrTWFwcGluZygwLCAyLCAiZXhhbXBsZS5qcyIsIDAsIDIsIG1h cHBpbmcpOwogICAgICAgICAgICAgbmV4dCgpOwpAQCAtODQsOCArODEsNyBAQCBmdW5jdGlvbiB0 ZXN0KCkKICAgICAgICAgICAgICAgICAibWFwcGluZ3MiOiJBQUFBOzs7Q0FDQSIsCiAgICAgICAg ICAgICAgICAgInNvdXJjZXMiOlsiZXhhbXBsZS5qcyJdCiAgICAgICAgICAgICB9OwotICAgICAg ICAgICAgdmFyIG1hcHBpbmcgPSBuZXcgV2ViSW5zcGVjdG9yLlNvdXJjZU1hcFBhcnNlcigpOwot ICAgICAgICAgICAgbWFwcGluZy5fcGFyc2VNYXBwaW5nUGF5bG9hZChtYXBwaW5nUGF5bG9hZCk7 CisgICAgICAgICAgICB2YXIgbWFwcGluZyA9IG5ldyBXZWJJbnNwZWN0b3IuU291cmNlTWFwUGFy c2VyKCJzb3VyY2UtbWFwLmpzb24iLCBtYXBwaW5nUGF5bG9hZCk7CiAgICAgICAgICAgICBjaGVj a01hcHBpbmcoMCwgMCwgImV4YW1wbGUuanMiLCAwLCAwLCBtYXBwaW5nKTsKICAgICAgICAgICAg IGNoZWNrUmV2ZXJzZU1hcHBpbmcoMywgMSwgImV4YW1wbGUuanMiLCAxLCBtYXBwaW5nKTsKICAg ICAgICAgICAgIG5leHQoKTsKQEAgLTEwOCw4ICsxMDQsNyBAQCBmdW5jdGlvbiB0ZXN0KCkKICAg ICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIF19Owot ICAgICAgICAgICAgdmFyIG1hcHBpbmcgPSBuZXcgV2ViSW5zcGVjdG9yLlNvdXJjZU1hcFBhcnNl cigpOwotICAgICAgICAgICAgbWFwcGluZy5fcGFyc2VNYXBwaW5nUGF5bG9hZChtYXBwaW5nUGF5 bG9hZCk7CisgICAgICAgICAgICB2YXIgbWFwcGluZyA9IG5ldyBXZWJJbnNwZWN0b3IuU291cmNl TWFwUGFyc2VyKCJzb3VyY2UtbWFwLmpzb24iLCBtYXBwaW5nUGF5bG9hZCk7CiAgICAgICAgICAg ICBJbnNwZWN0b3JUZXN0LmFzc2VydEVxdWFscygyLCBtYXBwaW5nLnNvdXJjZXMoKS5sZW5ndGgp OwogICAgICAgICAgICAgY2hlY2tNYXBwaW5nKDAsIDAsICJzb3VyY2UxLmpzIiwgMCwgMCwgbWFw cGluZyk7CiAgICAgICAgICAgICBjaGVja01hcHBpbmcoMCwgMSwgInNvdXJjZTEuanMiLCAyLCAx LCBtYXBwaW5nKTsK