Fix AnimationKeyframeEffectModel.MultipleProperties to not depend on the order of CSS prope…

Source/core/animation/KeyframeAnimationEffectTest.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 297 matching lines @@
     keyframes[0]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(3.0));
     keyframes[0]->setPropertyValue(CSSPropertyRight, unknownAnimatableValue(4.0));
     keyframes[1] = Keyframe::create();
     keyframes[1]->setOffset(1.0);
     keyframes[1]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(5.0));
     keyframes[1]->setPropertyValue(CSSPropertyRight, unknownAnimatableValue(6.0));
 
     RefPtr<KeyframeAnimationEffect> effect = KeyframeAnimationEffect::create(keyframes);
     OwnPtr<AnimationEffect::CompositableValueList> values = effect->sample(0, 0.6);
     ASSERT_EQ(2UL, values->size());
-    EXPECT_TRUE(values->at(0).first == CSSPropertyLeft);
-    expectDoubleValue(5.0, values->at(0).second->compositeOnto(unknownAnimatableValue(7.0)));
-    EXPECT_TRUE(values->at(1).first == CSSPropertyRight);
-    expectDoubleValue(6.0, values->at(1).second->compositeOnto(unknownAnimatableValue(7.0)));
+    for (size_t i = 0; i < 2; ++i) {
+        std::pair<CSSPropertyID, RefPtr<AnimationEffect::CompositableValue> >& value = values->at(i);
+        switch (value.first) {
+        case CSSPropertyLeft:
+            expectDoubleValue(5.0, value.second->compositeOnto(unknownAnimatableValue(7.0)));
+            break;
+        case CSSPropertyRight:
+            expectDoubleValue(6.0, value.second->compositeOnto(unknownAnimatableValue(7.0)));
+            break;
+        default:
+            ADD_FAILURE();
+        }
+    }

[Julien - ping for review, 2013/12/16 07:25:10]

Wouldn't this still pass if you have 2 'right' or 2 'left' even though that's
invalid?

[Steve Block, 2013/12/16 23:23:52]

Yes, it would. I didn't bother guarding against this because internally we use
the property IDs as keys in a map, so this shouldn't happen. I'll make the test
more robust though.

 }
 
 TEST(AnimationKeyframeAnimationEffectTest, RecompositeCompositableValue)
 {
     KeyframeAnimationEffect::KeyframeVector keyframes = keyframesAtZeroAndOne(pixelAnimatableValue(3.0), pixelAnimatableValue(5.0));
     keyframes[0]->setComposite(AnimationEffect::CompositeAdd);
     keyframes[1]->setComposite(AnimationEffect::CompositeAdd);
     RefPtr<KeyframeAnimationEffect> effect = KeyframeAnimationEffect::create(keyframes);
     OwnPtr<AnimationEffect::CompositableValueList> values = effect->sample(0, 0.6);
     expectDoubleValue((7.0 + 3.0) * 0.4 + (7.0 + 5.0) * 0.6, values->at(0).second->compositeOnto(pixelAnimatableValue(7.0)));
@@ skipping 38 matching lines @@
 TEST(AnimationKeyframeAnimationEffectTest, ToKeyframeAnimationEffect)
 {
     KeyframeAnimationEffect::KeyframeVector keyframes(0);
     RefPtr<KeyframeAnimationEffect> effect = KeyframeAnimationEffect::create(keyframes);
 
     AnimationEffect* baseEffect = effect.get();
     EXPECT_TRUE(toKeyframeAnimationEffect(baseEffect));
 }
 
 } // namespace