Remove Animations and Transitions.

sky/engine/core/css/resolver/StyleResolver.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
@@ skipping 14 matching lines @@
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "sky/engine/core/css/resolver/StyleResolver.h"
 
 #include "gen/sky/core/CSSPropertyNames.h"
 #include "gen/sky/core/MediaTypeNames.h"
 #include "gen/sky/core/StylePropertyShorthand.h"
 #include "gen/sky/platform/RuntimeEnabledFeatures.h"
-#include "sky/engine/core/animation/ActiveAnimations.h"
-#include "sky/engine/core/animation/Animation.h"
-#include "sky/engine/core/animation/AnimationTimeline.h"
-#include "sky/engine/core/animation/StyleInterpolation.h"
-#include "sky/engine/core/animation/animatable/AnimatableValue.h"
-#include "sky/engine/core/animation/css/CSSAnimatableValueFactory.h"
-#include "sky/engine/core/animation/css/CSSAnimations.h"
 #include "sky/engine/core/css/CSSCalculationValue.h"
 #include "sky/engine/core/css/CSSFontSelector.h"
 #include "sky/engine/core/css/CSSSelector.h"
 #include "sky/engine/core/css/CSSValueList.h"
 #include "sky/engine/core/css/CSSValuePool.h"
 #include "sky/engine/core/css/ElementRuleCollector.h"
 #include "sky/engine/core/css/FontFace.h"
 #include "sky/engine/core/css/MediaQueryEvaluator.h"
 #include "sky/engine/core/css/RuleSet.h"
 #include "sky/engine/core/css/StylePropertySet.h"
 #include "sky/engine/core/css/StyleSheetContents.h"
 #include "sky/engine/core/css/parser/BisonCSSParser.h"
-#include "sky/engine/core/css/resolver/AnimatedStyleBuilder.h"
 #include "sky/engine/core/css/resolver/MatchResult.h"
 #include "sky/engine/core/css/resolver/SharedStyleFinder.h"
 #include "sky/engine/core/css/resolver/StyleAdjuster.h"
 #include "sky/engine/core/css/resolver/StyleBuilder.h"
 #include "sky/engine/core/css/resolver/StyleResolverState.h"
 #include "sky/engine/core/css/resolver/StyleResolverStats.h"
 #include "sky/engine/core/dom/NodeRenderStyle.h"
 #include "sky/engine/core/dom/StyleEngine.h"
 #include "sky/engine/core/dom/Text.h"
 #include "sky/engine/core/dom/shadow/ElementShadow.h"
 #include "sky/engine/core/dom/shadow/ShadowRoot.h"
 #include "sky/engine/core/frame/FrameView.h"
 #include "sky/engine/core/frame/LocalFrame.h"
 #include "sky/engine/core/rendering/RenderView.h"
 #include "sky/engine/wtf/LeakAnnotations.h"
 #include "sky/engine/wtf/StdLibExtras.h"
 
-namespace {
-
-using namespace blink;
-
-void setAnimationUpdateIfNeeded(StyleResolverState& state, Element& element)
-{
-    // If any changes to CSS Animations were detected, stash the update away for application after the
-    // render object is updated if we're in the appropriate scope.
-    if (state.animationUpdate())
-        element.ensureActiveAnimations().cssAnimations().setPendingUpdate(state.takeAnimationUpdate());
-}
-
-} // namespace
-
 namespace blink {
 
 static RuleSet& defaultStyles()
 {
     DEFINE_STATIC_LOCAL(RefPtr<StyleSheetContents>, styleSheet, ());
     DEFINE_STATIC_LOCAL(OwnPtr<RuleSet>, ruleSet, ());
 
     if (ruleSet)
         return *ruleSet;
 
@@ skipping 125 matching lines @@
 
         applyMatchedProperties(state, collector.matchedResult());
     }
 
     // Cache our original display.
     state.style()->setOriginalDisplay(state.style()->display());
 
     StyleAdjuster adjuster;
     adjuster.adjustRenderStyle(state.style(), state.parentStyle(), *element);
 
-    if (applyAnimatedProperties(state, element))
-        adjuster.adjustRenderStyle(state.style(), state.parentStyle(), *element);
-
-    setAnimationUpdateIfNeeded(state, *element);
-
     if (state.style()->hasViewportUnits())
         m_document.setHasViewportUnits();
 
     // Now return the style.
     return state.takeStyle();
 }
 
-// This function is used by the WebAnimations JavaScript API method animate().
-// FIXME: Remove this when animate() switches away from resolution-dependent parsing.
-PassRefPtr<AnimatableValue> StyleResolver::createAnimatableValueSnapshot(Element& element, CSSPropertyID property, CSSValue& value)
-{
-    RefPtr<RenderStyle> style;
-    if (element.renderStyle())
-        style = RenderStyle::clone(element.renderStyle());
-    else
-        style = RenderStyle::create();
-    StyleResolverState state(element.document(), &element);
-    state.setStyle(style);
-    state.fontBuilder().initForStyleResolve(state.document(), state.style());
-    return createAnimatableValueSnapshot(state, property, value);
-}
-
-PassRefPtr<AnimatableValue> StyleResolver::createAnimatableValueSnapshot(StyleResolverState& state, CSSPropertyID property, CSSValue& value)
-{
-    StyleBuilder::applyProperty(property, state, &value);
-    return CSSAnimatableValueFactory::create(property, *state.style());
-}
-
 PassRefPtr<RenderStyle> StyleResolver::defaultStyleForElement()
 {
     StyleResolverState state(m_document, nullptr);
     state.setStyle(RenderStyle::create());
     state.fontBuilder().initForStyleResolve(m_document, state.style());
     state.style()->setLineHeight(RenderStyle::initialLineHeight());
     state.setLineHeightValue(0);
     state.fontBuilder().setInitial();
     state.style()->font().update(m_document.styleEngine()->fontSelector());
     return state.takeStyle();
 }
 
 PassRefPtr<RenderStyle> StyleResolver::styleForText(Text* textNode)
 {
     ASSERT(textNode);
 
     Node* parentNode = NodeRenderingTraversal::parent(textNode);
     if (!parentNode || !parentNode->renderStyle())
         return defaultStyleForElement();
     return parentNode->renderStyle();
 }
 
 void StyleResolver::updateFont(StyleResolverState& state)
 {
     state.fontBuilder().createFont(m_document.styleEngine()->fontSelector(), state.parentStyle(), state.style());
     if (state.fontBuilder().fontSizeHasViewportUnits())
         state.style()->setHasViewportUnits();
 }
 
-// -------------------------------------------------------------------------------------
-// this is mostly boring stuff on how to apply a certain rule to the renderstyle...
-
-bool StyleResolver::applyAnimatedProperties(StyleResolverState& state, Element* animatingElement)
-{
-    const Element* element = state.element();
-    ASSERT(element);
-
-    // The animating element may be this element, or its pseudo element. It is
-    // null when calculating the style for a potential pseudo element that has
-    // yet to be created.
-    ASSERT(animatingElement == element || !animatingElement || animatingElement->parentOrShadowHostElement() == element);
-
-    if (!(animatingElement && animatingElement->hasActiveAnimations())
-        && !state.style()->transitions() && !state.style()->animations())
-        return false;
-
-    state.setAnimationUpdate(CSSAnimations::calculateUpdate(animatingElement, *element, *state.style(), state.parentStyle()));
-    if (!state.animationUpdate())
-        return false;
-
-    const HashMap<CSSPropertyID, RefPtr<Interpolation> >& activeInterpolationsForAnimations = state.animationUpdate()->activeInterpolationsForAnimations();
-    const HashMap<CSSPropertyID, RefPtr<Interpolation> >& activeInterpolationsForTransitions = state.animationUpdate()->activeInterpolationsForTransitions();
-    applyAnimatedProperties<HighPriorityProperties>(state, activeInterpolationsForAnimations);
-    applyAnimatedProperties<HighPriorityProperties>(state, activeInterpolationsForTransitions);
-
-    updateFont(state);
-
-    applyAnimatedProperties<LowPriorityProperties>(state, activeInterpolationsForAnimations);
-    applyAnimatedProperties<LowPriorityProperties>(state, activeInterpolationsForTransitions);
-
-    ASSERT(!state.fontBuilder().fontDirty());
-
-    return true;
-}
-
-template <StyleResolver::StyleApplicationPass pass>
-void StyleResolver::applyAnimatedProperties(StyleResolverState& state, const HashMap<CSSPropertyID, RefPtr<Interpolation> >& activeInterpolations)
-{
-    for (HashMap<CSSPropertyID, RefPtr<Interpolation> >::const_iterator iter = activeInterpolations.begin(); iter != activeInterpolations.end(); ++iter) {
-        CSSPropertyID property = iter->key;
-        if (!isPropertyForPass<pass>(property))
-            continue;
-        const StyleInterpolation* interpolation = toStyleInterpolation(iter->value.get());
-        interpolation->apply(state);
-    }
-}
-
 // FIXME: Consider refactoring to create a new class which owns the following
 // first/last/range properties.
 // This method returns the first CSSPropertyId of high priority properties.
 // Other properties can depend on high priority properties. For example,
 // border-color property with currentColor value depends on color property.
 // All high priority properties are obtained by using
 // firstCSSPropertyId<HighPriorityProperties> and
 // lastCSSPropertyId<HighPriorityProperties>.
 template<> CSSPropertyID StyleResolver::firstCSSPropertyId<StyleResolver::HighPriorityProperties>()
 {
@@ skipping 187 matching lines @@
                 break;
             default:
                 break;
             }
             StyleBuilder::applyProperty(properties[i].property, state, properties[i].value);
         }
     }
 }
 
 } // namespace blink