Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 07:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 581652145f1b (bug 1376026)

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2017-07-06 08:11:47 +02:00
parent 6969a898fd
commit cd6ff28835
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gfx/thebes/gfxWindowsPlatform.cpp
View File

@ -355,7 +355,7 @@ gfxWindowsPlatform::InitAcceleration()
UpdateRenderMode();
// If we have Skia and we didn't init dwrite already, do it now.
if (!DWriteEnabled() && GetDefaultContentBackend() == BackendType::SKIA) {
if (!DWriteAvailable() && GetDefaultContentBackend() == BackendType::SKIA) {
InitDWriteSupport();
}
@ -491,7 +491,7 @@ gfxWindowsPlatform::CreatePlatformFontList()
// bug 630201 - older pre-RTM versions of Direct2D/DirectWrite cause odd
// crashers so blacklist them altogether
if (IsNotWin7PreRTM() && DWriteEnabled()) {
if (IsNotWin7PreRTM() && DWriteAvailable()) {
pfl = new gfxDWriteFontList();
if (NS_SUCCEEDED(pfl->InitFontList())) {
return pfl;
@ -1103,7 +1103,7 @@ gfxWindowsPlatform::FontsPrefsChanged(const char *aPref)
void
gfxWindowsPlatform::SetupClearTypeParams()
{
if (DWriteEnabled()) {
if (DWriteAvailable()) {
// any missing prefs will default to invalid (-1) and be ignored;
// out-of-range values will also be ignored
FLOAT gamma = -1.0;
@ -1526,7 +1526,7 @@ gfxWindowsPlatform::InitializeD2D()
}
// Using Direct2D depends on DWrite support.
if (!DWriteEnabled() && !InitDWriteSupport()) {
if (!DWriteAvailable() && !InitDWriteSupport()) {
d2d1.SetFailed(FeatureStatus::Failed, "Failed to initialize DirectWrite support",
NS_LITERAL_CSTRING("FEATURE_FAILURE_D2D_DWRITE"));
return;

2
gfx/thebes/gfxWindowsPlatform.h
View File

@ -192,7 +192,7 @@ public:
void SetupClearTypeParams();
inline bool DWriteEnabled() const { return !!mozilla::gfx::Factory::GetDWriteFactory(); }
inline bool DWriteAvailable() const { return !!mozilla::gfx::Factory::GetDWriteFactory(); }
inline DWRITE_MEASURING_MODE DWriteMeasuringMode() { return mMeasuringMode; }
IDWriteRenderingParams *GetRenderingParams(TextRenderingMode aRenderMode)