| Index: third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
|
| diff --git a/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp b/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
|
| index be12c3bee157f07c4b386dead89d440319fd2ecb..f4a5c70cf83880480466df4efe8c1ea02fbb6508 100644
|
| --- a/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
|
| +++ b/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
|
| @@ -1550,8 +1550,9 @@ void StyleResolver::applyMatchedProperties(StyleResolverState& state,
|
|
|
| applyProperties<priority, shouldUpdateNeedsApplyPass>(
|
| state, matchedProperties.properties.get(), isImportant, inheritedOnly,
|
| - needsApplyPass, static_cast<PropertyWhitelistType>(
|
| - matchedProperties.m_types.whitelistType));
|
| + needsApplyPass,
|
| + static_cast<PropertyWhitelistType>(
|
| + matchedProperties.m_types.whitelistType));
|
| }
|
| state.setApplyPropertyToRegularStyle(true);
|
| state.setApplyPropertyToVisitedLinkStyle(false);
|
| @@ -1560,8 +1561,9 @@ void StyleResolver::applyMatchedProperties(StyleResolverState& state,
|
| for (const auto& matchedProperties : range) {
|
| applyProperties<priority, shouldUpdateNeedsApplyPass>(
|
| state, matchedProperties.properties.get(), isImportant, inheritedOnly,
|
| - needsApplyPass, static_cast<PropertyWhitelistType>(
|
| - matchedProperties.m_types.whitelistType));
|
| + needsApplyPass,
|
| + static_cast<PropertyWhitelistType>(
|
| + matchedProperties.m_types.whitelistType));
|
| }
|
| }
|
|
|
| @@ -1627,10 +1629,9 @@ StyleResolver::CacheSuccess StyleResolver::applyMatchedCache(
|
| bool isInheritedCacheHit = false;
|
| bool isNonInheritedCacheHit = false;
|
| const CachedMatchedProperties* cachedMatchedProperties =
|
| - cacheHash
|
| - ? m_matchedPropertiesCache.find(cacheHash, state,
|
| - matchResult.matchedProperties())
|
| - : nullptr;
|
| + cacheHash ? m_matchedPropertiesCache.find(cacheHash, state,
|
| + matchResult.matchedProperties())
|
| + : nullptr;
|
|
|
| if (cachedMatchedProperties && MatchedPropertiesCache::isCacheable(state)) {
|
| INCREMENT_STYLE_STATS_COUNTER(document().styleEngine(),
|
|
|