Diff
Modified: trunk/Source/WebCore/ChangeLog (112035 => 112036)
--- trunk/Source/WebCore/ChangeLog 2012-03-25 19:51:18 UTC (rev 112035)
+++ trunk/Source/WebCore/ChangeLog 2012-03-25 20:00:03 UTC (rev 112036)
@@ -1,5 +1,51 @@
2012-03-25 Kentaro Hara <[email protected]>
+ Remove duplicated GenerateConditionalString() from code generators
+ https://bugs.webkit.org/show_bug.cgi?id=82148
+
+ Reviewed by Adam Barth.
+
+ Previously GenerateConditionalString()s were defined in each code generator,
+ and they were doing the same thing. This patch puts GenerateConditionalString()
+ in CodeGenerator.pm and removes duplicated GenerateConditionalString()s.
+
+ No tests. No change in the generated code.
+
+ * bindings/scripts/CodeGenerator.pm:
+ (GenerateConditionalString):
+ * bindings/scripts/CodeGeneratorCPP.pm:
+ (GenerateHeader):
+ (GenerateImplementation):
+ * bindings/scripts/CodeGeneratorGObject.pm:
+ (GenerateProperty):
+ (GenerateProperties):
+ (GenerateFunction):
+ (WriteData):
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateHeaderContentHeader):
+ (GenerateImplementationContentHeader):
+ (GenerateHeader):
+ (GenerateImplementation):
+ (GenerateCallbackHeader):
+ (GenerateCallbackImplementation):
+ * bindings/scripts/CodeGeneratorObjC.pm:
+ (GenerateHeader):
+ (GenerateImplementation):
+ * bindings/scripts/CodeGeneratorV8.pm:
+ (GenerateHeader):
+ (GenerateNormalAttrGetter):
+ (GenerateNormalAttrSetter):
+ (GenerateOverloadedFunctionCallback):
+ (GenerateFunctionCallback):
+ (GenerateBatchedAttributeData):
+ (GenerateImplementation):
+ (GenerateHeaderContentHeader):
+ (GenerateImplementationContentHeader):
+ (GenerateCallbackHeader):
+ (GenerateCallbackImplementation):
+
+2012-03-25 Kentaro Hara <[email protected]>
+
Move DOMWindowSQLDatabase.* to DOMWindowWebDatabase.*, and move WorkerContextSQLDatabase.* to WorkerContextWebDatabase.*
https://bugs.webkit.org/show_bug.cgi?id=82146
Modified: trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm (112035 => 112036)
--- trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm 2012-03-25 19:51:18 UTC (rev 112035)
+++ trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm 2012-03-25 20:00:03 UTC (rev 112036)
@@ -604,6 +604,19 @@
return not $dataNode->extendedAttributes->{"DoNotCheckConstants"};
}
+sub GenerateConditionalString
+{
+ my $generator = shift;
+ my $node = shift;
+
+ my $conditional = $node->extendedAttributes->{"Conditional"};
+ if ($conditional) {
+ return $generator->GenerateConditionalStringFromAttributeValue($conditional);
+ } else {
+ return "";
+ }
+}
+
sub GenerateConditionalStringFromAttributeValue
{
my $generator = shift;
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorCPP.pm (112035 => 112036)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorCPP.pm 2012-03-25 19:51:18 UTC (rev 112035)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorCPP.pm 2012-03-25 20:00:03 UTC (rev 112036)
@@ -307,17 +307,6 @@
$implIncludes{"WebDOM$type.h"} = 1;
}
-sub GenerateConditionalString
-{
- my $node = shift;
- my $conditional = $node->extendedAttributes->{"Conditional"};
- if ($conditional) {
- return $codeGenerator->GenerateConditionalStringFromAttributeValue($conditional);
- } else {
- return "";
- }
-}
-
sub GetNamespaceForClass
{
my $type = shift;
@@ -351,7 +340,7 @@
push(@headerContentHeader, "\n#ifndef $className" . "_h");
push(@headerContentHeader, "\n#define $className" . "_h\n\n");
- my $conditionalString = GenerateConditionalString($dataNode);
+ my $conditionalString = $codeGenerator->GenerateConditionalString($dataNode);
push(@headerContentHeader, "#if ${conditionalString}\n\n") if $conditionalString;
# - INCLUDES -
@@ -428,7 +417,7 @@
foreach my $attribute (@{$dataNode->attributes}) {
next if ShouldSkipType($attribute);
- my $attributeConditionalString = GenerateConditionalString($attribute->signature);
+ my $attributeConditionalString = $codeGenerator->GenerateConditionalString($attribute->signature);
my $attributeName = $attribute->signature->name;
my $attributeType = GetCPPType($attribute->signature->type, 0);
my $attributeIsReadonly = ($attribute->type =~ /^readonly/);
@@ -496,7 +485,7 @@
AddForwardDeclarationsForType($type, 1);
}
- my $conditionalString = GenerateConditionalString($function->signature);
+ my $conditionalString = $codeGenerator->GenerateConditionalString($function->signature);
push(@headerFunctions, "#if ${conditionalString}\n") if $conditionalString;
push(@headerFunctions, " ");
push(@headerFunctions, $functionDeclaration);
@@ -603,7 +592,7 @@
# - INCLUDES -
push(@implContentHeader, "\n#include \"config.h\"\n");
- my $conditionalString = GenerateConditionalString($dataNode);
+ my $conditionalString = $codeGenerator->GenerateConditionalString($dataNode);
push(@implContentHeader, "\n#if ${conditionalString}\n\n") if $conditionalString;
push(@implContentHeader, "#include \"$className.h\"\n\n");
@@ -720,7 +709,7 @@
}
my $getterContent = "${getterContentHead}${functionName}(" . join(", ", @arguments) . ")${getterContentTail}";
- my $attributeConditionalString = GenerateConditionalString($attribute->signature);
+ my $attributeConditionalString = $codeGenerator->GenerateConditionalString($attribute->signature);
push(@implContent, "#if ${attributeConditionalString}\n") if $attributeConditionalString;
push(@implContent, $getterSig);
@@ -889,7 +878,7 @@
}
}
- my $conditionalString = GenerateConditionalString($function->signature);
+ my $conditionalString = $codeGenerator->GenerateConditionalString($function->signature);
push(@implContent, "\n#if ${conditionalString}\n") if $conditionalString;
push(@implContent, "$functionSig\n");
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm (112035 => 112036)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm 2012-03-25 19:51:18 UTC (rev 112035)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm 2012-03-25 20:00:03 UTC (rev 112036)
@@ -342,23 +342,6 @@
return @result;
}
-sub GenerateConditionalString
-{
- my $node = shift;
- my $conditional = $node->extendedAttributes->{"Conditional"};
- if ($conditional) {
- if ($conditional =~ /&/) {
- return "ENABLE(" . join(") && ENABLE(", split(/&/, $conditional)) . ")";
- } elsif ($conditional =~ /\|/) {
- return "ENABLE(" . join(") || ENABLE(", split(/\|/, $conditional)) . ")";
- } else {
- return "ENABLE(" . $conditional . ")";
- }
- } else {
- return "";
- }
-}
-
sub GenerateConditionalWarning
{
my $node = shift;
@@ -390,7 +373,7 @@
my $interfaceName = shift;
my @writeableProperties = @{shift @_};
- my $conditionalString = GenerateConditionalString($attribute->signature);
+ my $conditionalString = $codeGenerator->GenerateConditionalString($attribute->signature);
my $camelPropName = $attribute->signature->name;
my $setPropNameFunction = $codeGenerator->WK_ucfirst($camelPropName);
my $getPropNameFunction = $codeGenerator->WK_lcfirst($camelPropName);
@@ -529,7 +512,7 @@
my $conditionGuardStart = "";
my $conditionGuardEnd = "";
- my $conditionalString = GenerateConditionalString($dataNode);
+ my $conditionalString = $codeGenerator->GenerateConditionalString($dataNode);
if ($conditionalString) {
$conditionGuardStart = "#if ${conditionalString}";
$conditionGuardEnd = "#endif // ${conditionalString}";
@@ -793,8 +776,8 @@
my $returnType = GetGlibTypeName($functionSigType);
my $returnValueIsGDOMType = IsGDOMClassType($functionSigType);
- my $conditionalString = GenerateConditionalString($function->signature);
- my $parentConditionalString = GenerateConditionalString($parentNode);
+ my $conditionalString = $codeGenerator->GenerateConditionalString($function->signature);
+ my $parentConditionalString = $codeGenerator->GenerateConditionalString($parentNode);
my @conditionalWarn = GenerateConditionalWarning($function->signature);
my @parentConditionalWarn = GenerateConditionalWarning($parentNode);
@@ -1362,7 +1345,7 @@
my $parentClassName = GetParentClassName($dataNode);
# Add the guard if the 'Conditional' extended attribute exists
- my $conditionalString = GenerateConditionalString($dataNode);
+ my $conditionalString = $codeGenerator->GenerateConditionalString($dataNode);
open(PRIVHEADER, ">$filename") or die "Couldn't open file $filename for writing";
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (112035 => 112036)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2012-03-25 19:51:18 UTC (rev 112035)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2012-03-25 20:00:03 UTC (rev 112036)
@@ -382,17 +382,6 @@
}
}
-sub GenerateConditionalString
-{
- my $node = shift;
- my $conditional = $node->extendedAttributes->{"Conditional"};
- if ($conditional) {
- return $codeGenerator->GenerateConditionalStringFromAttributeValue($conditional);
- } else {
- return "";
- }
-}
-
sub GenerateGetOwnPropertySlotBody
{
my ($dataNode, $interfaceName, $className, $implClassName, $hasAttributes, $inlined) = @_;
@@ -589,7 +578,7 @@
push(@headerContentHeader, "\n#ifndef $className" . "_h");
push(@headerContentHeader, "\n#define $className" . "_h\n\n");
- my $conditionalString = GenerateConditionalString($dataNode);
+ my $conditionalString = $codeGenerator->GenerateConditionalString($dataNode);
push(@headerContentHeader, "#if ${conditionalString}\n\n") if $conditionalString;
return @headerContentHeader;
}
@@ -602,7 +591,7 @@
my @implContentHeader = split("\r", $headerTemplate);
push(@implContentHeader, "\n#include \"config.h\"\n");
- my $conditionalString = GenerateConditionalString($dataNode);
+ my $conditionalString = $codeGenerator->GenerateConditionalString($dataNode);
push(@implContentHeader, "\n#if ${conditionalString}\n\n") if $conditionalString;
push(@implContentHeader, "#include \"$className.h\"\n\n");
return @implContentHeader;
@@ -845,7 +834,7 @@
$numCustomAttributes++ if ($attribute->signature->extendedAttributes->{"CustomGetter"} || $attribute->signature->extendedAttributes->{"JSCustomGetter"});
$numCustomAttributes++ if ($attribute->signature->extendedAttributes->{"CustomSetter"} || $attribute->signature->extendedAttributes->{"JSCustomSetter"});
if ($attribute->signature->extendedAttributes->{"CachedAttribute"}) {
- my $conditionalString = GenerateConditionalString($attribute->signature);
+ my $conditionalString = $codeGenerator->GenerateConditionalString($attribute->signature);
push(@headerContent, "#if ${conditionalString}\n") if $conditionalString;
push(@headerContent, " JSC::WriteBarrier<JSC::Unknown> m_" . $attribute->signature->name . ";\n");
$numCachedAttributes++;
@@ -865,7 +854,7 @@
push(@headerContent, "\n // Custom attributes\n");
foreach my $attribute (@{$dataNode->attributes}) {
- my $conditionalString = GenerateConditionalString($attribute->signature);
+ my $conditionalString = $codeGenerator->GenerateConditionalString($attribute->signature);
if ($attribute->signature->extendedAttributes->{"Custom"} || $attribute->signature->extendedAttributes->{"JSCustom"} || $attribute->signature->extendedAttributes->{"CustomGetter"} || $attribute->signature->extendedAttributes->{"JSCustomGetter"}) {
push(@headerContent, "#if ${conditionalString}\n") if $conditionalString;
my $methodName = $codeGenerator->WK_lcfirst($attribute->signature->name);
@@ -889,7 +878,7 @@
foreach my $function (@{$dataNode->functions}) {
next unless $function->signature->extendedAttributes->{"Custom"} or $function->signature->extendedAttributes->{"JSCustom"};
next if $function->{overloads} && $function->{overloadIndex} != 1;
- my $conditionalString = GenerateConditionalString($function->signature);
+ my $conditionalString = $codeGenerator->GenerateConditionalString($function->signature);
push(@headerContent, "#if ${conditionalString}\n") if $conditionalString;
my $functionImplementationName = $function->signature->extendedAttributes->{"ImplementedAs"} || $codeGenerator->WK_lcfirst($function->signature->name);
push(@headerContent, " " . ($function->isStatic ? "static " : "") . "JSC::JSValue " . $functionImplementationName . "(JSC::ExecState*);\n");
@@ -1079,7 +1068,7 @@
push(@headerContent,"// Functions\n\n");
foreach my $function (@{$dataNode->functions}) {
next if $function->{overloadIndex} && $function->{overloadIndex} > 1;
- my $conditionalString = GenerateConditionalString($function->signature);
+ my $conditionalString = $codeGenerator->GenerateConditionalString($function->signature);
push(@headerContent, "#if ${conditionalString}\n") if $conditionalString;
my $functionName = GetFunctionName($className, $function);
push(@headerContent, "JSC::EncodedJSValue JSC_HOST_CALL ${functionName}(JSC::ExecState*);\n");
@@ -1090,7 +1079,7 @@
if ($numAttributes > 0 || !$dataNode->extendedAttributes->{"OmitConstructor"}) {
push(@headerContent,"// Attributes\n\n");
foreach my $attribute (@{$dataNode->attributes}) {
- my $conditionalString = GenerateConditionalString($attribute->signature);
+ my $conditionalString = $codeGenerator->GenerateConditionalString($attribute->signature);
push(@headerContent, "#if ${conditionalString}\n") if $conditionalString;
my $getter = "js" . $interfaceName . $codeGenerator->WK_ucfirst($attribute->signature->name) . ($attribute->signature->type =~ /Constructor$/ ? "Constructor" : "");
push(@headerContent, "JSC::JSValue ${getter}(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);\n");
@@ -1115,7 +1104,7 @@
if ($numConstants > 0) {
push(@headerContent,"// Constants\n\n");
foreach my $constant (@{$dataNode->constants}) {
- my $conditionalString = GenerateConditionalString($constant);
+ my $conditionalString = $codeGenerator->GenerateConditionalString($constant);
push(@headerContent, "#if ${conditionalString}\n") if $conditionalString;
my $getter = "js" . $interfaceName . $codeGenerator->WK_ucfirst($constant->name);
push(@headerContent, "JSC::JSValue ${getter}(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);\n");
@@ -1123,7 +1112,7 @@
}
}
- my $conditionalString = GenerateConditionalString($dataNode);
+ my $conditionalString = $codeGenerator->GenerateConditionalString($dataNode);
push(@headerContent, "\n} // namespace WebCore\n\n");
push(@headerContent, "#endif // ${conditionalString}\n\n") if $conditionalString;
push(@headerContent, "#endif\n");
@@ -1682,7 +1671,7 @@
my $getFunctionName = "js" . $interfaceName . $codeGenerator->WK_ucfirst($attribute->signature->name) . ($attribute->signature->type =~ /Constructor$/ ? "Constructor" : "");
my $implGetterFunctionName = $codeGenerator->WK_lcfirst($name);
- my $attributeConditionalString = GenerateConditionalString($attribute->signature);
+ my $attributeConditionalString = $codeGenerator->GenerateConditionalString($attribute->signature);
push(@implContent, "#if ${attributeConditionalString}\n") if $attributeConditionalString;
push(@implContent, "JSValue ${getFunctionName}(ExecState* exec, JSValue slotBase, const Identifier&)\n");
@@ -1873,7 +1862,7 @@
my $putFunctionName = "setJS" . $interfaceName . $codeGenerator->WK_ucfirst($name) . ($attribute->signature->type =~ /Constructor$/ ? "Constructor" : "");
my $implSetterFunctionName = $codeGenerator->WK_ucfirst($name);
- my $attributeConditionalString = GenerateConditionalString($attribute->signature);
+ my $attributeConditionalString = $codeGenerator->GenerateConditionalString($attribute->signature);
push(@implContent, "#if ${attributeConditionalString}\n") if $attributeConditionalString;
push(@implContent, "void ${putFunctionName}(ExecState* exec, JSObject* thisObject, JSValue value)\n");
@@ -2367,7 +2356,7 @@
push(@implContent, "\n}\n");
- my $conditionalString = GenerateConditionalString($dataNode);
+ my $conditionalString = $codeGenerator->GenerateConditionalString($dataNode);
push(@implContent, "\n#endif // ${conditionalString}\n") if $conditionalString;
}
@@ -2636,7 +2625,7 @@
push(@headerContent, "};\n\n");
push(@headerContent, "} // namespace WebCore\n\n");
- my $conditionalString = GenerateConditionalString($dataNode);
+ my $conditionalString = $codeGenerator->GenerateConditionalString($dataNode);
push(@headerContent, "#endif // ${conditionalString}\n\n") if $conditionalString;
push(@headerContent, "#endif\n");
}
@@ -2730,7 +2719,7 @@
}
push(@implContent, "\n}\n");
- my $conditionalString = GenerateConditionalString($dataNode);
+ my $conditionalString = $codeGenerator->GenerateConditionalString($dataNode);
push(@implContent, "\n#endif // ${conditionalString}\n") if $conditionalString;
}
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm (112035 => 112036)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm 2012-03-25 19:51:18 UTC (rev 112035)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm 2012-03-25 20:00:03 UTC (rev 112036)
@@ -269,23 +269,6 @@
$interfaceAvailabilityVersion = "WEBKIT_VERSION_LATEST" if $newPublicClass;
}
-sub GenerateConditionalString
-{
- my $node = shift;
- my $conditional = $node->extendedAttributes->{"Conditional"};
- if ($conditional) {
- if ($conditional =~ /&/) {
- return "ENABLE(" . join(") && ENABLE(", split(/&/, $conditional)) . ")";
- } elsif ($conditional =~ /\|/) {
- return "ENABLE(" . join(") || ENABLE(", split(/\|/, $conditional)) . ")";
- } else {
- return "ENABLE(" . $conditional . ")";
- }
- } else {
- return "";
- }
-}
-
# Params: 'domClass' struct
sub GenerateInterface
{
@@ -825,7 +808,7 @@
push(@headerAttributes, $property) if $public;
push(@privateHeaderAttributes, $property) unless $public;
} else {
- my $attributeConditionalString = GenerateConditionalString($attribute->signature);
+ my $attributeConditionalString = $codeGenerator->GenerateConditionalString($attribute->signature);
if ($attributeConditionalString) {
push(@headerAttributes, "#if ${attributeConditionalString}\n") if $public;
push(@privateHeaderAttributes, "#if ${attributeConditionalString}\n") unless $public;
@@ -920,7 +903,7 @@
AddForwardDeclarationsForType($type, $public) unless $public and $needsDeprecatedVersion;
}
- my $functionConditionalString = GenerateConditionalString($function->signature);
+ my $functionConditionalString = $codeGenerator->GenerateConditionalString($function->signature);
if ($functionConditionalString) {
push(@headerFunctions, "#if ${functionConditionalString}\n") if $public;
push(@privateHeaderFunctions, "#if ${functionConditionalString}\n") unless $public;
@@ -1093,7 +1076,7 @@
# - INCLUDES -
push(@implContentHeader, "\n#import \"config.h\"\n");
- my $conditionalString = GenerateConditionalString($dataNode);
+ my $conditionalString = $codeGenerator->GenerateConditionalString($dataNode);
push(@implContentHeader, "\n#if ${conditionalString}\n\n") if $conditionalString;
push(@implContentHeader, "#import \"DOMInternal.h\"\n\n");
@@ -1363,7 +1346,7 @@
$getterContent = $getterContentHead . $getterContentTail;
}
- my $attributeConditionalString = GenerateConditionalString($attribute->signature);
+ my $attributeConditionalString = $codeGenerator->GenerateConditionalString($attribute->signature);
push(@implContent, "#if ${attributeConditionalString}\n") if $attributeConditionalString;
push(@implContent, $getterSig);
push(@implContent, "{\n");
@@ -1692,7 +1675,7 @@
}
}
- my $conditionalString = GenerateConditionalString($function->signature);
+ my $conditionalString = $codeGenerator->GenerateConditionalString($function->signature);
push(@implContent, "\n#if ${conditionalString}\n") if $conditionalString;
push(@implContent, "$functionSig\n");
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm (112035 => 112036)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm 2012-03-25 19:51:18 UTC (rev 112035)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm 2012-03-25 20:00:03 UTC (rev 112036)
@@ -181,17 +181,6 @@
}
}
-sub GenerateConditionalString
-{
- my $node = shift;
- my $conditional = $node->extendedAttributes->{"Conditional"};
- if ($conditional) {
- return $codeGenerator->GenerateConditionalStringFromAttributeValue($conditional);
- } else {
- return "";
- }
-}
-
sub GetSVGPropertyTypes
{
my $implType = shift;
@@ -365,7 +354,7 @@
my $attrExt = $function->signature->extendedAttributes;
if (($attrExt->{"Custom"} || $attrExt->{"V8Custom"}) && !$attrExt->{"ImplementedBy"} && $function->{overloadIndex} == 1) {
- my $conditionalString = GenerateConditionalString($function->signature);
+ my $conditionalString = $codeGenerator->GenerateConditionalString($function->signature);
push(@headerContent, "#if ${conditionalString}\n") if $conditionalString;
push(@headerContent, <<END);
static v8::Handle<v8::Value> ${name}Callback(const v8::Arguments&);
@@ -387,7 +376,7 @@
foreach my $attribute (@{$dataNode->attributes}) {
my $name = $attribute->signature->name;
my $attrExt = $attribute->signature->extendedAttributes;
- my $conditionalString = GenerateConditionalString($attribute->signature);
+ my $conditionalString = $codeGenerator->GenerateConditionalString($attribute->signature);
if (($attrExt->{"V8CustomGetter"} || $attrExt->{"CustomGetter"} ||
$attrExt->{"V8Custom"} || $attrExt->{"Custom"}) &&
!$attrExt->{"ImplementedBy"}) {
@@ -499,7 +488,7 @@
push(@headerContent, "\n}\n\n");
push(@headerContent, "#endif // $className" . "_h\n");
- my $conditionalString = GenerateConditionalString($dataNode);
+ my $conditionalString = $codeGenerator->GenerateConditionalString($dataNode);
push(@headerContent, "#endif // ${conditionalString}\n\n") if $conditionalString;
}
@@ -786,7 +775,7 @@
my $svgNativeType = $codeGenerator->GetSVGTypeNeedingTearOff($implClassName);
# Getter
- my $conditionalString = GenerateConditionalString($attribute->signature);
+ my $conditionalString = $codeGenerator->GenerateConditionalString($attribute->signature);
push(@implContentDecls, "#if ${conditionalString}\n\n") if $conditionalString;
push(@implContentDecls, <<END);
@@ -1027,7 +1016,7 @@
my $attrName = $attribute->signature->name;
my $attrExt = $attribute->signature->extendedAttributes;
- my $conditionalString = GenerateConditionalString($attribute->signature);
+ my $conditionalString = $codeGenerator->GenerateConditionalString($attribute->signature);
push(@implContentDecls, "#if ${conditionalString}\n\n") if $conditionalString;
push(@implContentDecls, "static void ${attrName}AttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)\n{\n");
@@ -1328,7 +1317,7 @@
# declaration in the IDL.
my $name = $function->signature->name;
- my $conditionalString = GenerateConditionalString($function->signature);
+ my $conditionalString = $codeGenerator->GenerateConditionalString($function->signature);
push(@implContentDecls, "#if ${conditionalString}\n\n") if $conditionalString;
push(@implContentDecls, <<END);
static v8::Handle<v8::Value> ${name}Callback(const v8::Arguments& args)
@@ -1374,7 +1363,7 @@
return;
}
- my $conditionalString = GenerateConditionalString($function->signature);
+ my $conditionalString = $codeGenerator->GenerateConditionalString($function->signature);
push(@implContentDecls, "#if ${conditionalString}\n\n") if $conditionalString;
push(@implContentDecls, <<END);
static v8::Handle<v8::Value> ${name}Callback(const v8::Arguments& args)
@@ -1997,7 +1986,7 @@
my $attributes = shift;
foreach my $attribute (@$attributes) {
- my $conditionalString = GenerateConditionalString($attribute->signature);
+ my $conditionalString = $codeGenerator->GenerateConditionalString($attribute->signature);
push(@implContent, "#if ${conditionalString}\n") if $conditionalString;
GenerateSingleBatchedAttribute($interfaceName, $attribute, ",", "");
push(@implContent, "#endif // ${conditionalString}\n") if $conditionalString;
@@ -2491,7 +2480,7 @@
}
my $name = $function->signature->name;
my $callback = GetFunctionTemplateCallbackName($function, $interfaceName);
- my $conditionalString = GenerateConditionalString($function->signature);
+ my $conditionalString = $codeGenerator->GenerateConditionalString($function->signature);
push(@implContent, "#if ${conditionalString}\n") if $conditionalString;
push(@implContent, <<END);
{"$name", $callback},
@@ -2638,7 +2627,7 @@
# Setup the enable-at-runtime attrs if we have them
foreach my $runtime_attr (@enabledAtRuntime) {
my $enable_function = GetRuntimeEnableFunctionName($runtime_attr->signature);
- my $conditionalString = GenerateConditionalString($runtime_attr->signature);
+ my $conditionalString = $codeGenerator->GenerateConditionalString($runtime_attr->signature);
push(@implContent, "\n#if ${conditionalString}\n") if $conditionalString;
push(@implContent, " if (${enable_function}()) {\n");
push(@implContent, " static const BatchedAttribute attrData =\\\n");
@@ -2653,7 +2642,7 @@
# Setup the enable-at-runtime constants if we have them
foreach my $runtime_const (@constantsEnabledAtRuntime) {
my $enable_function = GetRuntimeEnableFunctionName($runtime_const);
- my $conditionalString = GenerateConditionalString($runtime_const);
+ my $conditionalString = $codeGenerator->GenerateConditionalString($runtime_const);
my $name = $runtime_const->name;
my $value = $runtime_const->value;
push(@implContent, "\n#if ${conditionalString}\n") if $conditionalString;
@@ -2756,7 +2745,7 @@
next;
}
- my $conditionalString = GenerateConditionalString($function->signature);
+ my $conditionalString = $codeGenerator->GenerateConditionalString($function->signature);
push(@implContent, "#if ${conditionalString}\n") if $conditionalString;
push(@implContent, <<END);
@@ -2892,7 +2881,7 @@
} // namespace WebCore
END
- my $conditionalString = GenerateConditionalString($dataNode);
+ my $conditionalString = $codeGenerator->GenerateConditionalString($dataNode);
push(@implContent, "\n#endif // ${conditionalString}\n") if $conditionalString;
# We've already added the header for this file in implFixedHeader, so remove
@@ -2904,7 +2893,7 @@
{
my $dataNode = shift;
my $className = "V8" . $dataNode->name;
- my $conditionalString = GenerateConditionalString($dataNode);
+ my $conditionalString = $codeGenerator->GenerateConditionalString($dataNode);
my @headerContentHeader = split("\r", $headerTemplate);
@@ -2918,7 +2907,7 @@
{
my $dataNode = shift;
my $className = "V8" . $dataNode->name;
- my $conditionalString = GenerateConditionalString($dataNode);
+ my $conditionalString = $codeGenerator->GenerateConditionalString($dataNode);
my @implContentHeader = split("\r", $headerTemplate);
@@ -3001,7 +2990,7 @@
push(@headerContent, "}\n\n");
push(@headerContent, "#endif // $className" . "_h\n\n");
- my $conditionalString = GenerateConditionalString($dataNode);
+ my $conditionalString = $codeGenerator->GenerateConditionalString($dataNode);
push(@headerContent, "#endif // ${conditionalString}\n") if $conditionalString;
}
@@ -3095,7 +3084,7 @@
push(@implContent, "\n} // namespace WebCore\n\n");
- my $conditionalString = GenerateConditionalString($dataNode);
+ my $conditionalString = $codeGenerator->GenerateConditionalString($dataNode);
push(@implContent, "#endif // ${conditionalString}\n") if $conditionalString;
}
