Bug 1479173 - Rename LayerAnimationInto::mLayerType to LayerAnimationInfo::mDisplayitemType. r=birtles

In the case of WebRender there is no layers, but actually we'd been using it for
WebRender too, that's confusing.

Depends on D10689

Differential Revision: https://phabricator.services.mozilla.com/D10690

--HG--
extra : moz-landing-system : lando

dom/animation/KeyframeEffect.cpp

@@ -1264,7 +1264,7 @@ KeyframeEffect::CanThrottle() const
     // Note that AnimationInfo::GetGenarationFromFrame() is supposed to work
     // with the primary frame instead of the style frame.
     Maybe<uint64_t> generation = layers::AnimationInfo::GetGenerationFromFrame(
-        GetPrimaryFrame(), record.mLayerType);
+        GetPrimaryFrame(), record.mDisplayItemType);
     // Unthrottle if the animation needs to be brought up to date
     if (!generation || effectSet->GetAnimationGeneration() != *generation) {
       return false;

layout/base/RestyleManager.cpp

@@ -1800,7 +1800,7 @@ RestyleManager::AddLayerChangesForAnimation(nsIFrame* aFrame,
          LayerAnimationInfo::sRecords) {
     Maybe<uint64_t> generation =
       layers::AnimationInfo::GetGenerationFromFrame(aFrame,
-                                                    layerInfo.mLayerType);
+                                                    layerInfo.mDisplayItemType);
     if (generation && frameGeneration != *generation) {
       // If we have a transform layer bug don't have any transform style, we
       // probably just removed the transform but haven't destroyed the layer
@@ -1821,7 +1821,7 @@ RestyleManager::AddLayerChangesForAnimation(nsIFrame* aFrame,
       // Note that we *don't* add nsChangeHint_UpdateTransformLayer since if we
       // did, ApplyRenderingChangeToTree would complain that we're updating a
       // transform layer without a transform.
-      if (layerInfo.mLayerType == DisplayItemType::TYPE_TRANSFORM &&
+      if (layerInfo.mDisplayItemType == DisplayItemType::TYPE_TRANSFORM &&
           !aFrame->StyleDisplay()->HasTransformStyle()) {
         // Add all the hints for a removing a transform if they are not already
         // set for this frame.

layout/style/LayerAnimationInfo.h

@@ -22,7 +22,7 @@ struct LayerAnimationInfo {
   // a record of the corresponding layer type and change hint.
   struct Record {
     nsCSSPropertyID mProperty;
-    DisplayItemType mLayerType;
+    DisplayItemType mDisplayItemType;
     nsChangeHint mChangeHint;
   };