Bug 724432 - Skip UpdateOverflow if we did Reflow. Don't propagate UpdateOverflow in ReResolveStyleContext. r=roc

2012-02-07 12:31:47 +01:00
parent 08aadd5133
commit aeb31c8469
2 changed files with 3 additions and 1 deletions
--- a/layout/base/nsFrameManager.cpp
+++ b/layout/base/nsFrameManager.cpp
@@ -1061,6 +1061,8 @@ nsFrameManager::ReResolveStyleContext(nsPresContext     *aPresContext,
      NS_SubtractHint(aMinChange, nsChangeHint_ClearAncestorIntrinsics);
  }

+  aMinChange = NS_SubtractHint(aMinChange, nsChangeHint_UpdateOverflow);
+
  // It would be nice if we could make stronger assertions here; they
  // would let us simplify the ?: expressions below setting |content|
  // and |pseudoContent| in sensible ways as well as making what