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

Back out bug 935056 (rev d39a3544a287) on suspicion of causing bug 939980.

Browse Source
This commit is contained in:
Cameron McCormack 2013-11-21 10:24:04 +11:00
parent 8da587c32d
commit f1bb3132a3
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

@ -1780,7 +1780,6 @@ fuzzy(1,10000) fuzzy-if(Android&&AndroidVersion>=15,5,10000) == 902330-1.html 90
fuzzy-if(Android,8,400) == 906199-1.html 906199-1-ref.html
== 921716-1.html 921716-1-ref.html
fuzzy-if(cocoaWidget,1,40) == 928607-1.html 928607-1-ref.html
test-pref(font.minimum-size.x-western,32) == 935056-1.html 935056-1-ref.html
== 936670-1.svg 936670-1-ref.svg
== 931853.html 931853-ref.html
== 931853-quirks.html 931853-quirks-ref.html

12
layout/style/nsRuleNode.cpp
View File

@ -3554,15 +3554,9 @@ 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. It's safe to look at mAllowZoom on this style struct
// we're computing, since we know -x-text-zoom is only ever specified
// on an <svg:text> element and is inherited otherwise.
if (fontSize > 0 && aFont->mAllowZoom) {
// 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;