Changeset 142888 in webkit

Timestamp:

Feb 14, 2013, 9:52:04 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: fix closure compilation warnings caused by setVariableValue change
​https://bugs.webkit.org/show_bug.cgi?id=109488

Patch by Peter Rybin <​prybin@chromium.org> on 2013-02-14
Reviewed by Pavel Feldman.

Annotations are fixed as required by closure compiler.
Parameters in Inspector.json are reordered as required.

• inspector/InjectedScriptExterns.js:

(InjectedScriptHost.prototype.setFunctionVariableValue):
(JavaScriptCallFrame.prototype.setVariableValue):

• inspector/InjectedScriptSource.js:

(.):

• inspector/Inspector.json:
• inspector/InspectorDebuggerAgent.cpp:

(WebCore::InspectorDebuggerAgent::setVariableValue):

• inspector/InspectorDebuggerAgent.h:

(InspectorDebuggerAgent):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InjectedScriptExterns.js (modified) (2 diffs)
• inspector/InjectedScriptSource.js (modified) (2 diffs)
• inspector/Inspector.json (modified) (1 diff)
• inspector/InspectorDebuggerAgent.cpp (modified) (1 diff)
• inspector/InspectorDebuggerAgent.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-14  Peter Rybin  <prybin@chromium.org>
+
+        Web Inspector: fix closure compilation warnings caused by setVariableValue change
+        https://bugs.webkit.org/show_bug.cgi?id=109488
+
+        Reviewed by Pavel Feldman.
+
+        Annotations are fixed as required by closure compiler.
+        Parameters in Inspector.json are reordered as required.
+
+        * inspector/InjectedScriptExterns.js:
+        (InjectedScriptHost.prototype.setFunctionVariableValue):
+        (JavaScriptCallFrame.prototype.setVariableValue):
+        * inspector/InjectedScriptSource.js:
+        (.):
+        * inspector/Inspector.json:
+        * inspector/InspectorDebuggerAgent.cpp:
+        (WebCore::InspectorDebuggerAgent::setVariableValue):
+        * inspector/InspectorDebuggerAgent.h:
+        (InspectorDebuggerAgent):
+
 2013-02-14  Tommy Widenflycht  <tommyw@google.com>
 

trunk/Source/WebCore/inspector/InjectedScriptExterns.js

@@ -83 +83 @@
 InjectedScriptHost.prototype.evaluate = function(expression) { }
 
+/**
+ * @param {function(...)} fun
+ * @param {number} scopeNumber
+ * @param {string} variableName
+ * @param {*} newValue
+ */
+InjectedScriptHost.prototype.setFunctionVariableValue = function(fun, scopeNumber, variableName, newValue) {}
+
 
 /**
@@ -105 +113 @@
 
 JavaScriptCallFrame.prototype.restart = function() { }
+
+/**
+ * @param {number} scopeNumber
+ * @param {string} variableName
+ * @param {*} newValue
+ */
+JavaScriptCallFrame.prototype.setVariableValue = function(scopeNumber, variableName, newValue) {}
 
 /**

trunk/Source/WebCore/inspector/InjectedScriptSource.js

@@ -597 +597 @@
      * @param {string|boolean} callFrameId or false
      * @param {string|boolean} functionObjectId or false
-     * @param {integer} scopeNumber
+     * @param {number} scopeNumber
      * @param {string} variableName
      * @param {string} newValueJsonString RuntimeAgent.CallArgument structure serialized as string 
@@ -606 +606 @@
         var setter;
         if (callFrameId) {
-            var callFrame = this._callFrameForId(topCallFrame, callFrameId);
+            var callFrame = this._callFrameForId(topCallFrame, String(callFrameId));
             if (!callFrame)
                 return "Could not find call frame with given id";
             setter = callFrame.setVariableValue.bind(callFrame);    
         } else {
-            var parsedFunctionId = this._parseObjectId(functionObjectId);
+            var parsedFunctionId = this._parseObjectId(String(functionObjectId));
             var func = this._objectForId(parsedFunctionId);
             if (typeof func !== "function")

trunk/Source/WebCore/inspector/Inspector.json

@@ -2950 +2950 @@
                 "name": "setVariableValue",
                 "parameters": [
-                    { "name": "callFrameId", "$ref": "CallFrameId", "optional": true, "description": "Id of callframe that holds variable." },
-                    { "name": "functionObjectId", "$ref": "Runtime.RemoteObjectId", "optional": true, "description": "Object id of closure (function) that holds variable." },
                     { "name": "scopeNumber", "type": "integer", "description": "0-based number of scope as was listed in scope chain. Only 'local', 'closure' and 'catch' scope types are allowed. Other scopes could be manipulated manually." },
                     { "name": "variableName", "type": "string", "description": "Variable name." },
-                    { "name": "newValue", "$ref": "Runtime.CallArgument", "description": "New variable value." }
+                    { "name": "newValue", "$ref": "Runtime.CallArgument", "description": "New variable value." },
+                    { "name": "callFrameId", "$ref": "CallFrameId", "optional": true, "description": "Id of callframe that holds variable." },
+                    { "name": "functionObjectId", "$ref": "Runtime.RemoteObjectId", "optional": true, "description": "Object id of closure (function) that holds variable." }
                 ],
                 "hidden": true,

trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp

@@ -581 +581 @@
 }
 
-void InspectorDebuggerAgent::setVariableValue(ErrorString* errorString, const String* callFrameId, const String* functionObjectId, int scopeNumber, const String& variableName, const RefPtr<InspectorObject>& newValue)
+void InspectorDebuggerAgent::setVariableValue(ErrorString* errorString, int scopeNumber, const String& variableName, const RefPtr<InspectorObject>& newValue, const String* callFrameId, const String* functionObjectId)
 {
     InjectedScript injectedScript;

trunk/Source/WebCore/inspector/InspectorDebuggerAgent.h

@@ -114 +114 @@
     void runScript(ErrorString*, const TypeBuilder::Debugger::ScriptId&, const int* executionContextId, const String* objectGroup, const bool* doNotPauseOnExceptionsAndMuteConsole, RefPtr<TypeBuilder::Runtime::RemoteObject>& result, TypeBuilder::OptOutput<bool>* wasThrown);
     virtual void setOverlayMessage(ErrorString*, const String*);
-    virtual void setVariableValue(ErrorString*, const String* in_callFrame, const String* in_functionObjectId, int in_scopeNumber, const String& in_variableName, const RefPtr<InspectorObject>& in_newValue);
+    virtual void setVariableValue(ErrorString*, int in_scopeNumber, const String& in_variableName, const RefPtr<InspectorObject>& in_newValue, const String* in_callFrame, const String* in_functionObjectId);
 
     void schedulePauseOnNextStatement(InspectorFrontend::Debugger::Reason::Enum breakReason, PassRefPtr<InspectorObject> data);