[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[japhet at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit a615d503de468207483df6b8985eaa621769bb90
Author: japhet at chromium.org <japhet at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 22 20:03:17 2010 +0000

    2010-02-22  Nate Chapin  <japhet at chromium.org>
    
            Unreviewed, Chromium build fix.
    
            * bindings/scripts/CodeGeneratorV8.pm: Compile break due to bad patch merge.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55097 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9106ebf..6f9782b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,11 @@
 2010-02-22  Nate Chapin  <japhet at chromium.org>
 
+        Unreviewed, Chromium build fix.
+
+        * bindings/scripts/CodeGeneratorV8.pm: Compile break due to bad patch merge.
+
+2010-02-22  Nate Chapin  <japhet at chromium.org>
+
         Reviewed by Dimitri Glazkov.
 
         [V8] Streamline V8 event listener code. Merge all the variants of
diff --git a/WebCore/bindings/scripts/CodeGeneratorV8.pm b/WebCore/bindings/scripts/CodeGeneratorV8.pm
index fff5cbe..94762c8 100644
--- a/WebCore/bindings/scripts/CodeGeneratorV8.pm
+++ b/WebCore/bindings/scripts/CodeGeneratorV8.pm
@@ -1010,7 +1010,7 @@ sub GenerateNewFunctionTemplate
     return "v8::FunctionTemplate::New($callback, v8::Handle<v8::Value>(), $signature)";
 }
 
-sub GenerateNewFunctionTemplatellback
+sub GenerateEventListenerCallback
 {
     my $implClassName = shift;
     my $functionName = shift;

-- 
WebKit Debian packaging