diff options
| -rw-r--r-- | gfx/thebes/gfxGDIFontList.cpp | 11 | ||||
| -rwxr-xr-x | gfx/thebes/gfxWindowsPlatform.cpp | 14 |
2 files changed, 6 insertions, 19 deletions
diff --git a/gfx/thebes/gfxGDIFontList.cpp b/gfx/thebes/gfxGDIFontList.cpp index 97a3d36ab..cc047ef38 100644 --- a/gfx/thebes/gfxGDIFontList.cpp +++ b/gfx/thebes/gfxGDIFontList.cpp @@ -862,15 +862,8 @@ gfxGDIFontList::MakePlatformFont(const nsAString& aFontName, gfxWindowsFontType(isCFF ? GFX_FONT_TYPE_PS_OPENTYPE : GFX_FONT_TYPE_TRUETYPE) /*type*/, aStyle, w, aStretch, winUserFontData, false); - if (!fe) - return fe; - - fe->mIsDataUserFont = true; - - // Uniscribe doesn't place CFF fonts loaded privately - // via AddFontMemResourceEx on XP/Vista - if (isCFF && !IsWin7OrLater()) { - fe->mForceGDI = true; + if (fe) { + fe->mIsDataUserFont = true; } return fe; diff --git a/gfx/thebes/gfxWindowsPlatform.cpp b/gfx/thebes/gfxWindowsPlatform.cpp index 54263c8a3..84199170b 100755 --- a/gfx/thebes/gfxWindowsPlatform.cpp +++ b/gfx/thebes/gfxWindowsPlatform.cpp @@ -191,10 +191,6 @@ public: HMODULE gdi32Handle; PFND3DKMTQS queryD3DKMTStatistics = nullptr; - // GPU memory reporting is not available before Windows 7 - if (!IsWin7OrLater()) - return NS_OK; - if ((gdi32Handle = LoadLibrary(TEXT("gdi32.dll")))) queryD3DKMTStatistics = (PFND3DKMTQS)GetProcAddress(gdi32Handle, "D3DKMTQueryStatistics"); @@ -1646,14 +1642,12 @@ gfxWindowsPlatform::InitGPUProcessSupport() "Not using GPU Process since D3D11 is unavailable", NS_LITERAL_CSTRING("FEATURE_FAILURE_NO_D3D11")); } else if (!IsWin7SP1OrLater()) { - // For Windows XP, we simply don't care enough to support this - // configuration. On Windows Vista and 7 Pre-SP1, DXGI 1.2 is not - // available and remote presentation for D3D11 will not work. Rather - // than take a regression and use D3D9, we revert back to in-process - // rendering. + // On Windows 7 Pre-SP1, DXGI 1.2 is not available and remote presentation + // for D3D11 will not work. Rather than take a regression and use D3D9, we + // revert back to in-process rendering. gpuProc.Disable( FeatureStatus::Unavailable, - "Windows XP, Vista, and 7 Pre-SP1 cannot use the GPU process", + "Windows 7 Pre-SP1 cannot use the GPU process", NS_LITERAL_CSTRING("FEATURE_FAILURE_OLD_WINDOWS")); } else if (!IsWin8OrLater()) { // Windows 7 SP1 can have DXGI 1.2 only via the Platform Update, so we |