Source/core/animation/AnimationStack.h - Issue 863863004: Implemented additive animations for length

Side by Side Diff: Source/core/animation/AnimationStack.h

Issue 863863004: Implemented additive animations for length (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Fixed AnimationStackTest Created 5 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

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 35 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
46 class AnimationStack {	46 class AnimationStack {

47 DISALLOW_ALLOCATION();	47 DISALLOW_ALLOCATION();

48 WTF_MAKE_NONCOPYABLE(AnimationStack);	48 WTF_MAKE_NONCOPYABLE(AnimationStack);

49 public:	49 public:

50 AnimationStack();	50 AnimationStack();

51	51

52 void add(PassOwnPtrWillBeRawPtr<SampledEffect> effect) { m_effects.append(ef fect); }	52 void add(PassOwnPtrWillBeRawPtr<SampledEffect> effect) { m_effects.append(ef fect); }

53 bool isEmpty() const { return m_effects.isEmpty(); }	53 bool isEmpty() const { return m_effects.isEmpty(); }

54 bool affects(CSSPropertyID) const;	54 bool affects(CSSPropertyID) const;

55 bool hasActiveAnimationsOnCompositor(CSSPropertyID) const;	55 bool hasActiveAnimationsOnCompositor(CSSPropertyID) const;

56 static WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> > activeInterpolations(AnimationStack, const WillBeHeapVector<RawPtrWillBeMember< InertAnimation> > newAnimations, const WillBeHeapHashSet<RawPtrWillBeMember<con st AnimationPlayer> >* suppressedAnimationPlayers, Animation::Priority, double t imelineCurrentTime);	56 static InterpolationPipelineMap activeInterpolations(AnimationStack, const WillBeHeapVector<RawPtrWillBeMember<InertAnimation>> newAnimations, const WillB eHeapHashSet<RawPtrWillBeMember<const AnimationPlayer>>* suppressedAnimationPlay ers, Animation::Priority, double timelineCurrentTime);

57	57

58 bool getAnimatedBoundingBox(FloatBox&, CSSPropertyID) const;	58 bool getAnimatedBoundingBox(FloatBox&, CSSPropertyID) const;

59 void trace(Visitor*);	59 void trace(Visitor*);

60	60

61 private:	61 private:

62 void simplifyEffects();	62 void simplifyEffects();

63 // Effects sorted by priority. Lower priority at the start of the list.	63 // Effects sorted by priority. Lower priority at the start of the list.

64 WillBeHeapVector<OwnPtrWillBeMember<SampledEffect> > m_effects;	64 WillBeHeapVector<OwnPtrWillBeMember<SampledEffect>> m_effects;

65	65

66 friend class AnimationAnimationStackTest;	66 friend class AnimationAnimationStackTest;

67 };	67 };

68	68

69 } // namespace blink	69 } // namespace blink

70	70

71 #endif // AnimationStack_h	71 #endif // AnimationStack_h

OLD	NEW