wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 841207 - Handle all dominant-baseline values in SVG text layout. r=roc

Browse Source
This commit is contained in:
Cameron McCormack 2013-02-14 12:52:48 +11:00
parent a8b68744f7
commit fdf1a702ad
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
layout/svg/nsSVGTextFrame2.cpp
View File

@ -345,6 +345,13 @@ GetBaselinePosition(nsTextFrame* aFrame,
case NS_STYLE_DOMINANT_BASELINE_HANGING: case NS_STYLE_DOMINANT_BASELINE_HANGING:
case NS_STYLE_DOMINANT_BASELINE_TEXT_BEFORE_EDGE: case NS_STYLE_DOMINANT_BASELINE_TEXT_BEFORE_EDGE:
return 0; return 0;
case NS_STYLE_DOMINANT_BASELINE_USE_SCRIPT:
case NS_STYLE_DOMINANT_BASELINE_NO_CHANGE:
case NS_STYLE_DOMINANT_BASELINE_RESET_SIZE:
// These three should not simply map to 'baseline', but we don't
// support the complex baseline model that SVG 1.1 has and which
// css3-linebox now defines.
// (fall through)
case NS_STYLE_DOMINANT_BASELINE_AUTO: case NS_STYLE_DOMINANT_BASELINE_AUTO:
case NS_STYLE_DOMINANT_BASELINE_ALPHABETIC: case NS_STYLE_DOMINANT_BASELINE_ALPHABETIC:
return aFrame->GetBaseline(); return aFrame->GetBaseline();
@ -360,6 +367,7 @@ GetBaselinePosition(nsTextFrame* aFrame,
return metrics.mAscent + metrics.mDescent; return metrics.mAscent + metrics.mDescent;
case NS_STYLE_DOMINANT_BASELINE_CENTRAL: case NS_STYLE_DOMINANT_BASELINE_CENTRAL:
case NS_STYLE_DOMINANT_BASELINE_MIDDLE: case NS_STYLE_DOMINANT_BASELINE_MIDDLE:
case NS_STYLE_DOMINANT_BASELINE_MATHEMATICAL:
return (metrics.mAscent + metrics.mDescent) / 2.0; return (metrics.mAscent + metrics.mDescent) / 2.0;
} }