diff --git a/layout/generic/nsBRFrame.cpp b/layout/generic/nsBRFrame.cpp index a1857eb6d0c2..f958f9885c81 100644 --- a/layout/generic/nsBRFrame.cpp +++ b/layout/generic/nsBRFrame.cpp @@ -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(); } } diff --git a/layout/reftests/bugs/1242781-ref.html b/layout/reftests/bugs/1242781-ref.html deleted file mode 100644 index d1b0fb13eb6f..000000000000 --- a/layout/reftests/bugs/1242781-ref.html +++ /dev/null @@ -1,6 +0,0 @@ - - - -

some te
xt

- - diff --git a/layout/reftests/bugs/1242781.html b/layout/reftests/bugs/1242781.html deleted file mode 100644 index c7cff3519d95..000000000000 --- a/layout/reftests/bugs/1242781.html +++ /dev/null @@ -1,6 +0,0 @@ - - - -

some te
xt

- - diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list index e9e563c4e88a..156e39e19179 100644 --- a/layout/reftests/bugs/reftest.list +++ b/layout/reftests/bugs/reftest.list @@ -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