Cleanup: Remove LayoutRegion.

Cleanup: Remove LayoutRegion.

Move what was in use by the derived class LayoutMultiColumnSet into said
derived class, and delete the rest (such as setIsValid() / isValid(),
which are remnants from the region days).

R=dsinclair@chromium.org

Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=194965

[leviw_travelin_and_unemployed, 2015-05-05 20:21:57]

leviw@chromium.org changed reviewers:
+ leviw@chromium.org

[leviw_travelin_and_unemployed, 2015-05-05 20:21:57]

Super exciting! Patch is out of date, sadly :(

[mstensho (USE GERRIT), 2015-05-05 20:24:27]

On 2015/05/05 20:21:57, leviw wrote:
> Super exciting! Patch is out of date, sadly :(

Gah! Red red red... I'll rebase. :)

[dsinclair, 2015-05-05 20:27:22]

On 2015/05/05 at 20:24:27, mstensho wrote:
> On 2015/05/05 20:21:57, leviw wrote:
> > Super exciting! Patch is out of date, sadly :(
> 
> Gah! Red red red... I'll rebase. :)

That was me, sorry. On the plus side, I'm done now, heh.

[dsinclair, 2015-05-05 20:34:56]

The change looks good to me, wasn't sure if leviw@ wanted to chime in or not.

[mstensho (USE GERRIT), 2015-05-05 20:36:04]

On 2015/05/05 20:27:22, dsinclair wrote:
> On 2015/05/05 at 20:24:27, mstensho wrote:
> > On 2015/05/05 20:21:57, leviw wrote:
> > > Super exciting! Patch is out of date, sadly :(
> > 
> > Gah! Red red red... I'll rebase. :)
> 
> That was me, sorry. On the plus side, I'm done now, heh.

No worries. I suppose we could have used Visual Source Safe or something instead
of git to avoid conflicts. :)
Anyway, new patch is up.

[leviw_travelin_and_unemployed, 2015-05-05 21:08:30]

The CQ bit was checked by leviw@chromium.org

[leviw_travelin_and_unemployed, 2015-05-05 21:08:30]

lgtm

https://www.youtube.com/watch?v=9CKtSY5yfvM

[commit-bot: I haz the power, 2015-05-05 21:09:04]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1122323002/20001

[commit-bot: I haz the power, 2015-05-05 22:51:24]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-05-05 22:51:26]

Failed to apply patch for Source/core/layout/LayoutFlowThread.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/core/layout/LayoutFlowThread.cpp
  Hunk #1 FAILED at 38.
  Hunk #2 succeeded at 105 (offset -1 lines).
  Hunk #3 succeeded at 155 (offset -1 lines).
  Hunk #4 succeeded at 166 (offset -1 lines).
  Hunk #5 succeeded at 176 (offset -1 lines).
  1 out of 5 hunks FAILED -- saving rejects to file
Source/core/layout/LayoutFlowThread.cpp.rej

Patch:       Source/core/layout/LayoutFlowThread.cpp
Index: Source/core/layout/LayoutFlowThread.cpp
diff --git a/Source/core/layout/LayoutFlowThread.cpp
b/Source/core/layout/LayoutFlowThread.cpp
index
cb0391c25df3b0da15cf43e23b115f752aae4e12..341f68131e024584eca3566c9a1eb2cf00deca45
100644
--- a/Source/core/layout/LayoutFlowThread.cpp
+++ b/Source/core/layout/LayoutFlowThread.cpp
@@ -38,52 +38,52 @@ namespace blink {
 
 LayoutFlowThread::LayoutFlowThread()
     : LayoutBlockFlow(0)
-    , m_regionsInvalidated(false)
-    , m_regionsHaveUniformLogicalHeight(true)
+    , m_columnSetsInvalidated(false)
+    , m_columnSetsHaveUniformLogicalHeight(true)
     , m_pageLogicalSizeChanged(false)
 {
     setFlowThreadState(InsideOutOfFlowThread);
 }
 
-void LayoutFlowThread::removeRegionFromThread(LayoutMultiColumnSet* columnSet)
+void LayoutFlowThread::removeColumnSetFromThread(LayoutMultiColumnSet*
columnSet)
 {
     ASSERT(columnSet);
     m_multiColumnSetList.remove(columnSet);
 }
 
-void LayoutFlowThread::invalidateRegions()
+void LayoutFlowThread::invalidateColumnSets()
 {
-    if (m_regionsInvalidated) {
+    if (m_columnSetsInvalidated) {
         ASSERT(selfNeedsLayout());
         return;
     }
 
    
setNeedsLayoutAndFullPaintInvalidation(LayoutInvalidationReason::ColumnsChanged);
 
-    m_regionsInvalidated = true;
+    m_columnSetsInvalidated = true;
 }
 
-void LayoutFlowThread::validateRegions()
+void LayoutFlowThread::validateColumnSets()
 {
-    if (m_regionsInvalidated) {
-        m_regionsInvalidated = false;
-        m_regionsHaveUniformLogicalHeight = true;
+    if (m_columnSetsInvalidated) {
+        m_columnSetsInvalidated = false;
+        m_columnSetsHaveUniformLogicalHeight = true;
 
-        if (hasRegions()) {
-            LayoutUnit previousRegionLogicalHeight = 0;
-            bool firstRegionVisited = false;
+        if (hasColumnSets()) {
+            LayoutUnit previousLogicalHeight = 0;
+            bool firstVisited = false;
 
             for (auto* columnSet : m_multiColumnSetList) {
-                LayoutUnit regionLogicalHeight =
columnSet->pageLogicalHeight();
+                LayoutUnit currentLogicalHeight =
columnSet->pageLogicalHeight();
 
-                if (!firstRegionVisited) {
-                    firstRegionVisited = true;
+                if (!firstVisited) {
+                    firstVisited = true;
                 } else {
-                    if (m_regionsHaveUniformLogicalHeight &&
previousRegionLogicalHeight != regionLogicalHeight)
-                        m_regionsHaveUniformLogicalHeight = false;
+                    if (m_columnSetsHaveUniformLogicalHeight &&
previousLogicalHeight != currentLogicalHeight)
+                        m_columnSetsHaveUniformLogicalHeight = false;
                 }
 
-                previousRegionLogicalHeight = regionLogicalHeight;
+                previousLogicalHeight = currentLogicalHeight;
             }
         }
     }
@@ -106,7 +106,7 @@ void
LayoutFlowThread::mapRectToPaintInvalidationBacking(const LayoutBoxModelObj
 
 void LayoutFlowThread::layout()
 {
-    m_pageLogicalSizeChanged = m_regionsInvalidated && everHadLayout();
+    m_pageLogicalSizeChanged = m_columnSetsInvalidated && everHadLayout();
     LayoutBlockFlow::layout();
     m_pageLogicalSizeChanged = false;
 }
@@ -156,20 +156,6 @@ LayoutUnit
LayoutFlowThread::pageRemainingLogicalHeightForOffset(LayoutUnit offs
     return remainingHeight;
 }
 
-LayoutRegion* LayoutFlowThread::firstRegion() const
-{
-    if (!hasValidRegionInfo())
-        return 0;
-    return m_multiColumnSetList.first();
-}
-
-LayoutRegion* LayoutFlowThread::lastRegion() const
-{
-    if (!hasValidRegionInfo())
-        return 0;
-    return m_multiColumnSetList.last();
-}
-
 void LayoutFlowThread::generateColumnSetIntervalTree()
 {
     // FIXME: Optimize not to clear the interval all the time. This implies
manually managing the tree nodes lifecycle.
@@ -181,7 +167,7 @@ void LayoutFlowThread::generateColumnSetIntervalTree()
 
 void LayoutFlowThread::collectLayerFragments(DeprecatedPaintLayerFragments&
layerFragments, const LayoutRect& layerBoundingBox, const LayoutRect& dirtyRect)
 {
-    ASSERT(!m_regionsInvalidated);
+    ASSERT(!m_columnSetsInvalidated);
 
     for (LayoutMultiColumnSetList::const_iterator iter =
m_multiColumnSetList.begin(); iter != m_multiColumnSetList.end(); ++iter) {
         LayoutMultiColumnSet* columnSet = *iter;
@@ -191,7 +177,7 @@ void
LayoutFlowThread::collectLayerFragments(DeprecatedPaintLayerFragments& laye
 
 LayoutRect LayoutFlowThread::fragmentsBoundingBox(const LayoutRect&
layerBoundingBox) const
 {
-    ASSERT(!m_regionsInvalidated);
+    ASSERT(!m_columnSetsInvalidated);
 
     LayoutRect result;
     for (auto* columnSet : m_multiColumnSetList) {

[commit-bot: I haz the power, 2015-05-05 22:51:28]

The CQ bit was unchecked by commit-bot@chromium.org

[mstensho (USE GERRIT), 2015-05-06 05:48:23]

The CQ bit was checked by mstensho@opera.com

[mstensho (USE GERRIT), 2015-05-06 05:48:24]

The patchset sent to the CQ was uploaded after l-g-t-m from leviw@chromium.org
Link to the patchset: https://codereview.chromium.org/1122323002/#ps40001
(title: "rebase master")

[commit-bot: I haz the power, 2015-05-06 05:48:35]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1122323002/40001

[commit-bot: I haz the power, 2015-05-06 07:17:22]

Committed patchset #3 (id:40001) as
https://src.chromium.org/viewvc/blink?view=rev&revision=194965