Merge overflowRectForFlowThreadPortion() into flowThreadPortionOverflowRectAt().

third_party/WebKit/Source/core/layout/LayoutMultiColumnSet.cpp

 /*
  * Copyright (C) 2012 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 284 matching lines @@
 }
 
 LayoutUnit LayoutMultiColumnSet::logicalTopInFlowThread() const {
   return firstFragmentainerGroup().logicalTopInFlowThread();
 }
 
 LayoutUnit LayoutMultiColumnSet::logicalBottomInFlowThread() const {
   return lastFragmentainerGroup().logicalBottomInFlowThread();
 }
 
-LayoutRect LayoutMultiColumnSet::flowThreadPortionOverflowRect() const {
-  return overflowRectForFlowThreadPortion(flowThreadPortionRect(),
-                                          !previousSiblingMultiColumnSet(),
-                                          !nextSiblingMultiColumnSet());
-}
-
-LayoutRect LayoutMultiColumnSet::overflowRectForFlowThreadPortion(
-    const LayoutRect& flowThreadPortionRect,
-    bool isFirstPortion,
-    bool isLastPortion) const {
-  // Only clip along the block direction axis.
-  LayoutRect clipRect(LayoutRect::infiniteIntRect());
-
-  if (m_flowThread->isHorizontalWritingMode()) {
-    if (!isFirstPortion)
-      clipRect.shiftYEdgeTo(flowThreadPortionRect.y());
-    if (!isLastPortion)
-      clipRect.shiftMaxYEdgeTo(flowThreadPortionRect.maxY());
-    return clipRect;
-  }
-  if (!isFirstPortion)
-    clipRect.shiftXEdgeTo(flowThreadPortionRect.x());
-  if (!isLastPortion)
-    clipRect.shiftMaxXEdgeTo(flowThreadPortionRect.maxX());
-  return clipRect;
-}
-
 bool LayoutMultiColumnSet::heightIsAuto() const {
   LayoutMultiColumnFlowThread* flowThread = multiColumnFlowThread();
   if (!flowThread->isLayoutPagedFlowThread()) {
     // If support for the column-fill property isn't enabled, we want to behave
     // as if column-fill were auto, so that multicol containers with specified
     // height don't get their columns balanced (auto-height multicol containers
     // will still get their columns balanced, even if column-fill isn't
     // 'balance' - in accordance with the spec).
     // Pretending that column-fill is auto also matches the old multicol
     // implementation, which has no support for this property.
@@ skipping 268 matching lines @@
   // Now add in column rule bounds, if present.
   Vector<LayoutRect> columnRuleBounds;
   if (computeColumnRuleBounds(LayoutPoint(), columnRuleBounds)) {
     for (auto& bound : columnRuleBounds)
       blockFlowBounds.unite(bound);
   }
   return blockFlowBounds;
 }
 
 }  // namespace blink