| Index: Source/core/rendering/FastTextAutosizer.h
|
| diff --git a/Source/core/rendering/FastTextAutosizer.h b/Source/core/rendering/FastTextAutosizer.h
|
| index de1293d9fa8ad30132904d3b84710cbf17087e4d..7020cbcd0a2e3ccac494344d5cb6432e33bd04fc 100644
|
| --- a/Source/core/rendering/FastTextAutosizer.h
|
| +++ b/Source/core/rendering/FastTextAutosizer.h
|
| @@ -65,6 +65,8 @@ public:
|
| void beginLayout(RenderBlock*);
|
| void endLayout(RenderBlock*);
|
|
|
| + void inflateListItem(RenderBlock*, RenderObject*);
|
| +
|
| private:
|
| struct Cluster {
|
| explicit Cluster(const RenderBlock* root, bool autosize, Cluster* parent)
|
| @@ -126,13 +128,13 @@ private:
|
| Cluster* maybeGetOrCreateCluster(const RenderBlock*);
|
| Cluster* addSupercluster(AtomicString, const RenderBlock*);
|
| const RenderBlock* deepestCommonAncestor(BlockSet&);
|
| - float clusterMultiplier(Cluster*);
|
| + float clusterMultiplier(Cluster*, const RenderBlock* forceInclude = 0);
|
| void applyMultiplier(RenderObject*, float);
|
|
|
| Cluster* currentCluster() const;
|
|
|
| RenderObject* nextChildSkippingChildrenOfBlocks(const RenderObject*, const RenderObject*);
|
| - const RenderBlock* findDeepestBlockContainingAllText(const RenderBlock*);
|
| + const RenderBlock* findDeepestBlockContainingAllText(const RenderBlock*, const RenderBlock* forceInclude = 0);
|
| // Returns the first text leaf that is in the current cluster and not in a descendent cluster.
|
| // The TraversalDirection controls whether we return the first or the last text leaf.
|
| const RenderObject* findTextLeaf(const RenderObject*, size_t&, TextLeafSearch);
|
|
|