corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 781360 patch 3: Rename {nsIFrame,nsStyleContext,nsComputedDOMStyle}::GetStyle* to Style*, since they can never return null. r=dholbert

Browse Source 
Except for the changes in:
  layout/generic/nsIFrame.h (part)
  layout/style/nsComputedDOMStyle.h (all)
  layout/style/nsRuleNode.cpp (part)
  layout/style/nsStyleContext.cpp (part)
  layout/style/nsStyleContext.h (part)
(see patch 3b in the bug), this patch was written with the sed script:
s/\<GetStyle\(Font\|Color\|List\|Text\|Visibility\|Quotes\|UserInterface\|TableBorder\|SVG\|Background\|Position\|TextReset\|Display\|Content\|UIReset\|Table\|Margin\|Padding\|Border\|Outline\|XUL\|SVGReset\|Column\)\>/Style\1/g
This commit is contained in:
L. David Baron
2013-02-16 13:51:02 -08:00
parent aac304acbb
commit ca6c366dc6
156 changed files with 1186 additions and 1186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
layout/generic/nsHTMLReflowState.cpp
View File

@@ -104,7 +104,7 @@ FontSizeInflationListMarginAdjustment(const nsIFrame* aFrame)
float inflation = nsLayoutUtils::FontSizeInflationFor(aFrame);
if (aFrame->IsFrameOfType(nsIFrame::eBlockFrame)) {
const nsBlockFrame* blockFrame = static_cast<const nsBlockFrame*>(aFrame);
const nsStyleList* styleList = aFrame->GetStyleList();
const nsStyleList* styleList = aFrame->StyleList();
// We only want to adjust the margins if we're dealing with an ordered
// list.
@@ -300,13 +300,13 @@ nsHTMLReflowState::Init(nsPresContext* aPresContext,
"very large sizes, not attempts at intrinsic width "
"calculation");
mStylePosition = frame->GetStylePosition();
mStyleDisplay = frame->GetStyleDisplay();
mStyleVisibility = frame->GetStyleVisibility();
mStyleBorder = frame->GetStyleBorder();
mStyleMargin = frame->GetStyleMargin();
mStylePadding = frame->GetStylePadding();
mStyleText = frame->GetStyleText();
mStylePosition = frame->StylePosition();
mStyleDisplay = frame->StyleDisplay();
mStyleVisibility = frame->StyleVisibility();
mStyleBorder = frame->StyleBorder();
mStyleMargin = frame->StyleMargin();
mStylePadding = frame->StylePadding();
mStyleText = frame->StyleText();
nsIAtom* type = frame->GetType();
@@ -322,7 +322,7 @@ nsHTMLReflowState::Init(nsPresContext* aPresContext,
if (parent &&
(parent->GetStateBits() & NS_FRAME_IN_CONSTRAINED_HEIGHT) &&
!(parent->GetType() == nsGkAtoms::scrollFrame &&
parent->GetStyleDisplay()->mOverflowY != NS_STYLE_OVERFLOW_HIDDEN)) {
parent->StyleDisplay()->mOverflowY != NS_STYLE_OVERFLOW_HIDDEN)) {
frame->AddStateBits(NS_FRAME_IN_CONSTRAINED_HEIGHT);
} else if (type == nsGkAtoms::svgForeignObjectFrame) {
// An SVG foreignObject frame is inherently constrained height.
@@ -340,7 +340,7 @@ nsHTMLReflowState::Init(nsPresContext* aPresContext,
// http://www.w3.org/TR/CSS21/visudet.html#the-height-property
nsIFrame* containingBlk = frame;
while (containingBlk) {
const nsStylePosition* stylePos = containingBlk->GetStylePosition();
const nsStylePosition* stylePos = containingBlk->StylePosition();
if ((stylePos->mHeight.IsCoordPercentCalcUnit() &&
!stylePos->mHeight.HasPercent()) ||
(stylePos->mMaxHeight.IsCoordPercentCalcUnit() &&
@@ -662,10 +662,10 @@ nsHTMLReflowState::InitFrameType(nsIAtom* aFrameType)
return;
}
NS_ASSERTION(frame->GetStyleDisplay()->IsAbsolutelyPositionedStyle() ==
NS_ASSERTION(frame->StyleDisplay()->IsAbsolutelyPositionedStyle() ==
disp->IsAbsolutelyPositionedStyle(),
"Unexpected position style");
NS_ASSERTION(frame->GetStyleDisplay()->IsFloatingStyle() ==
NS_ASSERTION(frame->StyleDisplay()->IsFloatingStyle() ==
disp->IsFloatingStyle(), "Unexpected float style");
if (frame->GetStateBits() & NS_FRAME_OUT_OF_FLOW) {
if (disp->IsAbsolutelyPositioned(frame)) {
@@ -741,7 +741,7 @@ nsHTMLReflowState::ComputeRelativeOffsets(uint8_t aCBDirection,
nscoord aContainingBlockHeight,
nsMargin& aComputedOffsets)
{
const nsStylePosition* position = aFrame->GetStylePosition();
const nsStylePosition* position = aFrame->StylePosition();
// Compute the 'left' and 'right' values. 'Left' moves the boxes to the right,
// and 'right' moves the boxes to the left. The computed values are always:
@@ -1086,7 +1086,7 @@ nsHTMLReflowState::CalculateHypotheticalBox(nsPresContext* aPresContext,
}
// Get the 'direction' of the block
const nsStyleVisibility* blockVis = aContainingBlock->GetStyleVisibility();
const nsStyleVisibility* blockVis = aContainingBlock->StyleVisibility();
// Get the placeholder x-offset and y-offset in the coordinate
// space of its containing block
@@ -1327,7 +1327,7 @@ nsHTMLReflowState::InitAbsoluteConstraints(nsPresContext* aPresContext,
// Use the direction of the original ("static-position") containing block
// to dictate whether 'left' or 'right' is treated like 'static-position'.
if (NS_STYLE_DIRECTION_LTR == placeholderFrame->GetContainingBlock()
->GetStyleVisibility()->mDirection) {
->StyleVisibility()->mDirection) {
NS_ASSERTION(hypotheticalBox.mLeftIsExact, "should always have "
"exact value on containing block's start side");
mComputedOffsets.left = hypotheticalBox.mLeft;
@@ -1802,7 +1802,7 @@ IsSideCaption(nsIFrame* aFrame, const nsStyleDisplay* aStyleDisplay)
{
if (aStyleDisplay->mDisplay != NS_STYLE_DISPLAY_TABLE_CAPTION)
return false;
uint8_t captionSide = aFrame->GetStyleTableBorder()->mCaptionSide;
uint8_t captionSide = aFrame->StyleTableBorder()->mCaptionSide;
return captionSide == NS_STYLE_CAPTION_SIDE_LEFT ||
captionSide == NS_STYLE_CAPTION_SIDE_RIGHT;
}
@@ -2086,7 +2086,7 @@ nsHTMLReflowState::InitConstraints(nsPresContext* aPresContext,
// Check for blinking text and permission to display it
mFlags.mBlinks = (parentReflowState && parentReflowState->mFlags.mBlinks);
if (!mFlags.mBlinks && BlinkIsAllowed()) {
const nsStyleTextReset* st = frame->GetStyleTextReset();
const nsStyleTextReset* st = frame->StyleTextReset();
mFlags.mBlinks = (st->mTextBlink != NS_STYLE_TEXT_BLINK_NONE);
}
}
@@ -2136,7 +2136,7 @@ nsCSSOffsetState::InitOffsets(nscoord aContainingBlockWidth,
mComputedMargin);
const nsStyleDisplay *disp = frame->GetStyleDisplay();
const nsStyleDisplay *disp = frame->StyleDisplay();
bool isThemed = frame->IsThemed(disp);
bool needPaddingProp;
nsIntMargin widget;
@@ -2156,7 +2156,7 @@ nsCSSOffsetState::InitOffsets(nscoord aContainingBlockWidth,
}
else if (aPadding) { // padding is an input arg
mComputedPadding = *aPadding;
needPaddingProp = frame->GetStylePadding()->IsWidthDependent();
needPaddingProp = frame->StylePadding()->IsWidthDependent();
}
else {
needPaddingProp = ComputePadding(aContainingBlockWidth, aFrameType);
@@ -2183,7 +2183,7 @@ nsCSSOffsetState::InitOffsets(nscoord aContainingBlockWidth,
mComputedBorderPadding = *aBorder;
}
else {
mComputedBorderPadding = frame->GetStyleBorder()->GetComputedBorder();
mComputedBorderPadding = frame->StyleBorder()->GetComputedBorder();
}
mComputedBorderPadding += mComputedPadding;
@@ -2356,7 +2356,7 @@ ComputeLineHeight(nsStyleContext* aStyleContext,
nscoord aBlockHeight,
float aFontSizeInflation)
{
const nsStyleCoord& lhCoord = aStyleContext->GetStyleText()->mLineHeight;
const nsStyleCoord& lhCoord = aStyleContext->StyleText()->mLineHeight;
if (lhCoord.GetUnit() == eStyleUnit_Coord) {
nscoord result = lhCoord.GetCoordValue();
@@ -2371,7 +2371,7 @@ ComputeLineHeight(nsStyleContext* aStyleContext,
// is found by multiplying the factor by the font's computed size
// (adjusted for min-size prefs and text zoom).
return NSToCoordRound(lhCoord.GetFactorValue() * aFontSizeInflation *
aStyleContext->GetStyleFont()->mFont.size);
aStyleContext->StyleFont()->mFont.size);
NS_ASSERTION(lhCoord.GetUnit() == eStyleUnit_Normal ||
lhCoord.GetUnit() == eStyleUnit_Enumerated,
@@ -2427,7 +2427,7 @@ nsCSSOffsetState::ComputeMargin(nscoord aContainingBlockWidth)
}
// If style style can provide us the margin directly, then use it.
const nsStyleMargin *styleMargin = frame->GetStyleMargin();
const nsStyleMargin *styleMargin = frame->StyleMargin();
bool isWidthDependent = !styleMargin->GetMargin(mComputedMargin);
if (isWidthDependent) {
// We have to compute the value
@@ -2453,7 +2453,7 @@ nsCSSOffsetState::ComputeMargin(nscoord aContainingBlockWidth)
nscoord marginAdjustment = FontSizeInflationListMarginAdjustment(frame);
if (marginAdjustment > 0) {
const nsStyleVisibility* visibility = frame->GetStyleVisibility();
const nsStyleVisibility* visibility = frame->StyleVisibility();
if (visibility->mDirection == NS_STYLE_DIRECTION_RTL) {
mComputedMargin.right = mComputedMargin.right + marginAdjustment;
} else {
@@ -2468,7 +2468,7 @@ bool
nsCSSOffsetState::ComputePadding(nscoord aContainingBlockWidth, nsIAtom* aFrameType)
{
// If style can provide us the padding directly, then use it.
const nsStylePadding *stylePadding = frame->GetStylePadding();
const nsStylePadding *stylePadding = frame->StylePadding();
bool isWidthDependent = !stylePadding->GetPadding(mComputedPadding);
// a table row/col group, row/col doesn't have padding
// XXXldb Neither do border-collapse tables.