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

[zimmermann at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit e63af2a11e8ac401a680ad7114fad1f62fe9d705
Author: zimmermann at webkit.org <zimmermann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 3 12:15:21 2010 +0000

    2010-11-03  Nikolas Zimmermann  <nzimmermann at rim.com>
    
            Not reviewed.
    
            Convert SVGAnimatedString/SVGStringList to the new SVG*PropertyTearOff concept
            https://bugs.webkit.org/show_bug.cgi?id=48898
    
            Fix Chromium/V8 build for real, verified using a local ToT Chromium build.
    
            * bindings/scripts/CodeGeneratorV8.pm:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71232 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 90e9085..8dd4c84 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -5,6 +5,17 @@
         Convert SVGAnimatedString/SVGStringList to the new SVG*PropertyTearOff concept
         https://bugs.webkit.org/show_bug.cgi?id=48898
 
+        Fix Chromium/V8 build for real, verified using a local ToT Chromium build.
+
+        * bindings/scripts/CodeGeneratorV8.pm:
+
+2010-11-03  Nikolas Zimmermann  <nzimmermann at rim.com>
+
+        Not reviewed.
+
+        Convert SVGAnimatedString/SVGStringList to the new SVG*PropertyTearOff concept
+        https://bugs.webkit.org/show_bug.cgi?id=48898
+
         Next attempt to fix the Chromium/V8 builds - a class forward in the headers was still missing.
 
         * bindings/scripts/CodeGeneratorV8.pm: Add SVGStringListPropertyTearOff in the V8SVGStringList header.
diff --git a/WebCore/bindings/scripts/CodeGeneratorV8.pm b/WebCore/bindings/scripts/CodeGeneratorV8.pm
index 9f88ace..70dfb01 100644
--- a/WebCore/bindings/scripts/CodeGeneratorV8.pm
+++ b/WebCore/bindings/scripts/CodeGeneratorV8.pm
@@ -228,7 +228,6 @@ sub GetSVGPropertyTypes
         $implIncludes{"SVGAnimatedListPropertyTearOff.h"} = 1;
     } elsif ($svgNativeType =~ /SVGStringListPropertyTearOff/) {
         $svgListPropertyType = "SVGStringList";
-        $implIncludes{"SVGStringListPropertyTearOff.h"} = 1;
         $implIncludes{"$svgWrappedNativeType.h"} = 1;
     }
 
@@ -275,10 +274,12 @@ sub GenerateHeader
     push(@headerContent, "\nnamespace WebCore {\n");
     push(@headerContent, "\ntemplate<typename PODType> class V8SVGPODTypeWrapper;\n") if $podType;
     push(@headerContent, "\ntemplate<typename PropertyType> class SVGPropertyTearOff;\n") if $svgPropertyType;
-    if ($svgListPropertyType eq "SVGStringList") {
-        push(@headerContent, "\nclass SVGStringListPropertyTearOff;\n");
-    } else {
-        push(@headerContent, "\ntemplate<typename PropertyType> class SVGListPropertyTearOff;\n");
+    if ($svgListPropertyType) {
+        if ($svgListPropertyType eq "SVGStringList") {
+            push(@headerContent, "\nclass SVGStringListPropertyTearOff;\n");
+        } else {
+            push(@headerContent, "\ntemplate<typename PropertyType> class SVGListPropertyTearOff;\n");
+        }
     }
     push(@headerContent, "\nclass $className {\n");
 
@@ -751,7 +752,7 @@ END
         }
     } elsif ($svgNativeType) {
         my $svgWrappedNativeType = $codeGenerator->GetSVGWrappedTypeNeedingTearOff($implClassName);
-        if ($svgWrappedNativeType =~ /List$/) {
+        if ($svgWrappedNativeType =~ /List$/ or $implClassName eq "SVGStringList") {
             push(@implContentDecls, <<END);
     $svgNativeType* imp = V8${implClassName}::toNative(info.Holder());
 END
@@ -931,6 +932,7 @@ END
         $implIncludes{"V8$attrType.h"} = 1;
         my $tearOffType = $codeGenerator->GetSVGTypeNeedingTearOff($attrType);
         if ($tearOffType eq "SVGStringListPropertyTearOff") {
+            $implIncludes{"SVGStringListPropertyTearOff.h"} = 1;
             my $extraImp = "GetOwnerElementForType<$implClassName, IsDerivedFromSVGElement<$implClassName>::value>::ownerElement(imp), ";
             push(@implContentDecls, "    return toV8(WTF::getPtr(${tearOffType}::create($extraImp$result)));\n");
         } else {

-- 
WebKit Debian packaging