Bug 1345243. Remove support for building without DirectWrite. r=bas
authorJeff Muizelaar <jmuizelaar@mozilla.com>
Thu, 16 Mar 2017 12:43:50 -0400
changeset 348316 759381469dbaa108a24a97896c760f45c7e62a74
parent 348315 d70f85b48971f442dd65c3016be6867b577903ef
child 348317 df0f179a8a9c0755b85e480334601b24069facf9
push id31518
push userarchaeopteryx@coole-files.de
push dateSat, 18 Mar 2017 15:25:21 +0000
treeherdermozilla-central@e1576dd8bd9d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbas
bugs1345243
milestone55.0a1
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
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.
gfx/cairo/cairo/src/moz.build
gfx/thebes/moz.build
old-configure.in
--- a/gfx/cairo/cairo/src/moz.build
+++ b/gfx/cairo/cairo/src/moz.build
@@ -32,20 +32,19 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] not in (
         'cairo-type1-fallback.c',
         'cairo-type3-glyph-surface.c',
     ]
 
 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',
         ]
     SOURCES += [
         'cairo-win32-font.c',
         'cairo-win32-surface.c',
     ]
--- a/gfx/thebes/moz.build
+++ b/gfx/thebes/moz.build
@@ -140,32 +140,29 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wi
         'gfxWindowsPlatform.h',
         'gfxWindowsSurface.h',
     ]
     EXPORTS.mozilla.gfx += [
         'PrintTargetPDF.h',
         'PrintTargetWindows.h',
     ]
     SOURCES += [
+        'gfxDWriteCommon.cpp',
+        'gfxDWriteFonts.cpp',
         'gfxGDIFont.cpp',
         'gfxGDIFontList.cpp',
         'gfxWindowsNativeDrawing.cpp',
         'gfxWindowsPlatform.cpp',
         'gfxWindowsSurface.cpp',
         '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']:
     SOURCES += ['gfxAlphaRecoverySSE2.cpp']
     # The file uses SSE2 intrinsics, so it needs special compile flags on some
     # compilers.
     SOURCES['gfxAlphaRecoverySSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
 
--- a/old-configure.in
+++ b/old-configure.in
@@ -4879,32 +4879,30 @@ if test "$MOZ_TREE_CAIRO"; then
         QUARTZ_FONT_FEATURE="#define CAIRO_HAS_QUARTZ_FONT 1"
         ;;
       windows)
         WIN32_D2D_SURFACE_FEATURE="#define CAIRO_HAS_D2D_SURFACE 1"
         WIN32_DWRITE_FONT_FEATURE="#define CAIRO_HAS_DWRITE_FONT 1"
         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
 
           dnl D3D10 Layers depend on D2D Surfaces.
           if test -n "$WIN32_D2D_SURFACE_FEATURE"; then
             MOZ_CHECK_HEADER(d3d10.h, MOZ_ENABLE_D3D10_LAYER=1)
           fi
         fi
         ;;
     esac
     if test "$USE_FC_FREETYPE"; 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)
 
     AC_SUBST(PS_SURFACE_FEATURE)
     AC_SUBST(SVG_SURFACE_FEATURE)
     AC_SUBST(XLIB_SURFACE_FEATURE)
     AC_SUBST(XLIB_XRENDER_SURFACE_FEATURE)
     AC_SUBST(QUARTZ_SURFACE_FEATURE)