diff --git a/gfx/layers/CompositorAnimationStorage.cpp b/gfx/layers/CompositorAnimationStorage.cpp index b8ccd49fe8ea..ea34d011a0db 100644 --- a/gfx/layers/CompositorAnimationStorage.cpp +++ b/gfx/layers/CompositorAnimationStorage.cpp @@ -152,8 +152,8 @@ void CompositorAnimationStorage::SetAnimatedValue( if (!aPreviousValue) { MOZ_ASSERT(!mAnimatedValues.Contains(aId)); mAnimatedValues.InsertOrUpdate( - aId, MakeUnique(gfx::Matrix4x4(), aFrameTransform, aData, - std::move(aValue))); + aId, + MakeUnique(aFrameTransform, aData, std::move(aValue))); return; } MOZ_ASSERT(aPreviousValue->Is()); diff --git a/gfx/layers/CompositorAnimationStorage.h b/gfx/layers/CompositorAnimationStorage.h index 41fe07424f08..55d892b36382 100644 --- a/gfx/layers/CompositorAnimationStorage.h +++ b/gfx/layers/CompositorAnimationStorage.h @@ -28,11 +28,6 @@ using AnimationArray = nsTArray; using SampledAnimationArray = AutoTArray, 1>; struct AnimationTransform { - /* - * This transform is calculated from sampleanimation in device pixel - * and used for layers (i.e. non WebRender) - */ - gfx::Matrix4x4 mTransformInDevSpace; /* * This transform is calculated from frame used for WebRender and used by * getOMTAStyle() for OMTA testing. @@ -64,12 +59,10 @@ struct AnimatedValue final { return mValue.is(); } - AnimatedValue(const gfx::Matrix4x4& aTransformInDevSpace, - const gfx::Matrix4x4& aFrameTransform, + AnimatedValue(const gfx::Matrix4x4& aFrameTransform, const TransformData& aData, SampledAnimationArray&& aValue) - : mValue(AsVariant(AnimationTransform{ - aTransformInDevSpace, aFrameTransform, aData, std::move(aValue)})) { - } + : mValue(AsVariant( + AnimationTransform{aFrameTransform, aData, std::move(aValue)})) {} explicit AnimatedValue(const float& aValue) : mValue(AsVariant(aValue)) {}