96088 2012-09-07 02:38:06 -0700 Web Inspector: support empty entries in source maps. 2012-09-10 07:50:33 -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 714323 0 podivilov 2012-09-07 02:38:06 -0700 Web Inspector: support empty entries in source maps. Empty entries should be mapped to the compiled script. 714324 1 162716 podivilov 2012-09-07 02:39:42 -0700 Created attachment 162716 Patch 714435 2 162716 vsevik 2012-09-07 05:49:40 -0700 Comment on attachment 162716 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=162716&action=review > Source/WebCore/inspector/front-end/CompilerScriptMapping.js:44 > + this._originalUISourceCodeForScriptId = {}; Can we reuse this._uiSourceCodeByURL ? > Source/WebCore/inspector/front-end/CompilerScriptMapping.js:87 > var result = []; uiSourceCodes() method is now used for tests only so I would get rid of it altogether. > LayoutTests/http/tests/inspector/compiler-script-mapping.html:142 > InspectorTest.checkUILocation(uiSourceCodeList[0], 4, 4, mapping.rawLocationToUILocation(WebInspector.debuggerModel.createRawLocation(script, 0, 81))); Shouldn't we do some checkUILocation/checkRawLocation for empty entries case? 716062 3 162716 podivilov 2012-09-10 07:36:12 -0700 Comment on attachment 162716 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=162716&action=review >> Source/WebCore/inspector/front-end/CompilerScriptMapping.js:44 >> + this._originalUISourceCodeForScriptId = {}; > > Can we reuse this._uiSourceCodeByURL ? That way inline and anonymous scripts won't be shown correctly. >> Source/WebCore/inspector/front-end/CompilerScriptMapping.js:87 >> var result = []; > > uiSourceCodes() method is now used for tests only so I would get rid of it altogether. done. >> LayoutTests/http/tests/inspector/compiler-script-mapping.html:142 >> InspectorTest.checkUILocation(uiSourceCodeList[0], 4, 4, mapping.rawLocationToUILocation(WebInspector.debuggerModel.createRawLocation(script, 0, 81))); > > Shouldn't we do some checkUILocation/checkRawLocation for empty entries case? Added a check for empty entry. 716067 4 podivilov 2012-09-10 07:50:33 -0700 Committed r128061: <http://trac.webkit.org/changeset/128061> 162716 2012-09-07 02:39:42 -0700 2012-09-10 07:36:12 -0700 Patch bug-96088-20120907133921.patch text/plain 10502 podivilov U3VidmVyc2lvbiBSZXZpc2lvbjogMTI3NDIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGE0MGQ1ZDNmYWM4Y2Rk M2Y1MjA3ODMyZjYwOTk4YWQyOWIzNzZmNS4uZTllZjdkZWYzNjEyNDAxZmNiMWQzOTE5NWM2NzI1 ZmZjZmE4NzIxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA5LTA3ICBQYXZl bCBQb2Rpdmlsb3YgIDxwb2Rpdmlsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IHN1cHBvcnQgZW1wdHkgZW50cmllcyBpbiBzb3VyY2UgbWFwcy4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk2MDg4CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRW1wdHkgZW50cmllcyBzaG91bGQg YmUgbWFwcGVkIHRvIHRoZSBjb21waWxlZCBzY3JpcHQuCisKKyAgICAgICAgKiBpbnNwZWN0b3Iv ZnJvbnQtZW5kL0NvbXBpbGVyU2NyaXB0TWFwcGluZy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5Db21waWxlclNjcmlwdE1hcHBpbmcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbXBpbGVy U2NyaXB0TWFwcGluZy5wcm90b3R5cGUucmF3TG9jYXRpb25Ub1VJTG9jYXRpb24pOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkNvbXBpbGVyU2NyaXB0TWFwcGluZy5wcm90b3R5cGUuZ2V0IHVpU291 cmNlQ29kZXMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbXBpbGVyU2NyaXB0TWFwcGluZy5w cm90b3R5cGUuX3Jlc2V0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VNYXBQYXJzZXIu cHJvdG90eXBlLl9wYXJzZU1hcCk6CisKIDIwMTItMDktMDMgIEFsZXhhbmRlciBQYXZsb3YgIDxh cGF2bG92QGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBVbmhpZGUgaGlk ZGVuIGNoYXJhY3RlcnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvQ29tcGlsZXJTY3JpcHRNYXBwaW5nLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Db21waWxlclNjcmlwdE1hcHBpbmcuanMKaW5kZXggODA5NmQ1NjJhYTBmZjkw ODFiNjI0YjAxNjViOTE0ZWZlYjFiN2VmNC4uOGZmODUwMWI0MDEwNmNmYjU2Mzc0ZDBhZmY3NDVh MTNkZGFjMDk1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9Db21waWxlclNjcmlwdE1hcHBpbmcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Db21waWxlclNjcmlwdE1hcHBpbmcuanMKQEAgLTQxLDYgKzQxLDggQEAgV2Vi SW5zcGVjdG9yLkNvbXBpbGVyU2NyaXB0TWFwcGluZyA9IGZ1bmN0aW9uKHdvcmtzcGFjZSkKICAg ICB0aGlzLl9zY3JpcHRGb3JTb3VyY2VNYXAgPSBuZXcgTWFwKCk7CiAgICAgdGhpcy5fc291cmNl TWFwRm9yVUlTb3VyY2VDb2RlID0gbmV3IE1hcCgpOwogICAgIHRoaXMuX3VpU291cmNlQ29kZUJ5 VVJMID0ge307CisgICAgdGhpcy5fb3JpZ2luYWxVSVNvdXJjZUNvZGVGb3JTY3JpcHRJZCA9IHt9 OworICAgIHRoaXMuX3NjcmlwdEZvck9yaWdpbmFsVUlTb3VyY2UgPSBuZXcgTWFwKCk7CiAgICAg dGhpcy5fd29ya3NwYWNlLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLldvcmtzcGFjZS5F dmVudHMuUHJvamVjdFdpbGxSZXNldCwgdGhpcy5fcmVzZXQsIHRoaXMpOwogfQogCkBAIC01Myw3 ICs1NSwxMSBAQCBXZWJJbnNwZWN0b3IuQ29tcGlsZXJTY3JpcHRNYXBwaW5nLnByb3RvdHlwZSA9 IHsKICAgICB7CiAgICAgICAgIHZhciBkZWJ1Z2dlck1vZGVsTG9jYXRpb24gPSAvKiogQHR5cGUg e1dlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLkxvY2F0aW9ufSAqLyByYXdMb2NhdGlvbjsKICAg ICAgICAgdmFyIHNvdXJjZU1hcCA9IHRoaXMuX3NvdXJjZU1hcEZvclNjcmlwdElkW2RlYnVnZ2Vy TW9kZWxMb2NhdGlvbi5zY3JpcHRJZF07Ci0gICAgICAgIHZhciBlbnRyeSA9IHNvdXJjZU1hcC5m aW5kRW50cnkoZGVidWdnZXJNb2RlbExvY2F0aW9uLmxpbmVOdW1iZXIsIGRlYnVnZ2VyTW9kZWxM b2NhdGlvbi5jb2x1bW5OdW1iZXIgfHwgMCk7CisgICAgICAgIHZhciBsaW5lTnVtYmVyID0gZGVi dWdnZXJNb2RlbExvY2F0aW9uLmxpbmVOdW1iZXI7CisgICAgICAgIHZhciBjb2x1bW5OdW1iZXIg PSBkZWJ1Z2dlck1vZGVsTG9jYXRpb24uY29sdW1uTnVtYmVyIHx8IDA7CisgICAgICAgIHZhciBl bnRyeSA9IHNvdXJjZU1hcC5maW5kRW50cnkobGluZU51bWJlciwgY29sdW1uTnVtYmVyKTsKKyAg ICAgICAgaWYgKGVudHJ5Lmxlbmd0aCA9PT0gMikKKyAgICAgICAgICAgIHJldHVybiBuZXcgV2Vi SW5zcGVjdG9yLlVJTG9jYXRpb24odGhpcy5fb3JpZ2luYWxVSVNvdXJjZUNvZGVGb3JTY3JpcHRJ ZFtkZWJ1Z2dlck1vZGVsTG9jYXRpb24uc2NyaXB0SWRdLCBsaW5lTnVtYmVyLCBjb2x1bW5OdW1i ZXIpOwogICAgICAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5VSUxvY2F0aW9uKHRoaXMuX3Vp U291cmNlQ29kZUJ5VVJMW2VudHJ5WzJdXSwgZW50cnlbM10sIGVudHJ5WzRdKTsKICAgICB9LAog CkBAIC02NSw2ICs3MSw5IEBAIFdlYkluc3BlY3Rvci5Db21waWxlclNjcmlwdE1hcHBpbmcucHJv dG90eXBlID0gewogICAgICAqLwogICAgIHVpTG9jYXRpb25Ub1Jhd0xvY2F0aW9uOiBmdW5jdGlv bih1aVNvdXJjZUNvZGUsIGxpbmVOdW1iZXIsIGNvbHVtbk51bWJlcikKICAgICB7CisgICAgICAg IHZhciBzY3JpcHQgPSB0aGlzLl9zY3JpcHRGb3JPcmlnaW5hbFVJU291cmNlLmdldCh1aVNvdXJj ZUNvZGUpOworICAgICAgICBpZiAoc2NyaXB0KQorICAgICAgICAgICAgcmV0dXJuIFdlYkluc3Bl Y3Rvci5kZWJ1Z2dlck1vZGVsLmNyZWF0ZVJhd0xvY2F0aW9uKHNjcmlwdCwgbGluZU51bWJlciwg Y29sdW1uTnVtYmVyKTsKICAgICAgICAgdmFyIHNvdXJjZU1hcCA9IHRoaXMuX3NvdXJjZU1hcEZv clVJU291cmNlQ29kZS5nZXQodWlTb3VyY2VDb2RlKTsKICAgICAgICAgdmFyIGVudHJ5ID0gc291 cmNlTWFwLmZpbmRFbnRyeVJldmVyc2VkKHVpU291cmNlQ29kZS51cmwsIGxpbmVOdW1iZXIpOwog ICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwuY3JlYXRlUmF3TG9jYXRp b24odGhpcy5fc2NyaXB0Rm9yU291cmNlTWFwLmdldChzb3VyY2VNYXApLCBlbnRyeVswXSwgZW50 cnlbMV0pOwpAQCAtNzgsMTkgKzg3LDggQEAgV2ViSW5zcGVjdG9yLkNvbXBpbGVyU2NyaXB0TWFw cGluZy5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciByZXN1bHQgPSBbXTsKICAgICAgICAgZm9y ICh2YXIgdXJsIGluIHRoaXMuX3VpU291cmNlQ29kZUJ5VVJMKQogICAgICAgICAgICAgcmVzdWx0 LnB1c2godGhpcy5fdWlTb3VyY2VDb2RlQnlVUkxbdXJsXSk7Ci0gICAgICAgIHJldHVybiByZXN1 bHQ7Ci0gICAgfSwKLSAgICAKLSAgICAvKioKLSAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5T b3VyY2VNYXBQYXJzZXJ9IHNvdXJjZU1hcAotICAgICAqIEByZXR1cm4ge0FycmF5LjxXZWJJbnNw ZWN0b3IuVUlTb3VyY2VDb2RlPn0KLSAgICAgKi8KLSAgICBfdWlTb3VyY2VDb2Rlc0ZvclNvdXJj ZU1hcDogZnVuY3Rpb24oc291cmNlTWFwKQotICAgIHsKLSAgICAgICAgdmFyIHJlc3VsdCA9IFtd Ci0gICAgICAgIHZhciBzb3VyY2VVUkxzID0gc291cmNlTWFwLnNvdXJjZXMoKTsKLSAgICAgICAg Zm9yICh2YXIgaSA9IDA7IGkgPCBzb3VyY2VVUkxzLmxlbmd0aDsgKytpKQotICAgICAgICAgICAg cmVzdWx0LnB1c2godGhpcy5fdWlTb3VyY2VDb2RlQnlVUkxbc291cmNlVVJMc1tpXV0pOworICAg ICAgICBmb3IgKHZhciBzY3JpcHRJZCBpbiB0aGlzLl9vcmlnaW5hbFVJU291cmNlQ29kZUZvclNj cmlwdElkKQorICAgICAgICAgICAgcmVzdWx0LnB1c2godGhpcy5fb3JpZ2luYWxVSVNvdXJjZUNv ZGVGb3JTY3JpcHRJZFtzY3JpcHRJZF0pOwogICAgICAgICByZXR1cm4gcmVzdWx0OwogICAgIH0s CiAKQEAgLTk5LDExICs5NywxNSBAQCBXZWJJbnNwZWN0b3IuQ29tcGlsZXJTY3JpcHRNYXBwaW5n LnByb3RvdHlwZSA9IHsKICAgICAgKi8KICAgICBhZGRTY3JpcHQ6IGZ1bmN0aW9uKHNjcmlwdCkK ICAgICB7CisgICAgICAgIHZhciBvcmlnaW5hbFVJU291cmNlQ29kZSA9IG5ldyBXZWJJbnNwZWN0 b3IuSmF2YVNjcmlwdFNvdXJjZShzY3JpcHQuc291cmNlVVJMLCBudWxsLCBzY3JpcHQsIHRoaXMs IHRydWUpOworICAgICAgICB0aGlzLl9vcmlnaW5hbFVJU291cmNlQ29kZUZvclNjcmlwdElkW3Nj cmlwdC5zY3JpcHRJZF0gPSBvcmlnaW5hbFVJU291cmNlQ29kZTsKKyAgICAgICAgdGhpcy5fc2Ny aXB0Rm9yT3JpZ2luYWxVSVNvdXJjZS5wdXQob3JpZ2luYWxVSVNvdXJjZUNvZGUsIHNjcmlwdCk7 CisgICAgICAgIHRoaXMuX3dvcmtzcGFjZS5wcm9qZWN0KCkuYWRkVUlTb3VyY2VDb2RlKG9yaWdp bmFsVUlTb3VyY2VDb2RlKTsKKwogICAgICAgICB2YXIgc291cmNlTWFwID0gdGhpcy5sb2FkU291 cmNlTWFwRm9yU2NyaXB0KHNjcmlwdCk7CiAKICAgICAgICAgaWYgKHRoaXMuX3NjcmlwdEZvclNv dXJjZU1hcC5nZXQoc291cmNlTWFwKSkgewogICAgICAgICAgICAgdGhpcy5fc291cmNlTWFwRm9y U2NyaXB0SWRbc2NyaXB0LnNjcmlwdElkXSA9IHNvdXJjZU1hcDsKLSAgICAgICAgICAgIHZhciB1 aVNvdXJjZUNvZGVzID0gdGhpcy5fdWlTb3VyY2VDb2Rlc0ZvclNvdXJjZU1hcChzb3VyY2VNYXAp OwogICAgICAgICAgICAgc2NyaXB0LnNldFNvdXJjZU1hcHBpbmcodGhpcyk7CiAgICAgICAgICAg ICByZXR1cm47CiAgICAgICAgIH0KQEAgLTE2OCw2ICsxNzAsOCBAQCBXZWJJbnNwZWN0b3IuQ29t cGlsZXJTY3JpcHRNYXBwaW5nLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fc2NyaXB0Rm9y U291cmNlTWFwID0gbmV3IE1hcCgpOwogICAgICAgICB0aGlzLl9zb3VyY2VNYXBGb3JVSVNvdXJj ZUNvZGUgPSBuZXcgTWFwKCk7CiAgICAgICAgIHRoaXMuX3VpU291cmNlQ29kZUJ5VVJMID0ge307 CisgICAgICAgIHRoaXMuX29yaWdpbmFsVUlTb3VyY2VDb2RlRm9yU2NyaXB0SWQgPSB7fTsKKyAg ICAgICAgdGhpcy5fc2NyaXB0Rm9yT3JpZ2luYWxVSVNvdXJjZSA9IG5ldyBNYXAoKTsKICAgICB9 CiB9CiAKQEAgLTMxMywyMiArMzE3LDI1IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VNYXBQYXJzZXIu cHJvdG90eXBlID0gewogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICBjb2x1bW5OdW1iZXIg Kz0gdGhpcy5fZGVjb2RlVkxRKHN0cmluZ0NoYXJJdGVyYXRvcik7Ci0gICAgICAgICAgICBpZiAo IXRoaXMuX2lzU2VwYXJhdG9yKHN0cmluZ0NoYXJJdGVyYXRvci5wZWVrKCkpKSB7Ci0gICAgICAg ICAgICAgICAgdmFyIHNvdXJjZUluZGV4RGVsdGEgPSB0aGlzLl9kZWNvZGVWTFEoc3RyaW5nQ2hh ckl0ZXJhdG9yKTsKLSAgICAgICAgICAgICAgICBpZiAoc291cmNlSW5kZXhEZWx0YSkgewotICAg ICAgICAgICAgICAgICAgICBzb3VyY2VJbmRleCArPSBzb3VyY2VJbmRleERlbHRhOwotICAgICAg ICAgICAgICAgICAgICBzb3VyY2VVUkwgPSBzb3VyY2VzW3NvdXJjZUluZGV4XTsKLSAgICAgICAg ICAgICAgICAgICAgcmV2ZXJzZU1hcHBpbmdzID0gdGhpcy5fcmV2ZXJzZU1hcHBpbmdzQnlTb3Vy Y2VVUkxbc291cmNlVVJMXTsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgc291 cmNlTGluZU51bWJlciArPSB0aGlzLl9kZWNvZGVWTFEoc3RyaW5nQ2hhckl0ZXJhdG9yKTsKLSAg ICAgICAgICAgICAgICBzb3VyY2VDb2x1bW5OdW1iZXIgKz0gdGhpcy5fZGVjb2RlVkxRKHN0cmlu Z0NoYXJJdGVyYXRvcik7Ci0gICAgICAgICAgICAgICAgaWYgKCF0aGlzLl9pc1NlcGFyYXRvcihz dHJpbmdDaGFySXRlcmF0b3IucGVlaygpKSkKLSAgICAgICAgICAgICAgICAgICAgbmFtZUluZGV4 ICs9IHRoaXMuX2RlY29kZVZMUShzdHJpbmdDaGFySXRlcmF0b3IpOwotCi0gICAgICAgICAgICAg ICAgdGhpcy5fbWFwcGluZ3MucHVzaChbbGluZU51bWJlciwgY29sdW1uTnVtYmVyLCBzb3VyY2VV UkwsIHNvdXJjZUxpbmVOdW1iZXIsIHNvdXJjZUNvbHVtbk51bWJlcl0pOwotICAgICAgICAgICAg ICAgIGlmICghcmV2ZXJzZU1hcHBpbmdzW3NvdXJjZUxpbmVOdW1iZXJdKQotICAgICAgICAgICAg ICAgICAgICByZXZlcnNlTWFwcGluZ3Nbc291cmNlTGluZU51bWJlcl0gPSBbbGluZU51bWJlciwg Y29sdW1uTnVtYmVyXTsKKyAgICAgICAgICAgIGlmICh0aGlzLl9pc1NlcGFyYXRvcihzdHJpbmdD aGFySXRlcmF0b3IucGVlaygpKSkgeworICAgICAgICAgICAgICAgIHRoaXMuX21hcHBpbmdzLnB1 c2goW2xpbmVOdW1iZXIsIGNvbHVtbk51bWJlcl0pOworICAgICAgICAgICAgICAgIGNvbnRpbnVl OworICAgICAgICAgICAgfQorCisgICAgICAgICAgICB2YXIgc291cmNlSW5kZXhEZWx0YSA9IHRo aXMuX2RlY29kZVZMUShzdHJpbmdDaGFySXRlcmF0b3IpOworICAgICAgICAgICAgaWYgKHNvdXJj ZUluZGV4RGVsdGEpIHsKKyAgICAgICAgICAgICAgICBzb3VyY2VJbmRleCArPSBzb3VyY2VJbmRl eERlbHRhOworICAgICAgICAgICAgICAgIHNvdXJjZVVSTCA9IHNvdXJjZXNbc291cmNlSW5kZXhd OworICAgICAgICAgICAgICAgIHJldmVyc2VNYXBwaW5ncyA9IHRoaXMuX3JldmVyc2VNYXBwaW5n c0J5U291cmNlVVJMW3NvdXJjZVVSTF07CiAgICAgICAgICAgICB9CisgICAgICAgICAgICBzb3Vy Y2VMaW5lTnVtYmVyICs9IHRoaXMuX2RlY29kZVZMUShzdHJpbmdDaGFySXRlcmF0b3IpOworICAg ICAgICAgICAgc291cmNlQ29sdW1uTnVtYmVyICs9IHRoaXMuX2RlY29kZVZMUShzdHJpbmdDaGFy SXRlcmF0b3IpOworICAgICAgICAgICAgaWYgKCF0aGlzLl9pc1NlcGFyYXRvcihzdHJpbmdDaGFy SXRlcmF0b3IucGVlaygpKSkKKyAgICAgICAgICAgICAgICBuYW1lSW5kZXggKz0gdGhpcy5fZGVj b2RlVkxRKHN0cmluZ0NoYXJJdGVyYXRvcik7CisKKyAgICAgICAgICAgIHRoaXMuX21hcHBpbmdz LnB1c2goW2xpbmVOdW1iZXIsIGNvbHVtbk51bWJlciwgc291cmNlVVJMLCBzb3VyY2VMaW5lTnVt YmVyLCBzb3VyY2VDb2x1bW5OdW1iZXJdKTsKKyAgICAgICAgICAgIGlmICghcmV2ZXJzZU1hcHBp bmdzW3NvdXJjZUxpbmVOdW1iZXJdKQorICAgICAgICAgICAgICAgIHJldmVyc2VNYXBwaW5nc1tz b3VyY2VMaW5lTnVtYmVyXSA9IFtsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXJdOwogICAgICAgICB9 CiAgICAgfSwKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCmluZGV4IGFhYjY5N2ZiYzkzNWQzM2E2ZTExNWY1ZjZjZTM4YTI1M2VmYmY5 YjIuLmRjODlhNjlkNTA1NjQ5NzcwODM1M2NiYjU3NzVkYWNjYThlNDlkNGYgMTAwNjQ0Ci0tLSBh L0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNCBAQAorMjAxMi0wOS0wNyAgUGF2ZWwgUG9kaXZpbG92ICA8cG9kaXZpbG92QGNocm9t aXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBzdXBwb3J0IGVtcHR5IGVudHJpZXMg aW4gc291cmNlIG1hcHMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD05NjA4OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEVtcHR5IGVudHJpZXMgc2hvdWxkIGJlIG1hcHBlZCB0byB0aGUgY29tcGlsZWQgc2Ny aXB0LgorCisgICAgICAgICogaHR0cC90ZXN0cy9pbnNwZWN0b3IvY29tcGlsZXItc2NyaXB0LW1h cHBpbmcuaHRtbDoKKwogMjAxMi0wOS0wMyAgQWxleGFuZGVyIFBhdmxvdiAgPGFwYXZsb3ZAY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFVuaGlkZSBoaWRkZW4gY2hhcmFj dGVycwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvY29tcGls ZXItc2NyaXB0LW1hcHBpbmcuaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9y L2NvbXBpbGVyLXNjcmlwdC1tYXBwaW5nLmh0bWwKaW5kZXggM2I3MmZkMmJkNGJkZGZjMjNlYmNh YmJkMjY3OTEwOTUzOGZhMWRlYi4uMjdiMzBkMWI0YTgxYTQyMmQwN2I4ODE0OTJlN2Q5YjZhODQ2 NzY1ZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvY29tcGls ZXItc2NyaXB0LW1hcHBpbmcuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3Bl Y3Rvci9jb21waWxlci1zY3JpcHQtbWFwcGluZy5odG1sCkBAIC03MSw2ICs3MSw4IEBAIGZ1bmN0 aW9uIHRlc3QoKQogICAgICAgICAgICAgfTsKICAgICAgICAgICAgIHZhciBtYXBwaW5nID0gbmV3 IFdlYkluc3BlY3Rvci5Tb3VyY2VNYXBQYXJzZXIoInNvdXJjZS1tYXAuanNvbiIsIG1hcHBpbmdQ YXlsb2FkKTsKICAgICAgICAgICAgIGNoZWNrTWFwcGluZygwLCAwLCAiZXhhbXBsZS5qcyIsIDAs IDAsIG1hcHBpbmcpOworICAgICAgICAgICAgdmFyIGVudHJ5ID0gbWFwcGluZy5maW5kRW50cnko MCwgMSk7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFzc2VydEVxdWFscygyLCBlbnRyeS5s ZW5ndGgpOwogICAgICAgICAgICAgY2hlY2tNYXBwaW5nKDAsIDIsICJleGFtcGxlLmpzIiwgMCwg MiwgbWFwcGluZyk7CiAgICAgICAgICAgICBuZXh0KCk7CiAgICAgICAgIH0sCkBAIC0xMzIsOSAr MTM0LDEwIEBAIGZ1bmN0aW9uIHRlc3QoKQogICAgICAgICAgICAgbWFwcGluZy5hZGRTY3JpcHQo c2NyaXB0KTsKIAogICAgICAgICAgICAgdmFyIHVpU291cmNlQ29kZUxpc3QgPSBtYXBwaW5nLnVp U291cmNlQ29kZXMoKTsKLSAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0RXF1YWxzKDIs IHVpU291cmNlQ29kZUxpc3QubGVuZ3RoKTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYXNz ZXJ0RXF1YWxzKDMsIHVpU291cmNlQ29kZUxpc3QubGVuZ3RoKTsKICAgICAgICAgICAgIEluc3Bl Y3RvclRlc3QuYXNzZXJ0RXF1YWxzKCJodHRwOi8vbG9jYWxob3N0OjgwMDAvaW5zcGVjdG9yL3Jl c291cmNlcy9zb3VyY2UxLmpzIiwgdWlTb3VyY2VDb2RlTGlzdFswXS51cmwpOwogICAgICAgICAg ICAgSW5zcGVjdG9yVGVzdC5hc3NlcnRFcXVhbHMoImh0dHA6Ly9sb2NhbGhvc3Q6ODAwMC9pbnNw ZWN0b3IvcmVzb3VyY2VzL3NvdXJjZTIuanMiLCB1aVNvdXJjZUNvZGVMaXN0WzFdLnVybCk7Cisg ICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFzc2VydEVxdWFscygiY29tcGlsZWQuanMiLCB1aVNv dXJjZUNvZGVMaXN0WzJdLnVybCk7CiAKICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuY2hlY2tV SUxvY2F0aW9uKHVpU291cmNlQ29kZUxpc3RbMF0sIDQsIDQsIG1hcHBpbmcucmF3TG9jYXRpb25U b1VJTG9jYXRpb24oV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwuY3JlYXRlUmF3TG9jYXRpb24o c2NyaXB0LCAwLCA4MSkpKTsKICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuY2hlY2tVSUxvY2F0 aW9uKHVpU291cmNlQ29kZUxpc3RbMF0sIDUsIDQsIG1hcHBpbmcucmF3TG9jYXRpb25Ub1VJTG9j YXRpb24oV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwuY3JlYXRlUmF3TG9jYXRpb24oc2NyaXB0 LCAwLCA5MykpKTsKQEAgLTE3NSw4ICsxNzgsOSBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAg ICAgIG1hcHBpbmcuYWRkU2NyaXB0KHNjcmlwdCk7CiAKICAgICAgICAgICAgIHZhciB1aVNvdXJj ZUNvZGVMaXN0ID0gbWFwcGluZy51aVNvdXJjZUNvZGVzKCk7Ci0gICAgICAgICAgICBJbnNwZWN0 b3JUZXN0LmFzc2VydEVxdWFscygxLCB1aVNvdXJjZUNvZGVMaXN0Lmxlbmd0aCk7CisgICAgICAg ICAgICBJbnNwZWN0b3JUZXN0LmFzc2VydEVxdWFscygyLCB1aVNvdXJjZUNvZGVMaXN0Lmxlbmd0 aCk7CiAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFzc2VydEVxdWFscygic291cmNlLmpzIiwg dWlTb3VyY2VDb2RlTGlzdFswXS51cmwpOworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3Nl cnRFcXVhbHMoImh0dHA6Ly9leGFtcGxlLmNvbS9jb21waWxlZC5qcyIsIHVpU291cmNlQ29kZUxp c3RbMV0udXJsKTsKIAogICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5jaGVja1VJTG9jYXRpb24o dWlTb3VyY2VDb2RlTGlzdFswXSwgMiwgNCwgbWFwcGluZy5yYXdMb2NhdGlvblRvVUlMb2NhdGlv bihXZWJJbnNwZWN0b3IuZGVidWdnZXJNb2RlbC5jcmVhdGVSYXdMb2NhdGlvbihzY3JpcHQsIDAs IDE4KSkpOwogICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5jaGVja1Jhd0xvY2F0aW9uKHNjcmlw dCwgMCwgMTgsIG1hcHBpbmcudWlMb2NhdGlvblRvUmF3TG9jYXRpb24odWlTb3VyY2VDb2RlTGlz dFswXSwgMiwgNCkpOwo=