[DevTools] Move evaluateOnCallFrame to native

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

 /*
  * Copyright (C) 2007 Apple Inc.  All rights reserved.
  * Copyright (C) 2013 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 271 matching lines @@
     isPrimitiveValue: function(object)
     {
         // FIXME(33716): typeof document.all is always 'undefined'.
         return InjectedScript.primitiveTypes[typeof object] && !this._isHTMLAllCollection(object);
     },
 
     /**
      * @param {*} object
      * @param {string} groupName
      * @param {boolean} canAccessInspectedGlobalObject
+     * @param {boolean} forceValueType
      * @param {boolean} generatePreview
      * @return {!RuntimeAgent.RemoteObject}
      */
-    wrapObject: function(object, groupName, canAccessInspectedGlobalObject, generatePreview)
+    wrapObject: function(object, groupName, canAccessInspectedGlobalObject, forceValueType, generatePreview)
     {
         if (canAccessInspectedGlobalObject)
-            return this._wrapObject(object, groupName, false, generatePreview);
+            return this._wrapObject(object, groupName, forceValueType, generatePreview);
         return this._fallbackWrapper(object);
     },
 
     /**
      * @param {*} object
      * @return {!RuntimeAgent.RemoteObject}
      */
     _fallbackWrapper: function(object)
     {
         var result = { __proto__: null };
@@ skipping 88 matching lines @@
     {
         return nullifyObjectProto(/** @type {!Object} */ (InjectedScriptHost.eval("(" + objectId + ")")));
     },
 
     clearLastEvaluationResult: function()
     {
         delete this._lastResult;
     },
 
     /**
+     * @param {*} result
+     */
+    setLastEvaluationResult: function(result)
+    {
+        this._lastResult = result;
+    },
+
+    /**
      * @param {string} objectId
      * @param {boolean} ownProperties
      * @param {boolean} accessorPropertiesOnly
      * @param {boolean} generatePreview
      * @return {!Array.<!RuntimeAgent.PropertyDescriptor>|boolean}
      */
     getProperties: function(objectId, ownProperties, accessorPropertiesOnly, generatePreview)
     {
         var parsedObjectId = this._parseObjectId(objectId);
         var object = this._objectForId(parsedObjectId);
@@ skipping 222 matching lines @@
     /**
      * @param {string} expression
      * @param {string} objectGroup
      * @param {boolean} injectCommandLineAPI
      * @param {boolean} returnByValue
      * @param {boolean} generatePreview
      * @return {*}
      */
     evaluate: function(expression, objectGroup, injectCommandLineAPI, returnByValue, generatePreview)
     {
-        return this._evaluateAndWrap(null, expression, objectGroup, injectCommandLineAPI, returnByValue, generatePreview);
+        var scopeExtensionForEval = injectCommandLineAPI ? new CommandLineAPI(this._commandLineAPIImpl) : undefined;
+        var wrappedResult = InjectedScriptHost.evaluateWithExceptionDetails(expression, scopeExtensionForEval);
+        if (objectGroup === "console" && !wrappedResult.exceptionDetails)
+            this._lastResult = wrappedResult.result;
+        if (!wrappedResult.exceptionDetails) {
+            return { wasThrown: false,
+                     result: this._wrapObject(wrappedResult.result, objectGroup, returnByValue, generatePreview),
+                     __proto__: null };
+        }
+        return this._createThrownValue(wrappedResult.result, objectGroup, generatePreview, wrappedResult.exceptionDetails);
     },
 
     /**
      * @param {string} objectId
      * @param {string} expression
      * @param {string} args
      * @param {boolean} returnByValue
      * @return {!Object|string}
      */
     callFunctionOn: function(objectId, expression, args, returnByValue)
@@ skipping 112 matching lines @@
         } else if ("value" in callArgumentJson) {
             var value = callArgumentJson.value;
             if (callArgumentJson.type === "number" && typeof value !== "number")
                 value = Number(value);
             return value;
         }
         return undefined;
     },
 
     /**
-     * @param {?JavaScriptCallFrame} callFrame
-     * @param {string} expression
-     * @param {string} objectGroup
-     * @param {boolean} injectCommandLineAPI
-     * @param {boolean} returnByValue
-     * @param {boolean} generatePreview
-     * @return {!Object}
-     */
-    _evaluateAndWrap: function(callFrame, expression, objectGroup, injectCommandLineAPI, returnByValue, generatePreview)
-    {
-        var wrappedResult = this._evaluateOn(callFrame, objectGroup, expression, injectCommandLineAPI);
-        if (!wrappedResult.exceptionDetails) {
-            return { wasThrown: false,
-                     result: this._wrapObject(wrappedResult.result, objectGroup, returnByValue, generatePreview),
-                     __proto__: null };
-        }
-        return this._createThrownValue(wrappedResult.result, objectGroup, generatePreview, wrappedResult.exceptionDetails);
-    },
-
-    /**
      * @param {*} value
      * @param {string|undefined} objectGroup
      * @param {boolean} generatePreview
      * @param {!RuntimeAgent.ExceptionDetails=} exceptionDetails
      * @return {!Object}
      */
     _createThrownValue: function(value, objectGroup, generatePreview, exceptionDetails)
     {
         var remoteObject = this._wrapObject(value, objectGroup, false, generatePreview && InjectedScriptHost.subtype(value) !== "error");
         if (!remoteObject.description){
             try {
                 remoteObject.description = toStringDescription(value);
             } catch (e) {}
         }
         return { wasThrown: true, result: remoteObject, exceptionDetails: exceptionDetails, __proto__: null };
     },
 
     /**
-     * @param {?JavaScriptCallFrame} callFrame
-     * @param {string} objectGroup
-     * @param {string} expression
-     * @param {boolean} injectCommandLineAPI
-     * @return {*}
-     */
-    _evaluateOn: function(callFrame, objectGroup, expression, injectCommandLineAPI)
-    {
-        // Only install command line api object for the time of evaluation.
-        // Surround the expression in with statements to inject our command line API so that
-        // the window object properties still take more precedent than our API functions.
-
-        var scopeExtensionForEval = (callFrame && injectCommandLineAPI) ? new CommandLineAPI(this._commandLineAPIImpl, callFrame) : undefined;
-        var wrappedResult = callFrame ? callFrame.evaluateWithExceptionDetails(expression, scopeExtensionForEval) : InjectedScriptHost.evaluateWithExceptionDetails(expression, injectCommandLineAPI ? new CommandLineAPI(this._commandLineAPIImpl, callFrame) : undefined);
-        if (objectGroup === "console" && !wrappedResult.exceptionDetails)
-            this._lastResult = wrappedResult.result;
-        return wrappedResult;
-
-    },
-
-    /**
      * @param {?Object} callFrame
      * @return {!Array.<!InjectedScript.CallFrameProxy>|boolean}
      */
     wrapCallFrames: function(callFrame)
     {
         if (!callFrame)
             return false;
 
         var result = [];
         var depth = 0;
         do {
             result[depth] = new InjectedScript.CallFrameProxy(depth, callFrame);
             callFrame = callFrame.caller;
             ++depth;
         } while (callFrame);
         return result;
     },
 
     /**
-     * @param {!JavaScriptCallFrame} topCallFrame
-     * @param {string} callFrameId
-     * @param {string} expression
-     * @param {string} objectGroup
-     * @param {boolean} injectCommandLineAPI
-     * @param {boolean} returnByValue
-     * @param {boolean} generatePreview
-     * @return {*}
-     */
-    evaluateOnCallFrame: function(topCallFrame, callFrameId, expression, objectGroup, injectCommandLineAPI, returnByValue, generatePreview)
-    {
-        var callFrame = this._callFrameForId(topCallFrame, callFrameId);
-        if (!callFrame)
-            return "Could not find call frame with given id";
-        return this._evaluateAndWrap(callFrame, expression, objectGroup, injectCommandLineAPI, returnByValue, generatePreview);
-    },
-
-    /**
      * @return {!CommandLineAPI}
      */
     commandLineAPI: function()
     {
-        return new CommandLineAPI(this._commandLineAPIImpl, null);
+        return new CommandLineAPI(this._commandLineAPIImpl);
     },
 
     /**
      * @param {!JavaScriptCallFrame} topCallFrame
      * @param {string} callFrameId
      * @return {?JavaScriptCallFrame}
      */
     _callFrameForId: function(topCallFrame, callFrameId)
     {
         var parsedCallFrameId = nullifyObjectProto(/** @type {!Object} */ (InjectedScriptHost.eval("(" + callFrameId + ")")));
@@ skipping 581 matching lines @@
         scope.startLocation = startLocation;
     if (endLocation)
         scope.endLocation = endLocation;
 
     return scope;
 }
 
 /**
  * @constructor
  * @param {!CommandLineAPIImpl} commandLineAPIImpl
- * @param {?JavaScriptCallFrame} callFrame
  */
-function CommandLineAPI(commandLineAPIImpl, callFrame)
+function CommandLineAPI(commandLineAPIImpl)
 {
     /**
-     * @param {string} member
-     * @return {boolean}
-     */
-    function inScopeVariables(member)
-    {
-        var scopeChain = callFrame.scopeChain;
-        for (var i = 0; i < scopeChain.length; ++i) {
-            if (member in scopeChain[i])
-                return true;
-        }
-        return false;
-    }
-
-    /**
      * @param {string} name The name of the method for which a toString method should be generated.
      * @return {function():string}
      */
     function customToStringMethod(name)
     {
         return function()
         {
             var funcArgsSyntax = "";
             try {
                 var funcSyntax = "" + commandLineAPIImpl[name];
                 funcSyntax = funcSyntax.replace(/\n/g, " ");
                 funcSyntax = funcSyntax.replace(/^function[^\(]*\(([^\)]*)\).*$/, "$1");
                 funcSyntax = funcSyntax.replace(/\s*,\s*/g, ", ");
                 funcSyntax = funcSyntax.replace(/\bopt_(\w+)\b/g, "[$1]");
                 funcArgsSyntax = funcSyntax.trim();
             } catch (e) {
             }
             return "function " + name + "(" + funcArgsSyntax + ") { [Command Line API] }";
         };
     }
 
     for (var i = 0; i < CommandLineAPI.members_.length; ++i) {
         var member = CommandLineAPI.members_[i];
-        if (callFrame && inScopeVariables(member))
-            continue;
-
         this[member] = bind(commandLineAPIImpl[member], commandLineAPIImpl);
         this[member].toString = customToStringMethod(member);
     }
 
     for (var i = 0; i < 5; ++i) {
         var member = "$" + i;
-        if (callFrame && inScopeVariables(member))
-            continue;
-
         this[member] = bind(commandLineAPIImpl._inspectedObject, commandLineAPIImpl, i);
     }
 
     this.$_ = injectedScript._lastResult;
 
     this.__proto__ = null;
 }
 
 // NOTE: Please keep the list of API methods below synchronized to that in WebInspector.RuntimeModel
 // and V8InjectedScriptHost!
@@ skipping 279 matching lines @@
      */
     _logEvent: function(event)
     {
         inspectedGlobalObject.console.log(event.type, event);
     }
 }
 
 injectedScript._commandLineAPIImpl = new CommandLineAPIImpl();
 return injectedScript;
 })