Index: third_party/WebKit/Source/core/animation/css/CSSAnimations.h |
diff --git a/third_party/WebKit/Source/core/animation/css/CSSAnimations.h b/third_party/WebKit/Source/core/animation/css/CSSAnimations.h |
index 54715efbbe25490663c07000912199a41071e74b..23a1e06f0566f54ad5bcd2556847ad9ea1bbe8fb 100644 |
--- a/third_party/WebKit/Source/core/animation/css/CSSAnimations.h |
+++ b/third_party/WebKit/Source/core/animation/css/CSSAnimations.h |
@@ -78,9 +78,14 @@ class CSSAnimations final { |
const ComputedStyle&, |
const ComputedStyle* parentStyle, |
bool wasViewportChanged); |
+ |
+ // Specifies whether to process custom or standard CSS properties. |
+ enum class PropertyPass { Custom, Standard }; |
static void calculateTransitionUpdate(CSSAnimationUpdate&, |
+ PropertyPass, |
const Element* animatingElement, |
const ComputedStyle&); |
+ |
static void snapshotCompositorKeyframes(Element&, |
CSSAnimationUpdate&, |
const ComputedStyle&, |
@@ -161,10 +166,15 @@ class CSSAnimations final { |
const ComputedStyle& oldStyle; |
const ComputedStyle& style; |
const TransitionMap* activeTransitions; |
- std::bitset<numCSSProperties>& listedProperties; |
+ HashSet<PropertyHandle>& listedProperties; |
const CSSTransitionData& transitionData; |
}; |
+ static void calculateTransitionUpdateForCustomProperty( |
+ TransitionUpdateState&, |
+ const CSSTransitionData::TransitionProperty&, |
+ size_t transitionIndex); |
+ |
static void calculateTransitionUpdateForStandardProperty( |
TransitionUpdateState&, |
const CSSTransitionData::TransitionProperty&, |
@@ -179,6 +189,7 @@ class CSSAnimations final { |
const Element* animatingElement); |
static void calculateTransitionActiveInterpolations( |
CSSAnimationUpdate&, |
+ PropertyPass, |
const Element* animatingElement); |
class AnimationEventDelegate final |