Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1350743 - Rename AnimationPropertySegment::HasReplacableValues to AnimationPropertySegment::HasReplaceableValues. r=birtles

Browse Source 
MozReview-Commit-ID: KNwZhFvG5PJ

--HG--
extra : rebase_source : 28819462a86d1ad2050314dc7a5f5a68e69bf7b9
This commit is contained in:
Hiroyuki Ikezoe 2017-03-27 09:15:26 +09:00
parent 7b0ef88536
commit 2e2e70805e
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom/animation/KeyframeEffectReadOnly.cpp
View File

@ -467,7 +467,7 @@ KeyframeEffectReadOnly::EnsureBaseStyles(
for (const AnimationProperty& property : aProperties) {
for (const AnimationPropertySegment& segment : property.mSegments) {
if (segment.HasReplacableValues()) {
if (segment.HasReplaceableValues()) {
continue;
}
@ -1660,7 +1660,7 @@ KeyframeEffectReadOnly::CalculateCumulativeChangeHint(
// we can't throttle animations which will not cause any layout changes
// on invisible elements because we can't calculate the change hint for
// such properties until we compose it.
if (!segment.HasReplacableValues()) {
if (!segment.HasReplaceableValues()) {
mCumulativeChangeHint = ~nsChangeHint_Hints_CanIgnoreIfNotVisible;
return;
}

8
dom/animation/KeyframeEffectReadOnly.h
View File

@ -65,18 +65,18 @@ struct AnimationPropertySegment
dom::CompositeOperation mFromComposite = dom::CompositeOperation::Replace;
dom::CompositeOperation mToComposite = dom::CompositeOperation::Replace;
bool HasReplacableValues() const
bool HasReplaceableValues() const
{
return HasReplacableFromValue() && HasReplacableToValue();
return HasReplaceableFromValue() && HasReplaceableToValue();
}
bool HasReplacableFromValue() const
bool HasReplaceableFromValue() const
{
return !mFromValue.IsNull() &&
mFromComposite == dom::CompositeOperation::Replace;
}
bool HasReplacableToValue() const
bool HasReplaceableToValue() const
{
return !mToValue.IsNull() &&
mToComposite == dom::CompositeOperation::Replace;

4
layout/base/nsLayoutUtils.cpp
View File

@ -603,10 +603,10 @@ GetMinAndMaxScaleForAnimationProperty(const nsIFrame* aFrame,
for (const AnimationPropertySegment& segment : prop.mSegments) {
// In case of add or accumulate composite, StyleAnimationValue does
// not have a valid value.
if (segment.HasReplacableFromValue()) {
if (segment.HasReplaceableFromValue()) {
UpdateMinMaxScale(aFrame, segment.mFromValue, aMinScale, aMaxScale);
}
if (segment.HasReplacableToValue()) {
if (segment.HasReplaceableToValue()) {
UpdateMinMaxScale(aFrame, segment.mToValue, aMinScale, aMaxScale);
}
}