Chromium Code Reviews| Index: src/messages.js |
| diff --git a/src/messages.js b/src/messages.js |
| index 859bc0d721cd84bd9ba5bdd86b011b06d59dff8b..f5dd5c09ec1b56c48bae7ead593acb4ac5d40f61 100644 |
| --- a/src/messages.js |
| +++ b/src/messages.js |
| @@ -555,44 +555,15 @@ function ScriptNameOrSourceURL() { |
| if (this.line_offset > 0 || this.column_offset > 0) { |
| return this.name; |
| } |
| - |
| - // The result is cached as on long scripts it takes noticable time to search |
| - // for the sourceURL. |
| - if (this.hasCachedNameOrSourceURL) { |
|
vsevik
2014/06/10 11:49:29
This should be done in a separate patch, otherwise
yurys
2014/06/10 11:55:28
The result seems unchanged why the tests would bre
|
| - return this.cachedNameOrSourceURL; |
| - } |
| - this.hasCachedNameOrSourceURL = true; |
| - |
| - // TODO(608): the spaces in a regexp below had to be escaped as \040 |
| - // because this file is being processed by js2c whose handling of spaces |
| - // in regexps is broken. Also, ['"] are excluded from allowed URLs to |
| - // avoid matches against sources that invoke evals with sourceURL. |
| - // A better solution would be to detect these special comments in |
| - // the scanner/parser. |
| - var source = ToString(this.source); |
| - var sourceUrlPos = %StringIndexOf(source, "sourceURL=", 0); |
| - this.cachedNameOrSourceURL = this.name; |
| - if (sourceUrlPos > 4) { |
| - var sourceUrlPattern = |
| - /\/\/[#@][\040\t]sourceURL=[\040\t]*([^\s\'\"]*)[\040\t]*$/gm; |
| - // Don't reuse lastMatchInfo here, so we create a new array with room |
| - // for four captures (array with length one longer than the index |
| - // of the fourth capture, where the numbering is zero-based). |
| - var matchInfo = new InternalArray(CAPTURE(3) + 1); |
| - var match = |
| - %_RegExpExec(sourceUrlPattern, source, sourceUrlPos - 4, matchInfo); |
| - if (match) { |
| - this.cachedNameOrSourceURL = |
| - %_SubString(source, matchInfo[CAPTURE(2)], matchInfo[CAPTURE(3)]); |
| - } |
| + if (this.source_url) { |
| + return this.source_url; |
| } |
| - return this.cachedNameOrSourceURL; |
| + return this.name; |
| } |
| SetUpLockedPrototype(Script, |
| - $Array("source", "name", "line_ends", "line_offset", "column_offset", |
| - "cachedNameOrSourceURL", "hasCachedNameOrSourceURL" ), |
| + $Array("source", "name", "source_url", "source_mapping_url", "line_ends", "line_offset", "column_offset"), |
| $Array( |
| "lineFromPosition", ScriptLineFromPosition, |
| "locationFromPosition", ScriptLocationFromPosition, |