Source/WebCore/rendering/RenderBlockLineLayout.cpp - Issue 10916347: Merge 127381

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/RenderBlockLineLayout.cpp

Issue 10916347: Merge 127381 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1229/

Patch Set: Created 8 years, 3 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:

Index: Source/WebCore/rendering/RenderBlockLineLayout.cpp

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

--- Source/WebCore/rendering/RenderBlockLineLayout.cpp (revision 128797)

+++ Source/WebCore/rendering/RenderBlockLineLayout.cpp (working copy)

@@ -397,9 +397,9 @@

static inline void dirtyLineBoxesForRenderer(RenderObject* o, bool fullLayout)

{

if (o->isText()) {

- if (o->preferredLogicalWidthsDirty() && (o->isCounter() || o->isQuote()))

- toRenderText(o)->computePreferredLogicalWidths(0); // FIXME: Counters depend on this hack. No clue why. Should be investigated and removed.

- toRenderText(o)->dirtyLineBoxes(fullLayout);

+ RenderText* renderText = toRenderText(o);

+ renderText->updateTextIfNeeded(); // FIXME: Counters depend on this hack. No clue why. Should be investigated and removed.

+ renderText->dirtyLineBoxes(fullLayout);

} else

toRenderInline(o)->dirtyLineBoxes(fullLayout);

}