Skip to content

Initial DirectWrite support #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
szKarlen wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Initial DirectWrite support #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Source/WebCore/platform/graphics/win/FontCustomPlatformDataCairo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, b

auto hfont = adoptGDIObject(::CreateFontIndirect(&logFont));

cairo_font_face_t* fontFace = cairo_win32_font_face_create_for_hfont(hfont.get());
cairo_font_face_t* fontFace = cairo_dwrite_font_face_create_for_hfont(hfont.get());

FontPlatformData fontPlatformData(WTF::move(hfont), fontFace, size, bold, italic);

Expand Down
2 changes: 1 addition & 1 deletion Source/WebCore/platform/graphics/win/FontPlatformDataCairoWin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ namespace WebCore {

void FontPlatformData::platformDataInit(HFONT font, float size, HDC hdc, WCHAR* faceName)
{
cairo_font_face_t* fontFace = cairo_win32_font_face_create_for_hfont(font);
cairo_font_face_t* fontFace = cairo_dwrite_font_face_create_for_hfont(font);

cairo_matrix_t sizeMatrix, ctm;
cairo_matrix_init_identity(&ctm);
Expand Down
60 changes: 46 additions & 14 deletions Source/WebCore/platform/graphics/win/SimpleFontDataCairoWin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
#include <cairo-win32.h>
#include <mlang.h>
#include <wtf/MathExtras.h>
#include <dwrite.h>

namespace WebCore {

Expand Down Expand Up @@ -68,21 +69,34 @@ void SimpleFontData::platformInit()
cairo_scaled_font_t* scaledFont = m_platformData.scaledFont();
const double metricsMultiplier = cairo_win32_scaled_font_get_metrics_factor(scaledFont) * m_platformData.size();

cairo_win32_scaled_font_select_font(scaledFont, dc);
IDWriteFontFace* dwriteFontFace = (IDWriteFontFace*)cairo_dwrite_font_face_get(scaledFont);

cairo_font_face_t* win32fontface = cairo_logfontw_font_face_create_for_dwrite(scaledFont);
cairo_matrix_t sizeMatrix, ctm;
cairo_matrix_init_identity(&ctm);
cairo_matrix_init_scale(&sizeMatrix, m_platformData.size(), m_platformData.size());

static cairo_font_options_t* fontOptions = 0;
if (!fontOptions) {
fontOptions = cairo_font_options_create();
cairo_font_options_set_antialias(fontOptions, CAIRO_ANTIALIAS_SUBPIXEL);
}

cairo_scaled_font_t* win32font = cairo_scaled_font_create(win32fontface, &sizeMatrix, &ctm, fontOptions);
cairo_font_face_destroy(win32fontface);

TEXTMETRIC textMetrics;
GetTextMetrics(dc, &textMetrics);
float ascent = textMetrics.tmAscent * metricsMultiplier;
float descent = textMetrics.tmDescent * metricsMultiplier;
float xHeight = ascent * 0.56f; // Best guess for xHeight for non-Truetype fonts.
float lineGap = textMetrics.tmExternalLeading * metricsMultiplier;
cairo_win32_scaled_font_select_font(win32font, dc);

int faceLength = ::GetTextFace(dc, 0, 0);
Vector<WCHAR> faceName(faceLength);
::GetTextFace(dc, faceLength, faceName.data());
m_isSystemFont = !wcscmp(faceName.data(), L"Lucida Grande");

ascent = ascentConsideringMacAscentHack(faceName.data(), ascent, descent);
TEXTMETRIC textMetrics;
GetTextMetrics(dc, &textMetrics);

DWRITE_FONT_METRICS dwriteFontMetrics;
dwriteFontFace->GetMetrics(&dwriteFontMetrics);

float ascent = ((FLOAT)dwriteFontMetrics.ascent / dwriteFontMetrics.designUnitsPerEm) * metricsMultiplier;
float descent = ((FLOAT)dwriteFontMetrics.descent / dwriteFontMetrics.designUnitsPerEm) * metricsMultiplier;
float xHeight = ((FLOAT)dwriteFontMetrics.xHeight / dwriteFontMetrics.designUnitsPerEm) * metricsMultiplier;
float lineGap = ((FLOAT)dwriteFontMetrics.lineGap / dwriteFontMetrics.designUnitsPerEm) * metricsMultiplier;

m_fontMetrics.setAscent(ascent);
m_fontMetrics.setDescent(descent);
Expand All @@ -97,7 +111,8 @@ void SimpleFontData::platformInit()

m_fontMetrics.setXHeight(xHeight);
cairo_win32_scaled_font_done_font(scaledFont);

cairo_win32_scaled_font_done_font(win32font);

m_scriptCache = 0;
m_scriptFontProperties = 0;

Expand All @@ -120,6 +135,7 @@ float SimpleFontData::platformWidthForGlyph(Glyph glyph) const
if (!m_platformData.size())
return 0;

/*
HWndDC dc(0);
SaveDC(dc);

Expand All @@ -135,6 +151,22 @@ float SimpleFontData::platformWidthForGlyph(Glyph glyph) const

const double metricsMultiplier = cairo_win32_scaled_font_get_metrics_factor(scaledFont) * m_platformData.size();
return width * metricsMultiplier;
*/
cairo_scaled_font_t* scaledFont = m_platformData.scaledFont();

const double metricsMultiplier = cairo_win32_scaled_font_get_metrics_factor(scaledFont) * m_platformData.size();

IDWriteFontFace* dwriteFontFace = (IDWriteFontFace*)cairo_dwrite_font_face_get(scaledFont);

DWRITE_FONT_METRICS dwriteFontMetrics;
dwriteFontFace->GetMetrics(&dwriteFontMetrics);

DWRITE_GLYPH_METRICS metrics;
dwriteFontFace->GetDesignGlyphMetrics(&glyph, 1, &metrics);

float width = (FLOAT)metrics.advanceWidth / dwriteFontMetrics.designUnitsPerEm;

return width * metricsMultiplier;
}

}