Source/WebCore/rendering/RenderBlock.cpp - Issue 10880056: Merge 124564

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

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

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

Index: Source/WebCore/rendering/RenderBlock.cpp

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

--- Source/WebCore/rendering/RenderBlock.cpp (revision 126638)

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

@@ -1169,8 +1169,8 @@

// column span flag if it is set.

ASSERT(!inlineChildrenBlock->continuation());

RefPtr<RenderStyle> newStyle = RenderStyle::createAnonymousStyleWithDisplay(style(), BLOCK);

+ inlineChildrenBlock->setStyle(newStyle);

children()->removeChildNode(this, inlineChildrenBlock, inlineChildrenBlock->hasLayer());

- inlineChildrenBlock->setStyle(newStyle);

// Now just put the inlineChildrenBlock inside the blockChildrenBlock.

blockChildrenBlock->children()->insertChildNode(blockChildrenBlock, inlineChildrenBlock, prev == inlineChildrenBlock ? blockChildrenBlock->firstChild() : 0,

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