[debug] [reland] Consistently use script from FrameMirror

src/inspector/debugger-script.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 398 matching lines @@
  * @param {!FrameMirror} frameMirror
  * @return {!JavaScriptCallFrame}
  */
 DebuggerScript._frameMirrorToJSCallFrame = function(frameMirror)
 {
     // Stuff that can not be initialized lazily (i.e. valid while paused with a valid break_id).
     // The frameMirror and scopeMirror can be accessed only while paused on the debugger.
     var frameDetails = frameMirror.details();
 
     var funcObject = frameDetails.func();
+    var scriptObject = frameDetails.script();
     var sourcePosition = frameDetails.sourcePosition();
     var thisObject = frameDetails.receiver();
 
     var isAtReturn = !!frameDetails.isAtReturn();
     var returnValue = isAtReturn ? frameDetails.returnValue() : undefined;
 
     var scopeMirrors = frameMirror.allScopes(false);
     /** @type {!Array<number>} */
     var scopeTypes = new Array(scopeMirrors.length);
     /** @type {?Array<!Object>} */
@@ skipping 12 matching lines @@
         scopeObjects[i] = scopeDetails.object();
         scopeNames[i] = scopeDetails.name();
         scopeStartPositions[i] = scopeDetails.startPosition ? scopeDetails.startPosition() : 0;
         scopeEndPositions[i] = scopeDetails.endPosition ? scopeDetails.endPosition() : 0;
         scopeFunctions[i] = scopeDetails.func ? scopeDetails.func() : null;
     }
 
     // Calculated lazily.
     var scopeChain;
     var funcMirror;
+    var scriptMirror;
     var location;
     /** @type {!Array<?RawLocation>} */
     var scopeStartLocations;
     /** @type {!Array<?RawLocation>} */
     var scopeEndLocations;
     var details;
 
     /**
      * @param {!ScriptMirror|undefined} script
      * @param {number} pos
@@ skipping 48 matching lines @@
         return scopeChain;
     }
 
     /**
      * @return {!JavaScriptCallFrameDetails}
      */
     function lazyDetails()
     {
         if (!details) {
             var scopeObjects = ensureScopeChain();
-            var script = ensureFuncMirror().script();
+            var script = ensureScriptMirror();
             /** @type {!Array<Scope>} */
             var scopes = [];
             for (var i = 0; i < scopeObjects.length; ++i) {
                 var scope = {
                     "type": /** @type {string} */(DebuggerScript._scopeTypeNames.get(scopeTypes[i])),
                     "object": scopeObjects[i],
                 };
                 if (scopeNames[i])
                     scope.name = scopeNames[i];
                 if (scopeStartLocations[i])
@@ skipping 33 matching lines @@
     {
         if (!funcMirror) {
             funcMirror = MakeMirror(funcObject);
             if (!funcMirror.isFunction())
                 funcMirror = new UnresolvedFunctionMirror(funcObject);
         }
         return /** @type {!FunctionMirror} */(funcMirror);
     }
 
     /**
+     * @return {!ScriptMirror}
+     */
+    function ensureScriptMirror()
+    {
+        if (!scriptMirror) {
+            scriptMirror = MakeMirror(scriptObject);
+        }
+        return /** @type {!ScriptMirror} */(scriptMirror);
+    }
+
+    /**
      * @return {!{line: number, column: number}}
      */
     function ensureLocation()
     {
         if (!location) {
-            var script = ensureFuncMirror().script();
-            if (script)
-                location = script.locationFromPosition(sourcePosition, true);
+            var script = ensureScriptMirror();
+            location = script.locationFromPosition(sourcePosition, true);
             if (!location)
                 location = { line: 0, column: 0 };
         }
         return location;
     }
 
     /**
      * @return {number}
      */
     function line()
@@ skipping 18 matching lines @@
         // Old V8 do not have context() function on these objects
         if (!mirror.context)
             return DebuggerScript._executionContextId(mirror.script().value().context_data);
         var context = mirror.context();
         if (context)
             return DebuggerScript._executionContextId(context.data());
         return 0;
     }
 
     /**
-     * @return {number|undefined}
+     * @return {number}
      */
     function sourceID()
     {
-        var script = ensureFuncMirror().script();
-        return script && script.id();
+        var script = ensureScriptMirror();
+        return script.id();
     }
 
     /**
      * @param {string} expression
      * @return {*}
      */
     function evaluate(expression)
     {
         return frameMirror.evaluate(expression, false).value();
     }
@@ skipping 68 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;
 })();