Source/core/rendering/style/RenderStyle.cpp - Issue 18859010: Move colorFromPrimitiveValue from StyleResolverState to TextLinkColors

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/style/RenderStyle.cpp

Issue 18859010: Move colorFromPrimitiveValue from StyleResolverState to TextLinkColors (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 7 years, 5 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/rendering/style/RenderStyle.cpp

diff --git a/Source/core/rendering/style/RenderStyle.cpp b/Source/core/rendering/style/RenderStyle.cpp

index a48257fdfa04ec7ca1520c628dd7a1e98e6c0649..0590d35a4de9cb3f58fc64bac46eb34f79d7acb6 100644

--- a/Source/core/rendering/style/RenderStyle.cpp

+++ b/Source/core/rendering/style/RenderStyle.cpp

@@ -188,6 +188,7 @@ void RenderStyle::copyNonInheritedFrom(const RenderStyle* other)

noninherited_flags._page_break_after = other->noninherited_flags._page_break_after;

noninherited_flags._page_break_inside = other->noninherited_flags._page_break_inside;

noninherited_flags.explicitInheritance = other->noninherited_flags.explicitInheritance;

+ noninherited_flags.currentColor = other->noninherited_flags.currentColor;

if (m_svgStyle != other->m_svgStyle)

m_svgStyle.access()->copyNonInheritedFrom(other->m_svgStyle.get());

ASSERT(zoom() == initialZoom());