Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(762)

Unified Diff: third_party/WebKit/Source/core/style/ComputedStyle.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/Source/core/style/ComputedStyle.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/style/ComputedStyle.cpp
diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.cpp b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
index 308fd1a45dd9154198195118f6e225e6dd825a83..97040a915543921453596480e6e8decb55d78722 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
@@ -1568,6 +1568,13 @@ void ComputedStyle::clearAppliedTextDecorations()
m_rareInheritedData.access()->appliedTextDecorations = nullptr;
}
+void ComputedStyle::restoreParentTextDecorations(const ComputedStyle& parentStyle)
+{
+ m_inheritedData.m_textUnderline = parentStyle.m_inheritedData.m_textUnderline;
+ if (m_rareInheritedData->appliedTextDecorations != parentStyle.m_rareInheritedData->appliedTextDecorations)
+ m_rareInheritedData.access()->appliedTextDecorations = parentStyle.m_rareInheritedData->appliedTextDecorations;
+}
+
void ComputedStyle::clearMultiCol()
{
m_rareNonInheritedData.access()->m_multiCol = nullptr;
« no previous file with comments | « third_party/WebKit/Source/core/style/ComputedStyle.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698