Chromium Code Reviews| Index: Source/core/css/resolver/StyleAdjuster.cpp |
| diff --git a/Source/core/css/resolver/StyleAdjuster.cpp b/Source/core/css/resolver/StyleAdjuster.cpp |
| index c364b0db535fa8993c5a3b4f7ffdb48e5f9f9f44..02c1dd50170ea9d854e26c7febbc88db9278f1da 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()); |
|
Julien - ping for review
2014/05/05 17:45:08
AFAICT this was the only caller of setTextDecorati
andersr
2014/05/06 13:15:29
Ah, yes. That is no reason to be sad. ;)
|
| - else |
| - style->addToTextDecorationsInEffect(style->textDecoration()); |
| + style->clearAppliedTextDecorations(); |
| + |
| + style->applyTextDecorations(); |
| if (style->overflowX() != OVISIBLE || style->overflowY() != OVISIBLE) |
| adjustOverflow(style, e); |