From 6ac132dfe97094446d2cea17df75f85fee6cf630 Mon Sep 17 00:00:00 2001 From: "tlin@mozilla.com" Date: Thu, 25 Aug 2016 09:59:51 +0000 Subject: [PATCH] Bug 1295084 Part 4 - Rename Position::PositionCoord to Position::Coord. r=dholbert --HG-- extra : rebase_source : 1b8b7019640f2db91167880899438cac7a2c49cd --- layout/base/nsCSSRendering.cpp | 2 +- layout/base/nsLayoutUtils.cpp | 2 +- layout/style/StyleAnimationValue.cpp | 2 +- layout/style/nsComputedDOMStyle.cpp | 2 +- layout/style/nsComputedDOMStyle.h | 2 +- layout/style/nsRuleNode.cpp | 14 +++++++------- layout/style/nsStyleStruct.h | 5 +++-- layout/style/nsStyleUtil.cpp | 2 +- 8 files changed, 16 insertions(+), 15 deletions(-) diff --git a/layout/base/nsCSSRendering.cpp b/layout/base/nsCSSRendering.cpp index 2796744eaf88..f6572193eb01 100644 --- a/layout/base/nsCSSRendering.cpp +++ b/layout/base/nsCSSRendering.cpp @@ -1054,7 +1054,7 @@ nsCSSRendering::PaintFocus(nsPresContext* aPresContext, * dimension. (so, x/width vs. y/height) */ static void -ComputeObjectAnchorCoord(const Position::PositionCoord& aCoord, +ComputeObjectAnchorCoord(const Position::Coord& aCoord, const nscoord aOriginBounds, const nscoord aImageSize, nscoord* aTopLeftCoord, diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp index 0ecba1c05c23..d29b0f1546aa 100644 --- a/layout/base/nsLayoutUtils.cpp +++ b/layout/base/nsLayoutUtils.cpp @@ -4151,7 +4151,7 @@ ComputeConcreteObjectSize(const nsSize& aConstraintSize, // (Helper for HasInitialObjectFitAndPosition, to check // each "object-position" coord.) static bool -IsCoord50Pct(const mozilla::Position::PositionCoord& aCoord) +IsCoord50Pct(const mozilla::Position::Coord& aCoord) { return (aCoord.mLength == 0 && aCoord.mHasPercent && diff --git a/layout/style/StyleAnimationValue.cpp b/layout/style/StyleAnimationValue.cpp index 491c5e103662..9ba82dc7f155 100644 --- a/layout/style/StyleAnimationValue.cpp +++ b/layout/style/StyleAnimationValue.cpp @@ -3372,7 +3372,7 @@ SetPositionValue(const Position& aPos, nsCSSValue& aCSSValue) } static void -SetPositionCoordValue(const Position::PositionCoord& aPosCoord, +SetPositionCoordValue(const Position::Coord& aPosCoord, nsCSSValue& aCSSValue) { RefPtr posArray = nsCSSValue::Array::Create(2); diff --git a/layout/style/nsComputedDOMStyle.cpp b/layout/style/nsComputedDOMStyle.cpp index 20f20ccf5a0b..9d7d9385213c 100644 --- a/layout/style/nsComputedDOMStyle.cpp +++ b/layout/style/nsComputedDOMStyle.cpp @@ -2359,7 +2359,7 @@ nsComputedDOMStyle::DoGetBackgroundOrigin() void nsComputedDOMStyle::SetValueToPositionCoord( - const Position::PositionCoord& aCoord, + const Position::Coord& aCoord, nsROCSSPrimitiveValue* aValue) { if (!aCoord.mHasPercent) { diff --git a/layout/style/nsComputedDOMStyle.h b/layout/style/nsComputedDOMStyle.h index 98a3c55edb8a..60c7fef53f04 100644 --- a/layout/style/nsComputedDOMStyle.h +++ b/layout/style/nsComputedDOMStyle.h @@ -585,7 +585,7 @@ private: void SetToRGBAColor(nsROCSSPrimitiveValue* aValue, nscolor aColor); void SetValueToStyleImage(const nsStyleImage& aStyleImage, nsROCSSPrimitiveValue* aValue); - void SetValueToPositionCoord(const mozilla::Position::PositionCoord& aCoord, + void SetValueToPositionCoord(const mozilla::Position::Coord& aCoord, nsROCSSPrimitiveValue* aValue); void SetValueToPosition(const mozilla::Position& aPosition, nsDOMCSSValueList* aValueList); diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp index fd55c520c8db..e950e060e643 100644 --- a/layout/style/nsRuleNode.cpp +++ b/layout/style/nsRuleNode.cpp @@ -6737,7 +6737,7 @@ static void ComputePositionCoord(nsStyleContext* aStyleContext, const nsCSSValue& aEdge, const nsCSSValue& aOffset, - Position::PositionCoord* aResult, + Position::Coord* aResult, RuleNodeCacheConditions& aConditions) { if (eCSSUnit_Percent == aOffset.GetUnit()) { @@ -6824,7 +6824,7 @@ ComputePositionValue(nsStyleContext* aStyleContext, static void ComputePositionCoordValue(nsStyleContext* aStyleContext, const nsCSSValue& aValue, - Position::PositionCoord& aComputedValue, + Position::Coord& aComputedValue, RuleNodeCacheConditions& aConditions) { NS_ASSERTION(aValue.GetUnit() == eCSSUnit_Array, @@ -7021,9 +7021,9 @@ SetImageLayerPositionCoordList( const nsCSSValue& aValue, nsStyleAutoArray& aLayers, const nsStyleAutoArray& aParentLayers, - Position::PositionCoord + Position::Coord Position::* aResultLocation, - Position::PositionCoord aInitialValue, + Position::Coord aInitialValue, uint32_t aParentItemCount, uint32_t& aItemCount, uint32_t& aMaxItemCount, @@ -7170,7 +7170,7 @@ FillBackgroundList( static void FillBackgroundPositionCoordList( nsStyleAutoArray& aLayers, - Position::PositionCoord + Position::Coord Position::* aResultLocation, uint32_t aItemCount, uint32_t aFillCount) { @@ -7268,7 +7268,7 @@ nsRuleNode::ComputeBackgroundData(void* aStartStruct, conditions); // background-position-x/y: enum, length, percent (flags), inherit [list] - Position::PositionCoord initialPositionCoord; + Position::Coord initialPositionCoord; initialPositionCoord.mPercent = nsStyleImageLayers::GetInitialPositionForLayerType( nsStyleImageLayers::LayerType::Background); @@ -10032,7 +10032,7 @@ nsRuleNode::ComputeSVGResetData(void* aStartStruct, conditions); // mask-position-x/y: enum, length, percent (flags), inherit [list] - Position::PositionCoord initialPositionCoord; + Position::Coord initialPositionCoord; initialPositionCoord.mPercent = nsStyleImageLayers::GetInitialPositionForLayerType( nsStyleImageLayers::LayerType::Mask); diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h index a9c5be9c230a..4f91881c33d9 100644 --- a/layout/style/nsStyleStruct.h +++ b/layout/style/nsStyleStruct.h @@ -146,8 +146,9 @@ private: }; struct Position { - typedef nsStyleCoord::CalcValue PositionCoord; - PositionCoord mXPosition, mYPosition; + using Coord = nsStyleCoord::CalcValue; + + Coord mXPosition, mYPosition; // Initialize nothing Position() {} diff --git a/layout/style/nsStyleUtil.cpp b/layout/style/nsStyleUtil.cpp index fad09d7c5cb9..3a4061523b17 100644 --- a/layout/style/nsStyleUtil.cpp +++ b/layout/style/nsStyleUtil.cpp @@ -687,7 +687,7 @@ nsStyleUtil::IsSignificantChild(nsIContent* aChild, bool aTextIsSignificant, // element's content-box, this method checks whether the given // "object-position" coordinate might cause overflow in its dimension. static bool -ObjectPositionCoordMightCauseOverflow(const Position::PositionCoord& aCoord) +ObjectPositionCoordMightCauseOverflow(const Position::Coord& aCoord) { // Any nonzero length in "object-position" can push us to overflow // (particularly if our concrete object size is exactly the same size as the