[DevTools] Wrap call frame with its injected script instead top injected script

third_party/WebKit/Source/platform/v8_inspector/DebuggerScript.js

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 121 matching lines @@
     if (mirror.isSet() || mirror.isIterator()) {
         var result = [];
         var values = mirror.isSet() ? /** @type {!SetMirror} */(mirror).values() : /** @type {!IteratorMirror} */(mirror).preview();
         for (var i = 0; i < values.length; ++i)
             result.push({ value: values[i] });
         return result;
     }
 }
 
 /**
+ * @param {string|undefined} contextData
+ * @return {number}
+ */
+DebuggerScript._executionContextId = function(contextData)
+{
+    if (!contextData)
+        return 0;
+    var firstComma = contextData.indexOf(",");
+    if (firstComma === -1)
+        return 0;
+    var secondComma = contextData.indexOf(",", firstComma + 1);
+    if (secondComma === -1)
+        return 0;
+
+    return parseInt(contextData.substring(firstComma + 1, secondComma), 10) || 0;
+}
+
+/**
  * @param {string} contextGroupId
  * @return {!Array<!FormattedScript>}
  */
 DebuggerScript.getScripts = function(contextGroupId)
 {
     var result = [];
     var scripts = Debug.scripts();
     var contextDataPrefix = null;
     if (contextGroupId)
         contextDataPrefix = contextGroupId + ",";
@@ skipping 25 matching lines @@
     // V8 will not count last line if script source ends with \n.
     if (script.source[script.source.length - 1] === '\n') {
         endLine += 1;
         endColumn = 0;
     } else {
         if (lineCount === 1)
             endColumn = script.source.length + script.column_offset;
         else
             endColumn = script.source.length - (lineEnds[lineCount - 2] + 1);
     }
-
-    /**
-     * @return {number}
-     */
-    function executionContextId()
-    {
-        var context_data = script.context_data;
-        if (!context_data)
-            return 0;
-        var firstComma = context_data.indexOf(",");
-        if (firstComma === -1)
-            return 0;
-        var secondComma = context_data.indexOf(",", firstComma + 1);
-        if (secondComma === -1)
-            return 0;
-
-        return parseInt(context_data.substring(firstComma + 1, secondComma), 10) || 0;
-    }
-
     return {
         id: script.id,
         name: script.nameOrSourceURL(),
         sourceURL: script.source_url,
         sourceMappingURL: script.source_mapping_url,
         source: script.source,
         startLine: script.line_offset,
         startColumn: script.column_offset,
         endLine: endLine,
         endColumn: endColumn,
-        executionContextId: executionContextId(),
+        executionContextId: DebuggerScript._executionContextId(script.context_data),
         isContentScript: !!script.context_data && script.context_data.endsWith(",nondefault"),
         isInternalScript: script.is_debugger_script
     };
 }
 
 /**
  * @param {!ExecutionState} execState
  * @param {!BreakpointInfo} info
  * @return {string|undefined}
  */
@@ skipping 361 matching lines @@
 
     /**
      * @return {number}
      */
     function column()
     {
         return ensureLocation().column;
     }
 
     /**
+     * @return {number}
+     */
+    function contextId()
+    {
+        var context = ensureFuncMirror().context();
+        if (context)
+            return DebuggerScript._executionContextId(context.data());
+        return 0;
+    }
+
+    /**
      * @return {number|undefined}
      */
     function sourceID()
     {
         var script = ensureFuncMirror().script();
         return script && script.id();
     }
 
     /**
      * @param {string} expression
@@ skipping 20 matching lines @@
         var scopeMirror = frameMirror.scope(scopeNumber);
         if (!scopeMirror)
             throw new Error("Incorrect scope index");
         scopeMirror.setVariableValue(variableName, newValue);
     }
 
     return {
         "sourceID": sourceID,
         "line": line,
         "column": column,
+        "contextId": contextId,
         "thisObject": thisObject,
         "evaluate": evaluate,
         "restart": restart,
         "setVariableValue": setVariableValue,
         "isAtReturn": isAtReturn,
         "details": lazyDetails
     };
 }
 
 /**
@@ skipping 33 matching lines @@
         break;
     }
     return result;
 }
 
 // We never resolve Mirror by its handle so to avoid memory leaks caused by Mirrors in the cache we disable it.
 ToggleMirrorCache(false);
 
 return DebuggerScript;
 })();