Back out changeset 4304cf04f1e8 (bug 868498 patch 2) for causing bug 894931. a=me
authorL. David Baron <dbaron@dbaron.org>
Thu, 18 Jul 2013 01:03:05 -0700
changeset 143563 668caad64c7a713634d76bdee3054b362ba8006c
parent 143562 0cc06eeec7d07946cba50bae26ebc4800ebd8b43
child 143564 d3a462c5d0354bd1b0deca366ba17716ca3e3904
push id3997
push userdbaron@mozilla.com
push dateThu, 18 Jul 2013 08:05:00 +0000
treeherdermozilla-aurora@668caad64c7a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs868498, 894931
milestone24.0a2
backs out4304cf04f1e847b6165c42f723e24a6b23d83424
Back out changeset 4304cf04f1e8 (bug 868498 patch 2) for causing bug 894931. a=me
layout/style/nsStyleStruct.cpp
--- a/layout/style/nsStyleStruct.cpp
+++ b/layout/style/nsStyleStruct.cpp
@@ -2184,44 +2184,28 @@ nsStyleDisplay::nsStyleDisplay(const nsS
   /* Copy over transform origin. */
   mTransformOrigin[0] = aSource.mTransformOrigin[0];
   mTransformOrigin[1] = aSource.mTransformOrigin[1];
   mTransformOrigin[2] = aSource.mTransformOrigin[2];
   mPerspectiveOrigin[0] = aSource.mPerspectiveOrigin[0];
   mPerspectiveOrigin[1] = aSource.mPerspectiveOrigin[1];
 }
 
-static uint8_t
-MapRelativePositionToStatic(uint8_t aPositionValue)
-{
-  return aPositionValue == NS_STYLE_POSITION_RELATIVE ?
-      NS_STYLE_POSITION_STATIC : aPositionValue;
-}
-
 nsChangeHint nsStyleDisplay::CalcDifference(const nsStyleDisplay& aOther) const
 {
   nsChangeHint hint = nsChangeHint(0);
 
-  // Changes between position:static and position:relative don't need
-  // to reconstruct frames.
   if (!EqualURIs(mBinding, aOther.mBinding)
-      || MapRelativePositionToStatic(mPosition) !=
-           MapRelativePositionToStatic(aOther.mPosition)
+      || mPosition != aOther.mPosition
       || mDisplay != aOther.mDisplay
       || (mFloats == NS_STYLE_FLOAT_NONE) != (aOther.mFloats == NS_STYLE_FLOAT_NONE)
       || mOverflowX != aOther.mOverflowX
       || mOverflowY != aOther.mOverflowY
-      || mResize != aOther.mResize) {
+      || mResize != aOther.mResize)
     NS_UpdateHint(hint, nsChangeHint_ReconstructFrame);
-  }
-
-  if (mPosition != aOther.mPosition) {
-    NS_UpdateHint(hint,
-      NS_CombineHint(nsChangeHint_NeedReflow, nsChangeHint_RepaintFrame));
-  }
 
   if (mFloats != aOther.mFloats) {
     // Changing which side we float on doesn't affect descendants directly
     NS_UpdateHint(hint,
        NS_SubtractHint(nsChangeHint_AllReflowHints,
                        NS_CombineHint(nsChangeHint_ClearDescendantIntrinsics,
                                       nsChangeHint_NeedDirtyReflow)));
   }