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

[darin at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 47c6eca4f7355bfc95b29add396c5df2a7f91e3c
Author: darin at chromium.org <darin at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 28 07:27:09 2010 +0000

    2010-01-27  Darin Fisher  <darin at chromium.org>
    
            Fix chromium build bustage (take 2).
    
            * bindings/scripts/CodeGeneratorV8.pm: Really treat V8CustomGetter like CustomGetter in all cases.
    
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53974 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2c5b8d3..ab314cd 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,11 @@
 2010-01-27  Darin Fisher  <darin at chromium.org>
 
+        Fix chromium build bustage (take 2).
+
+        * bindings/scripts/CodeGeneratorV8.pm: Really treat V8CustomGetter like CustomGetter in all cases.
+
+2010-01-27  Darin Fisher  <darin at chromium.org>
+
         Fix chromium build bustage.
 
         * bindings/scripts/CodeGeneratorV8.pm: Treat V8CustomGetter like CustomGetter in all cases.
diff --git a/WebCore/bindings/scripts/CodeGeneratorV8.pm b/WebCore/bindings/scripts/CodeGeneratorV8.pm
index 12c18bd..0631679 100644
--- a/WebCore/bindings/scripts/CodeGeneratorV8.pm
+++ b/WebCore/bindings/scripts/CodeGeneratorV8.pm
@@ -1491,7 +1491,8 @@ sub GenerateImplementation
 
         # Generate special code for the constructor attributes.
         if ($attrType =~ /Constructor$/) {
-            if ($attribute->signature->extendedAttributes->{"CustomGetter"}) {
+            if ($attribute->signature->extendedAttributes->{"CustomGetter"} ||
+                $attribute->signature->extendedAttributes->{"V8CustomGetter"}) {
                 $implIncludes{"V8CustomBinding.h"} = 1;
             } else {
                 $hasConstructors = 1;
@@ -1513,7 +1514,8 @@ sub GenerateImplementation
         }
 
         # Generate the accessor.
-        if ($attribute->signature->extendedAttributes->{"CustomGetter"}) {
+        if ($attribute->signature->extendedAttributes->{"CustomGetter"} ||
+            $attribute->signature->extendedAttributes->{"V8CustomGetter"}) {
             $implIncludes{"V8CustomBinding.h"} = 1;
         } else {
             GenerateNormalAttrGetter($attribute, $dataNode, $classIndex, $implClassName, $interfaceName);

-- 
WebKit Debian packaging