backed out 7510a8ab857d / Bug 594333 since its reftest failed on Win Debug. a=orange
authorDaniel Holbert <dholbert@cs.stanford.edu>
Fri, 10 Dec 2010 12:16:07 -0800
changeset 59085 fcd702dc1ec7f7f5d7788b25995f5197ec4eb6ce
parent 59084 89e633e31dad283de4e541b988eafae4a815ba20
child 59086 e8d00d32b03200d0324772a4829c2a7f026a8ded
push id1
push usershaver@mozilla.com
push dateTue, 04 Jan 2011 17:58:04 +0000
reviewersorange
bugs594333
milestone2.0b8pre
backs out7510a8ab857da0baea0acdb46ada34d61381dc91
backed out 7510a8ab857d / Bug 594333 since its reftest failed on Win Debug. a=orange
layout/generic/nsBlockReflowState.cpp
layout/reftests/bugs/594333-1-ref.html
layout/reftests/bugs/594333-1.html
layout/reftests/bugs/reftest.list
--- a/layout/generic/nsBlockReflowState.cpp
+++ b/layout/generic/nsBlockReflowState.cpp
@@ -46,17 +46,16 @@
 #include "nsBlockReflowState.h"
 #include "nsBlockFrame.h"
 #include "nsLineLayout.h"
 #include "nsPresContext.h"
 #include "nsGkAtoms.h"
 #include "nsIFrame.h"
 #include "nsFrameManager.h"
 #include "mozilla/AutoRestore.h"
-#include "FrameLayerBuilder.h"
 
 #include "nsINameSpaceManager.h"
 
 
 #ifdef DEBUG
 #include "nsBlockDebugFlags.h"
 #endif
 
@@ -852,23 +851,19 @@ nsBlockReflowState::FlowAndPlaceFloat(ns
                  floatMargin.top + floatY);
 
   // If float is relatively positioned, factor that in as well
   origin += aFloat->GetRelativeOffset(floatDisplay);
 
   // 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
   mFloatOverflowAreas.UnionWith(aFloat->GetOverflowAreas() + origin);
 
   // Place the float in the float manager
   // calculate region
   nsRect region = nsFloatManager::CalculateRegionFor(aFloat, floatMargin);
deleted file mode 100644
--- a/layout/reftests/bugs/594333-1-ref.html
+++ /dev/null
@@ -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>
deleted file mode 100644
--- a/layout/reftests/bugs/594333-1.html
+++ /dev/null
@@ -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>
--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@@ -1518,17 +1518,16 @@ random-if(layersGPUAccelerated) == 58131
 asserts(0-1) == 582146-1.html about:blank
 == 582476-1.svg 582476-1-ref.svg
 == 584400-dash-length.svg 584400-dash-length-ref.svg
 == 584699-1.html 584699-1-ref.html
 == 585598-2.xhtml 585598-2-ref.xhtml
 == 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
 == 599113-1.html 599113-1-ref.html
 fails-if(!haveTestPlugin) == 599476.html 599476-ref.html
 == 600045-1.html 600045-1-ref.html
 == 600803-1.html 600803-1-ref.html
 == 603423-1.html 603423-1-ref.html