author | Carsten "Tomcat" Book <cbook@mozilla.com> |
Tue, 12 May 2015 12:20:57 +0200 | |
changeset 243525 | c6f0d9ea3c59ecd885e0a7f966d8d9fc00283ec5 |
parent 243524 | 1911efabecd818a871a228c7c429b95a3128451b |
child 243526 | fee8af61e5c2943d46ade73efd1eea5d961a5bae |
push id | 28741 |
push user | kwierso@gmail.com |
push date | Tue, 12 May 2015 23:24:40 +0000 |
treeherder | mozilla-central@d476776d920d [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
bugs | 1056479 |
milestone | 40.0a1 |
backs out | a517a5188e1b864d0af7143e99f6700e19a07aad |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/accessible/base/TextAttrs.cpp +++ b/accessible/base/TextAttrs.cpp @@ -13,20 +13,16 @@ #include "gfxFont.h" #include "nsFontMetrics.h" #include "nsLayoutUtils.h" #include "nsContainerFrame.h" #include "HyperTextAccessible.h" #include "mozilla/AppUnits.h" #include "mozilla/gfx/2D.h" -#if defined(MOZ_WIDGET_GTK) -#include "gfxPlatformGtk.h" // xxx - for UseFcFontList -#endif - using namespace mozilla; using namespace mozilla::a11y; //////////////////////////////////////////////////////////////////////////////// // TextAttrsMgr //////////////////////////////////////////////////////////////////////////////// void @@ -627,40 +623,31 @@ TextAttrsMgr::FontWeightTextAttr:: // When there doesn't exist a bold font in the family and so the rendering of // a non-bold font face is changed so that the user sees what looks like a // bold font, i.e. synthetic bolding is used. IsSyntheticBold method is only // needed on Mac, but it is "safe" to use on all platforms. (For non-Mac // platforms it always return false.) if (font->IsSyntheticBold()) return 700; - bool useFontEntryWeight = true; - - // Under Linux, when gfxPangoFontGroup code is used, - // font->GetStyle()->weight will give the absolute weight requested of the - // font face. The gfxPangoFontGroup code uses the gfxFontEntry constructor - // which doesn't initialize the weight field. -#if defined(MOZ_WIDGET_QT) - useFontEntryWeight = false; -#elif defined(MOZ_WIDGET_GTK) - useFontEntryWeight = gfxPlatformGtk::UseFcFontList(); +#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_QT) + // On Linux, font->GetStyle()->weight will give the absolute weight requested + // of the font face. The Linux code uses the gfxFontEntry constructor which + // doesn't initialize the weight field. + return font->GetStyle()->weight; +#else + // On Windows, font->GetStyle()->weight will give the same weight as + // fontEntry->Weight(), the weight of the first font in the font group, which + // may not be the weight of the font face used to render the characters. + // On Mac, font->GetStyle()->weight will just give the same number as + // getComputedStyle(). fontEntry->Weight() will give the weight of the font + // face used. + gfxFontEntry *fontEntry = font->GetFontEntry(); + return fontEntry->Weight(); #endif - - if (useFontEntryWeight) { - // On Windows, font->GetStyle()->weight will give the same weight as - // fontEntry->Weight(), the weight of the first font in the font group, - // which may not be the weight of the font face used to render the - // characters. On Mac, font->GetStyle()->weight will just give the same - // number as getComputedStyle(). fontEntry->Weight() will give the weight - // of the font face used. - gfxFontEntry *fontEntry = font->GetFontEntry(); - return fontEntry->Weight(); - } else { - return font->GetStyle()->weight; - } } //////////////////////////////////////////////////////////////////////////////// // AutoGeneratedTextAttr //////////////////////////////////////////////////////////////////////////////// TextAttrsMgr::AutoGeneratedTextAttr:: AutoGeneratedTextAttr(HyperTextAccessible* aHyperTextAcc, Accessible* aAccessible) :