Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 06:11:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset b6d407af386f for causing bug 503718 on Windows

Browse Source
This commit is contained in:
Jonathan Kew 2009-07-15 11:04:00 +01:00
parent 1e7b94c8cd
commit 1bd592f93d
5 changed files with 2 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gfx/thebes/src/gfxWindowsFonts.cpp
View File

@ -1137,24 +1137,8 @@ gfxWindowsFont::Measure(gfxTextRun *aTextRun,
}
}
gfxFont::RunMetrics metrics = gfxFont::Measure(aTextRun, aStart, aEnd,
aBoundingBoxType, aRefContext,
aSpacing);
// if aBoundingBoxType is LOOSE_INK_EXTENTS
// and the underlying cairo font may be antialiased,
// we can't trust Windows to have considered all the pixels
// so we need to add "padding" to the bounds.
// (see bugs 475968, 439831, compare also bug 445087)
if (aBoundingBoxType == LOOSE_INK_EXTENTS &&
mAntialiasOption != CAIRO_ANTIALIAS_NONE &&
metrics.mBoundingBox.size.width > 0) {
const PRUint32 appUnitsPerDevUnit = aTextRun->GetAppUnitsPerDevUnit();
metrics.mBoundingBox.pos.x -= appUnitsPerDevUnit;
metrics.mBoundingBox.size.width += 3 * appUnitsPerDevUnit;
}
return metrics;
return gfxFont::Measure(aTextRun, aStart, aEnd,
aBoundingBoxType, aRefContext, aSpacing);
}
FontEntry*

5
layout/reftests/bugs/308406-1-ref.html
View File

@ -1,10 +1,5 @@
<!DOCTYPE html>
<html>
<head>
<style type="text/css">
td { padding: 3px; }
</style>
</head>
<body>
<table>
<tbody style="height:200px; overflow:auto;">

5
layout/reftests/bugs/308406-1.html
View File

@ -1,10 +1,5 @@
<!DOCTYPE html>
<html>
<head>
<style type="text/css">
td { padding: 3px; }
</style>
</head>
<body>
<table>
<tbody style="height:200px;">

5
layout/reftests/bugs/308406-2-ref.html
View File

@ -1,9 +1,4 @@
<html>
<head>
<style type="text/css">
td { padding: 3px; }
</style>
</head>
<body>
<table>
<tbody style="height:200px; overflow:auto;">

5
layout/reftests/bugs/308406-2.html
View File

@ -1,9 +1,4 @@
<html>
<head>
<style type="text/css">
td { padding: 3px; }
</style>
</head>
<body>
<table>
<tbody style="height:200px;">