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

Backed out changeset 3ad367f04970 (bug 1242781) for reftest failures. r=backout

Browse Source
This commit is contained in:
Sebastian Hengst 2016-03-08 12:43:19 +01:00
parent 00c6bf3687
commit c3651e35dd
4 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
layout/generic/nsBRFrame.cpp
View File

@ -140,7 +140,6 @@ BRFrame::Reflow(nsPresContext* aPresContext,
// XXX This also fixes bug 10036!
// Warning: nsTextControlFrame::CalculateSizeStandard depends on
// the following line, see bug 228752.
// The code below in AddInlinePrefISize also adds 1 appunit to width
finalSize.ISize(wm) = 1;
}
@ -180,8 +179,6 @@ BRFrame::AddInlinePrefISize(nsRenderingContext *aRenderingContext,
nsIFrame::InlinePrefISizeData *aData)
{
if (!GetParent()->StyleContext()->ShouldSuppressLineBreak()) {
// Match the 1 appunit width assigned in the Reflow method above
aData->currentLine += 1;
aData->ForceBreak();
}
}

6
layout/reftests/bugs/1242781-ref.html
View File

@ -1,6 +0,0 @@
<!DOCTYPE HTML>
<html>
<body>
<p style="display:inline-block">some&nbsp;<span>te<br/>xt</span></p>
</body>
</html>

6
layout/reftests/bugs/1242781.html
View File

@ -1,6 +0,0 @@
<!DOCTYPE HTML>
<html>
<body>
<p style="display:inline-block">some <span>te<br/>xt</span></p>
</body>
</html>

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

@ -1238,7 +1238,7 @@ fuzzy-if(skiaContent,1,12000) == 461512-1.html 461512-1-ref.html
skip-if((B2G&&browserIsRemote)||Mulet) == 463217-1.xul 463217-1-ref.xul # bug 974780 # Initial mulet triage: parity with B2G/B2G Desktop
skip-if(B2G||Mulet) == 463952-1.html 463952-1-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
== 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
@ -1945,4 +1945,3 @@ fuzzy(1,74) fuzzy-if(gtkWidget,6,79) == 1174332-1.html 1174332-1-ref.html
pref(layout.css.overflow-clip-box.enabled,true) == 1226278.html 1226278-ref.html
== 1230466.html about:blank
fuzzy(100,2000) == 1239564.html 1239564-ref.html
== 1242781.html 1242781-ref.html