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

Unified Diff: third_party/WebKit/Source/core/css/resolver/StyleResolver.h

Issue 2521103004: Revert of Apply custom property animation (Closed)
Patch Set: Created 4 years, 1 month 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
Index: third_party/WebKit/Source/core/css/resolver/StyleResolver.h
diff --git a/third_party/WebKit/Source/core/css/resolver/StyleResolver.h b/third_party/WebKit/Source/core/css/resolver/StyleResolver.h
index bb317bc1703e9cf234a716dc8c7cc35fdc62e04b..9416e8b425d69fbff01834fb05d5a4a34066d84e 100644
--- a/third_party/WebKit/Source/core/css/resolver/StyleResolver.h
+++ b/third_party/WebKit/Source/core/css/resolver/StyleResolver.h
@@ -210,33 +210,10 @@
void collectTreeBoundaryCrossingRulesV0CascadeOrder(const Element&,
ElementRuleCollector&);
- struct CacheSuccess {
- STACK_ALLOCATED();
- bool isInheritedCacheHit;
- bool isNonInheritedCacheHit;
- unsigned cacheHash;
- Member<const CachedMatchedProperties> cachedMatchedProperties;
-
- CacheSuccess(bool isInheritedCacheHit,
- bool isNonInheritedCacheHit,
- unsigned cacheHash,
- const CachedMatchedProperties* cachedMatchedProperties)
- : isInheritedCacheHit(isInheritedCacheHit),
- isNonInheritedCacheHit(isNonInheritedCacheHit),
- cacheHash(cacheHash),
- cachedMatchedProperties(cachedMatchedProperties) {}
-
- bool isFullCacheHit() const {
- return isInheritedCacheHit && isNonInheritedCacheHit;
- }
- bool shouldApplyInheritedOnly() const {
- return isNonInheritedCacheHit && !isInheritedCacheHit;
- }
- void setFailed() {
- isInheritedCacheHit = false;
- isNonInheritedCacheHit = false;
- }
- };
+ void applyMatchedProperties(StyleResolverState&, const MatchResult&);
+ bool applyAnimatedProperties(StyleResolverState&,
+ const Element* animatingElement);
+ void applyCallbackSelectors(StyleResolverState&);
// These flags indicate whether an apply pass for a given CSSPropertyPriority
// and isImportant is required.
@@ -261,30 +238,6 @@
CheckNeedsApplyPass = false,
UpdateNeedsApplyPass = true,
};
-
- void applyMatchedPropertiesAndCustomPropertyAnimations(
- StyleResolverState&,
- const MatchResult&,
- const Element* animatingElement);
- CacheSuccess applyMatchedCache(StyleResolverState&, const MatchResult&);
- void applyCustomProperties(StyleResolverState&,
- const MatchResult&,
- bool applyAnimations,
- const CacheSuccess&,
- NeedsApplyPass&);
- void applyMatchedAnimationProperties(StyleResolverState&,
- const MatchResult&,
- const CacheSuccess&,
- NeedsApplyPass&);
- void applyMatchedStandardProperties(StyleResolverState&,
- const MatchResult&,
- const CacheSuccess&,
- NeedsApplyPass&);
- void calculateAnimationUpdate(StyleResolverState&,
- const Element* animatingElement);
- bool applyAnimatedStandardProperties(StyleResolverState&, const Element*);
-
- void applyCallbackSelectors(StyleResolverState&);
template <CSSPropertyPriority priority, ShouldUpdateNeedsApplyPass>
void applyMatchedProperties(StyleResolverState&,

Powered by Google App Engine
This is Rietveld 408576698