Cleanup: Remove LayoutRegion.

Source/core/layout/LayoutFlowThread.h

 /*
  * Copyright (C) 2011 Adobe Systems Incorporated. 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.
@@ skipping 20 matching lines @@
 #define LayoutFlowThread_h
 
 #include "core/CoreExport.h"
 #include "core/layout/LayoutBlockFlow.h"
 #include "core/paint/DeprecatedPaintLayerFragment.h"
 #include "wtf/ListHashSet.h"
 
 namespace blink {
 
 class LayoutMultiColumnSet;
-class LayoutRegion;
 
 typedef ListHashSet<LayoutMultiColumnSet*> LayoutMultiColumnSetList;
 
-// LayoutFlowThread is used to collect all the layout objects that participate in a
-// flow thread. It will also help in doing the layout. However, it will not layout
-// directly to screen. Instead, LayoutRegion objects will redirect their paint
-// and nodeAtPoint methods to this object. Each LayoutRegion will actually be a viewPort
-// of the LayoutFlowThread.
-
+// LayoutFlowThread is used to collect all the layout objects that participate in a flow thread. It
+// will also help in doing the layout. However, it will not layout directly to screen. Instead,
+// LayoutMultiColumnSet objects will redirect their paint and nodeAtPoint methods to this
+// object. Each LayoutMultiColumnSet will actually be a viewPort of the LayoutFlowThread.
 class CORE_EXPORT LayoutFlowThread: public LayoutBlockFlow {
 public:
     LayoutFlowThread();
     virtual ~LayoutFlowThread() { };
 
     virtual bool isLayoutFlowThread() const override final { return true; }
     virtual bool isLayoutMultiColumnFlowThread() const { return false; }
     virtual bool isLayoutPagedFlowThread() const { return false; }
 
     virtual bool supportsPaintInvalidationStateCachedOffsets() const override { return false; }
 
     virtual void layout() override;
 
     // Always create a Layer for the LayoutFlowThread so that we
     // can easily avoid drawing the children directly.
     virtual DeprecatedPaintLayerType layerTypeRequired() const override final { return NormalDeprecatedPaintLayer; }
 
     // Skip past a column spanner during flow thread layout. Spanners are not laid out inside the
     // flow thread, since the flow thread is not in a spanner's containing block chain (since the
     // containing block is the multicol container). If the spanner follows right after a column set
     // (as opposed to following another spanner), we may have to stretch the flow thread to ensure
     // completely filled columns in the preceding column set. Return this adjustment, if any.
     virtual LayoutUnit skipColumnSpanner(LayoutBox*, LayoutUnit logicalTopInFlowThread) { return LayoutUnit(); }
 
     virtual void flowThreadDescendantWasInserted(LayoutObject*) { }
     virtual void flowThreadDescendantWillBeRemoved(LayoutObject*) { }
 
     virtual bool nodeAtPoint(HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) override final;
 
-    virtual void addRegionToThread(LayoutMultiColumnSet*) = 0;
-    virtual void removeRegionFromThread(LayoutMultiColumnSet*);
+    virtual void addColumnSetToThread(LayoutMultiColumnSet*) = 0;
+    virtual void removeColumnSetFromThread(LayoutMultiColumnSet*);
 
     virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
 
-    bool hasRegions() const { return m_multiColumnSetList.size(); }
+    bool hasColumnSets() const { return m_multiColumnSetList.size(); }
 
-    void validateRegions();
-    void invalidateRegions();
-    bool hasValidRegionInfo() const { return !m_regionsInvalidated && !m_multiColumnSetList.isEmpty(); }
+    void validateColumnSets();
+    void invalidateColumnSets();
+    bool hasValidColumnSetInfo() const { return !m_columnSetsInvalidated && !m_multiColumnSetList.isEmpty(); }
 
     virtual void mapRectToPaintInvalidationBacking(const LayoutBoxModelObject* paintInvalidationContainer, LayoutRect&, const PaintInvalidationState*) const override;
 
     LayoutUnit pageLogicalHeightForOffset(LayoutUnit);
     LayoutUnit pageRemainingLogicalHeightForOffset(LayoutUnit, PageBoundaryRule = IncludePageBoundary);
 
     virtual void setPageBreak(LayoutUnit /*offset*/, LayoutUnit /*spaceShortage*/) { }
     virtual void updateMinimumPageHeight(LayoutUnit /*offset*/, LayoutUnit /*minHeight*/) { }
 
-    bool regionsHaveUniformLogicalHeight() const { return m_regionsHaveUniformLogicalHeight; }
+    bool columnSetsHaveUniformLogicalHeight() const { return m_columnSetsHaveUniformLogicalHeight; }
 
-    // FIXME: These 2 functions should return a LayoutMultiColumnSet.
-    LayoutRegion* firstRegion() const;
-    LayoutRegion* lastRegion() const;
-
-    virtual bool addForcedRegionBreak(LayoutUnit, LayoutObject* breakChild, bool isBefore, LayoutUnit* offsetBreakAdjustment = 0) { return false; }
+    virtual bool addForcedColumnBreak(LayoutUnit, LayoutObject* breakChild, bool isBefore, LayoutUnit* offsetBreakAdjustment = 0) { return false; }
 
     virtual bool isPageLogicalHeightKnown() const { return true; }
     bool pageLogicalSizeChanged() const { return m_pageLogicalSizeChanged; }
 
     void collectLayerFragments(DeprecatedPaintLayerFragments&, const LayoutRect& layerBoundingBox, const LayoutRect& dirtyRect);
 
     // Return the visual bounding box based on the supplied flow-thread bounding box. Both
     // rectangles are completely physical in terms of writing mode.
     LayoutRect fragmentsBoundingBox(const LayoutRect& layerBoundingBox) const;
 
@@ skipping 33 matching lines @@
 
         LayoutMultiColumnSet* result() const { return m_result; }
 
     private:
         LayoutUnit m_offset;
         LayoutMultiColumnSet* m_result;
     };
 
     MultiColumnSetIntervalTree m_multiColumnSetIntervalTree;
 
-    bool m_regionsInvalidated : 1;
-    bool m_regionsHaveUniformLogicalHeight : 1;
+    bool m_columnSetsInvalidated : 1;
+    bool m_columnSetsHaveUniformLogicalHeight : 1;
     bool m_pageLogicalSizeChanged : 1;
 };
 
 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutFlowThread, isLayoutFlowThread());
 
 // These structures are used by PODIntervalTree for debugging.
 #ifndef NDEBUG
 template <> struct ValueToString<LayoutUnit> {
     static String string(const LayoutUnit value) { return String::number(value.toFloat()); }
 };
 
 template <> struct ValueToString<LayoutMultiColumnSet*> {
     static String string(const LayoutMultiColumnSet* value) { return String::format("%p", value); }
 };
 #endif
 
 } // namespace blink
 
 #endif // LayoutFlowThread_h