Source/WebCore/rendering/RenderInline.cpp - Issue 10696154: Merge 120639

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

Issue 10696154: Merge 120639 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1180/

Patch Set: Created 8 years, 5 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/RenderInline.cpp

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

--- Source/WebCore/rendering/RenderInline.cpp (revision 122239)

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

@@ -953,8 +953,8 @@

LayoutRect RenderInline::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const

{

- // Only run-ins and first-letter elements are allowed in here during layout.

- ASSERT(!view() || !view()->layoutStateEnabled() || isRunIn() || style()->styleType() == FIRST_LETTER);

+ // Only run-ins are allowed in here during layout.

+ ASSERT(!view() || !view()->layoutStateEnabled() || isRunIn());

if (!firstLineBoxIncludingCulling() && !continuation())

return LayoutRect();

« no previous file with comments | « Source/WebCore/rendering/RenderBlock.cpp ('k') | Source/WebCore/rendering/RenderObject.h » ('j') | no next file with comments »