Implement Scroll Container Animation Triggers

https://bugs.webkit.org/show_bug.cgi?id=142732

Attempt to fix the build.

* css/CSSComputedStyleDeclaration.cpp: Add an #if ENABLE guard.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@181658 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 9a2e392..c9e129e 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -72,6 +72,15 @@
         Implement Scroll Container Animation Triggers
         https://bugs.webkit.org/show_bug.cgi?id=142732
 
+        Attempt to fix the build.
+
+        * css/CSSComputedStyleDeclaration.cpp: Add an #if ENABLE guard.
+
+2015-03-17  Dean Jackson  <dino@apple.com>
+
+        Implement Scroll Container Animation Triggers
+        https://bugs.webkit.org/show_bug.cgi?id=142732
+
         Reviewed by Simon Fraser.
 
         Test: animations/trigger-container-scroll-simple.html

diff --git a/Source/WebCore/css/CSSComputedStyleDeclaration.cpp b/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
index 2c11088..c1fa00b 100644 (file)
--- a/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
+++ b/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
@@ -245,7 +245,9 @@ static const CSSPropertyID computedProperties[] = {
     CSSPropertyWebkitAnimationName,
     CSSPropertyWebkitAnimationPlayState,
     CSSPropertyWebkitAnimationTimingFunction,
+#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
     CSSPropertyWebkitAnimationTrigger,
+#endif
     CSSPropertyWebkitAppearance,
     CSSPropertyWebkitBackfaceVisibility,
     CSSPropertyWebkitBackgroundClip,