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

Side by Side Diff: Source/core/animation/LengthStyleInterpolation.cpp

Issue 1164573002: CSSValue Immediates: Change CSSValue to an object instead of a pointer (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 years, 4 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 "config.h" 5 #include "config.h"
6 #include "core/animation/LengthStyleInterpolation.h" 6 #include "core/animation/LengthStyleInterpolation.h"
7 7
8 #include "core/animation/css/CSSAnimatableValueFactory.h" 8 #include "core/animation/css/CSSAnimatableValueFactory.h"
9 #include "core/css/CSSCalculationValue.h" 9 #include "core/css/CSSCalculationValue.h"
10 #include "core/css/resolver/StyleBuilder.h" 10 #include "core/css/resolver/StyleBuilder.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 return true; 44 return true;
45 } 45 }
46 return false; 46 return false;
47 default: 47 default:
48 return false; 48 return false;
49 } 49 }
50 } 50 }
51 51
52 } // namespace 52 } // namespace
53 53
54 bool LengthStyleInterpolation::canCreateFrom(const CSSValue& value, CSSPropertyI D property) 54 bool LengthStyleInterpolation::canCreateFrom(const CSSValue value, CSSPropertyID property)
55 { 55 {
56 if (value.isPrimitiveValue()) { 56 if (value.isPrimitiveValue()) {
57 const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value); 57 const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
58 if (primitiveValue.cssCalcValue()) 58 if (primitiveValue.cssCalcValue())
59 return true; 59 return true;
60 60
61 if (primitiveValue.isValueID()) { 61 if (primitiveValue.isValueID()) {
62 CSSValueID valueID = primitiveValue.getValueID(); 62 CSSValueID valueID = primitiveValue.getValueID();
63 double pixels; 63 double pixels;
64 return pixelsForKeyword(property, valueID, pixels); 64 return pixelsForKeyword(property, valueID, pixels);
65 } 65 }
66 66
67 CSSPrimitiveValue::LengthUnitType type; 67 CSSPrimitiveValue::LengthUnitType type;
68 // Only returns true if the type is a primitive length unit. 68 // Only returns true if the type is a primitive length unit.
69 return CSSPrimitiveValue::unitTypeToLengthUnitType(primitiveValue.primit iveType(), type); 69 return CSSPrimitiveValue::unitTypeToLengthUnitType(primitiveValue.primit iveType(), type);
70 } 70 }
71 return value.isCalcValue(); 71 return value.isCalcValue();
72 } 72 }
73 73
74 PassOwnPtrWillBeRawPtr<InterpolableValue> LengthStyleInterpolation::toInterpolab leValue(const CSSValue& value, CSSPropertyID id) 74 PassOwnPtrWillBeRawPtr<InterpolableValue> LengthStyleInterpolation::toInterpolab leValue(const CSSValue value, CSSPropertyID id)
75 { 75 {
76 ASSERT(canCreateFrom(value, id)); 76 ASSERT(canCreateFrom(value, id));
77 OwnPtrWillBeRawPtr<InterpolableList> listOfValuesAndTypes = InterpolableList ::create(2); 77 OwnPtrWillBeRawPtr<InterpolableList> listOfValuesAndTypes = InterpolableList ::create(2);
78 OwnPtrWillBeRawPtr<InterpolableList> listOfValues = InterpolableList::create (CSSPrimitiveValue::LengthUnitTypeCount); 78 OwnPtrWillBeRawPtr<InterpolableList> listOfValues = InterpolableList::create (CSSPrimitiveValue::LengthUnitTypeCount);
79 OwnPtrWillBeRawPtr<InterpolableList> listOfTypes = InterpolableList::create( CSSPrimitiveValue::LengthUnitTypeCount); 79 OwnPtrWillBeRawPtr<InterpolableList> listOfTypes = InterpolableList::create( CSSPrimitiveValue::LengthUnitTypeCount);
80 80
81 const CSSPrimitiveValue& primitive = toCSSPrimitiveValue(value); 81 const CSSPrimitiveValue& primitive = toCSSPrimitiveValue(value);
82 82
83 CSSLengthArray arrayOfValues; 83 CSSLengthArray arrayOfValues;
84 CSSPrimitiveValue::CSSLengthTypeArray arrayOfTypes; 84 CSSPrimitiveValue::CSSLengthTypeArray arrayOfTypes;
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 return CSSPrimitiveValue::create(CSSCalcValue::create(constructCalcExpre ssion(listOfValuesAndTypes), valueRange)); 311 return CSSPrimitiveValue::create(CSSCalcValue::create(constructCalcExpre ssion(listOfValuesAndTypes), valueRange));
312 } 312 }
313 } 313 }
314 314
315 void LengthStyleInterpolation::apply(StyleResolverState& state) const 315 void LengthStyleInterpolation::apply(StyleResolverState& state) const
316 { 316 {
317 if (m_lengthSetter) { 317 if (m_lengthSetter) {
318 (state.style()->*m_lengthSetter)(lengthFromInterpolableValue(*m_cachedVa lue, m_range, state.style()->effectiveZoom())); 318 (state.style()->*m_lengthSetter)(lengthFromInterpolableValue(*m_cachedVa lue, m_range, state.style()->effectiveZoom()));
319 #if ENABLE(ASSERT) 319 #if ENABLE(ASSERT)
320 RefPtrWillBeRawPtr<AnimatableValue> before = CSSAnimatableValueFactory:: create(m_id, *state.style()); 320 RefPtrWillBeRawPtr<AnimatableValue> before = CSSAnimatableValueFactory:: create(m_id, *state.style());
321 StyleBuilder::applyProperty(m_id, state, fromInterpolableValue(*m_cached Value, m_range).get()); 321 StyleBuilder::applyProperty(m_id, state, fromInterpolableValue(*m_cached Value, m_range));
322 RefPtrWillBeRawPtr<AnimatableValue> after = CSSAnimatableValueFactory::c reate(m_id, *state.style()); 322 RefPtrWillBeRawPtr<AnimatableValue> after = CSSAnimatableValueFactory::c reate(m_id, *state.style());
323 ASSERT(before->equals(*after)); 323 ASSERT(before->equals(*after));
324 #endif 324 #endif
325 } else { 325 } else {
326 StyleBuilder::applyProperty(m_id, state, fromInterpolableValue(*m_cached Value, m_range).get()); 326 StyleBuilder::applyProperty(m_id, state, fromInterpolableValue(*m_cached Value, m_range));
327 } 327 }
328 } 328 }
329 329
330 DEFINE_TRACE(LengthStyleInterpolation) 330 DEFINE_TRACE(LengthStyleInterpolation)
331 { 331 {
332 StyleInterpolation::trace(visitor); 332 StyleInterpolation::trace(visitor);
333 } 333 }
334 334
335 } 335 }
OLDNEW
« no previous file with comments | « Source/core/animation/LengthStyleInterpolation.h ('k') | Source/core/animation/LengthStyleInterpolationTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698