[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[loislo at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 7218331ffd5bbd1efea3161cddca46f686fde410
Author: loislo at chromium.org <loislo at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 11 14:56:11 2010 +0000

    2010-08-11  Ilya Tikhonovsky  <loislo at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            WebInspector: small refactoring for CodeGeneratorInspector.
            all "notify" methods are generating in InspectorFrontend
            the other methods are generating in InspectorBackend.
            https://bugs.webkit.org/show_bug.cgi?id=43849
    
            * inspector/CodeGeneratorInspector.pm:
    
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65156 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 305ee22..90b2b85 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-11  Ilya Tikhonovsky  <loislo at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        WebInspector: small refactoring for CodeGeneratorInspector.
+        all "notify" methods are generating in InspectorFrontend
+        the other methods are generating in InspectorBackend.
+        https://bugs.webkit.org/show_bug.cgi?id=43849
+
+        * inspector/CodeGeneratorInspector.pm:
+
 2010-08-11  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
         Reviewed by Xan Lopez.
diff --git a/WebCore/inspector/CodeGeneratorInspector.pm b/WebCore/inspector/CodeGeneratorInspector.pm
index 9d0af53..386f30b 100644
--- a/WebCore/inspector/CodeGeneratorInspector.pm
+++ b/WebCore/inspector/CodeGeneratorInspector.pm
@@ -225,8 +225,11 @@ sub generateFunctions
     my $interface = shift;
 
     foreach my $function (@{$interface->functions}) {
-        generateFrontendFunction($function);
-        generateBackendFunction($function);
+        if ($function->signature->extendedAttributes->{"notify"}) {
+            generateFrontendFunction($function);
+        } else {
+            generateBackendFunction($function);
+        }
     }
     push(@backendMethodsImpl, generateBackendDispatcher());
     push(@backendMethodsImpl, generateBackendReportProtocolError());
@@ -236,12 +239,9 @@ sub generateFrontendFunction
 {
     my $function = shift;
 
-    my $notify = $function->signature->extendedAttributes->{"notify"};
-    return if !$notify;
-    my $functionName = $notify ? $function->signature->name : "did" . ucfirst($function->signature->name);
+    my $functionName = $function->signature->name;
 
     my @argsFiltered = grep($_->direction eq "out", @{$function->parameters}); # just keep only out parameters for frontend interface.
-    unshift(@argsFiltered, $callId) if !$notify; # Add callId as the first argument for all frontend did* methods.
     map($frontendTypes{$_->type} = 1, @argsFiltered); # register required types.
     my $arguments = join(", ", map($typeTransform{$_->type}->{"param"} . " " . $_->name, @argsFiltered)); # prepare arguments for function signature.
     my @pushArguments = map("    arguments->push" . $typeTransform{$_->type}->{"accessorSuffix"} . "(" . $_->name . ");", @argsFiltered);
@@ -254,7 +254,7 @@ sub generateFrontendFunction
         push(@function, "void ${frontendClassName}::${functionName}(${arguments})");
         push(@function, "{");
         push(@function, "    RefPtr<InspectorArray> arguments = InspectorArray::create();");
-        push(@function, "    arguments->pushString(\"" . ($notify ? $functionName : "processResponse") . "\");");
+        push(@function, "    arguments->pushString(\"$functionName\");");
         push(@function, @pushArguments);
         push(@function, "    m_inspectorClient->sendMessageToFrontend(arguments->toJSONString());");
 
@@ -283,7 +283,6 @@ EOF
 sub generateBackendFunction
 {
     my $function = shift;
-    return if $function->signature->extendedAttributes->{"notify"};
 
     my $functionName = $function->signature->name;
 

-- 
WebKit Debian packaging