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

Back out 29e6539961c3 (bug 935056) for re-causing bug 939980

Browse Source
This commit is contained in:
Phil Ringnalda 2013-12-04 23:11:00 -08:00
parent 4a8fb0be2e
commit 29ddeee1e5
4 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
layout/reftests/bugs/935056-1-ref.html
View File

@ -1,10 +0,0 @@
<!DOCTYPE html>
<meta charset=utf-8>
<style>
p { font: 32px serif; }
text { font: 16px serif; }
</style>
<p>This text should be affected by the minimum font size.</p>
<svg width="800" height="40">
<text x="10" y="20">This text should not be affected by the minimum font size.</text>
</svg>

9
layout/reftests/bugs/935056-1.html
View File

@ -1,9 +0,0 @@
<!DOCTYPE html>
<meta charset=utf-8>
<style>
p, text { font: 16px serif; }
</style>
<p>This text should be affected by the minimum font size.</p>
<svg width="800" height="40">
<text x="10" y="20">This text should not be affected by the minimum font size.</text>
</svg>

1
layout/reftests/bugs/reftest.list
View File

@ -1786,4 +1786,3 @@ fuzzy-if(cocoaWidget,1,40) == 928607-1.html 928607-1-ref.html
== 936670-1.svg 936670-1-ref.svg
== 941940-1.html 941940-1-ref.html
fails-if(winWidget&&!d2d) == 942672-1.html 942672-1-ref.html
test-pref(font.minimum-size.x-western,32) == 935056-1.html 935056-1-ref.html

12
layout/style/nsRuleNode.cpp
View File

@ -3109,8 +3109,6 @@ nsRuleNode::SetFont(nsPresContext* aPresContext, nsStyleContext* aContext,
allowZoom = true;
}
aFont->EnableZoom(aPresContext, allowZoom);
} else {
allowZoom = true;
}
// mLanguage must be set before before any of the CalcLengthWith calls
@ -3573,18 +3571,14 @@ nsRuleNode::SetFont(nsPresContext* aPresContext, nsStyleContext* aContext,
nscoord fontSize = aFont->mSize;
// Enforce the user's specified minimum font-size on the value that we
// expose (but don't change font-size:0, since that would unhide hidden
// text).
//
// We don't do this for SVG text, which we can tell from the value of
// -x-text-zoom.
// enforce the user' specified minimum font-size on the value that we expose
// (but don't change font-size:0, since that would unhide hidden text)
if (fontSize > 0) {
nscoord minFontSize = aPresContext->MinFontSize(aFont->mLanguage);
if (minFontSize < 0) {
minFontSize = 0;
}
if (fontSize < minFontSize && !aPresContext->IsChrome() && allowZoom) {
if (fontSize < minFontSize && !aPresContext->IsChrome()) {
// override the minimum font-size constraint
fontSize = minFontSize;
}