Source/WebCore/rendering/RenderBox.cpp - Issue 7050016: Merge 86448

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

Issue 7050016: Merge 86448 (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/RenderBox.cpp

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

--- Source/WebCore/rendering/RenderBox.cpp (revision 86860)

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

@@ -223,7 +223,7 @@

for (RenderObject* curr = parent(); curr && !curr->isRenderView(); curr = curr->parent()) {

if (curr->isRenderBlock()) {

RenderBlock* currBlock = toRenderBlock(curr);

- if (currBlock->containsFloat(this))

+ if (!parentBlock || currBlock->containsFloat(this))

parentBlock = currBlock;

}

« no previous file with comments | « LayoutTests/fast/block/float/float-not-removed-crash-expected.txt ('k') | no next file » | no next file with comments »