Merge 144626

Source/WebCore/css/StylePropertyShorthand.cpp

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. 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.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 228 matching lines @@
     static const CSSPropertyID paddingProperties[] = {
         CSSPropertyPaddingTop,
         CSSPropertyPaddingRight,
         CSSPropertyPaddingBottom,
         CSSPropertyPaddingLeft
     };
     DEFINE_STATIC_LOCAL(StylePropertyShorthand, paddingLonghands, (paddingProperties, WTF_ARRAY_LENGTH(paddingProperties)));
     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[] = {
         CSSPropertyWebkitAnimationName,
         CSSPropertyWebkitAnimationDuration,
         CSSPropertyWebkitAnimationTimingFunction,
         CSSPropertyWebkitAnimationDelay,
         CSSPropertyWebkitAnimationIterationCount,
         CSSPropertyWebkitAnimationDirection,
         CSSPropertyWebkitAnimationFillMode
@@ skipping 227 matching lines @@
     case CSSPropertyFont:
         return fontShorthand();
     case CSSPropertyMargin:
         return marginShorthand();
     case CSSPropertyOutline:
         return outlineShorthand();
     case CSSPropertyOverflow:
         return overflowShorthand();
     case CSSPropertyPadding:
         return paddingShorthand();
+    case CSSPropertyTransition:
+        return transitionShorthand();
     case CSSPropertyWebkitAnimation:
         return webkitAnimationShorthand();
     case CSSPropertyWebkitBorderAfter:
         return webkitBorderAfterShorthand();
     case CSSPropertyWebkitBorderBefore:
         return webkitBorderBeforeShorthand();
     case CSSPropertyWebkitBorderEnd:
         return webkitBorderEndShorthand();
     case CSSPropertyWebkitBorderStart:
         return webkitBorderStartShorthand();
@@ skipping 30 matching lines @@
         return webkitWrapShorthand();
 #endif
     default: {
         DEFINE_STATIC_LOCAL(StylePropertyShorthand, emptyShorthand, ());
         return emptyShorthand;
     }
     }
 }
 
 } // namespace WebCore