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

Backed out changeset d23df90fc306 (bug 1150021) for frequent B2G reftest failures.

Browse Source
This commit is contained in:
Ryan VanderMeulen 2015-04-07 11:27:14 -04:00
parent 820d2d7035
commit d3085ce0b1
6 changed files with 1 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
layout/reftests/bugs/1150021-1-ref.css
View File

@ -1,9 +0,0 @@
.wide { background: red; width: 800px; height: 30px; display: inline-block;}
#container {
background-color: yellow;
}
#rightBox {
margin-left: 1000px;
}

20
layout/reftests/bugs/1150021-1-ref.xul
View File

@ -1,20 +0,0 @@
<?xml version="1.0"?> <!-- -*- Mode: HTML -*- -->
<?xml-stylesheet type="text/css" href="1150021-1-ref.css"?>
<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml"
title="gsg"
>
<vbox id="container">
<vbox id="rightBox">
<html:span>
<html:div class="wide"></html:div><html:div class="wide"></html:div>
</html:span>
</vbox>
</vbox>
</window>

10
layout/reftests/bugs/1150021-1.css
View File

@ -1,10 +0,0 @@
window { direction: rtl; }
.wide { background: red; width: 800px; height: 30px; display: inline-block;}
#container {
background-color: yellow;
}
#rightBox {
margin-left: 1000px;
}

20
layout/reftests/bugs/1150021-1.xul
View File

@ -1,20 +0,0 @@
<?xml version="1.0"?> <!-- -*- Mode: HTML -*- -->
<?xml-stylesheet type="text/css" href="1150021-1.css"?>
<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml"
title="gsg"
>
<vbox id="container">
<vbox id="rightBox">
<html:span>
<html:div class="wide"></html:div><html:div class="wide"></html:div>
</html:span>
</vbox>
</vbox>
</window>

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

@ -1872,6 +1872,5 @@ skip-if(Mulet) == 1120431-2.html 1120431-2-ref.html # TC: Bug 1144079 - Re-enabl
== 1128354-1.html 1128354-1-ref.html
== 1130231-1-button-padding-rtl.html 1130231-1-button-padding-rtl-ref.html
== 1130231-2-button-padding-rtl.html 1130231-2-button-padding-rtl-ref.html
== 1150021-1.xul 1150021-1-ref.xul
== 1151145-1.html 1151145-1-ref.html
== 1151306-1.html 1151306-1-ref.html

14
layout/xul/nsSprocketLayout.cpp
View File

@ -397,12 +397,7 @@ nsSprocketLayout::Layout(nsIFrame* aBox, nsBoxLayoutState& aState)
nextY += (childBoxSize->right);
else
nextY -= (childBoxSize->left);
if (GetFrameDirection(aBox) == NS_STYLE_DIRECTION_LTR) {
childRect.x = originalClientRect.x;
} else {
// keep the right edge of the box the same
childRect.x = clientRect.x + originalClientRect.width - childRect.width;
}
childRect.x = originalClientRect.x;
}
// If we encounter a completely bogus box size, we just leave this child completely
@ -534,13 +529,6 @@ nsSprocketLayout::Layout(nsIFrame* aBox, nsBoxLayoutState& aState)
newChildRect.y = childRect.YMost() - newChildRect.height;
}
if (!(frameState & NS_STATE_IS_HORIZONTAL)) {
if (GetFrameDirection(aBox) != NS_STYLE_DIRECTION_LTR) {
// keep the right edge the same
newChildRect.x = childRect.XMost() - newChildRect.width;
}
}
// If the child resized then recompute its position.
ComputeChildsNextPosition(aBox, x, y, nextX, nextY, newChildRect);