Merge CSSProperties.in and CSSShorthands.in

Source/build/scripts/templates/StyleBuilder.cpp.tmpl

Index: Source/build/scripts/templates/StyleBuilder.cpp.tmpl
diff --git a/Source/build/scripts/templates/StyleBuilder.cpp.tmpl b/Source/build/scripts/templates/StyleBuilder.cpp.tmpl
index 861dda7317725bab7184f536f08667c953c1d39b..537baf0b6fbde46856c5466803673ba1d85315a2 100644
--- a/Source/build/scripts/templates/StyleBuilder.cpp.tmpl
+++ b/Source/build/scripts/templates/StyleBuilder.cpp.tmpl
@@ -16,7 +16,7 @@ namespace blink {
 void StyleBuilder::applyProperty(CSSPropertyID property, StyleResolverState& state, CSSValue* value, bool isInitial, bool isInherit) {
     switch(property) {
     {% for property_id, property in properties.items()
-          if not property.direction_aware and not property.skip %}
+        if property.should_declare_functions or property.use_handlers_for %}
     {% set used_property = properties[property.use_handlers_for] or property %}
     {% set used_property_id = used_property.property_id %}
     case {{property_id}}:
@@ -38,12 +38,11 @@ void StyleBuilder::applyProperty(CSSPropertyID property, StyleResolverState& sta
         applyProperty(resolvedProperty, state, value);
         return;
     }
-    {% for property_id, property in properties.items() if property.skip %}
+    {% for property_id, property in properties.items() if property.builder_skip %}
     case {{property_id}}:
     {% endfor %}
         return;
     default:
-        // FIXME: We should explicitly handle all cases here once we merge the various .in files
         ASSERT_NOT_REACHED();
     }
 }