Implement interfaces in PaintInfo and make it a class.

Source/core/rendering/InlineTextBox.cpp

Index: Source/core/rendering/InlineTextBox.cpp
diff --git a/Source/core/rendering/InlineTextBox.cpp b/Source/core/rendering/InlineTextBox.cpp
index e2eeae0773a22ce7063620fe64a13fa98a9f888b..9e1442d3df22c19733ed5fd269b31fb48ac0045d 100644
--- a/Source/core/rendering/InlineTextBox.cpp
+++ b/Source/core/rendering/InlineTextBox.cpp
@@ -483,18 +483,18 @@ static inline AffineTransform rotation(const FloatRect& boxRect, RotationDirecti
 void InlineTextBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset, LayoutUnit /*lineTop*/, LayoutUnit /*lineBottom*/)
 {
     if (isLineBreak() || !paintInfo.shouldPaintWithinRoot(renderer()) || renderer()->style()->visibility() != VISIBLE ||
-        m_truncation == cFullTruncation || paintInfo.phase == PaintPhaseOutline || !m_len)
+        m_truncation == cFullTruncation || paintInfo.getPhase() == PaintPhaseOutline || !m_len)
         return;
 
-    ASSERT(paintInfo.phase != PaintPhaseSelfOutline && paintInfo.phase != PaintPhaseChildOutlines);
+    ASSERT(paintInfo.getPhase() != PaintPhaseSelfOutline && paintInfo.getPhase() != PaintPhaseChildOutlines);
 
     LayoutUnit logicalLeftSide = logicalLeftVisualOverflow();
     LayoutUnit logicalRightSide = logicalRightVisualOverflow();
     LayoutUnit logicalStart = logicalLeftSide + (isHorizontal() ? paintOffset.x() : paintOffset.y());
     LayoutUnit logicalExtent = logicalRightSide - logicalLeftSide;
 
-    LayoutUnit paintEnd = isHorizontal() ? paintInfo.rect.maxX() : paintInfo.rect.maxY();
-    LayoutUnit paintStart = isHorizontal() ? paintInfo.rect.x() : paintInfo.rect.y();
+    LayoutUnit paintEnd = isHorizontal() ? paintInfo.getRect().maxX() : paintInfo.getRect().maxY();
+    LayoutUnit paintStart = isHorizontal() ? paintInfo.getRect().x() : paintInfo.getRect().y();
 
     LayoutPoint adjustedPaintOffset = roundedIntPoint(paintOffset);
 
@@ -504,8 +504,8 @@ void InlineTextBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset,
     bool isPrinting = textRenderer()->document()->printing();
 
     // Determine whether or not we're selected.
-    bool haveSelection = !isPrinting && paintInfo.phase != PaintPhaseTextClip && selectionState() != RenderObject::SelectionNone;
-    if (!haveSelection && paintInfo.phase == PaintPhaseSelection)
+    bool haveSelection = !isPrinting && paintInfo.getPhase() != PaintPhaseTextClip && selectionState() != RenderObject::SelectionNone;
+    if (!haveSelection && paintInfo.getPhase() == PaintPhaseSelection)
         // When only painting the selection, don't bother to paint if there is none.
         return;
 
@@ -527,7 +527,7 @@ void InlineTextBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset,
         }
     }
 
-    GraphicsContext* context = paintInfo.context;
+    GraphicsContext* context = paintInfo.getContext();
 
     RenderObject* rendererToUse = renderer();
     RenderStyle* styleToUse = rendererToUse->style(isFirstLineStyle());
@@ -589,7 +589,7 @@ void InlineTextBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset,
             emphasisMarkColor = correctedTextColor(emphasisMarkColor, Color::white);
     }
 
-    bool paintSelectedTextOnly = (paintInfo.phase == PaintPhaseSelection);
+    bool paintSelectedTextOnly = (paintInfo.getPhase() == PaintPhaseSelection);
     bool paintSelectedTextSeparately = false;
 
     Color selectionFillColor = textFillColor;
@@ -648,7 +648,7 @@ void InlineTextBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset,
 
     // 1. Paint backgrounds behind text if needed. Examples of such backgrounds include selection
     // and composition underlines.
-    if (paintInfo.phase != PaintPhaseSelection && paintInfo.phase != PaintPhaseTextClip && !isPrinting) {
+    if (paintInfo.getPhase() != PaintPhaseSelection && paintInfo.getPhase() != PaintPhaseTextClip && !isPrinting) {
 
         if (containsComposition && !useCustomUnderlines)
             paintCompositionBackground(context, boxOrigin, styleToUse, font,
@@ -667,7 +667,7 @@ void InlineTextBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset,
             // legitimately be unpainted if they are waiting on a slow-loading web font. We should fix that, and
             // when we do, we will have to account for the fact the InlineTextBoxes do not always have unique
             // renderers and Page currently relies on each unpainted object having a unique renderer.
-            if (paintInfo.phase == PaintPhaseForeground)
+            if (paintInfo.getPhase() == PaintPhaseForeground)
                 page->addRelevantRepaintedObject(renderer(), IntRect(boxOrigin.x(), boxOrigin.y(), logicalWidth(), logicalHeight()));
         }
     }
@@ -767,7 +767,7 @@ void InlineTextBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset,
 
     // Paint decorations
     TextDecoration textDecorations = styleToUse->textDecorationsInEffect();
-    if (textDecorations != TextDecorationNone && paintInfo.phase != PaintPhaseSelection) {
+    if (textDecorations != TextDecorationNone && paintInfo.getPhase() != PaintPhaseSelection) {
         updateGraphicsContext(context, textFillColor, textStrokeColor, textStrokeWidth);
         if (combinedText)
             context->concatCTM(rotation(boxRect, Clockwise));
@@ -776,7 +776,7 @@ void InlineTextBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset,
             context->concatCTM(rotation(boxRect, Counterclockwise));
     }
 
-    if (paintInfo.phase == PaintPhaseForeground) {
+    if (paintInfo.getPhase() == PaintPhaseForeground) {
         paintDocumentMarkers(context, boxOrigin, styleToUse, font, false);
 
         if (useCustomUnderlines) {