mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-01 17:23:59 +00:00
Back out ceaac3da2eff (bug 1010675) for Android reftest failures
CLOSED TREE
This commit is contained in:
Phil Ringnalda
parent
b5b1a4609e
commit
0b8d3e9eb3
@ -268,31 +268,9 @@ nsHTMLButtonControlFrame::ReflowButtonContents(nsPresContext* aPresContext,
|
||||
|
||||
// Buttons have some bonus renderer-determined border/padding,
|
||||
// which occupies part of the button's content-box area:
|
||||
LogicalMargin focusPadding =
|
||||
const LogicalMargin focusPadding =
|
||||
LogicalMargin(wm, mRenderer.GetAddedButtonBorderAndPadding());
|
||||
|
||||
// See whether out availSize's inline-size is big enough. If it's
|
||||
// smaller than our intrinsic min iSize, that means that the kid
|
||||
// wouldn't really fit. In that case, we overflow into our internal
|
||||
// focuspadding (which other browsers don't have) so that there's a
|
||||
// little more space for it.
|
||||
// Note that GetMinISize includes the focusPadding.
|
||||
nscoord IOverflow = GetMinISize(aButtonReflowState.rendContext) -
|
||||
aButtonReflowState.ComputedISize();
|
||||
nscoord IFocusPadding = focusPadding.IStartEnd(wm);
|
||||
nscoord focusPaddingReduction = std::min(IFocusPadding,
|
||||
std::max(IOverflow, 0));
|
||||
if (focusPaddingReduction > 0) {
|
||||
nscoord startReduction = focusPadding.IStart(wm);
|
||||
if (focusPaddingReduction != IFocusPadding) {
|
||||
startReduction = NSToCoordRound(startReduction *
|
||||
(float(focusPaddingReduction) /
|
||||
float(IFocusPadding)));
|
||||
}
|
||||
focusPadding.IStart(wm) -= startReduction;
|
||||
focusPadding.IEnd(wm) -= focusPaddingReduction - startReduction;
|
||||
}
|
||||
|
||||
// shorthand for a value we need to use in a bunch of places
|
||||
const LogicalMargin& clbp = aButtonReflowState.ComputedLogicalBorderPadding();
|
||||
|
||||
@ -300,8 +278,26 @@ nsHTMLButtonControlFrame::ReflowButtonContents(nsPresContext* aPresContext,
|
||||
// from the regular border.
|
||||
availSize.ISize(wm) -= focusPadding.IStartEnd(wm);
|
||||
|
||||
// See whether out availSize's inline-size is big enough. If it's smaller than
|
||||
// our intrinsic min iSize, that means that the kid wouldn't really fit; for a
|
||||
// better look in such cases we adjust the available iSize and our inline-start
|
||||
// offset to allow the kid to spill start-wards into our padding.
|
||||
LogicalPoint childPos(wm);
|
||||
childPos.I(wm) = focusPadding.IStart(wm) + clbp.IStart(wm);
|
||||
nscoord extraISize = GetMinISize(aButtonReflowState.rendContext) -
|
||||
aButtonReflowState.ComputedISize();
|
||||
if (extraISize > 0) {
|
||||
nscoord extraIStart = extraISize / 2;
|
||||
nscoord extraIEnd = extraISize - extraIStart;
|
||||
NS_ASSERTION(extraIEnd >=0, "How'd that happen?");
|
||||
|
||||
// Do not allow the extras to be bigger than the relevant padding
|
||||
const LogicalMargin& padding = aButtonReflowState.ComputedLogicalPadding();
|
||||
extraIStart = std::min(extraIStart, padding.IStart(wm));
|
||||
extraIEnd = std::min(extraIEnd, padding.IEnd(wm));
|
||||
childPos.I(wm) -= extraIStart;
|
||||
availSize.ISize(wm) = availSize.ISize(wm) + extraIStart + extraIEnd;
|
||||
}
|
||||
availSize.ISize(wm) = std::max(availSize.ISize(wm), 0);
|
||||
|
||||
// Give child a clone of the button's reflow state, with height/width reduced
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<div style="padding: 0; margin: 0; border: none; background: transparent; -moz-appearance: none; width: 0; height: 0; font: inherit; padding: 1px 0">
|
||||
<div style="padding: 0; margin: 0; border: none; background: transparent; -moz-appearance: none; width: 0; height: 0; font: inherit; padding: 1px 3px">
|
||||
Some text <div style="background: green; width: 100px; height: 100px"></div>
|
||||
</div>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<div style="padding: 0; margin: 0; border: none; background: transparent; -moz-appearance: none; width: 20px; font: inherit; padding: 1px 0; white-space: pre; overflow: hidden">Some text</div>
|
||||
<div style="padding: 0; margin: 0; border: none; background: transparent; -moz-appearance: none; width: 14px; font: inherit; padding: 1px 3px; white-space: pre; overflow: hidden">Some text</div>
|
||||
</div>
|
||||
|
||||
@ -152,8 +152,8 @@ random == 99850-1b.html 99850-1-ref.html # bug 471629
|
||||
== 179596-2.html 179596-2-ref.html
|
||||
== 179596-2.html 179596-2-ref2.html
|
||||
== 179596-2.html 179596-2-ref3.html
|
||||
!= 180085-1.html 180085-1-ref.html # fix for 180085 reverted in bug 1010675
|
||||
!= 180085-2.html 180085-2-ref.html # fix for 180085 reverted in bug 1010675
|
||||
== 180085-1.html 180085-1-ref.html
|
||||
== 180085-2.html 180085-2-ref.html
|
||||
== 185388-1.html 185388-1-ref.html
|
||||
== 186317-1.html 186317-1-ref.html
|
||||
== 192902-1.html 192902-ref.html
|
||||
@ -527,8 +527,8 @@ random-if(cocoaWidget) == 350506-1.html 350506-1-ref.html
|
||||
== 356774-1.html 356774-1-ref.html
|
||||
== 356775-1.html 356775-1-ref.html
|
||||
== 359869-1.html 359869-1-ref.html
|
||||
!= 359903-1.html 359903-1-ref.html # erosion of padding removed in bug 1010675
|
||||
!= 359903-2.html 359903-2-ref.html # erosion of padding removed in bug 1010675
|
||||
skip-if(B2G||Mulet) == 359903-1.html 359903-1-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
|
||||
== 359903-2.html 359903-2-ref.html
|
||||
== 360065-1.html 360065-1-ref.html
|
||||
== 360746-1.html 360746-1-ref.html
|
||||
== 360757-1a.html 360757-1-ref.html
|
||||
|
||||
@ -27,16 +27,3 @@ fails-if(Android||B2G||Mulet) == disabled-1.html disabled-1-ref.html # Initial m
|
||||
!= disabled-4.html disabled-4-notref.html
|
||||
!= disabled-5.html disabled-5-notref.html
|
||||
!= disabled-6.html disabled-6-notref.html
|
||||
|
||||
== width-auto-size-em-ltr.html width-auto-size-em-ltr-ref.html
|
||||
== width-auto-size-ltr.html width-auto-size-ltr-ref.html
|
||||
== width-exact-fit-ltr.html width-auto-size-ltr-ref.html
|
||||
== width-erode-part-focuspadding-ltr.html width-erode-part-focuspadding-ltr-ref.html
|
||||
== width-erode-all-focuspadding-ltr.html width-erode-all-focuspadding-ltr-ref.html
|
||||
== width-erode-overflow-focuspadding-ltr.html width-erode-overflow-focuspadding-ltr-ref.html
|
||||
== width-auto-size-em-rtl.html width-auto-size-em-rtl-ref.html
|
||||
== width-auto-size-rtl.html width-auto-size-rtl-ref.html
|
||||
== width-exact-fit-rtl.html width-auto-size-rtl-ref.html
|
||||
== width-erode-part-focuspadding-rtl.html width-erode-part-focuspadding-rtl-ref.html
|
||||
== width-erode-all-focuspadding-rtl.html width-erode-all-focuspadding-rtl-ref.html
|
||||
== width-erode-overflow-focuspadding-rtl.html width-erode-overflow-focuspadding-rtl-ref.html
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
<!DOCTYPE HTML>
|
||||
<style>
|
||||
|
||||
div.button {
|
||||
display: inline-block;
|
||||
background: yellow;
|
||||
border: 2px solid fuchsia;
|
||||
padding: 2px;
|
||||
}
|
||||
|
||||
span {
|
||||
display: inline-block; vertical-align: middle;
|
||||
height: 2em; width: 5em; border: 2px solid blue;
|
||||
margin: 1px 3px; /* for implicit focuspadding */
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
<div class=button><span></span></div>
|
||||
@ -1,19 +0,0 @@
|
||||
<!DOCTYPE HTML>
|
||||
<style>
|
||||
|
||||
button {
|
||||
-moz-appearance: none;
|
||||
background: yellow;
|
||||
border: 2px solid fuchsia;
|
||||
padding: 2px;
|
||||
font-size: 1em;
|
||||
}
|
||||
|
||||
span {
|
||||
display: inline-block; vertical-align: middle;
|
||||
height: 2em; width: 5em; border: 2px solid blue;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
<button><span></span></button>
|
||||
@ -1,20 +0,0 @@
|
||||
<!DOCTYPE HTML>
|
||||
<html dir=rtl>
|
||||
<style>
|
||||
|
||||
div.button {
|
||||
display: inline-block;
|
||||
background: yellow;
|
||||
border: 2px solid fuchsia;
|
||||
padding: 2px;
|
||||
}
|
||||
|
||||
span {
|
||||
display: inline-block; vertical-align: middle;
|
||||
height: 2em; width: 5em; border: 2px solid blue;
|
||||
margin: 1px 3px; /* for implicit focuspadding */
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
<div class=button><span></span></div>
|
||||
@ -1,20 +0,0 @@
|
||||
<!DOCTYPE HTML>
|
||||
<html dir=rtl>
|
||||
<style>
|
||||
|
||||
button {
|
||||
-moz-appearance: none;
|
||||
background: yellow;
|
||||
border: 2px solid fuchsia;
|
||||
padding: 2px;
|
||||
font-size: 1em;
|
||||
}
|
||||
|
||||
span {
|
||||
display: inline-block; vertical-align: middle;
|
||||
height: 2em; width: 5em; border: 2px solid blue;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
<button><span></span></button>
|
||||
@ -1,20 +0,0 @@
|
||||
<!DOCTYPE HTML>
|
||||
<style>
|
||||
|
||||
div.button {
|
||||
display: inline-block;
|
||||
background: yellow;
|
||||
border: 2px solid fuchsia;
|
||||
padding: 2px;
|
||||
font-size: 10px;
|
||||
}
|
||||
|
||||
span {
|
||||
display: inline-block; vertical-align: middle;
|
||||
height: 20px; width: 50px; border: 2px solid blue;
|
||||
margin: 1px 3px; /* for implicit focuspadding */
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
<div class=button><span></span></div>
|
||||
@ -1,19 +0,0 @@
|
||||
<!DOCTYPE HTML>
|
||||
<style>
|
||||
|
||||
button {
|
||||
-moz-appearance: none;
|
||||
background: yellow;
|
||||
border: 2px solid fuchsia;
|
||||
padding: 2px;
|
||||
font-size: 10px;
|
||||
}
|
||||
|
||||
span {
|
||||
display: inline-block; vertical-align: middle;
|
||||
height: 2em; width: 5em; border: 2px solid blue;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
<button><span></span></button>
|
||||
@ -1,21 +0,0 @@
|
||||
<!DOCTYPE HTML>
|
||||
<html dir=rtl>
|
||||
<style>
|
||||
|
||||
div.button {
|
||||
display: inline-block;
|
||||
background: yellow;
|
||||
border: 2px solid fuchsia;
|
||||
padding: 2px;
|
||||
font-size: 10px;
|
||||
}
|
||||
|
||||
span {
|
||||
display: inline-block; vertical-align: middle;
|
||||
height: 20px; width: 50px; border: 2px solid blue;
|
||||
margin: 1px 3px; /* for implicit focuspadding */
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
<div class=button><span></span></div>
|
||||
@ -1,20 +0,0 @@
|
||||
<!DOCTYPE HTML>
|
||||
<html dir=rtl>
|
||||
<style>
|
||||
|
||||
button {
|
||||
-moz-appearance: none;
|
||||
background: yellow;
|
||||
border: 2px solid fuchsia;
|
||||
padding: 2px;
|
||||
font-size: 10px;
|
||||
}
|
||||
|
||||
span {
|
||||
display: inline-block; vertical-align: middle;
|
||||
height: 2em; width: 5em; border: 2px solid blue;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
<button><span></span></button>
|
||||
@ -1,20 +0,0 @@
|
||||
<!DOCTYPE HTML>
|
||||
<style>
|
||||
|
||||
div.button {
|
||||
display: inline-block;
|
||||
background: yellow;
|
||||
border: 2px solid fuchsia;
|
||||
padding: 2px;
|
||||
font-size: 10px;
|
||||
}
|
||||
|
||||
span {
|
||||
display: inline-block; vertical-align: middle;
|
||||
height: 20px; width: 50px; border: 2px solid blue;
|
||||
margin: 1px 0px; /* for implicit focuspadding, fully eroded */
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
<div class=button><span></span></div>
|
||||
@ -1,20 +0,0 @@
|
||||
<!DOCTYPE HTML>
|
||||
<style>
|
||||
|
||||
button {
|
||||
-moz-appearance: none;
|
||||
background: yellow;
|
||||
border: 2px solid fuchsia;
|
||||
padding: 2px;
|
||||
font-size: 10px;
|
||||
width: 62px;
|
||||
}
|
||||
|
||||
span {
|
||||
display: inline-block; vertical-align: middle;
|
||||
height: 20px; width: 50px; border: 2px solid blue;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
<button><span></span></button>
|
||||
@ -1,21 +0,0 @@
|
||||
<!DOCTYPE HTML>
|
||||
<html dir=rtl>
|
||||
<style>
|
||||
|
||||
div.button {
|
||||
display: inline-block;
|
||||
background: yellow;
|
||||
border: 2px solid fuchsia;
|
||||
padding: 2px;
|
||||
font-size: 10px;
|
||||
}
|
||||
|
||||
span {
|
||||
display: inline-block; vertical-align: middle;
|
||||
height: 20px; width: 50px; border: 2px solid blue;
|
||||
margin: 1px 0px; /* for implicit focuspadding, fully eroded */
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
<div class=button><span></span></div>
|
||||
@ -1,21 +0,0 @@
|
||||
<!DOCTYPE HTML>
|
||||
<html dir=rtl>
|
||||
<style>
|
||||
|
||||
button {
|
||||
-moz-appearance: none;
|
||||
background: yellow;
|
||||
border: 2px solid fuchsia;
|
||||
padding: 2px;
|
||||
font-size: 10px;
|
||||
width: 62px;
|
||||
}
|
||||
|
||||
span {
|
||||
display: inline-block; vertical-align: middle;
|
||||
height: 20px; width: 50px; border: 2px solid blue;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
<button><span></span></button>
|
||||
@ -1,20 +0,0 @@
|
||||
<!DOCTYPE HTML>
|
||||
<style>
|
||||
|
||||
div.button {
|
||||
display: inline-block;
|
||||
background: yellow;
|
||||
border: 2px solid fuchsia;
|
||||
padding: 2px;
|
||||
font-size: 10px;
|
||||
}
|
||||
|
||||
span {
|
||||
display: inline-block; vertical-align: middle;
|
||||
height: 20px; width: 50px; border: 2px solid blue;
|
||||
margin: 1px -2px 1px 0; /* for implicit focuspadding, fully eroded and overflowed */
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
<div class=button><span></span></div>
|
||||
@ -1,20 +0,0 @@
|
||||
<!DOCTYPE HTML>
|
||||
<style>
|
||||
|
||||
button {
|
||||
-moz-appearance: none;
|
||||
background: yellow;
|
||||
border: 2px solid fuchsia;
|
||||
padding: 2px;
|
||||
font-size: 10px;
|
||||
width: 60px;
|
||||
}
|
||||
|
||||
span {
|
||||
display: inline-block; vertical-align: middle;
|
||||
height: 20px; width: 50px; border: 2px solid blue;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
<button><span></span></button>
|
||||
@ -1,21 +0,0 @@
|
||||
<!DOCTYPE HTML>
|
||||
<html dir=rtl>
|
||||
<style>
|
||||
|
||||
div.button {
|
||||
display: inline-block;
|
||||
background: yellow;
|
||||
border: 2px solid fuchsia;
|
||||
padding: 2px;
|
||||
font-size: 10px;
|
||||
}
|
||||
|
||||
span {
|
||||
display: inline-block; vertical-align: middle;
|
||||
height: 20px; width: 50px; border: 2px solid blue;
|
||||
margin: 1px 0 1px -2px; /* for implicit focuspadding, fully eroded and overflowed */
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
<div class=button><span></span></div>
|
||||
@ -1,21 +0,0 @@
|
||||
<!DOCTYPE HTML>
|
||||
<html dir=rtl>
|
||||
<style>
|
||||
|
||||
button {
|
||||
-moz-appearance: none;
|
||||
background: yellow;
|
||||
border: 2px solid fuchsia;
|
||||
padding: 2px;
|
||||
font-size: 10px;
|
||||
width: 60px;
|
||||
}
|
||||
|
||||
span {
|
||||
display: inline-block; vertical-align: middle;
|
||||
height: 20px; width: 50px; border: 2px solid blue;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
<button><span></span></button>
|
||||
@ -1,20 +0,0 @@
|
||||
<!DOCTYPE HTML>
|
||||
<style>
|
||||
|
||||
div.button {
|
||||
display: inline-block;
|
||||
background: yellow;
|
||||
border: 2px solid fuchsia;
|
||||
padding: 2px;
|
||||
font-size: 10px;
|
||||
}
|
||||
|
||||
span {
|
||||
display: inline-block; vertical-align: middle;
|
||||
height: 20px; width: 50px; border: 2px solid blue;
|
||||
margin: 1px 2px; /* for implicit focuspadding, partly eroded */
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
<div class=button><span></span></div>
|
||||
@ -1,20 +0,0 @@
|
||||
<!DOCTYPE HTML>
|
||||
<style>
|
||||
|
||||
button {
|
||||
-moz-appearance: none;
|
||||
background: yellow;
|
||||
border: 2px solid fuchsia;
|
||||
padding: 2px;
|
||||
font-size: 10px;
|
||||
width: 66px;
|
||||
}
|
||||
|
||||
span {
|
||||
display: inline-block; vertical-align: middle;
|
||||
height: 20px; width: 50px; border: 2px solid blue;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
<button><span></span></button>
|
||||
@ -1,21 +0,0 @@
|
||||
<!DOCTYPE HTML>
|
||||
<html dir=rtl>
|
||||
<style>
|
||||
|
||||
div.button {
|
||||
display: inline-block;
|
||||
background: yellow;
|
||||
border: 2px solid fuchsia;
|
||||
padding: 2px;
|
||||
font-size: 10px;
|
||||
}
|
||||
|
||||
span {
|
||||
display: inline-block; vertical-align: middle;
|
||||
height: 20px; width: 50px; border: 2px solid blue;
|
||||
margin: 1px 2px; /* for implicit focuspadding, partly eroded */
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
<div class=button><span></span></div>
|
||||
@ -1,21 +0,0 @@
|
||||
<!DOCTYPE HTML>
|
||||
<html dir=rtl>
|
||||
<style>
|
||||
|
||||
button {
|
||||
-moz-appearance: none;
|
||||
background: yellow;
|
||||
border: 2px solid fuchsia;
|
||||
padding: 2px;
|
||||
font-size: 10px;
|
||||
width: 66px;
|
||||
}
|
||||
|
||||
span {
|
||||
display: inline-block; vertical-align: middle;
|
||||
height: 20px; width: 50px; border: 2px solid blue;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
<button><span></span></button>
|
||||
@ -1,20 +0,0 @@
|
||||
<!DOCTYPE HTML>
|
||||
<style>
|
||||
|
||||
button {
|
||||
-moz-appearance: none;
|
||||
background: yellow;
|
||||
border: 2px solid fuchsia;
|
||||
padding: 2px;
|
||||
font-size: 10px;
|
||||
width: 68px;
|
||||
}
|
||||
|
||||
span {
|
||||
display: inline-block; vertical-align: middle;
|
||||
height: 20px; width: 50px; border: 2px solid blue;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
<button><span></span></button>
|
||||
@ -1,21 +0,0 @@
|
||||
<!DOCTYPE HTML>
|
||||
<html dir=rtl>
|
||||
<style>
|
||||
|
||||
button {
|
||||
-moz-appearance: none;
|
||||
background: yellow;
|
||||
border: 2px solid fuchsia;
|
||||
padding: 2px;
|
||||
font-size: 10px;
|
||||
width: 68px;
|
||||
}
|
||||
|
||||
span {
|
||||
display: inline-block; vertical-align: middle;
|
||||
height: 20px; width: 50px; border: 2px solid blue;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
<button><span></span></button>
|
||||
Loading…
Reference in New Issue
Block a user