Source/core/css/resolver/StyleResolver.cpp - Issue 201683003: Remove resetStyleInheritance.

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/css/resolver/StyleResolver.cpp

Issue 201683003: Remove resetStyleInheritance. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Resolve conflicts Created 6 years, 9 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/core/css/resolver/StyleResolver.cpp

diff --git a/Source/core/css/resolver/StyleResolver.cpp b/Source/core/css/resolver/StyleResolver.cpp

index 7e1c31e0da08dd383102ea50b86456382287758f..9f595d56e77d0c491409f2ccff8e1c2e2e606e94 100644

--- a/Source/core/css/resolver/StyleResolver.cpp

+++ b/Source/core/css/resolver/StyleResolver.cpp

@@ -1000,7 +1000,7 @@ PassRefPtr<RenderStyle> StyleResolver::styleForText(Text* textNode)

NodeRenderingTraversal::ParentDetails parentDetails;

Node* parentNode = NodeRenderingTraversal::parent(textNode, &parentDetails);

- if (!parentNode || !parentNode->renderStyle() || parentDetails.resetStyleInheritance())

+ if (!parentNode || !parentNode->renderStyle())

return defaultStyleForElement();

return parentNode->renderStyle();

}