Changeset 155119 in webkit for trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp

Timestamp:

Sep 5, 2013, 8:15:59 AM (12 years ago)

Author:

[email protected]

Message:

Animations in an AnimationList are never null
​https://bugs.webkit.org/show_bug.cgi?id=120720

Reviewed by Andreas Kling.

Change AnimationList::operator[] to return an Animation& and fix up related code to also take references.

• css/CSSComputedStyleDeclaration.cpp:
• css/DeprecatedStyleBuilder.cpp:
• page/animation/CompositeAnimation.cpp:
• page/animation/KeyframeAnimation.cpp:
• platform/animation/Animation.h:
• platform/animation/AnimationList.cpp:
• platform/animation/AnimationList.h:
• rendering/RenderLayerBacking.cpp:

File:

• trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp (modified) (3 diffs)

trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp

@@ -1636 +1636 @@
 class ApplyPropertyAnimation {
 public:
-    static void setValue(Animation* animation, T value) { (animation->*setterFunction)(value); }
-    static T value(const Animation* animation) { return (animation->*getterFunction)(); }
-    static bool test(const Animation* animation) { return (animation->*testFunction)(); }
-    static void clear(Animation* animation) { (animation->*clearFunction)(); }
+    static void setValue(Animation& animation, T value) { (animation.*setterFunction)(value); }
+    static T value(const Animation& animation) { return (animation.*getterFunction)(); }
+    static bool test(const Animation& animation) { return (animation.*testFunction)(); }
+    static void clear(Animation& animation) { (animation.*clearFunction)(); }
     static T initial() { return (*initialFunction)(); }
-    static void map(StyleResolver* styleResolver, Animation* animation, CSSValue* value) { (styleResolver->styleMap()->*mapFunction)(animation, value); }
+    static void map(StyleResolver* styleResolver, Animation& animation, CSSValue* value) { (styleResolver->styleMap()->*mapFunction)(&animation, value); }
     static AnimationList* accessAnimations(RenderStyle* style) { return (style->*animationGetterFunction)(); }
     static const AnimationList* animations(RenderStyle* style) { return (style->*immutableAnimationGetterFunction)(); }
@@ -1654 +1654 @@
                 list->append(Animation::create());
             setValue(list->animation(i), value(parentList->animation(i)));
-            list->animation(i)->setAnimationMode(parentList->animation(i)->animationMode());
+            list->animation(i).setAnimationMode(parentList->animation(i).animationMode());
         }
 
@@ -1669 +1669 @@
         setValue(list->animation(0), initial());
         if (propertyID == CSSPropertyWebkitTransitionProperty)
-            list->animation(0)->setAnimationMode(Animation::AnimateAll);
+            list->animation(0).setAnimationMode(Animation::AnimateAll);
         for (size_t i = 1; i < list->size(); ++i)
             clear(list->animation(i));