Make MultiColumnFragmentainerGroup::m_columnSet const.

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MultiColumnFragmentainerGroup_h
 #define MultiColumnFragmentainerGroup_h
 
 #include "core/layout/LayoutMultiColumnFlowThread.h"
 #include "wtf/Allocator.h"
 
@@ skipping 11 matching lines @@
 //
 // Each fragmentainer group may have its own actual column count (if there are unused columns
 // because of forced breaks, for example). If there are multiple fragmentainer groups, the actual
 // column count must not exceed the used column count (the one calculated based on column-count and
 // column-width from CSS), or they'd overflow the outer fragmentainer in the inline direction. If we
 // need more columns than what a group has room for, we'll create another group and put them there
 // (and make them appear in the next outer fragmentainer).
 class MultiColumnFragmentainerGroup {
     DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
 public:
-    MultiColumnFragmentainerGroup(LayoutMultiColumnSet&);
+    MultiColumnFragmentainerGroup(const LayoutMultiColumnSet&);
 
     const LayoutMultiColumnSet& columnSet() const { return m_columnSet; }
 
     bool isFirstGroup() const;
     bool isLastGroup() const;
 
     // Position within the LayoutMultiColumnSet.
     LayoutUnit logicalTop() const { return m_logicalTop; }
     void setLogicalTop(LayoutUnit logicalTop) { m_logicalTop = logicalTop; }
 
@@ skipping 10 matching lines @@
     void setLogicalTopInFlowThread(LayoutUnit logicalTopInFlowThread) { m_logicalTopInFlowThread = logicalTopInFlowThread; }
 
     // The bottom of our flow thread portion
     LayoutUnit logicalBottomInFlowThread() const { return m_logicalBottomInFlowThread; }
     void setLogicalBottomInFlowThread(LayoutUnit logicalBottomInFlowThread) { ASSERT(logicalBottomInFlowThread >= m_logicalTopInFlowThread); m_logicalBottomInFlowThread = logicalBottomInFlowThread; }
 
     // The height of our flow thread portion
     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;
     LayoutPoint visualPointToFlowThreadPoint(const LayoutPoint& visualPoint) const;
     LayoutRect fragmentsBoundingBox(const LayoutRect& boundingBoxInFlowThread) const;
 
     void collectLayerFragments(PaintLayerFragments&, const LayoutRect& layerBoundingBox, const LayoutRect& dirtyRect) const;
     LayoutRect calculateOverflow() const;
 
     enum ColumnIndexCalculationMode {
@@ skipping 22 matching lines @@
     // not inside any of the columns.
     unsigned columnIndexAtVisualPoint(const LayoutPoint& visualPoint) const;
 
     // Get the first and the last column intersecting the specified block range.
     // Note that |logicalBottomInFlowThread| is an exclusive endpoint.
     void columnIntervalForBlockRangeInFlowThread(LayoutUnit logicalTopInFlowThread, LayoutUnit logicalBottomInFlowThread, unsigned& firstColumn, unsigned& lastColumn) const;
 
     // 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;
     LayoutUnit m_logicalBottomInFlowThread;
 
     LayoutUnit m_columnHeight;
 
     LayoutUnit m_maxColumnHeight; // Maximum column height allowed.
 };
 
@@ skipping 34 matching lines @@
 
 private:
     LayoutMultiColumnSet& m_columnSet;
 
     Vector<MultiColumnFragmentainerGroup, 1> m_groups;
 };
 
 } // namespace blink
 
 #endif // MultiColumnFragmentainerGroup_h