Bug 777519: Remove unnecessary checks for min-height/max-height:auto in nsHTMLReflowState::InitResizeFlags. r=dbaron
authorDaniel Holbert <dholbert@cs.stanford.edu>
Fri, 27 Jul 2012 15:52:40 -0700
changeset 100785 83a4dfef9a7d9d24dfc1c1b65a0ea5c12d0261a1
parent 100784 88ca3f681c99ea89b8ec0715315a4340fec3d3d7
child 100786 7a1a791c856fdcb8478873f4e18791fff1d0d0ae
push id23193
push userryanvm@gmail.com
push dateSat, 28 Jul 2012 21:54:39 +0000
treeherdermozilla-central@29bff59d3bbe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdbaron
bugs777519
milestone17.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 777519: Remove unnecessary checks for min-height/max-height:auto in nsHTMLReflowState::InitResizeFlags. r=dbaron
layout/generic/nsHTMLReflowState.cpp
--- a/layout/generic/nsHTMLReflowState.cpp
+++ b/layout/generic/nsHTMLReflowState.cpp
@@ -529,22 +529,18 @@ nsHTMLReflowState::InitResizeFlags(nsPre
     mFlags.mVResize = frame->GetSize().height !=
                         mComputedHeight + mComputedBorderPadding.TopBottom();
   }
 
   bool dependsOnCBHeight =
     (mStylePosition->HeightDependsOnContainer() &&
      // FIXME: condition this on not-abspos?
      mStylePosition->mHeight.GetUnit() != eStyleUnit_Auto) ||
-    (mStylePosition->MinHeightDependsOnContainer() &&
-     // FIXME: condition this on not-abspos?
-     mStylePosition->mMinHeight.GetUnit() != eStyleUnit_Auto) ||
-    (mStylePosition->MaxHeightDependsOnContainer() &&
-     // FIXME: condition this on not-abspos?
-     mStylePosition->mMaxHeight.GetUnit() != eStyleUnit_Auto) ||
+    mStylePosition->MinHeightDependsOnContainer() ||
+    mStylePosition->MaxHeightDependsOnContainer() ||
     mStylePosition->OffsetHasPercent(NS_SIDE_TOP) ||
     mStylePosition->mOffset.GetBottomUnit() != eStyleUnit_Auto ||
     frame->IsBoxFrame();
 
   if (mStyleText->mLineHeight.GetUnit() == eStyleUnit_Enumerated) {
     NS_ASSERTION(mStyleText->mLineHeight.GetIntValue() ==
                  NS_STYLE_LINE_HEIGHT_BLOCK_HEIGHT,
                  "bad line-height value");