Add support in generate scripts to handle Conditional

WEB_AUDIO and SVG_FONTS conditions in tagName files were 
handled by generate scripts and this CL adds the support. 
This fix was also needed to build without SVG_FONTS enabled.

Review URL: https://codereview.chromium.org/330093002

git-svn-id: svn://svn.chromium.org/blink/trunk@176249 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/build/scripts/make_element_factory.py

@@ -40,6 +40,7 @@ from make_qualified_names import MakeQualifiedNamesWriter
 class MakeElementFactoryWriter(MakeQualifiedNamesWriter):
     defaults = dict(MakeQualifiedNamesWriter.default_parameters, **{
         'JSInterfaceName': None,
+        'Conditional': None,
         'constructorNeedsCreatedByParser': None,
         'constructorNeedsFormElement': None,
         'contextConditional': None,

third_party/WebKit/Source/build/scripts/make_element_type_helpers.py

@@ -22,9 +22,7 @@ def _symbol(tag):
 
 class MakeElementTypeHelpersWriter(in_generator.Writer):
     defaults = {
-        'interfaceName': None,
-        'noConstructor': None,
-        'noTypeHelpers': None,
+        'Conditional': None,
         'ImplementedAs': None,
         'JSInterfaceName': None,
         'constructorNeedsCreatedByParser': None,
@@ -32,17 +30,20 @@ class MakeElementTypeHelpersWriter(in_generator.Writer):
         'contextConditional': None,
         'interfaceName': None,
         'noConstructor': None,
+        'noConstructor': None,
+        'noTypeHelpers': None,
         'runtimeEnabled': None,
     }
     default_parameters = {
         'attrsNullNamespace': None,
+        'fallbackInterfaceName': '',
         'namespace': '',
         'namespacePrefix': '',
         'namespaceURI': '',
-        'fallbackInterfaceName': '',
         'fallbackJSInterfaceName': '',
     }
     filters = {
+        'enable_conditional': name_utilities.enable_conditional_if_endif,
         'hash': hasher.hash,
         'symbol': _symbol,
     }

third_party/WebKit/Source/build/scripts/make_names.py

@@ -46,17 +46,18 @@ def _symbol(entry):
 class MakeNamesWriter(in_generator.Writer):
     defaults = {
         'Conditional': None,  # FIXME: Add support for Conditional.
-        'RuntimeEnabled': None,  # What should we do for runtime-enabled features?
         'ImplementedAs': None,
+        'RuntimeEnabled': None,  # What should we do for runtime-enabled features?
         'Symbol': None,
     }
     default_parameters = {
+        'export': '',
         'namespace': '',
         'suffix': '',
-        'export': '',
     }
     filters = {
         'cpp_name': name_utilities.cpp_name,
+        'enable_conditional': name_utilities.enable_conditional_if_endif,
         'hash': hasher.hash,
         'script_name': name_utilities.script_name,
         'symbol': _symbol,

third_party/WebKit/Source/build/scripts/make_qualified_names.py

@@ -55,8 +55,9 @@ class MakeQualifiedNamesWriter(in_generator.Writer):
     }
     filters = {
         'hash': hasher.hash,
-        'to_macro_style': name_utilities.to_macro_style,
+        'enable_conditional': name_utilities.enable_conditional_if_endif,
         'symbol': _symbol,
+        'to_macro_style': name_utilities.to_macro_style,
     }
 
     def __init__(self, in_file_paths):

third_party/WebKit/Source/build/scripts/templates/ElementFactory.cpp.tmpl

@@ -35,6 +35,7 @@ typedef HashMap<AtomicString, ConstructorFunction> FunctionMap;
 static FunctionMap* g_constructors = 0;
 
 {% for tag in tags|sort if not tag.noConstructor %}
+{% filter enable_conditional(tag.Conditional) %}
 static PassRefPtrWillBeRawPtr<{{namespace}}Element> {{tag|symbol}}Constructor(
     Document& document,
     {% if namespace == 'HTML' %}
@@ -57,6 +58,7 @@ static PassRefPtrWillBeRawPtr<{{namespace}}Element> {{tag|symbol}}Constructor(
         {%- if tag.constructorNeedsCreatedByParser %}, createdByParser{% endif -%}
     );
 }
+{% endfilter %}
 {% endfor %}
 
 struct Create{{namespace}}FunctionMapData {
@@ -68,9 +70,13 @@ static void create{{namespace}}FunctionMap()
 {
     ASSERT(!g_constructors);
     g_constructors = new FunctionMap;
+    // Empty array initializer lists are illegal [dcl.init.aggr] and will not
+    // compile in MSVC. If tags list is empty, add check to skip this.
     static const Create{{namespace}}FunctionMapData data[] = {
     {% for tag in tags|sort if not tag.noConstructor %}
+    {% filter enable_conditional(tag.Conditional) %}
         { {{tag|symbol}}Tag, {{tag|symbol}}Constructor },
+    {% endfilter %}
     {% endfor %}
     };
     for (size_t i = 0; i < WTF_ARRAY_LENGTH(data); i++)

third_party/WebKit/Source/build/scripts/templates/ElementTypeHelpers.h.tmpl

@@ -12,6 +12,7 @@
 namespace WebCore {
 // Type checking.
 {% for tag in tags|sort if not tag.multipleTagNames and not tag.noTypeHelpers %}
+{% filter enable_conditional(tag.Conditional) %}
 class {{tag.interface}};
 void is{{tag.interface}}(const {{tag.interface}}&); // Catch unnecessary runtime check of type known at compile time.
 void is{{tag.interface}}(const {{tag.interface}}*); // Catch unnecessary runtime check of type known at compile time.
@@ -51,13 +52,15 @@ template <> inline bool isElementOfType<const {{tag.interface}}>(const Element&
 {% if namespace == "HTML" %}
 template <> inline bool isElementOfType<const {{tag.interface}}>(const HTMLElement& element) { return is{{tag.interface}}(element); }
 {% endif %}
-
+{% endfilter %}
 {% endfor %}
 // Using macros because the types are forward-declared and we don't want to use reinterpret_cast in the
 // casting functions above. reinterpret_cast would be unsafe due to multiple inheritence.
 
 {% for tag in tags|sort if not tag.multipleTagNames and not tag.noTypeHelpers %}
+{% filter enable_conditional(tag.Conditional) %}
 #define to{{tag.interface}}(x) WebCore::toElement<WebCore::{{tag.interface}}>(x)
+{% endfilter %}
 {% endfor %}
 } // WebCore
 

third_party/WebKit/Source/build/scripts/templates/ElementWrapperFactory.cpp.tmpl

@@ -31,6 +31,7 @@ static v8::Handle<v8::Object> create{{namespace}}ElementWrapper({{namespace}}Ele
     return v8::Handle<v8::Object>();
 }
 {% for js_interface, list in tags|sort|selectattr('has_js_interface')|groupby('js_interface') %}
+{% filter enable_conditional(list[0].Conditional) %}
 static v8::Handle<v8::Object> create{{js_interface}}Wrapper({{namespace}}Element* element, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
 {
     {% if list[0].contextConditional %}
@@ -43,6 +44,7 @@ static v8::Handle<v8::Object> create{{js_interface}}Wrapper({{namespace}}Element
     {% endif %}
     return wrap(static_cast<{{js_interface}}*>(element), creationContext, isolate);
 }
+{% endfilter %}
 {% endfor %}
 
 v8::Handle<v8::Object> createV8{{namespace}}Wrapper({{namespace}}Element* element, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
@@ -51,7 +53,9 @@ v8::Handle<v8::Object> createV8{{namespace}}Wrapper({{namespace}}Element* elemen
     DEFINE_STATIC_LOCAL(FunctionMap, map, ());
     if (map.isEmpty()) {
     {% for tag in tags|sort %}
+    {% filter enable_conditional(tag.Conditional) %}
         map.set({{tag|symbol}}Tag.localName().impl(), create{{tag.js_interface}}Wrapper);
+    {% endfilter %}
     {% endfor %}
     }
 
@@ -78,7 +82,9 @@ const WrapperTypeInfo* findWrapperTypeFor{{namespace}}TagName(const AtomicString
         // FIXME: This seems wrong. We should list every interface here, not
         // just the ones that have specialized JavaScript interfaces.
         {% for tag in tags|sort if tag.has_js_interface %}
+        {% filter enable_conditional(tag.Conditional) %}
         map.set({{tag|symbol}}Tag.localName().impl(), &V8{{tag.js_interface}}::wrapperTypeInfo);
+        {% endfilter %}
         {% endfor %}
     }
 

third_party/WebKit/Source/build/scripts/templates/MakeNames.cpp.tmpl

@@ -17,22 +17,28 @@ namespace {{namespace}}Names {
 using namespace WTF;
 
 {% for entry in entries|sort %}
+{% filter enable_conditional(entry.Conditional) %}
 {% if export %}
 DEFINE_GLOBAL(AtomicString, {{entry|symbol}}Storage)
 {{export}} const AtomicString& {{entry|symbol}} = *reinterpret_cast<const AtomicString*>(&{{entry|symbol}}Storage);
 {% else %}
 DEFINE_GLOBAL(AtomicString, {{entry|symbol}})
 {% endif %}
+{% endfilter %}
 {% endfor %}
 
 void init{{suffix}}()
 {
     {% for entry in entries|sort %}
+    {% filter enable_conditional(entry.Conditional) %}
     StringImpl* {{entry|symbol}}Impl = StringImpl::createStatic("{{entry|cpp_name}}", {{entry|cpp_name|length}}, {{entry|cpp_name|hash}});
+    {% endfilter %}
     {% endfor %}
 
     {% for entry in entries|sort %}
+    {% filter enable_conditional(entry.Conditional) %}
     new ((void*)&{{entry|symbol}}) AtomicString({{entry|symbol}}Impl);
+    {% endfilter %}
     {% endfor %}
 }
 

third_party/WebKit/Source/build/scripts/templates/MakeNames.h.tmpl

@@ -19,11 +19,13 @@ namespace {{namespace}}Names {
 #ifndef {{namespace|to_macro_style}}_NAMES_HIDE_GLOBALS
 
 {% for entry in entries|sort %}
+{% filter enable_conditional(entry.Conditional) %}
 {% if export %}
 {{export}} extern const WTF::AtomicString& {{entry|symbol}};
 {% else %}
 extern const WTF::AtomicString {{entry|symbol}};
 {% endif %}
+{% endfilter %}
 {% endfor %}
 
 #endif // {{namespace|to_macro_style}}_NAMES_HIDE_GLOBALS

third_party/WebKit/Source/core/svg/SVGTagNames.in

@@ -4,11 +4,9 @@ fallbackInterfaceName="SVGUnknownElement"
 fallbackJSInterfaceName="SVGElement"
 
 a
-#if ENABLE_SVG_FONTS
-altGlyph
-altGlyphDef
-altGlyphItem
-#endif
+altGlyph Conditional=SVG_FONTS
+altGlyphDef Conditional=SVG_FONTS
+altGlyphItem Conditional=SVG_FONTS
 animate noTypeHelpers
 animateColor interfaceName=SVGUnknownElement, JSInterfaceName=SVGElement, noConstructor
 animateMotion
@@ -47,30 +45,24 @@ feSpotLight
 feTile
 feTurbulence
 filter
-#if ENABLE_SVG_FONTS
-font
-font-face
-font-face-format
-font-face-name
-font-face-src
-font-face-uri
-#endif
+font Conditional=SVG_FONTS
+font-face Conditional=SVG_FONTS
+font-face-format Conditional=SVG_FONTS
+font-face-name Conditional=SVG_FONTS
+font-face-src Conditional=SVG_FONTS
+font-face-uri Conditional=SVG_FONTS
 foreignObject
 g
-#if ENABLE_SVG_FONTS
-glyph
-glyphRef
-hkern interfaceName=SVGHKernElement
-#endif
+glyph Conditional=SVG_FONTS
+glyphRef Conditional=SVG_FONTS
+hkern Conditional=SVG_FONTS, interfaceName=SVGHKernElement
 image
 line
 linearGradient
 marker
 mask
 metadata
-#if ENABLE_SVG_FONTS
-missing-glyph
-#endif
+missing-glyph Conditional=SVG_FONTS
 mpath interfaceName=SVGMPathElement
 path
 pattern
@@ -90,6 +82,4 @@ title
 tspan interfaceName=SVGTSpanElement
 use
 view
-#if ENABLE_SVG_FONTS
-vkern interfaceName=SVGVKernElement
-#endif
+vkern Conditional=SVG_FONTS, interfaceName=SVGVKernElement