Remove FlowThreadController and relateds.

Source/core/rendering/RenderView.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 11 matching lines @@
 #include "core/rendering/RenderView.h"
 
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/frame/LocalFrame.h"
 #include "core/html/HTMLFrameOwnerElement.h"
 #include "core/html/HTMLIFrameElement.h"
 #include "core/page/Page.h"
 #include "core/paint/ViewPainter.h"
 #include "core/rendering/ColumnInfo.h"
-#include "core/rendering/FlowThreadController.h"
 #include "core/rendering/HitTestResult.h"
 #include "core/rendering/RenderFlowThread.h"
 #include "core/rendering/RenderGeometryMap.h"
 #include "core/rendering/RenderLayer.h"
 #include "core/rendering/RenderPart.h"
 #include "core/rendering/RenderQuote.h"
 #include "core/rendering/compositing/CompositedLayerMapping.h"
 #include "core/rendering/compositing/RenderLayerCompositor.h"
 #include "core/svg/SVGDocumentExtensions.h"
 #include "platform/TraceEvent.h"
@@ skipping 782 matching lines @@
 
     return m_compositor.get();
 }
 
 void RenderView::setIsInWindow(bool isInWindow)
 {
     if (m_compositor)
         m_compositor->setIsInWindow(isInWindow);
 }
 
-FlowThreadController* RenderView::flowThreadController()
-{
-    if (!m_flowThreadController)
-        m_flowThreadController = FlowThreadController::create();
-
-    return m_flowThreadController.get();
-}
-
 void RenderView::pushLayoutState(LayoutState& layoutState)
 {
-    if (m_flowThreadController) {
-        RenderFlowThread* currentFlowThread = m_flowThreadController->currentRenderFlowThread();
-        if (currentFlowThread)
-            currentFlowThread->pushFlowThreadLayoutState(layoutState.renderer());
-    }
+    if (RenderFlowThread* currentFlowThread = layoutState.flowThread())
+        currentFlowThread->pushFlowThreadLayoutState(layoutState.renderer());
     m_layoutState = &layoutState;
 }
 
 void RenderView::popLayoutState()
 {
     ASSERT(m_layoutState);
+    RenderFlowThread* currentFlowThread = m_layoutState->flowThread();

[Julien - ping for review, 2014/12/02 16:59:47]

We could potentially combine the lines below:

if (RenderFlowThread* currentFlowThread = m_layoutState->flowThread())
    currentFlowThread->popFlowThreadLayoutState();
m_layoutState = m_layoutState->next();

[mstensho (USE GERRIT), 2014/12/02 19:41:12]

That may be right, but never mind: I have another upcoming patch that kills all
this code. :)

     m_layoutState = m_layoutState->next();
-    if (!m_flowThreadController)
-        return;
-
-    RenderFlowThread* currentFlowThread = m_flowThreadController->currentRenderFlowThread();
-    if (!currentFlowThread)
-        return;
-
-    currentFlowThread->popFlowThreadLayoutState();
+    if (currentFlowThread)

[Julien - ping for review, 2014/12/02 16:59:47]

Nit: /me prefers early returns

[mstensho (USE GERRIT), 2014/12/02 19:41:12]

Ditto.

+        currentFlowThread->popFlowThreadLayoutState();
 }
 
 IntervalArena* RenderView::intervalArena()
 {
     if (!m_intervalArena)
         m_intervalArena = IntervalArena::create();
     return m_intervalArena.get();
 }
 
 bool RenderView::backgroundIsKnownToBeOpaqueInRect(const LayoutRect&) const
@@ skipping 11 matching lines @@
     return viewWidth(IncludeScrollbars) / scale;
 }
 
 double RenderView::layoutViewportHeight() const
 {
     float scale = m_frameView ? m_frameView->frame().pageZoomFactor() : 1;
     return viewHeight(IncludeScrollbars) / scale;
 }
 
 } // namespace blink