Merge CSSProperties.in and CSSShorthands.in

Source/core/core_generated.gyp

Index: Source/core/core_generated.gyp
diff --git a/Source/core/core_generated.gyp b/Source/core/core_generated.gyp
index 73fcc61f856cc5269d40bf3cbd1a00c5a4da9f6d..3cb863bd5a740a01990b84cdd75e76a85caae480 100644
--- a/Source/core/core_generated.gyp
+++ b/Source/core/core_generated.gyp
@@ -317,11 +317,10 @@
         {
           'action_name': 'StylePropertyShorthand',
           'inputs': [
-            '<@(scripts_for_in_files)',
+            '<@(css_properties_files)',
             '../build/scripts/make_style_shorthands.py',
             '../build/scripts/templates/StylePropertyShorthand.cpp.tmpl',
             '../build/scripts/templates/StylePropertyShorthand.h.tmpl',
-            'css/CSSShorthands.in',
           ],
           'outputs': [
             '<(blink_core_output_dir)/StylePropertyShorthand.cpp',
@@ -330,7 +329,7 @@
           'action': [
             'python',
             '../build/scripts/make_style_shorthands.py',
-            'css/CSSShorthands.in',
+            'css/CSSProperties.in',
             '--output_dir',
             '<(blink_core_output_dir)',
           ],
@@ -338,12 +337,11 @@
         {
           'action_name': 'StyleBuilder',
           'inputs': [
-            '<@(scripts_for_in_files)',
+            '<@(css_properties_files)',
             '../build/scripts/make_style_builder.py',
             '../build/scripts/templates/StyleBuilder.cpp.tmpl',
             '../build/scripts/templates/StyleBuilderFunctions.cpp.tmpl',
             '../build/scripts/templates/StyleBuilderFunctions.h.tmpl',
-            'css/CSSProperties.in',
           ],
           'outputs': [
             '<(blink_core_output_dir)/StyleBuilder.cpp',