| Index: Source/core/paint/InlineTextBoxPainter.cpp
|
| diff --git a/Source/core/paint/InlineTextBoxPainter.cpp b/Source/core/paint/InlineTextBoxPainter.cpp
|
| index 5187bd0ff4db450040a6de175ead93cfda475994..12b68201d53a6d8f67460a83f8622bc565d02d4b 100644
|
| --- a/Source/core/paint/InlineTextBoxPainter.cpp
|
| +++ b/Source/core/paint/InlineTextBoxPainter.cpp
|
| @@ -99,7 +99,7 @@ void InlineTextBoxPainter::paint(const PaintInfo& paintInfo, const LayoutPoint&
|
| }
|
|
|
| GraphicsContext* context = paintInfo.context;
|
| - RenderStyle* styleToUse = m_inlineTextBox.renderer().style(m_inlineTextBox.isFirstLineStyle());
|
| + const RenderStyle* styleToUse = m_inlineTextBox.renderer().style(m_inlineTextBox.isFirstLineStyle());
|
|
|
| adjustedPaintOffset.move(0, styleToUse->isHorizontalWritingMode() ? LayoutUnit() : -m_inlineTextBox.logicalHeight().toLayoutUnit());
|
|
|
| @@ -258,7 +258,7 @@ unsigned InlineTextBoxPainter::underlinePaintEnd(const CompositionUnderline& und
|
| return paintEnd;
|
| }
|
|
|
| -void InlineTextBoxPainter::paintCompositionBackgrounds(GraphicsContext* pt, const FloatPoint& boxOrigin, RenderStyle* style, const Font& font, bool useCustomUnderlines)
|
| +void InlineTextBoxPainter::paintCompositionBackgrounds(GraphicsContext* pt, const FloatPoint& boxOrigin, const RenderStyle* style, const Font& font, bool useCustomUnderlines)
|
| {
|
| if (useCustomUnderlines) {
|
| // Paint custom background highlights for compositions.
|
| @@ -277,7 +277,7 @@ void InlineTextBoxPainter::paintCompositionBackgrounds(GraphicsContext* pt, cons
|
| }
|
| }
|
|
|
| -void InlineTextBoxPainter::paintSingleCompositionBackgroundRun(GraphicsContext* context, const FloatPoint& boxOrigin, RenderStyle* style, const Font& font, Color backgroundColor, int startPos, int endPos)
|
| +void InlineTextBoxPainter::paintSingleCompositionBackgroundRun(GraphicsContext* context, const FloatPoint& boxOrigin, const RenderStyle* style, const Font& font, Color backgroundColor, int startPos, int endPos)
|
| {
|
| int sPos = std::max(startPos - static_cast<int>(m_inlineTextBox.start()), 0);
|
| int ePos = std::min(endPos - static_cast<int>(m_inlineTextBox.start()), static_cast<int>(m_inlineTextBox.len()));
|
| @@ -290,7 +290,7 @@ void InlineTextBoxPainter::paintSingleCompositionBackgroundRun(GraphicsContext*
|
| context->drawHighlightForText(font, m_inlineTextBox.constructTextRun(style, font), localOrigin, selHeight, backgroundColor, sPos, ePos);
|
| }
|
|
|
| -void InlineTextBoxPainter::paintDocumentMarkers(GraphicsContext* pt, const FloatPoint& boxOrigin, RenderStyle* style, const Font& font, bool background)
|
| +void InlineTextBoxPainter::paintDocumentMarkers(GraphicsContext* pt, const FloatPoint& boxOrigin, const RenderStyle* style, const Font& font, bool background)
|
| {
|
| if (!m_inlineTextBox.renderer().node())
|
| return;
|
| @@ -358,7 +358,7 @@ static GraphicsContext::DocumentMarkerLineStyle lineStyleForMarkerType(DocumentM
|
| }
|
| }
|
|
|
| -void InlineTextBoxPainter::paintDocumentMarker(GraphicsContext* pt, const FloatPoint& boxOrigin, DocumentMarker* marker, RenderStyle* style, const Font& font, bool grammar)
|
| +void InlineTextBoxPainter::paintDocumentMarker(GraphicsContext* pt, const FloatPoint& boxOrigin, DocumentMarker* marker, const RenderStyle* style, const Font& font, bool grammar)
|
| {
|
| // Never print spelling/grammar markers (5327887)
|
| if (m_inlineTextBox.renderer().document().printing())
|
| @@ -426,7 +426,7 @@ void InlineTextBoxPainter::paintDocumentMarker(GraphicsContext* pt, const FloatP
|
| pt->drawLineForDocumentMarker(FloatPoint(boxOrigin.x() + start, boxOrigin.y() + underlineOffset), width, lineStyleForMarkerType(marker->type()));
|
| }
|
|
|
| -void InlineTextBoxPainter::paintSelection(GraphicsContext* context, const FloatPoint& boxOrigin, RenderStyle* style, const Font& font, Color textColor)
|
| +void InlineTextBoxPainter::paintSelection(GraphicsContext* context, const FloatPoint& boxOrigin, const RenderStyle* style, const Font& font, Color textColor)
|
| {
|
| // See if we have a selection to paint at all.
|
| int sPos, ePos;
|
| @@ -708,7 +708,7 @@ void InlineTextBoxPainter::paintDecoration(GraphicsContext* context, const Float
|
| // Use a special function for underlines to get the positioning exactly right.
|
| bool isPrinting = m_inlineTextBox.renderer().document().printing();
|
|
|
| - RenderStyle* styleToUse = m_inlineTextBox.renderer().style(m_inlineTextBox.isFirstLineStyle());
|
| + const RenderStyle* styleToUse = m_inlineTextBox.renderer().style(m_inlineTextBox.isFirstLineStyle());
|
| int baseline = styleToUse->fontMetrics().ascent();
|
|
|
| // Set the thick of the line to be 10% (or something else ?)of the computed font size and not less than 1px.
|
| @@ -774,7 +774,7 @@ void InlineTextBoxPainter::paintCompositionUnderline(GraphicsContext* ctx, const
|
| ctx->drawLineForText(FloatPoint(boxOrigin.x() + start, boxOrigin.y() + m_inlineTextBox.logicalHeight() - lineThickness), width, m_inlineTextBox.renderer().document().printing());
|
| }
|
|
|
| -void InlineTextBoxPainter::paintTextMatchMarker(GraphicsContext* pt, const FloatPoint& boxOrigin, DocumentMarker* marker, RenderStyle* style, const Font& font)
|
| +void InlineTextBoxPainter::paintTextMatchMarker(GraphicsContext* pt, const FloatPoint& boxOrigin, DocumentMarker* marker, const RenderStyle* style, const Font& font)
|
| {
|
| // Use same y positioning and height as for selection, so that when the selection and this highlight are on
|
| // the same word there are no pieces sticking out.
|
|
|