Index: third_party/WebKit/Source/core/animation/ListInterpolationFunctions.h |
diff --git a/third_party/WebKit/Source/core/animation/ListInterpolationFunctions.h b/third_party/WebKit/Source/core/animation/ListInterpolationFunctions.h |
index 8e1fe604b7deaf49dd15b20c68dac0df3d4f0933..0ee60f12e1da568c30251d18f043399647bbb3d8 100644 |
--- a/third_party/WebKit/Source/core/animation/ListInterpolationFunctions.h |
+++ b/third_party/WebKit/Source/core/animation/ListInterpolationFunctions.h |
@@ -23,12 +23,15 @@ class ListInterpolationFunctions { |
return InterpolationValue(InterpolableList::Create(0)); |
} |
+ enum LengthMatchingStrategy { kLowestCommonMultiple, kPadToLargest }; |
shend
2017/04/27 06:07:49
Should the enum value name indicate that it's a st
alancutter (OOO until 2018)
2017/04/27 07:09:22
Made it an enum class.
|
+ |
using MergeSingleItemConversionsCallback = |
PairwiseInterpolationValue (*)(InterpolationValue&& start, |
InterpolationValue&& end); |
static PairwiseInterpolationValue MaybeMergeSingles( |
InterpolationValue&& start, |
InterpolationValue&& end, |
+ LengthMatchingStrategy, |
MergeSingleItemConversionsCallback); |
using EqualNonInterpolableValuesCallback = |
@@ -48,6 +51,7 @@ class ListInterpolationFunctions { |
double underlying_fraction, |
const InterpolationType&, |
const InterpolationValue&, |
+ LengthMatchingStrategy, |
NonInterpolableValuesAreCompatibleCallback, |
CompositeItemCallback); |
}; |