| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "core/css/resolver/CSSVariableResolver.h" | 5 #include "core/css/resolver/CSSVariableResolver.h" |
| 6 | 6 |
| 7 #include "core/CSSPropertyNames.h" | 7 #include "core/CSSPropertyNames.h" |
| 8 #include "core/CSSValueKeywords.h" | 8 #include "core/CSSValueKeywords.h" |
| 9 #include "core/StyleBuilderFunctions.h" | 9 #include "core/StyleBuilderFunctions.h" |
| 10 #include "core/StylePropertyShorthand.h" | 10 #include "core/StylePropertyShorthand.h" |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 return false; | 33 return false; |
| 34 ASSERT(range.peek().type() == CommaToken); | 34 ASSERT(range.peek().type() == CommaToken); |
| 35 range.consume(); | 35 range.consume(); |
| 36 return resolveTokenRange(range, disallowAnimationTainted, result, | 36 return resolveTokenRange(range, disallowAnimationTainted, result, |
| 37 resultIsAnimationTainted); | 37 resultIsAnimationTainted); |
| 38 } | 38 } |
| 39 | 39 |
| 40 CSSVariableData* CSSVariableResolver::valueForCustomProperty( | 40 CSSVariableData* CSSVariableResolver::valueForCustomProperty( |
| 41 AtomicString name) { | 41 AtomicString name) { |
| 42 if (m_variablesSeen.contains(name)) { | 42 if (m_variablesSeen.contains(name)) { |
| 43 m_cycleStartPoints.add(name); | 43 m_cycleStartPoints.insert(name); |
| 44 return nullptr; | 44 return nullptr; |
| 45 } | 45 } |
| 46 | 46 |
| 47 DCHECK(m_registry || !RuntimeEnabledFeatures::cssVariables2Enabled()); | 47 DCHECK(m_registry || !RuntimeEnabledFeatures::cssVariables2Enabled()); |
| 48 const PropertyRegistry::Registration* registration = | 48 const PropertyRegistry::Registration* registration = |
| 49 m_registry ? m_registry->registration(name) : nullptr; | 49 m_registry ? m_registry->registration(name) : nullptr; |
| 50 | 50 |
| 51 CSSVariableData* variableData = nullptr; | 51 CSSVariableData* variableData = nullptr; |
| 52 if (!registration || registration->inherits()) { | 52 if (!registration || registration->inherits()) { |
| 53 if (m_inheritedVariables) | 53 if (m_inheritedVariables) |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 } | 87 } |
| 88 | 88 |
| 89 PassRefPtr<CSSVariableData> CSSVariableResolver::resolveCustomProperty( | 89 PassRefPtr<CSSVariableData> CSSVariableResolver::resolveCustomProperty( |
| 90 AtomicString name, | 90 AtomicString name, |
| 91 const CSSVariableData& variableData) { | 91 const CSSVariableData& variableData) { |
| 92 ASSERT(variableData.needsVariableResolution()); | 92 ASSERT(variableData.needsVariableResolution()); |
| 93 | 93 |
| 94 bool disallowAnimationTainted = false; | 94 bool disallowAnimationTainted = false; |
| 95 bool isAnimationTainted = variableData.isAnimationTainted(); | 95 bool isAnimationTainted = variableData.isAnimationTainted(); |
| 96 Vector<CSSParserToken> tokens; | 96 Vector<CSSParserToken> tokens; |
| 97 m_variablesSeen.add(name); | 97 m_variablesSeen.insert(name); |
| 98 bool success = | 98 bool success = |
| 99 resolveTokenRange(variableData.tokens(), disallowAnimationTainted, tokens, | 99 resolveTokenRange(variableData.tokens(), disallowAnimationTainted, tokens, |
| 100 isAnimationTainted); | 100 isAnimationTainted); |
| 101 m_variablesSeen.remove(name); | 101 m_variablesSeen.remove(name); |
| 102 | 102 |
| 103 // The old variable data holds onto the backing string the new resolved | 103 // The old variable data holds onto the backing string the new resolved |
| 104 // CSSVariableData relies on. Ensure it will live beyond us overwriting the | 104 // CSSVariableData relies on. Ensure it will live beyond us overwriting the |
| 105 // RefPtr in StyleInheritedVariables. | 105 // RefPtr in StyleInheritedVariables. |
| 106 ASSERT(variableData.refCount() > 1); | 106 ASSERT(variableData.refCount() > 1); |
| 107 | 107 |
| (...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 331 CSSVariableResolver::CSSVariableResolver(const StyleResolverState& state) | 331 CSSVariableResolver::CSSVariableResolver(const StyleResolverState& state) |
| 332 : m_inheritedVariables(state.style()->inheritedVariables()), | 332 : m_inheritedVariables(state.style()->inheritedVariables()), |
| 333 m_nonInheritedVariables(state.style()->nonInheritedVariables()), | 333 m_nonInheritedVariables(state.style()->nonInheritedVariables()), |
| 334 m_registry(state.document().propertyRegistry()) {} | 334 m_registry(state.document().propertyRegistry()) {} |
| 335 | 335 |
| 336 DEFINE_TRACE(CSSVariableResolver) { | 336 DEFINE_TRACE(CSSVariableResolver) { |
| 337 visitor->trace(m_registry); | 337 visitor->trace(m_registry); |
| 338 } | 338 } |
| 339 | 339 |
| 340 } // namespace blink | 340 } // namespace blink |
| OLD | NEW |