Bug 1223653 patch 1 - Fix incorrect function being called, caught by enum class type checking in next patch. r=jfkthame
authorL. David Baron <dbaron@dbaron.org>
Thu, 19 Nov 2015 18:09:29 -0800
changeset 273421 73e519e9ec5e8a458d95dcf2ef6bda5ccb232cd4
parent 273420 b4f4af049f7d08ccf6d74e45b8aee9ac79801ebf
child 273422 965b8e749d1f06b34ec176e4a7ddc5dcfd444e6e
push id68272
push userdbaron@mozilla.com
push dateFri, 20 Nov 2015 02:10:18 +0000
treeherdermozilla-inbound@965b8e749d1f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjfkthame
bugs1223653, 311415
milestone45.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 1223653 patch 1 - Fix incorrect function being called, caught by enum class type checking in next patch. r=jfkthame This looks like a regression from the way I addressed review comments in bug 311415 comment 11 (see "I just added another variant of ComputeWidthValue").
layout/generic/nsHTMLReflowState.cpp
--- a/layout/generic/nsHTMLReflowState.cpp
+++ b/layout/generic/nsHTMLReflowState.cpp
@@ -1451,18 +1451,18 @@ nsHTMLReflowState::CalculateHypothetical
         // Figure out how to get the correct boxBSize here (need to reflow the
         // positioned frame?)
         boxBSize = 0;
       }
     } else {
       // We need to compute it. It's important we do this, because if it's
       // percentage-based this computed value may be different from the
       // computed value calculated using the absolute containing block height.
-      boxBSize = ComputeBSizeValue(blockContentSize.BSize(wm),
-                                   insideBoxSizing, styleBSize) +
+      boxBSize = nsLayoutUtils::ComputeBSizeValue(blockContentSize.BSize(wm),
+                                                  insideBoxSizing, styleBSize) +
                  insideBoxSizing + outsideBoxSizing;
     }
 
     LogicalSize boxSize(wm, knowBoxISize ? boxISize : 0, boxBSize);
 
     LogicalPoint origin(wm, aHypotheticalPos.mIStart,
                         aHypotheticalPos.mBStart);
     origin = origin.ConvertTo(cbwm, wm, cbrsSize -