Source/core/frame/FrameView.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/frame/FrameView.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/frame/FrameView.cpp

diff --git a/Source/core/frame/FrameView.cpp b/Source/core/frame/FrameView.cpp

index a5991c617e53526b6680d0eb7d31ac7b598f247f..ab6a105a6ddf21ebe29862ca8789586ab60ee939 100644

--- a/Source/core/frame/FrameView.cpp

+++ b/Source/core/frame/FrameView.cpp

@@ -4031,11 +4031,6 @@ LayoutObject* FrameView::viewportLayoutObject()

void FrameView::collectAnnotatedRegions(LayoutObject& layoutObject, Vector<AnnotatedRegionValue>& regions)

{

- // LayoutTexts don't have their own style, they just use their parent's style,

- // so we don't want to include them.

- if (layoutObject.isText())

- return;

layoutObject.addAnnotatedRegions(regions);

for (LayoutObject* curr = layoutObject.slowFirstChild(); curr; curr = curr->nextSibling())

collectAnnotatedRegions(*curr, regions);

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