OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2007, 2008, 2009 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2008, 2009 Apple Inc. All rights reserved. |
3 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. | 3 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
7 * are met: | 7 * are met: |
8 * | 8 * |
9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
(...skipping 893 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
904 } | 904 } |
905 | 905 |
906 const Vector<AnimationPropertyWrapperBase*> propertyWrappers() const { retur n m_propertyWrappers; } | 906 const Vector<AnimationPropertyWrapperBase*> propertyWrappers() const { retur n m_propertyWrappers; } |
907 | 907 |
908 private: | 908 private: |
909 Vector<AnimationPropertyWrapperBase*> m_propertyWrappers; | 909 Vector<AnimationPropertyWrapperBase*> m_propertyWrappers; |
910 }; | 910 }; |
911 | 911 |
912 class PropertyWrapperFlex : public AnimationPropertyWrapperBase { | 912 class PropertyWrapperFlex : public AnimationPropertyWrapperBase { |
913 public: | 913 public: |
914 PropertyWrapperFlex() : AnimationPropertyWrapperBase(CSSPropertyWebkitFlex) | 914 PropertyWrapperFlex() : AnimationPropertyWrapperBase(CSSPropertyFlex) |
Julien - ping for review
2013/06/13 17:10:59
Interesting, I would have expected this to be styl
cbiesinger
2013/06/13 20:21:43
Done.
| |
915 { | 915 { |
916 } | 916 } |
917 | 917 |
918 virtual bool equals(const RenderStyle* a, const RenderStyle* b) const | 918 virtual bool equals(const RenderStyle* a, const RenderStyle* b) const |
919 { | 919 { |
920 // If the style pointers are the same, don't bother doing the test. | 920 // If the style pointers are the same, don't bother doing the test. |
921 // If either is null, return false. If both are null, return true. | 921 // If either is null, return false. If both are null, return true. |
922 if ((!a && !b) || a == b) | 922 if ((!a && !b) || a == b) |
923 return true; | 923 return true; |
924 if (!a || !b) | 924 if (!a || !b) |
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1239 } | 1239 } |
1240 | 1240 |
1241 int CSSPropertyAnimation::getNumProperties() | 1241 int CSSPropertyAnimation::getNumProperties() |
1242 { | 1242 { |
1243 ensurePropertyMap(); | 1243 ensurePropertyMap(); |
1244 | 1244 |
1245 return gPropertyWrappers->size(); | 1245 return gPropertyWrappers->size(); |
1246 } | 1246 } |
1247 | 1247 |
1248 } | 1248 } |
OLD | NEW |