Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 12:55:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 385516 - "Console is spewed with WARNING: empty langgroup" (Add default constructor to gfxFontStyle and use it) [p=wasti.redl@gmx.net (Sebastian Redl) r=stuart a1.9=damons]

Browse Source
This commit is contained in:
reed@reedloden.com 2008-03-12 03:52:58 -07:00
parent 9d3befe0ca
commit be5cf144bf
5 changed files with 11 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gfx/src/thebes/nsSystemFontsBeOS.cpp
View File

@ -45,21 +45,10 @@
#include "nsIDeviceContext.h"
#include "nsSystemFontsBeOS.h"
#define DEFAULT_PIXEL_FONT_SIZE 16.0f
nsSystemFontsBeOS::nsSystemFontsBeOS()
: mDefaultFontName(NS_LITERAL_STRING("sans-serif"))
, mMenuFontName(NS_LITERAL_STRING("sans-serif"))
, mCaptionFontName(NS_LITERAL_STRING("sans-serif"))
, mDefaultFontStyle(FONT_STYLE_NORMAL, FONT_WEIGHT_NORMAL,
DEFAULT_PIXEL_FONT_SIZE, NS_LITERAL_CSTRING(""),
0.0f, PR_TRUE, PR_FALSE)
, mMenuFontStyle(FONT_STYLE_NORMAL, FONT_WEIGHT_NORMAL,
DEFAULT_PIXEL_FONT_SIZE, NS_LITERAL_CSTRING(""),
0.0f, PR_TRUE, PR_FALSE)
, mCaptionFontStyle(FONT_STYLE_NORMAL, FONT_WEIGHT_NORMAL,
DEFAULT_PIXEL_FONT_SIZE, NS_LITERAL_CSTRING(""),
0.0f, PR_TRUE, PR_FALSE)
{
menu_info info;
get_menu_info(&info);

14
gfx/src/thebes/nsSystemFontsGTK2.cpp
View File

@ -108,25 +108,11 @@ MOZ_pango_font_description_get_size_is_absolute(PangoFontDescription *desc)
}
#endif
#define DEFAULT_PIXEL_FONT_SIZE 16.0f
nsSystemFontsGTK2::nsSystemFontsGTK2()
: mDefaultFontName(NS_LITERAL_STRING("sans-serif"))
, mButtonFontName(NS_LITERAL_STRING("sans-serif"))
, mFieldFontName(NS_LITERAL_STRING("sans-serif"))
, mMenuFontName(NS_LITERAL_STRING("sans-serif"))
, mDefaultFontStyle(FONT_STYLE_NORMAL, FONT_WEIGHT_NORMAL,
DEFAULT_PIXEL_FONT_SIZE, NS_LITERAL_CSTRING(""),
0.0f, PR_TRUE, PR_FALSE)
, mButtonFontStyle(FONT_STYLE_NORMAL, FONT_WEIGHT_NORMAL,
DEFAULT_PIXEL_FONT_SIZE, NS_LITERAL_CSTRING(""),
0.0f, PR_TRUE, PR_FALSE)
, mFieldFontStyle(FONT_STYLE_NORMAL, FONT_WEIGHT_NORMAL,
DEFAULT_PIXEL_FONT_SIZE, NS_LITERAL_CSTRING(""),
0.0f, PR_TRUE, PR_FALSE)
, mMenuFontStyle(FONT_STYLE_NORMAL, FONT_WEIGHT_NORMAL,
DEFAULT_PIXEL_FONT_SIZE, NS_LITERAL_CSTRING(""),
0.0f, PR_TRUE, PR_FALSE)
{
InitPangoLib();

4
gfx/src/thebes/nsThebesDeviceContext.cpp
View File

@ -394,9 +394,7 @@ nsThebesDeviceContext::GetSystemFont(nsSystemFontID aID, nsFont *aFont) const
}
nsString fontName;
gfxFontStyle fontStyle(NS_FONT_STYLE_NORMAL, FONT_WEIGHT_NORMAL, 16.0f,
NS_LITERAL_CSTRING(""), 0.0f, PR_TRUE,
PR_FALSE);
gfxFontStyle fontStyle;
nsresult rv = gSystemFonts->GetSystemFont(aID, &fontName, &fontStyle);
NS_ENSURE_SUCCESS(rv, rv);

1
gfx/thebes/public/gfxFont.h
View File

@ -72,6 +72,7 @@ class gfxFontGroup;
#define FONT_MAX_SIZE 2000.0
struct THEBES_API gfxFontStyle {
gfxFontStyle();
gfxFontStyle(PRUint8 aStyle, PRUint16 aWeight, gfxFloat aSize,
const nsACString& aLangGroup,
float aSizeAdjust, PRPackedBool aSystemFont,

9
gfx/thebes/src/gfxFont.cpp
View File

@ -873,6 +873,15 @@ gfxFontGroup::MakeSpaceTextRun(const Parameters *aParams, PRUint32 aFlags)
return textRun.forget();
}
#define DEFAULT_PIXEL_FONT_SIZE 16.0f
gfxFontStyle::gfxFontStyle() :
style(FONT_STYLE_NORMAL), systemFont(PR_TRUE), familyNameQuirks(PR_FALSE),
weight(FONT_WEIGHT_NORMAL), size(DEFAULT_PIXEL_FONT_SIZE),
langGroup(NS_LITERAL_CSTRING("x-western")), sizeAdjust(0.0f)
{
}
gfxFontStyle::gfxFontStyle(PRUint8 aStyle, PRUint16 aWeight, gfxFloat aSize,
const nsACString& aLangGroup,
float aSizeAdjust, PRPackedBool aSystemFont,