Changeset 94005 in webkit

Timestamp:

Aug 29, 2011, 1:03:33 PM (15 years ago)

Author:

Patrick Gansterer

Message:

Consider Conditional attribute in CodeGeneratorJS' JSValueToNative and NativeToJSValue function
​https://bugs.webkit.org/show_bug.cgi?id=65040

Reviewed by Brent Fulgham.

JSValueToNative and NativeToJSValue add additional include statements
to the implementation and need to handle the Conditional attribute from
the IDL file. The Conditional attribute adds appropriate #if ENABLE()
lines for the preprocessor around the include statements to remove
some unneeded build dependencies.

• bindings/scripts/CodeGeneratorJS.pm:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/scripts/CodeGeneratorJS.pm (modified) (10 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-29  Patrick Gansterer  <paroga@webkit.org>
+
+        Consider Conditional attribute in CodeGeneratorJS' JSValueToNative and NativeToJSValue function
+        https://bugs.webkit.org/show_bug.cgi?id=65040
+
+        Reviewed by Brent Fulgham.
+
+        JSValueToNative and NativeToJSValue add additional include statements
+        to the implementation and need to handle the Conditional attribute from
+        the IDL file. The Conditional attribute adds appropriate #if ENABLE()
+        lines for the preprocessor around the include statements to remove
+        some unneeded build dependencies.
+
+        * bindings/scripts/CodeGeneratorJS.pm:
+
 2011-08-29  Nate Chapin  <japhet@chromium.org>
 

trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm

@@ -310 +310 @@
     } elsif ($type eq "String") {
         $implIncludes{"PlatformString.h"} = 1;
+    }
+}
+
+sub AddToImplIncludes
+{
+    my $header = shift;
+    my $conditional = shift;
+
+    if (not $conditional) {
+        $implIncludes{$header} = 1;
+    } elsif (not exists($implIncludes{$header})) {
+        $implIncludes{$header} = $conditional;
+    } else {
+        my $oldValue = $implIncludes{$header};
+        if ($oldValue ne 1) {
+            my %newValue = ();
+            $newValue{$conditional} = 1;
+            foreach my $condition (split(/\|/, $oldValue)) {
+                $newValue{$condition} = 1;
+            }
+            $implIncludes{$header} = join("|", sort keys %newValue);
+        }
     }
 }
@@ -1786 +1808 @@
                             $constructorType =~ s/Constructor$//;
                             if ($constructorType ne "DOMObject") {
-                                my $header = "JS" . $constructorType . ".h";
-                                my $conditional = $attribute->signature->extendedAttributes->{"Conditional"};
-                                if (not $conditional) {
-                                    $implIncludes{$header} = 1;
-                                } elsif (not exists($implIncludes{$header})) {
-                                    $implIncludes{$header} = $conditional;
-                                } else {
-                                    my $oldValue = $implIncludes{$header};
-                                    if ($oldValue ne 1) {
-                                        my %newValue = ();
-                                        $newValue{$conditional} = 1;
-                                        foreach my $condition (split(/\|/, $oldValue)) {
-                                            $newValue{$condition} = 1;
-                                        }
-                                        $implIncludes{$header} = join("|", sort keys %newValue);
-                                    }
-                                }
+                                AddToImplIncludes("JS" . $constructorType . ".h", $attribute->signature->extendedAttributes->{"Conditional"});
                             }
                             push(@implContent, "    // Shadowing a built-in constructor\n");
@@ -2631 +2637 @@
     my $value = shift;
 
+    my $conditional = $signature->extendedAttributes->{"Conditional"};
     my $type = $codeGenerator->StripModule($signature->type);
 
@@ -2654 +2661 @@
 
     if ($type eq "NodeFilter") {
-        $implIncludes{"JS$type.h"} = 1;
+        AddToImplIncludes("JS$type.h", $conditional);
         return "to$type(exec->globalData(), $value)";
     }
 
     if ($type eq "MediaQueryListListener") {
-        $implIncludes{"MediaQueryListListener.h"} = 1;
+        AddToImplIncludes("MediaQueryListListener.h", $conditional);
         return "MediaQueryListListener::create(ScriptValue(exec->globalData(), " . $value ."))";
     }
 
     if ($type eq "SerializedScriptValue" or $type eq "any") {
-        $implIncludes{"SerializedScriptValue.h"} = 1;
+        AddToImplIncludes("SerializedScriptValue.h", $conditional);
         return "SerializedScriptValue::create(exec, $value)";
     }
 
     if ($type eq "IDBKey") {
-        $implIncludes{"IDBBindingUtilities.h"} = 1;
-        $implIncludes{"IDBKey.h"} = 1;
+        AddToImplIncludes("IDBBindingUtilities.h", $conditional);
+        AddToImplIncludes("IDBKey.h", $conditional);
         return "createIDBKeyFromValue(exec, $value)";
     }
 
-    $implIncludes{"HTMLOptionElement.h"} = 1 if $type eq "HTMLOptionElement";
-    $implIncludes{"JSCustomVoidCallback.h"} = 1 if $type eq "VoidCallback";
-    $implIncludes{"Event.h"} = 1 if $type eq "Event";
+    AddToImplIncludes("HTMLOptionElement.h", $conditional) if $type eq "HTMLOptionElement";
+    AddToImplIncludes("JSCustomVoidCallback.h", $conditional) if $type eq "VoidCallback";
+    AddToImplIncludes("Event.h", $conditional) if $type eq "Event";
 
     # Default, assume autogenerated type conversion routines
-    $implIncludes{"JS$type.h"} = 1;
+    AddToImplIncludes("JS$type.h", $conditional);
     return "to$type($value)";
 }
@@ -2691 +2698 @@
     my $thisValue = shift;
 
+    my $conditional = $signature->extendedAttributes->{"Conditional"};
     my $type = $codeGenerator->StripModule($signature->type);
 
@@ -2710 +2718 @@
 
     if ($codeGenerator->IsStringType($type)) {
-        $implIncludes{"KURL.h"} = 1;
+        AddToImplIncludes("KURL.h", $conditional);
         my $conv = $signature->extendedAttributes->{"ConvertNullStringTo"};
         if (defined $conv) {
@@ -2721 +2729 @@
         $conv = $signature->extendedAttributes->{"ConvertScriptString"};
         return "jsOwnedStringOrNull(exec, $value)" if $conv;
-        $implIncludes{"<runtime/JSString.h>"} = 1;
+        AddToImplIncludes("<runtime/JSString.h>", $conditional);
         return "jsString(exec, $value)";
     }
@@ -2728 +2736 @@
 
     if ($type eq "CSSStyleDeclaration") {
-        $implIncludes{"CSSMutableStyleDeclaration.h"} = 1;
+        AddToImplIncludes("CSSMutableStyleDeclaration.h", $conditional);
     }
 
     if ($type eq "NodeList") {
-        $implIncludes{"NameNodeList.h"} = 1;
+        AddToImplIncludes("NameNodeList.h", $conditional);
     }
 
     if ($type eq "DOMObject") {
         if ($implClassName eq "Document") {
-            $implIncludes{"JSCanvasRenderingContext2D.h"} = 1;
+            AddToImplIncludes("JSCanvasRenderingContext2D.h", $conditional);
         } else {
             return "($value.hasNoValue() ? jsNull() : $value.jsValue())";
         }
     } elsif ($type =~ /SVGPathSeg/) {
-        $implIncludes{"JS$type.h"} = 1;
+        AddToImplIncludes("JS$type.h", $conditional);
         my $joinedName = $type;
         $joinedName =~ s/Abs|Rel//;
-        $implIncludes{"$joinedName.h"} = 1;
+        AddToImplIncludes("$joinedName.h", $conditional);
     } elsif ($type eq "SerializedScriptValue" or $type eq "any") {
-        $implIncludes{"SerializedScriptValue.h"} = 1;
+        AddToImplIncludes("SerializedScriptValue.h", $conditional);
         return "$value ? $value->deserialize(exec, castedThis->globalObject()) : jsNull()";
     } else {
         # Default, include header with same name.
-        $implIncludes{"JS$type.h"} = 1;
-        $implIncludes{"$type.h"} = 1 if not $codeGenerator->AvoidInclusionOfType($type);
+        AddToImplIncludes("JS$type.h", $conditional);
+        AddToImplIncludes("$type.h", $conditional) if not $codeGenerator->AvoidInclusionOfType($type);
     }
 
@@ -2775 +2783 @@
             my $selfIsTearOffType = $codeGenerator->IsSVGTypeNeedingTearOff($implClassName);
             if ($selfIsTearOffType) {
-                $implIncludes{"SVGStaticPropertyWithParentTearOff.h"} = 1;
+                AddToImplIncludes("SVGStaticPropertyWithParentTearOff.h", $conditional);
                 $tearOffType =~ s/SVGPropertyTearOff</SVGStaticPropertyWithParentTearOff<$implClassName, /;
 
@@ -2786 +2794 @@
                 $value = "${tearOffType}::create(castedThis->impl(), $value, $updateMethod)";
             } else {
-                $implIncludes{"SVGStaticPropertyTearOff.h"} = 1;
+                AddToImplIncludes("SVGStaticPropertyTearOff.h", $conditional);
                 $tearOffType =~ s/SVGPropertyTearOff</SVGStaticPropertyTearOff<$implClassName, /;
                 $value = "${tearOffType}::create(imp, $value, $updateMethod)";