Use a bitfield to store animatable properties.

ui/compositor/layer_animation_sequence_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/compositor/layer_animation_sequence.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
@@ skipping 10 matching lines @@
 
 namespace {
 
 // Check that the sequence behaves sanely when it contains no elements.
 TEST(LayerAnimationSequenceTest, NoElement) {
   LayerAnimationSequence sequence;
   base::TimeTicks start_time;
   start_time += base::TimeDelta::FromSeconds(1);
   sequence.set_start_time(start_time);
   EXPECT_TRUE(sequence.IsFinished(start_time));
-  EXPECT_TRUE(sequence.properties().size() == 0);
-  LayerAnimationElement::AnimatableProperties properties;
-  EXPECT_FALSE(sequence.HasConflictingProperty(properties));
+  EXPECT_TRUE(sequence.properties() == LayerAnimationElement::UNKNOWN);

[sky, 2014/01/13 14:26:42]

EXPECT_EQ (here and similar places in this file).

[Ian Vollick, 2014/01/13 19:03:59]

Done.

+  EXPECT_FALSE(sequence.HasConflictingProperty(LayerAnimationElement::UNKNOWN));
 }
 
 // Check that the sequences progresses the delegate as expected when it contains
 // a single non-threaded element.
 TEST(LayerAnimationSequenceTest, SingleElement) {
   LayerAnimationSequence sequence;
   TestLayerAnimationDelegate delegate;
   float start = 0.0f;
   float middle = 0.5f;
   float target = 1.0f;
@@ skipping 11 matching lines @@
     EXPECT_FLOAT_EQ(start, delegate.GetBrightnessForAnimation());
     sequence.Progress(start_time + base::TimeDelta::FromMilliseconds(500),
                       &delegate);
     EXPECT_FLOAT_EQ(middle, delegate.GetBrightnessForAnimation());
     EXPECT_TRUE(sequence.IsFinished(start_time + delta));
     sequence.Progress(start_time + base::TimeDelta::FromMilliseconds(1000),
                       &delegate);
     EXPECT_FLOAT_EQ(target, delegate.GetBrightnessForAnimation());
   }
 
-  EXPECT_TRUE(sequence.properties().size() == 1);
-  EXPECT_TRUE(sequence.properties().find(LayerAnimationElement::BRIGHTNESS) !=
-              sequence.properties().end());
+  EXPECT_TRUE(sequence.properties() == LayerAnimationElement::BRIGHTNESS);
 }
 
 // Check that the sequences progresses the delegate as expected when it contains
 // a single threaded element.
 TEST(LayerAnimationSequenceTest, SingleThreadedElement) {
   LayerAnimationSequence sequence;
   TestLayerAnimationDelegate delegate;
   float start = 0.0f;
   float middle = 0.5f;
   float target = 1.0f;
@@ skipping 20 matching lines @@
         cc::Animation::Opacity,
         (effective_start - base::TimeTicks()).InSecondsF()));
     sequence.Progress(effective_start + delta/2, &delegate);
     EXPECT_FLOAT_EQ(middle, sequence.last_progressed_fraction());
     EXPECT_TRUE(sequence.IsFinished(effective_start + delta));
     sequence.Progress(effective_start + delta, &delegate);
     EXPECT_FLOAT_EQ(target, sequence.last_progressed_fraction());
     EXPECT_FLOAT_EQ(target, delegate.GetOpacityForAnimation());
   }
 
-  EXPECT_TRUE(sequence.properties().size() == 1);
-  EXPECT_TRUE(sequence.properties().find(LayerAnimationElement::OPACITY) !=
-              sequence.properties().end());
+  EXPECT_TRUE(sequence.properties() == LayerAnimationElement::OPACITY);
 }
 
 // Check that the sequences progresses the delegate as expected when it contains
 // multiple elements. Note, see the layer animator tests for cyclic sequences.
 TEST(LayerAnimationSequenceTest, MultipleElement) {
   LayerAnimationSequence sequence;
   TestLayerAnimationDelegate delegate;
   float start_opacity = 0.0f;
   float target_opacity = 1.0f;
   base::TimeTicks start_time;
   base::TimeTicks opacity_effective_start;
   base::TimeTicks transform_effective_start;
   base::TimeDelta delta = base::TimeDelta::FromSeconds(1);
   sequence.AddElement(
       LayerAnimationElement::CreateOpacityElement(target_opacity, delta));
 
   // Pause bounds for a second.
-  LayerAnimationElement::AnimatableProperties properties;
-  properties.insert(LayerAnimationElement::BOUNDS);
-
-  sequence.AddElement(
-      LayerAnimationElement::CreatePauseElement(properties, delta));
+  sequence.AddElement(LayerAnimationElement::CreatePauseElement(
+      LayerAnimationElement::BOUNDS, delta));
 
   gfx::Transform start_transform, target_transform, middle_transform;
   start_transform.Rotate(-30.0);
   target_transform.Rotate(30.0);
 
   sequence.AddElement(
       LayerAnimationElement::CreateTransformElement(target_transform, delta));
 
   for (int i = 0; i < 2; ++i) {
     int starting_group_id = 1;
@@ skipping 46 matching lines @@
         cc::Animation::Transform,
         (transform_effective_start - base::TimeTicks()).InSecondsF()));
     sequence.Progress(transform_effective_start + delta/2, &delegate);
     EXPECT_FLOAT_EQ(0.5, sequence.last_progressed_fraction());
     EXPECT_TRUE(sequence.IsFinished(transform_effective_start + delta));
     sequence.Progress(transform_effective_start + delta, &delegate);
     CheckApproximatelyEqual(target_transform,
                             delegate.GetTransformForAnimation());
   }
 
-  EXPECT_TRUE(sequence.properties().size() == 3);
-  EXPECT_TRUE(sequence.properties().find(LayerAnimationElement::OPACITY) !=
-              sequence.properties().end());
-  EXPECT_TRUE(sequence.properties().find(LayerAnimationElement::TRANSFORM) !=
-              sequence.properties().end());
-  EXPECT_TRUE(sequence.properties().find(LayerAnimationElement::BOUNDS) !=
-              sequence.properties().end());
+  EXPECT_TRUE(sequence.properties() == (LayerAnimationElement::OPACITY |
+                                        LayerAnimationElement::TRANSFORM |
+                                        LayerAnimationElement::BOUNDS));
 }
 
 // Check that a sequence can still be aborted if it has cycled many times.
 TEST(LayerAnimationSequenceTest, AbortingCyclicSequence) {
   LayerAnimationSequence sequence;
   TestLayerAnimationDelegate delegate;
   float start_brightness = 0.0f;
   float target_brightness = 1.0f;
   base::TimeTicks start_time;
   base::TimeDelta delta = base::TimeDelta::FromSeconds(1);
@@ skipping 61 matching lines @@
     EXPECT_TRUE(!observer.last_ended_sequence());
     sequence.Progress(start_time + delta, &delegate);
     EXPECT_EQ(observer.last_ended_sequence(), &sequence);
     sequence.RemoveObserver(&observer);
   }
 }
 
 } // namespace
 
 } // namespace ui