diff --git a/gfx/thebes/gfxWindowsPlatform.cpp b/gfx/thebes/gfxWindowsPlatform.cpp index 354326e0c3..bd9ba0211b 100644 --- a/gfx/thebes/gfxWindowsPlatform.cpp +++ b/gfx/thebes/gfxWindowsPlatform.cpp @@ -531,9 +531,8 @@ gfxWindowsPlatform::CreatePlatformFontList() { gfxPlatformFontList *pfl; - // bug 630201 - older pre-RTM versions of Direct2D/DirectWrite cause odd - // crashers so blacklist them altogether - if (IsNotWin7PreRTM() && GetDWriteFactory()) { + // DirectWrite is Vista+ + if (IsVistaOrLater() && GetDWriteFactory()) { pfl = new gfxDWriteFontList(); if (NS_SUCCEEDED(pfl->InitFontList())) { return pfl; diff --git a/mfbt/WindowsVersion.h b/mfbt/WindowsVersion.h index abc9ab59ae..62d6074500 100644 --- a/mfbt/WindowsVersion.h +++ b/mfbt/WindowsVersion.h @@ -179,13 +179,6 @@ IsWin11OrLater() return IsWindows10BuildOrLater(WinBuild::Win11RTM); } -MOZ_ALWAYS_INLINE bool -IsNotWin7PreRTM() -{ - return IsWin7SP1OrLater() || !IsWin7OrLater() || - IsWindowsBuildOrLater(7600); -} - MOZ_ALWAYS_INLINE bool IsWin7AndPre2000Compatible() { /*