Source/core/layout/LayoutBlock.cpp - Issue 1156143002: *** NOT FOR LANDING *** Text nodes should only inherit inheritable properties.

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/layout/LayoutBlock.cpp

Issue 1156143002: *** NOT FOR LANDING *** Text nodes should only inherit inheritable properties. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Some tests need to be rebaselined. Text nodes can no longer have z-index. Created 5 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:

View side-by-side diff with in-line comments

Download patch

Index: Source/core/layout/LayoutBlock.cpp

diff --git a/Source/core/layout/LayoutBlock.cpp b/Source/core/layout/LayoutBlock.cpp

index 63e4afc3616059abd6a55f78f5792e6f5a4af99b..58e2cc45f7c297cf45a0e5abc28686ec327d4a57 100644

--- a/Source/core/layout/LayoutBlock.cpp

+++ b/Source/core/layout/LayoutBlock.cpp

@@ -781,7 +781,7 @@ LayoutBlockFlow* LayoutBlock::columnsBlockForSpanningElement(LayoutObject* newCh

// cross the streams and have to cope with both types of continuations mixed together).

// This function currently supports (1) and (2).

LayoutBlockFlow* columnsBlockAncestor = 0;

- if (!newChild->isText() && newChild->style()->columnSpan() && !newChild->isBeforeOrAfterContent()

+ if (newChild->style()->columnSpan() && !newChild->isBeforeOrAfterContent()

&& !newChild->isFloatingOrOutOfFlowPositioned() && !newChild->isInline() && !newChild->isTablePart()

&& !isAnonymousColumnSpanBlock()) {

columnsBlockAncestor = containingColumnsBlock(false);

« Source/core/dom/LayoutTreeBuilder.cpp ('K') | « Source/core/frame/FrameView.cpp ('k') | Source/core/layout/LayoutCounter.cpp » ('j') | Source/core/layout/LayoutText.cpp » ('J')