Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1007)

Unified Diff: Source/core/rendering/RenderBlockFlow.cpp

Issue 101543009: Make cluster creation independent of fingerprinting. Keep track of current (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@pdr-multiplier
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/FastTextAutosizer.cpp ('k') | Source/core/rendering/TextAutosizer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderBlockFlow.cpp
diff --git a/Source/core/rendering/RenderBlockFlow.cpp b/Source/core/rendering/RenderBlockFlow.cpp
index d485a94340f34c0a5911fc7131ca389a2308b684..98ca6c5f670e6484792d05ccdf201d9af8f27dcb 100644
--- a/Source/core/rendering/RenderBlockFlow.cpp
+++ b/Source/core/rendering/RenderBlockFlow.cpp
@@ -33,6 +33,7 @@
#include "core/accessibility/AXObjectCache.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"
@@ -302,6 +303,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;
@@ -312,6 +317,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;
« no previous file with comments | « Source/core/rendering/FastTextAutosizer.cpp ('k') | Source/core/rendering/TextAutosizer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698