Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1170)

Unified Diff: sky/engine/core/css/resolver/StyleResolver.cpp

Issue 876433002: Remove even more @keyframes related code. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/core/css/resolver/StyleResolver.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/css/resolver/StyleResolver.cpp
diff --git a/sky/engine/core/css/resolver/StyleResolver.cpp b/sky/engine/core/css/resolver/StyleResolver.cpp
index 2ef255af132df438b17c194c3033630470246749..ea8dbf71cc9e415301dffae3e8b969e4af57f5e1 100644
--- a/sky/engine/core/css/resolver/StyleResolver.cpp
+++ b/sky/engine/core/css/resolver/StyleResolver.cpp
@@ -49,7 +49,6 @@
#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/StyleKeyframe.h"
#include "sky/engine/core/css/StylePropertySet.h"
#include "sky/engine/core/css/StyleSheetContents.h"
#include "sky/engine/core/css/parser/BisonCSSParser.h"
@@ -69,7 +68,6 @@
#include "sky/engine/core/frame/FrameView.h"
#include "sky/engine/core/frame/LocalFrame.h"
#include "sky/engine/core/rendering/RenderView.h"
-#include "sky/engine/core/rendering/style/KeyframeList.h"
#include "sky/engine/wtf/LeakAnnotations.h"
#include "sky/engine/wtf/StdLibExtras.h"
@@ -251,47 +249,6 @@ PassRefPtr<RenderStyle> StyleResolver::styleForElement(Element* element, RenderS
return state.takeStyle();
}
-PassRefPtr<RenderStyle> StyleResolver::styleForKeyframe(Element* element, const RenderStyle& elementStyle, RenderStyle* parentStyle, const StyleKeyframe* keyframe, const AtomicString& animationName)
-{
- ASSERT(m_document.frame());
- ASSERT(m_document.settings());
-
- if (element == m_document.documentElement())
- m_document.setDirectionSetOnDocumentElement(false);
- StyleResolverState state(m_document, element, parentStyle);
-
- MatchResult result;
- result.addMatchedProperties(&keyframe->properties());
-
- ASSERT(!state.style());
-
- // Create the style
- state.setStyle(RenderStyle::clone(&elementStyle));
- state.setLineHeightValue(0);
-
- state.fontBuilder().initForStyleResolve(state.document(), state.style());
-
- // We also don't need to bother with animation properties since the only
- // relevant one is animation-timing-function and we special-case that in
- // CSSAnimations.cpp
- bool inheritedOnly = false;
- applyMatchedProperties<HighPriorityProperties>(state, result, inheritedOnly);
-
- // If our font got dirtied, go ahead and update it now.
- updateFont(state);
-
- // Line-height is set when we are sure we decided on the font-size
- if (state.lineHeightValue())
- StyleBuilder::applyProperty(CSSPropertyLineHeight, state, state.lineHeightValue());
-
- // Now do rest of the properties.
- applyMatchedProperties<LowPriorityProperties>(state, result, inheritedOnly);
-
- loadPendingResources(state);
-
- 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)
@@ -381,14 +338,6 @@ bool StyleResolver::applyAnimatedProperties(StyleResolverState& state, Element*
return true;
}
-void StyleResolver::styleTreeResolveScopedKeyframesRules(const Element* element, Vector<RawPtr<ScopedStyleResolver>, 8>& resolvers)
-{
- // Add resolvers for shadow roots hosted by the given element.
- if (ShadowRoot* shadowRoot = element->shadowRoot())
- resolvers.append(&shadowRoot->scopedStyleResolver());
- resolvers.append(&element->treeScope().scopedStyleResolver());
-}
-
template <StyleResolver::StyleApplicationPass pass>
void StyleResolver::applyAnimatedProperties(StyleResolverState& state, const HashMap<CSSPropertyID, RefPtr<Interpolation> >& activeInterpolations)
{
« no previous file with comments | « sky/engine/core/css/resolver/StyleResolver.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698