Source/core/animation/AnimationStack.h - Issue 955303002: Web Animations: Remove AnimationPlayer discarding logic

Side by Side Diff

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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 955303002: Web Animations: Remove AnimationPlayer discarding logic (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: don't actually delete unit test Created 5 years, 9 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

« no previous file with comments | « Source/core/animation/AnimationPlayer.cpp ('k') | Source/core/animation/AnimationStack.cpp » ('j') | no next file with comments »

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 40 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
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 hasActiveAnimationsOnCompositor(CSSPropertyID) const;	54 bool hasActiveAnimationsOnCompositor(CSSPropertyID) const;

55 static WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> > activeInterpolations(AnimationStack, const WillBeHeapVector<RawPtrWillBeMember< InertAnimation> > newAnimations, const WillBeHeapHashSet<RawPtrWillBeMember<con st AnimationPlayer> >* suppressedAnimationPlayers, Animation::Priority, double t imelineCurrentTime);	55 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	56

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

58 DECLARE_TRACE();	58 DECLARE_TRACE();

59	59

60 private:	60 private:

61 void simplifyEffects();

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

63 WillBeHeapVector<OwnPtrWillBeMember<SampledEffect> > m_effects;	62 WillBeHeapVector<OwnPtrWillBeMember<SampledEffect> > m_effects;

64	63

65 friend class AnimationAnimationStackTest;	64 friend class AnimationAnimationStackTest;

66 };	65 };

67	66

68 } // namespace blink	67 } // namespace blink

69	68

70 #endif // AnimationStack_h	69 #endif // AnimationStack_h

OLD	NEW