Merge 76680 - 2011-01-26 Pavel Feldman <pfeldman@chromium.org>...

Source/WebCore/inspector/InjectedScriptSource.js

 /*
  * Copyright (C) 2007 Apple 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.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 168 matching lines @@
         }
     },
 
     _getPropertyNames: function(object, resultSet)
     {
         var propertyNameSet = {};
         this._populatePropertyNames(object, propertyNameSet);
         return Object.keys(propertyNameSet);
     },
 
-    getCompletions: function(expression, includeInspectorCommandLineAPI)
+    getCompletions: function(expression, includeCommandLineAPI)
     {
         var props = {};
         try {
             if (!expression)
                 expression = "this";
-            var expressionResult = this._evaluateOn(inspectedWindow.eval, inspectedWindow, expression, false);
+            var expressionResult = this._evaluateOn(inspectedWindow.eval, inspectedWindow, expression, false, false);
 
             if (typeof expressionResult === "object")
                 this._populatePropertyNames(expressionResult, props);
     
-            if (includeInspectorCommandLineAPI) {
+            if (includeCommandLineAPI) {
                 for (var prop in this._commandLineAPI)
                     props[prop] = true;
             }
         } catch(e) {
         }
         return props;
     },
 
-    getCompletionsOnCallFrame: function(callFrameId, expression, includeInspectorCommandLineAPI)
+    getCompletionsOnCallFrame: function(callFrameId, expression, includeCommandLineAPI)
     {
         var props = {};
         try {
             var callFrame = this._callFrameForId(callFrameId);
             if (!callFrame)
                 return props;
 
             if (expression) {
-                var expressionResult = this._evaluateOn(callFrame.evaluate, callFrame, expression, true);
+                var expressionResult = this._evaluateOn(callFrame.evaluate, callFrame, expression, true, false);
                 if (typeof expressionResult === "object")
                     this._populatePropertyNames(expressionResult, props);
             } else {
                 // Evaluate into properties in scope of the selected call frame.
                 var scopeChain = callFrame.scopeChain;
                 for (var i = 0; i < scopeChain.length; ++i)
                     this._populatePropertyNames(scopeChain[i], props);
             }
     
-            if (includeInspectorCommandLineAPI) {
+            if (includeCommandLineAPI) {
                 for (var prop in this._commandLineAPI)
                     props[prop] = true;
             }
         } catch(e) {
         }
         return props;
     },
 
-    evaluate: function(expression, objectGroup)
+    evaluate: function(expression, objectGroup, injectCommandLineAPI)
     {
-        return this._evaluateAndWrap(inspectedWindow.eval, inspectedWindow, expression, objectGroup, false);
+        return this._evaluateAndWrap(inspectedWindow.eval, inspectedWindow, expression, objectGroup, false, injectCommandLineAPI);
     },
 
-    _evaluateAndWrap: function(evalFunction, object, expression, objectGroup, isEvalOnCallFrame)
+    _evaluateAndWrap: function(evalFunction, object, expression, objectGroup, isEvalOnCallFrame, injectCommandLineAPI)
     {
         try {
-            return this._wrapObject(this._evaluateOn(evalFunction, object, expression, isEvalOnCallFrame), objectGroup);
+            return this._wrapObject(this._evaluateOn(evalFunction, object, expression, isEvalOnCallFrame, injectCommandLineAPI), objectGroup);
         } catch (e) {
             return InjectedScript.RemoteObject.fromException(e);
         }
     },
 
-    _evaluateOn: function(evalFunction, object, expression, isEvalOnCallFrame)
+    _evaluateOn: function(evalFunction, object, expression, isEvalOnCallFrame, 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.
         inspectedWindow.console._commandLineAPI = this._commandLineAPI;
     
         // We don't want local variables to be shadowed by global ones when evaluating on CallFrame.
         if (!isEvalOnCallFrame)
             expression = "with (window) {\n" + expression + "\n} ";
-        expression = "with (window ? window.console._commandLineAPI : {}) {\n" + expression + "\n}";
+        if (injectCommandLineAPI)
+            expression = "with (window ? window.console._commandLineAPI : {}) {\n" + expression + "\n}";
         var value = evalFunction.call(object, expression);
     
         delete inspectedWindow.console._commandLineAPI;
     
         // When evaluating on call frame error is not thrown, but returned as a value.
         if (this._type(value) === "error")
             throw value.toString();
     
         return value;
     },
@@ skipping 12 matching lines @@
         injectedScript.releaseWrapperObjectGroup("backtrace");
         var result = [];
         var depth = 0;
         do {
             result.push(new InjectedScript.CallFrameProxy(depth++, callFrame));
             callFrame = callFrame.caller;
         } while (callFrame);
         return result;
     },
 
-    evaluateOnCallFrame: function(callFrameId, code, objectGroup)
+    evaluateOnCallFrame: function(callFrameId, expression, objectGroup, injectCommandLineAPI)
     {
         var callFrame = this._callFrameForId(callFrameId);
         if (!callFrame)
             return false;
-        return this._evaluateAndWrap(callFrame.evaluate, callFrame, code, objectGroup, true);
+        return this._evaluateAndWrap(callFrame.evaluate, callFrame, expression, objectGroup, true, injectCommandLineAPI);
     },
 
     _callFrameForId: function(callFrameId)
     {
         var parsedCallFrameId = eval("(" + callFrameId + ")");
         var ordinal = parsedCallFrameId.ordinal;
         var callFrame = InjectedScriptHost.currentCallFrame();
         while (--ordinal >= 0 && callFrame)
             callFrame = callFrame.caller;
         return callFrame;
@@ skipping 408 matching lines @@
     clear: function()
     {
         InjectedScriptHost.clearConsoleMessages();
     }
 }
 
 injectedScript._commandLineAPI = new CommandLineAPI();
 return injectedScript;
 })