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

Unified Diff: Source/core/rendering/FastTextAutosizer.h

Issue 320393003: Descend into inner blocks for inflateAutoTable. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Update TestExpectations Created 6 years, 6 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
Index: Source/core/rendering/FastTextAutosizer.h
diff --git a/Source/core/rendering/FastTextAutosizer.h b/Source/core/rendering/FastTextAutosizer.h
index d4e301bd366f4f1f1876e3dc80b55ebc60c4d371..f3f5efb2eab1757adbfcc7499d90e3998c0e70de 100644
--- a/Source/core/rendering/FastTextAutosizer.h
+++ b/Source/core/rendering/FastTextAutosizer.h
@@ -107,6 +107,11 @@ private:
ContinueLayout
};
+ enum InflateBehavior {
+ ThisBlockOnly,
+ DescendToInnerBlocks
+ };
+
enum BlockFlag {
// A block that is evaluated for becoming a cluster root.
POTENTIAL_ROOT = 1 << 0,
@@ -245,7 +250,7 @@ private:
void beginLayout(RenderBlock*);
void endLayout(RenderBlock*);
void inflateAutoTable(RenderTable*);
- float inflate(RenderObject*, float multiplier = 0);
+ float inflate(RenderObject*, InflateBehavior = ThisBlockOnly, float multiplier = 0);
bool shouldHandleLayout() const;
void setAllTextNeedsLayout();
void resetMultipliers();
« no previous file with comments | « LayoutTests/fast/text-autosizing/nested-table-long-word-2-expected.html ('k') | Source/core/rendering/FastTextAutosizer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698