wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 752380 - Directly using enums from a namespace (a:🅱️:enum::value) is a c++11 feature, add 'using namespace a::b;' to workaround it. r=Bas

Browse Source
This commit is contained in:
Landry Breuil 2012-05-24 18:45:10 -04:00
parent bac7888148
commit dbfb7e8132
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gfx/thebes/gfxFT2FontBase.cpp
View File

@ -7,6 +7,8 @@
#include "gfxFT2Utils.h"
#include "harfbuzz/hb.h"
using namespace mozilla::gfx;
gfxFT2FontBase::gfxFT2FontBase(cairo_scaled_font_t *aScaledFont,
gfxFontEntry *aFontEntry,
const gfxFontStyle *aFontStyle)
@ -231,15 +233,15 @@ gfxFT2FontBase::ConstructFontOptions()
const gfxFontStyle* style = this->GetStyle();
if (style->style == NS_FONT_STYLE_ITALIC) {
if (style->weight == NS_FONT_WEIGHT_BOLD) {
mFontOptions.mStyle = mozilla::gfx::FontStyle::FONT_STYLE_BOLD_ITALIC;
mFontOptions.mStyle = FONT_STYLE_BOLD_ITALIC;
} else {
mFontOptions.mStyle = mozilla::gfx::FontStyle::FONT_STYLE_ITALIC;
mFontOptions.mStyle = FONT_STYLE_ITALIC;
}
} else {
if (style->weight == NS_FONT_WEIGHT_BOLD) {
mFontOptions.mStyle = mozilla::gfx::FontStyle::FONT_STYLE_BOLD;
mFontOptions.mStyle = FONT_STYLE_BOLD;
} else {
mFontOptions.mStyle = mozilla::gfx::FontStyle::FONT_STYLE_NORMAL;
mFontOptions.mStyle = FONT_STYLE_NORMAL;
}
}
}