From a90a5cba08fdf6c0ceb95101c275108a152a3aed Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 12 Jun 2024 07:35:37 +0200 Subject: Merging upstream version 127.0. Signed-off-by: Daniel Baumann --- gfx/2d/ScaledFontDWrite.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gfx/2d/ScaledFontDWrite.cpp') diff --git a/gfx/2d/ScaledFontDWrite.cpp b/gfx/2d/ScaledFontDWrite.cpp index f6a0d97504..e2dc4390ab 100644 --- a/gfx/2d/ScaledFontDWrite.cpp +++ b/gfx/2d/ScaledFontDWrite.cpp @@ -24,7 +24,7 @@ #include -#include "cairo-win32.h" +#include "cairo-dwrite.h" #include "HelpersWinFonts.h" @@ -696,13 +696,15 @@ cairo_font_face_t* ScaledFontDWrite::CreateCairoFontFace( return nullptr; } - return cairo_dwrite_font_face_create_for_dwrite_fontface(nullptr, mFontFace); + return cairo_dwrite_font_face_create_for_dwrite_fontface(mFontFace); } void ScaledFontDWrite::PrepareCairoScaledFont(cairo_scaled_font_t* aFont) { +#if 0 if (mGDIForced) { cairo_dwrite_scaled_font_set_force_GDI_classic(aFont, true); } +#endif } already_AddRefed UnscaledFontDWrite::CreateFromFontDescriptor( -- cgit v1.2.3