Chromium Code Reviews| Index: sky/engine/core/rendering/InlineTextBox.cpp |
| diff --git a/sky/engine/core/rendering/InlineTextBox.cpp b/sky/engine/core/rendering/InlineTextBox.cpp |
| index 0d472c873e54fc5299e6dc1348a3d6081d7e1e87..6fe8624030bc5d523938865a36e1e522326c1df5 100644 |
| --- a/sky/engine/core/rendering/InlineTextBox.cpp |
| +++ b/sky/engine/core/rendering/InlineTextBox.cpp |
| @@ -617,18 +617,16 @@ void InlineTextBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset, |
| paintDecoration(context, boxOrigin, textDecorations); |
| } |
| - if (paintInfo.phase == PaintPhaseForeground) { |
| - paintDocumentMarkers(context, boxOrigin, styleToUse, font, false); |
| - |
| - // Paint custom underlines for compositions. |
| - if (useCustomUnderlines) { |
| - const Vector<CompositionUnderline>& underlines = renderer().frame()->inputMethodController().customCompositionUnderlines(); |
| - CompositionUnderlineRangeFilter filter(underlines, start(), end()); |
| - for (CompositionUnderlineRangeFilter::ConstIterator it = filter.begin(); it != filter.end(); ++it) { |
| - if (it->color == Color::transparent) |
| - continue; |
| - paintCompositionUnderline(context, boxOrigin, *it); |
| - } |
| + paintDocumentMarkers(context, boxOrigin, styleToUse, font, false); |
|
ojan
2015/01/30 01:25:59
Not sure why we'd want to skip this code if we're
|
| + |
| + // Paint custom underlines for compositions. |
| + if (useCustomUnderlines) { |
| + const Vector<CompositionUnderline>& underlines = renderer().frame()->inputMethodController().customCompositionUnderlines(); |
| + CompositionUnderlineRangeFilter filter(underlines, start(), end()); |
| + for (CompositionUnderlineRangeFilter::ConstIterator it = filter.begin(); it != filter.end(); ++it) { |
| + if (it->color == Color::transparent) |
| + continue; |
| + paintCompositionUnderline(context, boxOrigin, *it); |
| } |
| } |
| } |