Bug 1289928 - Drop nsStyleContext* argument from BuildSegmentsFromValueEntries r?hiro
MozReview-Commit-ID: KxyTVGaePjT
--- a/dom/animation/KeyframeUtils.cpp
+++ b/dom/animation/KeyframeUtils.cpp
@@ -378,18 +378,17 @@ HasValidOffsets(const nsTArray<Keyframe>
static void
MarkAsComputeValuesFailureKey(PropertyValuePair& aPair);
static bool
IsComputeValuesFailureKey(const PropertyValuePair& aPair);
static void
-BuildSegmentsFromValueEntries(nsStyleContext* aStyleContext,
- nsTArray<KeyframeValueEntry>& aEntries,
+BuildSegmentsFromValueEntries(nsTArray<KeyframeValueEntry>& aEntries,
nsTArray<AnimationProperty>& aResult);
static void
GetKeyframeListFromPropertyIndexedKeyframe(JSContext* aCx,
nsIDocument* aDocument,
JS::Handle<JS::Value> aValue,
nsTArray<Keyframe>& aResult,
ErrorResult& aRv);
@@ -662,17 +661,17 @@ KeyframeUtils::GetAnimationPropertiesFro
entry->mOffset = frame.mComputedOffset;
entry->mProperty = value.mProperty;
entry->mValue = value.mValue;
entry->mTimingFunction = frame.mTimingFunction;
}
}
nsTArray<AnimationProperty> result;
- BuildSegmentsFromValueEntries(aStyleContext, entries, result);
+ BuildSegmentsFromValueEntries(entries, result);
return result;
}
/* static */ bool
KeyframeUtils::IsAnimatableProperty(nsCSSPropertyID aProperty)
{
if (aProperty == eCSSProperty_UNKNOWN) {
return false;
@@ -1074,18 +1073,17 @@ IsComputeValuesFailureKey(const Property
eCSSPropertyExtra_no_properties;
}
/**
* Builds an array of AnimationProperty objects to represent the keyframe
* animation segments in aEntries.
*/
static void
-BuildSegmentsFromValueEntries(nsStyleContext* aStyleContext,
- nsTArray<KeyframeValueEntry>& aEntries,
+BuildSegmentsFromValueEntries(nsTArray<KeyframeValueEntry>& aEntries,
nsTArray<AnimationProperty>& aResult)
{
if (aEntries.IsEmpty()) {
return;
}
// Sort the KeyframeValueEntry objects so that all entries for a given
// property are together, and the entries are sorted by offset otherwise.