Bug 781360 patch 3: Rename {nsIFrame,nsStyleContext,nsComputedDOMStyle}::GetStyle* to Style*, since they can never return null. r=dholbert
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:
@@ -365,7 +365,7 @@ nsRangeFrame::ComputeAutoSize(nsRenderingContext *aRenderingContext,
|
||||
nsSize aMargin, nsSize aBorder,
|
||||
nsSize aPadding, bool aShrinkWrap)
|
||||
{
|
||||
nscoord oneEm = NSToCoordRound(GetStyleFont()->mFont.size *
|
||||
nscoord oneEm = NSToCoordRound(StyleFont()->mFont.size *
|
||||
nsLayoutUtils::FontSizeInflationFor(this)); // 1em
|
||||
|
||||
// frameSizeOverride values just gets us to fall back to being horizontal
|
||||
@@ -416,7 +416,7 @@ nsRangeFrame::GetPrefWidth(nsRenderingContext *aRenderingContext)
|
||||
return 0;
|
||||
}
|
||||
|
||||
nscoord prefWidth = NSToCoordRound(GetStyleFont()->mFont.size *
|
||||
nscoord prefWidth = NSToCoordRound(StyleFont()->mFont.size *
|
||||
nsLayoutUtils::FontSizeInflationFor(this)); // 1em
|
||||
|
||||
if (isHorizontal) {
|
||||
|
||||
Reference in New Issue
Block a user