diff --git a/mozilla/content/shared/src/nsStyleStruct.cpp b/mozilla/content/shared/src/nsStyleStruct.cpp index 9d5b5610bff..726d3166ec8 100644 --- a/mozilla/content/shared/src/nsStyleStruct.cpp +++ b/mozilla/content/shared/src/nsStyleStruct.cpp @@ -188,12 +188,9 @@ nsStyleFont::nsStyleFont(const nsStyleFont& aSrc) nsStyleFont::nsStyleFont(nsIPresContext* aPresContext) - : mFlags(NS_STYLE_FONT_DEFAULT) + : mFlags(NS_STYLE_FONT_DEFAULT), + mFont(*(aPresContext->GetDefaultFont(kPresContext_DefaultVariableFont_ID))) { - const nsFont* defaultFont = - aPresContext->GetDefaultFont(kPresContext_DefaultVariableFont_ID); - - mFont = *defaultFont; mSize = mFont.size = nsStyleFont::ZoomText(aPresContext, mFont.size); } diff --git a/mozilla/layout/style/nsStyleStruct.cpp b/mozilla/layout/style/nsStyleStruct.cpp index 9d5b5610bff..726d3166ec8 100644 --- a/mozilla/layout/style/nsStyleStruct.cpp +++ b/mozilla/layout/style/nsStyleStruct.cpp @@ -188,12 +188,9 @@ nsStyleFont::nsStyleFont(const nsStyleFont& aSrc) nsStyleFont::nsStyleFont(nsIPresContext* aPresContext) - : mFlags(NS_STYLE_FONT_DEFAULT) + : mFlags(NS_STYLE_FONT_DEFAULT), + mFont(*(aPresContext->GetDefaultFont(kPresContext_DefaultVariableFont_ID))) { - const nsFont* defaultFont = - aPresContext->GetDefaultFont(kPresContext_DefaultVariableFont_ID); - - mFont = *defaultFont; mSize = mFont.size = nsStyleFont::ZoomText(aPresContext, mFont.size); }