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

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

Issue 797493004: Oilpan: fix build after r187337. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years 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/LengthPairStyleInterpolation.h" 6 #include "core/animation/LengthPairStyleInterpolation.h"
7 7
8 #include "core/animation/LengthStyleInterpolation.h" 8 #include "core/animation/LengthStyleInterpolation.h"
9 #include "core/css/Pair.h" 9 #include "core/css/Pair.h"
10 #include "core/css/resolver/StyleBuilder.h" 10 #include "core/css/resolver/StyleBuilder.h"
(...skipping 11 matching lines...) Expand all
22 Pair* pair = toCSSPrimitiveValue(value).getPairValue(); 22 Pair* pair = toCSSPrimitiveValue(value).getPairValue();
23 ASSERT(pair); 23 ASSERT(pair);
24 24
25 result->set(0, LengthStyleInterpolation::lengthToInterpolableValue(*pair->fi rst())); 25 result->set(0, LengthStyleInterpolation::lengthToInterpolableValue(*pair->fi rst()));
26 result->set(1, LengthStyleInterpolation::lengthToInterpolableValue(*pair->se cond())); 26 result->set(1, LengthStyleInterpolation::lengthToInterpolableValue(*pair->se cond()));
27 return result.release(); 27 return result.release();
28 } 28 }
29 29
30 static inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> toPrimitiveValue(PassRef PtrWillBeRawPtr<CSSValue> value) 30 static inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> toPrimitiveValue(PassRef PtrWillBeRawPtr<CSSValue> value)
31 { 31 {
32 return adoptRef(toCSSPrimitiveValue(value.leakRef())); 32 return adoptRefWillBeNoop(toCSSPrimitiveValue(value.leakRef()));
33 } 33 }
34 34
35 PassRefPtrWillBeRawPtr<CSSValue> LengthPairStyleInterpolation::interpolableValue ToLengthPair(InterpolableValue* value, ValueRange range) 35 PassRefPtrWillBeRawPtr<CSSValue> LengthPairStyleInterpolation::interpolableValue ToLengthPair(InterpolableValue* value, ValueRange range)
36 { 36 {
37 InterpolableList* lengthPair = toInterpolableList(value); 37 InterpolableList* lengthPair = toInterpolableList(value);
38 RefPtr<CSSPrimitiveValue> first = toPrimitiveValue(LengthStyleInterpolation: :interpolableValueToLength(lengthPair->get(0), range)); 38 RefPtrWillBeRawPtr<CSSPrimitiveValue> first = toPrimitiveValue(LengthStyleIn terpolation::interpolableValueToLength(lengthPair->get(0), range));
39 RefPtr<CSSPrimitiveValue> second = toPrimitiveValue(LengthStyleInterpolation ::interpolableValueToLength(lengthPair->get(1), range)); 39 RefPtrWillBeRawPtr<CSSPrimitiveValue> second = toPrimitiveValue(LengthStyleI nterpolation::interpolableValueToLength(lengthPair->get(1), range));
40 RefPtr<Pair> result = Pair::create(first, second, Pair::KeepIdenticalValues) ; 40 RefPtrWillBeRawPtr<Pair> result = Pair::create(first, second, Pair::KeepIden ticalValues);
41 41
42 return CSSPrimitiveValue::create(result.release()); 42 return CSSPrimitiveValue::create(result.release());
43 } 43 }
44 44
45 void LengthPairStyleInterpolation::apply(StyleResolverState& state) const 45 void LengthPairStyleInterpolation::apply(StyleResolverState& state) const
46 { 46 {
47 StyleBuilder::applyProperty(m_id, state, interpolableValueToLengthPair(m_cac hedValue.get(), m_range).get()); 47 StyleBuilder::applyProperty(m_id, state, interpolableValueToLengthPair(m_cac hedValue.get(), m_range).get());
48 } 48 }
49 49
50 void LengthPairStyleInterpolation::trace(Visitor* visitor) 50 } // namespace blink
51 {
52 StyleInterpolation::trace(visitor);
53 }
54 }
OLDNEW
« no previous file with comments | « Source/core/animation/LengthPairStyleInterpolation.h ('k') | Source/core/animation/LengthPairStyleInterpolationTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698