Bug 1277703: Mark nsHTMLReflowState::ComputeContainingBlockRectangle as 'const'. r=mats
authorDaniel Holbert <dholbert@cs.stanford.edu>
Thu, 02 Jun 2016 15:24:00 -0700
changeset 300295 952636b63ad76c6f56d399b0cf1736793d1f4cb8
parent 300294 4b1961339522201e009ada20a73dcfa6cd957e68
child 300296 bb39628ebe69337f45a7f044aef247583e0ff220
push id30309
push usercbook@mozilla.com
push dateFri, 03 Jun 2016 10:00:40 +0000
treeherdermozilla-central@e27fe24a746f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmats
bugs1277703
milestone49.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 1277703: Mark nsHTMLReflowState::ComputeContainingBlockRectangle as 'const'. r=mats MozReview-Commit-ID: HuSDz3rgtQY
layout/generic/nsHTMLReflowState.cpp
layout/generic/nsHTMLReflowState.h
--- a/layout/generic/nsHTMLReflowState.cpp
+++ b/layout/generic/nsHTMLReflowState.cpp
@@ -1997,17 +1997,17 @@ CalcQuirkContainingBlockHeight(const nsH
   return std::max(result, 0);
 }
 
 // Called by InitConstraints() to compute the containing block rectangle for
 // the element. Handles the special logic for absolutely positioned elements
 LogicalSize
 nsHTMLReflowState::ComputeContainingBlockRectangle(
                      nsPresContext*           aPresContext,
-                     const nsHTMLReflowState* aContainingBlockRS)
+                     const nsHTMLReflowState* aContainingBlockRS) const
 {
   // Unless the element is absolutely positioned, the containing block is
   // formed by the content edge of the nearest block-level ancestor
   LogicalSize cbSize = aContainingBlockRS->ComputedSize();
 
   WritingMode wm = aContainingBlockRS->GetWritingMode();
 
   // mFrameType for abs-pos tables is NS_CSS_FRAME_TYPE_BLOCK, so we need to
--- a/layout/generic/nsHTMLReflowState.h
+++ b/layout/generic/nsHTMLReflowState.h
@@ -731,18 +731,18 @@ public:
    */
   static nscoord CalcLineHeight(nsIContent* aContent,
                                 nsStyleContext* aStyleContext,
                                 nscoord aBlockBSize,
                                 float aFontSizeInflation);
 
 
   mozilla::LogicalSize ComputeContainingBlockRectangle(
-         nsPresContext*          aPresContext,
-         const nsHTMLReflowState* aContainingBlockRS);
+         nsPresContext*           aPresContext,
+         const nsHTMLReflowState* aContainingBlockRS) const;
 
   /**
    * Apply the mComputed(Min/Max)Width constraints to the content
    * size computed so far.
    */
   nscoord ApplyMinMaxWidth(nscoord aWidth) const {
     if (NS_UNCONSTRAINEDSIZE != ComputedMaxWidth()) {
       aWidth = std::min(aWidth, ComputedMaxWidth());