Bug 1345243. Remove support for building without DirectWrite. r=bas

Now that we don't support XP it's reasonable for us to drop support for GDI
fonts and rely solely on DirectWrite. We should start this process by removing
support for building without DirectWrite.
This commit is contained in:
Jeff Muizelaar 2017-03-16 12:43:50 -04:00
Родитель 4ecf8268a9
Коммит 67d7b8af2a
3 изменённых файлов: 8 добавлений и 14 удалений

Просмотреть файл

@ -37,10 +37,9 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
EXPORTS.cairo += [
'cairo-win32.h',
]
if CONFIG['MOZ_ENABLE_DWRITE_FONT']:
SOURCES += [
'cairo-dwrite-font.cpp',
]
SOURCES += [
'cairo-dwrite-font.cpp',
]
if CONFIG['MOZ_ENABLE_D2D_SURFACE']:
SOURCES += [
'cairo-d2d-surface.cpp',

Просмотреть файл

@ -145,6 +145,8 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
'PrintTargetWindows.h',
]
SOURCES += [
'gfxDWriteCommon.cpp',
'gfxDWriteFonts.cpp',
'gfxGDIFont.cpp',
'gfxGDIFontList.cpp',
'gfxWindowsNativeDrawing.cpp',
@ -153,14 +155,9 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
'PrintTargetPDF.cpp',
'PrintTargetWindows.cpp',
]
if CONFIG['MOZ_ENABLE_DWRITE_FONT']:
UNIFIED_SOURCES += [
'gfxDWriteFontList.cpp',
]
SOURCES += [
'gfxDWriteCommon.cpp',
'gfxDWriteFonts.cpp',
]
UNIFIED_SOURCES += [
'gfxDWriteFontList.cpp',
]
# Are we targeting x86 or x64? If so, build gfxAlphaRecoverySSE2.cpp.
if CONFIG['INTEL_ARCHITECTURE']:

Просмотреть файл

@ -4884,7 +4884,6 @@ if test "$MOZ_TREE_CAIRO"; then
WIN32_FONT_FEATURE="#define CAIRO_HAS_WIN32_FONT 1"
WIN32_SURFACE_FEATURE="#define CAIRO_HAS_WIN32_SURFACE 1"
MOZ_ENABLE_D2D_SURFACE=1
MOZ_ENABLE_DWRITE_FONT=1
if test "$COMPILE_ENVIRONMENT"; then
@ -4899,7 +4898,6 @@ if test "$MOZ_TREE_CAIRO"; then
FC_FONT_FEATURE="#define CAIRO_HAS_FC_FONT 1"
fi
AC_SUBST(MOZ_ENABLE_CAIRO_FT)
AC_SUBST(MOZ_ENABLE_DWRITE_FONT)
AC_SUBST(MOZ_ENABLE_D2D_SURFACE)
AC_SUBST(MOZ_ENABLE_D3D10_LAYER)