Implement interfaces in PaintInfo and make it a class.

Source/core/rendering/RenderThemeChromiumDefault.cpp

 /*
  * Copyright (C) 2007 Apple Inc.
  * Copyright (C) 2007 Alp Toker <alp@atoker.com>
  * Copyright (C) 2008 Collabora Ltd.
  * Copyright (C) 2008, 2009 Google Inc.
  * Copyright (C) 2009 Kenneth Rohde Christiansen
  *
  * 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
@@ skipping 189 matching lines @@
     unsigned activeForegroundColor,
     unsigned inactiveBackgroundColor,
     unsigned inactiveForegroundColor)
 {
     m_activeSelectionBackgroundColor = activeBackgroundColor;
     m_activeSelectionForegroundColor = activeForegroundColor;
     m_inactiveSelectionBackgroundColor = inactiveBackgroundColor;
     m_inactiveSelectionForegroundColor = inactiveForegroundColor;
 }
 
-bool RenderThemeChromiumDefault::paintCheckbox(RenderObject* o, const PaintInfo& i, const IntRect& rect)
+bool RenderThemeChromiumDefault::paintCheckbox(RenderObject* o, PaintInfo& i, const IntRect& rect)
 {
     WebKit::WebThemeEngine::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 = rect;
     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()->themeEngine()->paint(canvas, WebKit::WebThemeEngine::PartCheckbox, getWebThemeState(this, o), WebKit::WebRect(unzoomedRect), &extraParams);
     return false;
 }
 
 void RenderThemeChromiumDefault::setCheckboxSize(RenderStyle* style) 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()->themeEngine()->getSize(WebKit::WebThemeEngine::PartCheckbox);
     float zoomLevel = style->effectiveZoom();
     size.setWidth(size.width() * zoomLevel);
     size.setHeight(size.height() * zoomLevel);
     setSizeIfAuto(style, size);
 }
 
-bool RenderThemeChromiumDefault::paintRadio(RenderObject* o, const PaintInfo& i, const IntRect& rect)
+bool RenderThemeChromiumDefault::paintRadio(RenderObject* o, PaintInfo& i, const IntRect& rect)
 {
     WebKit::WebThemeEngine::ExtraParams extraParams;
-    WebKit::WebCanvas* canvas = i.context->canvas();
+    WebKit::WebCanvas* canvas = i.getContext()->canvas();
     extraParams.button.checked = isChecked(o);
 
     WebKit::Platform::current()->themeEngine()->paint(canvas, WebKit::WebThemeEngine::PartRadio, getWebThemeState(this, o), WebKit::WebRect(rect), &extraParams);
     return false;
 }
 
 void RenderThemeChromiumDefault::setRadioSize(RenderStyle* style) 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()->themeEngine()->getSize(WebKit::WebThemeEngine::PartRadio);
     float zoomLevel = style->effectiveZoom();
     size.setWidth(size.width() * zoomLevel);
     size.setHeight(size.height() * zoomLevel);
     setSizeIfAuto(style, size);
 }
 
-bool RenderThemeChromiumDefault::paintButton(RenderObject* o, const PaintInfo& i, const IntRect& rect)
+bool RenderThemeChromiumDefault::paintButton(RenderObject* o, PaintInfo& i, const IntRect& rect)
 {
     WebKit::WebThemeEngine::ExtraParams extraParams;
-    WebKit::WebCanvas* canvas = i.context->canvas();
+    WebKit::WebCanvas* canvas = i.getContext()->canvas();
     extraParams.button.hasBorder = true;
     extraParams.button.backgroundColor = defaultButtonBackgroundColor;
     if (o->hasBackground())
         extraParams.button.backgroundColor = o->resolveColor(CSSPropertyBackgroundColor).rgb();
 
     WebKit::Platform::current()->themeEngine()->paint(canvas, WebKit::WebThemeEngine::PartButton, getWebThemeState(this, o), WebKit::WebRect(rect), &extraParams);
     return false;
 }
 
-bool RenderThemeChromiumDefault::paintTextField(RenderObject* o, const PaintInfo& i, const IntRect& rect)
+bool RenderThemeChromiumDefault::paintTextField(RenderObject* o, PaintInfo& i, const IntRect& rect)
 {
     // WebThemeEngine does not handle border rounded corner and background image
     // so return true to draw CSS border and background.
     if (o->style()->hasBorderRadius() || o->style()->hasBackgroundImage())
         return true;
 
     ControlPart part = o->style()->appearance();
 
     WebKit::WebThemeEngine::ExtraParams extraParams;
     extraParams.textField.isTextArea = part == TextAreaPart;
     extraParams.textField.isListbox = part == ListboxPart;
 
-    WebKit::WebCanvas* canvas = i.context->canvas();
+    WebKit::WebCanvas* canvas = i.getContext()->canvas();
 
     // Fallback to white if the specified color object is invalid.
     Color backgroundColor = o->resolveColor(CSSPropertyBackgroundColor, Color::white);
     extraParams.textField.backgroundColor = backgroundColor.rgb();
 
     WebKit::Platform::current()->themeEngine()->paint(canvas, WebKit::WebThemeEngine::PartTextField, getWebThemeState(this, o), WebKit::WebRect(rect), &extraParams);
     return false;
 }
 
-bool RenderThemeChromiumDefault::paintMenuList(RenderObject* o, const PaintInfo& i, const IntRect& rect)
+bool RenderThemeChromiumDefault::paintMenuList(RenderObject* o, PaintInfo& i, const IntRect& rect)
 {
     if (!o->isBox())
         return false;
 
     const int right = rect.x() + rect.width();
     const int middle = rect.y() + rect.height() / 2;
 
     WebKit::WebThemeEngine::ExtraParams extraParams;
     extraParams.menuList.arrowX = (o->style()->direction() == RTL) ? rect.x() + 7 : right - 13;
     extraParams.menuList.arrowY = middle;
     const RenderBox* box = toRenderBox(o);
     // Match Chromium Win behaviour of showing all borders if any are shown.
     extraParams.menuList.hasBorder = box->borderRight() || box->borderLeft() || box->borderTop() || box->borderBottom();
     extraParams.menuList.hasBorderRadius = o->style()->hasBorderRadius();
     // Fallback to transparent if the specified color object is invalid.
     extraParams.menuList.backgroundColor = Color::transparent;
     if (o->hasBackground())
         extraParams.menuList.backgroundColor = o->resolveColor(CSSPropertyBackgroundColor).rgb();
 
-    WebKit::WebCanvas* canvas = i.context->canvas();
+    WebKit::WebCanvas* canvas = i.getContext()->canvas();
 
     WebKit::Platform::current()->themeEngine()->paint(canvas, WebKit::WebThemeEngine::PartMenuList, getWebThemeState(this, o), WebKit::WebRect(rect), &extraParams);
     return false;
 }
 
-bool RenderThemeChromiumDefault::paintSliderTrack(RenderObject* o, const PaintInfo& i, const IntRect& rect)
+bool RenderThemeChromiumDefault::paintSliderTrack(RenderObject* o, PaintInfo& i, const IntRect& rect)
 {
     WebKit::WebThemeEngine::ExtraParams extraParams;
-    WebKit::WebCanvas* canvas = i.context->canvas();
+    WebKit::WebCanvas* canvas = i.getContext()->canvas();
     extraParams.slider.vertical = o->style()->appearance() == SliderVerticalPart;
 
     paintSliderTicks(o, i, rect);
 
     float zoomLevel = o->style()->effectiveZoom();
-    GraphicsContextStateSaver stateSaver(*i.context);
+    GraphicsContextStateSaver stateSaver(*(i.getContext()));
     IntRect unzoomedRect = rect;
     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()->themeEngine()->paint(canvas, WebKit::WebThemeEngine::PartSliderTrack, getWebThemeState(this, o), WebKit::WebRect(unzoomedRect), &extraParams);
 
     return false;
 }
 
-bool RenderThemeChromiumDefault::paintSliderThumb(RenderObject* o, const PaintInfo& i, const IntRect& rect)
+bool RenderThemeChromiumDefault::paintSliderThumb(RenderObject* o, PaintInfo& i, const IntRect& rect)
 {
     WebKit::WebThemeEngine::ExtraParams extraParams;
-    WebKit::WebCanvas* canvas = i.context->canvas();
+    WebKit::WebCanvas* canvas = i.getContext()->canvas();
     extraParams.slider.vertical = o->style()->appearance() == SliderThumbVerticalPart;
     extraParams.slider.inDrag = isPressed(o);
 
     float zoomLevel = o->style()->effectiveZoom();
-    GraphicsContextStateSaver stateSaver(*i.context);
+    GraphicsContextStateSaver stateSaver(*(i.getContext()));
     IntRect unzoomedRect = rect;
     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()->themeEngine()->paint(canvas, WebKit::WebThemeEngine::PartSliderThumb, getWebThemeState(this, o), WebKit::WebRect(unzoomedRect), &extraParams);
     return false;
 }
 
 void RenderThemeChromiumDefault::adjustInnerSpinButtonStyle(RenderStyle* style, Element*) const
 {
     IntSize size = WebKit::Platform::current()->themeEngine()->getSize(WebKit::WebThemeEngine::PartInnerSpinButton);
 
     style->setWidth(Length(size.width(), Fixed));
     style->setMinWidth(Length(size.width(), Fixed));
 }
 
-bool RenderThemeChromiumDefault::paintInnerSpinButton(RenderObject* o, const PaintInfo& i, const IntRect& rect)
+bool RenderThemeChromiumDefault::paintInnerSpinButton(RenderObject* o, PaintInfo& i, const IntRect& rect)
 {
     WebKit::WebThemeEngine::ExtraParams extraParams;
-    WebKit::WebCanvas* canvas = i.context->canvas();
+    WebKit::WebCanvas* canvas = i.getContext()->canvas();
     extraParams.innerSpin.spinUp = (controlStatesForRenderer(o) & SpinUpState);
     extraParams.innerSpin.readOnly = isReadOnlyControl(o);
 
     WebKit::Platform::current()->themeEngine()->paint(canvas, WebKit::WebThemeEngine::PartInnerSpinButton, getWebThemeState(this, o), WebKit::WebRect(rect), &extraParams);
     return false;
 }
 
-bool RenderThemeChromiumDefault::paintProgressBar(RenderObject* o, const PaintInfo& i, const IntRect& rect)
+bool RenderThemeChromiumDefault::paintProgressBar(RenderObject* o, PaintInfo& i, const IntRect& rect)
 {
     if (!o->isProgress())
         return true;
 
     RenderProgress* renderProgress = toRenderProgress(o);
     IntRect valueRect = progressValueRectFor(renderProgress, rect);
 
     WebKit::WebThemeEngine::ExtraParams extraParams;
     extraParams.progressBar.determinate = renderProgress->isDeterminate();
     extraParams.progressBar.valueRectX = valueRect.x();
     extraParams.progressBar.valueRectY = valueRect.y();
     extraParams.progressBar.valueRectWidth = valueRect.width();
     extraParams.progressBar.valueRectHeight = valueRect.height();
 
     DirectionFlippingScope scope(o, i, rect);
-    WebKit::WebCanvas* canvas = i.context->canvas();
+    WebKit::WebCanvas* canvas = i.getContext()->canvas();
     WebKit::Platform::current()->themeEngine()->paint(canvas, WebKit::WebThemeEngine::PartProgressBar, getWebThemeState(this, o), WebKit::WebRect(rect), &extraParams);
     return false;
 }
 
 bool RenderThemeChromiumDefault::shouldOpenPickerWithF4Key() const
 {
     return true;
 }
 
 } // namespace WebCore