Implement interfaces in PaintInfo and make it a class.

Source/core/rendering/RenderTheme.cpp

 /**
  * This file is part of the theme implementation for form controls in WebCore.
  *
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Computer, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 247 matching lines @@
         return adjustMeterStyle(style, e);
 #if ENABLE(INPUT_SPEECH)
     case InputSpeechButtonPart:
         return adjustInputFieldSpeechButtonStyle(style, e);
 #endif
     default:
         break;
     }
 }
 
-bool RenderTheme::paint(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
+bool RenderTheme::paint(RenderObject* o, PaintInfo& paintInfo, const IntRect& r)
 {
     // If painting is disabled, but we aren't updating control tints, then just bail.
     // If we are updating control tints, just schedule a repaint if the theme supports tinting
     // for that control.
-    if (paintInfo.context->updatingControlTints()) {
+    if (paintInfo.getContext()->updatingControlTints()) {
         if (controlSupportsTints(o))
             o->repaint();
         return false;
     }
-    if (paintInfo.context->paintingDisabled())
+    if (paintInfo.getContext()->paintingDisabled())
         return false;
 
     ControlPart part = o->style()->appearance();
 
     if (shouldUseFallbackTheme(o->style()))
         return paintUsingFallbackTheme(o, paintInfo, r);
 
 #if USE(NEW_THEME)
     switch (part) {
     case CheckboxPart:
     case RadioPart:
     case PushButtonPart:
     case SquareButtonPart:
     case ButtonPart:
     case InnerSpinButtonPart:
-        m_theme->paint(part, controlStatesForRenderer(o), const_cast<GraphicsContext*>(paintInfo.context), r, o->style()->effectiveZoom(), o->view()->frameView());
+        m_theme->paint(part, controlStatesForRenderer(o), const_cast<GraphicsContext*>(paintInfo.getContext()), r, o->style()->effectiveZoom(), o->view()->frameView());
         return false;
     default:
         break;
     }
 #endif
 
     // Call the appropriate paint method based off the appearance value.
     switch (part) {
 #if !USE(NEW_THEME)
     case CheckboxPart:
@@ skipping 81 matching lines @@
     case InputSpeechButtonPart:
         return paintInputFieldSpeechButton(o, paintInfo, r);
 #endif
     default:
         break;
     }
 
     return true; // We don't support the appearance, so let the normal background/border paint.
 }
 
-bool RenderTheme::paintBorderOnly(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
+bool RenderTheme::paintBorderOnly(RenderObject* o, PaintInfo& paintInfo, const IntRect& r)
 {
-    if (paintInfo.context->paintingDisabled())
+    if (paintInfo.getContext()->paintingDisabled())
         return false;
 
     // Call the appropriate paint method based off the appearance value.
     switch (o->style()->appearance()) {
     case TextFieldPart:
         return paintTextField(o, paintInfo, r);
     case ListboxPart:
     case TextAreaPart:
         return paintTextArea(o, paintInfo, r);
     case MenulistButtonPart:
@@ skipping 21 matching lines @@
 #if ENABLE(INPUT_SPEECH)
     case InputSpeechButtonPart:
 #endif
     default:
         break;
     }
 
     return false;
 }
 
-bool RenderTheme::paintDecorations(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
+bool RenderTheme::paintDecorations(RenderObject* o, PaintInfo& paintInfo, const IntRect& r)
 {
-    if (paintInfo.context->paintingDisabled())
+    if (paintInfo.getContext()->paintingDisabled())
         return false;
 
     // Call the appropriate paint method based off the appearance value.
     switch (o->style()->appearance()) {
     case MenulistButtonPart:
         return paintMenuListButton(o, paintInfo, r);
     case TextFieldPart:
     case TextAreaPart:
     case ListboxPart:
     case CheckboxPart:
@@ skipping 495 matching lines @@
 void RenderTheme::adjustMenuListStyle(RenderStyle*, Element*) const
 {
 }
 
 #if ENABLE(INPUT_SPEECH)
 void RenderTheme::adjustInputFieldSpeechButtonStyle(RenderStyle* style, Element* element) const
 {
     RenderInputSpeech::adjustInputFieldSpeechButtonStyle(style, element);
 }
 
-bool RenderTheme::paintInputFieldSpeechButton(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+bool RenderTheme::paintInputFieldSpeechButton(RenderObject* object, PaintInfo& paintInfo, const IntRect& rect)
 {
     return RenderInputSpeech::paintInputFieldSpeechButton(object, paintInfo, rect);
 }
 #endif
 
 void RenderTheme::adjustMeterStyle(RenderStyle* style, Element*) const
 {
 }
 
 IntSize RenderTheme::meterSizeForBounds(const RenderMeter*, const IntRect& bounds) const
 {
     return bounds.size();
 }
 
 bool RenderTheme::supportsMeter(ControlPart) const
 {
     return false;
 }
 
-bool RenderTheme::paintMeter(RenderObject*, const PaintInfo&, const IntRect&)
+bool RenderTheme::paintMeter(RenderObject*, PaintInfo&, const IntRect&)
 {
     return true;
 }
 
 LayoutUnit RenderTheme::sliderTickSnappingThreshold() const
 {
     return 5;
 }
 
-void RenderTheme::paintSliderTicks(RenderObject* o, const PaintInfo& paintInfo, const IntRect& rect)
+void RenderTheme::paintSliderTicks(RenderObject* o, PaintInfo& paintInfo, const IntRect& rect)
 {
     Node* node = o->node();
     if (!node || !node->hasTagName(inputTag))
         return;
 
     HTMLInputElement* input = toHTMLInputElement(node);
     HTMLDataListElement* dataList = input->dataList();
     if (!dataList)
         return;
 
@@ skipping 38 matching lines @@
         tickRegionSideMargin = trackBounds.x() + (thumbSize.width() - tickSize.width() * zoomFactor) / 2.0;
         tickRegionWidth = trackBounds.width() - thumbSize.width();
     } else {
         tickRect.setWidth(floor(tickSize.height() * zoomFactor));
         tickRect.setHeight(floor(tickSize.width() * zoomFactor));
         tickRect.setX(floor(rect.x() + rect.width() / 2.0 + sliderTickOffsetFromTrackCenter() * zoomFactor));
         tickRegionSideMargin = trackBounds.y() + (thumbSize.width() - tickSize.width() * zoomFactor) / 2.0;
         tickRegionWidth = trackBounds.height() - thumbSize.width();
     }
     RefPtr<HTMLCollection> options = dataList->options();
-    GraphicsContextStateSaver stateSaver(*paintInfo.context);
-    paintInfo.context->setFillColor(o->resolveColor(CSSPropertyColor));
+    GraphicsContextStateSaver stateSaver(*(paintInfo.getContext()));
+    paintInfo.getContext()->setFillColor(o->resolveColor(CSSPropertyColor));
     for (unsigned i = 0; Node* node = options->item(i); i++) {
         ASSERT(node->hasTagName(optionTag));
         HTMLOptionElement* optionElement = toHTMLOptionElement(node);
         String value = optionElement->value();
         if (!input->isValidValue(value))
             continue;
         double parsedValue = parseToDoubleForNumberType(input->sanitizeValue(value));
         double tickFraction = (parsedValue - min) / (max - min);
         double tickRatio = isHorizontal && o->style()->isLeftToRightDirection() ? tickFraction : 1.0 - tickFraction;
         double tickPosition = round(tickRegionSideMargin + tickRegionWidth * tickRatio);
         if (isHorizontal)
             tickRect.setX(tickPosition);
         else
             tickRect.setY(tickPosition);
-        paintInfo.context->fillRect(tickRect);
+        paintInfo.getContext()->fillRect(tickRect);
     }
 }
 
 double RenderTheme::animationRepeatIntervalForProgressBar(RenderProgress*) const
 {
     return 0;
 }
 
 double RenderTheme::animationDurationForProgressBar(RenderProgress*) const
 {
@@ skipping 220 matching lines @@
     switch (part) {
     case CheckboxPart:
         return adjustCheckboxStyleUsingFallbackTheme(style, e);
     case RadioPart:
         return adjustRadioStyleUsingFallbackTheme(style, e);
     default:
         break;
     }
 }
 
-bool RenderTheme::paintUsingFallbackTheme(RenderObject* o, const PaintInfo& i, const IntRect& r)
+bool RenderTheme::paintUsingFallbackTheme(RenderObject* o, PaintInfo& i, const IntRect& r)
 {
     ControlPart part = o->style()->appearance();
     switch (part) {
     case CheckboxPart:
         return paintCheckboxUsingFallbackTheme(o, i, r);
     case RadioPart:
         return paintRadioUsingFallbackTheme(o, i, r);
     default:
         break;
     }
     return true;
 }
 
 // static
 void RenderTheme::setSizeIfAuto(RenderStyle* style, const IntSize& size)
 {
     if (style->width().isIntrinsicOrAuto())
         style->setWidth(Length(size.width(), Fixed));
     if (style->height().isAuto())
         style->setHeight(Length(size.height(), Fixed));
 }
 
-bool RenderTheme::paintCheckboxUsingFallbackTheme(RenderObject* o, const PaintInfo& i, const IntRect& r)
+bool RenderTheme::paintCheckboxUsingFallbackTheme(RenderObject* o, PaintInfo& i, const IntRect& r)
 {
     WebKit::WebFallbackThemeEngine::ExtraParams extraParams;
-    WebKit::WebCanvas* canvas = i.context->canvas();
+    WebKit::WebCanvas* canvas = i.getContext()->canvas();
     extraParams.button.checked = isChecked(o);
     extraParams.button.indeterminate = isIndeterminate(o);
 
     float zoomLevel = o->style()->effectiveZoom();
-    GraphicsContextStateSaver stateSaver(*i.context);
+    GraphicsContextStateSaver stateSaver(*(i.getContext()));
     IntRect unzoomedRect = r;
     if (zoomLevel != 1) {
         unzoomedRect.setWidth(unzoomedRect.width() / zoomLevel);
         unzoomedRect.setHeight(unzoomedRect.height() / zoomLevel);
-        i.context->translate(unzoomedRect.x(), unzoomedRect.y());
-        i.context->scale(FloatSize(zoomLevel, zoomLevel));
-        i.context->translate(-unzoomedRect.x(), -unzoomedRect.y());
+        i.getContext()->translate(unzoomedRect.x(), unzoomedRect.y());
+        i.getContext()->scale(FloatSize(zoomLevel, zoomLevel));
+        i.getContext()->translate(-unzoomedRect.x(), -unzoomedRect.y());
     }
 
     WebKit::Platform::current()->fallbackThemeEngine()->paint(canvas, WebKit::WebFallbackThemeEngine::PartCheckbox, getWebFallbackThemeState(this, o), WebKit::WebRect(unzoomedRect), &extraParams);
     return false;
 }
 
 void RenderTheme::adjustCheckboxStyleUsingFallbackTheme(RenderStyle* style, Element*) const
 {
     // If the width and height are both specified, then we have nothing to do.
     if (!style->width().isIntrinsicOrAuto() && !style->height().isAuto())
         return;
 
     IntSize size = WebKit::Platform::current()->fallbackThemeEngine()->getSize(WebKit::WebFallbackThemeEngine::PartCheckbox);
     float zoomLevel = style->effectiveZoom();
     size.setWidth(size.width() * zoomLevel);
     size.setHeight(size.height() * zoomLevel);
     setSizeIfAuto(style, size);
 
     // padding - not honored by WinIE, needs to be removed.
     style->resetPadding();
 
     // border - honored by WinIE, but looks terrible (just paints in the control box and turns off the Windows XP theme)
     // for now, we will not honor it.
     style->resetBorder();
 }
 
-bool RenderTheme::paintRadioUsingFallbackTheme(RenderObject* o, const PaintInfo& i, const IntRect& r)
+bool RenderTheme::paintRadioUsingFallbackTheme(RenderObject* o, PaintInfo& i, const IntRect& r)
 {
     WebKit::WebFallbackThemeEngine::ExtraParams extraParams;
-    WebKit::WebCanvas* canvas = i.context->canvas();
+    WebKit::WebCanvas* canvas = i.getContext()->canvas();
     extraParams.button.checked = isChecked(o);
     extraParams.button.indeterminate = isIndeterminate(o);
 
     float zoomLevel = o->style()->effectiveZoom();
-    GraphicsContextStateSaver stateSaver(*i.context);
+    GraphicsContextStateSaver stateSaver(*(i.getContext()));
     IntRect unzoomedRect = r;
     if (zoomLevel != 1) {
         unzoomedRect.setWidth(unzoomedRect.width() / zoomLevel);
         unzoomedRect.setHeight(unzoomedRect.height() / zoomLevel);
-        i.context->translate(unzoomedRect.x(), unzoomedRect.y());
-        i.context->scale(FloatSize(zoomLevel, zoomLevel));
-        i.context->translate(-unzoomedRect.x(), -unzoomedRect.y());
+        i.getContext()->translate(unzoomedRect.x(), unzoomedRect.y());
+        i.getContext()->scale(FloatSize(zoomLevel, zoomLevel));
+        i.getContext()->translate(-unzoomedRect.x(), -unzoomedRect.y());
     }
 
     WebKit::Platform::current()->fallbackThemeEngine()->paint(canvas, WebKit::WebFallbackThemeEngine::PartRadio, getWebFallbackThemeState(this, o), WebKit::WebRect(unzoomedRect), &extraParams);
     return false;
 }
 
 void RenderTheme::adjustRadioStyleUsingFallbackTheme(RenderStyle* style, Element*) const
 {
     // If the width and height are both specified, then we have nothing to do.
     if (!style->width().isIntrinsicOrAuto() && !style->height().isAuto())
         return;
 
     IntSize size = WebKit::Platform::current()->fallbackThemeEngine()->getSize(WebKit::WebFallbackThemeEngine::PartRadio);
     float zoomLevel = style->effectiveZoom();
     size.setWidth(size.width() * zoomLevel);
     size.setHeight(size.height() * zoomLevel);
     setSizeIfAuto(style, size);
 
     // padding - not honored by WinIE, needs to be removed.
     style->resetPadding();
 
     // border - honored by WinIE, but looks terrible (just paints in the control box and turns off the Windows XP theme)
     // for now, we will not honor it.
     style->resetBorder();
 }
 
 } // namespace WebCore