Merge CSSProperties.in and CSSShorthands.in

Source/build/scripts/templates/StylePropertyShorthand.h.tmpl

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Intel Corporation. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 49 matching lines @@
     CSSPropertyID id() const { return m_shorthandID; }
 
 private:
     const CSSPropertyID* m_properties;
     const StylePropertyShorthand** m_propertiesForInitialization;
     unsigned m_length;
     CSSPropertyID m_shorthandID;
 };
 
 {% for property_id, property in properties.items() %}
-{% set camel_case_name = property.camel_case_name %}
-const StylePropertyShorthand& {{camel_case_name}}Shorthand();
+const StylePropertyShorthand& {{property.lower_camel_name}}Shorthand();
 {% endfor %}
 
 // Returns an empty list if the property is not a shorthand, otherwise the list of longhands for parsing.
 const StylePropertyShorthand& parsingShorthandForProperty(CSSPropertyID);
 
 // Returns an empty list if the property is not a shorthand.
 const StylePropertyShorthand& shorthandForProperty(CSSPropertyID);
 
 // Return the list of shorthands for a given longhand.
 // The client must pass in an empty result vector.
 void getMatchingShorthandsForLonghand(CSSPropertyID, Vector<StylePropertyShorthand, 4>* result);
 
 unsigned indexOfShorthandForLonghand(CSSPropertyID, const Vector<StylePropertyShorthand, 4>&);
 
 bool isExpandedShorthand(CSSPropertyID);
 
 bool isExpandedShorthandForAll(CSSPropertyID);
 
 } // namespace blink
 
 #endif // StylePropertyShorthand_h