Bug 1264865 - Part 2: Remove trailing whitespaces. r=birtles
MozReview-Commit-ID: AFdXnvmbFfD
--- a/layout/style/nsComputedDOMStyle.cpp
+++ b/layout/style/nsComputedDOMStyle.cpp
@@ -518,17 +518,17 @@ nsComputedDOMStyle::GetStyleContextForEl
// We want to build a list of user/ua rules that is in order from least to
// most important, so we have to reverse the list.
// Integer division to get "stop" is purposeful here: if length is odd, we
// don't have to do anything with the middle element of the array.
for (uint32_t i = 0, length = rules.Length(), stop = length / 2;
i < stop; ++i) {
rules[i].swap(rules[length - i - 1]);
}
-
+
sc = styleSet->AsGecko()->ResolveStyleForRules(parentContext, rules);
}
return sc.forget();
}
nsMargin
nsComputedDOMStyle::GetAdjustedValuesForBoxSizing()
@@ -2234,17 +2234,17 @@ nsComputedDOMStyle::DoGetImageLayerRepea
}
RefPtr<nsROCSSPrimitiveValue> valY;
if (hasContraction) {
valX->SetIdent(nsCSSProps::ValueToKeywordEnum(contraction,
nsCSSProps::kImageLayerRepeatKTable));
} else {
valY = new nsROCSSPrimitiveValue;
-
+
valX->SetIdent(nsCSSProps::ValueToKeywordEnum(xRepeat,
nsCSSProps::kImageLayerRepeatKTable));
valY->SetIdent(nsCSSProps::ValueToKeywordEnum(yRepeat,
nsCSSProps::kImageLayerRepeatKTable));
}
itemList->AppendCSSValue(valX.forget());
if (valY) {
itemList->AppendCSSValue(valY.forget());
@@ -4725,17 +4725,17 @@ nsComputedDOMStyle::DoGetHeight()
if (mInnerFrame) {
calcHeight = true;
const nsStyleDisplay* displayData = StyleDisplay();
if (displayData->mDisplay == NS_STYLE_DISPLAY_INLINE &&
!(mInnerFrame->IsFrameOfType(nsIFrame::eReplaced)) &&
// An outer SVG frame should behave the same as eReplaced in this case
mInnerFrame->GetType() != nsGkAtoms::svgOuterSVGFrame) {
-
+
calcHeight = false;
}
}
if (calcHeight) {
AssertFlushedPendingReflows();
nsMargin adjustedValues = GetAdjustedValuesForBoxSizing();
val->SetAppUnits(mInnerFrame->GetContentRect().height +
@@ -4769,17 +4769,17 @@ nsComputedDOMStyle::DoGetWidth()
if (mInnerFrame) {
calcWidth = true;
const nsStyleDisplay *displayData = StyleDisplay();
if (displayData->mDisplay == NS_STYLE_DISPLAY_INLINE &&
!(mInnerFrame->IsFrameOfType(nsIFrame::eReplaced)) &&
// An outer SVG frame should behave the same as eReplaced in this case
mInnerFrame->GetType() != nsGkAtoms::svgOuterSVGFrame) {
-
+
calcWidth = false;
}
}
if (calcWidth) {
AssertFlushedPendingReflows();
nsMargin adjustedValues = GetAdjustedValuesForBoxSizing();
val->SetAppUnits(mInnerFrame->GetContentRect().width +
--- a/layout/style/nsStyleStruct.cpp
+++ b/layout/style/nsStyleStruct.cpp
@@ -151,17 +151,17 @@ nsStyleFont::nsStyleFont(const nsStyleFo
}
nsStyleFont::nsStyleFont(StyleStructContext aContext)
: nsStyleFont(*aContext.GetDefaultFont(kPresContext_DefaultVariableFont_ID),
aContext)
{
}
-void
+void
nsStyleFont::Destroy(nsPresContext* aContext) {
this->~nsStyleFont();
aContext->PresShell()->
FreeByObjectID(eArenaObjectID_nsStyleFont, this);
}
void
nsStyleFont::EnableZoom(nsPresContext* aContext, bool aEnable)
@@ -267,17 +267,17 @@ nsStyleMargin::nsStyleMargin(StyleStruct
}
nsStyleMargin::nsStyleMargin(const nsStyleMargin& aSrc)
: mMargin(aSrc.mMargin)
{
MOZ_COUNT_CTOR(nsStyleMargin);
}
-void
+void
nsStyleMargin::Destroy(nsPresContext* aContext) {
this->~nsStyleMargin();
aContext->PresShell()->
FreeByObjectID(eArenaObjectID_nsStyleMargin, this);
}
nsChangeHint
nsStyleMargin::CalcDifference(const nsStyleMargin& aNewData) const
@@ -302,17 +302,17 @@ nsStylePadding::nsStylePadding(StyleStru
}
nsStylePadding::nsStylePadding(const nsStylePadding& aSrc)
: mPadding(aSrc.mPadding)
{
MOZ_COUNT_CTOR(nsStylePadding);
}
-void
+void
nsStylePadding::Destroy(nsPresContext* aContext) {
this->~nsStylePadding();
aContext->PresShell()->
FreeByObjectID(eArenaObjectID_nsStylePadding, this);
}
nsChangeHint
nsStylePadding::CalcDifference(const nsStylePadding& aNewData) const
@@ -555,17 +555,17 @@ nsStyleOutline::nsStyleOutline(const nsS
, mActualOutlineWidth(aSrc.mActualOutlineWidth)
, mOutlineColor(aSrc.mOutlineColor)
, mOutlineStyle(aSrc.mOutlineStyle)
, mTwipsPerPixel(aSrc.mTwipsPerPixel)
{
MOZ_COUNT_CTOR(nsStyleOutline);
}
-void
+void
nsStyleOutline::RecalcData()
{
if (NS_STYLE_BORDER_STYLE_NONE == GetOutlineStyle()) {
mActualOutlineWidth = 0;
} else {
MOZ_ASSERT(mOutlineWidth.ConvertsToLength() ||
mOutlineWidth.GetUnit() == eStyleUnit_Enumerated);
// Clamp negative calc() to 0.
@@ -603,25 +603,25 @@ nsStyleOutline::CalcDifference(const nsS
}
return nsChangeHint(0);
}
// --------------------
// nsStyleList
//
-nsStyleList::nsStyleList(StyleStructContext aContext)
+nsStyleList::nsStyleList(StyleStructContext aContext)
: mListStylePosition(NS_STYLE_LIST_STYLE_POSITION_OUTSIDE)
, mCounterStyle(aContext.BuildCounterStyle(NS_LITERAL_STRING("disc")))
{
MOZ_COUNT_CTOR(nsStyleList);
SetQuotesInitial();
}
-nsStyleList::~nsStyleList()
+nsStyleList::~nsStyleList()
{
MOZ_COUNT_DTOR(nsStyleList);
}
nsStyleList::nsStyleList(const nsStyleList& aSource)
: mListStylePosition(aSource.mListStylePosition)
, mCounterStyle(aSource.mCounterStyle)
, mQuotes(aSource.mQuotes)
@@ -3178,20 +3178,20 @@ nsStyleDisplay::CalcDifference(const nsS
if (HasTransformStyle()) {
hint |= transformHint;
} else {
hint |= nsChangeHint_NeutralChange;
}
}
}
- // Note that the HasTransformStyle() != aNewData.HasTransformStyle()
+ // Note that the HasTransformStyle() != aNewData.HasTransformStyle()
// test above handles relevant changes in the
- // NS_STYLE_WILL_CHANGE_TRANSFORM bit, which in turn handles frame
- // reconstruction for changes in the containing block of
+ // NS_STYLE_WILL_CHANGE_TRANSFORM bit, which in turn handles frame
+ // reconstruction for changes in the containing block of
// fixed-positioned elements.
uint8_t willChangeBitsChanged =
mWillChangeBitField ^ aNewData.mWillChangeBitField;
if (willChangeBitsChanged & (NS_STYLE_WILL_CHANGE_STACKING_CONTEXT |
NS_STYLE_WILL_CHANGE_SCROLL |
NS_STYLE_WILL_CHANGE_OPACITY)) {
hint |= nsChangeHint_RepaintFrame;
}