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

Unified Diff: Source/core/paint/SVGInlineTextBoxPainter.cpp

Issue 889563002: Make RenderObject::style() return a const object (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Blind fix for Mac. Created 5 years, 11 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
Index: Source/core/paint/SVGInlineTextBoxPainter.cpp
diff --git a/Source/core/paint/SVGInlineTextBoxPainter.cpp b/Source/core/paint/SVGInlineTextBoxPainter.cpp
index ddd51c06f2840959f1c8fb6e5d4da1ad9f3dc941..46ff853ecbace852cd9585d49f0c27b476a48e24 100644
--- a/Source/core/paint/SVGInlineTextBoxPainter.cpp
+++ b/Source/core/paint/SVGInlineTextBoxPainter.cpp
@@ -56,7 +56,7 @@ void SVGInlineTextBoxPainter::paint(const PaintInfo& paintInfo, const LayoutPoin
return;
RenderObject& parentRenderer = m_svgInlineTextBox.parent()->renderer();
- RenderStyle* style = parentRenderer.style();
+ const RenderStyle* style = parentRenderer.style();
ASSERT(style);
InlineTextBoxPainter(m_svgInlineTextBox).paintDocumentMarkers(
@@ -75,13 +75,13 @@ void SVGInlineTextBoxPainter::paint(const PaintInfo& paintInfo, const LayoutPoin
void SVGInlineTextBoxPainter::paintTextFragments(const PaintInfo& paintInfo, RenderObject& parentRenderer)
{
- RenderStyle* style = parentRenderer.style();
+ const RenderStyle* style = parentRenderer.style();
const SVGRenderStyle& svgStyle = style->svgStyle();
bool hasFill = svgStyle.hasFill();
bool hasVisibleStroke = svgStyle.hasVisibleStroke();
- RenderStyle* selectionStyle = style;
+ const RenderStyle* selectionStyle = style;
bool shouldPaintSelection = this->shouldPaintSelection();
if (shouldPaintSelection) {
selectionStyle = parentRenderer.getCachedPseudoStyle(SELECTION);
@@ -164,7 +164,7 @@ void SVGInlineTextBoxPainter::paintSelectionBackground(const PaintInfo& paintInf
if (!textShouldBePainted(textRenderer))
return;
- RenderStyle* style = m_svgInlineTextBox.parent()->renderer().style();
+ const RenderStyle* style = m_svgInlineTextBox.parent()->renderer().style();
ASSERT(style);
int startPosition, endPosition;
@@ -242,7 +242,7 @@ void SVGInlineTextBoxPainter::paintDecoration(const PaintInfo& paintInfo, TextDe
// Find out which render style defined the text-decoration, as its fill/stroke properties have to be used for drawing instead of ours.
RenderObject* decorationRenderer = findRenderObjectDefininingTextDecoration(m_svgInlineTextBox.parent());
- RenderStyle* decorationStyle = decorationRenderer->style();
+ const RenderStyle* decorationStyle = decorationRenderer->style();
ASSERT(decorationStyle);
if (decorationStyle->visibility() == HIDDEN)
@@ -292,7 +292,7 @@ void SVGInlineTextBoxPainter::paintDecoration(const PaintInfo& paintInfo, TextDe
}
}
-void SVGInlineTextBoxPainter::paintTextWithShadows(const PaintInfo& paintInfo, RenderStyle* style,
+void SVGInlineTextBoxPainter::paintTextWithShadows(const PaintInfo& paintInfo, const RenderStyle* style,
TextRun& textRun, const SVGTextFragment& fragment, int startPosition, int endPosition,
RenderSVGResourceMode resourceMode)
{
@@ -350,8 +350,8 @@ void SVGInlineTextBoxPainter::paintTextWithShadows(const PaintInfo& paintInfo, R
scaledFont.drawText(context, textRunPaintInfo, textOrigin);
}
-void SVGInlineTextBoxPainter::paintText(const PaintInfo& paintInfo, RenderStyle* style,
- RenderStyle* selectionStyle, const SVGTextFragment& fragment,
+void SVGInlineTextBoxPainter::paintText(const PaintInfo& paintInfo, const RenderStyle* style,
+ const RenderStyle* selectionStyle, const SVGTextFragment& fragment,
RenderSVGResourceMode resourceMode, bool shouldPaintSelection)
{
ASSERT(style);
@@ -396,7 +396,7 @@ void SVGInlineTextBoxPainter::paintText(const PaintInfo& paintInfo, RenderStyle*
paintTextWithShadows(paintInfo, style, textRun, fragment, endPosition, fragment.length, resourceMode);
}
-void SVGInlineTextBoxPainter::paintTextMatchMarker(GraphicsContext* context, const FloatPoint&, DocumentMarker* marker, RenderStyle* style, const Font& font)
+void SVGInlineTextBoxPainter::paintTextMatchMarker(GraphicsContext* context, const FloatPoint&, DocumentMarker* marker, const RenderStyle* style, const Font& font)
{
// SVG is only interested in the TextMatch markers.
if (marker->type() != DocumentMarker::TextMatch)

Powered by Google App Engine
This is Rietveld 408576698