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

Unified Diff: Source/core/paint/EllipsisBoxPainter.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/EllipsisBoxPainter.cpp
diff --git a/Source/core/paint/EllipsisBoxPainter.cpp b/Source/core/paint/EllipsisBoxPainter.cpp
index 0cf37be456d2266c342a98f0a79f9cee50cff481..5196cd9e13f023a5e1cacfde335b701854ac6289 100644
--- a/Source/core/paint/EllipsisBoxPainter.cpp
+++ b/Source/core/paint/EllipsisBoxPainter.cpp
@@ -17,12 +17,12 @@ namespace blink {
void EllipsisBoxPainter::paint(const PaintInfo& paintInfo, const LayoutPoint& paintOffset, LayoutUnit lineTop, LayoutUnit lineBottom)
{
- RenderStyle* style = m_ellipsisBox.renderer().style(m_ellipsisBox.isFirstLineStyle());
+ const RenderStyle* style = m_ellipsisBox.renderer().style(m_ellipsisBox.isFirstLineStyle());
paintEllipsis(paintInfo, paintOffset, lineTop, lineBottom, style);
paintMarkupBox(paintInfo, paintOffset, lineTop, lineBottom, style);
}
-void EllipsisBoxPainter::paintEllipsis(const PaintInfo& paintInfo, const LayoutPoint& paintOffset, LayoutUnit lineTop, LayoutUnit lineBottom, RenderStyle* style)
+void EllipsisBoxPainter::paintEllipsis(const PaintInfo& paintInfo, const LayoutPoint& paintOffset, LayoutUnit lineTop, LayoutUnit lineBottom, const RenderStyle* style)
{
GraphicsContext* context = paintInfo.context;
FloatPoint boxOrigin = m_ellipsisBox.locationIncludingFlipping().toFloatPoint();
@@ -58,7 +58,7 @@ void EllipsisBoxPainter::paintEllipsis(const PaintInfo& paintInfo, const LayoutP
textPainter.paint(0, m_ellipsisBox.ellipsisStr().length(), m_ellipsisBox.ellipsisStr().length(), textStyle);
}
-void EllipsisBoxPainter::paintMarkupBox(const PaintInfo& paintInfo, const LayoutPoint& paintOffset, LayoutUnit lineTop, LayoutUnit lineBottom, RenderStyle* style)
+void EllipsisBoxPainter::paintMarkupBox(const PaintInfo& paintInfo, const LayoutPoint& paintOffset, LayoutUnit lineTop, LayoutUnit lineBottom, const RenderStyle* style)
{
InlineBox* markupBox = m_ellipsisBox.markupBox();
if (!markupBox)
@@ -70,7 +70,7 @@ void EllipsisBoxPainter::paintMarkupBox(const PaintInfo& paintInfo, const Layout
markupBox->paint(paintInfo, adjustedPaintOffset, lineTop, lineBottom);
}
-void EllipsisBoxPainter::paintSelection(GraphicsContext* context, const FloatPoint& boxOrigin, RenderStyle* style, const Font& font)
+void EllipsisBoxPainter::paintSelection(GraphicsContext* context, const FloatPoint& boxOrigin, const RenderStyle* style, const Font& font)
{
Color textColor = m_ellipsisBox.renderer().resolveColor(style, CSSPropertyColor);
Color c = m_ellipsisBox.renderer().selectionBackgroundColor();

Powered by Google App Engine
This is Rietveld 408576698