Index: Source/core/rendering/RenderBlockFlow.cpp |
diff --git a/Source/core/rendering/RenderBlockFlow.cpp b/Source/core/rendering/RenderBlockFlow.cpp |
index 2160493e2352d42588881d4d10641223c6b035f5..e52f68cac980ca464975e3e45ff0cfaa3cbdf8e9 100644 |
--- a/Source/core/rendering/RenderBlockFlow.cpp |
+++ b/Source/core/rendering/RenderBlockFlow.cpp |
@@ -32,6 +32,7 @@ |
#include "core/rendering/RenderBlockFlow.h" |
#include "core/frame/FrameView.h" |
+#include "core/rendering/FastTextAutosizer.h" |
#include "core/rendering/HitTestLocation.h" |
#include "core/rendering/LayoutRectRecorder.h" |
#include "core/rendering/LayoutRepainter.h" |
@@ -292,6 +293,10 @@ void RenderBlockFlow::layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalH |
LayoutUnit previousHeight = logicalHeight(); |
setLogicalHeight(beforeEdge); |
+ FastTextAutosizer* textAutosizer = document().fastTextAutosizer(); |
+ if (textAutosizer) |
+ textAutosizer->beginLayout(this); |
+ |
m_repaintLogicalTop = 0; |
m_repaintLogicalBottom = 0; |
LayoutUnit maxFloatLogicalBottom = 0; |
@@ -302,6 +307,9 @@ void RenderBlockFlow::layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalH |
else |
layoutBlockChildren(relayoutChildren, maxFloatLogicalBottom, layoutScope, beforeEdge, afterEdge); |
+ if (textAutosizer) |
+ textAutosizer->endLayout(this); |
+ |
if (frameView()->partialLayout().isStopping()) { |
statePusher.pop(); |
return; |