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

Back out 4dd5fb21e599 (bug 906199) for Android R2 orange

Browse Source 
CLOSED TREE
This commit is contained in:
Phil Ringnalda 2013-08-20 22:49:12 -07:00
parent d9aaafc1b8
commit 32900daa61
4 changed files with 0 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
layout/generic/nsFrame.cpp
View File

@ -1683,14 +1683,6 @@ WrapPreserve3DListInternal(nsIFrame* aFrame, nsDisplayListBuilder *aBuilder, nsD
if (!aTemp->IsEmpty()) {
aOutput->AppendToTop(new (aBuilder) nsDisplayTransform(aBuilder, aFrame, aTemp, aIndex++));
}
// Override item's clipping with our current clip state (if any). Since we're
// bubbling up a preserve-3d transformed child to a preserve-3d parent,
// we can be sure the child doesn't have clip state of its own.
NS_ASSERTION(!item->GetClip().HasClip(), "Unexpected clip on item");
const DisplayItemClip* clip = aBuilder->ClipState().GetCurrentCombinedClip(aBuilder);
if (clip) {
item->SetClip(aBuilder, *clip);
}
aOutput->AppendToTop(item);
break;
}

32
layout/reftests/bugs/906199-1-ref.html
View File

@ -1,32 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<style>
div {
position:relative;
width:300px;
height:200px;
left:50px;
top:50px;
}
.grandparentdiv {
background:yellow;
overflow:hidden;
}
.childdiv {
background:green;
}
.grandchilddiv {
background:red;
}
</style>
</head>
<body>
<div class="grandparentdiv">
<div class="childdiv">
<div class="grandchilddiv"></div>
</div>
</div>
</body>
</html>

33
layout/reftests/bugs/906199-1.html
View File

@ -1,33 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<style>
div {
position:relative;
width:300px;
height:200px;
left:50px;
top:50px;
transform-style:preserve-3d;
}
.grandparentdiv {
background:yellow;
overflow:hidden;
}
.childdiv {
background:green;
}
.grandchilddiv {
background:red;
}
</style>
</head>
<body>
<div class="grandparentdiv">
<div class="childdiv">
<div class="grandchilddiv"></div>
</div>
</div>
</body>
</html>

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

@ -1772,4 +1772,3 @@ test-pref(layout.css.flexbox.enabled,true) == 849407-1.html 849407-1-ref.html
== 883987-1f.html 883987-1-ref.html
== 890495-1.html 890495-1-ref.html
== 894931-1.html 894931-1-ref.html
== 906199-1.html 906199-1-ref.html