Index: Source/core/rendering/RenderView.cpp |
diff --git a/Source/core/rendering/RenderView.cpp b/Source/core/rendering/RenderView.cpp |
index 2f8862bfe37c18cc7a1d1f7a704895429ba060af..f1dd69171c271d229e9923c47799abe9cf683e28 100644 |
--- a/Source/core/rendering/RenderView.cpp |
+++ b/Source/core/rendering/RenderView.cpp |
@@ -29,7 +29,6 @@ |
#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" |
@@ -832,36 +831,20 @@ void RenderView::setIsInWindow(bool isInWindow) |
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
mstensho (USE GERRIT)
2014/12/02 19:41:12
That may be right, but never mind: I have another
|
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() |