Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(348)

Side by Side Diff: third_party/WebKit/Source/core/animation/StringKeyframe.cpp

Issue 1826733002: Remove ASSERT_WITH_MESSAGE family. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/StringKeyframe.h" 5 #include "core/animation/StringKeyframe.h"
6 6
7 #include "core/StylePropertyShorthand.h" 7 #include "core/StylePropertyShorthand.h"
8 #include "core/animation/ConstantStyleInterpolation.h" 8 #include "core/animation/ConstantStyleInterpolation.h"
9 #include "core/animation/DeferredLegacyStyleInterpolation.h" 9 #include "core/animation/DeferredLegacyStyleInterpolation.h"
10 #include "core/animation/InvalidatableInterpolation.h" 10 #include "core/animation/InvalidatableInterpolation.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 m_svgAttributeMap.set(&attributeName, value); 53 m_svgAttributeMap.set(&attributeName, value);
54 } 54 }
55 55
56 PropertyHandleSet StringKeyframe::properties() const 56 PropertyHandleSet StringKeyframe::properties() const
57 { 57 {
58 // This is not used in time-critical code, so we probably don't need to 58 // This is not used in time-critical code, so we probably don't need to
59 // worry about caching this result. 59 // worry about caching this result.
60 PropertyHandleSet properties; 60 PropertyHandleSet properties;
61 for (unsigned i = 0; i < m_cssPropertyMap->propertyCount(); ++i) { 61 for (unsigned i = 0; i < m_cssPropertyMap->propertyCount(); ++i) {
62 StylePropertySet::PropertyReference propertyReference = m_cssPropertyMap ->propertyAt(i); 62 StylePropertySet::PropertyReference propertyReference = m_cssPropertyMap ->propertyAt(i);
63 ASSERT_WITH_MESSAGE( 63 DCHECK(
64 !isShorthandProperty(propertyReference.id()) || propertyReference.va lue()->isVariableReferenceValue(), 64 !isShorthandProperty(propertyReference.id()) || propertyReference.va lue()->isVariableReferenceValue())
65 "Web Animations: Encountered unexpanded shorthand CSS property (%d). ", propertyReference.id()); 65 << "Web Animations: Encountered unexpanded shorthand CSS property (" << propertyReference.id() << ").";
66 properties.add(PropertyHandle(propertyReference.id(), false)); 66 properties.add(PropertyHandle(propertyReference.id(), false));
67 } 67 }
68 68
69 for (unsigned i = 0; i < m_presentationAttributeMap->propertyCount(); ++i) 69 for (unsigned i = 0; i < m_presentationAttributeMap->propertyCount(); ++i)
70 properties.add(PropertyHandle(m_presentationAttributeMap->propertyAt(i). id(), true)); 70 properties.add(PropertyHandle(m_presentationAttributeMap->propertyAt(i). id(), true));
71 71
72 for (const auto& key: m_svgAttributeMap.keys()) 72 for (const auto& key: m_svgAttributeMap.keys())
73 properties.add(PropertyHandle(*key)); 73 properties.add(PropertyHandle(*key));
74 74
75 return properties; 75 return properties;
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 } 163 }
164 164
165 PassRefPtr<Interpolation> SVGPropertySpecificKeyframe::maybeCreateInterpolation( PropertyHandle propertyHandle, Keyframe::PropertySpecificKeyframe& end, Element* , const ComputedStyle*) const 165 PassRefPtr<Interpolation> SVGPropertySpecificKeyframe::maybeCreateInterpolation( PropertyHandle propertyHandle, Keyframe::PropertySpecificKeyframe& end, Element* , const ComputedStyle*) const
166 { 166 {
167 const InterpolationTypes* applicableTypes = PropertyInterpolationTypesMappin g::get(propertyHandle); 167 const InterpolationTypes* applicableTypes = PropertyInterpolationTypesMappin g::get(propertyHandle);
168 ASSERT(applicableTypes); 168 ASSERT(applicableTypes);
169 return InvalidatableInterpolation::create(propertyHandle, *applicableTypes, const_cast<SVGPropertySpecificKeyframe*>(this), &end); 169 return InvalidatableInterpolation::create(propertyHandle, *applicableTypes, const_cast<SVGPropertySpecificKeyframe*>(this), &end);
170 } 170 }
171 171
172 } // namespace blink 172 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698