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

backed out 7510a8ab857d / Bug 594333 since its reftest failed on Win Debug. a=orange

Browse Source
This commit is contained in:
Daniel Holbert 2010-12-10 12:16:07 -08:00
parent e75b9f4317
commit 9d511895f8
4 changed files with 3 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
layout/generic/nsBlockReflowState.cpp
View File

@ -51,7 +51,6 @@
#include "nsIFrame.h"
#include "nsFrameManager.h"
#include "mozilla/AutoRestore.h"
#include "FrameLayerBuilder.h"
#include "nsINameSpaceManager.h"
@ -857,13 +856,9 @@ nsBlockReflowState::FlowAndPlaceFloat(nsIFrame* aFloat)
// Position the float and make sure and views are properly
// positioned. We need to explicitly position its child views as
// well, since we're moving the float after flowing it.
PRBool moved = aFloat->GetPosition() != origin;
if (moved) {
aFloat->SetPosition(origin);
nsContainerFrame::PositionFrameView(aFloat);
nsContainerFrame::PositionChildViews(aFloat);
FrameLayerBuilder::InvalidateThebesLayersInSubtree(aFloat);
}
aFloat->SetPosition(origin);
nsContainerFrame::PositionFrameView(aFloat);
nsContainerFrame::PositionChildViews(aFloat);
// Update the float combined area state
// XXX Floats should really just get invalidated here if necessary

17
layout/reftests/bugs/594333-1-ref.html
View File

@ -1,17 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<style>
div {
float: left;
width: 300px;
height: 200px;
background: url(repeatable-diagonal-gradient.png);
}
</style>
</head>
<body>
<div id="a" style="width:0"></div>
<div id="b" style="opacity:0.5"></div>
</body>
</html>

30
layout/reftests/bugs/594333-1.html
View File

@ -1,30 +0,0 @@
<!DOCTYPE html>
<html class="reftest-wait">
<head>
<style>
div {
float: left;
width: 300px;
height: 200px;
background: url(repeatable-diagonal-gradient.png);
}
</style>
<script type="text/javascript">
var i = 32;
function test() {
document.getElementById("a").style.width = (i*10)+'px';
document.getElementById("b").style.opacity = i/64.0 + 0.5;
i--;
if (i >= 0) {
setTimeout(test, 10);
} else {
document.documentElement.removeAttribute("class");
}
}
</script>
</head>
<body onload="test()">
<div id="a"></div>
<div id="b"></div>
</body>
</html>

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

@ -1523,7 +1523,6 @@ asserts(0-1) == 582146-1.html about:blank
== 586400-1.html 586400-1-ref.html
== 589672-1.html 589672-1-ref.html
== 593544-1.html 593544-1-ref.html
== 594333-1.html 594333-1-ref.html
== 594624-1.html 594624-1-ref.html
== 594737-1.html 594737-1-ref.html
== 597721-1.html 597721-1-ref.html