| Index: Source/core/css/resolver/StyleResolver.cpp
|
| diff --git a/Source/core/css/resolver/StyleResolver.cpp b/Source/core/css/resolver/StyleResolver.cpp
|
| index 67dd9d85671efd1e8f88b1ba9acf54221042bdb0..86ccd8315df8dc70f0c6594c746d380c713d887f 100644
|
| --- a/Source/core/css/resolver/StyleResolver.cpp
|
| +++ b/Source/core/css/resolver/StyleResolver.cpp
|
| @@ -158,7 +158,7 @@ StyleResolver::StyleResolver(Document& document)
|
| initWatchedSelectorRules(CSSSelectorWatch::from(document).watchedCallbackSelectors());
|
| }
|
|
|
| -void StyleResolver::initWatchedSelectorRules(const WillBeHeapVector<RefPtrWillBeMember<StyleRule> >& watchedSelectors)
|
| +void StyleResolver::initWatchedSelectorRules(const WillBeHeapVector<RefPtrWillBeMember<StyleRule>>& watchedSelectors)
|
| {
|
| if (!watchedSelectors.size())
|
| return;
|
| @@ -167,14 +167,14 @@ void StyleResolver::initWatchedSelectorRules(const WillBeHeapVector<RefPtrWillBe
|
| m_watchedSelectorsRules->addStyleRule(watchedSelectors[i].get(), RuleHasNoSpecialState);
|
| }
|
|
|
| -void StyleResolver::lazyAppendAuthorStyleSheets(unsigned firstNew, const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet> >& styleSheets)
|
| +void StyleResolver::lazyAppendAuthorStyleSheets(unsigned firstNew, const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet>>& styleSheets)
|
| {
|
| unsigned size = styleSheets.size();
|
| for (unsigned i = firstNew; i < size; ++i)
|
| m_pendingStyleSheets.add(styleSheets[i].get());
|
| }
|
|
|
| -void StyleResolver::removePendingAuthorStyleSheets(const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet> >& styleSheets)
|
| +void StyleResolver::removePendingAuthorStyleSheets(const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet>>& styleSheets)
|
| {
|
| for (unsigned i = 0; i < styleSheets.size(); ++i)
|
| m_pendingStyleSheets.remove(styleSheets[i].get());
|
| @@ -202,7 +202,7 @@ void StyleResolver::appendPendingAuthorStyleSheets()
|
| finishAppendAuthorStyleSheets();
|
| }
|
|
|
| -void StyleResolver::appendAuthorStyleSheets(const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet> >& styleSheets)
|
| +void StyleResolver::appendAuthorStyleSheets(const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet>>& styleSheets)
|
| {
|
| // This handles sheets added to the end of the stylesheet list only. In other cases the style resolver
|
| // needs to be reconstructed. To handle insertions too the rule order numbers would need to be updated.
|
| @@ -987,8 +987,8 @@ bool StyleResolver::applyAnimatedProperties(StyleResolverState& state, const Ele
|
| if (!state.animationUpdate())
|
| return false;
|
|
|
| - const WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> >& activeInterpolationsForAnimations = state.animationUpdate()->activeInterpolationsForAnimations();
|
| - const WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> >& activeInterpolationsForTransitions = state.animationUpdate()->activeInterpolationsForTransitions();
|
| + const WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation>>& activeInterpolationsForAnimations = state.animationUpdate()->activeInterpolationsForAnimations();
|
| + const WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation>>& activeInterpolationsForTransitions = state.animationUpdate()->activeInterpolationsForTransitions();
|
| applyAnimatedProperties<HighPropertyPriority>(state, activeInterpolationsForAnimations);
|
| applyAnimatedProperties<HighPropertyPriority>(state, activeInterpolationsForTransitions);
|
|
|
| @@ -1020,7 +1020,7 @@ StyleRuleKeyframes* StyleResolver::findKeyframesRule(const Element* element, con
|
| }
|
|
|
| template <CSSPropertyPriority priority>
|
| -void StyleResolver::applyAnimatedProperties(StyleResolverState& state, const WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> >& activeInterpolations)
|
| +void StyleResolver::applyAnimatedProperties(StyleResolverState& state, const WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation>>& activeInterpolations)
|
| {
|
| for (const auto& interpolationEntry : activeInterpolations) {
|
| CSSPropertyID property = interpolationEntry.key;
|
|
|