Source/WebCore/rendering/RenderObject.h - Issue 6949014: Merge 85964

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/RenderObject.h

Issue 6949014: Merge 85964 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/742/

Patch Set: Created 9 years, 7 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/RenderObject.h

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

--- Source/WebCore/rendering/RenderObject.h (revision 86000)

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

@@ -1007,7 +1007,9 @@

if (!container && !o->isRenderView())

return;

if (!last->isText() && (last->style()->position() == FixedPosition || last->style()->position() == AbsolutePosition)) {

- if (o->m_posChildNeedsLayout)

+ while (o && !o->isRenderBlock()) // Skip relatively positioned inlines and get to the enclosing RenderBlock.

+ o = o->container();

+ if (!o || o->m_posChildNeedsLayout)

return;

o->m_posChildNeedsLayout = true;

simplifiedNormalFlowLayout = true;