diff --git a/dom/animation/KeyframeEffectReadOnly.cpp b/dom/animation/KeyframeEffectReadOnly.cpp index 839416ce3de4..fbad51d808a9 100644 --- a/dom/animation/KeyframeEffectReadOnly.cpp +++ b/dom/animation/KeyframeEffectReadOnly.cpp @@ -1670,6 +1670,12 @@ KeyframeEffectReadOnly::ShouldBlockAsyncTransformAnimations( } } + // XXX cku temporarily disable async-animation when this frame has any + // individual transforms before bug 1425837 been fixed. + if (aFrame->StyleDisplay()->HasIndividualTransform()) { + return true; + } + return false; } diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h index f55f2571c512..0643d8e82c71 100644 --- a/layout/style/nsStyleStruct.h +++ b/layout/style/nsStyleStruct.h @@ -2803,6 +2803,10 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleDisplay (mWillChangeBitField & NS_STYLE_WILL_CHANGE_TRANSFORM); } + bool HasIndividualTransform() const { + return mSpecifiedRotate || mSpecifiedTranslate || mSpecifiedScale; + } + bool HasPerspectiveStyle() const { return mChildPerspective.GetUnit() == eStyleUnit_Coord; }