Bug 877160: Backout patch for bug 794693 due to regressions. [r=mats]
authorScott Johnson <sjohnson@mozilla.com>
Tue, 04 Jun 2013 10:43:08 -0500
changeset 133934 ca43cd65708b6d2f47d9bad38745e8d40bc592bd
parent 133933 ee864722aff91e534a5641adc6c45844ebef304d
child 133935 a539cf3c4c2aaebbdcc18dd081bfaf05e5f68b8c
child 133937 b6cce1e412531ef22f5143f6b8d24359208afc30
push id24776
push userryanvm@gmail.com
push dateTue, 04 Jun 2013 19:01:04 +0000
treeherdermozilla-central@a539cf3c4c2a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmats
bugs877160, 794693
milestone24.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 877160: Backout patch for bug 794693 due to regressions. [r=mats]
layout/base/crashtests/794693.html
layout/base/crashtests/crashtests.list
layout/generic/nsHTMLReflowState.cpp
deleted file mode 100644
--- a/layout/base/crashtests/794693.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml"><body style="display: -moz-box;">
-<font style="display: table; float: left;">
-<span style="display: table;">
-text text
-</span>
-</font>
-</body>
-</html>
--- a/layout/base/crashtests/crashtests.list
+++ b/layout/base/crashtests/crashtests.list
@@ -396,17 +396,16 @@ asserts(0-2) load 736389-1.xhtml # somet
 asserts-if(winWidget,0-2) load 736924-1.html # bug 738803
 load 749816-1.html
 load 763223-1.html
 test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.lineThreshold,100) load 763702.xhtml
 load 770381-1.html
 load 772306.html
 load 788360.html
 load 793848.html
-test-pref(font.size.inflation.minTwips,120) load 794693.html
 load 795646.html
 load 802902.html
 skip-if(!gtk2Widget) load 813372-1.html # bug 873083
 asserts-if(gtk2Widget,0-1) load 822865.html # bug 540078
 load 833604-1.html
 load 835056.html
 load 836990-1.html
 load 852293.html
--- a/layout/generic/nsHTMLReflowState.cpp
+++ b/layout/generic/nsHTMLReflowState.cpp
@@ -427,24 +427,22 @@ nsHTMLReflowState::InitResizeFlags(nsPre
   bool isHResize = (frame->GetSize().width !=
                      mComputedWidth + mComputedBorderPadding.LeftRight()) ||
                      aPresContext->PresShell()->IsReflowOnZoomPending();
 
   if ((frame->GetStateBits() & NS_FRAME_FONT_INFLATION_FLOW_ROOT) &&
       nsLayoutUtils::FontSizeInflationEnabled(aPresContext)) {
     // Create our font inflation data if we don't have it already, and
     // give it our current width information.
-
-    // Avoid running this at the box-to-block interface
-    // (where we shouldn't be inflating anyway, and where
-    // reflow state construction is probably to construct a
-    // dummy parent reflow state anyway).
-    bool dirty = !mFlags.mDummyParentReflowState &&
-                 nsFontInflationData::UpdateFontInflationDataWidthFor(*this);
-
+    bool dirty = nsFontInflationData::UpdateFontInflationDataWidthFor(*this) &&
+                 // Avoid running this at the box-to-block interface
+                 // (where we shouldn't be inflating anyway, and where
+                 // reflow state construction is probably to construct a
+                 // dummy parent reflow state anyway).
+                 !mFlags.mDummyParentReflowState;
 
     if (dirty || (!frame->GetParent() && isHResize)) {
       // When font size inflation is enabled, a change in either:
       //  * the effective width of a font inflation flow root
       //  * the width of the frame
       // needs to cause a dirty reflow since they change the font size
       // inflation calculations, which in turn change the size of text,
       // line-heights, etc.  This is relatively similar to a classic