Commit 9f6b1333 authored by kozyatinskiy's avatar kozyatinskiy Committed by Commit bot

[V8] Don't ignore sourceURL comment in inline scripts in .stack

In DevTools we've already used sourceURL in inline scripts.
This CL makes the behavior of the V8 in the same for Error.stack property and v8::StackTrace.

BUG=v8:3920
LOG=Y
R=yangguo@chromium.org

Review URL: https://codereview.chromium.org/1044173002

Cr-Commit-Position: refs/heads/master@{#27554}
parent 5b760434
...@@ -588,8 +588,8 @@ function ScriptLineCount() { ...@@ -588,8 +588,8 @@ function ScriptLineCount() {
/** /**
* If sourceURL comment is available and script starts at zero returns sourceURL * If sourceURL comment is available returns sourceURL comment contents.
* comment contents. Otherwise, script name is returned. See * Otherwise, script name is returned. See
* http://fbug.googlecode.com/svn/branches/firebug1.1/docs/ReleaseNotes_1.1.txt * http://fbug.googlecode.com/svn/branches/firebug1.1/docs/ReleaseNotes_1.1.txt
* and Source Map Revision 3 proposal for details on using //# sourceURL and * and Source Map Revision 3 proposal for details on using //# sourceURL and
* deprecated //@ sourceURL comment to identify scripts that don't have name. * deprecated //@ sourceURL comment to identify scripts that don't have name.
...@@ -598,12 +598,7 @@ function ScriptLineCount() { ...@@ -598,12 +598,7 @@ function ScriptLineCount() {
* deprecated //@ sourceURL comment otherwise. * deprecated //@ sourceURL comment otherwise.
*/ */
function ScriptNameOrSourceURL() { function ScriptNameOrSourceURL() {
if (this.line_offset > 0 || this.column_offset > 0) { if (this.source_url) return this.source_url;
return this.name;
}
if (this.source_url) {
return this.source_url;
}
return this.name; return this.name;
} }
......
...@@ -15818,7 +15818,7 @@ void AnalyzeStackOfInlineScriptWithSourceURL( ...@@ -15818,7 +15818,7 @@ void AnalyzeStackOfInlineScriptWithSourceURL(
v8::Handle<v8::StackTrace> stackTrace = v8::StackTrace::CurrentStackTrace( v8::Handle<v8::StackTrace> stackTrace = v8::StackTrace::CurrentStackTrace(
args.GetIsolate(), 10, v8::StackTrace::kDetailed); args.GetIsolate(), 10, v8::StackTrace::kDetailed);
CHECK_EQ(4, stackTrace->GetFrameCount()); CHECK_EQ(4, stackTrace->GetFrameCount());
v8::Handle<v8::String> url = v8_str("url"); v8::Handle<v8::String> url = v8_str("source_url");
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
v8::Handle<v8::String> name = v8::Handle<v8::String> name =
stackTrace->GetFrame(i)->GetScriptNameOrSourceURL(); stackTrace->GetFrame(i)->GetScriptNameOrSourceURL();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment