Bug 1554499 - Rename PerFrameKey -> PerFrameIndex for most methods r=…

…mattwoodrow This distinguishes better between the overloaded aspect of the PerFrameKey and the actual mixed value. Differential Revision: https://phabricator.services.mozilla.com/D37804
iaxat · Jul 17, 2019 · d501009 · d501009
1 parent 2806cf4
commit d501009
Show file tree

Hide file tree

Showing 7 changed files with 92 additions and 89 deletions.
diff --git a/layout/generic/TextOverflow.cpp b/layout/generic/TextOverflow.cpp
@@ -163,11 +163,12 @@ class nsDisplayTextOverflowMarker final : public nsPaintedDisplayItem {
   }
 
   // Should have the same argument signature as the above ctor
-  static uint16_t CalculatePerFrameKey(nsDisplayListBuilder* aBuilder,
-                                       nsIFrame* aFrame, const nsRect& aRect,
-                                       nscoord aAscent,
-                                       const StyleTextOverflowSide& aStyle,
-                                       uint32_t aLineNumber, uint16_t aIndex) {
+  static uint16_t CalculatePerFrameIndex(nsDisplayListBuilder* aBuilder,
+                                         nsIFrame* aFrame, const nsRect& aRect,
+                                         nscoord aAscent,
+                                         const StyleTextOverflowSide& aStyle,
+                                         uint32_t aLineNumber,
+                                         uint16_t aIndex) {
     return (aLineNumber << 1) + aIndex;
   }
 

diff --git a/layout/mathml/nsMathMLChar.cpp b/layout/mathml/nsMathMLChar.cpp
@@ -1726,9 +1726,9 @@ class nsDisplayMathMLCharForeground final : public nsPaintedDisplayItem {
   }
 
   // Should have the same argument signature as the above ctor
-  static uint16_t CalculatePerFrameKey(nsDisplayListBuilder* aBuilder,
-                                       nsIFrame* aFrame, nsMathMLChar* aChar,
-                                       uint16_t aIndex, bool aIsSelected) {
+  static uint16_t CalculatePerFrameIndex(nsDisplayListBuilder* aBuilder,
+                                         nsIFrame* aFrame, nsMathMLChar* aChar,
+                                         uint16_t aIndex, bool aIsSelected) {
     return aIndex;
   }
 

diff --git a/layout/mathml/nsMathMLFrame.cpp b/layout/mathml/nsMathMLFrame.cpp
@@ -309,9 +309,9 @@ class nsDisplayMathMLBar final : public nsPaintedDisplayItem {
   }
 
   // Should have the same argument signature as the above ctor
-  static uint16_t CalculatePerFrameKey(nsDisplayListBuilder* aBuilder,
-                                       nsIFrame* aFrame, const nsRect& aRect,
-                                       uint16_t aIndex) {
+  static uint16_t CalculatePerFrameIndex(nsDisplayListBuilder* aBuilder,
+                                         nsIFrame* aFrame, const nsRect& aRect,
+                                         uint16_t aIndex) {
     return aIndex;
   }
 

diff --git a/layout/mathml/nsMathMLmencloseFrame.cpp b/layout/mathml/nsMathMLmencloseFrame.cpp
@@ -714,10 +714,10 @@ class nsDisplayNotation final : public nsPaintedDisplayItem {
   }
 
   // Should have the same argument signature as the above ctor
-  static uint16_t CalculatePerFrameKey(nsDisplayListBuilder* aBuilder,
-                                       nsIFrame* aFrame, const nsRect& aRect,
-                                       nscoord aThickness,
-                                       nsMencloseNotation aType) {
+  static uint16_t CalculatePerFrameIndex(nsDisplayListBuilder* aBuilder,
+                                         nsIFrame* aFrame, const nsRect& aRect,
+                                         nscoord aThickness,
+                                         nsMencloseNotation aType) {
     return aType;
   }
 

diff --git a/layout/painting/nsDisplayList.cpp b/layout/painting/nsDisplayList.cpp
@@ -3983,7 +3983,7 @@ nsDisplayBackgroundImage::nsDisplayBackgroundImage(
 }
 
 // Should have an identical argument signature to the above ctor
-uint16_t nsDisplayBackgroundImage::CalculatePerFrameKey(
+uint16_t nsDisplayBackgroundImage::CalculatePerFrameIndex(
     nsDisplayListBuilder* aBuilder, nsIFrame* aFrame, const InitData& aInitData,
     nsIFrame* aFrameForBounds) {
   return aInitData.layer;
@@ -4806,7 +4806,7 @@ nsDisplayTableBackgroundImage::nsDisplayTableBackgroundImage(
 }
 
 // Should have an identical argument signature to the above ctor
-uint16_t nsDisplayTableBackgroundImage::CalculatePerFrameKey(
+uint16_t nsDisplayTableBackgroundImage::CalculatePerFrameIndex(
     nsDisplayListBuilder* aBuilder, nsIFrame* aFrame, const InitData& aData,
     nsIFrame* aCellFrame) {
   return CalculateTablePerFrameKey(aData.layer,
@@ -5463,7 +5463,7 @@ nsDisplayCompositorHitTestInfo::nsDisplayCompositorHitTestInfo(
 }
 
 // Should have the same argument signature as the above ctor
-uint16_t nsDisplayCompositorHitTestInfo::CalculatePerFrameKey(
+uint16_t nsDisplayCompositorHitTestInfo::CalculatePerFrameIndex(
     nsDisplayListBuilder* aBuilder, nsIFrame* aFrame,
     const mozilla::gfx::CompositorHitTestInfo& aHitTestFlags, uint16_t aIndex,
     const mozilla::Maybe<nsRect>& aArea) {
@@ -5482,7 +5482,7 @@ nsDisplayCompositorHitTestInfo::nsDisplayCompositorHitTestInfo(
 }
 
 // Should have the same argument signature as the above ctor
-uint16_t nsDisplayCompositorHitTestInfo::CalculatePerFrameKey(
+uint16_t nsDisplayCompositorHitTestInfo::CalculatePerFrameIndex(
     nsDisplayListBuilder* aBuilder, nsIFrame* aFrame,
     mozilla::UniquePtr<HitTestInfo>&& aHitTestInfo) {
   return 0;