Merge CSSProperties.in and CSSShorthands.in

Source/core/css/CSSShorthands.in

Index: Source/core/css/CSSShorthands.in
diff --git a/Source/core/css/CSSShorthands.in b/Source/core/css/CSSShorthands.in
deleted file mode 100644
index 8614cf9aa3ff1ac0fcdcfe51287c0e71ee26f149..0000000000000000000000000000000000000000
--- a/Source/core/css/CSSShorthands.in
+++ /dev/null
@@ -1,53 +0,0 @@
-// This file contains all the mapping shorthands <-> longhands and generate
-// the appropriate code to handle them in core. First column is the shorthand name
-// followed by the longhands associated to the shorthand.
-// Note: Mandatory blank line to skip parameter parsing phase
-
-animation longhands=animation-name;animation-duration;animation-timing-function;animation-delay;animation-iteration-count;animation-direction;animation-fill-mode;animation-play-state
-background longhands=background-image;background-position-x;background-position-y;background-size;background-repeat-x;background-repeat-y;background-attachment;background-origin;background-clip;background-color
-background-position longhands=background-position-x;background-position-y
-background-repeat longhands=background-repeat-x;background-repeat-y
-border longhands=border-top-color;border-top-style;border-top-width;border-right-color;border-right-style;border-right-width;border-bottom-color;border-bottom-style;border-bottom-width;border-left-color;border-left-style;border-left-width
-border-bottom longhands=border-bottom-width;border-bottom-style;border-bottom-color
-border-color longhands=border-top-color;border-right-color;border-bottom-color;border-left-color
-border-image longhands=border-image-source;border-image-slice;border-image-width;border-image-outset;border-image-repeat
-border-left longhands=border-left-width;border-left-style;border-left-color
-border-radius longhands=border-top-left-radius;border-top-right-radius;border-bottom-right-radius;border-bottom-left-radius
-border-right longhands=border-right-width;border-right-style;border-right-color
-border-spacing longhands=-webkit-border-horizontal-spacing;-webkit-border-vertical-spacing
-border-style longhands=border-top-style;border-right-style;border-bottom-style;border-left-style
-border-top longhands=border-top-width;border-top-style;border-top-color
-border-width longhands=border-top-width;border-right-width;border-bottom-width;border-left-width
-flex longhands=flex-grow;flex-shrink;flex-basis
-flex-flow longhands=flex-direction;flex-wrap
-font longhands=font-family;font-size;font-style;font-variant;font-weight;font-stretch;line-height
-grid longhands=grid-template;grid-auto-flow;grid-auto-columns;grid-auto-rows
-grid-template longhands=grid-template-columns;grid-template-rows;grid-template-areas
-grid-area longhands=grid-row-start;grid-column-start;grid-row-end;grid-column-end
-grid-column longhands=grid-column-start;grid-column-end
-grid-row longhands=grid-row-start;grid-row-end
-list-style longhands=list-style-type;list-style-position;list-style-image
-margin longhands=margin-top;margin-right;margin-bottom;margin-left
-marker longhands=marker-start;marker-mid;marker-end
-outline longhands=outline-color;outline-style;outline-width
-overflow longhands=overflow-x;overflow-y
-padding longhands=padding-top;padding-right;padding-bottom;padding-left
-text-decoration longhands=text-decoration-line;text-decoration-style;text-decoration-color
-transition longhands=transition-property;transition-duration;transition-timing-function;transition-delay
--webkit-animation longhands=-webkit-animation-name;-webkit-animation-duration;-webkit-animation-timing-function;-webkit-animation-delay;-webkit-animation-iteration-count;-webkit-animation-direction;-webkit-animation-fill-mode;-webkit-animation-play-state
--webkit-border-after longhands=-webkit-border-after-width;-webkit-border-after-style;-webkit-border-after-color
--webkit-border-before longhands=-webkit-border-before-width;-webkit-border-before-style;-webkit-border-before-color
--webkit-border-end longhands=-webkit-border-end-width;-webkit-border-end-style;-webkit-border-end-color
--webkit-border-start longhands=-webkit-border-start-width;-webkit-border-start-style;-webkit-border-start-color
--webkit-border-radius longhands=border-top-left-radius;border-top-right-radius;border-bottom-right-radius;border-bottom-left-radius
--webkit-columns longhands=-webkit-column-width;-webkit-column-count
--webkit-column-rule longhands=-webkit-column-rule-width;-webkit-column-rule-style;-webkit-column-rule-color
--webkit-margin-collapse longhands=-webkit-margin-before-collapse;-webkit-margin-after-collapse
--webkit-mask longhands=-webkit-mask-image;-webkit-mask-position-x;-webkit-mask-position-y;-webkit-mask-size;-webkit-mask-repeat-x;-webkit-mask-repeat-y;-webkit-mask-origin;-webkit-mask-clip
--webkit-mask-box-image longhands=-webkit-mask-box-image-source;-webkit-mask-box-image-slice;-webkit-mask-box-image-width;-webkit-mask-box-image-outset;-webkit-mask-box-image-repeat
--webkit-mask-position longhands=-webkit-mask-position-x;-webkit-mask-position-y
--webkit-mask-repeat longhands=-webkit-mask-repeat-x;-webkit-mask-repeat-y
--webkit-text-emphasis longhands=-webkit-text-emphasis-style;-webkit-text-emphasis-color
--webkit-text-stroke longhands=-webkit-text-stroke-width;-webkit-text-stroke-color
--webkit-transition longhands=-webkit-transition-property;-webkit-transition-duration;-webkit-transition-timing-function;-webkit-transition-delay
--webkit-transform-origin longhands=-webkit-transform-origin-x;-webkit-transform-origin-y;-webkit-transform-origin-z