Continuing nsIPresContext deCOMtamination (bug 229371). Remove ReParentStyleContext - callers can call frame manager directly. Removed several unused setters. Inlined getters for default colors, font scaler, and focus ring width. Changed GetDefaultFont to return a const nsFont*. r+sr=dbaron.
git-svn-id: svn://10.0.0.236/trunk@152127 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -190,9 +190,9 @@ nsStyleFont::nsStyleFont(const nsStyleFont& aSrc)
|
||||
nsStyleFont::nsStyleFont(nsIPresContext* aPresContext)
|
||||
: mFlags(NS_STYLE_FONT_DEFAULT)
|
||||
{
|
||||
const nsFont* defaultFont;
|
||||
aPresContext->GetDefaultFont(kPresContext_DefaultVariableFont_ID,
|
||||
&defaultFont);
|
||||
const nsFont* defaultFont =
|
||||
aPresContext->GetDefaultFont(kPresContext_DefaultVariableFont_ID);
|
||||
|
||||
mFont = *defaultFont;
|
||||
mSize = mFont.size = nsStyleFont::ZoomText(aPresContext, mFont.size);
|
||||
}
|
||||
@@ -943,7 +943,7 @@ nsChangeHint nsStyleTableBorder::CalcDifference(const nsStyleTableBorder& aOther
|
||||
|
||||
nsStyleColor::nsStyleColor(nsIPresContext* aPresContext)
|
||||
{
|
||||
aPresContext->GetDefaultColor(&mColor);
|
||||
mColor = aPresContext->DefaultColor();
|
||||
}
|
||||
|
||||
nsStyleColor::nsStyleColor(const nsStyleColor& aSource)
|
||||
@@ -970,7 +970,7 @@ nsStyleBackground::nsStyleBackground(nsIPresContext* aPresContext)
|
||||
mBackgroundOrigin(NS_STYLE_BG_ORIGIN_PADDING),
|
||||
mBackgroundRepeat(NS_STYLE_BG_REPEAT_XY)
|
||||
{
|
||||
aPresContext->GetDefaultBackgroundColor(&mBackgroundColor);
|
||||
mBackgroundColor = aPresContext->DefaultBackgroundColor();
|
||||
}
|
||||
|
||||
nsStyleBackground::nsStyleBackground(const nsStyleBackground& aSource)
|
||||
|
||||
Reference in New Issue
Block a user