Bug 1280647 - Rename nsStyleDisplay member mFloats to mFloat.
Also rename mOriginalFloats to mOriginalFloat.
MozReview-Commit-ID: COfmU34CtJU
--- a/layout/generic/WritingModes.h
+++ b/layout/generic/WritingModes.h
@@ -1999,23 +1999,23 @@ nsStylePosition::MaxBSizeDependsOnContai
{
return aWM.IsVertical() ? MaxWidthDependsOnContainer()
: MaxHeightDependsOnContainer();
}
inline uint8_t
nsStyleDisplay::PhysicalFloats(mozilla::WritingMode aWM) const
{
- if (mFloats == NS_STYLE_FLOAT_INLINE_START) {
+ if (mFloat == NS_STYLE_FLOAT_INLINE_START) {
return aWM.IsBidiLTR() ? NS_STYLE_FLOAT_LEFT : NS_STYLE_FLOAT_RIGHT;
}
- if (mFloats == NS_STYLE_FLOAT_INLINE_END) {
+ if (mFloat == NS_STYLE_FLOAT_INLINE_END) {
return aWM.IsBidiLTR() ? NS_STYLE_FLOAT_RIGHT : NS_STYLE_FLOAT_LEFT;
}
- return mFloats;
+ return mFloat;
}
inline uint8_t
nsStyleDisplay::PhysicalBreakType(mozilla::WritingMode aWM) const
{
if (mBreakType == NS_STYLE_CLEAR_INLINE_START) {
return aWM.IsBidiLTR() ? NS_STYLE_CLEAR_LEFT : NS_STYLE_CLEAR_RIGHT;
}
--- a/layout/style/nsComputedDOMStyle.cpp
+++ b/layout/style/nsComputedDOMStyle.cpp
@@ -914,17 +914,17 @@ nsComputedDOMStyle::DoGetClear()
nsCSSProps::kClearKTable));
return val.forget();
}
already_AddRefed<CSSValue>
nsComputedDOMStyle::DoGetFloat()
{
RefPtr<nsROCSSPrimitiveValue> val = new nsROCSSPrimitiveValue;
- val->SetIdent(nsCSSProps::ValueToKeywordEnum(StyleDisplay()->mFloats,
+ val->SetIdent(nsCSSProps::ValueToKeywordEnum(StyleDisplay()->mFloat,
nsCSSProps::kFloatKTable));
return val.forget();
}
already_AddRefed<CSSValue>
nsComputedDOMStyle::DoGetBottom()
{
return GetOffsetWidthFor(NS_SIDE_BOTTOM);
--- a/layout/style/nsRuleNode.cpp
+++ b/layout/style/nsRuleNode.cpp
@@ -5322,22 +5322,22 @@ nsRuleNode::ComputeDisplayData(void* aSt
nsStyleContext* aContext,
nsRuleNode* aHighestNode,
const RuleDetail aRuleDetail,
const RuleNodeCacheConditions aConditions)
{
COMPUTE_START_RESET(Display, display, parentDisplay)
// We may have ended up with aStartStruct's values of mDisplay and
- // mFloats, but those may not be correct if our style data overrides
+ // mFloat, but those may not be correct if our style data overrides
// its position or float properties. Reset to mOriginalDisplay and
- // mOriginalFloats; it if turns out we still need the display/floats
- // adjustments we'll do them below.
+ // mOriginalFloat; if it turns out we still need the display/floats
+ // adjustments, we'll do them below.
display->mDisplay = display->mOriginalDisplay;
- display->mFloats = display->mOriginalFloats;
+ display->mFloat = display->mOriginalFloat;
// Each property's index in this array must match its index in the
// const array |transitionPropInfo| above.
TransitionPropData transitionPropData[4];
TransitionPropData& delay = transitionPropData[0];
TransitionPropData& duration = transitionPropData[1];
TransitionPropData& property = transitionPropData[2];
TransitionPropData& timingFunction = transitionPropData[3];
@@ -6011,22 +6011,22 @@ nsRuleNode::ComputeDisplayData(void* aSt
SETVAL_ENUMERATED | SETVAL_UNSET_INITIAL,
parentDisplay->mTouchAction,
/* initial */ NS_STYLE_TOUCH_ACTION_AUTO,
/* auto */ NS_STYLE_TOUCH_ACTION_AUTO,
/* none */ NS_STYLE_TOUCH_ACTION_NONE, Unused, Unused);
// float: enum, inherit, initial
SetValue(*aRuleData->ValueForFloat(),
- display->mFloats, conditions,
+ display->mFloat, conditions,
SETVAL_ENUMERATED | SETVAL_UNSET_INITIAL,
- parentDisplay->mFloats,
+ parentDisplay->mFloat,
NS_STYLE_FLOAT_NONE);
- // Save mFloats in mOriginalFloats in case we need it later
- display->mOriginalFloats = display->mFloats;
+ // Save mFloat in mOriginalFloat in case we need it later
+ display->mOriginalFloat = display->mFloat;
// overflow-x: enum, inherit, initial
SetValue(*aRuleData->ValueForOverflowX(),
display->mOverflowX, conditions,
SETVAL_ENUMERATED | SETVAL_UNSET_INITIAL,
parentDisplay->mOverflowX,
NS_STYLE_OVERFLOW_VISIBLE);
@@ -6139,25 +6139,25 @@ nsRuleNode::ComputeDisplayData(void* aSt
// property.
conditions.SetUncacheable();
}
if (display->IsAbsolutelyPositionedStyle()) {
// 1) if position is 'absolute' or 'fixed' then display must be
// block-level and float must be 'none'
EnsureBlockDisplay(display->mDisplay);
- display->mFloats = NS_STYLE_FLOAT_NONE;
+ display->mFloat = NS_STYLE_FLOAT_NONE;
// Note that it's OK to cache this struct in the ruletree
// because it's fine as-is for any style context that points to
// it directly, and any use of it as aStartStruct (e.g. if a
// more specific rule sets "position: static") will use
- // mOriginalDisplay and mOriginalFloats, which we have carefully
+ // mOriginalDisplay and mOriginalFloat, which we have carefully
// not changed.
- } else if (display->mFloats != NS_STYLE_FLOAT_NONE) {
+ } else if (display->mFloat != NS_STYLE_FLOAT_NONE) {
// 2) if float is not none, and display is not none, then we must
// set a block-level 'display' type per CSS2.1 section 9.7.
EnsureBlockDisplay(display->mDisplay);
// Note that it's OK to cache this struct in the ruletree
// because it's fine as-is for any style context that points to
// it directly, and any use of it as aStartStruct (e.g. if a
// more specific rule sets "float: none") will use
--- a/layout/style/nsStyleStruct.cpp
+++ b/layout/style/nsStyleStruct.cpp
@@ -2827,18 +2827,18 @@ mozilla::StyleAnimation::operator==(cons
// nsStyleDisplay
//
nsStyleDisplay::nsStyleDisplay(StyleStructContext aContext)
: mDisplay(NS_STYLE_DISPLAY_INLINE)
, mOriginalDisplay(NS_STYLE_DISPLAY_INLINE)
, mContain(NS_STYLE_CONTAIN_NONE)
, mAppearance(NS_THEME_NONE)
, mPosition(NS_STYLE_POSITION_STATIC)
- , mFloats(NS_STYLE_FLOAT_NONE)
- , mOriginalFloats(NS_STYLE_FLOAT_NONE)
+ , mFloat(NS_STYLE_FLOAT_NONE)
+ , mOriginalFloat(NS_STYLE_FLOAT_NONE)
, mBreakType(NS_STYLE_CLEAR_NONE)
, mBreakInside(NS_STYLE_PAGE_BREAK_AUTO)
, mBreakBefore(false)
, mBreakAfter(false)
, mOverflowX(NS_STYLE_OVERFLOW_VISIBLE)
, mOverflowY(NS_STYLE_OVERFLOW_VISIBLE)
, mOverflowClipBox(NS_STYLE_OVERFLOW_CLIP_BOX_PADDING_BOX)
, mResize(NS_STYLE_RESIZE_NONE)
@@ -2889,18 +2889,18 @@ nsStyleDisplay::nsStyleDisplay(StyleStru
nsStyleDisplay::nsStyleDisplay(const nsStyleDisplay& aSource)
: mBinding(aSource.mBinding)
, mDisplay(aSource.mDisplay)
, mOriginalDisplay(aSource.mOriginalDisplay)
, mContain(aSource.mContain)
, mAppearance(aSource.mAppearance)
, mPosition(aSource.mPosition)
- , mFloats(aSource.mFloats)
- , mOriginalFloats(aSource.mOriginalFloats)
+ , mFloat(aSource.mFloat)
+ , mOriginalFloat(aSource.mOriginalFloat)
, mBreakType(aSource.mBreakType)
, mBreakInside(aSource.mBreakInside)
, mBreakBefore(aSource.mBreakBefore)
, mBreakAfter(aSource.mBreakAfter)
, mOverflowX(aSource.mOverflowX)
, mOverflowY(aSource.mOverflowY)
, mOverflowClipBox(aSource.mOverflowClipBox)
, mResize(aSource.mResize)
@@ -2952,17 +2952,17 @@ nsChangeHint
nsStyleDisplay::CalcDifference(const nsStyleDisplay& aOther) const
{
nsChangeHint hint = nsChangeHint(0);
if (!EqualURIs(mBinding, aOther.mBinding)
|| mPosition != aOther.mPosition
|| mDisplay != aOther.mDisplay
|| mContain != aOther.mContain
- || (mFloats == NS_STYLE_FLOAT_NONE) != (aOther.mFloats == NS_STYLE_FLOAT_NONE)
+ || (mFloat == NS_STYLE_FLOAT_NONE) != (aOther.mFloat == NS_STYLE_FLOAT_NONE)
|| mOverflowX != aOther.mOverflowX
|| mOverflowY != aOther.mOverflowY
|| mScrollBehavior != aOther.mScrollBehavior
|| mScrollSnapTypeX != aOther.mScrollSnapTypeX
|| mScrollSnapTypeY != aOther.mScrollSnapTypeY
|| mScrollSnapPointsX != aOther.mScrollSnapPointsX
|| mScrollSnapPointsY != aOther.mScrollSnapPointsY
|| mScrollSnapDestination != aOther.mScrollSnapDestination
@@ -2990,17 +2990,17 @@ nsStyleDisplay::CalcDifference(const nsS
// |-moz-appearance:textfield| to get a control without a spinner. (The
// spinner is present for |-moz-appearance:number-input| but also other
// values such as 'none'.) We need to reframe since we want to use
// nsTextControlFrame instead of nsNumberControlFrame if the author
// specifies 'textfield'.
return nsChangeHint_ReconstructFrame;
}
- if (mFloats != aOther.mFloats) {
+ if (mFloat != aOther.mFloat) {
// Changing which side we float on doesn't affect descendants directly
hint |= nsChangeHint_AllReflowHints &
~(nsChangeHint_ClearDescendantIntrinsics |
nsChangeHint_NeedDirtyReflow);
}
if (mVerticalAlign != aOther.mVerticalAlign) {
// XXX Can this just be AllReflowHints + RepaintFrame, and be included in
@@ -3134,17 +3134,17 @@ nsStyleDisplay::CalcDifference(const nsS
// notified about every new style context constructed, and it uses
// that opportunity to handle dynamic changes appropriately.
// But we still need to return nsChangeHint_NeutralChange for these
// properties, since some data did change in the style struct.
if (!hint &&
(mOriginalDisplay != aOther.mOriginalDisplay ||
- mOriginalFloats != aOther.mOriginalFloats ||
+ mOriginalFloat != aOther.mOriginalFloat ||
mTransitions != aOther.mTransitions ||
mTransitionTimingFunctionCount !=
aOther.mTransitionTimingFunctionCount ||
mTransitionDurationCount != aOther.mTransitionDurationCount ||
mTransitionDelayCount != aOther.mTransitionDelayCount ||
mTransitionPropertyCount != aOther.mTransitionPropertyCount ||
mAnimations != aOther.mAnimations ||
mAnimationTimingFunctionCount != aOther.mAnimationTimingFunctionCount ||
--- a/layout/style/nsStyleStruct.h
+++ b/layout/style/nsStyleStruct.h
@@ -2508,19 +2508,19 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsSt
RefPtr<mozilla::css::URLValue> mBinding; // [reset]
uint8_t mDisplay; // [reset] see nsStyleConsts.h NS_STYLE_DISPLAY_*
uint8_t mOriginalDisplay; // [reset] saved mDisplay for position:absolute/fixed
// and float:left/right; otherwise equal
// to mDisplay
uint8_t mContain; // [reset] see nsStyleConsts.h NS_STYLE_CONTAIN_*
uint8_t mAppearance; // [reset]
uint8_t mPosition; // [reset] see nsStyleConsts.h
- uint8_t mFloats; // [reset] see nsStyleConsts.h NS_STYLE_FLOAT_*
- uint8_t mOriginalFloats; // [reset] saved mFloats for position:absolute/fixed;
- // otherwise equal to mFloats
+ uint8_t mFloat; // [reset] see nsStyleConsts.h NS_STYLE_FLOAT_*
+ uint8_t mOriginalFloat; // [reset] saved mFloat for position:absolute/fixed;
+ // otherwise equal to mFloat
uint8_t mBreakType; // [reset] see nsStyleConsts.h NS_STYLE_CLEAR_*
uint8_t mBreakInside; // [reset] NS_STYLE_PAGE_BREAK_AUTO/AVOID
bool mBreakBefore; // [reset]
bool mBreakAfter; // [reset]
uint8_t mOverflowX; // [reset] see nsStyleConsts.h
uint8_t mOverflowY; // [reset] see nsStyleConsts.h
uint8_t mOverflowClipBox; // [reset] see nsStyleConsts.h
uint8_t mResize; // [reset] see nsStyleConsts.h
@@ -2632,17 +2632,17 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsSt
NS_STYLE_DISPLAY_TABLE_ROW_GROUP == mDisplay ||
NS_STYLE_DISPLAY_TABLE_HEADER_GROUP == mDisplay ||
NS_STYLE_DISPLAY_TABLE_FOOTER_GROUP == mDisplay ||
NS_STYLE_DISPLAY_TABLE_COLUMN == mDisplay ||
NS_STYLE_DISPLAY_TABLE_COLUMN_GROUP == mDisplay;
}
bool IsFloatingStyle() const {
- return NS_STYLE_FLOAT_NONE != mFloats;
+ return NS_STYLE_FLOAT_NONE != mFloat;
}
bool IsAbsolutelyPositionedStyle() const {
return NS_STYLE_POSITION_ABSOLUTE == mPosition ||
NS_STYLE_POSITION_FIXED == mPosition;
}
bool IsRelativelyPositionedStyle() const {