Merge 144626

Source/WebCore/css/StylePropertyShorthand.cpp

Index: Source/WebCore/css/StylePropertyShorthand.cpp
===================================================================
--- Source/WebCore/css/StylePropertyShorthand.cpp	(revision 145343)
+++ Source/WebCore/css/StylePropertyShorthand.cpp	(working copy)
@@ -246,6 +246,18 @@
     return paddingLonghands;
 }
 
+const StylePropertyShorthand& transitionShorthand()
+{
+    static const CSSPropertyID transitionProperties[] = {
+        CSSPropertyTransitionProperty,
+        CSSPropertyTransitionDuration,
+        CSSPropertyTransitionTimingFunction,
+        CSSPropertyTransitionDelay
+    };
+    DEFINE_STATIC_LOCAL(StylePropertyShorthand, transitionLonghands, (transitionProperties, WTF_ARRAY_LENGTH(transitionProperties)));
+    return transitionLonghands;
+}
+
 const StylePropertyShorthand& webkitAnimationShorthand()
 {
     static const CSSPropertyID animationProperties[] = {
@@ -493,6 +505,8 @@
         return overflowShorthand();
     case CSSPropertyPadding:
         return paddingShorthand();
+    case CSSPropertyTransition:
+        return transitionShorthand();
     case CSSPropertyWebkitAnimation:
         return webkitAnimationShorthand();
     case CSSPropertyWebkitBorderAfter: