Index: Source/core/scripts/make_names.pl |
diff --git a/Source/core/scripts/make_names.pl b/Source/core/scripts/make_names.pl |
index 276e45f48305835bad0163be4004902381c7a5fe..4a93c848755e6f67d3e9212ff41478b0ee820c20 100755 |
--- a/Source/core/scripts/make_names.pl |
+++ b/Source/core/scripts/make_names.pl |
@@ -115,6 +115,7 @@ die "You must specify a namespace (e.g. SVG) for <namespace>Names.h" unless $par |
die "You must specify a namespaceURI (e.g. http://www.w3.org/2000/svg)" unless $parameters{namespaceURI}; |
$parameters{namespacePrefix} = $parameters{namespace} unless $parameters{namespacePrefix}; |
+$parameters{fallbackJSInterfaceName} = $parameters{fallbackInterfaceName} unless $parameters{fallbackJSInterfaceName}; |
my $namesBasePath = "$outputDir/$parameters{namespace}Names"; |
my $factoryBasePath = "$outputDir/$parameters{namespace}ElementFactory"; |
@@ -159,7 +160,8 @@ sub defaultParametersHash |
'guardFactoryWith' => '', |
'tagsNullNamespace' => 0, |
'attrsNullNamespace' => 0, |
- 'fallbackInterfaceName' => '' |
+ 'fallbackInterfaceName' => '', |
+ 'fallbackJSInterfaceName' => '' |
); |
} |
@@ -690,7 +692,7 @@ sub printJSElementIncludes |
print F "#include \"V8${JSInterfaceName}.h\"\n"; |
} |
- print F "#include \"V8$parameters{fallbackInterfaceName}.h\"\n"; |
+ print F "#include \"V8$parameters{fallbackJSInterfaceName}.h\"\n"; |
} |
sub printElementIncludes |
@@ -966,7 +968,7 @@ sub printWrapperFunctions |
for my $tagName (sort keys %enabledTags) { |
# Avoid defining the same wrapper method twice. |
my $JSInterfaceName = $enabledTags{$tagName}{JSInterfaceName}; |
- next if defined($tagsSeen{$JSInterfaceName}) || (usesDefaultJSWrapper($tagName) && ($parameters{fallbackInterfaceName} eq $parameters{namespace} . "Element")); |
+ next if defined($tagsSeen{$JSInterfaceName}) || (usesDefaultJSWrapper($tagName) && ($parameters{fallbackJSInterfaceName} eq $parameters{namespace} . "Element")); |
$tagsSeen{$JSInterfaceName} = 1; |
my $conditional = $enabledTags{$tagName}{conditional}; |
@@ -1096,7 +1098,7 @@ END |
for my $tag (sort keys %enabledTags) { |
# Do not add the name to the map if it does not have a JS wrapper constructor or uses the default wrapper. |
- next if (usesDefaultJSWrapper($tag, \%enabledTags) && ($parameters{fallbackInterfaceName} eq $parameters{namespace} . "Element")); |
+ next if (usesDefaultJSWrapper($tag, \%enabledTags) && ($parameters{fallbackJSInterfaceName} eq $parameters{namespace} . "Element")); |
my $conditional = $enabledTags{$tag}{conditional}; |
if ($conditional) { |
@@ -1203,7 +1205,7 @@ sub printWrapperFactoryHeaderFile |
print F <<END |
#include <V8$parameters{namespace}Element.h> |
-#include <V8$parameters{fallbackInterfaceName}.h> |
+#include <V8$parameters{fallbackJSInterfaceName}.h> |
#include <v8.h> |
namespace WebCore { |
@@ -1216,9 +1218,9 @@ namespace WebCore { |
{ |
return V8$parameters{namespace}Element::createWrapper(element, creationContext, isolate); |
} |
- inline v8::Handle<v8::Object> createV8$parameters{namespace}FallbackWrapper($parameters{fallbackInterfaceName}* element, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate) |
+ inline v8::Handle<v8::Object> createV8$parameters{namespace}FallbackWrapper($parameters{fallbackJSInterfaceName}* element, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate) |
{ |
- return V8$parameters{fallbackInterfaceName}::createWrapper(element, creationContext, isolate); |
+ return V8$parameters{fallbackJSInterfaceName}::createWrapper(element, creationContext, isolate); |
} |
} |
END |