Merge CSSProperties.in and CSSShorthands.in

Source/devtools/devtools.gyp

 #
 # Copyright (C) 2013 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #         * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #         * Redistributions in binary form must reproduce the above
@@ skipping 221 matching lines @@
           'type': 'none',
           'actions': [
             {
               'action_name': 'generateSupportedCSSProperties',
               'inputs': [
                 # The python script in action below.
                 'scripts/generate_supported_css.py',
                 # Input files for the script.
                 '../core/css/CSSPropertyNames.in',
                 '../core/css/SVGCSSPropertyNames.in',
-                '../core/css/CSSShorthands.in',
+                '../core/css/CSSProperties.in',
               ],
               'outputs': [
                 '<(blink_devtools_output_dir)/SupportedCSSProperties.js',
               ],
               'action': [
                 'python',
                 '<@(_inputs)',
                 '<@(_outputs)',
               ],
               'message': 'Generating supported CSS properties for front end',
@@ skipping 669 matching lines @@
                             '<@(devtools_module_json_files)',
                         ],
                         'outputs': ['<(blink_devtools_output_dir)/common/modules.js'],
                         'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)', '<@(devtools_module_json_files)'],
                     }],
                 },
             ],
         }],
     ], # conditions
 }