Changeset 82769 in webkit

Timestamp:

Apr 2, 2011 12:48:27 AM (13 years ago)

Author:

loislo@chromium.org

Message:

2011-04-02 Ilya Tikhonovsky <​loislo@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: we should be able to have in and out arguments of a command with same name.
​https://bugs.webkit.org/show_bug.cgi?id=57701

• inspector/CodeGeneratorInspector.pm:
• inspector/Inspector.json:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/CodeGeneratorInspector.pm (modified) (4 diffs)
• inspector/Inspector.json (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-02  Ilya Tikhonovsky  <loislo@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: we should be able to have in and out arguments of a command with same name.
+        https://bugs.webkit.org/show_bug.cgi?id=57701
+
+        * inspector/CodeGeneratorInspector.pm:
+        * inspector/Inspector.json:
+
 2011-04-01  Ilya Tikhonovsky  <loislo@chromium.org>
 

trunk/Source/WebCore/inspector/CodeGeneratorInspector.pm

@@ -482 +482 @@
 
     # declare local variables for out arguments.
-    push(@function, map("    " . typeTraits($_->type, "variable") . " " . $_->name . " = " . typeTraits($_->type, "defaultValue") . ";", @outArgs));
+    push(@function, map("    " . typeTraits($_->type, "variable") . " out_" . $_->name . " = " . typeTraits($_->type, "defaultValue") . ";", @outArgs));
     push(@function, "");
     push(@function, "    ErrorString error;");
@@ -495 +495 @@
             my $type = $parameter->type;
             my $typeString = camelCase($parameter->type);
-            push(@function, "        " . typeTraits($type, "variable") . " $name = get$typeString(argumentsContainer.get(), \"$name\", protocolErrors.get());");
+            push(@function, "        " . typeTraits($type, "variable") . " in_$name = get$typeString(argumentsContainer.get(), \"$name\", protocolErrors.get());");
         }
         push(@function, "");
@@ -501 +501 @@
     }
 
-    my $args = join(", ", ("&error", map($_->name, @inArgs), map("&" . $_->name, @outArgs)));
+    my $args = join(", ", ("&error", map("in_" . $_->name, @inArgs), map("&out_" . $_->name, @outArgs)));
     push(@function, "$indent    if (!protocolErrors->length())");
     push(@function, "$indent        $domainAccessor->$functionName($args);");
@@ -522 +522 @@
         push(@function, "                responseMessage->setString(\"error\", error);");
         push(@function, "            RefPtr<InspectorObject> responseBody = InspectorObject::create();");
-        push(@function, map("            responseBody->set" . typeTraits($_->type, "JSONType") . "(\"" . $_->name . "\", " . $_->name . ");", @outArgs));
+        push(@function, map("            responseBody->set" . typeTraits($_->type, "JSONType") . "(\"" . $_->name . "\", out_" . $_->name . ");", @outArgs));
         push(@function, "            responseMessage->setObject(\"body\", responseBody);");
         push(@function, "        }");

trunk/Source/WebCore/inspector/Inspector.json

@@ -681 +681 @@
                 ],
                 "returns": [
-                    { "name": "elementId", "type": "integer", "description": "Query selector result." }
+                    { "name": "nodeId", "type": "integer", "description": "Query selector result." }
                 ],
                 "description": "Executes <code>querySelector</code> on a given node. Setting <code>documentWide</code> to true starts selecting from the document node."