Source/core/rendering/RenderInline.cpp - Issue 68013006: Fix render tree construction when inlines are inserted in reverse after a block in a continuation

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

Issue 68013006: Fix render tree construction when inlines are inserted in reverse after a block in a continuation (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 7 years, 1 month 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

« LayoutTests/fast/inline/continuation-inlines-inserted-in-reverse-after-block.html ('K') | « LayoutTests/platform/win/tables/mozilla/bugs/bug113235-3-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/rendering/RenderInline.cpp

diff --git a/Source/core/rendering/RenderInline.cpp b/Source/core/rendering/RenderInline.cpp

index 92d87c1eb3f6b86f82e070f7071130794bc289f6..63f310f57a8c9bf4c76ddeda07bfacf852826af7 100644

--- a/Source/core/rendering/RenderInline.cpp

+++ b/Source/core/rendering/RenderInline.cpp

@@ -514,12 +514,11 @@ void RenderInline::addChildToContinuation(RenderObject* newChild, RenderObject*

else {

// The goal here is to match up if we can, so that we can coalesce and create the

// minimal # of continuations needed for the inline.

- if (childInline == bcpInline)

+ if (childInline == bcpInline || (beforeChild && beforeChild->isInline()))

return beforeChildParent->addChildIgnoringContinuation(newChild, beforeChild);

- else if (flowInline == childInline)

+ if (flowInline == childInline)

return flow->addChildIgnoringContinuation(newChild, 0); // Just treat like an append.

- else

- return beforeChildParent->addChildIgnoringContinuation(newChild, beforeChild);

+ return beforeChildParent->addChildIgnoringContinuation(newChild, beforeChild);

}