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

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: Fix jchaffraix' issues. Created 6 years, 7 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 | « Source/core/core.gypi ('k') | Source/core/rendering/InlineTextBox.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/resolver/StyleAdjuster.cpp
diff --git a/Source/core/css/resolver/StyleAdjuster.cpp b/Source/core/css/resolver/StyleAdjuster.cpp
index 8f4133988b4b85efbf1714e1c8bf8915c6672f04..24a0a295ecba05aff6b5139e99229b0d104ba17e 100644
--- a/Source/core/css/resolver/StyleAdjuster.cpp
+++ b/Source/core/css/resolver/StyleAdjuster.cpp
@@ -137,7 +137,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
@@ -245,9 +245,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);
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/rendering/InlineTextBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698