Make MultiColumnFragmentainerGroup::m_columnSet const.

third_party/WebKit/Source/core/layout/MultiColumnFragmentainerGroup.h

Index: third_party/WebKit/Source/core/layout/MultiColumnFragmentainerGroup.h
diff --git a/third_party/WebKit/Source/core/layout/MultiColumnFragmentainerGroup.h b/third_party/WebKit/Source/core/layout/MultiColumnFragmentainerGroup.h
index e1ca9abfb033b437823dacbe081332bfcfe7ec5b..4f7df29cc02a1dd842ab2f8b443a6e7c508f79e8 100644
--- a/third_party/WebKit/Source/core/layout/MultiColumnFragmentainerGroup.h
+++ b/third_party/WebKit/Source/core/layout/MultiColumnFragmentainerGroup.h
@@ -29,7 +29,7 @@ namespace blink {
 class MultiColumnFragmentainerGroup {
     DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
 public:
-    MultiColumnFragmentainerGroup(LayoutMultiColumnSet&);
+    MultiColumnFragmentainerGroup(const LayoutMultiColumnSet&);
 
     const LayoutMultiColumnSet& columnSet() const { return m_columnSet; }
 
@@ -60,7 +60,7 @@ public:
     LayoutUnit logicalHeightInFlowThread() const { return m_logicalBottomInFlowThread - m_logicalTopInFlowThread; }
 
     void resetColumnHeight();
-    bool recalculateColumnHeight();
+    bool recalculateColumnHeight(LayoutMultiColumnSet&);

[mstensho (USE GERRIT), 2016/04/19 19:07:39]

So, how silly is this? I need a non-const reference here, so that I can call
propagateTallestUnbreakableLogicalHeight().

Any better suggestions?

[leviw_travelin_and_unemployed, 2016/04/19 19:57:50]

It's silly, but I don't have better solutions. I'd rather avoid that nasty word
mutable.

LGTM.

 
     LayoutSize flowThreadTranslationAtOffset(LayoutUnit offsetInFlowThread) const;
     LayoutUnit columnLogicalTopForOffset(LayoutUnit offsetInFlowThread) const;
@@ -103,7 +103,7 @@ private:
     // Get the first and the last column intersecting the specified visual rectangle.
     void columnIntervalForVisualRect(const LayoutRect&, unsigned& firstColumn, unsigned& lastColumn) const;
 
-    LayoutMultiColumnSet& m_columnSet;
+    const LayoutMultiColumnSet& m_columnSet;
 
     LayoutUnit m_logicalTop;
     LayoutUnit m_logicalTopInFlowThread;