Source/WebCore/rendering/TextAutosizer.h - Issue 12326104: Merge 142866

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/WebCore/rendering/TextAutosizer.h

Issue 12326104: Merge 142866 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/

Patch Set: Created 7 years, 10 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 | « LayoutTests/fast/text-autosizing/narrow-descendants-combined-expected.html ('k') | Source/WebCore/rendering/TextAutosizer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/WebCore/rendering/TextAutosizer.h

===================================================================

--- Source/WebCore/rendering/TextAutosizer.h (revision 143928)

+++ Source/WebCore/rendering/TextAutosizer.h (working copy)

@@ -61,7 +61,9 @@

explicit TextAutosizer(Document*);

+ void processClusterInternal(TextAutosizingClusterInfo&, RenderBlock* container, RenderObject* subtreeRoot, const TextAutosizingWindowInfo&, float textWidth, bool shouldBeAutosized);

void processCluster(TextAutosizingClusterInfo&, RenderBlock* container, RenderObject* subtreeRoot, const TextAutosizingWindowInfo&);

+ void processCompositeCluster(Vector<TextAutosizingClusterInfo>&, const TextAutosizingWindowInfo&);

void processContainer(float multiplier, RenderBlock* container, TextAutosizingClusterInfo&, RenderObject* subtreeRoot, const TextAutosizingWindowInfo&);

void setMultiplier(RenderObject*, float);

@@ -77,6 +79,7 @@

static bool containerIsRowOfLinks(const RenderObject* container);

static bool contentHeightIsConstrained(const RenderBlock* container);

static bool clusterShouldBeAutosized(TextAutosizingClusterInfo&, float blockWidth);

+ static bool compositeClusterShouldBeAutosized(Vector<TextAutosizingClusterInfo>&, float blockWidth);

static void measureDescendantTextWidth(const RenderBlock* container, TextAutosizingClusterInfo&, float minTextWidth, float& textWidth);

// Use to traverse the tree of descendants, excluding descendants of containers (but returning the containers themselves).