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

backout c3f1ab75ea51 (bug 421436) for regressing bug 439462

Browse Source
This commit is contained in:
Daniel Holbert 2014-05-22 15:10:20 -07:00
parent b3defc8b63
commit 278d0a41b3
6 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
editor/libeditor/html/tests/browserscope/lib/richtext2/currentStatus.js
View File

@ -546,6 +546,9 @@ const knownFailures = {
"S-Proposed-SM:e.b.lb_P.P.P-1_SIR-2-dM": true,
"S-Proposed-SM:e.b.lb_P.P.P-1_SIR-2-body": true,
"S-Proposed-SM:e.b.lb_P.P.P-1_SIR-2-div": true,
"S-Proposed-SM:e.f.l_BR.BR-2_SI-1-dM": true,
"S-Proposed-SM:e.f.l_BR.BR-2_SI-1-body": true,
"S-Proposed-SM:e.f.l_BR.BR-2_SI-1-div": true,
"A-Proposed-B_TEXT-1_SI-dM": true,
"A-Proposed-B_TEXT-1_SI-body": true,
"A-Proposed-B_TEXT-1_SI-div": true,

6
layout/forms/nsTextControlFrame.cpp
View File

@ -184,6 +184,12 @@ nsTextControlFrame::CalcIntrinsicSize(nsRenderingContext* aRenderingContext,
}
// Now add the extra padding on (so that small input sizes work well)
aIntrinsicSize.width += internalPadding;
} else {
// This is to account for the anonymous <br> having a 1 twip width
// in Full Standards mode, see BRFrame::Reflow and bug 228752.
if (PresContext()->CompatibilityMode() == eCompatibility_FullStandards) {
aIntrinsicSize.width += 1;
}
}
// Increment width with cols * letter-spacing.

8
layout/generic/nsBRFrame.cpp
View File

@ -125,6 +125,14 @@ BRFrame::Reflow(nsPresContext* aPresContext,
else {
aMetrics.SetTopAscent(aMetrics.Height() = 0);
}
// XXX temporary until I figure out a better solution; see the
// code in nsLineLayout::VerticalAlignFrames that zaps minY/maxY
// if the width is zero.
// XXX This also fixes bug 10036!
// Warning: nsTextControlFrame::CalculateSizeStandard depends on
// the following line, see bug 228752.
aMetrics.Width() = 1;
}
// Return our reflow status

2
layout/generic/test/test_bug421436.html
View File

@ -23,7 +23,7 @@ var inner = document.getElementById("inner");
var outer = document.getElementById("outer");
is(inner.getBoundingClientRect().left, outer.getBoundingClientRect().left, "left edges equal");
is(inner.getBoundingClientRect().right, outer.getBoundingClientRect().right, "right edges equal");
todo_is(inner.getBoundingClientRect().right, outer.getBoundingClientRect().right, "right edges equal");
</script>
</pre>

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

@ -1229,7 +1229,7 @@ skip-if(B2G) == 458296-1d.html 458296-1-ref.html
skip-if(B2G&&browserIsRemote) == 463217-1.xul 463217-1-ref.xul # bug 974780
skip-if(B2G) == 463952-1.html 463952-1-ref.html
== 464811-1.html 464811-1-ref.html
== 465574-1.html 465574-1-ref.html
fails == 465574-1.html 465574-1-ref.html # bug 421436
== 466258-1.html 466258-1-ref.html
== 466395-1.html 466395-1-ref.html
== 466395-2.html 466395-2-ref.html

2
layout/reftests/text-overflow/reftest.list
View File

@ -5,7 +5,7 @@ skip-if(B2G) HTTP(..) == marker-string.html marker-string-ref.html
skip-if(Android||B2G) HTTP(..) == bidi-simple.html bidi-simple-ref.html # Fails on Android due to anti-aliasing
skip-if(!gtk2Widget) HTTP(..) == bidi-simple-scrolled.html bidi-simple-scrolled-ref.html # Fails on Windows and OSX due to anti-aliasing
skip-if(B2G) fuzzy-if(Android&&AndroidVersion<15,9,2545) fuzzy-if(Android&&AndroidVersion>=15,24,4000) HTTP(..) == scroll-rounding.html scroll-rounding-ref.html # bug 760264
fuzzy-if(Android||B2G||OSX==10.8,1,1) HTTP(..) == anonymous-block.html anonymous-block-ref.html
fuzzy-if(OSX==10.8,1,1) HTTP(..) == anonymous-block.html anonymous-block-ref.html
skip-if(B2G) HTTP(..) == false-marker-overlap.html false-marker-overlap-ref.html
HTTP(..) == visibility-hidden.html visibility-hidden-ref.html
skip-if(B2G) HTTP(..) == block-padding.html block-padding-ref.html