OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/animation/CSSInterpolationType.h" | 5 #include "core/animation/CSSInterpolationType.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 #include "core/StylePropertyShorthand.h" | 8 #include "core/StylePropertyShorthand.h" |
9 #include "core/animation/StringKeyframe.h" | 9 #include "core/animation/StringKeyframe.h" |
10 #include "core/css/CSSCustomPropertyDeclaration.h" | 10 #include "core/css/CSSCustomPropertyDeclaration.h" |
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
298 CSSTokenizer tokenizer(string_value); | 298 CSSTokenizer tokenizer(string_value); |
299 bool is_animation_tainted = true; | 299 bool is_animation_tainted = true; |
300 bool needs_variable_resolution = false; | 300 bool needs_variable_resolution = false; |
301 RefPtr<CSSVariableData> variable_data = CSSVariableData::Create( | 301 RefPtr<CSSVariableData> variable_data = CSSVariableData::Create( |
302 tokenizer.TokenRange(), is_animation_tainted, needs_variable_resolution); | 302 tokenizer.TokenRange(), is_animation_tainted, needs_variable_resolution); |
303 ComputedStyle& style = *state.Style(); | 303 ComputedStyle& style = *state.Style(); |
304 const PropertyHandle property = GetProperty(); | 304 const PropertyHandle property = GetProperty(); |
305 const AtomicString& property_name = property.CustomPropertyName(); | 305 const AtomicString& property_name = property.CustomPropertyName(); |
306 DCHECK(registration_); | 306 DCHECK(registration_); |
307 if (registration_->Inherits()) { | 307 if (registration_->Inherits()) { |
308 style.SetResolvedInheritedVariable(property_name, variable_data.Release(), | 308 style.SetResolvedInheritedVariable(property_name, std::move(variable_data), |
309 css_value); | 309 css_value); |
310 } else { | 310 } else { |
311 style.SetResolvedNonInheritedVariable(property_name, | 311 style.SetResolvedNonInheritedVariable(property_name, |
312 variable_data.Release(), css_value); | 312 std::move(variable_data), css_value); |
313 } | 313 } |
314 } | 314 } |
315 | 315 |
316 } // namespace blink | 316 } // namespace blink |
OLD | NEW |