Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-03 23:01:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 9430676f5442 (bug 808767) for Android R3 failures.

Browse Source
This commit is contained in:
Ryan VanderMeulen 2012-11-29 17:55:50 -05:00
parent c0af152aaa
commit eb28b72392
4 changed files with 1 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
layout/generic/nsFlexContainerFrame.cpp
View File

@ -8,7 +8,6 @@
/* rendering object for CSS "display: flex" */
#include "nsFlexContainerFrame.h"
#include "nsDisplayList.h"
#include "nsLayoutUtils.h"
#include "nsPresContext.h"
#include "nsStyleContext.h"
@ -981,11 +980,8 @@ nsFlexContainerFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
nsresult rv = DisplayBorderBackgroundOutline(aBuilder, aLists);
NS_ENSURE_SUCCESS(rv, rv);
// Our children are all block-level, so their borders/backgrounds all go on
// the BlockBorderBackgrounds list.
nsDisplayListSet childLists(aLists, aLists.BlockBorderBackgrounds());
for (nsFrameList::Enumerator e(mFrames); !e.AtEnd(); e.Next()) {
rv = BuildDisplayListForChild(aBuilder, e.get(), aDirtyRect, childLists,
rv = BuildDisplayListForChild(aBuilder, e.get(), aDirtyRect, aLists,
GetDisplayFlagsForFlexItem(e.get()));
NS_ENSURE_SUCCESS(rv, rv);
}

74
layout/reftests/flexbox/flexbox-paint-ordering-1-ref.xhtml
View File

@ -1,74 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/
-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<style>
.container {
width: 40px;
height: 14px;
border: 2px solid green;
margin-bottom: 2px;
}
.a {
width: 16px;
height: 10px;
background: blue;
min-width: 0;
border: 2px solid lightblue;
}
.b {
width: 16px;
height: 10px;
background: purple;
min-width: 0;
border: 2px solid slateblue;
}
.aKid {
margin-left: 10px;
margin-top: 2px;
width: 16px;
height: 6px;
background: yellow;
border: 1px solid black;
}
.a, .b { float: left; }
</style>
</head>
<body>
<!-- Just 6 copies of the same container, since they all should look
the same: -->
<div class="container">
<div class="a"><div class="aKid"/></div>
<div class="b"></div>
</div>
<div class="container">
<div class="a"><div class="aKid"/></div>
<div class="b"></div>
</div>
<div class="container">
<div class="a"><div class="aKid"/></div>
<div class="b"></div>
</div>
<div class="container">
<div class="a"><div class="aKid"/></div>
<div class="b"></div>
</div>
<div class="container">
<div class="a"><div class="aKid"/></div>
<div class="b"></div>
</div>
<div class="container">
<div class="a"><div class="aKid"/></div>
<div class="b"></div>
</div>
</body>
</html>

86
layout/reftests/flexbox/flexbox-paint-ordering-1.xhtml
View File

@ -1,86 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/
-->
<!-- Testcase with flex items containing overlapping content, to test
their paint-order. -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<style>
body {
line-height: 0;
}
.container {
width: 40px;
height: 14px;
border: 2px solid green;
margin-bottom: 2px;
}
.a {
width: 16px;
height: 10px;
background: blue;
min-width: 0;
border: 2px solid lightblue;
}
.b {
width: 16px;
height: 10px;
background: purple;
min-width: 0;
border: 2px solid slateblue;
}
.aKid {
margin-left: 10px;
margin-top: 2px;
width: 16px;
height: 6px;
background: yellow;
border: 1px solid black;
}
</style>
</head>
<body>
<!-- inline-level flex container -->
<div class="container" style="display: inline-flex">
<div class="a"><div class="aKid"/></div>
<div class="b"></div>
</div>
<!-- block-level flex container -->
<div class="container" style="display: flex">
<div class="a"><div class="aKid"/></div>
<div class="b"></div>
</div>
<!-- floated flex container -->
<div class="container" style="display: flex; float: left">
<div class="a"><div class="aKid"/></div>
<div class="b"></div>
</div>
<!-- Helper-div to clear floats: -->
<div style="clear: both"/>
<!-- relatively-positioned flex container -->
<div class="container" style="display: flex; position: relative">
<div class="a"><div class="aKid"/></div>
<div class="b"></div>
</div>
<!-- absolutely-positioned flex container -->
<div class="container" style="display: flex; position: absolute">
<div class="a"><div class="aKid"/></div>
<div class="b"></div>
</div>
<!--- Spacer div, since abspos div doesn't set aside space for itself -->
<div style="height: 20px"/>
<!-- fixed-position flex container -->
<div class="container" style="display: flex; position: fixed">
<div class="a"><div class="aKid"/></div>
<div class="b"></div>
</div>
</body>
</html>

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

@ -100,9 +100,6 @@ test-pref(layout.css.flexbox.enabled,true) == flexbox-items-as-stacking-contexts
test-pref(layout.css.flexbox.enabled,true) == flexbox-minSize-horiz-1.xhtml flexbox-minSize-horiz-1-ref.xhtml
test-pref(layout.css.flexbox.enabled,true) == flexbox-minSize-vert-1.xhtml flexbox-minSize-vert-1-ref.xhtml
# Tests for the order in which we paint flex items
test-pref(layout.css.flexbox.enabled,true) == flexbox-paint-ordering-1.xhtml flexbox-paint-ordering-1-ref.xhtml
# Tests for handling of absolutely/fixed/relatively-positioned flex items.
test-pref(layout.css.flexbox.enabled,true) == flexbox-position-absolute-1.xhtml flexbox-position-absolute-1-ref.xhtml
test-pref(layout.css.flexbox.enabled,true) == flexbox-position-absolute-2.xhtml flexbox-position-absolute-2-ref.xhtml