Changeset 61933 in webkit

Timestamp:

Jun 25, 2010 7:01:29 PM (14 years ago)

Author:

dino@apple.com

Message:

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:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/animations/keyframes-from-missing-expected.txt (deleted)
• LayoutTests/animations/keyframes-from-missing.html (deleted)
• LayoutTests/animations/keyframes-to-missing-expected.txt (deleted)
• LayoutTests/animations/keyframes-to-missing.html (deleted)
• LayoutTests/animations/missing-from-to-expected.txt (added)
• LayoutTests/animations/missing-from-to-transforms-expected.txt (added)
• LayoutTests/animations/missing-from-to-transforms.html (added)
• LayoutTests/animations/missing-from-to.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/css/CSSStyleSelector.cpp (modified) (3 diffs)
• WebCore/css/CSSStyleSelector.h (modified) (2 diffs)
• WebCore/manual-tests/animation-with-transition.html (added)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+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
+
+        * animations/keyframes-from-missing-expected.txt: Removed.
+        * animations/keyframes-from-missing.html: Removed.
+        * animations/keyframes-to-missing-expected.txt: Removed.
+        * animations/keyframes-to-missing.html: Removed.
+        * animations/missing-from-to-transforms-expected.txt: Added.
+        * animations/missing-from-to-transforms.html: Added.
+        * animations/missing-from-to-expected.txt: Added.
+        * animations/missing-from-to.html: Added.
+
 2010-06-25  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+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:
+
 2010-06-25  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/css/CSSStyleSelector.cpp

@@ -1374 +1374 @@
 }
 
+PassRefPtr<RenderStyle> CSSStyleSelector::styleForKeyframe(const RenderStyle* elementStyle, const WebKitCSSKeyframeRule* keyframeRule, KeyframeList& list)
+{
+    if (keyframeRule->style())
+        addMatchedDeclaration(keyframeRule->style());
+
+    ASSERT(!m_style);
+
+    // Create the style
+    m_style = RenderStyle::clone(elementStyle);
+
+    m_lineHeightValue = 0;
+
+    // We don't need to bother with !important. Since there is only ever one
+    // decl, there's nothing to override. So just add the first properties.
+    if (keyframeRule->style())
+        applyDeclarations<true>(false, 0, m_matchedDecls.size() - 1);
+
+    // If our font got dirtied, go ahead and update it now.
+    if (m_fontDirty)
+        updateFont();
+
+    // Line-height is set when we are sure we decided on the font-size
+    if (m_lineHeightValue)
+        applyProperty(CSSPropertyLineHeight, m_lineHeightValue);
+
+    // Now do rest of the properties.
+    if (keyframeRule->style())
+        applyDeclarations<false>(false, 0, m_matchedDecls.size() - 1);
+
+    // If our font got dirtied by one of the non-essential font props,
+    // go ahead and update it a second time.
+    if (m_fontDirty)
+        updateFont();
+
+    // Add all the animating properties to the list
+    if (keyframeRule->style()) {
+        CSSMutableStyleDeclaration::const_iterator end = keyframeRule->style()->end();
+        for (CSSMutableStyleDeclaration::const_iterator it = keyframeRule->style()->begin(); it != end; ++it) {
+            int property = (*it).id();
+            // Timing-function within keyframes is special, because it is not animated; it just
+            // describes the timing function between this keyframe and the next.
+            if (property != CSSPropertyWebkitAnimationTimingFunction)
+                list.addProperty(property);
+        }
+    }
+
+    return m_style.release();
+}
+
 void CSSStyleSelector::keyframeStylesForAnimation(Element* e, const RenderStyle* elementStyle, KeyframeList& list)
 {
@@ -1388 +1437 @@
         
     const WebKitCSSKeyframesRule* rule = m_keyframesRuleMap.find(list.animationName().impl()).get()->second.get();
+    RefPtr<RenderStyle> keyframeStyle;
     
     // Construct and populate the style for each keyframe
@@ -1395 +1445 @@
         initForStyleResolve(e);
         
-        const WebKitCSSKeyframeRule* kf = rule->item(i);
-        addMatchedDeclaration(kf->style());
-
-        ASSERT(!m_style);
-
-        // Create the style
-        m_style = RenderStyle::clone(elementStyle);
+        const WebKitCSSKeyframeRule* keyframeRule = rule->item(i);
         
-        m_lineHeightValue = 0;
-        
-        // We don't need to bother with !important. Since there is only ever one
-        // decl, there's nothing to override. So just add the first properties.
-        applyDeclarations<true>(false, 0, m_matchedDecls.size() - 1);
-        
-        // If our font got dirtied, go ahead and update it now.
-        if (m_fontDirty)
-            updateFont();
-
-        // Line-height is set when we are sure we decided on the font-size
-        if (m_lineHeightValue)
-            applyProperty(CSSPropertyLineHeight, m_lineHeightValue);
-        
-        // Now do rest of the properties.
-        applyDeclarations<false>(false, 0, m_matchedDecls.size() - 1);
-        
-        // If our font got dirtied by one of the non-essential font props, 
-        // go ahead and update it a second time.
-        if (m_fontDirty)
-            updateFont();
-
-        // Add all the animating properties to the list
-        CSSMutableStyleDeclaration::const_iterator end = kf->style()->end();
-        for (CSSMutableStyleDeclaration::const_iterator it = kf->style()->begin(); it != end; ++it) {
-            int property = (*it).id();
-            // Timing-function within keyframes is special, because it is not animated; it just
-            // describes the timing function between this keyframe and the next.
-            if (property != CSSPropertyWebkitAnimationTimingFunction)
-                list.addProperty(property);
-        }
-        
+        keyframeStyle = styleForKeyframe(elementStyle, keyframeRule, list);
+
         // Add this keyframe style to all the indicated key times
         Vector<float> keys;
-        kf->getKeys(keys);
+        keyframeRule->getKeys(keys);
         for (size_t keyIndex = 0; keyIndex < keys.size(); ++keyIndex) {
             float key = keys[keyIndex];
-            list.insert(key, m_style);
-        }
-        m_style = 0;
-    }
-    
-    // Make sure there is a 0% and a 100% keyframe
-    float first = -1;
-    float last = -1;
-    if (list.size() >= 2) {
-        first = list.beginKeyframes()->key();
-        last = (list.endKeyframes()-1)->key();
-    }
-    if (first != 0 || last != 1)
-        list.clear();
+            list.insert(key, keyframeStyle.get());
+        }
+        keyframeStyle.release();
+    }
+    
+    // If the 0% keyframe is missing, create it (but only if there is at least one other keyframe)
+    int initialListSize = list.size();
+    if (initialListSize > 0 && list.beginKeyframes()->key() != 0) {
+        RefPtr<WebKitCSSKeyframeRule> keyframe = WebKitCSSKeyframeRule::create();
+        keyframe->setKeyText("0%");
+        keyframeStyle = styleForKeyframe(elementStyle, keyframe.get(), list);
+        list.insert(0, keyframeStyle.release());
+    }
+
+    // If the 100% keyframe is missing, create it (but only if there is at least one other keyframe)
+    if (initialListSize > 0 && (list.endKeyframes() - 1)->key() != 1) {
+        RefPtr<WebKitCSSKeyframeRule> keyframe = WebKitCSSKeyframeRule::create();
+        keyframe->setKeyText("100%");
+        keyframeStyle = styleForKeyframe(elementStyle, keyframe.get(), list);
+        list.insert(1, keyframeStyle.release());
+    }
 }
 

trunk/WebCore/css/CSSStyleSelector.h

@@ -65 +65 @@
 class StyleSheetList;
 class StyledElement;
+class WebKitCSSKeyframeRule;
 class WebKitCSSKeyframesRule;
 
@@ -111 +112 @@
 
         RenderStyle* style() const { return m_style.get(); }
+
+        PassRefPtr<RenderStyle> styleForKeyframe(const RenderStyle*, const WebKitCSSKeyframeRule*, KeyframeList&);
 
     public: