Read script ids for call stack frames from 'backtrace' response.

This change depends on v8 change http://codereview.chromium.org/65006/show
Review URL: http://codereview.chromium.org/65007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13430 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 1 deletions

diff --git a/webkit/glue/devtools/js/debugger_agent.js b/webkit/glue/devtools/js/debugger_agent.js
index fe9e72b..84ae57e 100644
--- a/webkit/glue/devtools/js/debugger_agent.js
+++ b/webkit/glue/devtools/js/debugger_agent.js
@@ -364,6 +364,13 @@ devtools.DebuggerAgent.prototype.handleBacktraceResponse_ = function(msg) {
  *     the format expected by ScriptsPanel and its panes.
  */
 devtools.DebuggerAgent.formatCallFrame_ = function(stackFrame, script, msg) {
+  var sourceId = script.id;

+  var func = msg.lookup(stackFrame.func.ref);

+  var funcScript = msg.lookup(func.script.ref);

+  if (funcScript && 'id' in funcScript) {

+    sourceId = funcScript.id;

+  }

+

   var funcName = devtools.DebuggerAgent.formatFunction_(stackFrame, msg);
   
   var scope = {};
@@ -379,7 +386,7 @@ devtools.DebuggerAgent.formatCallFrame_ = function(stackFrame, script, msg) {
   scope['this'] = devtools.DebuggerAgent.formatObject_(thisObject, msg);
   
   return {
-    'sourceID': script.id,
+    'sourceID': sourceId,
     'line': stackFrame.line - script.lineOffset +1,
     'type': 'function',
     'functionName': funcName, //stackFrame.text,