From 13bfbe0e6e910dfd86ea48bdf317f43dbf0ae5b9 Mon Sep 17 00:00:00 2001 From: "bryner%brianryner.com" Date: Wed, 25 Feb 2004 23:15:11 +0000 Subject: [PATCH] Trivial change to not run the nsFont default ctor here. r+sr=dbaron. git-svn-id: svn://10.0.0.236/trunk@153246 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/shared/src/nsStyleStruct.cpp | 7 ++----- mozilla/layout/style/nsStyleStruct.cpp | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) 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); }