Implement interfaces in PaintInfo and make it a class.

Source/core/rendering/RenderImage.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Allan Sandfeld Jensen (kde@carewolf.com)
  *           (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Google Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011-2012. All rights reserved.
  *
@@ skipping 264 matching lines @@
 
 void RenderImage::paintReplaced(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
     LayoutUnit cWidth = contentWidth();
     LayoutUnit cHeight = contentHeight();
     LayoutUnit leftBorder = borderLeft();
     LayoutUnit topBorder = borderTop();
     LayoutUnit leftPad = paddingLeft();
     LayoutUnit topPad = paddingTop();
 
-    GraphicsContext* context = paintInfo.context;
+    GraphicsContext* context = paintInfo.getContext();
 
     Page* page = 0;
     if (Frame* frame = this->frame())
         page = frame->page();
 
     if (!m_imageResource->hasImage() || m_imageResource->errorOccurred()) {
-        if (paintInfo.phase == PaintPhaseSelection)
+        if (paintInfo.getPhase() == PaintPhaseSelection)
             return;
 
-        if (page && paintInfo.phase == PaintPhaseForeground)
+        if (page && paintInfo.getPhase() == PaintPhaseForeground)
             page->addRelevantUnpaintedObject(this, visualOverflowRect());
 
         if (cWidth > 2 && cHeight > 2) {
             const int borderWidth = 1;
 
             // Draw an outline rect where the image should be.
             context->setStrokeStyle(SolidStroke);
             context->setStrokeColor(Color::lightGray);
             context->setFillColor(Color::transparent);
             context->drawRect(pixelSnappedIntRect(LayoutRect(paintOffset.x() + leftBorder + leftPad, paintOffset.y() + topBorder + topPad, cWidth, cHeight)));
@@ skipping 45 matching lines @@
                 if (errorPictureDrawn) {
                     if (usableWidth >= textWidth && fontMetrics.height() <= imageOffset.height())
                         context->drawText(font, textRunPaintInfo, textOrigin);
                 } else if (usableWidth >= textWidth && usableHeight >= fontMetrics.height())
                     context->drawText(font, textRunPaintInfo, textOrigin);
             }
         }
     } else if (m_imageResource->hasImage() && cWidth > 0 && cHeight > 0) {
         RefPtr<Image> img = m_imageResource->image(cWidth, cHeight);
         if (!img || img->isNull()) {
-            if (page && paintInfo.phase == PaintPhaseForeground)
+            if (page && paintInfo.getPhase() == PaintPhaseForeground)
                 page->addRelevantUnpaintedObject(this, visualOverflowRect());
             return;
         }
 
         LayoutSize contentSize(cWidth, cHeight);
         LayoutPoint contentLocation = paintOffset;
         contentLocation.move(leftBorder + leftPad, topBorder + topPad);
         paintIntoRect(context, LayoutRect(contentLocation, contentSize));
 
-        if (cachedImage() && page && paintInfo.phase == PaintPhaseForeground) {
+        if (cachedImage() && page && paintInfo.getPhase() == PaintPhaseForeground) {
             // For now, count images as unpainted if they are still progressively loading. We may want
             // to refine this in the future to account for the portion of the image that has painted.
             if (cachedImage()->isLoading())
                 page->addRelevantUnpaintedObject(this, LayoutRect(contentLocation, contentSize));
             else
                 page->addRelevantRepaintedObject(this, LayoutRect(contentLocation, contentSize));
         }
     }
 }
 
 void RenderImage::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
     RenderReplaced::paint(paintInfo, paintOffset);
 
-    if (paintInfo.phase == PaintPhaseOutline)
+    if (paintInfo.getPhase() == PaintPhaseOutline)
         paintAreaElementFocusRing(paintInfo);
 }
 
 void RenderImage::paintAreaElementFocusRing(PaintInfo& paintInfo)
 {
     Document* document = this->document();
 
     if (document->printing() || !document->frame()->selection()->isFocusedAndActive())
         return;
 
-    if (paintInfo.context->paintingDisabled() && !paintInfo.context->updatingControlTints())
+    if (paintInfo.getContext()->paintingDisabled() && !paintInfo.getContext()->updatingControlTints())
         return;
 
     Element* focusedElement = document->focusedElement();
     if (!focusedElement || !isHTMLAreaElement(focusedElement))
         return;
 
     HTMLAreaElement* areaElement = toHTMLAreaElement(focusedElement);
     if (areaElement->imageElement() != node())
         return;
 
     // Even if the theme handles focus ring drawing for entire elements, it won't do it for
     // an area within an image, so we don't call RenderTheme::supportsFocusRing here.
 
     Path path = areaElement->computePath(this);
     if (path.isEmpty())
         return;
 
     RenderStyle* areaElementStyle = areaElement->computedStyle();
     unsigned short outlineWidth = areaElementStyle->outlineWidth();
     if (!outlineWidth)
         return;
 
     // FIXME: Clip path instead of context when Skia pathops is ready.
     // https://crbug.com/251206
-    GraphicsContextStateSaver savedContext(*paintInfo.context);
-    paintInfo.context->clip(absoluteContentBox());
-    paintInfo.context->drawFocusRing(path, outlineWidth,
+    GraphicsContextStateSaver savedContext(*(paintInfo.getContext()));
+    paintInfo.getContext()->clip(absoluteContentBox());
+    paintInfo.getContext()->drawFocusRing(path, outlineWidth,
         areaElementStyle->outlineOffset(),
         resolveColor(areaElementStyle, CSSPropertyOutlineColor));
 }
 
 void RenderImage::areaElementFocusChanged(HTMLAreaElement* areaElement)
 {
     ASSERT(areaElement->imageElement() == node());
 
     Path path = areaElement->computePath(this);
     if (path.isEmpty())
@@ skipping 151 matching lines @@
         return 0;
 
     CachedImage* cachedImage = m_imageResource->cachedImage();
     if (cachedImage && cachedImage->image() && cachedImage->image()->isSVGImage())
         return static_cast<SVGImage*>(cachedImage->image())->embeddedContentBox();
 
     return 0;
 }
 
 } // namespace WebCore