r=mkaply, a=blizzard Following suit - removing italicslope from OS/2
This commit is contained in:
Родитель
ca6130489a
Коммит
a26eeb4fab
|
@ -844,13 +844,6 @@ HDC ps = NULL;
|
|||
|
||||
mAveCharWidth = NSToCoordRound( fm.lAveCharWidth * dev2app);
|
||||
|
||||
#ifdef MOZ_MATHML
|
||||
PRInt32 Degrees = fm.sCharSlope >> 7; // 9 bits (-180 .. 180)
|
||||
PRInt32 Minutes = fm.sCharSlope & 0x7F; // 7 bits (0 .. 59)
|
||||
float Angle = (float)Degrees + ((float)Minutes / 60.0f);
|
||||
mItalicSlope = tanf (Angle * 3.141592 / 180.0);
|
||||
#endif
|
||||
|
||||
// Cache the width of a single space.
|
||||
SIZEL size;
|
||||
::GetTextExtentPoint32(ps, " ", 1, &size);
|
||||
|
@ -872,14 +865,6 @@ nsresult nsFontMetricsOS2::GetSpaceWidth(nscoord &aSpaceWidth)
|
|||
}
|
||||
|
||||
// Other metrics
|
||||
#ifdef MOZ_MATHML
|
||||
NS_IMETHODIMP nsFontMetricsOS2::GetItalicSlope(float& aResult)
|
||||
{
|
||||
aResult = mItalicSlope;
|
||||
return NS_OK;
|
||||
}
|
||||
#endif
|
||||
|
||||
NS_IMETHODIMP nsFontMetricsOS2::GetXHeight( nscoord &aResult)
|
||||
{
|
||||
aResult = mXHeight;
|
||||
|
|
|
@ -89,7 +89,6 @@ public:
|
|||
#ifdef MOZ_MATHML
|
||||
virtual nsresult
|
||||
GetBoundingMetrics(HDC aDC,
|
||||
float aItalicSlope,
|
||||
const PRUnichar* aString,
|
||||
PRUint32 aLength,
|
||||
nsBoundingMetrics& aBoundingMetrics) = 0;
|
||||
|
@ -130,9 +129,6 @@ class nsFontMetricsOS2 : public nsIFontMetrics
|
|||
NS_IMETHOD Destroy();
|
||||
|
||||
// Metrics
|
||||
#ifdef MOZ_MATHML
|
||||
NS_IMETHOD GetItalicSlope(float& aResult);
|
||||
#endif
|
||||
NS_IMETHOD GetXHeight( nscoord &aResult);
|
||||
NS_IMETHOD GetSuperscriptOffset( nscoord &aResult);
|
||||
NS_IMETHOD GetSubscriptOffset( nscoord &aResult);
|
||||
|
@ -192,9 +188,6 @@ class nsFontMetricsOS2 : public nsIFontMetrics
|
|||
nscoord mSpaceWidth;
|
||||
nscoord mXHeight;
|
||||
nscoord mAveCharWidth;
|
||||
#ifdef MOZ_MATHML
|
||||
float mItalicSlope;
|
||||
#endif
|
||||
|
||||
nsFontHandleOS2 *mFontHandle;
|
||||
nsDeviceContextOS2 *mDeviceContext;
|
||||
|
|
Загрузка…
Ссылка в новой задаче