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

Source/WebCore/inspector/front-end/ScriptsPanel.js

Index: Source/WebCore/inspector/front-end/ScriptsPanel.js
===================================================================
--- Source/WebCore/inspector/front-end/ScriptsPanel.js	(revision 76933)
+++ Source/WebCore/inspector/front-end/ScriptsPanel.js	(working copy)
@@ -316,7 +316,7 @@
         return selectedCallFrame.id;
     },
 
-    evaluateInSelectedCallFrame: function(code, updateInterface, objectGroup, callback)
+    evaluateInSelectedCallFrame: function(code, updateInterface, objectGroup, includeCommandLineAPI, callback)
     {
         var selectedCallFrame = this.sidebarPanes.callstack.selectedCallFrame;
         if (!this._paused || !selectedCallFrame)
@@ -325,24 +325,15 @@
         if (typeof updateInterface === "undefined")
             updateInterface = true;
 
-        var self = this;
         function updatingCallbackWrapper(result)
         {
-            callback(result);
-            if (updateInterface)
-                self.sidebarPanes.scopechain.update(selectedCallFrame);
-        }
-        this.doEvalInCallFrame(selectedCallFrame, code, objectGroup, updatingCallbackWrapper);
-    },
-
-    doEvalInCallFrame: function(callFrame, code, objectGroup, callback)
-    {
-        function evalCallback(result)
-        {
-            if (result)
+            if (result) {
                 callback(WebInspector.RemoteObject.fromPayload(result));
+                if (updateInterface)
+                    this.sidebarPanes.scopechain.update(selectedCallFrame);
+            }
         }
-        InspectorBackend.evaluateOnCallFrame(callFrame.id, code, objectGroup, evalCallback);
+        InspectorBackend.evaluateOnCallFrame(selectedCallFrame.id, code, objectGroup, includeCommandLineAPI, updatingCallbackWrapper.bind(this));
     },
 
     _debuggerPaused: function(event)