third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp - Issue 2227003002: CSS: animated text-decoration-line overrides inline style

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: third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp

Issue 2227003002: CSS: animated text-decoration-line overrides inline style (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: StyleAdjuster uses parent appliedTextDecorations Created 4 years, 4 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

« no previous file with comments | « third_party/WebKit/LayoutTests/animations/text-decoration-expected.html ('k') | third_party/WebKit/Source/core/style/ComputedStyle.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp

diff --git a/third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp b/third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp

index 90e4221c16c3c86f203ecf958624440bb553e9a0..0b4bbc5338a574c0a19dcf353a24a98d12a34414 100644

--- a/third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp

+++ b/third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp

@@ -382,7 +382,8 @@ void StyleAdjuster::adjustComputedStyle(ComputedStyle& style, const ComputedStyl

if (doesNotInheritTextDecoration(style, element))

style.clearAppliedTextDecorations();

+ else

+ style.restoreParentTextDecorations(parentStyle);

style.applyTextDecorations();

// Cull out any useless layers and also repeat patterns into additional layers.