Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-01 05:48:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 549169 - account for font-size-adjust in DWrite font code. r=bas

Browse Source
This commit is contained in:
Jonathan Kew 2010-03-12 11:57:49 +00:00
parent 2c1322968e
commit 769b6a40c3
2 changed files with 55 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gfx/thebes/public/gfxDWriteFonts.h
View File

@ -64,6 +64,9 @@ public:
virtual PRBool SetupCairoFont(gfxContext *aContext);
virtual PRBool IsValid() { return mFontFace != NULL; }
gfxFloat GetAdjustedSize() const { return mAdjustedSize; }
protected:
friend class gfxDWriteFontGroup;
@ -77,7 +80,8 @@ protected:
cairo_font_face_t *mCairoFontFace;
cairo_scaled_font_t *mCairoScaledFont;
gfxFont::Metrics *mMetrics;
gfxFloat mAdjustedSize;
gfxFont::Metrics mMetrics;
PRBool mNeedsOblique;
};

99
gfx/thebes/src/gfxDWriteFonts.cpp
View File

@ -51,7 +51,7 @@ gfxDWriteFont::gfxDWriteFont(gfxFontEntry *aFontEntry,
const gfxFontStyle *aFontStyle,
PRBool aNeedsBold)
: gfxFont(aFontEntry, aFontStyle)
, mMetrics(nsnull)
, mAdjustedSize(0.0f)
, mCairoFontFace(nsnull)
, mCairoScaledFont(nsnull)
, mNeedsOblique(PR_FALSE)
@ -74,6 +74,8 @@ gfxDWriteFont::gfxDWriteFont(gfxFontEntry *aFontEntry,
rv = fe->CreateFontFace(getter_AddRefs(mFontFace), sims);
ComputeMetrics();
if (NS_FAILED(rv)) {
mIsValid = PR_FALSE;
}
@ -87,7 +89,6 @@ gfxDWriteFont::~gfxDWriteFont()
if (mCairoScaledFont) {
cairo_scaled_font_destroy(mCairoScaledFont);
}
delete mMetrics;
}
nsString
@ -99,90 +100,90 @@ gfxDWriteFont::GetUniqueName()
const gfxFont::Metrics&
gfxDWriteFont::GetMetrics()
{
if (!mMetrics) {
ComputeMetrics();
}
return *mMetrics;
return mMetrics;
}
void
gfxDWriteFont::ComputeMetrics()
{
if (!mMetrics) {
mMetrics = new gfxFont::Metrics;
}
DWRITE_FONT_METRICS fontMetrics;
mFontFace->GetMetrics(&fontMetrics);
mMetrics->xHeight =
if (mStyle.sizeAdjust != 0.0) {
gfxFloat aspect = (gfxFloat)fontMetrics.xHeight /
fontMetrics.designUnitsPerEm;
mAdjustedSize = mStyle.GetAdjustedSize(aspect);
} else {
mAdjustedSize = mStyle.size;
}
mMetrics.xHeight =
((gfxFloat)fontMetrics.xHeight /
fontMetrics.designUnitsPerEm) * mStyle.size;
mMetrics->emAscent =
fontMetrics.designUnitsPerEm) * mAdjustedSize;
mMetrics.emAscent =
((gfxFloat)fontMetrics.ascent /
fontMetrics.designUnitsPerEm) * mStyle.size;
mMetrics->emDescent =
fontMetrics.designUnitsPerEm) * mAdjustedSize;
mMetrics.emDescent =
((gfxFloat)fontMetrics.descent /
fontMetrics.designUnitsPerEm) * mStyle.size;
mMetrics->emHeight = mStyle.size;
mMetrics->maxAscent = mMetrics->emAscent;
mMetrics->maxDescent = mMetrics->emDescent;
mMetrics->maxHeight = mMetrics->emHeight;
mMetrics->maxAdvance = mStyle.size;
mMetrics->internalLeading =
fontMetrics.designUnitsPerEm) * mAdjustedSize;
mMetrics.emHeight = mAdjustedSize;
mMetrics.maxAscent = mMetrics.emAscent;
mMetrics.maxDescent = mMetrics.emDescent;
mMetrics.maxHeight = mMetrics.emHeight;
mMetrics.maxAdvance = mAdjustedSize;
mMetrics.internalLeading =
((gfxFloat)(fontMetrics.ascent +
fontMetrics.descent -
fontMetrics.designUnitsPerEm) /
fontMetrics.designUnitsPerEm) * mStyle.size;
fontMetrics.designUnitsPerEm) * mAdjustedSize;
mMetrics->externalLeading =
mMetrics.externalLeading =
((gfxFloat)fontMetrics.lineGap /
fontMetrics.designUnitsPerEm) * mStyle.size;
fontMetrics.designUnitsPerEm) * mAdjustedSize;
UINT16 glyph = (PRUint16)GetSpaceGlyph();
DWRITE_GLYPH_METRICS metrics;
mFontFace->GetDesignGlyphMetrics(&glyph, 1, &metrics);
mMetrics->spaceWidth =
mMetrics.spaceWidth =
((gfxFloat)metrics.advanceWidth /
fontMetrics.designUnitsPerEm) * mStyle.size;
fontMetrics.designUnitsPerEm) * mAdjustedSize;
UINT32 ucs = L'x';
if (SUCCEEDED(mFontFace->GetGlyphIndicesA(&ucs, 1, &glyph)) &&
SUCCEEDED(mFontFace->GetDesignGlyphMetrics(&glyph, 1, &metrics))) {
mMetrics->aveCharWidth =
mMetrics.aveCharWidth =
((gfxFloat)metrics.advanceWidth /
fontMetrics.designUnitsPerEm) * mStyle.size;
fontMetrics.designUnitsPerEm) * mAdjustedSize;
} else {
// Let's just assume the X is square.
mMetrics->aveCharWidth =
mMetrics.aveCharWidth =
((gfxFloat)fontMetrics.xHeight /
fontMetrics.designUnitsPerEm) * mStyle.size;
fontMetrics.designUnitsPerEm) * mAdjustedSize;
}
ucs = L'0';
if (FAILED(mFontFace->GetGlyphIndicesA(&ucs, 1, &glyph)) &&
SUCCEEDED(mFontFace->GetDesignGlyphMetrics(&glyph, 1, &metrics))) {
mMetrics->zeroOrAveCharWidth =
mMetrics.zeroOrAveCharWidth =
((gfxFloat)metrics.advanceWidth /
fontMetrics.designUnitsPerEm) * mStyle.size;
fontMetrics.designUnitsPerEm) * mAdjustedSize;
} else {
mMetrics->zeroOrAveCharWidth = mMetrics->aveCharWidth;
mMetrics.zeroOrAveCharWidth = mMetrics.aveCharWidth;
}
mMetrics->underlineOffset =
mMetrics.underlineOffset =
((gfxFloat)fontMetrics.underlinePosition /
fontMetrics.designUnitsPerEm) * mStyle.size;
mMetrics->underlineSize =
fontMetrics.designUnitsPerEm) * mAdjustedSize;
mMetrics.underlineSize =
((gfxFloat)fontMetrics.underlineThickness /
fontMetrics.designUnitsPerEm) * mStyle.size;
mMetrics->strikeoutOffset =
fontMetrics.designUnitsPerEm) * mAdjustedSize;
mMetrics.strikeoutOffset =
((gfxFloat)fontMetrics.strikethroughPosition /
fontMetrics.designUnitsPerEm) * mStyle.size;
mMetrics->strikeoutSize =
fontMetrics.designUnitsPerEm) * mAdjustedSize;
mMetrics.strikeoutSize =
((gfxFloat)fontMetrics.strikethroughThickness /
fontMetrics.designUnitsPerEm) * mStyle.size;
mMetrics->subscriptOffset = 0;
mMetrics->subscriptOffset = 0;
fontMetrics.designUnitsPerEm) * mAdjustedSize;
mMetrics.subscriptOffset = 0;
mMetrics.subscriptOffset = 0;
SanitizeMetrics(mMetrics, PR_FALSE);
SanitizeMetrics(&mMetrics, PR_FALSE);
}
PRUint32
@ -232,7 +233,7 @@ gfxDWriteFont::CairoScaledFont()
cairo_matrix_t sizeMatrix;
cairo_matrix_t identityMatrix;
cairo_matrix_init_scale(&sizeMatrix, mStyle.size, mStyle.size);
cairo_matrix_init_scale(&sizeMatrix, mAdjustedSize, mAdjustedSize);
cairo_matrix_init_identity(&identityMatrix);
cairo_font_options_t *fontOptions = cairo_font_options_create();
@ -257,7 +258,7 @@ gfxDWriteFont::CairoScaledFont()
cairo_font_options_destroy(fontOptions);
}
NS_ASSERTION(mStyle.size == 0.0 ||
NS_ASSERTION(mAdjustedSize == 0.0 ||
cairo_scaled_font_status(mCairoScaledFont)
== CAIRO_STATUS_SUCCESS,
"Failed to make scaled font");
@ -436,7 +437,7 @@ trymoreglyphs:
glyphProperties.Elements(),
actualGlyphs,
font->mFontFace,
(float)mStyle.size,
(float)font->GetAdjustedSize(),
FALSE,
FALSE,
&runHead->mScript,