2010-06-25 Dean Jackson <dino@apple.com>
Reviewed by Simon Fraser.
https://bugs.webkit.org/show_bug.cgi?id=41188
Animations should not require 0% and 100% keyframes
When we are generating the animation lists in CSSStyleSelector,
rather than bail if we notice that "from" or "to" are missing, we
now generate synthetic keyframes for those cases.
Tests: animations/missing-from-to-transforms.html
animations/missing-from-to.html
WebCore/manual-tests/animation-with-transition.html
* css/CSSStyleSelector.cpp:
(WebCore::CSSStyleSelector::styleForKeyframe):
Moved individual keyframe generation into a new function.
(WebCore::CSSStyleSelector::keyframeStylesForAnimation):
Call the new function above for regular keyframes, and
also check for missing keyframes and generate them if
necessary.
* css/CSSStyleSelector.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@61933 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/manual-tests/animation-with-transition.html b/WebCore/manual-tests/animation-with-transition.html
new file mode 100644
index 0000000..37a7589
--- /dev/null
+++ b/WebCore/manual-tests/animation-with-transition.html
@@ -0,0 +1,60 @@
+<html>
+<head>
+ <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+ <title>simple-animation</title>
+ <style type="text/css" media="screen">
+ div {
+ position: relative;
+ left: 10px;
+ top: 10px;
+ width: 200px;
+ height: 200px;
+ background-color: #696;
+ -webkit-transition: left 5s, top 5s;
+ }
+
+ .animate {
+ -webkit-animation-name: simple;
+ -webkit-animation-duration: 2s;
+ -webkit-animation-timing-function: linear;
+ -webkit-animation-fill-mode: backwards;
+ }
+
+ @-webkit-keyframes simple {
+ 50% {
+ left: 300px;
+ }
+ 100% {
+ left: 80px;
+ }
+ }
+
+
+ </style>
+ <script type="text/javascript" charset="utf-8">
+
+ function doTransition() {
+ var div = document.querySelector("div");
+ div.style.left = "200px";
+ }
+
+ function doAnimation() {
+ var div = document.querySelector("div");
+ div.className = "animate";
+ }
+
+ </script>
+</head>
+<body>
+ <p>Testing setting an animation while a transition is running, in the
+ case where the animation synthesizes the initial keyframe</p>
+ <p>
+ Start the transition, then start the animation.</p>
+ <p>
+ <a href="https://bugs.webkit.org/show_bug.cgi?id=41188">https://bugs.webkit.org/show_bug.cgi?id=41188</a>
+ </p>
+ <button onclick="doTransition();">Transition</button>
+ <button onclick="doAnimation();">Set Animation</button>
+<div></div>
+</body>
+</html>
