OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 882 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
893 case CSSPropertyWebkitTransform: | 893 case CSSPropertyWebkitTransform: |
894 case CSSPropertyWebkitTransformOriginX: | 894 case CSSPropertyWebkitTransformOriginX: |
895 case CSSPropertyWebkitTransformOriginY: | 895 case CSSPropertyWebkitTransformOriginY: |
896 case CSSPropertyWebkitTransformOriginZ: | 896 case CSSPropertyWebkitTransformOriginZ: |
897 case CSSPropertyWidows: | 897 case CSSPropertyWidows: |
898 case CSSPropertyWidth: | 898 case CSSPropertyWidth: |
899 case CSSPropertyWordSpacing: | 899 case CSSPropertyWordSpacing: |
900 case CSSPropertyZIndex: | 900 case CSSPropertyZIndex: |
901 case CSSPropertyZoom: | 901 case CSSPropertyZoom: |
902 return true; | 902 return true; |
903 // FIXME: Shorthands should not be present in this list, but | |
904 // CSSPropertyAnimation implements animation of these shorthands | |
905 // directly and makes use of this method. | |
906 case CSSPropertyFlex: | |
907 return !RuntimeEnabledFeatures::webAnimationsCSSEnabled(); | |
908 default: | 903 default: |
909 return false; | 904 return false; |
910 } | 905 } |
911 } | 906 } |
912 | 907 |
913 const StylePropertyShorthand& CSSAnimations::animatableProperties() | 908 const StylePropertyShorthand& CSSAnimations::animatableProperties() |
914 { | 909 { |
915 DEFINE_STATIC_LOCAL(Vector<CSSPropertyID>, properties, ()); | 910 DEFINE_STATIC_LOCAL(Vector<CSSPropertyID>, properties, ()); |
916 DEFINE_STATIC_LOCAL(StylePropertyShorthand, propertyShorthand, ()); | 911 DEFINE_STATIC_LOCAL(StylePropertyShorthand, propertyShorthand, ()); |
917 if (properties.isEmpty()) { | 912 if (properties.isEmpty()) { |
918 for (int i = firstCSSProperty; i < lastCSSProperty; ++i) { | 913 for (int i = firstCSSProperty; i < lastCSSProperty; ++i) { |
919 CSSPropertyID id = convertToCSSPropertyID(i); | 914 CSSPropertyID id = convertToCSSPropertyID(i); |
920 if (isAnimatableProperty(id)) | 915 if (isAnimatableProperty(id)) |
921 properties.append(id); | 916 properties.append(id); |
922 } | 917 } |
923 propertyShorthand = StylePropertyShorthand(CSSPropertyInvalid, propertie
s.begin(), properties.size()); | 918 propertyShorthand = StylePropertyShorthand(CSSPropertyInvalid, propertie
s.begin(), properties.size()); |
924 } | 919 } |
925 return propertyShorthand; | 920 return propertyShorthand; |
926 } | 921 } |
927 | 922 |
928 } // namespace WebCore | 923 } // namespace WebCore |
OLD | NEW |