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

Unified Diff: Source/core/css/resolver/StyleAdjuster.cpp

Issue 219633002: Proper support for multiple text decorations. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 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:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/css/resolver/StyleAdjuster.cpp
diff --git a/Source/core/css/resolver/StyleAdjuster.cpp b/Source/core/css/resolver/StyleAdjuster.cpp
index 624d735a327c199e7d7222c5b86249324fd82225..165ceb006db5fa60a12a47ceebfb806715918d36 100644
--- a/Source/core/css/resolver/StyleAdjuster.cpp
+++ b/Source/core/css/resolver/StyleAdjuster.cpp
@@ -136,7 +136,7 @@ static bool doesNotInheritTextDecoration(const RenderStyle* style, const Element
{
return style->display() == TABLE || style->display() == INLINE_TABLE
|| style->display() == INLINE_BLOCK || style->display() == INLINE_BOX || isAtShadowBoundary(e)
- || style->isFloating() || style->hasOutOfFlowPosition();
+ || style->isFloating() || style->hasOutOfFlowPosition() || isHTMLRTElement(e);
}
// FIXME: This helper is only needed because pseudoStyleForElement passes a null
@@ -242,9 +242,9 @@ void StyleAdjuster::adjustRenderStyle(RenderStyle* style, RenderStyle* parentSty
}
if (doesNotInheritTextDecoration(style, e))
- style->setTextDecorationsInEffect(style->textDecoration());
- else
- style->addToTextDecorationsInEffect(style->textDecoration());
+ style->clearAppliedTextDecorations();
+
+ style->applyTextDecorations();
if (style->overflowX() != OVISIBLE || style->overflowY() != OVISIBLE)
adjustOverflow(style, e);

Powered by Google App Engine
This is Rietveld 408576698