Remove CSS Animation Triggers
authordino@apple.com <dino@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 2 Oct 2018 17:36:05 +0000 (17:36 +0000)
committerdino@apple.com <dino@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 2 Oct 2018 17:36:05 +0000 (17:36 +0000)
https://bugs.webkit.org/show_bug.cgi?id=190175
<rdar://problem/44925626>

Reviewed by Simon Fraser.

Source/JavaScriptCore:

* Configurations/FeatureDefines.xcconfig:

Source/WebCore:

Remove the never-properly specified CSS Animation Triggers.

* Configurations/FeatureDefines.xcconfig:
* Sources.txt:
* WebCore.xcodeproj/project.pbxproj:
* css/CSSAnimationTriggerScrollValue.cpp: Removed.
* css/CSSAnimationTriggerScrollValue.h: Removed.
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::ComputedStyleExtractor::valueForPropertyinStyle):
(WebCore::createAnimationTriggerValue): Deleted.
(WebCore::animationTriggerValue): Deleted.
* css/CSSProperties.json:
* css/CSSToStyleMap.cpp:
(WebCore::CSSToStyleMap::mapAnimationTrigger): Deleted.
* css/CSSToStyleMap.h:
* css/CSSValue.cpp:
(WebCore::CSSValue::equals const):
(WebCore::CSSValue::cssText const):
(WebCore::CSSValue::destroy):
* css/CSSValue.h:
(WebCore::CSSValue::isAnimationTriggerScrollValue const): Deleted.
* css/parser/CSSPropertyParser.cpp:
(WebCore::consumeAnimationValue):
(WebCore::CSSPropertyParser::parseSingleValue):
(WebCore::consumeWebkitAnimationTrigger): Deleted.
* page/FrameView.cpp:
(WebCore::FrameView::sendScrollEvent):
* page/RuntimeEnabledFeatures.h:
(WebCore::RuntimeEnabledFeatures::setAnimationTriggersEnabled): Deleted.
(WebCore::RuntimeEnabledFeatures::animationTriggersEnabled const): Deleted.
* page/animation/AnimationBase.cpp:
(WebCore::AnimationBase::updateStateMachine):
(WebCore::AnimationBase::fireAnimationEventsIfNeeded):
(WebCore::AnimationBase::timeToNextService):
(WebCore::AnimationBase::getElapsedTime const):
* page/animation/CSSAnimationController.cpp:
(WebCore::CSSAnimationControllerPrivate::animationWillBeRemoved):
(WebCore::CSSAnimationControllerPrivate::addToAnimationsDependentOnScroll): Deleted.
(WebCore::CSSAnimationControllerPrivate::removeFromAnimationsDependentOnScroll): Deleted.
(WebCore::CSSAnimationControllerPrivate::scrollWasUpdated): Deleted.
(WebCore::CSSAnimationController::wantsScrollUpdates const): Deleted.
(WebCore::CSSAnimationController::scrollWasUpdated): Deleted.
* page/animation/CSSAnimationController.h:
* page/animation/CSSAnimationControllerPrivate.h:
(WebCore::CSSAnimationControllerPrivate::wantsScrollUpdates const): Deleted.
(WebCore::CSSAnimationControllerPrivate::scrollPosition const): Deleted.
* page/animation/CompositeAnimation.cpp:
(WebCore::CompositeAnimation::updateKeyframeAnimations):
* page/animation/CompositeAnimation.h:
(WebCore::CompositeAnimation::hasScrollTriggeredAnimation const): Deleted.
* platform/animation/Animation.cpp:
(WebCore::Animation::Animation):
(WebCore::Animation::operator=):
(WebCore::Animation::animationsMatch const):
* platform/animation/Animation.h:
(WebCore::Animation::isTimingFunctionSet const):
(WebCore::Animation::isEmpty const):
(WebCore::Animation::clearTimingFunction):
(WebCore::Animation::clearAll):
(WebCore::Animation::animationMode const):
(WebCore::Animation::setAnimationMode):
(WebCore::Animation::initialTimingFunction):
(WebCore::Animation::isTriggerSet const): Deleted.
(WebCore::Animation::clearTrigger): Deleted.
(WebCore::Animation::trigger const): Deleted.
(WebCore::Animation::setTrigger): Deleted.
(WebCore::Animation::initialTrigger): Deleted.
* platform/animation/AnimationTrigger.h: Removed.
* platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::GraphicsLayerCA::animationCanBeAccelerated const):

Source/WebCore/PAL:

* Configurations/FeatureDefines.xcconfig:

Source/WebKit:

* Configurations/FeatureDefines.xcconfig:

Source/WebKitLegacy/mac:

* Configurations/FeatureDefines.xcconfig:

Tools:

* TestWebKitAPI/Configurations/FeatureDefines.xcconfig:

LayoutTests:

Remove a bunch of tests that no longer have an implementation.

* TestExpectations:
* animations/trigger-computed-style-expected.txt: Removed.
* animations/trigger-computed-style.html: Removed.
* animations/trigger-container-scroll-boundaries-expected.txt: Removed.
* animations/trigger-container-scroll-boundaries.html: Removed.
* animations/trigger-container-scroll-empty-expected.txt: Removed.
* animations/trigger-container-scroll-empty.html: Removed.
* animations/trigger-container-scroll-simple-expected.txt: Removed.
* animations/trigger-container-scroll-simple.html: Removed.
* animations/trigger-parsing-expected.txt: Removed.
* animations/trigger-parsing.html: Removed.
* fast/css/compare-animation-trigger-expected.txt: Removed.
* fast/css/compare-animation-trigger.html: Removed.
* legacy-animation-engine/animations/trigger-computed-style-expected.txt: Removed.
* legacy-animation-engine/animations/trigger-computed-style.html: Removed.
* legacy-animation-engine/animations/trigger-container-scroll-boundaries-expected.txt: Removed.
* legacy-animation-engine/animations/trigger-container-scroll-boundaries.html: Removed.
* legacy-animation-engine/animations/trigger-container-scroll-empty-expected.txt: Removed.
* legacy-animation-engine/animations/trigger-container-scroll-empty.html: Removed.
* legacy-animation-engine/animations/trigger-container-scroll-simple-expected.txt: Removed.
* legacy-animation-engine/animations/trigger-container-scroll-simple.html: Removed.
* legacy-animation-engine/animations/trigger-parsing-expected.txt: Removed.
* legacy-animation-engine/animations/trigger-parsing.html: Removed.
* legacy-animation-engine/fast/css/compare-animation-trigger-expected.txt: Removed.
* legacy-animation-engine/fast/css/compare-animation-trigger.html: Removed.
* platform/gtk/TestExpectations:
* platform/ios/TestExpectations:
* platform/mac-wk2/TestExpectations:
* platform/wincairo/TestExpectations:

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

75 files changed:
LayoutTests/ChangeLog
LayoutTests/TestExpectations
LayoutTests/animations/trigger-computed-style-expected.txt [deleted file]
LayoutTests/animations/trigger-computed-style.html [deleted file]
LayoutTests/animations/trigger-container-scroll-boundaries-expected.txt [deleted file]
LayoutTests/animations/trigger-container-scroll-boundaries.html [deleted file]
LayoutTests/animations/trigger-container-scroll-empty-expected.txt [deleted file]
LayoutTests/animations/trigger-container-scroll-empty.html [deleted file]
LayoutTests/animations/trigger-container-scroll-simple-expected.txt [deleted file]
LayoutTests/animations/trigger-container-scroll-simple.html [deleted file]
LayoutTests/animations/trigger-parsing-expected.txt [deleted file]
LayoutTests/animations/trigger-parsing.html [deleted file]
LayoutTests/fast/css/compare-animation-trigger-expected.txt [deleted file]
LayoutTests/fast/css/compare-animation-trigger.html [deleted file]
LayoutTests/legacy-animation-engine/animations/trigger-computed-style-expected.txt [deleted file]
LayoutTests/legacy-animation-engine/animations/trigger-computed-style.html [deleted file]
LayoutTests/legacy-animation-engine/animations/trigger-container-scroll-boundaries-expected.txt [deleted file]
LayoutTests/legacy-animation-engine/animations/trigger-container-scroll-boundaries.html [deleted file]
LayoutTests/legacy-animation-engine/animations/trigger-container-scroll-empty-expected.txt [deleted file]
LayoutTests/legacy-animation-engine/animations/trigger-container-scroll-empty.html [deleted file]
LayoutTests/legacy-animation-engine/animations/trigger-container-scroll-simple-expected.txt [deleted file]
LayoutTests/legacy-animation-engine/animations/trigger-container-scroll-simple.html [deleted file]
LayoutTests/legacy-animation-engine/animations/trigger-parsing-expected.txt [deleted file]
LayoutTests/legacy-animation-engine/animations/trigger-parsing.html [deleted file]
LayoutTests/legacy-animation-engine/fast/css/compare-animation-trigger-expected.txt [deleted file]
LayoutTests/legacy-animation-engine/fast/css/compare-animation-trigger.html [deleted file]
LayoutTests/platform/gtk/TestExpectations
LayoutTests/platform/ios-wk1/TestExpectations
LayoutTests/platform/ios/TestExpectations
LayoutTests/platform/mac-wk2/TestExpectations
LayoutTests/platform/win/TestExpectations
LayoutTests/platform/wincairo/TestExpectations
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
Source/WebCore/ChangeLog
Source/WebCore/Configurations/FeatureDefines.xcconfig
Source/WebCore/PAL/ChangeLog
Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
Source/WebCore/Sources.txt
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/css/CSSAnimationTriggerScrollValue.cpp [deleted file]
Source/WebCore/css/CSSAnimationTriggerScrollValue.h [deleted file]
Source/WebCore/css/CSSComputedStyleDeclaration.cpp
Source/WebCore/css/CSSProperties.json
Source/WebCore/css/CSSToStyleMap.cpp
Source/WebCore/css/CSSToStyleMap.h
Source/WebCore/css/CSSValue.cpp
Source/WebCore/css/CSSValue.h
Source/WebCore/css/parser/CSSPropertyParser.cpp
Source/WebCore/page/FrameView.cpp
Source/WebCore/page/RuntimeEnabledFeatures.h
Source/WebCore/page/animation/AnimationBase.cpp
Source/WebCore/page/animation/CSSAnimationController.cpp
Source/WebCore/page/animation/CSSAnimationController.h
Source/WebCore/page/animation/CSSAnimationControllerPrivate.h
Source/WebCore/page/animation/CompositeAnimation.cpp
Source/WebCore/page/animation/CompositeAnimation.h
Source/WebCore/platform/animation/Animation.cpp
Source/WebCore/platform/animation/Animation.h
Source/WebCore/platform/animation/AnimationTrigger.h [deleted file]
Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
Source/WebKit/ChangeLog
Source/WebKit/Configurations/FeatureDefines.xcconfig
Source/WebKit/Shared/WebPreferences.yaml
Source/WebKit/UIProcess/API/C/WKPreferences.cpp
Source/WebKit/UIProcess/API/C/WKPreferencesRefPrivate.h
Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm
Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h
Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp
Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.h
Source/WebKitLegacy/mac/ChangeLog
Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig
Source/cmake/WebKitFeatures.cmake
Tools/ChangeLog
Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig

index 04ea8e5..c251ec2 100644 (file)
@@ -1,3 +1,43 @@
+2018-10-01  Dean Jackson  <dino@apple.com>
+
+        Remove CSS Animation Triggers
+        https://bugs.webkit.org/show_bug.cgi?id=190175
+        <rdar://problem/44925626>
+
+        Reviewed by Simon Fraser.
+
+        Remove a bunch of tests that no longer have an implementation.
+
+        * TestExpectations:
+        * animations/trigger-computed-style-expected.txt: Removed.
+        * animations/trigger-computed-style.html: Removed.
+        * animations/trigger-container-scroll-boundaries-expected.txt: Removed.
+        * animations/trigger-container-scroll-boundaries.html: Removed.
+        * animations/trigger-container-scroll-empty-expected.txt: Removed.
+        * animations/trigger-container-scroll-empty.html: Removed.
+        * animations/trigger-container-scroll-simple-expected.txt: Removed.
+        * animations/trigger-container-scroll-simple.html: Removed.
+        * animations/trigger-parsing-expected.txt: Removed.
+        * animations/trigger-parsing.html: Removed.
+        * fast/css/compare-animation-trigger-expected.txt: Removed.
+        * fast/css/compare-animation-trigger.html: Removed.
+        * legacy-animation-engine/animations/trigger-computed-style-expected.txt: Removed.
+        * legacy-animation-engine/animations/trigger-computed-style.html: Removed.
+        * legacy-animation-engine/animations/trigger-container-scroll-boundaries-expected.txt: Removed.
+        * legacy-animation-engine/animations/trigger-container-scroll-boundaries.html: Removed.
+        * legacy-animation-engine/animations/trigger-container-scroll-empty-expected.txt: Removed.
+        * legacy-animation-engine/animations/trigger-container-scroll-empty.html: Removed.
+        * legacy-animation-engine/animations/trigger-container-scroll-simple-expected.txt: Removed.
+        * legacy-animation-engine/animations/trigger-container-scroll-simple.html: Removed.
+        * legacy-animation-engine/animations/trigger-parsing-expected.txt: Removed.
+        * legacy-animation-engine/animations/trigger-parsing.html: Removed.
+        * legacy-animation-engine/fast/css/compare-animation-trigger-expected.txt: Removed.
+        * legacy-animation-engine/fast/css/compare-animation-trigger.html: Removed.
+        * platform/gtk/TestExpectations:
+        * platform/ios/TestExpectations:
+        * platform/mac-wk2/TestExpectations:
+        * platform/wincairo/TestExpectations:
+
 2018-10-02  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r236624 and r236671.
index f775cb1..ffc2cf6 100644 (file)
@@ -2880,9 +2880,6 @@ webkit.org/b/189997 imported/w3c/web-platform-tests/resource-timing/resource_tim
 # This is fallout from turning Web Animations on.
 webkit.org/b/190032 animations/animation-playstate-paused-style-resolution.html [ Failure ]
 webkit.org/b/190032 animations/fill-mode-removed.html [ Failure ]
-webkit.org/b/190032 animations/trigger-container-scroll-boundaries.html [ Failure ]
-webkit.org/b/190032 animations/trigger-container-scroll-empty.html [ Failure ]
-webkit.org/b/190032 animations/trigger-container-scroll-simple.html [ Failure ]
 webkit.org/b/190032 compositing/backing/backing-store-attachment-fill-forwards-animation.html [ Failure ]
 webkit.org/b/190032 compositing/backing/transform-transition-from-outside-view.html [ Failure ]
 webkit.org/b/190032 compositing/layer-creation/mismatched-rotated-transform-transition-overlap.html [ Failure ]
diff --git a/LayoutTests/animations/trigger-computed-style-expected.txt b/LayoutTests/animations/trigger-computed-style-expected.txt
deleted file mode 100644 (file)
index 7b8af8c..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-Test the computed style of the -webkit-animation-trigger property.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-
-Auto : auto
-PASS triggerStyle.length is 1
-PASS subRule.cssText is 'auto'
-
-One container-scroll value : container-scroll(10px)
-PASS triggerStyle.length is 1
-PASS subRule.cssText is 'container-scroll(10px)'
-
-One container-scroll value : container-scroll(2em)
-PASS triggerStyle.length is 1
-PASS subRule.cssText is 'container-scroll(32px)'
-
-One container-scroll value with end value : container-scroll(10px, 20px)
-PASS triggerStyle.length is 1
-PASS subRule.cssText is 'container-scroll(10px, 20px)'
-
-Two container-scroll values : container-scroll(10px), container-scroll(20px)
-PASS triggerStyle.length is 2
-PASS subRule.cssText is 'container-scroll(10px)'
-PASS subRule.cssText is 'container-scroll(20px)'
-
-Many container-scroll values : container-scroll(10px), container-scroll(20px), container-scroll(30px), container-scroll(40px), container-scroll(1px)
-PASS triggerStyle.length is 5
-PASS subRule.cssText is 'container-scroll(10px)'
-PASS subRule.cssText is 'container-scroll(20px)'
-PASS subRule.cssText is 'container-scroll(30px)'
-PASS subRule.cssText is 'container-scroll(40px)'
-PASS subRule.cssText is 'container-scroll(1px)'
-
-No value : 
-PASS triggerStyle.length is 1
-PASS subRule.cssText is 'auto'
-
-Bad value : banana
-PASS triggerStyle.length is 1
-PASS subRule.cssText is 'auto'
-
-Multiple bad values : banana, eggs, bacon
-PASS triggerStyle.length is 1
-PASS subRule.cssText is 'auto'
-
-Some good, some bad values : container-scroll(10), eggs, bacon
-PASS triggerStyle.length is 1
-PASS subRule.cssText is 'auto'
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/animations/trigger-computed-style.html b/LayoutTests/animations/trigger-computed-style.html
deleted file mode 100644 (file)
index 4247da7..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE HTML>
-<script src="../resources/js-test-pre.js"></script>
-<p id="description"></p>
-<div id="console"></div>
-<script>
-description("Test the computed style of the -webkit-animation-trigger property.");
-
-// These have to be global for the test helpers to see them.
-var stylesheet, triggerStyle, subRule;
-var styleElement = document.createElement("style");
-document.head.appendChild(styleElement);
-stylesheet = styleElement.sheet;
-
-function testComputedTriggerRule(description, rule, expectedLength, expectedTexts)
-{
-    debug("");
-    debug(description + " : " + rule);
-
-    stylesheet.insertRule("body { -webkit-animation-trigger: " + rule + "; }", 0);
-
-    triggerStyle = window.getComputedStyle(document.body).getPropertyCSSValue("-webkit-animation-trigger");
-    shouldBe("triggerStyle.length", "" + expectedLength);
-    for (var i = 0; i < expectedLength; i++) {
-        subRule = triggerStyle[i];
-        shouldBe("subRule.cssText", "'" + expectedTexts[i] + "'");
-    }
-    stylesheet.deleteRule(0);
-}
-
-testComputedTriggerRule("Auto",
-                        "auto", 1,
-                        ["auto"]);
-
-testComputedTriggerRule("One container-scroll value",
-                        "container-scroll(10px)", 1,
-                        ["container-scroll(10px)"]);
-
-testComputedTriggerRule("One container-scroll value",
-                        "container-scroll(2em)", 1,
-                        ["container-scroll(32px)"]);
-
-testComputedTriggerRule("One container-scroll value with end value",
-                        "container-scroll(10px, 20px)", 1,
-                        ["container-scroll(10px, 20px)"]);
-
-testComputedTriggerRule("Two container-scroll values",
-                        "container-scroll(10px), container-scroll(20px)", 2,
-                        ["container-scroll(10px)", "container-scroll(20px)"]);
-
-testComputedTriggerRule("Many container-scroll values",
-                        "container-scroll(10px), container-scroll(20px), container-scroll(30px), container-scroll(40px), container-scroll(1px)", 5,
-                        ["container-scroll(10px)", "container-scroll(20px)", "container-scroll(30px)", "container-scroll(40px)", "container-scroll(1px)"]);
-
-testComputedTriggerRule("No value",
-                        "", 1,
-                        ["auto"]);
-
-testComputedTriggerRule("Bad value",
-                        "banana", 1,
-                        ["auto"]);
-
-testComputedTriggerRule("Multiple bad values",
-                        "banana, eggs, bacon", 1,
-                        ["auto"]);
-
-testComputedTriggerRule("Some good, some bad values",
-                        "container-scroll(10), eggs, bacon", 1,
-                        ["auto"]);
-
-successfullyParsed = true;
-</script>
-<script src="../resources/js-test-post.js"></script>
diff --git a/LayoutTests/animations/trigger-container-scroll-boundaries-expected.txt b/LayoutTests/animations/trigger-container-scroll-boundaries-expected.txt
deleted file mode 100644 (file)
index 552eaa6..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-This element should begin animating only when the page scrolls to 20px from the top. It then animates smoothly, moving 100px to the left over the next 100px of scrolling. Remember to scroll to the top of the page before reloading!
-
-PASS: Value before animation is applied is 0px
-PASS: Value with animation but no scroll was 0px
-PASS: Value with scroll amount of 10 was 10px
-PASS: Value with scroll amount of 20 was 20px
-PASS: Value with scroll amount of 30 was 30px
-PASS: Value with scroll amount of 40 was 40px
-PASS: Value with scroll amount of 50 was 50px
-PASS: Value with scroll amount of 60 was 60px
-PASS: Value with scroll amount of 70 was 70px
-PASS: Value with scroll amount of 80 was 80px
-PASS: Value with scroll amount of 90 was 90px
-
diff --git a/LayoutTests/animations/trigger-container-scroll-boundaries.html b/LayoutTests/animations/trigger-container-scroll-boundaries.html
deleted file mode 100644 (file)
index a2e53b4..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE html>
-<style>
-body {
-    height: 2000px;
-}
-
-#box {
-    position: relative;
-    width: 20px;
-    height: 20px;
-    background-color: blue;
-}
-
-.animating {
-    animation-name: slide;
-    animation-duration: 1ms;
-    animation-fill-mode: forwards;
-    animation-timing-function: linear;
-    -webkit-animation-trigger: container-scroll(20px, 120px);
-}
-
-@-webkit-keyframes slide {
-  from {
-      left: 0px;
-  }
-  to {
-      left: 100px;
-  }
-}
-</style>
-<script>
-
-var results;
-var box;
-
-var scrollMin = 20;
-var scrollMax = 120;
-
-if (window.testRunner) {
-    window.testRunner.dumpAsText();
-    window.testRunner.waitUntilDone();
-}
-
-if (window.internals)
-    window.internals.settings.setVisualViewportEnabled(false);
-
-function runTest() {
-    results = document.getElementById("results");
-    box = document.getElementById("box");
-    var leftValue = window.getComputedStyle(box).left;
-    if (leftValue == "0px")
-        results.innerHTML = "PASS: Value before animation is applied is 0px<br>";
-    else
-        results.innerHTML = "FAIL: Value before animation is applied should be auto, was " + leftValue + "<br>";
-    box.className = "animating";
-    setTimeout(checkValueWithoutScroll, 0);
-}
-
-function checkValueWithoutScroll() {
-    var leftValue = window.getComputedStyle(box).left;
-    if (leftValue == "0px")
-        results.innerHTML += "PASS: Value with animation but no scroll was 0px<br>";
-    else
-        results.innerHTML += "FAIL: Value with animation but no scroll should be 0px, was " + leftValue + "<br>";
-
-    window.scrollTo(0, scrollMin + 10);
-    setTimeout(function () {
-        checkValueWithScroll(10);
-    }, 0);
-}
-
-function checkValueWithScroll(scrollAmount) {
-    var leftValue = Math.round(window.getComputedStyle(box).getPropertyCSSValue("left").getFloatValue(CSSPrimitiveValue.CSS_NUMBER));
-
-    if (leftValue == scrollAmount)
-        results.innerHTML += "PASS: Value with scroll amount of " + scrollAmount + " was " + scrollAmount + "px<br>";
-    else
-        results.innerHTML += "FAIL: Value with scroll amount of " + scrollAmount + " should be " + scrollAmount + "px, was " + leftValue + "px<br>";
-
-    if (scrollMin + scrollAmount + 10 < scrollMax) {
-        window.scrollTo(0, scrollMin + scrollAmount + 10);
-        setTimeout(function () {
-            checkValueWithScroll(scrollAmount + 10);
-        }, 0);
-    } else {
-        if (window.testRunner)
-            window.testRunner.notifyDone();
-    }
-}
-
-window.addEventListener("load", runTest, false);
-
-</script>
-
-<p>This element should begin animating only when the page scrolls to 20px from
-the top. It then animates smoothly, moving 100px to the left over the next
-100px of scrolling. Remember to scroll to the top of the page before reloading!</p>
-<div id="box"></div>
-
-<div id="results"></div>
diff --git a/LayoutTests/animations/trigger-container-scroll-empty-expected.txt b/LayoutTests/animations/trigger-container-scroll-empty-expected.txt
deleted file mode 100644 (file)
index cc8af9f..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-This element should begin animating only when the page scrolls to 20px from the top. It specifies an end value, but that should be ignored because it is not greater than the start. This means the animation will run to completion rather than take the scroll value as input. Remember to scroll to the top of the page before reloading!
-
-Value before animation is applied: 0px (should be 0px)
-Value with animation but no scroll: 0px (should be 0px)
-PASS: Animation was not depending on scroll.
-
diff --git a/LayoutTests/animations/trigger-container-scroll-empty.html b/LayoutTests/animations/trigger-container-scroll-empty.html
deleted file mode 100644 (file)
index 44bcc37..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-<!DOCTYPE html>
-<style>
-body {
-    height: 2000px;
-}
-
-#box {
-    position: relative;
-    width: 20px;
-    height: 20px;
-    background-color: blue;
-}
-
-.animating {
-    animation-name: slide;
-    animation-duration: 1ms;
-    animation-fill-mode: forwards;
-    animation-timing-function: linear;
-    -webkit-animation-trigger: container-scroll(20px, 20px);
-}
-
-@-webkit-keyframes slide {
-  from {
-      left: 0px;
-  }
-  to {
-      left: 100px;
-  }
-}
-</style>
-<script>
-
-var results;
-var box;
-
-if (window.testRunner) {
-    window.testRunner.dumpAsText();
-    window.testRunner.waitUntilDone();
-}
-
-if (window.internals)
-    window.internals.settings.setVisualViewportEnabled(false);
-
-function runTest() {
-    results = document.getElementById("results");
-    box = document.getElementById("box");
-    results.innerHTML = "Value before animation is applied: " + window.getComputedStyle(box).left + " (should be 0px)<br>";
-    box.className = "animating";
-    setTimeout(checkValueWithoutScroll, 0);
-}
-
-function checkValueWithoutScroll() {
-    results.innerHTML += "Value with animation but no scroll: " + window.getComputedStyle(box).left + " (should be 0px)<br>";
-    window.scrollTo(0, 30);
-    setTimeout(checkValueWithScroll, 10);
-}
-
-function checkValueWithScroll() {
-    var leftValue = Math.round(window.getComputedStyle(box).getPropertyCSSValue("left").getFloatValue(CSSPrimitiveValue.CSS_NUMBER));
-
-    if (leftValue > 11) // If we were reacting to scroll we'd have a value of 10.
-        results.innerHTML += "PASS: Animation was not depending on scroll.<br>";
-    else
-        results.innerHTML += "FAIL: Value seems to be reacting to scroll. It was " + leftValue + "px<br>";
-
-    if (window.testRunner)
-        window.testRunner.notifyDone();
-}
-
-window.addEventListener("load", runTest, false);
-
-</script>
-
-<p>This element should begin animating only when the page scrolls to 20px from
-the top. It specifies an end value, but that should be ignored because it is
-not greater than the start. This means the animation will run to completion
-rather than take the scroll value as input. Remember to scroll to the top of
-the page before reloading!</p>
-<div id="box"></div>
-
-<div id="results"></div>
diff --git a/LayoutTests/animations/trigger-container-scroll-simple-expected.txt b/LayoutTests/animations/trigger-container-scroll-simple-expected.txt
deleted file mode 100644 (file)
index 8a4326a..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-This element should begin animating only when the page scrolls to 20px from the top. The animation is almost instantaneous, so it will snap to its final position. Remember to scroll to the top of the page before reloading!
-
-Value before animation is applied: 0px (should be 0px)
-Value with animation but no scroll: 0px (should be 0px)
-Value with animation after scroll: 100px (should be 100px)
-
diff --git a/LayoutTests/animations/trigger-container-scroll-simple.html b/LayoutTests/animations/trigger-container-scroll-simple.html
deleted file mode 100644 (file)
index fa011b0..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-<!DOCTYPE html>
-<style>
-body {
-    height: 2000px;
-}
-
-#box {
-    position: relative;
-    width: 20px;
-    height: 20px;
-    background-color: blue;
-}
-
-.animating {
-    animation-name: slide;
-    animation-duration: 1ms;
-    animation-fill-mode: forwards;
-    animation-timing-function: step-start;
-    -webkit-animation-trigger: container-scroll(20px);
-}
-
-@-webkit-keyframes slide {
-  from {
-      left: 0px;
-  }
-  to {
-      left: 100px;
-  }
-}
-</style>
-<script>
-
-var results;
-var box;
-
-if (window.testRunner) {
-    window.testRunner.dumpAsText();
-    window.testRunner.waitUntilDone();
-}
-
-if (window.internals)
-    window.internals.settings.setVisualViewportEnabled(false);
-
-function runTest() {
-    results = document.getElementById("results");
-    box = document.getElementById("box");
-    results.innerHTML = "Value before animation is applied: " + window.getComputedStyle(box).left + " (should be 0px)<br>";
-    box.className = "animating";
-    setTimeout(checkValueWithoutScroll, 0);
-}
-
-function checkValueWithoutScroll() {
-    results.innerHTML += "Value with animation but no scroll: " + window.getComputedStyle(box).left + " (should be 0px)<br>";
-    window.scrollTo(0, 30);
-    setTimeout(checkValueWithScroll, 0);
-}
-
-function checkValueWithScroll() {
-    results.innerHTML += "Value with animation after scroll: " + window.getComputedStyle(box).left + " (should be 100px)<br>";
-    if (window.testRunner)
-        window.testRunner.notifyDone();
-}
-
-window.addEventListener("load", runTest, false);
-
-</script>
-
-<p>This element should begin animating only when the page scrolls to 20px from
-the top. The animation is almost instantaneous, so it will snap to its final
-position. Remember to scroll to the top of the page before reloading!</p>
-<div id="box"></div>
-
-<div id="results"></div>
diff --git a/LayoutTests/animations/trigger-parsing-expected.txt b/LayoutTests/animations/trigger-parsing-expected.txt
deleted file mode 100644 (file)
index 28343b4..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-Test the parsing of the -webkit-animation-trigger property.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-
-Valid property tests
-
-
-Auto : auto
-PASS cssRule.type is 1
-PASS declaration.length is 1
-PASS declaration.getPropertyValue('-webkit-animation-trigger') is 'auto'
-PASS triggerRule.cssText is 'auto'
-
-Container Scroll : container-scroll(200px)
-PASS cssRule.type is 1
-PASS declaration.length is 1
-PASS declaration.getPropertyValue('-webkit-animation-trigger') is 'container-scroll(200px)'
-PASS triggerRule.cssText is 'container-scroll(200px)'
-
-Container Scroll : container-scroll(2em)
-PASS cssRule.type is 1
-PASS declaration.length is 1
-PASS declaration.getPropertyValue('-webkit-animation-trigger') is 'container-scroll(2em)'
-PASS triggerRule.cssText is 'container-scroll(2em)'
-
-Container Scroll : container-scroll(30vw)
-PASS cssRule.type is 1
-PASS declaration.length is 1
-PASS declaration.getPropertyValue('-webkit-animation-trigger') is 'container-scroll(30vw)'
-PASS triggerRule.cssText is 'container-scroll(30vw)'
-
-Container Scroll with end value : container-scroll(200px, 300px)
-PASS cssRule.type is 1
-PASS declaration.length is 1
-PASS declaration.getPropertyValue('-webkit-animation-trigger') is 'container-scroll(200px, 300px)'
-PASS triggerRule.cssText is 'container-scroll(200px, 300px)'
-
-Two scroll values : container-scroll(1px), container-scroll(2px)
-PASS cssRule.type is 1
-PASS declaration.length is 1
-PASS declaration.getPropertyValue('-webkit-animation-trigger') is 'container-scroll(1px), container-scroll(2px)'
-PASS triggerRule.length is 2
-PASS subRule.cssText is 'container-scroll(1px)'
-PASS subRule.cssText is 'container-scroll(2px)'
-
-Many scroll values : container-scroll(1px), container-scroll(2px), container-scroll(3px), container-scroll(4px), container-scroll(5px), container-scroll(3000px)
-PASS cssRule.type is 1
-PASS declaration.length is 1
-PASS declaration.getPropertyValue('-webkit-animation-trigger') is 'container-scroll(1px), container-scroll(2px), container-scroll(3px), container-scroll(4px), container-scroll(5px), container-scroll(3000px)'
-PASS triggerRule.length is 6
-PASS subRule.cssText is 'container-scroll(1px)'
-PASS subRule.cssText is 'container-scroll(2px)'
-PASS subRule.cssText is 'container-scroll(3px)'
-PASS subRule.cssText is 'container-scroll(4px)'
-PASS subRule.cssText is 'container-scroll(5px)'
-PASS subRule.cssText is 'container-scroll(3000px)'
-
-Invalid property tests
-
-
-No value : 
-PASS cssRule.type is 1
-PASS declaration.length is 0
-PASS declaration.getPropertyValue('-webkit-animation-trigger') is ""
-
-Bad value : banana
-PASS cssRule.type is 1
-PASS declaration.length is 0
-PASS declaration.getPropertyValue('-webkit-animation-trigger') is ""
-
-Bad list : container-scroll(1px), orange
-PASS cssRule.type is 1
-PASS declaration.length is 0
-PASS declaration.getPropertyValue('-webkit-animation-trigger') is ""
-
-Missing comma : container-scroll(1px) container-scroll(2px)
-PASS cssRule.type is 1
-PASS declaration.length is 0
-PASS declaration.getPropertyValue('-webkit-animation-trigger') is ""
-
-Too many values : container-scroll(1px, 2px, 3px)
-PASS cssRule.type is 1
-PASS declaration.length is 0
-PASS declaration.getPropertyValue('-webkit-animation-trigger') is ""
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/animations/trigger-parsing.html b/LayoutTests/animations/trigger-parsing.html
deleted file mode 100644 (file)
index 35c9372..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE HTML>
-<script src="../resources/js-test-pre.js"></script>
-<p id="description"></p>
-<div id="console"></div>
-<script>
-description("Test the parsing of the -webkit-animation-trigger property.");
-
-// These have to be global for the test helpers to see them.
-var stylesheet, cssRule, declaration, triggerRule, subRule;
-var styleElement = document.createElement("style");
-document.head.appendChild(styleElement);
-stylesheet = styleElement.sheet;
-
-function testTriggerRule(description, rule, expectedLength, expectedValue, expectedTexts)
-{
-    debug("");
-    debug(description + " : " + rule);
-
-    stylesheet.insertRule("body { -webkit-animation-trigger: " + rule + "; }", 0);
-    cssRule = stylesheet.cssRules.item(0);
-
-    shouldBe("cssRule.type", "1");
-
-    declaration = cssRule.style;
-    if (!expectedLength || !expectedValue) {
-        shouldBe("declaration.length", "0");
-        shouldBeEqualToString("declaration.getPropertyValue('-webkit-animation-trigger')", "");
-        return;
-    }
-    shouldBe("declaration.length", "1");
-    shouldBe("declaration.getPropertyValue('-webkit-animation-trigger')", "'" + expectedValue + "'");
-
-    triggerRule = declaration.getPropertyCSSValue("-webkit-animation-trigger");
-    if (expectedLength > 1) {
-        shouldBe("triggerRule.length", "" + expectedLength);
-        for (var i = 0; i < expectedLength; i++) {
-            subRule = triggerRule[i];
-            shouldBe("subRule.cssText", "'" + expectedTexts[i] + "'");
-        }
-    } else {
-        shouldBe("triggerRule.cssText", "'" + expectedValue + "'");
-    }
-
-    stylesheet.deleteRule(0);
-}
-
-debug("")
-debug("Valid property tests");
-debug("")
-
-testTriggerRule("Auto",
-                "auto", 1, "auto");
-
-testTriggerRule("Container Scroll",
-                "container-scroll(200px)", 1, "container-scroll(200px)");
-
-testTriggerRule("Container Scroll",
-                "container-scroll(2em)", 1, "container-scroll(2em)");
-
-testTriggerRule("Container Scroll",
-                "container-scroll(30vw)", 1, "container-scroll(30vw)");
-
-testTriggerRule("Container Scroll with end value",
-                "container-scroll(200px, 300px)", 1, "container-scroll(200px, 300px)");
-
-testTriggerRule("Two scroll values",
-                "container-scroll(1px), container-scroll(2px)", 2, "container-scroll(1px), container-scroll(2px)", ["container-scroll(1px)", "container-scroll(2px)"]);
-
-testTriggerRule("Many scroll values",
-                "container-scroll(1px), container-scroll(2px), container-scroll(3px), container-scroll(4px), container-scroll(5px), container-scroll(3000px)",
-                6,
-                "container-scroll(1px), container-scroll(2px), container-scroll(3px), container-scroll(4px), container-scroll(5px), container-scroll(3000px)",
-                ["container-scroll(1px)", "container-scroll(2px)", "container-scroll(3px)", "container-scroll(4px)", "container-scroll(5px)", "container-scroll(3000px)"]);
-
-debug("")
-debug("Invalid property tests");
-debug("")
-
-testTriggerRule("No value", "", 0, null);
-testTriggerRule("Bad value", "banana", 0, null);
-testTriggerRule("Bad list", "container-scroll(1px), orange", 0, null);
-testTriggerRule("Missing comma", "container-scroll(1px) container-scroll(2px)", 0, null);
-testTriggerRule("Too many values", "container-scroll(1px, 2px, 3px)", 0, null);
-
-successfullyParsed = true;
-</script>
-<script src="../resources/js-test-post.js"></script>
diff --git a/LayoutTests/fast/css/compare-animation-trigger-expected.txt b/LayoutTests/fast/css/compare-animation-trigger-expected.txt
deleted file mode 100644 (file)
index 0ca8d9a..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-This test verifies that comparing two CSSAnimationTriggerScrollValues without end values does not crash.
-
-
diff --git a/LayoutTests/fast/css/compare-animation-trigger.html b/LayoutTests/fast/css/compare-animation-trigger.html
deleted file mode 100644 (file)
index d7ace34..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<html>
-<head>
-<style>
-    div { -webkit-animation-trigger : container-scroll(20px); }
-</style>
-<script>
-if (window.testRunner)
-    testRunner.dumpAsText();
-function run() {
-    document.getElementById("test").focus();
-    document.execCommand('insertHTML', false, '<div id="insertedDiv" style="-webkit-animation-trigger : container-scroll(20px); "></div>');
-}
-</script>
-</head>
-<body onload="run()">
-<p>This test verifies that comparing two CSSAnimationTriggerScrollValues without end values does not crash.</p>
-<div id="test" contenteditable></div>
-</body>
-</html>
diff --git a/LayoutTests/legacy-animation-engine/animations/trigger-computed-style-expected.txt b/LayoutTests/legacy-animation-engine/animations/trigger-computed-style-expected.txt
deleted file mode 100644 (file)
index 7b8af8c..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-Test the computed style of the -webkit-animation-trigger property.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-
-Auto : auto
-PASS triggerStyle.length is 1
-PASS subRule.cssText is 'auto'
-
-One container-scroll value : container-scroll(10px)
-PASS triggerStyle.length is 1
-PASS subRule.cssText is 'container-scroll(10px)'
-
-One container-scroll value : container-scroll(2em)
-PASS triggerStyle.length is 1
-PASS subRule.cssText is 'container-scroll(32px)'
-
-One container-scroll value with end value : container-scroll(10px, 20px)
-PASS triggerStyle.length is 1
-PASS subRule.cssText is 'container-scroll(10px, 20px)'
-
-Two container-scroll values : container-scroll(10px), container-scroll(20px)
-PASS triggerStyle.length is 2
-PASS subRule.cssText is 'container-scroll(10px)'
-PASS subRule.cssText is 'container-scroll(20px)'
-
-Many container-scroll values : container-scroll(10px), container-scroll(20px), container-scroll(30px), container-scroll(40px), container-scroll(1px)
-PASS triggerStyle.length is 5
-PASS subRule.cssText is 'container-scroll(10px)'
-PASS subRule.cssText is 'container-scroll(20px)'
-PASS subRule.cssText is 'container-scroll(30px)'
-PASS subRule.cssText is 'container-scroll(40px)'
-PASS subRule.cssText is 'container-scroll(1px)'
-
-No value : 
-PASS triggerStyle.length is 1
-PASS subRule.cssText is 'auto'
-
-Bad value : banana
-PASS triggerStyle.length is 1
-PASS subRule.cssText is 'auto'
-
-Multiple bad values : banana, eggs, bacon
-PASS triggerStyle.length is 1
-PASS subRule.cssText is 'auto'
-
-Some good, some bad values : container-scroll(10), eggs, bacon
-PASS triggerStyle.length is 1
-PASS subRule.cssText is 'auto'
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/legacy-animation-engine/animations/trigger-computed-style.html b/LayoutTests/legacy-animation-engine/animations/trigger-computed-style.html
deleted file mode 100644 (file)
index 40203c1..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE HTML><!-- webkit-test-runner [ experimental:WebAnimationsCSSIntegrationEnabled=false ] -->
-<script src="../../resources/js-test-pre.js"></script>
-<p id="description"></p>
-<div id="console"></div>
-<script>
-description("Test the computed style of the -webkit-animation-trigger property.");
-
-// These have to be global for the test helpers to see them.
-var stylesheet, triggerStyle, subRule;
-var styleElement = document.createElement("style");
-document.head.appendChild(styleElement);
-stylesheet = styleElement.sheet;
-
-function testComputedTriggerRule(description, rule, expectedLength, expectedTexts)
-{
-    debug("");
-    debug(description + " : " + rule);
-
-    stylesheet.insertRule("body { -webkit-animation-trigger: " + rule + "; }", 0);
-
-    triggerStyle = window.getComputedStyle(document.body).getPropertyCSSValue("-webkit-animation-trigger");
-    shouldBe("triggerStyle.length", "" + expectedLength);
-    for (var i = 0; i < expectedLength; i++) {
-        subRule = triggerStyle[i];
-        shouldBe("subRule.cssText", "'" + expectedTexts[i] + "'");
-    }
-    stylesheet.deleteRule(0);
-}
-
-testComputedTriggerRule("Auto",
-                        "auto", 1,
-                        ["auto"]);
-
-testComputedTriggerRule("One container-scroll value",
-                        "container-scroll(10px)", 1,
-                        ["container-scroll(10px)"]);
-
-testComputedTriggerRule("One container-scroll value",
-                        "container-scroll(2em)", 1,
-                        ["container-scroll(32px)"]);
-
-testComputedTriggerRule("One container-scroll value with end value",
-                        "container-scroll(10px, 20px)", 1,
-                        ["container-scroll(10px, 20px)"]);
-
-testComputedTriggerRule("Two container-scroll values",
-                        "container-scroll(10px), container-scroll(20px)", 2,
-                        ["container-scroll(10px)", "container-scroll(20px)"]);
-
-testComputedTriggerRule("Many container-scroll values",
-                        "container-scroll(10px), container-scroll(20px), container-scroll(30px), container-scroll(40px), container-scroll(1px)", 5,
-                        ["container-scroll(10px)", "container-scroll(20px)", "container-scroll(30px)", "container-scroll(40px)", "container-scroll(1px)"]);
-
-testComputedTriggerRule("No value",
-                        "", 1,
-                        ["auto"]);
-
-testComputedTriggerRule("Bad value",
-                        "banana", 1,
-                        ["auto"]);
-
-testComputedTriggerRule("Multiple bad values",
-                        "banana, eggs, bacon", 1,
-                        ["auto"]);
-
-testComputedTriggerRule("Some good, some bad values",
-                        "container-scroll(10), eggs, bacon", 1,
-                        ["auto"]);
-
-successfullyParsed = true;
-</script>
-<script src="../../resources/js-test-post.js"></script>
diff --git a/LayoutTests/legacy-animation-engine/animations/trigger-container-scroll-boundaries-expected.txt b/LayoutTests/legacy-animation-engine/animations/trigger-container-scroll-boundaries-expected.txt
deleted file mode 100644 (file)
index 552eaa6..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-This element should begin animating only when the page scrolls to 20px from the top. It then animates smoothly, moving 100px to the left over the next 100px of scrolling. Remember to scroll to the top of the page before reloading!
-
-PASS: Value before animation is applied is 0px
-PASS: Value with animation but no scroll was 0px
-PASS: Value with scroll amount of 10 was 10px
-PASS: Value with scroll amount of 20 was 20px
-PASS: Value with scroll amount of 30 was 30px
-PASS: Value with scroll amount of 40 was 40px
-PASS: Value with scroll amount of 50 was 50px
-PASS: Value with scroll amount of 60 was 60px
-PASS: Value with scroll amount of 70 was 70px
-PASS: Value with scroll amount of 80 was 80px
-PASS: Value with scroll amount of 90 was 90px
-
diff --git a/LayoutTests/legacy-animation-engine/animations/trigger-container-scroll-boundaries.html b/LayoutTests/legacy-animation-engine/animations/trigger-container-scroll-boundaries.html
deleted file mode 100644 (file)
index 91b8e6b..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE html><!-- webkit-test-runner [ experimental:WebAnimationsCSSIntegrationEnabled=false ] -->
-<style>
-body {
-    height: 2000px;
-}
-
-#box {
-    position: relative;
-    width: 20px;
-    height: 20px;
-    background-color: blue;
-}
-
-.animating {
-    animation-name: slide;
-    animation-duration: 1ms;
-    animation-fill-mode: forwards;
-    animation-timing-function: linear;
-    -webkit-animation-trigger: container-scroll(20px, 120px);
-}
-
-@-webkit-keyframes slide {
-  from {
-      left: 0px;
-  }
-  to {
-      left: 100px;
-  }
-}
-</style>
-<script>
-
-var results;
-var box;
-
-var scrollMin = 20;
-var scrollMax = 120;
-
-if (window.testRunner) {
-    window.testRunner.dumpAsText();
-    window.testRunner.waitUntilDone();
-}
-
-if (window.internals)
-    window.internals.settings.setVisualViewportEnabled(false);
-
-function runTest() {
-    results = document.getElementById("results");
-    box = document.getElementById("box");
-    var leftValue = window.getComputedStyle(box).left;
-    if (leftValue == "0px")
-        results.innerHTML = "PASS: Value before animation is applied is 0px<br>";
-    else
-        results.innerHTML = "FAIL: Value before animation is applied should be auto, was " + leftValue + "<br>";
-    box.className = "animating";
-    setTimeout(checkValueWithoutScroll, 0);
-}
-
-function checkValueWithoutScroll() {
-    var leftValue = window.getComputedStyle(box).left;
-    if (leftValue == "0px")
-        results.innerHTML += "PASS: Value with animation but no scroll was 0px<br>";
-    else
-        results.innerHTML += "FAIL: Value with animation but no scroll should be 0px, was " + leftValue + "<br>";
-
-    window.scrollTo(0, scrollMin + 10);
-    setTimeout(function () {
-        checkValueWithScroll(10);
-    }, 0);
-}
-
-function checkValueWithScroll(scrollAmount) {
-    var leftValue = Math.round(window.getComputedStyle(box).getPropertyCSSValue("left").getFloatValue(CSSPrimitiveValue.CSS_NUMBER));
-
-    if (leftValue == scrollAmount)
-        results.innerHTML += "PASS: Value with scroll amount of " + scrollAmount + " was " + scrollAmount + "px<br>";
-    else
-        results.innerHTML += "FAIL: Value with scroll amount of " + scrollAmount + " should be " + scrollAmount + "px, was " + leftValue + "px<br>";
-
-    if (scrollMin + scrollAmount + 10 < scrollMax) {
-        window.scrollTo(0, scrollMin + scrollAmount + 10);
-        setTimeout(function () {
-            checkValueWithScroll(scrollAmount + 10);
-        }, 0);
-    } else {
-        if (window.testRunner)
-            window.testRunner.notifyDone();
-    }
-}
-
-window.addEventListener("load", runTest, false);
-
-</script>
-
-<p>This element should begin animating only when the page scrolls to 20px from
-the top. It then animates smoothly, moving 100px to the left over the next
-100px of scrolling. Remember to scroll to the top of the page before reloading!</p>
-<div id="box"></div>
-
-<div id="results"></div>
diff --git a/LayoutTests/legacy-animation-engine/animations/trigger-container-scroll-empty-expected.txt b/LayoutTests/legacy-animation-engine/animations/trigger-container-scroll-empty-expected.txt
deleted file mode 100644 (file)
index cc8af9f..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-This element should begin animating only when the page scrolls to 20px from the top. It specifies an end value, but that should be ignored because it is not greater than the start. This means the animation will run to completion rather than take the scroll value as input. Remember to scroll to the top of the page before reloading!
-
-Value before animation is applied: 0px (should be 0px)
-Value with animation but no scroll: 0px (should be 0px)
-PASS: Animation was not depending on scroll.
-
diff --git a/LayoutTests/legacy-animation-engine/animations/trigger-container-scroll-empty.html b/LayoutTests/legacy-animation-engine/animations/trigger-container-scroll-empty.html
deleted file mode 100644 (file)
index c9608bf..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-<!DOCTYPE html><!-- webkit-test-runner [ experimental:WebAnimationsCSSIntegrationEnabled=false ] -->
-<style>
-body {
-    height: 2000px;
-}
-
-#box {
-    position: relative;
-    width: 20px;
-    height: 20px;
-    background-color: blue;
-}
-
-.animating {
-    animation-name: slide;
-    animation-duration: 1ms;
-    animation-fill-mode: forwards;
-    animation-timing-function: linear;
-    -webkit-animation-trigger: container-scroll(20px, 20px);
-}
-
-@-webkit-keyframes slide {
-  from {
-      left: 0px;
-  }
-  to {
-      left: 100px;
-  }
-}
-</style>
-<script>
-
-var results;
-var box;
-
-if (window.testRunner) {
-    window.testRunner.dumpAsText();
-    window.testRunner.waitUntilDone();
-}
-
-if (window.internals)
-    window.internals.settings.setVisualViewportEnabled(false);
-
-function runTest() {
-    results = document.getElementById("results");
-    box = document.getElementById("box");
-    results.innerHTML = "Value before animation is applied: " + window.getComputedStyle(box).left + " (should be 0px)<br>";
-    box.className = "animating";
-    setTimeout(checkValueWithoutScroll, 0);
-}
-
-function checkValueWithoutScroll() {
-    results.innerHTML += "Value with animation but no scroll: " + window.getComputedStyle(box).left + " (should be 0px)<br>";
-    window.scrollTo(0, 30);
-    setTimeout(checkValueWithScroll, 10);
-}
-
-function checkValueWithScroll() {
-    var leftValue = Math.round(window.getComputedStyle(box).getPropertyCSSValue("left").getFloatValue(CSSPrimitiveValue.CSS_NUMBER));
-
-    if (leftValue > 11) // If we were reacting to scroll we'd have a value of 10.
-        results.innerHTML += "PASS: Animation was not depending on scroll.<br>";
-    else
-        results.innerHTML += "FAIL: Value seems to be reacting to scroll. It was " + leftValue + "px<br>";
-
-    if (window.testRunner)
-        window.testRunner.notifyDone();
-}
-
-window.addEventListener("load", runTest, false);
-
-</script>
-
-<p>This element should begin animating only when the page scrolls to 20px from
-the top. It specifies an end value, but that should be ignored because it is
-not greater than the start. This means the animation will run to completion
-rather than take the scroll value as input. Remember to scroll to the top of
-the page before reloading!</p>
-<div id="box"></div>
-
-<div id="results"></div>
diff --git a/LayoutTests/legacy-animation-engine/animations/trigger-container-scroll-simple-expected.txt b/LayoutTests/legacy-animation-engine/animations/trigger-container-scroll-simple-expected.txt
deleted file mode 100644 (file)
index 8a4326a..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-This element should begin animating only when the page scrolls to 20px from the top. The animation is almost instantaneous, so it will snap to its final position. Remember to scroll to the top of the page before reloading!
-
-Value before animation is applied: 0px (should be 0px)
-Value with animation but no scroll: 0px (should be 0px)
-Value with animation after scroll: 100px (should be 100px)
-
diff --git a/LayoutTests/legacy-animation-engine/animations/trigger-container-scroll-simple.html b/LayoutTests/legacy-animation-engine/animations/trigger-container-scroll-simple.html
deleted file mode 100644 (file)
index 2b9eaff..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-<!DOCTYPE html><!-- webkit-test-runner [ experimental:WebAnimationsCSSIntegrationEnabled=false ] -->
-<style>
-body {
-    height: 2000px;
-}
-
-#box {
-    position: relative;
-    width: 20px;
-    height: 20px;
-    background-color: blue;
-}
-
-.animating {
-    animation-name: slide;
-    animation-duration: 1ms;
-    animation-fill-mode: forwards;
-    animation-timing-function: step-start;
-    -webkit-animation-trigger: container-scroll(20px);
-}
-
-@-webkit-keyframes slide {
-  from {
-      left: 0px;
-  }
-  to {
-      left: 100px;
-  }
-}
-</style>
-<script>
-
-var results;
-var box;
-
-if (window.testRunner) {
-    window.testRunner.dumpAsText();
-    window.testRunner.waitUntilDone();
-}
-
-if (window.internals)
-    window.internals.settings.setVisualViewportEnabled(false);
-
-function runTest() {
-    results = document.getElementById("results");
-    box = document.getElementById("box");
-    results.innerHTML = "Value before animation is applied: " + window.getComputedStyle(box).left + " (should be 0px)<br>";
-    box.className = "animating";
-    setTimeout(checkValueWithoutScroll, 0);
-}
-
-function checkValueWithoutScroll() {
-    results.innerHTML += "Value with animation but no scroll: " + window.getComputedStyle(box).left + " (should be 0px)<br>";
-    window.scrollTo(0, 30);
-    setTimeout(checkValueWithScroll, 0);
-}
-
-function checkValueWithScroll() {
-    results.innerHTML += "Value with animation after scroll: " + window.getComputedStyle(box).left + " (should be 100px)<br>";
-    if (window.testRunner)
-        window.testRunner.notifyDone();
-}
-
-window.addEventListener("load", runTest, false);
-
-</script>
-
-<p>This element should begin animating only when the page scrolls to 20px from
-the top. The animation is almost instantaneous, so it will snap to its final
-position. Remember to scroll to the top of the page before reloading!</p>
-<div id="box"></div>
-
-<div id="results"></div>
diff --git a/LayoutTests/legacy-animation-engine/animations/trigger-parsing-expected.txt b/LayoutTests/legacy-animation-engine/animations/trigger-parsing-expected.txt
deleted file mode 100644 (file)
index 28343b4..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-Test the parsing of the -webkit-animation-trigger property.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-
-Valid property tests
-
-
-Auto : auto
-PASS cssRule.type is 1
-PASS declaration.length is 1
-PASS declaration.getPropertyValue('-webkit-animation-trigger') is 'auto'
-PASS triggerRule.cssText is 'auto'
-
-Container Scroll : container-scroll(200px)
-PASS cssRule.type is 1
-PASS declaration.length is 1
-PASS declaration.getPropertyValue('-webkit-animation-trigger') is 'container-scroll(200px)'
-PASS triggerRule.cssText is 'container-scroll(200px)'
-
-Container Scroll : container-scroll(2em)
-PASS cssRule.type is 1
-PASS declaration.length is 1
-PASS declaration.getPropertyValue('-webkit-animation-trigger') is 'container-scroll(2em)'
-PASS triggerRule.cssText is 'container-scroll(2em)'
-
-Container Scroll : container-scroll(30vw)
-PASS cssRule.type is 1
-PASS declaration.length is 1
-PASS declaration.getPropertyValue('-webkit-animation-trigger') is 'container-scroll(30vw)'
-PASS triggerRule.cssText is 'container-scroll(30vw)'
-
-Container Scroll with end value : container-scroll(200px, 300px)
-PASS cssRule.type is 1
-PASS declaration.length is 1
-PASS declaration.getPropertyValue('-webkit-animation-trigger') is 'container-scroll(200px, 300px)'
-PASS triggerRule.cssText is 'container-scroll(200px, 300px)'
-
-Two scroll values : container-scroll(1px), container-scroll(2px)
-PASS cssRule.type is 1
-PASS declaration.length is 1
-PASS declaration.getPropertyValue('-webkit-animation-trigger') is 'container-scroll(1px), container-scroll(2px)'
-PASS triggerRule.length is 2
-PASS subRule.cssText is 'container-scroll(1px)'
-PASS subRule.cssText is 'container-scroll(2px)'
-
-Many scroll values : container-scroll(1px), container-scroll(2px), container-scroll(3px), container-scroll(4px), container-scroll(5px), container-scroll(3000px)
-PASS cssRule.type is 1
-PASS declaration.length is 1
-PASS declaration.getPropertyValue('-webkit-animation-trigger') is 'container-scroll(1px), container-scroll(2px), container-scroll(3px), container-scroll(4px), container-scroll(5px), container-scroll(3000px)'
-PASS triggerRule.length is 6
-PASS subRule.cssText is 'container-scroll(1px)'
-PASS subRule.cssText is 'container-scroll(2px)'
-PASS subRule.cssText is 'container-scroll(3px)'
-PASS subRule.cssText is 'container-scroll(4px)'
-PASS subRule.cssText is 'container-scroll(5px)'
-PASS subRule.cssText is 'container-scroll(3000px)'
-
-Invalid property tests
-
-
-No value : 
-PASS cssRule.type is 1
-PASS declaration.length is 0
-PASS declaration.getPropertyValue('-webkit-animation-trigger') is ""
-
-Bad value : banana
-PASS cssRule.type is 1
-PASS declaration.length is 0
-PASS declaration.getPropertyValue('-webkit-animation-trigger') is ""
-
-Bad list : container-scroll(1px), orange
-PASS cssRule.type is 1
-PASS declaration.length is 0
-PASS declaration.getPropertyValue('-webkit-animation-trigger') is ""
-
-Missing comma : container-scroll(1px) container-scroll(2px)
-PASS cssRule.type is 1
-PASS declaration.length is 0
-PASS declaration.getPropertyValue('-webkit-animation-trigger') is ""
-
-Too many values : container-scroll(1px, 2px, 3px)
-PASS cssRule.type is 1
-PASS declaration.length is 0
-PASS declaration.getPropertyValue('-webkit-animation-trigger') is ""
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/legacy-animation-engine/animations/trigger-parsing.html b/LayoutTests/legacy-animation-engine/animations/trigger-parsing.html
deleted file mode 100644 (file)
index 8dd6366..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE HTML><!-- webkit-test-runner [ experimental:WebAnimationsCSSIntegrationEnabled=false ] -->
-<script src="../../resources/js-test-pre.js"></script>
-<p id="description"></p>
-<div id="console"></div>
-<script>
-description("Test the parsing of the -webkit-animation-trigger property.");
-
-// These have to be global for the test helpers to see them.
-var stylesheet, cssRule, declaration, triggerRule, subRule;
-var styleElement = document.createElement("style");
-document.head.appendChild(styleElement);
-stylesheet = styleElement.sheet;
-
-function testTriggerRule(description, rule, expectedLength, expectedValue, expectedTexts)
-{
-    debug("");
-    debug(description + " : " + rule);
-
-    stylesheet.insertRule("body { -webkit-animation-trigger: " + rule + "; }", 0);
-    cssRule = stylesheet.cssRules.item(0);
-
-    shouldBe("cssRule.type", "1");
-
-    declaration = cssRule.style;
-    if (!expectedLength || !expectedValue) {
-        shouldBe("declaration.length", "0");
-        shouldBeEqualToString("declaration.getPropertyValue('-webkit-animation-trigger')", "");
-        return;
-    }
-    shouldBe("declaration.length", "1");
-    shouldBe("declaration.getPropertyValue('-webkit-animation-trigger')", "'" + expectedValue + "'");
-
-    triggerRule = declaration.getPropertyCSSValue("-webkit-animation-trigger");
-    if (expectedLength > 1) {
-        shouldBe("triggerRule.length", "" + expectedLength);
-        for (var i = 0; i < expectedLength; i++) {
-            subRule = triggerRule[i];
-            shouldBe("subRule.cssText", "'" + expectedTexts[i] + "'");
-        }
-    } else {
-        shouldBe("triggerRule.cssText", "'" + expectedValue + "'");
-    }
-
-    stylesheet.deleteRule(0);
-}
-
-debug("")
-debug("Valid property tests");
-debug("")
-
-testTriggerRule("Auto",
-                "auto", 1, "auto");
-
-testTriggerRule("Container Scroll",
-                "container-scroll(200px)", 1, "container-scroll(200px)");
-
-testTriggerRule("Container Scroll",
-                "container-scroll(2em)", 1, "container-scroll(2em)");
-
-testTriggerRule("Container Scroll",
-                "container-scroll(30vw)", 1, "container-scroll(30vw)");
-
-testTriggerRule("Container Scroll with end value",
-                "container-scroll(200px, 300px)", 1, "container-scroll(200px, 300px)");
-
-testTriggerRule("Two scroll values",
-                "container-scroll(1px), container-scroll(2px)", 2, "container-scroll(1px), container-scroll(2px)", ["container-scroll(1px)", "container-scroll(2px)"]);
-
-testTriggerRule("Many scroll values",
-                "container-scroll(1px), container-scroll(2px), container-scroll(3px), container-scroll(4px), container-scroll(5px), container-scroll(3000px)",
-                6,
-                "container-scroll(1px), container-scroll(2px), container-scroll(3px), container-scroll(4px), container-scroll(5px), container-scroll(3000px)",
-                ["container-scroll(1px)", "container-scroll(2px)", "container-scroll(3px)", "container-scroll(4px)", "container-scroll(5px)", "container-scroll(3000px)"]);
-
-debug("")
-debug("Invalid property tests");
-debug("")
-
-testTriggerRule("No value", "", 0, null);
-testTriggerRule("Bad value", "banana", 0, null);
-testTriggerRule("Bad list", "container-scroll(1px), orange", 0, null);
-testTriggerRule("Missing comma", "container-scroll(1px) container-scroll(2px)", 0, null);
-testTriggerRule("Too many values", "container-scroll(1px, 2px, 3px)", 0, null);
-
-successfullyParsed = true;
-</script>
-<script src="../../resources/js-test-post.js"></script>
diff --git a/LayoutTests/legacy-animation-engine/fast/css/compare-animation-trigger-expected.txt b/LayoutTests/legacy-animation-engine/fast/css/compare-animation-trigger-expected.txt
deleted file mode 100644 (file)
index 0ca8d9a..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-This test verifies that comparing two CSSAnimationTriggerScrollValues without end values does not crash.
-
-
diff --git a/LayoutTests/legacy-animation-engine/fast/css/compare-animation-trigger.html b/LayoutTests/legacy-animation-engine/fast/css/compare-animation-trigger.html
deleted file mode 100644 (file)
index d7ace34..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<html>
-<head>
-<style>
-    div { -webkit-animation-trigger : container-scroll(20px); }
-</style>
-<script>
-if (window.testRunner)
-    testRunner.dumpAsText();
-function run() {
-    document.getElementById("test").focus();
-    document.execCommand('insertHTML', false, '<div id="insertedDiv" style="-webkit-animation-trigger : container-scroll(20px); "></div>');
-}
-</script>
-</head>
-<body onload="run()">
-<p>This test verifies that comparing two CSSAnimationTriggerScrollValues without end values does not crash.</p>
-<div id="test" contenteditable></div>
-</body>
-</html>
index abe2f0c..721f291 100644 (file)
@@ -768,16 +768,6 @@ Bug(GTK) plugins/quicktime-plugin-replacement.html [ Skip ]
 # ENABLE(CSS_SCROLL_SNAP) is disabled.
 css3/scroll-snap [ Skip ]
 
-# TODO Animation triggers not supported
-animations/trigger-computed-style.html [ Skip ]
-legacy-animation-engine/animations/trigger-computed-style.html [ Skip ]
-animations/trigger-parsing.html [ Skip ]
-legacy-animation-engine/animations/trigger-parsing.html [ Skip ]
-animations/trigger-container-scroll-simple.html [ Skip ]
-legacy-animation-engine/animations/trigger-container-scroll-simple.html [ Skip ]
-animations/trigger-container-scroll-boundaries.html [ Skip ]
-legacy-animation-engine/animations/trigger-container-scroll-boundaries.html [ Skip ]
-
 # ENABLE(WEBVTT_REGIONS) is disabled
 webkit.org/b/109570 media/track/regions-webvtt [ Skip ]
 webkit.org/b/109570 media/track/w3c [ Skip ]
@@ -1835,9 +1825,6 @@ webkit.org/b/169621 imported/w3c/web-platform-tests/IndexedDB/fire-success-event
 
 webkit.org/b/170337 fast/repaint/obscured-background-no-repaint.html [ Pass Failure ]
 
-webkit.org/b/171599 animations/trigger-container-scroll-empty.html [ Pass Failure ]
-webkit.org/b/171599 legacy-animation-engine/animations/trigger-container-scroll-empty.html [ Pass Failure ]
-
 webkit.org/b/171600 css3/filters/composited-during-animation-layertree.html [ Pass Failure ]
 webkit.org/b/171600 legacy-animation-engine/css3/filters/composited-during-animation-layertree.html [ Pass Failure ]
 
index 90fd0a4..3fa5eb0 100644 (file)
@@ -1016,8 +1016,6 @@ animations/stop-animation-on-suspend.html [ Pass Failure ]
 legacy-animation-engine/animations/stop-animation-on-suspend.html [ Pass Failure ]
 animations/suspend-resume-animation-events.html [ Pass Failure ]
 legacy-animation-engine/animations/suspend-resume-animation-events.html [ Pass Failure ]
-animations/trigger-container-scroll-empty.html [ Failure ]
-legacy-animation-engine/animations/trigger-container-scroll-empty.html [ Failure ]
 
 # IndexedDB is not supported on iOS WK1.
 storage/indexeddb
index ad5ab84..2b35411 100644 (file)
@@ -218,10 +218,6 @@ fast/history/page-cache-media-source-closed.html [ Skip ]
 fast/history/page-cache-media-source-opened.html [ Skip ]
 fast/history/page-cache-removed-source-buffer.html [ Skip ]
 
-# TODO Animation triggers not supported
-animations/trigger-container-scroll-boundaries.html [ Failure ]
-legacy-animation-engine/animations/trigger-container-scroll-boundaries.html [ Failure ]
-
 # Quota API is not supported on iOS
 storage/domstorage/quota.html
 storage/storageinfo-missing-arguments.html
index 4d4c559..806c8f4 100644 (file)
@@ -635,9 +635,6 @@ webkit.org/b/168085 tiled-drawing/scrolling/latched-to-deleted-node.html [ Pass
 
 webkit.org/b/168336 [ Debug ] imported/w3c/web-platform-tests/streams/readable-streams/garbage-collection.html [ Pass Timeout ]
 
-webkit.org/b/168089 [ Release ] animations/trigger-container-scroll-empty.html [ Pass Failure ]
-webkit.org/b/168089 [ Release ] legacy-animation-engine/animations/trigger-container-scroll-empty.html [ Pass Failure ]
-
 # Skipped because Mac doesn't have a key to show the context menu
 fast/events/context-activated-by-key-event.html [ Skip ]
 
index 0b0c4f6..cce6dc5 100644 (file)
@@ -620,16 +620,6 @@ webkit.org/b/142260 fast/attachment [ Skip ]
 # TODO APNG is not supported
 webkit.org/b/142731 fast/images/animated-png.html [ Skip ]
 
-# TODO Animation triggers not supported
-animations/trigger-computed-style.html [ Skip ]
-legacy-animation-engine/animations/trigger-computed-style.html [ Skip ]
-animations/trigger-parsing.html [ Skip ]
-legacy-animation-engine/animations/trigger-parsing.html [ Skip ]
-animations/trigger-container-scroll-simple.html [ Skip ]
-legacy-animation-engine/animations/trigger-container-scroll-simple.html [ Skip ]
-animations/trigger-container-scroll-boundaries.html [ Skip ]
-legacy-animation-engine/animations/trigger-container-scroll-boundaries.html [ Skip ]
-
 # TODO aria-current is not supported
 webkit.org/b/149018 accessibility/aria-current.html [ Skip ]
 
@@ -2941,8 +2931,6 @@ contentfiltering [ Skip ]
 http/tests/contentfiltering [ Skip ]
 
 # The following are flaky on EWS bots. Revisit after next Windows update
-[ Release ] animations/trigger-container-scroll-empty.html [ Pass Failure ]
-[ Release ] legacy-animation-engine/animations/trigger-container-scroll-empty.html [ Pass Failure ]
 [ Release ] css3/filters/filtered-compositing-descendant.html [ Pass Failure ]
 [ Release ] fast/images/animated-gif-iframe-webkit-transform.html [ Skip ] # Timeout
 [ Release ] fast/images/animated-gif-webkit-transform.html [ Skip ] # Timeout
index e14de11..989f912 100644 (file)
@@ -1332,16 +1332,6 @@ webkit.org/b/183955 accessibility/row-with-aria-role-in-native-table.html [ Fail
 webkit.org/b/49182 animations/stop-animation-on-suspend.html [ Pass Failure ]
 webkit.org/b/49182 legacy-animation-engine/animations/stop-animation-on-suspend.html [ Pass Failure ]
 
-# TODO Animation triggers not supported
-animations/trigger-computed-style.html [ Skip ]
-legacy-animation-engine/animations/trigger-computed-style.html [ Skip ]
-animations/trigger-parsing.html [ Skip ]
-legacy-animation-engine/animations/trigger-parsing.html [ Skip ]
-animations/trigger-container-scroll-simple.html [ Skip ]
-legacy-animation-engine/animations/trigger-container-scroll-simple.html [ Skip ]
-animations/trigger-container-scroll-boundaries.html [ Skip ]
-legacy-animation-engine/animations/trigger-container-scroll-boundaries.html [ Skip ]
-
 animations/cross-fade-background-image.html [ ImageOnlyFailure ]
 legacy-animation-engine/animations/cross-fade-background-image.html [ ImageOnlyFailure ]
 
index 378ce34..38e21ec 100644 (file)
@@ -1,3 +1,13 @@
+2018-10-01  Dean Jackson  <dino@apple.com>
+
+        Remove CSS Animation Triggers
+        https://bugs.webkit.org/show_bug.cgi?id=190175
+        <rdar://problem/44925626>
+
+        Reviewed by Simon Fraser.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2018-10-02  Caio Lima  <ticaiolima@gmail.com>
 
         [BigInt] BigInt.proptotype.toString is broken when radix is power of 2
index dfa4a25..68efce9 100644 (file)
@@ -76,8 +76,6 @@ ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING;
 
 ENABLE_CSS3_TEXT = ;
 
-ENABLE_CSS_ANIMATIONS_LEVEL_2 = ENABLE_CSS_ANIMATIONS_LEVEL_2;
-
 ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
 
 ENABLE_CSS_COMPOSITING = ENABLE_CSS_COMPOSITING;
@@ -374,4 +372,4 @@ ENABLE_WIRELESS_PLAYBACK_TARGET = ENABLE_WIRELESS_PLAYBACK_TARGET;
 
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_JS_ASYNC_ITERATION) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_JS_ASYNC_ITERATION) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
index fc322e8..0d63b74 100644 (file)
@@ -1,3 +1,81 @@
+2018-10-01  Dean Jackson  <dino@apple.com>
+
+        Remove CSS Animation Triggers
+        https://bugs.webkit.org/show_bug.cgi?id=190175
+        <rdar://problem/44925626>
+
+        Reviewed by Simon Fraser.
+
+        Remove the never-properly specified CSS Animation Triggers.
+
+        * Configurations/FeatureDefines.xcconfig:
+        * Sources.txt:
+        * WebCore.xcodeproj/project.pbxproj:
+        * css/CSSAnimationTriggerScrollValue.cpp: Removed.
+        * css/CSSAnimationTriggerScrollValue.h: Removed.
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::ComputedStyleExtractor::valueForPropertyinStyle):
+        (WebCore::createAnimationTriggerValue): Deleted.
+        (WebCore::animationTriggerValue): Deleted.
+        * css/CSSProperties.json:
+        * css/CSSToStyleMap.cpp:
+        (WebCore::CSSToStyleMap::mapAnimationTrigger): Deleted.
+        * css/CSSToStyleMap.h:
+        * css/CSSValue.cpp:
+        (WebCore::CSSValue::equals const):
+        (WebCore::CSSValue::cssText const):
+        (WebCore::CSSValue::destroy):
+        * css/CSSValue.h:
+        (WebCore::CSSValue::isAnimationTriggerScrollValue const): Deleted.
+        * css/parser/CSSPropertyParser.cpp:
+        (WebCore::consumeAnimationValue):
+        (WebCore::CSSPropertyParser::parseSingleValue):
+        (WebCore::consumeWebkitAnimationTrigger): Deleted.
+        * page/FrameView.cpp:
+        (WebCore::FrameView::sendScrollEvent):
+        * page/RuntimeEnabledFeatures.h:
+        (WebCore::RuntimeEnabledFeatures::setAnimationTriggersEnabled): Deleted.
+        (WebCore::RuntimeEnabledFeatures::animationTriggersEnabled const): Deleted.
+        * page/animation/AnimationBase.cpp:
+        (WebCore::AnimationBase::updateStateMachine):
+        (WebCore::AnimationBase::fireAnimationEventsIfNeeded):
+        (WebCore::AnimationBase::timeToNextService):
+        (WebCore::AnimationBase::getElapsedTime const):
+        * page/animation/CSSAnimationController.cpp:
+        (WebCore::CSSAnimationControllerPrivate::animationWillBeRemoved):
+        (WebCore::CSSAnimationControllerPrivate::addToAnimationsDependentOnScroll): Deleted.
+        (WebCore::CSSAnimationControllerPrivate::removeFromAnimationsDependentOnScroll): Deleted.
+        (WebCore::CSSAnimationControllerPrivate::scrollWasUpdated): Deleted.
+        (WebCore::CSSAnimationController::wantsScrollUpdates const): Deleted.
+        (WebCore::CSSAnimationController::scrollWasUpdated): Deleted.
+        * page/animation/CSSAnimationController.h:
+        * page/animation/CSSAnimationControllerPrivate.h:
+        (WebCore::CSSAnimationControllerPrivate::wantsScrollUpdates const): Deleted.
+        (WebCore::CSSAnimationControllerPrivate::scrollPosition const): Deleted.
+        * page/animation/CompositeAnimation.cpp:
+        (WebCore::CompositeAnimation::updateKeyframeAnimations):
+        * page/animation/CompositeAnimation.h:
+        (WebCore::CompositeAnimation::hasScrollTriggeredAnimation const): Deleted.
+        * platform/animation/Animation.cpp:
+        (WebCore::Animation::Animation):
+        (WebCore::Animation::operator=):
+        (WebCore::Animation::animationsMatch const):
+        * platform/animation/Animation.h:
+        (WebCore::Animation::isTimingFunctionSet const):
+        (WebCore::Animation::isEmpty const):
+        (WebCore::Animation::clearTimingFunction):
+        (WebCore::Animation::clearAll):
+        (WebCore::Animation::animationMode const):
+        (WebCore::Animation::setAnimationMode):
+        (WebCore::Animation::initialTimingFunction):
+        (WebCore::Animation::isTriggerSet const): Deleted.
+        (WebCore::Animation::clearTrigger): Deleted.
+        (WebCore::Animation::trigger const): Deleted.
+        (WebCore::Animation::setTrigger): Deleted.
+        (WebCore::Animation::initialTrigger): Deleted.
+        * platform/animation/AnimationTrigger.h: Removed.
+        * platform/graphics/ca/GraphicsLayerCA.cpp:
+        (WebCore::GraphicsLayerCA::animationCanBeAccelerated const):
 2018-10-02  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r236624 and r236671.
index dfa4a25..68efce9 100644 (file)
@@ -76,8 +76,6 @@ ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING;
 
 ENABLE_CSS3_TEXT = ;
 
-ENABLE_CSS_ANIMATIONS_LEVEL_2 = ENABLE_CSS_ANIMATIONS_LEVEL_2;
-
 ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
 
 ENABLE_CSS_COMPOSITING = ENABLE_CSS_COMPOSITING;
@@ -374,4 +372,4 @@ ENABLE_WIRELESS_PLAYBACK_TARGET = ENABLE_WIRELESS_PLAYBACK_TARGET;
 
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_JS_ASYNC_ITERATION) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_JS_ASYNC_ITERATION) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
index d6fb22d..1cc4733 100644 (file)
@@ -1,3 +1,13 @@
+2018-10-01  Dean Jackson  <dino@apple.com>
+
+        Remove CSS Animation Triggers
+        https://bugs.webkit.org/show_bug.cgi?id=190175
+        <rdar://problem/44925626>
+
+        Reviewed by Simon Fraser.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2018-10-01  Andy Estes  <aestes@apple.com>
 
         [watchOS] Adopt NSURLSessionCompanionProxyPreference
index dfa4a25..68efce9 100644 (file)
@@ -76,8 +76,6 @@ ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING;
 
 ENABLE_CSS3_TEXT = ;
 
-ENABLE_CSS_ANIMATIONS_LEVEL_2 = ENABLE_CSS_ANIMATIONS_LEVEL_2;
-
 ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
 
 ENABLE_CSS_COMPOSITING = ENABLE_CSS_COMPOSITING;
@@ -374,4 +372,4 @@ ENABLE_WIRELESS_PLAYBACK_TARGET = ENABLE_WIRELESS_PLAYBACK_TARGET;
 
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_JS_ASYNC_ITERATION) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_JS_ASYNC_ITERATION) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
index 9872931..fc288b0 100644 (file)
@@ -545,7 +545,6 @@ crypto/keys/CryptoKeyRSAComponents.cpp
 crypto/keys/CryptoKeyRaw.cpp
 
 css/BasicShapeFunctions.cpp
-css/CSSAnimationTriggerScrollValue.cpp
 css/CSSAspectRatioValue.cpp
 css/CSSBasicShapes.cpp
 css/CSSBorderImage.cpp
index 5e15fce..d43b865 100644 (file)
                31A795C71888BCB200382F90 /* ANGLEInstancedArrays.h in Headers */ = {isa = PBXBuildFile; fileRef = 31A795C21888B72400382F90 /* ANGLEInstancedArrays.h */; };
                31A795C81888BCB500382F90 /* ANGLEInstancedArrays.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31A795C11888B72400382F90 /* ANGLEInstancedArrays.cpp */; };
                31AB5000122878A2001A7DB0 /* GraphicsContext3DIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 31AB4FFF122878A2001A7DB0 /* GraphicsContext3DIOS.h */; };
-               31BC742E1AAFF45C006B4340 /* CSSAnimationTriggerScrollValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 31BC742C1AAFF45C006B4340 /* CSSAnimationTriggerScrollValue.h */; };
                31C0FF220E4CEB6E007D6FE5 /* WebKitAnimationEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 31C0FF1C0E4CEB6E007D6FE5 /* WebKitAnimationEvent.h */; };
                31C0FF250E4CEB6E007D6FE5 /* WebKitTransitionEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 31C0FF1F0E4CEB6E007D6FE5 /* WebKitTransitionEvent.h */; };
                31C0FF3E0E4CEFAC007D6FE5 /* JSWebKitAnimationEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 31C0FF3A0E4CEFAC007D6FE5 /* JSWebKitAnimationEvent.h */; };
                31C0FF400E4CEFAC007D6FE5 /* JSWebKitTransitionEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 31C0FF3C0E4CEFAC007D6FE5 /* JSWebKitTransitionEvent.h */; };
                31D591B316697A6C00E6BF02 /* PlugInClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 31D591B116697A6C00E6BF02 /* PlugInClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               31DCD29D1AB4FBDE0072E817 /* AnimationTrigger.h in Headers */ = {isa = PBXBuildFile; fileRef = 31DCD29C1AB4FBDE0072E817 /* AnimationTrigger.h */; settings = {ATTRIBUTES = (Private, ); }; };
                31DCDF441DA1C45400EA5B93 /* ExtendedColor.h in Headers */ = {isa = PBXBuildFile; fileRef = 31DCDF421DA1C45400EA5B93 /* ExtendedColor.h */; settings = {ATTRIBUTES = (Private, ); }; };
                31DEA4561B39F4D900F77178 /* WebSystemBackdropLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 31DEA4541B39F4D900F77178 /* WebSystemBackdropLayer.h */; };
                31EAF97E121435A400E7C1BF /* DeviceMotionClientIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 31EAF97C121435A400E7C1BF /* DeviceMotionClientIOS.h */; };
                31A795C41888BAD100382F90 /* JSANGLEInstancedArrays.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSANGLEInstancedArrays.cpp; sourceTree = "<group>"; };
                31A795C51888BAD100382F90 /* JSANGLEInstancedArrays.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSANGLEInstancedArrays.h; sourceTree = "<group>"; };
                31AB4FFF122878A2001A7DB0 /* GraphicsContext3DIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GraphicsContext3DIOS.h; sourceTree = "<group>"; };
-               31BC742B1AAFF45C006B4340 /* CSSAnimationTriggerScrollValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSAnimationTriggerScrollValue.cpp; sourceTree = "<group>"; };
-               31BC742C1AAFF45C006B4340 /* CSSAnimationTriggerScrollValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSAnimationTriggerScrollValue.h; sourceTree = "<group>"; };
                31C0FF1B0E4CEB6E007D6FE5 /* WebKitAnimationEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKitAnimationEvent.cpp; sourceTree = "<group>"; };
                31C0FF1C0E4CEB6E007D6FE5 /* WebKitAnimationEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitAnimationEvent.h; sourceTree = "<group>"; };
                31C0FF1D0E4CEB6E007D6FE5 /* WebKitAnimationEvent.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebKitAnimationEvent.idl; sourceTree = "<group>"; };
                31D26BC51F86D268008FF255 /* JSImageBitmapOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSImageBitmapOptions.h; sourceTree = "<group>"; };
                31D26BC61F86D269008FF255 /* JSImageBitmap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSImageBitmap.cpp; sourceTree = "<group>"; };
                31D591B116697A6C00E6BF02 /* PlugInClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlugInClient.h; sourceTree = "<group>"; };
-               31DCD29C1AB4FBDE0072E817 /* AnimationTrigger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AnimationTrigger.h; sourceTree = "<group>"; };
                31DCDF411DA1C45400EA5B93 /* ExtendedColor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ExtendedColor.cpp; sourceTree = "<group>"; };
                31DCDF421DA1C45400EA5B93 /* ExtendedColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExtendedColor.h; sourceTree = "<group>"; };
                31DEA4531B39F4D900F77178 /* WebSystemBackdropLayer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebSystemBackdropLayer.mm; sourceTree = "<group>"; };
                                49E912A60EFAC906009D0CAF /* Animation.h */,
                                49E912A70EFAC906009D0CAF /* AnimationList.cpp */,
                                49E912A80EFAC906009D0CAF /* AnimationList.h */,
-                               31DCD29C1AB4FBDE0072E817 /* AnimationTrigger.h */,
                                0F580FAE149800D400FB5BD8 /* AnimationUtilities.h */,
                                0FDF45A81BD1C82500E4FA8C /* TimingFunction.cpp */,
                                49E912A90EFAC906009D0CAF /* TimingFunction.h */,
                                FBD6AF8415EF21D4008B7110 /* BasicShapeFunctions.cpp */,
                                FBD6AF8515EF21D4008B7110 /* BasicShapeFunctions.h */,
                                A80E6CDA0A1989CA007FB8C5 /* Counter.h */,
-                               31BC742B1AAFF45C006B4340 /* CSSAnimationTriggerScrollValue.cpp */,
-                               31BC742C1AAFF45C006B4340 /* CSSAnimationTriggerScrollValue.h */,
                                CAE9F90D146441F000C245B0 /* CSSAspectRatioValue.cpp */,
                                CAE9F90E146441F000C245B0 /* CSSAspectRatioValue.h */,
                                FBD6AF8615EF21D4008B7110 /* CSSBasicShapes.cpp */,
                                714C7C661FDAD2A100F2BEE1 /* AnimationPlaybackEvent.h in Headers */,
                                714C7C671FDAD2A900F2BEE1 /* AnimationPlaybackEventInit.h in Headers */,
                                71025ECD1F99F0CE004A250C /* AnimationTimeline.h in Headers */,
-                               31DCD29D1AB4FBDE0072E817 /* AnimationTrigger.h in Headers */,
                                0F580FAF149800D400FB5BD8 /* AnimationUtilities.h in Headers */,
                                93309DD7099E64920056E581 /* AppendNodeCommand.h in Headers */,
                                A1DF5A941F7EC4320058A477 /* ApplePayContactField.h in Headers */,
                                71C29E32203CE781008F36D2 /* CSSAnimation.h in Headers */,
                                316FE1140E6E1DA700BF6088 /* CSSAnimationController.h in Headers */,
                                0F15DA8A0F3AAEE70000CE47 /* CSSAnimationControllerPrivate.h in Headers */,
-                               31BC742E1AAFF45C006B4340 /* CSSAnimationTriggerScrollValue.h in Headers */,
                                CAE9F910146441F000C245B0 /* CSSAspectRatioValue.h in Headers */,
                                94DE5C821D7F3A1400164F2A /* CSSAtRuleID.h in Headers */,
                                FBD6AF8815EF25C9008B7110 /* CSSBasicShapes.h in Headers */,
diff --git a/Source/WebCore/css/CSSAnimationTriggerScrollValue.cpp b/Source/WebCore/css/CSSAnimationTriggerScrollValue.cpp
deleted file mode 100644 (file)
index a1a597b..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "CSSAnimationTriggerScrollValue.h"
-#include <wtf/PointerComparison.h>
-
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-
-#include <wtf/text/StringBuilder.h>
-
-namespace WebCore {
-
-String CSSAnimationTriggerScrollValue::customCSSText() const
-{
-    StringBuilder result;
-    result.appendLiteral("container-scroll(");
-    result.append(m_startValue->cssText());
-    if (m_endValue) {
-        result.appendLiteral(", ");
-        result.append(m_endValue->cssText());
-    }
-    result.append(')');
-    return result.toString();
-}
-
-bool CSSAnimationTriggerScrollValue::equals(const CSSAnimationTriggerScrollValue& other) const
-{
-    return m_startValue->equals(other.m_startValue.get()) && arePointingToEqualData(m_endValue.get(), other.m_endValue.get());
-}
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/css/CSSAnimationTriggerScrollValue.h b/Source/WebCore/css/CSSAnimationTriggerScrollValue.h
deleted file mode 100644 (file)
index e5e0274..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-
-#include "CSSValue.h"
-
-namespace WebCore {
-
-class CSSAnimationTriggerScrollValue final : public CSSValue {
-public:
-    static Ref<CSSAnimationTriggerScrollValue> create(Ref<CSSValue>&& startValue, RefPtr<CSSValue>&& endValue = nullptr)
-    {
-        return adoptRef(*new CSSAnimationTriggerScrollValue(WTFMove(startValue), WTFMove(endValue)));
-    }
-
-    const CSSValue& startValue() const { return m_startValue.get(); }
-    const CSSValue* endValue() const { return m_endValue.get(); }
-    bool hasEndValue() const { return m_endValue; }
-
-    String customCSSText() const;
-
-    bool equals(const CSSAnimationTriggerScrollValue&) const;
-    bool operator==(const CSSAnimationTriggerScrollValue& other) const { return equals(other); }
-
-private:
-    CSSAnimationTriggerScrollValue(Ref<CSSValue>&& startValue, RefPtr<CSSValue>&& endValue)
-        : CSSValue(AnimationTriggerScrollClass)
-        , m_startValue(WTFMove(startValue))
-        , m_endValue(WTFMove(endValue))
-    {
-    }
-
-    Ref<CSSValue> m_startValue;
-    RefPtr<CSSValue> m_endValue;
-};
-
-}
-
-SPECIALIZE_TYPE_TRAITS_CSS_VALUE(CSSAnimationTriggerScrollValue, isAnimationTriggerScrollValue())
-
-#endif
index b7b0a48..be894bf 100644 (file)
@@ -27,7 +27,6 @@
 
 #include "BasicShapeFunctions.h"
 #include "CSSAnimationController.h"
-#include "CSSAnimationTriggerScrollValue.h"
 #include "CSSAspectRatioValue.h"
 #include "CSSBasicShapes.h"
 #include "CSSBorderImage.h"
 #include "DashboardRegion.h"
 #endif
 
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-#include "AnimationTrigger.h"
-#endif
-
 namespace WebCore {
 
 // List of all properties we know how to compute, omitting shorthands.
@@ -261,9 +256,6 @@ static const CSSPropertyID computedProperties[] = {
 #endif
     CSSPropertyZIndex,
     CSSPropertyZoom,
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-    CSSPropertyWebkitAnimationTrigger,
-#endif
     CSSPropertyWebkitAppearance,
     CSSPropertyWebkitBackfaceVisibility,
     CSSPropertyWebkitBackgroundClip,
@@ -1598,37 +1590,6 @@ static Ref<CSSValueList> timingFunctionValue(const AnimationList* animationList)
     return list;
 }
 
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-
-static Ref<CSSValue> createAnimationTriggerValue(const AnimationTrigger& trigger, const RenderStyle& style)
-{
-    switch (trigger.type()) {
-    case AnimationTrigger::AnimationTriggerType::ScrollAnimationTriggerType: {
-        auto& scrollAnimationTrigger = downcast<ScrollAnimationTrigger>(trigger);
-        if (scrollAnimationTrigger.endValue().isAuto())
-            return CSSAnimationTriggerScrollValue::create(zoomAdjustedPixelValueForLength(scrollAnimationTrigger.startValue(), style));
-        return CSSAnimationTriggerScrollValue::create(zoomAdjustedPixelValueForLength(scrollAnimationTrigger.startValue(), style),
-                                                      zoomAdjustedPixelValueForLength(scrollAnimationTrigger.endValue(), style));
-    }
-    default:
-        ASSERT(trigger.type() == AnimationTrigger::AnimationTriggerType::AutoAnimationTriggerType);
-        return CSSValuePool::singleton().createIdentifierValue(CSSValueAuto);
-    }
-}
-
-static Ref<CSSValueList> animationTriggerValue(const AnimationList* animationList, const RenderStyle& style)
-{
-    auto list = CSSValueList::createCommaSeparated();
-    if (animationList) {
-        for (size_t i = 0; i < animationList->size(); ++i)
-            list->append(createAnimationTriggerValue(*animationList->animation(i).trigger(), style));
-    } else
-        list->append(createAnimationTriggerValue(Animation::initialTrigger().get(), style));
-    return list;
-}
-
-#endif
-
 static Ref<CSSValue> createLineBoxContainValue(unsigned lineBoxContain)
 {
     if (!lineBoxContain)
@@ -3625,10 +3586,6 @@ RefPtr<CSSValue> ComputedStyleExtractor::valueForPropertyinStyle(const RenderSty
         }
         case CSSPropertyAnimationTimingFunction:
             return timingFunctionValue(style.animations());
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-        case CSSPropertyWebkitAnimationTrigger:
-            return animationTriggerValue(style.animations(), style);
-#endif
         case CSSPropertyWebkitAppearance:
             return cssValuePool.createValue(style.appearance());
         case CSSPropertyWebkitAspectRatio:
index e999776..fde3dff 100644 (file)
             },
             "status": "non-standard"
         },
-        "-webkit-animation-trigger": {
-            "animatable": true,
-            "codegen-properties": {
-                "name-for-methods": "Trigger",
-                "enable-if": "ENABLE_CSS_ANIMATIONS_LEVEL_2"
-            },
-            "status": {
-                "status": "experimental"
-            }
-        },
         "-webkit-appearance": {
             "values": [
                 "checkbox",
index a0f9bda..a295348 100644 (file)
@@ -29,7 +29,6 @@
 #include "CSSToStyleMap.h"
 
 #include "Animation.h"
-#include "CSSAnimationTriggerScrollValue.h"
 #include "CSSBorderImageSliceValue.h"
 #include "CSSImageGeneratorValue.h"
 #include "CSSImageSetValue.h"
@@ -510,38 +509,6 @@ void CSSToStyleMap::mapAnimationTimingFunction(Animation& animation, const CSSVa
     }
 }
 
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-void CSSToStyleMap::mapAnimationTrigger(Animation& animation, const CSSValue& value)
-{
-    if (value.treatAsInitialValue(CSSPropertyWebkitAnimationTrigger)) {
-        animation.setTrigger(Animation::initialTrigger());
-        return;
-    }
-
-    if (value.isPrimitiveValue()) {
-        auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
-        if (primitiveValue.valueID() == CSSValueAuto)
-            animation.setTrigger(AutoAnimationTrigger::create());
-        return;
-    }
-
-    if (value.isAnimationTriggerScrollValue()) {
-        auto& scrollTrigger = downcast<CSSAnimationTriggerScrollValue>(value);
-
-        const CSSPrimitiveValue& startValue = downcast<CSSPrimitiveValue>(scrollTrigger.startValue());
-        Length startLength = startValue.computeLength<Length>(m_resolver->state().cssToLengthConversionData());
-
-        Length endLength;
-        if (scrollTrigger.hasEndValue()) {
-            const CSSPrimitiveValue* endValue = downcast<CSSPrimitiveValue>(scrollTrigger.endValue());
-            endLength = endValue->computeLength<Length>(m_resolver->state().cssToLengthConversionData());
-        }
-
-        animation.setTrigger(ScrollAnimationTrigger::create(startLength, endLength));
-    }
-}
-#endif
-
 void CSSToStyleMap::mapNinePieceImage(CSSPropertyID property, CSSValue* value, NinePieceImage& image)
 {
     // If we're not a value list, then we are "none" and don't need to alter the empty image at all.
index 31bb0b9..4fb29a9 100644 (file)
@@ -65,9 +65,6 @@ public:
     void mapAnimationPlayState(Animation&, const CSSValue&);
     void mapAnimationProperty(Animation&, const CSSValue&);
     void mapAnimationTimingFunction(Animation&, const CSSValue&);
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-    void mapAnimationTrigger(Animation&, const CSSValue&);
-#endif
 
     void mapNinePieceImage(CSSPropertyID, CSSValue*, NinePieceImage&);
     void mapNinePieceImageSlice(CSSValue&, NinePieceImage&);
index d828445..912e8ad 100644 (file)
@@ -28,7 +28,6 @@
 #include "config.h"
 #include "CSSValue.h"
 
-#include "CSSAnimationTriggerScrollValue.h"
 #include "CSSAspectRatioValue.h"
 #include "CSSBorderImageSliceValue.h"
 #include "CSSCalculationValue.h"
@@ -200,10 +199,6 @@ bool CSSValue::equals(const CSSValue& other) const
             return compareCSSValues<CSSCalcValue>(*this, other);
         case ImageSetClass:
             return compareCSSValues<CSSImageSetValue>(*this, other);
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-        case AnimationTriggerScrollClass:
-            return compareCSSValues<CSSAnimationTriggerScrollValue>(*this, other);
-#endif
         case CSSContentDistributionClass:
             return compareCSSValues<CSSContentDistributionValue>(*this, other);
         case CustomPropertyClass:
@@ -302,10 +297,6 @@ String CSSValue::cssText() const
         return downcast<CSSCalcValue>(*this).customCSSText();
     case ImageSetClass:
         return downcast<CSSImageSetValue>(*this).customCSSText();
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-    case AnimationTriggerScrollClass:
-        return downcast<CSSAnimationTriggerScrollValue>(*this).customCSSText();
-#endif
     case CSSContentDistributionClass:
         return downcast<CSSContentDistributionValue>(*this).customCSSText();
     case CustomPropertyClass:
@@ -436,11 +427,6 @@ void CSSValue::destroy()
     case FilterImageClass:
         delete downcast<CSSFilterImageValue>(this);
         return;
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-    case AnimationTriggerScrollClass:
-        delete downcast<CSSAnimationTriggerScrollValue>(this);
-        return;
-#endif
     case CSSContentDistributionClass:
         delete downcast<CSSContentDistributionValue>(this);
         return;
index d44b075..5d386af 100644 (file)
@@ -112,10 +112,6 @@ public:
     bool isGridLineNamesValue() const { return m_classType == GridLineNamesClass; }
     bool isUnicodeRangeValue() const { return m_classType == UnicodeRangeClass; }
 
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-    bool isAnimationTriggerScrollValue() const { return m_classType == AnimationTriggerScrollClass; }
-#endif
-
     bool isCustomIdentValue() const { return m_classType == CustomIdentClass; }
     bool isVariableReferenceValue() const { return m_classType == VariableReferenceClass; }
     bool isPendingSubstitutionValue() const { return m_classType == PendingSubstitutionValueClass; }
@@ -178,12 +174,9 @@ protected:
         LineBoxContainClass,
         CalculationClass,
         GridTemplateAreasClass,
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-        AnimationTriggerScrollClass,
-#endif
 
         CSSContentDistributionClass,
-        
+
         CustomIdentClass,
 
         CustomPropertyClass,
index 02d293c..33d1632 100644 (file)
@@ -30,9 +30,6 @@
 #include "config.h"
 #include "CSSPropertyParser.h"
 
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-#include "CSSAnimationTriggerScrollValue.h"
-#endif
 #include "CSSAspectRatioValue.h"
 #include "CSSBasicShapes.h"
 #include "CSSBorderImage.h"
@@ -1576,40 +1573,6 @@ static RefPtr<CSSValue> consumeAnimationTimingFunction(CSSParserTokenRange& rang
     return nullptr;
 }
 
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-static RefPtr<CSSValue> consumeWebkitAnimationTrigger(CSSParserTokenRange& range, CSSParserMode mode)
-{
-    if (range.peek().id() == CSSValueAuto)
-        return consumeIdent(range);
-    
-    if (range.peek().functionId() != CSSValueContainerScroll)
-        return nullptr;
-    
-    CSSParserTokenRange rangeCopy = range;
-    CSSParserTokenRange args = consumeFunction(rangeCopy);
-
-    RefPtr<CSSPrimitiveValue> startValue = consumeLength(args, mode, ValueRangeAll, UnitlessQuirk::Forbid);
-    if (!startValue)
-        return nullptr;
-    
-    if (args.atEnd()) {
-        range = rangeCopy;
-        return CSSAnimationTriggerScrollValue::create(startValue.releaseNonNull());
-    }
-
-    if (!consumeCommaIncludingWhitespace(args))
-        return nullptr;
-
-    RefPtr<CSSPrimitiveValue> endValue = consumeLength(args, mode, ValueRangeAll, UnitlessQuirk::Forbid);
-    if (!endValue || !args.atEnd())
-        return nullptr;
-
-    range = rangeCopy;
-
-    return CSSAnimationTriggerScrollValue::create(startValue.releaseNonNull(), endValue.releaseNonNull());
-}
-#endif
-    
 static RefPtr<CSSValue> consumeAnimationValue(CSSPropertyID property, CSSParserTokenRange& range, const CSSParserContext& context)
 {
     switch (property) {
@@ -1634,10 +1597,6 @@ static RefPtr<CSSValue> consumeAnimationValue(CSSPropertyID property, CSSParserT
     case CSSPropertyAnimationTimingFunction:
     case CSSPropertyTransitionTimingFunction:
         return consumeAnimationTimingFunction(range, context);
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-    case CSSPropertyWebkitAnimationTrigger:
-        return consumeWebkitAnimationTrigger(range, context.mode);
-#endif
     default:
         ASSERT_NOT_REACHED();
         return nullptr;
@@ -4040,9 +3999,6 @@ RefPtr<CSSValue> CSSPropertyParser::parseSingleValue(CSSPropertyID property, CSS
     case CSSPropertyTransitionProperty:
     case CSSPropertyAnimationTimingFunction:
     case CSSPropertyTransitionTimingFunction:
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-    case CSSPropertyWebkitAnimationTrigger:
-#endif
         return consumeAnimationPropertyList(property, m_range, m_context);
     case CSSPropertyShapeMargin:
         return consumeLengthOrPercent(m_range, m_context.mode, ValueRangeNonNegative);
index 802f391..074b938 100644 (file)
@@ -4798,9 +4798,6 @@ void FrameView::sendScrollEvent()
 {
     frame().eventHandler().sendScrollEvent();
     frame().eventHandler().dispatchFakeMouseMoveEventSoon();
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-    frame().animation().scrollWasUpdated();
-#endif
 }
 
 void FrameView::addChild(Widget& widget)
index 0e84f04..af5e952 100644 (file)
@@ -238,12 +238,6 @@ public:
     bool gamepadsEnabled() const { return m_areGamepadsEnabled; }
 #endif
 
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-    // FIXME: This is not used.
-    void setAnimationTriggersEnabled(bool areEnabled) { m_areAnimationTriggersEnabled = areEnabled; }
-    bool animationTriggersEnabled() const { return m_areAnimationTriggersEnabled; }
-#endif
-
 #if ENABLE(WEBGL2)
     void setWebGL2Enabled(bool isEnabled) { m_isWebGL2Enabled = isEnabled; }
     bool webGL2Enabled() const { return m_isWebGL2Enabled; }
@@ -391,10 +385,6 @@ private:
     bool m_areGamepadsEnabled { false };
 #endif
 
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-    bool m_areAnimationTriggersEnabled { false };
-#endif
-
 #if ENABLE(STREAMS_API)
     bool m_isReadableByteStreamAPIEnabled { false };
     bool m_isWritableStreamAPIEnabled { false };
index d1d0a81..d4b56cf 100644 (file)
@@ -228,10 +228,6 @@ void AnimationBase::updateStateMachine(AnimationStateInput input, double param)
                 m_pauseTime = std::nullopt;
             }
 
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-            if (m_animation->trigger() && m_animation->trigger()->isScrollAnimationTrigger())
-                m_compositeAnimation->animationController().addToAnimationsDependentOnScroll(this);
-#endif
             break;
         case AnimationState::StartWaitTimer:
             ASSERT(input == AnimationStateInput::StartTimerFired || input == AnimationStateInput::PlayStatePaused);
@@ -493,30 +489,12 @@ void AnimationBase::fireAnimationEventsIfNeeded()
     
     // Check for start timeout
     if (m_animationState == AnimationState::StartWaitTimer) {
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-        if (m_animation->trigger() && m_animation->trigger()->isScrollAnimationTrigger()) {
-            if (m_element) {
-                float offset = m_compositeAnimation->animationController().scrollPosition();
-                auto& scrollTrigger = downcast<ScrollAnimationTrigger>(*m_animation->trigger());
-                if (offset > scrollTrigger.startValue().value())
-                    updateStateMachine(AnimationStateInput::StartTimerFired, 0);
-            }
-
-            return;
-        }
-#endif
         if (beginAnimationUpdateTime() - m_requestedStartTime >= m_animation->delay())
             updateStateMachine(AnimationStateInput::StartTimerFired, 0);
         return;
     }
 
     double elapsedDuration = beginAnimationUpdateTime() - m_startTime.value_or(0);
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-    // If we are a triggered animation that depends on scroll, our elapsed
-    // time is determined by the scroll position.
-    if (m_animation->trigger() && m_animation->trigger()->isScrollAnimationTrigger())
-        elapsedDuration = getElapsedTime();
-#endif
 
     // FIXME: we need to ensure that elapsedDuration is never < 0. If it is, this suggests that
     // we had a recalcStyle() outside of beginAnimationUpdate()/endAnimationUpdate().
@@ -576,17 +554,6 @@ std::optional<Seconds> AnimationBase::timeToNextService()
         return std::nullopt;
     
     if (m_animationState == AnimationState::StartWaitTimer) {
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-        if (m_animation->trigger()->isScrollAnimationTrigger()) {
-            if (m_element) {
-                float currentScrollPosition = m_element->document().view()->scrollPositionForFixedPosition().y().toFloat();
-                auto& scrollTrigger = downcast<ScrollAnimationTrigger>(*m_animation->trigger());
-                if (currentScrollPosition >= scrollTrigger.startValue().value() && (!scrollTrigger.hasEndValue() || currentScrollPosition <= scrollTrigger.endValue().value()))
-                    return 0_s;
-            }
-            return std::nullopt;
-        }
-#endif
         double timeFromNow = m_animation->delay() - (beginAnimationUpdateTime() - m_requestedStartTime);
         return std::max(Seconds { timeFromNow }, 0_s);
     }
@@ -726,22 +693,6 @@ double AnimationBase::beginAnimationUpdateTime() const
 
 double AnimationBase::getElapsedTime() const
 {
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-    if (m_animation->trigger() && m_animation->trigger()->isScrollAnimationTrigger()) {
-        auto& scrollTrigger = downcast<ScrollAnimationTrigger>(*m_animation->trigger());
-        if (scrollTrigger.hasEndValue() && m_element) {
-            float offset = m_compositeAnimation->animationController().scrollPosition();
-            float startValue = scrollTrigger.startValue().value();
-            if (offset < startValue)
-                return 0;
-            float endValue = scrollTrigger.endValue().value();
-            if (offset > endValue)
-                return m_animation->duration();
-            return m_animation->duration() * (offset - startValue) / (endValue - startValue);
-        }
-    }
-#endif
-
     if (paused()) {
         double delayOffset = (!m_startTime && m_animation->delay() < 0) ? m_animation->delay() : 0;
         return m_pauseTime.value_or(0) - m_startTime.value_or(0) - delayOffset;
index 1e90fa5..5d56afc 100644 (file)
@@ -579,9 +579,6 @@ void CSSAnimationControllerPrivate::animationWillBeRemoved(AnimationBase* animat
 
     removeFromAnimationsWaitingForStyle(animation);
     removeFromAnimationsWaitingForStartTimeResponse(animation);
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-    removeFromAnimationsDependentOnScroll(animation);
-#endif
 
     bool anyAnimationsWaitingForAsyncStart = false;
     for (auto& animation : m_animationsWaitingForStartTimeResponse) {
@@ -595,33 +592,6 @@ void CSSAnimationControllerPrivate::animationWillBeRemoved(AnimationBase* animat
         m_waitingForAsyncStartNotification = false;
 }
 
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-void CSSAnimationControllerPrivate::addToAnimationsDependentOnScroll(AnimationBase* animation)
-{
-    m_animationsDependentOnScroll.add(animation);
-}
-
-void CSSAnimationControllerPrivate::removeFromAnimationsDependentOnScroll(AnimationBase* animation)
-{
-    m_animationsDependentOnScroll.remove(animation);
-}
-
-void CSSAnimationControllerPrivate::scrollWasUpdated()
-{
-    auto* view = m_frame.view();
-    if (!view || !wantsScrollUpdates())
-        return;
-
-    m_scrollPosition = view->scrollPositionForFixedPosition().y().toFloat();
-
-    // FIXME: This is updating all the animations, rather than just the ones
-    // that are dependent on scroll. We to go from our AnimationBase to its CompositeAnimation
-    // so we can execute code similar to updateAnimations.
-    // https://bugs.webkit.org/show_bug.cgi?id=144170
-    updateAnimations(CallSetChanged);
-}
-#endif
-
 CSSAnimationController::CSSAnimationController(Frame& frame)
     : m_data(std::make_unique<CSSAnimationControllerPrivate>(frame))
 {
@@ -824,18 +794,6 @@ bool CSSAnimationController::supportsAcceleratedAnimationOfProperty(CSSPropertyI
     return CSSPropertyAnimation::animationOfPropertyIsAccelerated(property);
 }
 
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-bool CSSAnimationController::wantsScrollUpdates() const
-{
-    return m_data->wantsScrollUpdates();
-}
-
-void CSSAnimationController::scrollWasUpdated()
-{
-    m_data->scrollWasUpdated();
-}
-#endif
-
 bool CSSAnimationController::hasAnimations() const
 {
     return m_data->hasAnimations();
index 05004ef..5b2e67a 100644 (file)
@@ -94,11 +94,6 @@ public:
     
     static bool supportsAcceleratedAnimationOfProperty(CSSPropertyID);
 
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-    bool wantsScrollUpdates() const;
-    void scrollWasUpdated();
-#endif
-
     bool hasAnimations() const;
 
 private:
index 728a175..baeea46 100644 (file)
@@ -108,15 +108,6 @@ public:
 
     void setRequiresLayout() { m_requiresLayout = true; }
 
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-    bool wantsScrollUpdates() const { return !m_animationsDependentOnScroll.isEmpty(); }
-    void addToAnimationsDependentOnScroll(AnimationBase*);
-    void removeFromAnimationsDependentOnScroll(AnimationBase*);
-
-    void scrollWasUpdated();
-    float scrollPosition() const { return m_scrollPosition; }
-#endif
-
 private:
     void animationTimerFired();
 
@@ -155,11 +146,6 @@ private:
     // behavior of allowing new transitions and animations to
     // run even when this object is suspended.
     bool m_allowsNewAnimationsWhileSuspended;
-
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-    AnimationsSet m_animationsDependentOnScroll;
-    float m_scrollPosition { 0 };
-#endif
 };
 
 } // namespace WebCore
index a8feca2..b77a6c2 100644 (file)
@@ -209,10 +209,6 @@ void CompositeAnimation::updateKeyframeAnimations(Element& element, const Render
     if (currentStyle && currentStyle->hasAnimations() && targetStyle.hasAnimations() && *(currentStyle->animations()) == *(targetStyle.animations()))
         return;
 
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-    m_hasScrollTriggeredAnimation = false;
-#endif
-
     AnimationNameMap newAnimations;
 
     // Toss the animation order map.
@@ -238,11 +234,6 @@ void CompositeAnimation::updateKeyframeAnimations(Element& element, const Render
                 if (keyframeAnim->postActive())
                     continue;
 
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-                if (animation.trigger()->isScrollAnimationTrigger())
-                    m_hasScrollTriggeredAnimation = true;
-#endif
-
                 // Animations match, but play states may differ. Update if needed.
                 keyframeAnim->updatePlayState(animation.playState());
 
@@ -261,11 +252,6 @@ void CompositeAnimation::updateKeyframeAnimations(Element& element, const Render
                     LOG(Animations, "  property %s", getPropertyName(propertyID));
 #endif
 
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-                if (animation.trigger()->isScrollAnimationTrigger())
-                    m_hasScrollTriggeredAnimation = true;
-#endif
-
                 newAnimations.set(keyframeAnim->name().impl(), keyframeAnim);
             }
             
index 633759d..cf754c7 100644 (file)
@@ -80,10 +80,6 @@ public:
     bool pauseTransitionAtTime(CSSPropertyID, double);
     unsigned numberOfActiveAnimations() const;
 
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-    bool hasScrollTriggeredAnimation() const { return m_hasScrollTriggeredAnimation; }
-#endif
-
     bool hasAnimationThatDependsOnLayout() const { return m_hasAnimationThatDependsOnLayout; }
 
 private:
@@ -97,9 +93,6 @@ private:
 
     bool m_suspended { false };
     bool m_hasAnimationThatDependsOnLayout { false };
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-    bool m_hasScrollTriggeredAnimation { false };
-#endif
 
     CSSAnimationControllerPrivate& m_animationController;
     CSSPropertyTransitionsMap m_transitions;
index ac7d27a..1f8cad0 100644 (file)
@@ -32,9 +32,6 @@ Animation::Animation()
     , m_delay(initialDelay())
     , m_duration(initialDuration())
     , m_timingFunction(initialTimingFunction())
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-    , m_trigger(initialTrigger())
-#endif
     , m_mode(AnimateAll)
     , m_direction(initialDirection())
     , m_fillMode(static_cast<unsigned>(initialFillMode()))
@@ -48,9 +45,6 @@ Animation::Animation()
     , m_playStateSet(false)
     , m_propertySet(false)
     , m_timingFunctionSet(false)
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-    , m_triggerSet(false)
-#endif
     , m_isNone(false)
 {
 }
@@ -63,9 +57,6 @@ Animation::Animation(const Animation& o)
     , m_delay(o.m_delay)
     , m_duration(o.m_duration)
     , m_timingFunction(o.m_timingFunction)
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-    , m_trigger(o.m_trigger)
-#endif
     , m_nameStyleScopeOrdinal(o.m_nameStyleScopeOrdinal)
     , m_mode(o.m_mode)
     , m_direction(o.m_direction)
@@ -80,9 +71,6 @@ Animation::Animation(const Animation& o)
     , m_playStateSet(o.m_playStateSet)
     , m_propertySet(o.m_propertySet)
     , m_timingFunctionSet(o.m_timingFunctionSet)
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-    , m_triggerSet(o.m_triggerSet)
-#endif
     , m_isNone(o.m_isNone)
 {
 }
@@ -94,18 +82,12 @@ Animation& Animation::operator=(const Animation& o)
     m_delay = o.m_delay;
     m_duration = o.m_duration;
     m_timingFunction = o.m_timingFunction;
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-    m_trigger = o.m_trigger;
-#endif
     m_nameStyleScopeOrdinal = o.m_nameStyleScopeOrdinal;
     m_property = o.m_property;
     m_mode = o.m_mode;
     m_direction = o.m_direction;
     m_fillMode = o.m_fillMode;
     m_playState = o.m_playState;
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-    m_trigger = o.m_trigger;
-#endif
 
     m_delaySet = o.m_delaySet;
     m_directionSet = o.m_directionSet;
@@ -116,9 +98,6 @@ Animation& Animation::operator=(const Animation& o)
     m_playStateSet = o.m_playStateSet;
     m_propertySet = o.m_propertySet;
     m_timingFunctionSet = o.m_timingFunctionSet;
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-    m_triggerSet = o.m_triggerSet;
-#endif
     m_isNone = o.m_isNone;
 
     return *this;
@@ -135,9 +114,6 @@ bool Animation::animationsMatch(const Animation& other, bool matchProperties) co
         && m_delay == other.m_delay
         && m_duration == other.m_duration
         && *(m_timingFunction.get()) == *(other.m_timingFunction.get())
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-        && *(m_trigger.get()) == *(other.m_trigger.get())
-#endif
         && m_nameStyleScopeOrdinal == other.m_nameStyleScopeOrdinal
         && m_direction == other.m_direction
         && m_fillMode == other.m_fillMode
@@ -148,9 +124,6 @@ bool Animation::animationsMatch(const Animation& other, bool matchProperties) co
         && m_iterationCountSet == other.m_iterationCountSet
         && m_nameSet == other.m_nameSet
         && m_timingFunctionSet == other.m_timingFunctionSet
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-        && m_triggerSet == other.m_triggerSet
-#endif
         && m_isNone == other.m_isNone;
 
     if (!result)
index f406e7f..56bc87d 100644 (file)
 #include "StyleScope.h"
 #include "TimingFunction.h"
 
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-#include "AnimationTrigger.h"
-#endif
-
 namespace WebCore {
 
 class Animation : public RefCounted<Animation> {
@@ -51,9 +47,6 @@ public:
     bool isPlayStateSet() const { return m_playStateSet; }
     bool isPropertySet() const { return m_propertySet; }
     bool isTimingFunctionSet() const { return m_timingFunctionSet; }
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-    bool isTriggerSet() const { return m_triggerSet; }
-#endif
 
     // Flags this to be the special "none" animation (animation-name: none)
     bool isNoneAnimation() const { return m_isNone; }
@@ -64,10 +57,6 @@ public:
 
     bool isEmpty() const
     {
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-        if (m_triggerSet)
-            return false;
-#endif
         return !m_directionSet && !m_durationSet && !m_fillModeSet
             && !m_nameSet && !m_playStateSet && !m_iterationCountSet
             && !m_delaySet && !m_timingFunctionSet && !m_propertySet;
@@ -87,9 +76,6 @@ public:
     void clearPlayState() { m_playStateSet = false; }
     void clearProperty() { m_propertySet = false; }
     void clearTimingFunction() { m_timingFunctionSet = false; }
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-    void clearTrigger() { m_triggerSet = false; }
-#endif
 
     void clearAll()
     {
@@ -102,9 +88,6 @@ public:
         clearPlayState();
         clearProperty();
         clearTimingFunction();
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-        clearTrigger();
-#endif
     }
 
     double delay() const { return m_delay; }
@@ -139,9 +122,6 @@ public:
     const String& unknownProperty() const { return m_unknownProperty; }
     TimingFunction* timingFunction() const { return m_timingFunction.get(); }
     AnimationMode animationMode() const { return static_cast<AnimationMode>(m_mode); }
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-    AnimationTrigger* trigger() const { return m_trigger.get(); }
-#endif
 
     void setDelay(double c) { m_delay = c; m_delaySet = true; }
     void setDirection(AnimationDirection d) { m_direction = d; m_directionSet = true; }
@@ -159,9 +139,6 @@ public:
     void setUnknownProperty(const String& property) { m_unknownProperty = property; }
     void setTimingFunction(RefPtr<TimingFunction>&& function) { m_timingFunction = WTFMove(function); m_timingFunctionSet = true; }
     void setAnimationMode(AnimationMode mode) { m_mode = static_cast<unsigned>(mode); }
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-    void setTrigger(RefPtr<AnimationTrigger>&& trigger) { m_trigger = WTFMove(trigger); m_triggerSet = true; }
-#endif
 
     void setIsNoneAnimation(bool n) { m_isNone = n; }
 
@@ -190,9 +167,6 @@ private:
     double m_delay;
     double m_duration;
     RefPtr<TimingFunction> m_timingFunction;
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-    RefPtr<AnimationTrigger> m_trigger;
-#endif
 
     Style::ScopeOrdinal m_nameStyleScopeOrdinal { Style::ScopeOrdinal::Element };
 
@@ -210,9 +184,6 @@ private:
     bool m_playStateSet : 1;
     bool m_propertySet : 1;
     bool m_timingFunctionSet : 1;
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-    bool m_triggerSet : 1;
-#endif
 
     bool m_isNone : 1;
 
@@ -226,9 +197,6 @@ public:
     static AnimationPlayState initialPlayState() { return AnimationPlayState::Playing; }
     static CSSPropertyID initialProperty() { return CSSPropertyInvalid; }
     static Ref<TimingFunction> initialTimingFunction() { return CubicBezierTimingFunction::create(); }
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-    static Ref<AnimationTrigger> initialTrigger() { return AutoAnimationTrigger::create(); }
-#endif
 };
 
 } // namespace WebCore
diff --git a/Source/WebCore/platform/animation/AnimationTrigger.h b/Source/WebCore/platform/animation/AnimationTrigger.h
deleted file mode 100644 (file)
index d1ead79..0000000
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-
-#include "Length.h"
-#include <wtf/Ref.h>
-#include <wtf/RefCounted.h>
-#include <wtf/TypeCasts.h>
-
-namespace WebCore {
-
-class AnimationTrigger : public RefCounted<AnimationTrigger> {
-public:
-    virtual Ref<AnimationTrigger> clone() const = 0;
-
-    virtual ~AnimationTrigger() = default;
-
-    enum class AnimationTriggerType { AutoAnimationTriggerType, ScrollAnimationTriggerType };
-    AnimationTriggerType type() const { return m_type; }
-
-    bool isAutoAnimationTrigger() const { return m_type == AnimationTriggerType::AutoAnimationTriggerType; }
-    bool isScrollAnimationTrigger() const { return m_type == AnimationTriggerType::ScrollAnimationTriggerType; }
-
-    virtual bool operator==(const AnimationTrigger& other) = 0;
-
-protected:
-    AnimationTrigger(AnimationTriggerType type)
-        : m_type(type)
-    {
-    }
-
-    AnimationTriggerType m_type;
-};
-
-class AutoAnimationTrigger final : public AnimationTrigger {
-public:
-    static Ref<AutoAnimationTrigger> create()
-    {
-        return adoptRef(*new AutoAnimationTrigger);
-    }
-
-    bool operator==(const AnimationTrigger& other) final
-    {
-        return other.isAutoAnimationTrigger();
-    }
-
-private:
-    AutoAnimationTrigger()
-        : AnimationTrigger(AnimationTriggerType::AutoAnimationTriggerType)
-    {
-    }
-
-    Ref<AnimationTrigger> clone() const final
-    {
-        return adoptRef(*new AutoAnimationTrigger);
-    }
-};
-
-class ScrollAnimationTrigger final : public AnimationTrigger {
-public:
-    static Ref<ScrollAnimationTrigger> create(Length startValue, Length endValue)
-    {
-        return adoptRef(*new ScrollAnimationTrigger(startValue, endValue));
-    }
-
-    bool operator==(const AnimationTrigger& other) final
-    {
-        if (!other.isScrollAnimationTrigger())
-            return false;
-
-        const ScrollAnimationTrigger* otherTrigger = static_cast<const ScrollAnimationTrigger*>(&other);
-        return m_startValue == otherTrigger->m_startValue
-            && m_endValue == otherTrigger->m_endValue
-            && m_hasEndValue == otherTrigger->m_hasEndValue;
-    }
-
-    Length startValue() const { return m_startValue; }
-
-    void setStartValue(Length value)
-    {
-        m_startValue = value;
-    }
-
-    Length endValue() const { return m_endValue; }
-
-    void setEndValue(Length value)
-    {
-        m_endValue = value;
-    }
-
-    bool hasEndValue() const { return !m_endValue.isAuto() && m_endValue.value() > m_startValue.value(); }
-
-private:
-    explicit ScrollAnimationTrigger(Length startValue, Length endValue)
-        : AnimationTrigger(AnimationTriggerType::ScrollAnimationTriggerType)
-        , m_startValue(startValue)
-    {
-        if (!endValue.isAuto() && endValue.value() > startValue.value())
-            m_endValue = endValue;
-    }
-
-    Ref<AnimationTrigger> clone() const final
-    {
-        return adoptRef(*new ScrollAnimationTrigger(m_startValue, m_endValue));
-    }
-
-    Length m_startValue;
-    Length m_endValue;
-    bool m_hasEndValue;
-};
-
-} // namespace WebCore
-
-#define SPECIALIZE_TYPE_TRAITS_ANIMATION_TRIGGER(ToClassName, TriggerTest) \
-SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::ToClassName) \
-static bool isType(const WebCore::AnimationTrigger& trigger) { return trigger.TriggerTest(); } \
-SPECIALIZE_TYPE_TRAITS_END()
-
-SPECIALIZE_TYPE_TRAITS_ANIMATION_TRIGGER(AutoAnimationTrigger, isAutoAnimationTrigger);
-SPECIALIZE_TYPE_TRAITS_ANIMATION_TRIGGER(ScrollAnimationTrigger, isScrollAnimationTrigger);
-
-#endif
index 81e5c03..a219d64 100644 (file)
@@ -1009,15 +1009,6 @@ bool GraphicsLayerCA::animationCanBeAccelerated(const KeyframeValueList& valueLi
     if (animationHasFramesTimingFunction(valueList, anim))
         return false;
 
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-    // If there is a trigger that depends on the scroll position, we cannot accelerate the animation.
-    if (is<ScrollAnimationTrigger>(anim->trigger())) {
-        auto& scrollTrigger = downcast<ScrollAnimationTrigger>(*anim->trigger());
-        if (scrollTrigger.hasEndValue())
-            return false;
-    }
-#endif
-
     return true;
 }
 
index ef21322..15cd292 100644 (file)
@@ -1,3 +1,13 @@
+2018-10-01  Dean Jackson  <dino@apple.com>
+
+        Remove CSS Animation Triggers
+        https://bugs.webkit.org/show_bug.cgi?id=190175
+        <rdar://problem/44925626>
+
+        Reviewed by Simon Fraser.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2018-10-02  Michael Catanzaro  <mcatanzaro@igalia.com>
 
         REGRESSION(r236662): Fix -Wformat warnings in CacheStorageEngineCaches.cpp
index dfa4a25..68efce9 100644 (file)
@@ -76,8 +76,6 @@ ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING;
 
 ENABLE_CSS3_TEXT = ;
 
-ENABLE_CSS_ANIMATIONS_LEVEL_2 = ENABLE_CSS_ANIMATIONS_LEVEL_2;
-
 ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
 
 ENABLE_CSS_COMPOSITING = ENABLE_CSS_COMPOSITING;
@@ -374,4 +372,4 @@ ENABLE_WIRELESS_PLAYBACK_TARGET = ENABLE_WIRELESS_PLAYBACK_TARGET;
 
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_JS_ASYNC_ITERATION) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_JS_ASYNC_ITERATION) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
index ee8029b..b81da6c 100644 (file)
@@ -92,13 +92,6 @@ Accelerated2dCanvasEnabled:
   type: bool
   defaultValue: false
 
-CSSAnimationTriggersEnabled:
-  type: bool
-  defaultValue: false
-  webcoreBinding: RuntimeEnabledFeatures
-  webcoreName: animationTriggersEnabled
-  condition: ENABLE(CSS_ANIMATIONS_LEVEL_2)
-
 ForceFTPDirectoryListings:
   type: bool
   defaultValue: false
index ee6177d..5fb31b6 100644 (file)
@@ -509,16 +509,6 @@ bool WKPreferencesGetAccelerated2DCanvasEnabled(WKPreferencesRef preferencesRef)
     return toImpl(preferencesRef)->accelerated2dCanvasEnabled();
 }
 
-void WKPreferencesSetCSSAnimationTriggersEnabled(WKPreferencesRef preferencesRef, bool flag)
-{
-    toImpl(preferencesRef)->setCSSAnimationTriggersEnabled(flag);
-}
-
-bool WKPreferencesGetCSSAnimationTriggersEnabled(WKPreferencesRef preferencesRef)
-{
-    return toImpl(preferencesRef)->cssAnimationTriggersEnabled();
-}
-
 void WKPreferencesSetWebAnimationsEnabled(WKPreferencesRef preferencesRef, bool flag)
 {
     toImpl(preferencesRef)->setWebAnimationsEnabled(flag);
index a503365..0fcb205 100644 (file)
@@ -110,10 +110,6 @@ WK_EXPORT bool WKPreferencesGetForceSoftwareWebGLRendering(WKPreferencesRef);
 WK_EXPORT void WKPreferencesSetAccelerated2DCanvasEnabled(WKPreferencesRef, bool);
 WK_EXPORT bool WKPreferencesGetAccelerated2DCanvasEnabled(WKPreferencesRef);
 
-// Defaults to true
-WK_EXPORT void WKPreferencesSetCSSAnimationTriggersEnabled(WKPreferencesRef, bool flag);
-WK_EXPORT bool WKPreferencesGetCSSAnimationTriggersEnabled(WKPreferencesRef);
-
 // Defaults to false
 WK_EXPORT void WKPreferencesSetWebAnimationsEnabled(WKPreferencesRef, bool flag);
 WK_EXPORT bool WKPreferencesGetWebAnimationsEnabled(WKPreferencesRef);
index 2d2fcfa..4a3658b 100644 (file)
@@ -1053,16 +1053,6 @@ static WebCore::EditableLinkBehavior toEditableLinkBehavior(_WKEditableLinkBehav
     return _preferences->viewGestureDebuggingEnabled();
 }
 
-- (void)_setCSSAnimationTriggersEnabled:(BOOL)enabled
-{
-    _preferences->setCSSAnimationTriggersEnabled(enabled);
-}
-
-- (BOOL)_cssAnimationTriggersEnabled
-{
-    return _preferences->cssAnimationTriggersEnabled();
-}
-
 - (void)_setWebAnimationsCSSIntegrationEnabled:(BOOL)enabled
 {
     _preferences->setWebAnimationsCSSIntegrationEnabled(enabled);
index 03e7529..a3762e6 100644 (file)
@@ -174,7 +174,6 @@ typedef NS_ENUM(NSInteger, _WKEditableLinkBehavior) {
 @property (nonatomic, setter=_setSubpixelCSSOMElementMetricsEnabled:) BOOL _subpixelCSSOMElementMetricsEnabled WK_API_AVAILABLE(macosx(10.13.4));
 @property (nonatomic, setter=_setMediaSourceEnabled:) BOOL _mediaSourceEnabled WK_API_AVAILABLE(macosx(10.13.4));
 @property (nonatomic, setter=_setViewGestureDebuggingEnabled:) BOOL _viewGestureDebuggingEnabled WK_API_AVAILABLE(macosx(10.13.4));
-@property (nonatomic, setter=_setCSSAnimationTriggersEnabled:) BOOL _cssAnimationTriggersEnabled WK_API_AVAILABLE(macosx(10.13.4));
 @property (nonatomic, setter=_setWebAnimationsCSSIntegrationEnabled:) BOOL _webAnimationsCSSIntegrationEnabled WK_API_AVAILABLE(macosx(10.14));
 @property (nonatomic, setter=_setStandardFontFamily:) NSString *_standardFontFamily WK_API_AVAILABLE(macosx(10.13.4));
 @property (nonatomic, setter=_setNotificationsEnabled:) BOOL _notificationsEnabled WK_API_AVAILABLE(macosx(10.13.4));
index 37a647b..fddf7f5 100644 (file)
@@ -187,11 +187,6 @@ void InjectedBundle::overrideBoolPreferenceForTestRunner(WebPageGroupProxy* page
     }
 #endif
 
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-    if (preference == "WebKitCSSAnimationTriggersEnabled")
-        RuntimeEnabledFeatures::sharedFeatures().setAnimationTriggersEnabled(enabled);
-#endif
-
     if (preference == "WebKitWebAnimationsEnabled")
         RuntimeEnabledFeatures::sharedFeatures().setWebAnimationsEnabled(enabled);
 
@@ -636,15 +631,6 @@ void InjectedBundle::setTabKeyCyclesThroughElements(WebPage* page, bool enabled)
     page->corePage()->setTabKeyCyclesThroughElements(enabled);
 }
 
-void InjectedBundle::setCSSAnimationTriggersEnabled(bool enabled)
-{
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-    RuntimeEnabledFeatures::sharedFeatures().setAnimationTriggersEnabled(enabled);
-#else
-    UNUSED_PARAM(enabled);
-#endif
-}
-
 void InjectedBundle::setWebAnimationsEnabled(bool enabled)
 {
     RuntimeEnabledFeatures::sharedFeatures().setWebAnimationsEnabled(enabled);
index 257ebb7..255c9f5 100644 (file)
@@ -153,7 +153,6 @@ public:
 
     void setTabKeyCyclesThroughElements(WebPage*, bool enabled);
     void setSerialLoadingEnabled(bool);
-    void setCSSAnimationTriggersEnabled(bool);
     void setWebAnimationsEnabled(bool);
     void setWebAnimationsCSSIntegrationEnabled(bool);
     void dispatchPendingLoadRequests();
index 8de17f7..1a18e14 100644 (file)
@@ -1,3 +1,13 @@
+2018-10-01  Dean Jackson  <dino@apple.com>
+
+        Remove CSS Animation Triggers
+        https://bugs.webkit.org/show_bug.cgi?id=190175
+        <rdar://problem/44925626>
+
+        Reviewed by Simon Fraser.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2018-10-02  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r236624 and r236671.
index dfa4a25..68efce9 100644 (file)
@@ -76,8 +76,6 @@ ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING;
 
 ENABLE_CSS3_TEXT = ;
 
-ENABLE_CSS_ANIMATIONS_LEVEL_2 = ENABLE_CSS_ANIMATIONS_LEVEL_2;
-
 ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
 
 ENABLE_CSS_COMPOSITING = ENABLE_CSS_COMPOSITING;
@@ -374,4 +372,4 @@ ENABLE_WIRELESS_PLAYBACK_TARGET = ENABLE_WIRELESS_PLAYBACK_TARGET;
 
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_JS_ASYNC_ITERATION) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_JS_ASYNC_ITERATION) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
index aa0da6a..f5307cc 100644 (file)
@@ -94,7 +94,6 @@ macro(WEBKIT_OPTION_BEGIN)
     WEBKIT_OPTION_DEFINE(ENABLE_CONTENT_FILTERING "Toggle content filtering support" PRIVATE OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_CONTEXT_MENUS "Toggle Context Menu support" PRIVATE ON)
     WEBKIT_OPTION_DEFINE(ENABLE_CSS3_TEXT "Toggle CSS3 Text support" PRIVATE OFF)
-    WEBKIT_OPTION_DEFINE(ENABLE_CSS_ANIMATIONS_LEVEL_2 "Toggle CSS Animations Level 2 support" PRIVATE ON)
     WEBKIT_OPTION_DEFINE(ENABLE_CSS_BOX_DECORATION_BREAK "Toggle Box Decoration break (CSS Backgrounds and Borders) support" PRIVATE ON)
     WEBKIT_OPTION_DEFINE(ENABLE_CSS_COMPOSITING "Toggle CSS COMPOSITING support" PRIVATE OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_CSS_DEVICE_ADAPTATION "Toggle CSS Device Adaptation support" PRIVATE OFF)
index 8aa11cc..48e7deb 100644 (file)
@@ -1,3 +1,13 @@
+2018-10-01  Dean Jackson  <dino@apple.com>
+
+        Remove CSS Animation Triggers
+        https://bugs.webkit.org/show_bug.cgi?id=190175
+        <rdar://problem/44925626>
+
+        Reviewed by Simon Fraser.
+
+        * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
 2018-10-02  Thibault Saunier  <tsaunier@igalia.com>
 
         [Flatpak] Use our own check of flatpak repos
index dfa4a25..68efce9 100644 (file)
@@ -76,8 +76,6 @@ ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING;
 
 ENABLE_CSS3_TEXT = ;
 
-ENABLE_CSS_ANIMATIONS_LEVEL_2 = ENABLE_CSS_ANIMATIONS_LEVEL_2;
-
 ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
 
 ENABLE_CSS_COMPOSITING = ENABLE_CSS_COMPOSITING;
@@ -374,4 +372,4 @@ ENABLE_WIRELESS_PLAYBACK_TARGET = ENABLE_WIRELESS_PLAYBACK_TARGET;
 
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_JS_ASYNC_ITERATION) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_JS_ASYNC_ITERATION) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);