Cleanup: Call logicalTopInFlowThreadAt() at more places.

Source/core/layout/MultiColumnFragmentainerGroup.cpp

 // 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.
 
 #include "config.h"
 
 #include "core/layout/MultiColumnFragmentainerGroup.h"
 
 #include "core/layout/LayoutMultiColumnSet.h"
 
@@ skipping 125 matching lines @@
     LayoutRect portionRect(flowThreadPortionRectAt(columnIndex));
     m_columnSet.flipForWritingMode(portionRect);
     LayoutRect columnRect(columnRectAt(columnIndex));
     m_columnSet.flipForWritingMode(columnRect);
     return columnRect.location() - portionRect.location();
 }
 
 LayoutUnit MultiColumnFragmentainerGroup::columnLogicalTopForOffset(LayoutUnit offsetInFlowThread) const
 {
     unsigned columnIndex = columnIndexAtOffset(offsetInFlowThread, AssumeNewColumns);
-    return m_logicalTopInFlowThread + columnIndex * m_columnHeight;
+    return logicalTopInFlowThreadAt(columnIndex);
 }
 
 LayoutPoint MultiColumnFragmentainerGroup::visualPointToFlowThreadPoint(const LayoutPoint& visualPoint) const
 {
     unsigned columnIndex = columnIndexAtVisualPoint(visualPoint);
     LayoutRect columnRect = columnRectAt(columnIndex);
     LayoutPoint localPoint(visualPoint);
     localPoint.moveBy(-columnRect.location());
     // Before converting to a flow thread position, if the block direction coordinate is outside the
     // column, snap to the bounds of the column, and reset the inline direction coordinate to the
@@ skipping 292 matching lines @@
     }
 
     LayoutRect columnRect(columnLogicalLeft, columnLogicalTop, columnLogicalWidth, columnLogicalHeight);
     if (!m_columnSet.isHorizontalWritingMode())
         return columnRect.transposedRect();
     return columnRect;
 }
 
 LayoutRect MultiColumnFragmentainerGroup::flowThreadPortionRectAt(unsigned columnIndex) const
 {
-    LayoutUnit logicalTop = m_logicalTopInFlowThread + columnIndex * m_columnHeight;
+    LayoutUnit logicalTop = logicalTopInFlowThreadAt(columnIndex);
     if (m_columnSet.isHorizontalWritingMode())
         return LayoutRect(LayoutUnit(), logicalTop, m_columnSet.pageLogicalWidth(), m_columnHeight);
     return LayoutRect(logicalTop, LayoutUnit(), m_columnHeight, m_columnSet.pageLogicalWidth());
 }
 
 LayoutRect MultiColumnFragmentainerGroup::flowThreadPortionOverflowRect(const LayoutRect& portionRect, unsigned columnIndex, unsigned columnCount, LayoutUnit columnGap) const
 {
     // This function determines the portion of the flow thread that paints for the column. Along the inline axis, columns are
     // unclipped at outside edges (i.e., the first and last column in the set), and they clip to half the column
     // gap along interior edges.
@@ skipping 76 matching lines @@
     append(MultiColumnFragmentainerGroup(m_columnSet));
     return last();
 }
 
 void MultiColumnFragmentainerGroupList::deleteExtraGroups()
 {
     shrink(1);
 }
 
 } // namespace blink