diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:35:37 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:35:37 +0000 |
commit | a90a5cba08fdf6c0ceb95101c275108a152a3aed (patch) | |
tree | 532507288f3defd7f4dcf1af49698bcb76034855 /gfx/2d/ScaledFontDWrite.cpp | |
parent | Adding debian version 126.0.1-1. (diff) | |
download | firefox-a90a5cba08fdf6c0ceb95101c275108a152a3aed.tar.xz firefox-a90a5cba08fdf6c0ceb95101c275108a152a3aed.zip |
Merging upstream version 127.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'gfx/2d/ScaledFontDWrite.cpp')
-rw-r--r-- | gfx/2d/ScaledFontDWrite.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
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 <vector> -#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<UnscaledFont> UnscaledFontDWrite::CreateFromFontDescriptor( |