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 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); |
|
Julien - ping for review
2014/05/06 23:29:30
Is this tested anywhere? Where does the specificat
andersr
2014/05/07 11:17:53
This was done to replace the behavior in the rende
Julien - ping for review
2014/05/09 15:45:50
Maybe it's related to this patch but the fact that
andersr
2014/05/12 11:12:49
Yes, I agree. Note that I did move this change to
|
| } |
| // 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); |