116290 2013-05-16 22:21:23 -0700 Web Inspector: Allow "//# sourceMappingURL" syntax alongside "//@" 2013-05-17 05:30:23 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck commit-queue graouts joepeck timothy oldest_to_newest 890209 0 joepeck 2013-05-16 22:21:23 -0700 Deprecating "//@" syntax in favor of "//#" syntax is actively being discussed on the dev-js-sourcemap mozilla mailing list, because of issues with JS conditional compilation IE: <https://groups.google.com/forum/?fromgroups=#!topic/mozilla.dev.js-sourcemap/4uo7Z5nTfUY> It made it into the Source Map Spec: <https://docs.google.com/document/d/1U1RGAehQwRypUTovF1KRlpiOFze0b-_2gc6fAH0KY0k/edit> > May 16, 2013 - John Lenz > Updated linking convention to use # instead of @. @ conflicts with internet explorer’s conditional code And a note about the previously deprecated syntax (which we should still support): > Note: The prefix for this annotation was initially “//@” however this conflicts with > Internet Explorer’s conditional comments and was changed to “//#”. It is reasonable > for tools to also accept “//@” but “//#” is preferred. 890210 1 joepeck 2013-05-16 22:22:39 -0700 <rdar://problem/13851470> 890215 2 202047 joepeck 2013-05-16 22:53:23 -0700 Created attachment 202047 [PATCH] Proposed Fix Support # or @ for sourceMappingURL and sourceURL. 890307 3 202047 commit-queue 2013-05-17 05:30:21 -0700 Comment on attachment 202047 [PATCH] Proposed Fix Clearing flags on attachment: 202047 Committed r150251: <http://trac.webkit.org/changeset/150251> 890308 4 commit-queue 2013-05-17 05:30:23 -0700 All reviewed patches have been landed. Closing bug. 202047 2013-05-16 22:53:23 -0700 2013-05-17 05:30:21 -0700 [PATCH] Proposed Fix sourceMappingPatch.patch text/plain 6787 joepeck ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA4ZjdhZmFlLi42OTc4YWY0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTMtMDUt MTYgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIg SW5zcGVjdG9yOiBBbGxvdyAiLy8jIHNvdXJjZU1hcHBpbmdVUkwiIHN5bnRheCBhbG9uZ3NpZGUg Ii8vQCIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEx NjI5MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog aHR0cC90ZXN0cy9pbnNwZWN0b3IvbmV0d29yay9yZXNvdXJjZXMvc291cmNlLW1hcC10ZXN0LXN0 eWxlLmNzczoKKyAgICAgICAgKiBodHRwL3Rlc3RzL2luc3BlY3Rvci9zdHlsZXNoZWV0LXNvdXJj ZS1tYXBwaW5nLmh0bWw6CisgICAgICAgICogaW5zcGVjdG9yL2RlYnVnZ2VyL3NvdXJjZS11cmwt Y29tbWVudC1leHBlY3RlZC50eHQ6CisgICAgICAgICogaW5zcGVjdG9yL2RlYnVnZ2VyL3NvdXJj ZS11cmwtY29tbWVudC5odG1sOgorCiAyMDEzLTA1LTE2ICBMYW1hcnF1ZSBWLiBTb3V6YSAgPExh bWFycXVlLlNvdXphQGJhc3lza29tLmNvbT4KIAogICAgICAgICBbV2ViU29ja2V0XSBVcGRhdGUg cHl3ZWJzb2NrZXQgdG8gcjc2MApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9p bnNwZWN0b3IvbmV0d29yay9yZXNvdXJjZXMvc291cmNlLW1hcC10ZXN0LXN0eWxlLmNzcyBiL0xh eW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL25ldHdvcmsvcmVzb3VyY2VzL3NvdXJjZS1t YXAtdGVzdC1zdHlsZS5jc3MKaW5kZXggNTgzMmRlMi4uOTZhYmE0NiAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvbmV0d29yay9yZXNvdXJjZXMvc291cmNlLW1h cC10ZXN0LXN0eWxlLmNzcworKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9u ZXR3b3JrL3Jlc291cmNlcy9zb3VyY2UtbWFwLXRlc3Qtc3R5bGUuY3NzCkBAIC0zLDQgKzMsNCBA QAogICAjY29udGFpbmVyICNpbnNwZWN0ZWQgewogICAgIGNvbG9yOiBncmVlbjsgfQogCi0vKkAg c291cmNlTWFwcGluZ1VSTD1zb3VyY2UtbWFwLXRlc3Qtc3R5bGUuY3NzLm1hcCAqLwpcIE5vIG5l d2xpbmUgYXQgZW5kIG9mIGZpbGUKKy8qIyBzb3VyY2VNYXBwaW5nVVJMPXNvdXJjZS1tYXAtdGVz dC1zdHlsZS5jc3MubWFwICovClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3Ivc3R5bGVzaGVldC1zb3VyY2UtbWFw cGluZy5odG1sIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3Ivc3R5bGVzaGVldC1z b3VyY2UtbWFwcGluZy5odG1sCmluZGV4IDBkYWE0MDMuLjYwNDQ0ZjIgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL3N0eWxlc2hlZXQtc291cmNlLW1hcHBpbmcu aHRtbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9zdHlsZXNoZWV0LXNv dXJjZS1tYXBwaW5nLmh0bWwKQEAgLTIxLDcgKzIxLDcgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAg ICAgICIgIGZvbzogYmFyO1xuIiArCiAgICAgICAgICIgIC8qIFNPTUUgQ09NTUVOVCAqL1xuIiAr CiAgICAgICAgICIgIGZvbnQtc2l6ZTogMTJweDsgfVxuXG4iICsKLSAgICAgICAgIi8qQCBzb3Vy Y2VNYXBwaW5nVVJMPWV4YW1wbGUuY3NzLm1hcCAqLyIpIH07CisgICAgICAgICIvKiMgc291cmNl TWFwcGluZ1VSTD1leGFtcGxlLmNzcy5tYXAgKi8iKSB9OwogICAgIHN0eWxlc1NvdXJjZU1hcHBp bmcuX3Jlc291cmNlQWRkZWQoZXZlbnQpOwogICAgIG1hcHBpbmcuX3Jlc291cmNlQWRkZWQoZXZl bnQpOwogICAgIGFmdGVyU3R5bGVTaGVldEFkZGVkKCk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9pbnNwZWN0b3IvZGVidWdnZXIvc291cmNlLXVybC1jb21tZW50LWV4cGVjdGVkLnR4dCBiL0xh eW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zb3VyY2UtdXJsLWNvbW1lbnQtZXhwZWN0ZWQu dHh0CmluZGV4IDdmODNhN2YuLjIxMDc0NjUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9kZWJ1Z2dlci9zb3VyY2UtdXJsLWNvbW1lbnQtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91 dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zb3VyY2UtdXJsLWNvbW1lbnQtZXhwZWN0ZWQudHh0 CkBAIC0xNSw1ICsxNSw5IEBAIGZ1bmN0aW9uIGtlZXBBbGl2ZUluRHluYW1pY1NjcmlwdCgpIHt9 CiBSdW5uaW5nOiB0ZXN0Tm9uUmVsYXRpdmVVUkwKIGZ1bmN0aW9uIHJlbGF0aXZlVVJMU2NyaXB0 KCkge30KIC8vQCBzb3VyY2VVUkw9L2pzL25vblJlbGF0aXZlVVJMLmpzCisKK1J1bm5pbmc6IHRl c3RIYXNoU3ludGF4CitmdW5jdGlvbiBoYXNoU3ludGF4KCkge30KKy8vIyBzb3VyY2VVUkw9aGFz aFN5bnRheC5qcwogRGVidWdnZXIgd2FzIGRpc2FibGVkLgogCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc291cmNlLXVybC1jb21tZW50Lmh0bWwgYi9MYXlvdXRU ZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc291cmNlLXVybC1jb21tZW50Lmh0bWwKaW5kZXggNzBi ZmNiMi4uNTFkZmMwNiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2Vy L3NvdXJjZS11cmwtY29tbWVudC5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1 Z2dlci9zb3VyY2UtdXJsLWNvbW1lbnQuaHRtbApAQCAtMTgsNiArMTgsMTEgQEAgZnVuY3Rpb24g ZG9FdmFsV2l0aE5vblJlbGF0aXZlVVJMKCkKICAgICBldmFsKCJmdW5jdGlvbiByZWxhdGl2ZVVS TFNjcmlwdCgpIHt9XG4vL0Agc291cmNlVVJMPS9qcy9ub25SZWxhdGl2ZVVSTC5qcyIpOwogfQog CitmdW5jdGlvbiBkb0V2YWxXaXRoSGFzaFN5bnRheCgpCit7CisgICAgZXZhbCgiZnVuY3Rpb24g aGFzaFN5bnRheCgpIHt9XG4vLyMgc291cmNlVVJMPWhhc2hTeW50YXguanMiKTsKK30KKwogZnVu Y3Rpb24gZG9EeW5hbWljU2NyaXB0KCkKIHsKICAgICB2YXIgc2NyaXB0RWxlbWVudCA9IGRvY3Vt ZW50LmNyZWF0ZUVsZW1lbnQoInNjcmlwdCIpOwpAQCAtMTEwLDYgKzExNSwyNCBAQCBmdW5jdGlv biB0ZXN0KCkKICAgICAgICAgICAgICAgICBmb3JFYWNoU2NyaXB0TWF0Y2hpbmdVUkwoIm5vblJl bGF0aXZlVVJMLmpzIiwgY2hlY2tTY3JpcHRIYXNTb3VyY2VVUkwpOwogICAgICAgICAgICAgICAg IG5leHQoKTsKICAgICAgICAgICAgIH0KKyAgICAgICAgfSwKKworICAgICAgICBmdW5jdGlvbiB0 ZXN0SGFzaFN5bnRheChuZXh0KQorICAgICAgICB7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0 LnNob3dTY3JpcHRTb3VyY2UoImhhc2hTeW50YXguanMiLCBkaWRTaG93U2NyaXB0U291cmNlKTsK KyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXZhbHVhdGVJblBhZ2UoInNldFRpbWVvdXQoZG9F dmFsV2l0aEhhc2hTeW50YXgsIDApIik7CisKKyAgICAgICAgICAgIGZ1bmN0aW9uIGRpZFNob3dT Y3JpcHRTb3VyY2Uoc291cmNlRnJhbWUpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAg ZnVuY3Rpb24gY2hlY2tTY3JpcHRIYXNTb3VyY2VVUkwoc2NyaXB0KQorICAgICAgICAgICAgICAg IHsKKyAgICAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnRUcnVlKHNjcmlwdC5o YXNTb3VyY2VVUkwsICJoYXNTb3VyY2VVUkwgZmxhZyBpcyBub3Qgc2V0IGZvciBldmFsIHdpdGgg YSBub24tcmVsYXRpdmUgVVJMIGluIGEgc291cmNlVVJMIGNvbW1lbnQiKTsKKyAgICAgICAgICAg ICAgICB9CisKKyAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdChzb3VyY2VG cmFtZS50ZXh0RWRpdG9yLnRleHQoKSk7CisgICAgICAgICAgICAgICAgZm9yRWFjaFNjcmlwdE1h dGNoaW5nVVJMKCJoYXNoU3ludGF4LmpzIiwgY2hlY2tTY3JpcHRIYXNTb3VyY2VVUkwpOworICAg ICAgICAgICAgICAgIG5leHQoKTsKKyAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIF0pOwog fTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZwppbmRleCAxMDJmMDIxLi4xNjQ0NGRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTggQEAKKzIwMTMtMDUtMTYgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4K KworICAgICAgICBXZWIgSW5zcGVjdG9yOiBBbGxvdyAiLy8jIHNvdXJjZU1hcHBpbmdVUkwiIHN5 bnRheCBhbG9uZ3NpZGUgIi8vQCIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTExNjI5MAorCisgICAgICAgIEZvbGxvdyBhbiB1cGRhdGUgdG8gdGhlIHNw ZWMgYW5kIHN1cHBvcnQgdGhlIG5ldyBhbmQgb2xkIHN5bnRheC4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9Db250ZW50U2VhcmNo VXRpbHMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudFNlYXJjaFV0aWxzOjpzY3JpcHRD b21tZW50UGF0dGVybik6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50U2VhcmNoVXRpbHM6OnN0 eWxlc2hlZXRDb21tZW50UGF0dGVybik6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9T QVNTU291cmNlTWFwcGluZy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TQVNTU291cmNlTWFw cGluZy5wcm90b3R5cGUuX2xvYWRBbmRQcm9jZXNzU291cmNlTWFwKToKKwogMjAxMy0wNS0xNiAg VGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBQREZQbHVn aW5zIGRvbid0IGxvYWQgd2hlbiBwbHVnaW5zIGFyZSBkaXNhYmxlZCwgYnV0IHRoZXkgc2hvdWxk CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvQ29udGVudFNlYXJjaFV0aWxz LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db250ZW50U2VhcmNoVXRpbHMuY3BwCmlu ZGV4IDJhMGVmZGQuLjk1MWRkZDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9Db250ZW50U2VhcmNoVXRpbHMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9D b250ZW50U2VhcmNoVXRpbHMuY3BwCkBAIC0xNzAsMTQgKzE3MCwxNCBAQCBQYXNzUmVmUHRyPFR5 cGVCdWlsZGVyOjpBcnJheTxUeXBlQnVpbGRlcjo6UGFnZTo6U2VhcmNoTWF0Y2g+ID4gc2VhcmNo SW5UZXh0QnlMaQogCiBzdGF0aWMgU3RyaW5nIHNjcmlwdENvbW1lbnRQYXR0ZXJuKGNvbnN0IFN0 cmluZyYgbmFtZSkKIHsKLSAgICAvLyAiLy9AIDxuYW1lPj08dmFsdWU+IgotICAgIHJldHVybiAi Ly9AW1wwNDBcdF0iICsgbmFtZSArICI9W1wwNDBcdF0qKFteXFxzXCdcIl0qKVtcMDQwXHRdKiQi OworICAgIC8vICIvLyMgPG5hbWU+PTx2YWx1ZT4iIGFuZCBkZXByZWNhdGVkICIvL0AiCisgICAg cmV0dXJuICIvL1sjQF1bXDA0MFx0XSIgKyBuYW1lICsgIj1bXDA0MFx0XSooW15cXHNcJ1wiXSop W1wwNDBcdF0qJCI7CiB9CiAKIHN0YXRpYyBTdHJpbmcgc3R5bGVzaGVldENvbW1lbnRQYXR0ZXJu KGNvbnN0IFN0cmluZyYgbmFtZSkKIHsKLSAgICAvLyAiLypAIDxuYW1lPj08dmFsdWU+ICovIgot ICAgIHJldHVybiAiL1xcKkBbXDA0MFx0XSIgKyBuYW1lICsgIj1bXDA0MFx0XSooW15cXHNcJ1wi XSopW1wwNDBcdF0qXFwqLyI7CisgICAgLy8gIi8qIyA8bmFtZT49PHZhbHVlPiAqLyIgYW5kIGRl cHJlY2F0ZWQgIi8qQCIKKyAgICByZXR1cm4gIi9cXCpbI0BdW1wwNDBcdF0iICsgbmFtZSArICI9 W1wwNDBcdF0qKFteXFxzXCdcIl0qKVtcMDQwXHRdKlxcKi8iOwogfQogCiBzdGF0aWMgU3RyaW5n IGZpbmRNYWdpY0NvbW1lbnQoY29uc3QgU3RyaW5nJiBjb250ZW50LCBjb25zdCBTdHJpbmcmIHBh dHRlcm5TdHJpbmcpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1NBU1NTb3VyY2VNYXBwaW5nLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9TQVNTU291cmNlTWFwcGluZy5qcwppbmRleCBkN2RhZWMyLi5jMGI3Njc4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NBU1NTb3VyY2VNYXBwaW5n LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU0FTU1NvdXJjZU1h cHBpbmcuanMKQEAgLTE2MSw3ICsxNjEsNyBAQCBXZWJJbnNwZWN0b3IuU0FTU1NvdXJjZU1hcHBp bmcucHJvdG90eXBlID0gewogICAgICAgICBpZiAoIWxpbmVzLmxlbmd0aCkKICAgICAgICAgICAg IHJldHVybjsKIAotICAgICAgICBjb25zdCBzb3VyY2VNYXBSZWdleCA9IC9eXC9cKkAgc291cmNl TWFwcGluZ1VSTD0oW15cc10rKVxzKlwqXC8kLzsKKyAgICAgICAgY29uc3Qgc291cmNlTWFwUmVn ZXggPSAvXlwvXCpbI0BdIHNvdXJjZU1hcHBpbmdVUkw9KFteXHNdKylccypcKlwvJC87CiAgICAg ICAgIHZhciBsYXN0TGluZSA9IGxpbmVzW2xpbmVzLmxlbmd0aCAtIDFdOwogICAgICAgICB2YXIg bWF0Y2ggPSBsYXN0TGluZS5tYXRjaChzb3VyY2VNYXBSZWdleCk7CiAgICAgICAgIGlmICghbWF0 Y2gpCg==