Changeset 96227 in webkit

Timestamp:

Sep 28, 2011 9:57:17 AM (13 years ago)

Author:

loislo@chromium.org

Message:

Web Inspector: optional arguments support for the frontend needs to be extended.
​https://bugs.webkit.org/show_bug.cgi?id=69005

Generator supports optional arguments but they are transferred by value.
It is not suitable if the used type doesn't have operator bool.
I'll transfer such arguments by pointer.

Reviewed by Pavel Feldman.

Build is the test.

• inspector/CodeGeneratorInspector.pm:

(generateFrontendFunction):
(paramTypeTraits):

• inspector/InspectorDebuggerAgent.cpp:

(WebCore::InspectorDebuggerAgent::didParseSource):

• inspector/InspectorResourceAgent.cpp:

(WebCore::InspectorResourceAgent::didFailLoading):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/CodeGeneratorInspector.pm (modified) (10 diffs)
• inspector/InspectorDebuggerAgent.cpp (modified) (1 diff)
• inspector/InspectorResourceAgent.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-28  Ilya Tikhonovsky  <loislo@chromium.org>
+
+        Web Inspector: optional arguments support for the frontend needs to be extended.
+        https://bugs.webkit.org/show_bug.cgi?id=69005
+
+        Generator supports optional arguments but they are transferred by value.
+        It is not suitable if the used type doesn't have operator bool.
+        I'll transfer such arguments by pointer.
+
+        Reviewed by Pavel Feldman.
+
+        Build is the test.
+
+        * inspector/CodeGeneratorInspector.pm:
+        (generateFrontendFunction):
+        (paramTypeTraits):
+        * inspector/InspectorDebuggerAgent.cpp:
+        (WebCore::InspectorDebuggerAgent::didParseSource):
+        * inspector/InspectorResourceAgent.cpp:
+        (WebCore::InspectorResourceAgent::didFailLoading):
+
 2011-09-28  Antaryami Pandia  <antaryami.pandia@motorola.com>
 

trunk/Source/WebCore/inspector/CodeGeneratorInspector.pm

@@ -135 +135 @@
 $typeTransform{"String"} = {
     "param" => "const String&",
+    "optional_param" => "const String* const",
+    "optional_valueAccessor" => "*",
     "variable" => "String",
     "return" => "String",
@@ -145 +147 @@
 $typeTransform{"long"} = {
     "param" => "long",
+    "optional_param" => "const long* const",
+    "optional_valueAccessor" => "*",
     "variable" => "long",
     "defaultValue" => "0",
@@ -154 +158 @@
 $typeTransform{"int"} = {
     "param" => "int",
+    "optional_param" => "const int* const",
+    "optional_valueAccessor" => "*",
     "variable" => "int",
     "defaultValue" => "0",
@@ -163 +169 @@
 $typeTransform{"unsigned long"} = {
     "param" => "unsigned long",
+    "optional_param" => "const unsigned long* const",
+    "optional_valueAccessor" => "*",
     "variable" => "unsigned long",
     "defaultValue" => "0u",
@@ -172 +180 @@
 $typeTransform{"unsigned int"} = {
     "param" => "unsigned int",
+    "optional_param" => "const unsigned int* const",
+    "optional_valueAccessor" => "*",
     "variable" => "unsigned int",
     "defaultValue" => "0u",
@@ -181 +191 @@
 $typeTransform{"double"} = {
     "param" => "double",
+    "optional_param" => "const double* const",
+    "optional_valueAccessor" => "*",
     "variable" => "double",
     "defaultValue" => "0.0",
@@ -190 +202 @@
 $typeTransform{"boolean"} = {
     "param" => "bool",
+    "optional_param" => "const bool* const",
+    "optional_valueAccessor" => "*",
     "variable"=> "bool",
     "defaultValue" => "false",
@@ -377 +391 @@
     my @argsFiltered = grep($_->direction eq "out", @{$function->parameters}); # just keep only out parameters for frontend interface.
     map($frontendTypes{$_->type} = 1, @argsFiltered); # register required types.
-    my $arguments = join(", ", map(typeTraits($_->type, "param") . " " . $_->name, @argsFiltered)); # prepare arguments for function signature.
+    my $arguments = join(", ", map(paramTypeTraits($_, "param") . " " . $_->name, @argsFiltered)); # prepare arguments for function signature.
 
     my $signature = "        void ${functionName}(${arguments});";
@@ -394 +408 @@
         foreach my $parameter (@argsFiltered) {
             my $optional = $parameter->extendedAttributes->{"optional"} ? "if (" . $parameter->name . ")\n        " : "";
-            push(@function, "    " . $optional . "paramsObject->set" . typeTraits($parameter->type, "JSONType") . "(\"" . $parameter->name . "\", " . $parameter->name . ");");
+            push(@function, "    " . $optional . "paramsObject->set" . paramTypeTraits($parameter, "JSONType") . "(\"" . $parameter->name . "\", " . paramTypeTraits($parameter, "valueAccessor") . $parameter->name . ");");
         }
         push(@function, "    ${functionName}Message->setObject(\"params\", paramsObject);");
@@ -1095 +1109 @@
     my $trait = shift;
     return $typeTransform{$type}->{$trait};
+}
+
+sub paramTypeTraits
+{
+    my $paramDescription = shift;
+    my $trait = shift;
+    if ($paramDescription->extendedAttributes->{"optional"}) {
+        my $optionalResult = typeTraits($paramDescription->type, "optional_" . $trait);
+        return $optionalResult if defined $optionalResult;
+    }
+    my $result = typeTraits($paramDescription->type, $trait);
+    return defined $result ? $result : "";
 }
 

trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp

@@ -438 +438 @@
 {
     // Don't send script content to the front end until it's really needed.
-    m_frontend->scriptParsed(scriptId, script.url, script.startLine, script.startColumn, script.endLine, script.endColumn, script.isContentScript);
+    m_frontend->scriptParsed(scriptId, script.url, script.startLine, script.startColumn, script.endLine, script.endColumn, script.isContentScript ? &script.isContentScript : 0);
 
     m_scripts.set(scriptId, script);

trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp

@@ -300 +300 @@
     }
 
-    m_frontend->loadingFailed(requestId, currentTime(), error.localizedDescription(), error.isCancellation());
+    bool canceled = error.isCancellation();
+    m_frontend->loadingFailed(requestId, currentTime(), error.localizedDescription(), canceled ? &canceled : 0);
 }