Bug 1354947 - Rename FillKeyframesForName to GetKeyframesForName. r?birtles
MozReview-Commit-ID: AOLygEtuhpO
--- a/layout/style/ServoBindingList.h
+++ b/layout/style/ServoBindingList.h
@@ -63,17 +63,17 @@ SERVO_BINDING_FUNC(Servo_StyleSet_Remove
SERVO_BINDING_FUNC(Servo_StyleSet_InsertStyleSheetBefore, void,
RawServoStyleSetBorrowed set,
RawServoStyleSheetBorrowed sheet,
uint32_t unique_id,
uint32_t before_unique_id)
SERVO_BINDING_FUNC(Servo_StyleSet_FlushStyleSheets, void, RawServoStyleSetBorrowed set)
SERVO_BINDING_FUNC(Servo_StyleSet_NoteStyleSheetsChanged, void,
RawServoStyleSetBorrowed set, bool author_style_disabled)
-SERVO_BINDING_FUNC(Servo_StyleSet_FillKeyframesForName, bool,
+SERVO_BINDING_FUNC(Servo_StyleSet_GetKeyframesForName, bool,
RawServoStyleSetBorrowed set,
const nsACString* property,
nsTimingFunctionBorrowed timing_function,
ServoComputedValuesBorrowed computed_values,
RawGeckoKeyframeListBorrowedMut keyframe_list)
SERVO_BINDING_FUNC(Servo_StyleSet_GetFontFaceRules, void,
RawServoStyleSetBorrowed set,
RawGeckoFontFaceRuleListBorrowedMut list)
--- a/layout/style/ServoStyleSet.cpp
+++ b/layout/style/ServoStyleSet.cpp
@@ -913,29 +913,29 @@ ServoStyleSet::AssertTreeIsClean()
DocumentStyleRootIterator iter(mPresContext->Document());
while (Element* root = iter.GetNextStyleRoot()) {
Servo_AssertTreeIsClean(root);
}
}
#endif
bool
-ServoStyleSet::FillKeyframesForName(const nsString& aName,
- const nsTimingFunction& aTimingFunction,
- const ServoComputedValues* aComputedValues,
- nsTArray<Keyframe>& aKeyframes)
+ServoStyleSet::GetKeyframesForName(const nsString& aName,
+ const nsTimingFunction& aTimingFunction,
+ const ServoComputedValues* aComputedValues,
+ nsTArray<Keyframe>& aKeyframes)
{
MaybeRebuildStylist();
NS_ConvertUTF16toUTF8 name(aName);
- return Servo_StyleSet_FillKeyframesForName(mRawSet.get(),
- &name,
- &aTimingFunction,
- aComputedValues,
- &aKeyframes);
+ return Servo_StyleSet_GetKeyframesForName(mRawSet.get(),
+ &name,
+ &aTimingFunction,
+ aComputedValues,
+ &aKeyframes);
}
nsTArray<ComputedKeyframeValues>
ServoStyleSet::GetComputedKeyframeValuesFor(
const nsTArray<Keyframe>& aKeyframes,
dom::Element* aElement,
const ServoComputedValuesWithParent& aServoValues)
{
--- a/layout/style/ServoStyleSet.h
+++ b/layout/style/ServoStyleSet.h
@@ -292,20 +292,20 @@ public:
void RebuildData();
/**
* Resolve style for the given element, and return it as a
* ServoComputedValues, not an nsStyleContext.
*/
already_AddRefed<ServoComputedValues> ResolveServoStyle(dom::Element* aElement);
- bool FillKeyframesForName(const nsString& aName,
- const nsTimingFunction& aTimingFunction,
- const ServoComputedValues* aComputedValues,
- nsTArray<Keyframe>& aKeyframes);
+ bool GetKeyframesForName(const nsString& aName,
+ const nsTimingFunction& aTimingFunction,
+ const ServoComputedValues* aComputedValues,
+ nsTArray<Keyframe>& aKeyframes);
nsTArray<ComputedKeyframeValues>
GetComputedKeyframeValuesFor(const nsTArray<Keyframe>& aKeyframes,
dom::Element* aElement,
const ServoComputedValuesWithParent&
aServoValues);
bool AppendFontFaceRules(nsTArray<nsFontFaceRuleContainer>& aArray);
--- a/layout/style/nsAnimationManager.cpp
+++ b/layout/style/nsAnimationManager.cpp
@@ -416,20 +416,20 @@ public:
bool BuildKeyframes(nsPresContext* aPresContext,
const StyleAnimation& aSrc,
nsTArray<Keyframe>& aKeyframes)
{
ServoStyleSet* styleSet = aPresContext->StyleSet()->AsServo();
MOZ_ASSERT(styleSet);
const nsTimingFunction& timingFunction = aSrc.GetTimingFunction();
- return styleSet->FillKeyframesForName(aSrc.GetName(),
- timingFunction,
- mComputedValues,
- aKeyframes);
+ return styleSet->GetKeyframesForName(aSrc.GetName(),
+ timingFunction,
+ mComputedValues,
+ aKeyframes);
}
void SetKeyframes(KeyframeEffectReadOnly& aEffect,
nsTArray<Keyframe>&& aKeyframes)
{
aEffect.SetKeyframes(Move(aKeyframes),
{ mComputedValues, mParentComputedValues });
}