Backed out changesets caf429779e37 and ca0e11da35da (bug 1172239) because the remaining patches in the bug didn't land.
authorRyan VanderMeulen <ryanvm@gmail.com>
Mon, 27 Jul 2015 16:54:12 -0400
changeset 275478 df25d99a85a2430b8b95bfdfb4e57f1cd3bee0e1
parent 275477 535b6bb28d8008b6d890758b9f4d9bea652d8be4
child 275479 64fb14a330e36c02b6c7ae794dbaa5b19f0949a7
push id863
push userraliiev@mozilla.com
push dateMon, 03 Aug 2015 13:22:43 +0000
treeherdermozilla-release@f6321b14228d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1172239
milestone40.0
backs outcaf429779e370589790d87b8b99aeb6f8a1150b8
ca0e11da35da9c610da09e8f75556fbe16a6bd0f
Backed out changesets caf429779e37 and ca0e11da35da (bug 1172239) because the remaining patches in the bug didn't land.
layout/generic/nsGfxScrollFrame.cpp
layout/style/nsStyleStruct.cpp
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -496,19 +496,16 @@ nsHTMLScrollFrame::ReflowScrolledFrame(S
   const nsMargin physicalPadding = padding.GetPhysicalMargin(wm);
   kidReflowState.Init(presContext, -1, -1, nullptr,
                       &physicalPadding);
   kidReflowState.mFlags.mAssumingHScrollbar = aAssumeHScroll;
   kidReflowState.mFlags.mAssumingVScrollbar = aAssumeVScroll;
   kidReflowState.SetComputedBSize(computedBSize);
   kidReflowState.ComputedMinBSize() = computedMinBSize;
   kidReflowState.ComputedMaxBSize() = computedMaxBSize;
-  if (aState->mReflowState.IsBResize()) {
-    kidReflowState.SetBResize(true);
-  }
 
   // Temporarily set mHasHorizontalScrollbar/mHasVerticalScrollbar to
   // reflect our assumptions while we reflow the child.
   bool didHaveHorizontalScrollbar = mHelper.mHasHorizontalScrollbar;
   bool didHaveVerticalScrollbar = mHelper.mHasVerticalScrollbar;
   mHelper.mHasHorizontalScrollbar = aAssumeHScroll;
   mHelper.mHasVerticalScrollbar = aAssumeVScroll;
 
--- a/layout/style/nsStyleStruct.cpp
+++ b/layout/style/nsStyleStruct.cpp
@@ -1596,20 +1596,17 @@ nsChangeHint nsStylePosition::CalcDiffer
       mMinHeight != aOther.mMinHeight ||
       mMaxHeight != aOther.mMaxHeight) {
     // Height changes can affect descendant intrinsic sizes due to replaced
     // elements with percentage heights in descendants which also have
     // percentage heights.  And due to our not-so-great computation of mVResize
     // in nsHTMLReflowState, they do need to force reflow of the whole subtree.
     // XXXbz due to XUL caching heights as well, height changes also need to
     // clear ancestor intrinsics!
-    return NS_CombineHint(hint, nsChangeHint_NeedReflow |
-        nsChangeHint_ClearAncestorIntrinsics |
-        nsChangeHint_ClearDescendantIntrinsics |
-        nsChangeHint_ReflowChangesSizeOrPosition);
+    return NS_CombineHint(hint, nsChangeHint_AllReflowHints);
   }
 
   if (mWidth != aOther.mWidth ||
       mMinWidth != aOther.mMinWidth ||
       mMaxWidth != aOther.mMaxWidth) {
     // None of our width differences can affect descendant intrinsic
     // sizes and none of them need to force children to reflow.
     return