| Index: Source/core/css/resolver/StyleResolver.cpp
|
| diff --git a/Source/core/css/resolver/StyleResolver.cpp b/Source/core/css/resolver/StyleResolver.cpp
|
| index 25a940938b40222011ec24b4e557760485c1ba9d..6ec3c9966f5c9994ae67ccef7604c80fa6e55d2a 100644
|
| --- a/Source/core/css/resolver/StyleResolver.cpp
|
| +++ b/Source/core/css/resolver/StyleResolver.cpp
|
| @@ -734,6 +734,9 @@ PassRefPtr<RenderStyle> StyleResolver::styleForElement(Element* element, RenderS
|
|
|
| setAnimationUpdateIfNeeded(state, *element);
|
|
|
| + if (state.style()->hasViewportUnits())
|
| + document().setHasViewportUnits();
|
| +
|
| // Now return the style.
|
| return state.takeStyle();
|
| }
|
| @@ -918,6 +921,9 @@ PassRefPtr<RenderStyle> StyleResolver::pseudoStyleForElement(Element* e, const P
|
| if (PseudoElement* pseudoElement = e->pseudoElement(pseudoStyleRequest.pseudoId))
|
| setAnimationUpdateIfNeeded(state, *pseudoElement);
|
|
|
| + if (state.style()->hasViewportUnits())
|
| + document().setHasViewportUnits();
|
| +
|
| // Now return the style.
|
| return state.takeStyle();
|
| }
|
| @@ -1020,6 +1026,8 @@ bool StyleResolver::checkRegionStyle(Element* regionElement)
|
| void StyleResolver::updateFont(StyleResolverState& state)
|
| {
|
| state.fontBuilder().createFont(m_fontSelector, state.parentStyle(), state.style());
|
| + if (state.fontBuilder().fontSizeHasViewportUnits())
|
| + state.style()->setHasViewportUnits();
|
| }
|
|
|
| PassRefPtr<StyleRuleList> StyleResolver::styleRulesForElement(Element* element, unsigned rulesToInclude)
|
| @@ -1428,7 +1436,7 @@ void StyleResolver::addMediaQueryResults(const MediaQueryResultList& list)
|
| m_viewportDependentMediaQueryResults.append(list[i]);
|
| }
|
|
|
| -bool StyleResolver::affectedByViewportChange() const
|
| +bool StyleResolver::mediaQueryAffectedByViewportChange() const
|
| {
|
| for (unsigned i = 0; i < m_viewportDependentMediaQueryResults.size(); ++i) {
|
| if (m_medium->eval(&m_viewportDependentMediaQueryResults[i]->m_expression) != m_viewportDependentMediaQueryResults[i]->m_result)
|
|
|